handle keyboard interrupt ctr-c properly

Author: firedm

firedm/FireDM.py

@@ -16,6 +16,7 @@
 import sys
 import argparse
 import re
+import signal
 
 # This code should stay on top to handle relative imports in case of direct call of FireDM.py
 if __package__ is None:
@@ -32,8 +33,8 @@
 from .controller import Controller, set_option
 from .tkview import MainWindow
 from .cmdview import CmdView
-from .utils import parse_urls, parse_bytes
-from .setting import get_user_settings, load_setting
+from .utils import parse_urls, parse_bytes, size_format
+from .setting import load_setting
 from .version import __version__
 
 
@@ -249,8 +250,9 @@ def speed(txt):
         help='Number of retries to download a file, default=%(default)s.')
     downloader.add_argument(
         '-l', '--speed-limit', dest='speed_limit',
-        type=speed, metavar='LIMIT', default=get_default("speed_limit"),
-        help='download speed limit, in bytes per second (e.g. 100K or 5M), zero means no limit, default=%(default)s.')
+        type=speed, metavar='LIMIT', default=config.speed_limit,
+        help=f'download speed limit, in bytes per second (e.g. 100K or 5M), zero means no limit, '
+             f'current value={size_format(config.speed_limit)}/s.')
     downloader.add_argument(
         '--concurrent', dest='max_concurrent_downloads',
         type=int, metavar='NUMBER', default=get_default("max_concurrent_downloads"),
@@ -350,9 +352,29 @@ def getversion(mod):
     # update config module with custom settings
     config.__dict__.update(custom_settings)
 
+    guimode = True if len(sys.argv) == 1 or args.gui else False
+    controller = None
+
+    def cleanup():
+        if guimode or args.persistent:
+            setting.save_setting()
+        controller.quit()
+
+    def signal_handler(signum, frame):
+        print('\n\nuser interrupt operation, cleanup ...')
+        signal.signal(signum, signal.SIG_IGN)  # ignore additional signals
+        cleanup()
+        sys.exit(0)
+
+    signal.signal(signal.SIGINT, signal_handler)
+
     # ------------------------------------------------------------------------------------------------------------------
     # if running application without arguments will start the gui, otherwise will run application in cmdline
-    if len(sys.argv) > 1 and not args.gui:
+    if guimode:
+        # GUI
+        controller = Controller(view_class=MainWindow, custom_settings=custom_settings)
+        controller.run()
+    else:
         config.log_level = 1
         controller = Controller(view_class=CmdView, custom_settings=custom_settings)
 
@@ -376,13 +398,7 @@ def getversion(mod):
 
         config.shutdown = True
 
-        if args.persistent:
-            setting.save_setting()
-    else:
-        # GUI
-        controller = Controller(view_class=MainWindow, custom_settings=custom_settings)
-        controller.run()
-        setting.save_setting()
+    cleanup()
 
 
 if __name__ == '__main__':

firedm/cmdview.py

@@ -29,6 +29,10 @@ def run(self):
         """intended to be used in gui as a mainloop not in terminal views"""
         pass
 
+    def quit(self):
+        """intended to be used in gui as a mainloop not in terminal views"""
+        pass
+
     def update_view(self, **kwargs):
         """update view"""
 

firedm/controller.py

@@ -1814,6 +1814,8 @@ def quit(self):
         for d in self.d_map.values():
             self.stop_download(d.uid)
 
+        self.view.quit()
+
         self._save_settings()
 
     def reset(self):

firedm/view.py

@@ -20,6 +20,11 @@ def run(self):
         """run view mainloop if any"""
         pass
 
+    @abstractmethod
+    def quit(self):
+        """quit view mainloop if any"""
+        pass
+
     @abstractmethod
     def update_view(self, **kwargs):
         """update view, it will be called automatically by controller, when a model changes