diff options
| author | Micah Lee <micah@micahflee.com> | 2021-11-15 18:16:10 -0800 |
|---|---|---|
| committer | Micah Lee <micah@micahflee.com> | 2021-11-15 18:16:10 -0800 |
| commit | 267e9eb1e43bb188e8925caecb71914130fb266f (patch) | |
| tree | edf14ecdce0c357147d1239c4c8ff30499b7f1fe /cli | |
| parent | a4db0d26c96bd66be8f3017ddd44a5c7d7792fc2 (diff) | |
| download | onionshare-267e9eb1e43bb188e8925caecb71914130fb266f.tar.gz onionshare-267e9eb1e43bb188e8925caecb71914130fb266f.zip | |
Exception handling on printing the banner
Diffstat (limited to 'cli')
| -rw-r--r-- | cli/onionshare_cli/common.py | 393 |
1 files changed, 201 insertions, 192 deletions
diff --git a/cli/onionshare_cli/common.py b/cli/onionshare_cli/common.py index 4333d2d5..a705809b 100644 --- a/cli/onionshare_cli/common.py +++ b/cli/onionshare_cli/common.py @@ -87,197 +87,206 @@ class Common: ╰───────────────────────────────────────────╯ """ - if self.platform == "Windows": - pass - else: - pass - - print( - Back.MAGENTA + Fore.WHITE + "╭───────────────────────────────────────────╮" - ) - print( - Back.MAGENTA - + Fore.WHITE - + "│" - + Fore.LIGHTMAGENTA_EX - + " * " - + Fore.WHITE - + "▄▄█████▄▄" - + Fore.LIGHTMAGENTA_EX - + " * " - + Fore.WHITE - + "│" - ) - print( - Back.MAGENTA - + Fore.WHITE - + "│" - + Fore.WHITE - + " ▄████▀▀▀████▄" - + Fore.LIGHTMAGENTA_EX - + " * " - + Fore.WHITE - + "│" - ) - print( - Back.MAGENTA - + Fore.WHITE - + "│" - + Fore.WHITE - + " ▀▀█▀ ▀██▄ " - + Fore.WHITE - + "│" - ) - print( - Back.MAGENTA - + Fore.WHITE - + "│" - + Fore.LIGHTMAGENTA_EX - + " * " - + Fore.WHITE - + "▄█▄ ▀██▄ " - + Fore.WHITE - + "│" - ) - print( - Back.MAGENTA - + Fore.WHITE - + "│" - + Fore.WHITE - + " ▄█████▄ ███" - + Fore.LIGHTMAGENTA_EX - + " -+- " - + Fore.WHITE - + "│" - ) - print( - Back.MAGENTA - + Fore.WHITE - + "│" - + Fore.WHITE - + " ███ ▀█████▀ " - + Fore.WHITE - + "│" - ) - print( - Back.MAGENTA - + Fore.WHITE - + "│" - + Fore.WHITE - + " ▀██▄ ▀█▀ " - + Fore.WHITE - + "│" - ) - print( - Back.MAGENTA - + Fore.WHITE - + "│" - + Fore.LIGHTMAGENTA_EX - + " * " - + Fore.WHITE - + "▀██▄ ▄█▄▄" - + Fore.LIGHTMAGENTA_EX - + " * " - + Fore.WHITE - + "│" - ) - print( - Back.MAGENTA - + Fore.WHITE - + "│" - + Fore.LIGHTMAGENTA_EX - + " * " - + Fore.WHITE - + "▀████▄▄▄████▀ " - + Fore.WHITE - + "│" - ) - print( - Back.MAGENTA - + Fore.WHITE - + "│" - + Fore.WHITE - + " ▀▀█████▀▀ " - + Fore.WHITE - + "│" - ) - print( - Back.MAGENTA - + Fore.WHITE - + "│" - + Fore.LIGHTMAGENTA_EX - + " -+- * " - + Fore.WHITE - + "│" - ) - print( - Back.MAGENTA - + Fore.WHITE - + "│" - + Fore.WHITE - + " ▄▀▄ ▄▀▀ █ " - + Fore.WHITE - + "│" - ) - print( - Back.MAGENTA - + Fore.WHITE - + "│" - + Fore.WHITE - + " █ █ ▀ ▀▄ █ " - + Fore.WHITE - + "│" - ) - print( - Back.MAGENTA - + Fore.WHITE - + "│" - + Fore.WHITE - + " █ █ █▀▄ █ ▄▀▄ █▀▄ ▀▄ █▀▄ ▄▀▄ █▄▀ ▄█▄ " - + Fore.WHITE - + "│" - ) - print( - Back.MAGENTA - + Fore.WHITE - + "│" - + Fore.WHITE - + " ▀▄▀ █ █ █ ▀▄▀ █ █ ▄▄▀ █ █ ▀▄█ █ ▀▄▄ " - + Fore.WHITE - + "│" - ) - print( - Back.MAGENTA + Fore.WHITE + "│ │" - ) - left_spaces = (43 - len(self.version) - 1) // 2 - right_spaces = left_spaces - if left_spaces + len(self.version) + 1 + right_spaces < 43: - right_spaces += 1 - print( - Back.MAGENTA - + Fore.WHITE - + "│" - + Fore.WHITE - + f"{' '*left_spaces}v{self.version}{' '*right_spaces}" - + Fore.WHITE - + "│" - ) - print( - Back.MAGENTA + Fore.WHITE + "│ │" - ) - print( - Back.MAGENTA - + Fore.WHITE - + "│" - + Fore.WHITE - + " https://onionshare.org/ " - + Fore.WHITE - + "│" - ) - print( - Back.MAGENTA + Fore.WHITE + "╰───────────────────────────────────────────╯" - ) - print() + try: + print( + Back.MAGENTA + + Fore.WHITE + + "╭───────────────────────────────────────────╮" + ) + print( + Back.MAGENTA + + Fore.WHITE + + "│" + + Fore.LIGHTMAGENTA_EX + + " * " + + Fore.WHITE + + "▄▄█████▄▄" + + Fore.LIGHTMAGENTA_EX + + " * " + + Fore.WHITE + + "│" + ) + print( + Back.MAGENTA + + Fore.WHITE + + "│" + + Fore.WHITE + + " ▄████▀▀▀████▄" + + Fore.LIGHTMAGENTA_EX + + " * " + + Fore.WHITE + + "│" + ) + print( + Back.MAGENTA + + Fore.WHITE + + "│" + + Fore.WHITE + + " ▀▀█▀ ▀██▄ " + + Fore.WHITE + + "│" + ) + print( + Back.MAGENTA + + Fore.WHITE + + "│" + + Fore.LIGHTMAGENTA_EX + + " * " + + Fore.WHITE + + "▄█▄ ▀██▄ " + + Fore.WHITE + + "│" + ) + print( + Back.MAGENTA + + Fore.WHITE + + "│" + + Fore.WHITE + + " ▄█████▄ ███" + + Fore.LIGHTMAGENTA_EX + + " -+- " + + Fore.WHITE + + "│" + ) + print( + Back.MAGENTA + + Fore.WHITE + + "│" + + Fore.WHITE + + " ███ ▀█████▀ " + + Fore.WHITE + + "│" + ) + print( + Back.MAGENTA + + Fore.WHITE + + "│" + + Fore.WHITE + + " ▀██▄ ▀█▀ " + + Fore.WHITE + + "│" + ) + print( + Back.MAGENTA + + Fore.WHITE + + "│" + + Fore.LIGHTMAGENTA_EX + + " * " + + Fore.WHITE + + "▀██▄ ▄█▄▄" + + Fore.LIGHTMAGENTA_EX + + " * " + + Fore.WHITE + + "│" + ) + print( + Back.MAGENTA + + Fore.WHITE + + "│" + + Fore.LIGHTMAGENTA_EX + + " * " + + Fore.WHITE + + "▀████▄▄▄████▀ " + + Fore.WHITE + + "│" + ) + print( + Back.MAGENTA + + Fore.WHITE + + "│" + + Fore.WHITE + + " ▀▀█████▀▀ " + + Fore.WHITE + + "│" + ) + print( + Back.MAGENTA + + Fore.WHITE + + "│" + + Fore.LIGHTMAGENTA_EX + + " -+- * " + + Fore.WHITE + + "│" + ) + print( + Back.MAGENTA + + Fore.WHITE + + "│" + + Fore.WHITE + + " ▄▀▄ ▄▀▀ █ " + + Fore.WHITE + + "│" + ) + print( + Back.MAGENTA + + Fore.WHITE + + "│" + + Fore.WHITE + + " █ █ ▀ ▀▄ █ " + + Fore.WHITE + + "│" + ) + print( + Back.MAGENTA + + Fore.WHITE + + "│" + + Fore.WHITE + + " █ █ █▀▄ █ ▄▀▄ █▀▄ ▀▄ █▀▄ ▄▀▄ █▄▀ ▄█▄ " + + Fore.WHITE + + "│" + ) + print( + Back.MAGENTA + + Fore.WHITE + + "│" + + Fore.WHITE + + " ▀▄▀ █ █ █ ▀▄▀ █ █ ▄▄▀ █ █ ▀▄█ █ ▀▄▄ " + + Fore.WHITE + + "│" + ) + print( + Back.MAGENTA + + Fore.WHITE + + "│ │" + ) + left_spaces = (43 - len(self.version) - 1) // 2 + right_spaces = left_spaces + if left_spaces + len(self.version) + 1 + right_spaces < 43: + right_spaces += 1 + print( + Back.MAGENTA + + Fore.WHITE + + "│" + + Fore.WHITE + + f"{' '*left_spaces}v{self.version}{' '*right_spaces}" + + Fore.WHITE + + "│" + ) + print( + Back.MAGENTA + + Fore.WHITE + + "│ │" + ) + print( + Back.MAGENTA + + Fore.WHITE + + "│" + + Fore.WHITE + + " https://onionshare.org/ " + + Fore.WHITE + + "│" + ) + print( + Back.MAGENTA + + Fore.WHITE + + "╰───────────────────────────────────────────╯" + ) + print() + except: + # If anything fails, print a boring banner + print(f"OnionShare v{self.version}") + print("https://onionshare.org/") + print() def load_settings(self, config=None): """ @@ -437,7 +446,7 @@ class Common: Returns True if OnionShare is running in a Flatpak sandbox """ return os.environ.get("FLATPAK_ID") == "org.onionshare.OnionShare" - + def is_snapcraft(self): """ Returns True if OnionShare is running in a Flatpak sandbox |