Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make multiple minor housekeeping changes #28

Merged
merged 1 commit into from
Jul 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 44 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# Expedite

Simple encrypted file transfer service

## Introduction

Expedite is a simple encrypted file transfer service that allows for people to
Expand Down Expand Up @@ -31,27 +33,59 @@ transfer. Please open up a pull request if you wish to list your server here.
- Atlanta, GA - `ws://expedite-atla.apexaltruism.net:6969`
- Mumbai, MH - `ws://expedite-mumb.apexaltruism.net:6969`

## Screenshots
## Illustration

### Client - Bridge - Info

![](https://raw.githubusercontent.com/gridhead/expedite/main/data/bridge-info-stat.png)

### Client - Bridge - Delivering - Static

![](https://raw.githubusercontent.com/gridhead/expedite/main/data/bridge-send-stat.png)

### Client - Bridge - Collecting - Static

![](https://raw.githubusercontent.com/gridhead/expedite/main/data/bridge-recv-stat.png)

### Client - Bridge - Delivering - Progress

![](https://raw.githubusercontent.com/gridhead/expedite/main/data/bridge-send-prog.gif)

### Client - Bridge - Collecting - Progress

![](https://raw.githubusercontent.com/gridhead/expedite/main/data/bridge-recv-prog.gif)

### Client - Prompt - Help

![](https://raw.githubusercontent.com/gridhead/expedite/main/data/prompt-help-stat.png)

### Client - Prompt - Delivering - Help

![](https://raw.githubusercontent.com/gridhead/expedite/main/data/prompt-send-help.png)

### Client - Prompt - Collecting - Help

![](https://raw.githubusercontent.com/gridhead/expedite/main/data/prompt-recv-help.png)

### Client - Prompt - Delivering
### Client - Prompt - Delivering - Static

![](https://raw.githubusercontent.com/gridhead/expedite/main/data/prompt-send.gif)
![](https://raw.githubusercontent.com/gridhead/expedite/main/data/prompt-send-stat.png)

### Client - Prompt - Collecting
### Client - Prompt - Collecting - Static

![](https://raw.githubusercontent.com/gridhead/expedite/main/data/prompt-recv.gif)
![](https://raw.githubusercontent.com/gridhead/expedite/main/data/prompt-recv-stat.png)

### Client - Bridge - Delivering
### Client - Prompt - Delivering - Progress

![](https://raw.githubusercontent.com/gridhead/expedite/main/data/bridge-send.gif)
![](https://raw.githubusercontent.com/gridhead/expedite/main/data/prompt-send-prog.gif)

### Client - Bridge - Collecting
### Client - Prompt - Collecting - Progress

![](https://raw.githubusercontent.com/gridhead/expedite/main/data/bridge-recv.gif)
![](https://raw.githubusercontent.com/gridhead/expedite/main/data/prompt-recv-prog.gif)

### Server - Broker

![](https://raw.githubusercontent.com/gridhead/expedite/main/data/brok.png)
![](https://raw.githubusercontent.com/gridhead/expedite/main/data/brok-stat.png)

## Installation

Expand Down
Binary file added data/bridge-info-stat.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
Binary file added data/bridge-recv-stat.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
Binary file added data/bridge-send-stat.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
Binary file added data/prompt-help-stat.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/prompt-recv-help.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
Binary file added data/prompt-recv-stat.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/prompt-send-help.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
Binary file added data/prompt-send-stat.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion expedite/client/bridge/room.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
class MainWindow(QMainWindow, Ui_mainwind):
def __init__(self):
super().__init__()
self.headtext = f"Expedite v{__versdata__}"
self.headtext = f"Expedite Bridge v{__versdata__}"
self.loop = new_event_loop()
set_event_loop(self.loop)
self.sock = None
Expand Down
4 changes: 2 additions & 2 deletions expedite/client/bridge/util.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,15 @@ def show_location_dialog(parent=None, oper: str = "") -> str:


def truncate_text(text: str = "", size: int = 32) -> str:
if len(text) >= 32:
if len(text) >= size:
return text[0:size-3] + "..."
else:
return text


def return_detail_text() -> str:
text = """
<b>Expedite v{vers}</b><br/>
<b>Expedite Bridge v{vers}</b><br/>
<i>A simple encrypted file transfer service for humans</i><br/><br/>
Expedite is a simple encrypted file transfer service that allows for people to share synchronously assets among each other without having to rely on third party file sharing services (and constantly worrying about how their data might be used) or feeling the need of having publicly visible IP addresses (and constantly worrying about script kiddies attacking your computer).<br/><br/>
Expedite Server can be deployed on a virtual private server having an IP address that is discoverable by the Expedite Client users to broker file contents. The transfers facilitated using WebSockets are end-to-end encrypted with the use of 128-bit Advanced Encryption Standard and the server is restricted to logging only unidentifiable activities to the volatile memory.<br/><br/>
Expand Down
4 changes: 2 additions & 2 deletions expedite/client/prompt/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ def work() -> None:
"-t",
"--time",
"time",
type=IntRange(5, 30),
type=IntRange(5, 300),
default=standard.client_time,
required=False,
help="Set the expiry period for participants"
Expand All @@ -82,7 +82,7 @@ def work() -> None:
help="Set the identity of the opposing client"
)
@version_option(
version=__versdata__, prog_name="Expedite Client by Akashdeep Dhar"
version=__versdata__, prog_name="Expedite Prompt by Akashdeep Dhar"
)
def main(
host: str = standard.client_host,
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ readme = "README.md"
homepage = "https://github.com/gridhead/expedite"
repository = "https://github.com/gridhead/expedite"
documentation = "https://github.com/gridhead/expedite/blob/main/README.md"
keywords = [""]
keywords = ["file", "transfer", "delivering", "collecting"]
classifiers= [
"Development Status :: 4 - Beta",
"Environment :: X11 Applications :: Qt",
Expand Down