improve download

Author: pyquick

oclp_r/support/network_handler.py

@@ -534,10 +534,9 @@ def stop(self) -> None:
         """
         Stop the download
 
-        If the download is active, this function will hold the thread until stopped
+        If the download is active, this function will hold the thread until stopped or timeout
         """
 
         self.should_stop = True
-        if self.active_thread:
-            while self.active_thread.is_alive():
-                time.sleep(1)
+        if self.active_thread and self.active_thread.is_alive():
+            self.active_thread.join(timeout=10)

oclp_r/wx_gui/gui_download.py

@@ -103,6 +103,14 @@ def terminate_download(self) -> None:
         if wx.MessageBox("Are you sure you want to cancel the download?", "Cancel Download", wx.YES_NO | wx.ICON_QUESTION | wx.NO_DEFAULT) == wx.YES:
             logging.info("User cancelled download")
             self.user_cancelled = True
-            self.download_obj.stop()
+            # Show a status message while stopping the download
+            status_dialog = wx.MessageDialog(self.frame_modal, "Cancelling download, please wait...", "Cancelling", wx.CANCEL | wx.STAY_ON_TOP)
+            status_dialog.Show()
+            wx.Yield()
+            
+            try:
+                self.download_obj.stop()
+            finally:
+                status_dialog.Destroy()