From 0961249d78e1360dd53e251d278a3d7b144a032d Mon Sep 17 00:00:00 2001 From: Denis Laxalde Date: Tue, 5 Nov 2019 14:55:56 +0100 Subject: [PATCH] Add a --debug option Add a --debug option which run "start-tor-browser" with --verbose option and without --detach. This makes the program run in the foreground and log underlying output to console. Closes #435. --- torbrowser_launcher/__init__.py | 4 +++- torbrowser_launcher/launcher.py | 9 +++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/torbrowser_launcher/__init__.py b/torbrowser_launcher/__init__.py index ce542a47..329dff5b 100644 --- a/torbrowser_launcher/__init__.py +++ b/torbrowser_launcher/__init__.py @@ -52,6 +52,8 @@ def main(): # Parse arguments parser = argparse.ArgumentParser() parser.add_argument('--settings', action='store_true', dest='settings', help='Open Tor Browser Launcher settings') + parser.add_argument('--debug', action='store_true', default=False, + help='Launch browser in debug mode (foreground, log to terminal)') parser.add_argument('url', nargs='*', help='URL to load') args = parser.parse_args() @@ -78,7 +80,7 @@ def main(): gui = Settings(common, app) else: # Launcher mode - gui = Launcher(common, app, url_list) + gui = Launcher(common, app, url_list, debug=args.debug) # Center the window desktop = app.desktop() diff --git a/torbrowser_launcher/launcher.py b/torbrowser_launcher/launcher.py index 6ee1b2c4..3d7ed49b 100644 --- a/torbrowser_launcher/launcher.py +++ b/torbrowser_launcher/launcher.py @@ -61,12 +61,13 @@ class Launcher(QtWidgets.QMainWindow): """ Launcher window. """ - def __init__(self, common, app, url_list): + def __init__(self, common, app, url_list, debug=False): super(Launcher, self).__init__() self.common = common self.app = app self.url_list = url_list + self.debug = debug self.force_redownload = False # This is the current version of Tor Browser, which should get updated with every release @@ -433,7 +434,11 @@ def run(self): return # Run Tor Browser - cmd = [self.common.paths['tbb']['start'], '--detach'] + cmd = [self.common.paths['tbb']['start']] + if self.debug: + cmd.append('--verbose') + else: + cmd.append('--detach') subprocess.call(cmd, cwd=self.common.paths['tbb']['dir_tbb']) sys.exit(0)