diff options
| author | Micah Lee <micah@micahflee.com> | 2021-04-26 19:29:18 -0700 |
|---|---|---|
| committer | Micah Lee <micah@micahflee.com> | 2021-04-26 19:29:18 -0700 |
| commit | ee3761af6cdc7d2a71e194415902063e016e761c (patch) | |
| tree | 652989cc8f0473933128ddcee359c219db478ab7 | |
| parent | dac508d06e25529e115e3769c66199aa5308a5b0 (diff) | |
| download | onionshare-ee3761af6cdc7d2a71e194415902063e016e761c.tar.gz onionshare-ee3761af6cdc7d2a71e194415902063e016e761c.zip | |
Move graphical banner into common, and display it in GUI too
| -rw-r--r-- | cli/onionshare_cli/__init__.py | 34 | ||||
| -rw-r--r-- | cli/onionshare_cli/common.py | 33 | ||||
| -rw-r--r-- | desktop/src/onionshare/__init__.py | 4 |
3 files changed, 35 insertions, 36 deletions
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) |