Startup: Add argument parser, option to enable debug output.

Author: mtwebster

bin/warpinator

@@ -1,20 +1,29 @@
 #!/usr/bin/python3
 
 import sys
+import argparse
+
 from gi.repository import Gio
 
-if len(sys.argv) > 1 and sys.argv[1] == "autostart":
+parser = argparse.ArgumentParser(description="Send and Receive Files across the Network")
+parser.add_argument("-d", "--debug", help="Print debugging information.",
+                    action="store_true")
+parser.add_argument("-a", "--autostart", help="Exit if (dconf) org.x.warpinator.preferences 'autostart' is false.",
+                    action="store_true")
+args = parser.parse_args()
+
+if args.autostart:
     settings = Gio.Settings(schema_id="org.x.warpinator.preferences")
     if not settings.get_boolean("autostart"):
         sys.exit(0)
 
-    del sys.argv[1]
+del sys.argv[1:]
 
 sys.path.insert(0, "/usr/libexec/warpinator/")
 
 try:
     import warpinator
-    sys.exit(warpinator.main())
+    sys.exit(warpinator.main(debug=args.debug))
 except Exception as e:
     print(e)
     sys.exit(1)

data/warpinator-autostart.desktop

@@ -6,6 +6,6 @@ Icon=warpinator
 
 # the autostart argument tells /usr/bin/warpinator to check our autostart gsettings key and either keeps
 # going or exits immediately.
-Exec=warpinator autostart
+Exec=warpinator --autostart
 
 Categories=GNOME;GTK;Utility;

src/server.py

@@ -266,7 +266,8 @@ def Ping(self, request, context):
         try:
             remote = self.remote_machines[request.id]
         except KeyError as e:
-            logging.warning("Received ping from unknown remote '%s': %s" % (request.readable_name, e))
+            logging.debug("Received ping from unknown remote (or not fully online yet) '%s': %s"
+                              % (request.readable_name, e))
             return void
 
         # If we receive a ping, assume no transfer is happening, set clear busy flag from our respective

src/warpinator.py

@@ -1312,18 +1312,20 @@ def send_status_icon_selection_to_machine(self, uri, remote_machine=None):
     def on_tray_icon_activate(self, icon, button, time):
         self.window.toggle_visibility(time)
 
-def main(test = False):
+def main(test=False, debug=False):
     import signal
 
     logging.basicConfig(format="%(asctime)-15s::warpinator::%(levelname)s: %(message)s -- %(filename)s (line %(lineno)d)")
-    logging.root.setLevel(logging.DEBUG)
-    args = sys.argv
 
-    w = WarpApplication(test)
+    if debug:
+        logging.root.setLevel(logging.DEBUG)
+    else:
+        logging.root.setLevel(logging.INFO)
 
+    w = WarpApplication(test)
     signal.signal(signal.SIGINT, lambda s, f: w.shutdown())
 
-    return w.run(args)
+    return w.run(sys.argv)
 
 if __name__ == "__main__":
     main()

testing/testrun

@@ -13,4 +13,4 @@ os.environ["GSETTINGS_BACKEND"] = "memory"
 sys.path.insert(0, "/usr/libexec/warpinator")
 
 import warpinator
-warpinator.main(True) # testmode
+warpinator.main(test=True)