From b5c68fa5ca63b6a592ac2cfb75179a83222d55ac Mon Sep 17 00:00:00 2001 From: Micah Lee Date: Mon, 12 Apr 2021 17:55:16 -0400 Subject: [PATCH 01/12] Add --title, and make it display the title in chat mode --- cli/onionshare_cli/__init__.py | 8 ++++++++ cli/onionshare_cli/mode_settings.py | 1 + cli/onionshare_cli/resources/templates/chat.html | 4 ++-- cli/onionshare_cli/web/chat_mode.py | 8 ++------ 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/cli/onionshare_cli/__init__.py b/cli/onionshare_cli/__init__.py index 1bd0582c..9e530c6c 100644 --- a/cli/onionshare_cli/__init__.py +++ b/cli/onionshare_cli/__init__.py @@ -143,6 +143,12 @@ def main(cwd=None): help="Filename of persistent session", ) # General args + parser.add_argument( + "--title", + metavar="TITLE", + default=None, + help="Set a title", + ) parser.add_argument( "--public", action="store_true", @@ -234,6 +240,7 @@ def main(cwd=None): connect_timeout = int(args.connect_timeout) config_filename = args.config persistent_filename = args.persistent + title = args.title public = bool(args.public) autostart_timer = int(args.autostart_timer) autostop_timer = int(args.autostop_timer) @@ -280,6 +287,7 @@ def main(cwd=None): if mode_settings.just_created: # This means the mode settings were just created, not loaded from disk + mode_settings.set("general", "title", title) mode_settings.set("general", "public", public) mode_settings.set("general", "autostart_timer", autostart_timer) mode_settings.set("general", "autostop_timer", autostop_timer) diff --git a/cli/onionshare_cli/mode_settings.py b/cli/onionshare_cli/mode_settings.py index c2e5e6cd..9ebf8e61 100644 --- a/cli/onionshare_cli/mode_settings.py +++ b/cli/onionshare_cli/mode_settings.py @@ -42,6 +42,7 @@ class ModeSettings: }, "persistent": {"mode": None, "enabled": False}, "general": { + "title": None, "public": False, "autostart_timer": False, "autostop_timer": False, diff --git a/cli/onionshare_cli/resources/templates/chat.html b/cli/onionshare_cli/resources/templates/chat.html index b4443c09..7156d58c 100644 --- a/cli/onionshare_cli/resources/templates/chat.html +++ b/cli/onionshare_cli/resources/templates/chat.html @@ -2,7 +2,7 @@ - OnionShare + {% if title %}{{ title }}{% else %}OnionShare Chat{% endif %} @@ -11,7 +11,7 @@
-

OnionShare

+

{% if title %}{{ title }}{% else %}OnionShare Chat{% endif %}