Frontend fixes

Fix #98 + print exceptions from frontend (debug of #97).

uldlib/cmd.py

@@ -42,6 +42,8 @@ def run():
 
     # Register sigint handler
     def sigint_handler(sig, frame):
+        if d.terminating:
+            return  # Already terminating
         d.terminate()
         print('Program terminated.')
         sys.exit(1)

uldlib/downloader.py

@@ -241,7 +241,7 @@ def download(self, url, parts=10, target_dir="", conn_timeout=DEFAULT_CONN_TIMEO
 
         self.frontend_thread = threading.Thread(
             target=self.frontend.run,
-            args=(info, downloads, self.stop_frontend)
+            args=(info, downloads, self.stop_frontend, self.terminate)
         )
         self.frontend_thread.start()
 

uldlib/frontend.py

@@ -1,6 +1,6 @@
-
 from abc import abstractmethod
 from datetime import timedelta
+from traceback import print_exc
 import colors
 import os
 import sys
@@ -41,7 +41,7 @@ def prompt(self, msg: str, level: LogLevel = LogLevel.INFO) -> str:
         pass
 
     @abstractmethod
-    def run(self, parts: List[DownloadPart], stop_event: threading.Event):
+    def run(self, parts: List[DownloadPart], stop_event: threading.Event, terminate_func):
         pass
 
 
@@ -106,7 +106,20 @@ def _color(text: str, level: LogLevel) -> str:
             return colors.green(text)
         return text
 
-    def run(self, info: DownloadInfo, parts: List[DownloadPart], stop_event: threading.Event):
+    def run(self, info: DownloadInfo, parts: List[DownloadPart], stop_event: threading.Event, terminate_func):
+        try:
+            self._loop(info, parts, stop_event)
+        except Exception:
+            if self.cli_initialized:
+                y = info.parts + CLI_STATUS_STARTLINE + 4
+                sys.stdout.write("\033[{};{}H".format(y, 0))
+                sys.stdout.write("\033[?25h")  # show cursor
+                self.cli_initialized = False
+                print("")
+            print_exc()
+            terminate_func()
+
+    def _loop(self, info: DownloadInfo, parts: List[DownloadPart], stop_event: threading.Event):
         os.system('cls' if os.name == 'nt' else 'clear')
         sys.stdout.write("\033[?25l")  # hide cursor
         self.cli_initialized = True
@@ -125,6 +138,8 @@ def run(self, info: DownloadInfo, parts: List[DownloadPart], stop_event: threadi
             s_start += size
         last_bps = [(s_start, t_start)]
 
+        y = 0
+
         while True:
             if stop_event.is_set():
                 break