Add slot for .aboutToQuit the app, start transition to this cleanup

Author: HugoCLSC

BlocksScreen/BlocksScreen.py

@@ -3,7 +3,7 @@
 import typing
 
 from lib.panels.mainWindow import MainWindow
-from logger import setup_logging
+from logger import setup_logging, LogManager
 from PyQt6 import QtCore, QtGui, QtWidgets
 
 QtGui.QGuiApplication.setAttribute(
@@ -30,6 +30,11 @@ def show_splash(window: typing.Optional[QtWidgets.QWidget] = None):
         splash.finish(window)
 
 
+def on_quit() -> None:
+    logging.info("Final exit cleanup")
+    LogManager.shutdown()
+
+
 if __name__ == "__main__":
     setup_logging(
         filename="logs/BlocksScreen.log",
@@ -47,5 +52,6 @@ def show_splash(window: typing.Optional[QtWidgets.QWidget] = None):
     BlocksScreen.setDesktopFileName("BlocksScreen")
     main_window = MainWindow()
     BlocksScreen.processEvents()
+    BlocksScreen.aboutToQuit.connect(on_quit)
     main_window.show()
     sys.exit(BlocksScreen.exec())

BlocksScreen/devices/storage/usb_controller.py

@@ -53,6 +53,10 @@ def restart(self) -> None:
         self.udisks.close()
         self.need_restart = True
 
+    def close(self) -> None:
+        self.udisks.close()
+        self.deleteLater()
+
     def _handle_full_restart(self) -> None:
         if self.need_restart:
             self.udisks.start(self.udisks.Priority.InheritPriority)

BlocksScreen/lib/panels/mainWindow.py

@@ -29,7 +29,6 @@
 from lib.ui.resources.main_menu_resources_rc import *
 from lib.ui.resources.system_resources_rc import *
 from lib.ui.resources.top_bar_resources_rc import *
-from logger import LogManager
 from PyQt6 import QtCore, QtGui, QtWidgets
 from screensaver import ScreenSaver
 
@@ -786,15 +785,14 @@ def set_header_nozzle_diameter(self, diam: str):
         self.ui.nozzle_size_icon.setText(f"{diam}mm")
         self.ui.nozzle_size_icon.update()
 
-    def closeEvent(self, a0: typing.Optional[QtGui.QCloseEvent]) -> None:
+    def closeEvent(self, a0: QtGui.QCloseEvent | None) -> None:
         """Handles GUI closing"""
         try:
             self.networkPanel.close()
+            self.usb_manager.close()
         except Exception as e:
-            _logger.warning("Network panel shutdown error: %s", e)
-
+            _logger.warning("Error shutting down: %s", e)
         self.ws.wb_disconnect()
-        LogManager.shutdown()
         if a0 is None:
             return
         QtWidgets.QMainWindow.closeEvent(self, a0)