Merge remote-tracking branch 'origin/pr/5492'

misc/userscripts/tor_identity

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
-# Copyright 2018 jnphilipp <mail@jnphilipp.org>
+# Copyright 2018-2020 J. Nathanael Philipp (jnphilipp) <nathanael@philipp.land>
 #
 # This file is part of qutebrowser.
 #
@@ -30,6 +30,8 @@
 import os
 import sys
 
+from argparse import ArgumentParser
+
 try:
     from stem import Signal
     from stem.control import Controller
@@ -41,12 +43,19 @@ except ImportError:
         print('Failed to import stem.')
 
 
-password = sys.argv[1]
-with Controller.from_port(port=9051) as controller:
-    controller.authenticate(password)
-    controller.signal(Signal.NEWNYM)
-    if os.getenv('QUTE_FIFO'):
-        with open(os.environ['QUTE_FIFO'], 'w') as f:
-            f.write('message-info "Tor identity changed."')
-    else:
-        print('Tor identity changed.')
+if __name__ == '__main__':
+    parser = ArgumentParser(prog='tor_identity')
+    parser.add_argument('-c', '--control-port', default=9051,
+                        help='Tor control port (default 9051).')
+    parser.add_argument('-p', '--password', type=str, default=None,
+                        help='Tor control port password.')
+    args = parser.parse_args()
+
+    with Controller.from_port(port=args.control_port) as controller:
+        controller.authenticate(args.password)
+        controller.signal(Signal.NEWNYM)
+        if os.getenv('QUTE_FIFO'):
+            with open(os.environ['QUTE_FIFO'], 'w') as f:
+                f.write('message-info "Tor identity changed."')
+        else:
+            print('Tor identity changed.')