Add CloseSignals and StopError Exception

Author: oleksis

Threads/Download.py

@@ -1,11 +1,14 @@
 import math
 import os
-import sys
 
 import youtube_dl
 from PyQt5 import QtCore
 
 
+class StopError(Exception):
+    pass
+
+
 class DownloadSignals(QtCore.QObject):
     "Define the signals available from a running download thread"
 
@@ -40,6 +43,9 @@ def __init__(self, opts):
         self.signals = DownloadSignals()
 
     def hook(self, li):
+        if self.done:
+            raise StopError()
+
         if li.get('downloaded_bytes') is not None:
             if li.get('speed') is not None:
                 self.speed = self.format_speed(li.get('speed'))
@@ -117,6 +123,11 @@ def download(self):
                 self.signals.remove_row_signal.emit()
                 self.signals.remove_url_signal.emit(self.url)
                 self.signals.status_bar_signal.emit(str(e))
+            except StopError:
+                # import threading
+                # print("Exiting thread:", threading.currentThread().getName())
+                self.done = True
+                self.signals.finished.emit()  # Done
 
     @QtCore.pyqtSlot()
     def run(self):
@@ -144,6 +155,9 @@ def run(self):
         self.signals.remove_url_signal.emit(self.url)
         self.done = True
         self.signals.finished.emit()  # Done
+    
+    def stop(self):
+        self.done = True
 
     def format_seconds(self, seconds):
         (minutes, secs) = divmod(seconds, 60)

main.py

@@ -25,6 +25,12 @@
 desktop_path = os.path.join(os.path.expanduser('~'), "Desktop")
 
 
+class CloseSignals(QtCore.QObject):
+    "Define the signals available for close"
+    
+    closed = QtCore.pyqtSignal()
+
+
 class MainWindow(QtWidgets.QMainWindow):
     def __init__(self, parent=None, *args, **kwargs):
         super(MainWindow, self).__init__(parent, *args, **kwargs)
@@ -63,6 +69,7 @@ def __init__(self, parent=None, *args, **kwargs):
 
         self.about = AboutDialog(self)
         self.license = LicenseDialogue(self)
+        self.closing = CloseSignals()
         self.show()
 
     def set_connections(self):
@@ -184,6 +191,7 @@ def download_url(self, url, row = None):
         downloadThread.signals.remove_url_signal.connect(self.remove_url)
         downloadThread.signals.add_update_list_signal.connect(self.add_to_table)
         downloadThread.signals.remove_row_signal.connect(self.decrease_rowcount)
+        self.closing.closed.connect(downloadThread.stop)
         self.threadpool.start(downloadThread)
 
         self.ui.tabWidget.setCurrentIndex(2)
@@ -275,6 +283,7 @@ def closeEvent(self, event):
             self.kill_all_threads()
 
     def kill_all_threads(self):
+        self.closing.closed.emit()
         self.threadpool.waitForDone()
         self.close()