Multiple patches for the import Wizard (#1205)

* Wizard actually destroyed, any threads safely exited

* MacOS fixes

* Turn off 'Applying strategy: ...' prints for better thread stability

---------

Co-authored-by: marc-vdm <m.t.van.der.meide@cml.leidenuniv.nl>

Author: mrvisscher

activity_browser/bwutils/importers.py

@@ -81,7 +81,7 @@ def simple_automated_import(cls, filepath, db_name: str, relink: dict = None) ->
             obj.project_parameters, obj.database_parameters,
             any("parameters" in ds for ds in obj.data)
         ])
-        obj.apply_strategies()
+        obj.apply_strategies(verbose=False)
         if any(obj.unlinked) and relink:
             for db, new_db in relink.items():
                 if db == "(name missing)":

activity_browser/ui/wizards/db_import_wizard.py

@@ -53,6 +53,9 @@ def __init__(self, parent=None):
         self.downloader = ABEcoinventDownloader()
         self.setWindowTitle("Database Import Wizard")
         self.setWindowModality(QtCore.Qt.ApplicationModal)
+        self.setAttribute(QtCore.Qt.WA_DeleteOnClose)
+        self.setWindowFlags(QtCore.Qt.Sheet)
+        self.setOption(self.NoCancelButton, False)
 
         # Construct and bind pages.
         self.import_type_page = ImportTypePage(self)
@@ -85,10 +88,6 @@ def __init__(self, parent=None):
         # db import is done when finish button becomes active
         self.button(QtWidgets.QWizard.FinishButton).clicked.connect(self.cleanup)
 
-        # thread management
-        self.button(QtWidgets.QWizard.CancelButton).clicked.connect(self.cancel_thread)
-        self.button(QtWidgets.QWizard.CancelButton).clicked.connect(self.cancel_extraction)
-
         import_signals.connection_problem.connect(self.show_info)
         import_signals.import_failure.connect(self.show_info)
         import_signals.import_failure_detailed.connect(self.show_detailed)
@@ -104,20 +103,54 @@ def system_model(self):
     def update_downloader(self):
         self.downloader.version = self.version
         self.downloader.system_model = self.system_model
+    
+    def done(self, result: int):
+        """
+        Reimplementation of the QWizard.done method which is called when the wizard is done
+        or when the user cancels.
+        """
+        # indicate to the user that the click was succesful
+        self.button(QtWidgets.QWizard.CancelButton).setDisabled(True)
+
+        # cancel any running tasks
+        self.cancel_extraction()
+        self.cancel_thread()
+
+        # else just call done on super()
+        super().done(result)
 
     def closeEvent(self, event):
         """ Close event now behaves similarly to cancel, because of self.reject.
 
         This allows the import wizard to be reused, ie starts from the beginning
         """
-        self.cancel_thread()
         self.cancel_extraction()
+        self.cancel_thread()
         event.accept()
 
     def cancel_thread(self):
-        log.info('\nDatabase import interrupted!')
-        import_signals.cancel_sentinel = True
-        self.cleanup()
+        """Cancels the worker thread initiated by the import page"""
+        thread = self.import_page.main_worker_thread
+        dispatcher = self.thread().eventDispatcher()
+
+        # show the user we're working on something within the wizard
+        self.setCursor(QtCore.Qt.WaitCursor)
+
+        if thread.isRunning():
+            # flag an abort through the sentinel
+            import_signals.cancel_sentinel = True
+            # make sure the import page doesn't receive any last signals by the thread
+            import_signals.disconnect(self.import_page)
+            # signal the thread to exit when it can do so safely
+            thread.exit(1)
+
+        # block while the thread is still running
+        while thread.isRunning():
+            # make sure we stay responsive
+            dispatcher.processEvents(QtCore.QEventLoop.AllEvents)
+        
+        # return to normal
+        self.setCursor(QtCore.Qt.ArrowCursor)
 
     def cancel_extraction(self):
         process = getattr(self.downloader, "extraction_process", None)