diff options
author | Miguel Jacq <mig@mig5.net> | 2021-08-31 17:53:50 +1000 |
---|---|---|
committer | Miguel Jacq <mig@mig5.net> | 2021-08-31 17:53:50 +1000 |
commit | 686e5abd0e41999d4a57b9966381af4d0f37b28d (patch) | |
tree | ff67c786054917aadfd6baf012a7964ab5efca9d | |
parent | 3a07bbe16126c6b14fc7ff553d2ef441e959a333 (diff) | |
download | onionshare-686e5abd0e41999d4a57b9966381af4d0f37b28d.tar.gz onionshare-686e5abd0e41999d4a57b9966381af4d0f37b28d.zip |
Don't force mode to be sent in CLI if --persistent is in use. Store the persistent mode only the first time the persistent file is created
-rw-r--r-- | cli/onionshare_cli/__init__.py | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/cli/onionshare_cli/__init__.py b/cli/onionshare_cli/__init__.py index a359f770..4bc00929 100644 --- a/cli/onionshare_cli/__init__.py +++ b/cli/onionshare_cli/__init__.py @@ -201,15 +201,6 @@ def main(cwd=None): disable_csp = bool(args.disable_csp) verbose = bool(args.verbose) - if receive: - mode = "receive" - elif website: - mode = "website" - elif chat: - mode = "chat" - else: - mode = "share" - # Verbose mode? common.verbose = verbose @@ -223,16 +214,26 @@ def main(cwd=None): if persistent_filename: mode_settings = ModeSettings(common, persistent_filename) mode_settings.set("persistent", "enabled", True) - mode_settings.set("persistent", "mode", mode) else: mode_settings = ModeSettings(common) + if receive: + mode = "receive" + elif website: + mode = "website" + elif chat: + mode = "chat" + else: + mode = "share" + 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) + if persistent_filename: + mode_settings.set("persistent", "mode", mode) if mode == "share": mode_settings.set("share", "autostop_sharing", autostop_sharing) if mode == "receive": |