Skip to content

Commit

Permalink
Add a --debug option
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
Denis Laxalde committed Nov 5, 2019
1 parent 52a68a9 commit 0961249
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 3 deletions.
4 changes: 3 additions & 1 deletion torbrowser_launcher/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand All @@ -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()
Expand Down
9 changes: 7 additions & 2 deletions torbrowser_launcher/launcher.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)

Expand Down

0 comments on commit 0961249

Please sign in to comment.