From dac508d06e25529e115e3769c66199aa5308a5b0 Mon Sep 17 00:00:00 2001 From: Micah Lee Date: Sun, 25 Apr 2021 19:23:10 -0400 Subject: Prettier ASCII art --- cli/onionshare_cli/__init__.py | 78 ++++++++++++++++-------------------------- cli/onionshare_cli/common.py | 3 ++ 2 files changed, 33 insertions(+), 48 deletions(-) (limited to 'cli') diff --git a/cli/onionshare_cli/__init__.py b/cli/onionshare_cli/__init__.py index 42ec9673..79c149f9 100644 --- a/cli/onionshare_cli/__init__.py +++ b/cli/onionshare_cli/__init__.py @@ -46,54 +46,36 @@ def main(cwd=None): # Display OnionShare banner print(f"OnionShare {common.version} | https://onionshare.org/") - reset = "\033[0m" - purple = "\33[95m" - print(purple) - print(" @@@@@@@@@ ") - print(" @@@@@@@@@@@@@@@@@@@ ") - print(" @@@@@@@@@@@@@@@@@@@@@@@@@ ") - print(" @@@@@@@@@@@@@@@@@@@@@@@@@@@@@ ") - print( - " @@@@@@@@@@@@@@@@@@@@@@@@@@@@@ ___ _ " - ) - print( - " @@@@@@ @@@@@@@@@@@@@ / _ \\ (_) " - ) - print( - " @@@@ @ @@@@@@@@@@@ | | | |_ __ _ ___ _ __ " - ) - print( - " @@@@@@@@ @@@@@@@@@@ | | | | '_ \\| |/ _ \\| '_ \\ " - ) - print( - " @@@@@@@@@@@@ @@@@@@@@@@ \\ \\_/ / | | | | (_) | | | | " - ) - print( - " @@@@@@@@@@@@@@@@ @@@@@@@@@ \\___/|_| |_|_|\\___/|_| |_| " - ) - print( - " @@@@@@@@@ @@@@@@@@@@@@@@@@ _____ _ " - ) - print( - " @@@@@@@@@@ @@@@@@@@@@@@ / ___| | " - ) - print( - " @@@@@@@@@@ @@@@@@@@ \\ `--.| |__ __ _ _ __ ___ " - ) - print( - " @@@@@@@@@@@ @ @@@@ `--. \\ '_ \\ / _` | '__/ _ \\" - ) - print( - " @@@@@@@@@@@@@ @@@@@@ /\\__/ / | | | (_| | | | __/" - ) - print( - " @@@@@@@@@@@@@@@@@@@@@@@@@@@@@ \\____/|_| |_|\\__,_|_| \\___|" - ) - print(" @@@@@@@@@@@@@@@@@@@@@@@@@@@@@ ") - print(" @@@@@@@@@@@@@@@@@@@@@@@@@ ") - print(" @@@@@@@@@@@@@@@@@@@ ") - print(" @@@@@@@@@ ") - print(reset) + print(common.C_DARKPURPLE) + print(" ▄▄█████████▄▄ ") + print(" ▄███████████████████▄ ") + print(" ▄█████████████████████████▄ ") + print(" █████████████████████████████ ") + print(" ▀████████████████████████████▄ ") + print(" ▄▄ ▀██████▀▀▀ ▀▀▀█████████████ ") + print(" ▄████▄ ▀█▀ ▀███████████ ") + print(" ▄████████▄ ██████████ ") + print(" ▄████████████▄ ██████████ ") + print(" ▄████████████████▄ █████████ ") + print(" █████████ ▀████████████████▀ ") + print(" ██████████ ▀████████████▀ ") + print(" ██████████ ▀████████▀ ") + print(" ███████████▄ ▄█▄ ▀████▀ ") + print(" █████████████▄▄▄ ▄▄▄██████▄ ▀▀ ") + print(" █████████████████████████████▄ ") + print(" ▀█████████████████████████████ ") + print(" ▀█████████████████████████ ") + print(" ▀███████████████████ ") + print(" ▀▀█████████▀▀ ") + print("") + print(common.C_LIGHTPURPLE) + print(" ▄██▄ ███ █ ") + print(" █ █ █▀ █ ") + print(" █ █ ▀ █▄▄ █ ") + print(" █ █ █▄█▄ █ ▄██▄ █▄█▄ ▀▀█ █▄█▄ ▄██▄ █▄█▄ ▄██▄ ") + print(" █ █ █▀ █ █ █ █ █▀ █ ▄█ █▀ █ █ █ █▀ █▄▄▀ ") + print(" ▀██▀ █ █ █ ▀██▀ █ █ ███ █ █ ▀█▀█ █ ▀▄▄▄ ") + print(common.C_RESET) # OnionShare CLI in OSX needs to change current working directory (#132) if common.platform == "Darwin": diff --git a/cli/onionshare_cli/common.py b/cli/onionshare_cli/common.py index e812aa98..b317b33f 100644 --- a/cli/onionshare_cli/common.py +++ b/cli/onionshare_cli/common.py @@ -44,8 +44,11 @@ class Common: """ C_RESET = "\033[0m" + C_BOLD = "\033[01m" C_LIGHTGRAY = "\033[37m" C_DARKGRAY = "\033[90m" + C_LIGHTPURPLE = "\033[95m" + C_DARKPURPLE = "\033[35m" def __init__(self, verbose=False): self.verbose = verbose -- cgit v1.2.3-54-g00ecf From ee3761af6cdc7d2a71e194415902063e016e761c Mon Sep 17 00:00:00 2001 From: Micah Lee Date: Mon, 26 Apr 2021 19:29:18 -0700 Subject: Move graphical banner into common, and display it in GUI too --- cli/onionshare_cli/__init__.py | 34 +--------------------------------- cli/onionshare_cli/common.py | 33 +++++++++++++++++++++++++++++++++ desktop/src/onionshare/__init__.py | 4 +--- 3 files changed, 35 insertions(+), 36 deletions(-) (limited to 'cli') diff --git a/cli/onionshare_cli/__init__.py b/cli/onionshare_cli/__init__.py index 79c149f9..a44f816c 100644 --- a/cli/onionshare_cli/__init__.py +++ b/cli/onionshare_cli/__init__.py @@ -43,39 +43,7 @@ def main(cwd=None): onionshare uses. """ common = Common() - - # Display OnionShare banner - print(f"OnionShare {common.version} | https://onionshare.org/") - print(common.C_DARKPURPLE) - print(" ▄▄█████████▄▄ ") - print(" ▄███████████████████▄ ") - print(" ▄█████████████████████████▄ ") - print(" █████████████████████████████ ") - print(" ▀████████████████████████████▄ ") - print(" ▄▄ ▀██████▀▀▀ ▀▀▀█████████████ ") - print(" ▄████▄ ▀█▀ ▀███████████ ") - print(" ▄████████▄ ██████████ ") - print(" ▄████████████▄ ██████████ ") - print(" ▄████████████████▄ █████████ ") - print(" █████████ ▀████████████████▀ ") - print(" ██████████ ▀████████████▀ ") - print(" ██████████ ▀████████▀ ") - print(" ███████████▄ ▄█▄ ▀████▀ ") - print(" █████████████▄▄▄ ▄▄▄██████▄ ▀▀ ") - print(" █████████████████████████████▄ ") - print(" ▀█████████████████████████████ ") - print(" ▀█████████████████████████ ") - print(" ▀███████████████████ ") - print(" ▀▀█████████▀▀ ") - print("") - print(common.C_LIGHTPURPLE) - print(" ▄██▄ ███ █ ") - print(" █ █ █▀ █ ") - print(" █ █ ▀ █▄▄ █ ") - print(" █ █ █▄█▄ █ ▄██▄ █▄█▄ ▀▀█ █▄█▄ ▄██▄ █▄█▄ ▄██▄ ") - print(" █ █ █▀ █ █ █ █ █▀ █ ▄█ █▀ █ █ █ █▀ █▄▄▀ ") - print(" ▀██▀ █ █ █ ▀██▀ █ █ ███ █ █ ▀█▀█ █ ▀▄▄▄ ") - print(common.C_RESET) + common.display_banner() # OnionShare CLI in OSX needs to change current working directory (#132) if common.platform == "Darwin": diff --git a/cli/onionshare_cli/common.py b/cli/onionshare_cli/common.py index b317b33f..41085f48 100644 --- a/cli/onionshare_cli/common.py +++ b/cli/onionshare_cli/common.py @@ -62,6 +62,39 @@ class Common: with open(self.get_resource_path("version.txt")) as f: self.version = f.read().strip() + def display_banner(self): + print(f"OnionShare {self.version} | https://onionshare.org/") + print(self.C_DARKPURPLE) + print(" ▄▄█████████▄▄ ") + print(" ▄███████████████████▄ ") + print(" ▄█████████████████████████▄ ") + print(" █████████████████████████████ ") + print(" ▀████████████████████████████▄ ") + print(" ▄▄ ▀██████▀▀▀ ▀▀▀█████████████ ") + print(" ▄████▄ ▀█▀ ▀███████████ ") + print(" ▄████████▄ ██████████ ") + print(" ▄████████████▄ ██████████ ") + print(" ▄████████████████▄ █████████ ") + print(" █████████ ▀████████████████▀ ") + print(" ██████████ ▀████████████▀ ") + print(" ██████████ ▀████████▀ ") + print(" ███████████▄ ▄█▄ ▀████▀ ") + print(" █████████████▄▄▄ ▄▄▄██████▄ ▀▀ ") + print(" █████████████████████████████▄ ") + print(" ▀█████████████████████████████ ") + print(" ▀█████████████████████████ ") + print(" ▀███████████████████ ") + print(" ▀▀█████████▀▀ ") + print("") + print(self.C_LIGHTPURPLE) + print(" ▄██▄ ███ █ ") + print(" █ █ █▀ █ ") + print(" █ █ ▀ █▄▄ █ ") + print(" █ █ █▄█▄ █ ▄██▄ █▄█▄ ▀▀█ █▄█▄ ▄██▄ █▄█▄ ▄██▄ ") + print(" █ █ █▀ █ █ █ █ █▀ █ ▄█ █▀ █ █ █ █▀ █▄▄▀ ") + print(" ▀██▀ █ █ █ ▀██▀ █ █ ███ █ █ ▀█▀█ █ ▀▄▄▄ ") + print(self.C_RESET) + def load_settings(self, config=None): """ Loading settings, optionally from a custom config json file. diff --git a/desktop/src/onionshare/__init__.py b/desktop/src/onionshare/__init__.py index 744f6979..1c69ffa5 100644 --- a/desktop/src/onionshare/__init__.py +++ b/desktop/src/onionshare/__init__.py @@ -75,14 +75,12 @@ def main(): The main() function implements all of the logic that the GUI version of onionshare uses. """ common = Common() + common.display_banner() # Required for macOS Big Sur: https://stackoverflow.com/a/64878899 if common.platform == "Darwin": os.environ["QT_MAC_WANTS_LAYER"] = "1" - # Display OnionShare banner - print(f"OnionShare {common.version} | https://onionshare.org/") - # Start the Qt app global qtapp qtapp = Application(common) -- cgit v1.2.3-54-g00ecf From ffe820398d9bba128176f29f9e4ef3ae51594107 Mon Sep 17 00:00:00 2001 From: Micah Lee Date: Wed, 28 Apr 2021 16:08:20 -0700 Subject: Level up the ASCII art --- cli/onionshare_cli/common.py | 255 +++++++++++++++++++++++++++++++++++++------ 1 file changed, 222 insertions(+), 33 deletions(-) (limited to 'cli') diff --git a/cli/onionshare_cli/common.py b/cli/onionshare_cli/common.py index 41085f48..c264f79f 100644 --- a/cli/onionshare_cli/common.py +++ b/cli/onionshare_cli/common.py @@ -44,7 +44,9 @@ class Common: """ C_RESET = "\033[0m" + C_BG_PURPLE = "\033[45m" C_BOLD = "\033[01m" + C_WHITE = "\033[97m" C_LIGHTGRAY = "\033[37m" C_DARKGRAY = "\033[90m" C_LIGHTPURPLE = "\033[95m" @@ -63,37 +65,224 @@ class Common: self.version = f.read().strip() def display_banner(self): - print(f"OnionShare {self.version} | https://onionshare.org/") - print(self.C_DARKPURPLE) - print(" ▄▄█████████▄▄ ") - print(" ▄███████████████████▄ ") - print(" ▄█████████████████████████▄ ") - print(" █████████████████████████████ ") - print(" ▀████████████████████████████▄ ") - print(" ▄▄ ▀██████▀▀▀ ▀▀▀█████████████ ") - print(" ▄████▄ ▀█▀ ▀███████████ ") - print(" ▄████████▄ ██████████ ") - print(" ▄████████████▄ ██████████ ") - print(" ▄████████████████▄ █████████ ") - print(" █████████ ▀████████████████▀ ") - print(" ██████████ ▀████████████▀ ") - print(" ██████████ ▀████████▀ ") - print(" ███████████▄ ▄█▄ ▀████▀ ") - print(" █████████████▄▄▄ ▄▄▄██████▄ ▀▀ ") - print(" █████████████████████████████▄ ") - print(" ▀█████████████████████████████ ") - print(" ▀█████████████████████████ ") - print(" ▀███████████████████ ") - print(" ▀▀█████████▀▀ ") - print("") - print(self.C_LIGHTPURPLE) - print(" ▄██▄ ███ █ ") - print(" █ █ █▀ █ ") - print(" █ █ ▀ █▄▄ █ ") - print(" █ █ █▄█▄ █ ▄██▄ █▄█▄ ▀▀█ █▄█▄ ▄██▄ █▄█▄ ▄██▄ ") - print(" █ █ █▀ █ █ █ █ █▀ █ ▄█ █▀ █ █ █ █▀ █▄▄▀ ") - print(" ▀██▀ █ █ █ ▀██▀ █ █ ███ █ █ ▀█▀█ █ ▀▄▄▄ ") - print(self.C_RESET) + """ + Raw ASCII art example: + ╭──────────────────────────────────────────╮ + │ * ▄▄████▄▄ * │ + │ ▄████▀▀████▄ * │ + │ ▀▀█▀ ▀██▄ │ + │ * ▄█▄ ▀██▄ │ + │ ▄█████▄ ███ -+- │ + │ ███ ▀█████▀ │ + │ ▀██▄ ▀█▀ │ + │ * ▀██▄ ▄█▄▄ * │ + │ * ▀████▄▄████▀ │ + │ ▀▀████▀▀ │ + │ -+- * │ + │ ▄▀▄ ▄▀▀ █ │ + │ █ █ ▀ ▀▄ █ │ + │ █ █ █▀▄ █ ▄▀▄ █▀▄ ▀▄ █▀▄ ▄▀▄ █▄▀ ▄█▄ │ + │ ▀▄▀ █ █ █ ▀▄▀ █ █ ▄▄▀ █ █ ▀▄█ █ ▀▄▄ │ + │ │ + │ v2.3.1 https://onionshare.org/ │ + ╰──────────────────────────────────────────╯ + """ + + print( + self.C_BG_PURPLE + + self.C_LIGHTGRAY + + "╭──────────────────────────────────────────╮" + + self.C_RESET + ) + print( + self.C_BG_PURPLE + + self.C_LIGHTGRAY + + "│" + + self.C_LIGHTPURPLE + + " * " + + self.C_WHITE + + "▄▄████▄▄" + + self.C_LIGHTPURPLE + + " * " + + self.C_LIGHTGRAY + + "│" + + self.C_RESET + ) + print( + self.C_BG_PURPLE + + self.C_LIGHTGRAY + + "│" + + self.C_WHITE + + " ▄████▀▀████▄" + + self.C_LIGHTPURPLE + + " * " + + self.C_LIGHTGRAY + + "│" + + self.C_RESET + ) + print( + self.C_BG_PURPLE + + self.C_LIGHTGRAY + + "│" + + self.C_WHITE + + " ▀▀█▀ ▀██▄ " + + self.C_LIGHTGRAY + + "│" + + self.C_RESET + ) + print( + self.C_BG_PURPLE + + self.C_LIGHTGRAY + + "│" + + self.C_LIGHTPURPLE + + " * " + + self.C_WHITE + + "▄█▄ ▀██▄ " + + self.C_LIGHTGRAY + + "│" + + self.C_RESET + ) + print( + self.C_BG_PURPLE + + self.C_LIGHTGRAY + + "│" + + self.C_WHITE + + " ▄█████▄ ███" + + self.C_LIGHTPURPLE + + " -+- " + + self.C_LIGHTGRAY + + "│" + + self.C_RESET + ) + print( + self.C_BG_PURPLE + + self.C_LIGHTGRAY + + "│" + + self.C_WHITE + + " ███ ▀█████▀ " + + self.C_LIGHTGRAY + + "│" + + self.C_RESET + ) + print( + self.C_BG_PURPLE + + self.C_LIGHTGRAY + + "│" + + self.C_WHITE + + " ▀██▄ ▀█▀ " + + self.C_LIGHTGRAY + + "│" + + self.C_RESET + ) + print( + self.C_BG_PURPLE + + self.C_LIGHTGRAY + + "│" + + self.C_LIGHTPURPLE + + " * " + + self.C_WHITE + + "▀██▄ ▄█▄▄" + + self.C_LIGHTPURPLE + + " * " + + self.C_LIGHTGRAY + + "│" + + self.C_RESET + ) + print( + self.C_BG_PURPLE + + self.C_LIGHTGRAY + + "│" + + self.C_LIGHTPURPLE + + " * " + + self.C_WHITE + + "▀████▄▄████▀ " + + self.C_LIGHTGRAY + + "│" + + self.C_RESET + ) + print( + self.C_BG_PURPLE + + self.C_LIGHTGRAY + + "│" + + self.C_WHITE + + " ▀▀████▀▀ " + + self.C_LIGHTGRAY + + "│" + + self.C_RESET + ) + print( + self.C_BG_PURPLE + + self.C_LIGHTGRAY + + "│" + + self.C_LIGHTPURPLE + + " -+- * " + + self.C_LIGHTGRAY + + "│" + + self.C_RESET + ) + print( + self.C_BG_PURPLE + + self.C_LIGHTGRAY + + "│" + + self.C_WHITE + + " ▄▀▄ ▄▀▀ █ " + + self.C_LIGHTGRAY + + "│" + + self.C_RESET + ) + print( + self.C_BG_PURPLE + + self.C_LIGHTGRAY + + "│" + + self.C_WHITE + + " █ █ ▀ ▀▄ █ " + + self.C_LIGHTGRAY + + "│" + + self.C_RESET + ) + print( + self.C_BG_PURPLE + + self.C_LIGHTGRAY + + "│" + + self.C_WHITE + + " █ █ █▀▄ █ ▄▀▄ █▀▄ ▀▄ █▀▄ ▄▀▄ █▄▀ ▄█▄ " + + self.C_LIGHTGRAY + + "│" + + self.C_RESET + ) + print( + self.C_BG_PURPLE + + self.C_LIGHTGRAY + + "│" + + self.C_WHITE + + " ▀▄▀ █ █ █ ▀▄▀ █ █ ▄▄▀ █ █ ▀▄█ █ ▀▄▄ " + + self.C_LIGHTGRAY + + "│" + + self.C_RESET + ) + print( + self.C_BG_PURPLE + + self.C_LIGHTGRAY + + "│ │" + + self.C_RESET + ) + print( + self.C_BG_PURPLE + + self.C_LIGHTGRAY + + "│" + + self.C_LIGHTGRAY + + f" v{self.version}{' '*(16-len(self.version))}https://onionshare.org/ " + + self.C_LIGHTGRAY + + "│" + + self.C_RESET + ) + print( + self.C_BG_PURPLE + + self.C_LIGHTGRAY + + "╰──────────────────────────────────────────╯" + + self.C_RESET + ) + print() def load_settings(self, config=None): """ @@ -166,7 +355,7 @@ class Common: try: appdata = os.environ["APPDATA"] onionshare_data_dir = f"{appdata}\\OnionShare" - except: + except Exception: # If for some reason we don't have the 'APPDATA' environment variable # (like running tests in Linux while pretending to be in Windows) onionshare_data_dir = os.path.expanduser("~/.config/onionshare") @@ -293,7 +482,7 @@ class Common: try: tmpsock.bind(("127.0.0.1", random.randint(min_port, max_port))) break - except OSError as e: + except OSError: pass _, port = tmpsock.getsockname() return port -- cgit v1.2.3-54-g00ecf From b8d43ab8ceeda36f41c7b8a837696699078cd535 Mon Sep 17 00:00:00 2001 From: Micah Lee Date: Wed, 28 Apr 2021 20:25:42 -0700 Subject: Center the version and URL --- cli/onionshare_cli/common.py | 98 +++++++++++++++++++++++++++----------------- 1 file changed, 60 insertions(+), 38 deletions(-) (limited to 'cli') diff --git a/cli/onionshare_cli/common.py b/cli/onionshare_cli/common.py index c264f79f..f0c562ca 100644 --- a/cli/onionshare_cli/common.py +++ b/cli/onionshare_cli/common.py @@ -67,31 +67,33 @@ class Common: def display_banner(self): """ Raw ASCII art example: - ╭──────────────────────────────────────────╮ - │ * ▄▄████▄▄ * │ - │ ▄████▀▀████▄ * │ - │ ▀▀█▀ ▀██▄ │ - │ * ▄█▄ ▀██▄ │ - │ ▄█████▄ ███ -+- │ - │ ███ ▀█████▀ │ - │ ▀██▄ ▀█▀ │ - │ * ▀██▄ ▄█▄▄ * │ - │ * ▀████▄▄████▀ │ - │ ▀▀████▀▀ │ - │ -+- * │ - │ ▄▀▄ ▄▀▀ █ │ - │ █ █ ▀ ▀▄ █ │ - │ █ █ █▀▄ █ ▄▀▄ █▀▄ ▀▄ █▀▄ ▄▀▄ █▄▀ ▄█▄ │ - │ ▀▄▀ █ █ █ ▀▄▀ █ █ ▄▄▀ █ █ ▀▄█ █ ▀▄▄ │ - │ │ - │ v2.3.1 https://onionshare.org/ │ - ╰──────────────────────────────────────────╯ + ╭───────────────────────────────────────────╮ + │ * ▄▄█████▄▄ * │ + │ ▄████▀▀▀████▄ * │ + │ ▀▀█▀ ▀██▄ │ + │ * ▄█▄ ▀██▄ │ + │ ▄█████▄ ███ -+- │ + │ ███ ▀█████▀ │ + │ ▀██▄ ▀█▀ │ + │ * ▀██▄ ▄█▄▄ * │ + │ * ▀████▄▄▄████▀ │ + │ ▀▀█████▀▀ │ + │ -+- * │ + │ ▄▀▄ ▄▀▀ █ │ + │ █ █ ▀ ▀▄ █ │ + │ █ █ █▀▄ █ ▄▀▄ █▀▄ ▀▄ █▀▄ ▄▀▄ █▄▀ ▄█▄ │ + │ ▀▄▀ █ █ █ ▀▄▀ █ █ ▄▄▀ █ █ ▀▄█ █ ▀▄▄ │ + │ │ + │ v2.3.1 │ + │ │ + │ https://onionshare.org/ │ + ╰───────────────────────────────────────────╯ """ print( self.C_BG_PURPLE + self.C_LIGHTGRAY - + "╭──────────────────────────────────────────╮" + + "╭───────────────────────────────────────────╮" + self.C_RESET ) print( @@ -101,7 +103,7 @@ class Common: + self.C_LIGHTPURPLE + " * " + self.C_WHITE - + "▄▄████▄▄" + + "▄▄█████▄▄" + self.C_LIGHTPURPLE + " * " + self.C_LIGHTGRAY @@ -113,7 +115,7 @@ class Common: + self.C_LIGHTGRAY + "│" + self.C_WHITE - + " ▄████▀▀████▄" + + " ▄████▀▀▀████▄" + self.C_LIGHTPURPLE + " * " + self.C_LIGHTGRAY @@ -125,7 +127,7 @@ class Common: + self.C_LIGHTGRAY + "│" + self.C_WHITE - + " ▀▀█▀ ▀██▄ " + + " ▀▀█▀ ▀██▄ " + self.C_LIGHTGRAY + "│" + self.C_RESET @@ -137,7 +139,7 @@ class Common: + self.C_LIGHTPURPLE + " * " + self.C_WHITE - + "▄█▄ ▀██▄ " + + "▄█▄ ▀██▄ " + self.C_LIGHTGRAY + "│" + self.C_RESET @@ -147,7 +149,7 @@ class Common: + self.C_LIGHTGRAY + "│" + self.C_WHITE - + " ▄█████▄ ███" + + " ▄█████▄ ███" + self.C_LIGHTPURPLE + " -+- " + self.C_LIGHTGRAY @@ -159,7 +161,7 @@ class Common: + self.C_LIGHTGRAY + "│" + self.C_WHITE - + " ███ ▀█████▀ " + + " ███ ▀█████▀ " + self.C_LIGHTGRAY + "│" + self.C_RESET @@ -169,7 +171,7 @@ class Common: + self.C_LIGHTGRAY + "│" + self.C_WHITE - + " ▀██▄ ▀█▀ " + + " ▀██▄ ▀█▀ " + self.C_LIGHTGRAY + "│" + self.C_RESET @@ -181,7 +183,7 @@ class Common: + self.C_LIGHTPURPLE + " * " + self.C_WHITE - + "▀██▄ ▄█▄▄" + + "▀██▄ ▄█▄▄" + self.C_LIGHTPURPLE + " * " + self.C_LIGHTGRAY @@ -195,7 +197,7 @@ class Common: + self.C_LIGHTPURPLE + " * " + self.C_WHITE - + "▀████▄▄████▀ " + + "▀████▄▄▄████▀ " + self.C_LIGHTGRAY + "│" + self.C_RESET @@ -205,7 +207,7 @@ class Common: + self.C_LIGHTGRAY + "│" + self.C_WHITE - + " ▀▀████▀▀ " + + " ▀▀█████▀▀ " + self.C_LIGHTGRAY + "│" + self.C_RESET @@ -215,7 +217,7 @@ class Common: + self.C_LIGHTGRAY + "│" + self.C_LIGHTPURPLE - + " -+- * " + + " -+- * " + self.C_LIGHTGRAY + "│" + self.C_RESET @@ -225,7 +227,7 @@ class Common: + self.C_LIGHTGRAY + "│" + self.C_WHITE - + " ▄▀▄ ▄▀▀ █ " + + " ▄▀▄ ▄▀▀ █ " + self.C_LIGHTGRAY + "│" + self.C_RESET @@ -235,7 +237,7 @@ class Common: + self.C_LIGHTGRAY + "│" + self.C_WHITE - + " █ █ ▀ ▀▄ █ " + + " █ █ ▀ ▀▄ █ " + self.C_LIGHTGRAY + "│" + self.C_RESET @@ -245,7 +247,7 @@ class Common: + self.C_LIGHTGRAY + "│" + self.C_WHITE - + " █ █ █▀▄ █ ▄▀▄ █▀▄ ▀▄ █▀▄ ▄▀▄ █▄▀ ▄█▄ " + + " █ █ █▀▄ █ ▄▀▄ █▀▄ ▀▄ █▀▄ ▄▀▄ █▄▀ ▄█▄ " + self.C_LIGHTGRAY + "│" + self.C_RESET @@ -255,7 +257,7 @@ class Common: + self.C_LIGHTGRAY + "│" + self.C_WHITE - + " ▀▄▀ █ █ █ ▀▄▀ █ █ ▄▄▀ █ █ ▀▄█ █ ▀▄▄ " + + " ▀▄▀ █ █ █ ▀▄▀ █ █ ▄▄▀ █ █ ▀▄█ █ ▀▄▄ " + self.C_LIGHTGRAY + "│" + self.C_RESET @@ -263,15 +265,19 @@ class Common: print( self.C_BG_PURPLE + self.C_LIGHTGRAY - + "│ │" + + "│ │" + self.C_RESET ) + left_spaces = (43 - len(self.version) - 1) // 2 + right_spaces = left_spaces + if left_spaces + len(self.version) + right_spaces < 43: + right_spaces += 1 print( self.C_BG_PURPLE + self.C_LIGHTGRAY + "│" + self.C_LIGHTGRAY - + f" v{self.version}{' '*(16-len(self.version))}https://onionshare.org/ " + + f"{' '*left_spaces}v{self.version}{' '*right_spaces}" + self.C_LIGHTGRAY + "│" + self.C_RESET @@ -279,7 +285,23 @@ class Common: print( self.C_BG_PURPLE + self.C_LIGHTGRAY - + "╰──────────────────────────────────────────╯" + + "│ │" + + self.C_RESET + ) + print( + self.C_BG_PURPLE + + self.C_LIGHTGRAY + + "│" + + self.C_LIGHTGRAY + + " https://onionshare.org/ " + + self.C_LIGHTGRAY + + "│" + + self.C_RESET + ) + print( + self.C_BG_PURPLE + + self.C_LIGHTGRAY + + "╰───────────────────────────────────────────╯" + self.C_RESET ) print() -- cgit v1.2.3-54-g00ecf