Merge branch 'dev' into bugfix/fans-button-not-clickable

Author: HugoCLSC

BlocksScreen/helper_methods.py

@@ -324,3 +324,32 @@ def check_file_on_path(
     """Check if file exists on path. Returns true if file exists on that specified directory"""
     _filepath = os.path.join(path, filename)
     return os.path.exists(_filepath)
+
+
+def get_file_loc(filename) -> pathlib.Path: ...
+
+
+def get_file_name(filename: typing.Optional[str]) -> str:
+    # If filename is None or empty, return empty string instead of None
+    if not filename:
+        return ""
+    # Remove trailing slashes or backslashes
+    filename = filename.rstrip("/\\")
+
+    # Normalize Windows backslashes to forward slashes
+    filename = filename.replace("\\", "/")
+
+    parts = filename.split("/")
+
+    # Split and return the last path component
+    return parts[-1] if filename else ""
+
+
+# def get_hash(data) -> hashlib._Hash:
+#     hash = hashlib.sha256()
+#     hash.update(data.encode())
+#     hash.digest()
+#     return hash
+
+
+def digest_hash() -> None: ...

BlocksScreen/lib/files.py

@@ -54,14 +54,12 @@ def __init__(
 
     @property
     def file_list(self):
-        """Get the current list of files"""
+        """Available files list"""
         return self.files
 
     def handle_message_received(self, method: str, data, params: dict) -> None:
         """Handle file related messages received by moonraker"""
         if "server.files.list" in method:
-            # Get all files in root and its subdirectories and
-            # request their metadata
             self.files.clear()
             self.files = data
             [self.request_file_metadata.emit(item["path"]) for item in self.files]
@@ -73,8 +71,6 @@ def handle_message_received(self, method: str, data, params: dict) -> None:
             else:
                 self.files_metadata[data["filename"]] = data
         elif "server.files.get_directory" in method:
-            # Emit here the files for each directory so the
-            # ui can build the files list
             self.directories = data.get("dirs", {})
             self.files.clear()
             self.files = data.get("files", [])
@@ -99,7 +95,7 @@ def on_request_fileinfo(self, filename: str) -> None:
         """Requests metadata for a file
 
         Args:
-            filename (str): file
+            filename (str): file to get metadata from
         """
         _data: dict = {
             "thumbnail_images": list,
@@ -134,7 +130,6 @@ def on_request_fileinfo(self, filename: str) -> None:
         )
         _thumbnail_images = list(map(lambda path: QtGui.QImage(path), _thumbnail_paths))
         _data.update({"thumbnail_images": _thumbnail_images})
-
         _data.update({"filament_total": _file_metadata.get("filament_total", "?")})
         _data.update({"estimated_time": _file_metadata.get("estimated_time", 0)})
         _data.update({"layer_count": _file_metadata.get("layer_count", -1.0)})
@@ -165,18 +160,15 @@ def on_request_fileinfo(self, filename: str) -> None:
         self.fileinfo.emit(_data)
 
     def eventFilter(self, a0: QtCore.QObject, a1: QtCore.QEvent) -> bool:
-        """Filter Klippy related events"""
+        """Handle Websocket and Klippy events"""
+        if a1.type() == events.WebSocketOpen.type():
+            self.request_file_list.emit()
+            self.request_dir_info[str, bool].emit("", False)
+            return False
         if a1.type() == events.KlippyDisconnected.type():
             self.files_metadata.clear()
             self.files.clear()
             return False
-        if a1.type() == events.KlippyReady.type():
-            # Request all files including in subdirectories
-            # in order to get all metadata
-            self.request_file_list.emit()
-            # List and directory build is depended only on this signal
-            self.request_dir_info[str, bool].emit("", False)
-            return False
         return super().eventFilter(a0, a1)
 
     def event(self, a0: QtCore.QEvent) -> bool:

BlocksScreen/lib/panels/widgets/babystepPage.py

@@ -3,7 +3,7 @@
 from lib.utils.blocks_button import BlocksCustomButton
 from lib.utils.blocks_label import BlocksLabel
 from lib.utils.icon_button import IconButton
-from lib.utils.group_button import GroupButton
+from lib.utils.check_button import BlocksCustomCheckButton
 from PyQt6 import QtCore, QtGui, QtWidgets
 
 
@@ -212,7 +212,7 @@ def setupUI(self):
         self.bbp_offset_steps_buttons.setObjectName("bbp_offset_steps_buttons")
 
         # 0.1mm button
-        self.bbp_nozzle_offset_1 = GroupButton(
+        self.bbp_nozzle_offset_1 = BlocksCustomCheckButton(
             parent=self.bbp_offset_steps_buttons_group_box
         )
         self.bbp_nozzle_offset_1.setMinimumSize(QtCore.QSize(100, 70))
@@ -237,7 +237,7 @@ def setupUI(self):
         # Line separator for 0.1mm - set size policy to expanding horizontally
 
         # 0.01mm button
-        self.bbp_nozzle_offset_01 = GroupButton(
+        self.bbp_nozzle_offset_01 = BlocksCustomCheckButton(
             parent=self.bbp_offset_steps_buttons_group_box
         )
         self.bbp_nozzle_offset_01.setMinimumSize(QtCore.QSize(100, 70))
@@ -261,7 +261,7 @@ def setupUI(self):
         )
 
         # 0.05mm button
-        self.bbp_nozzle_offset_05 = GroupButton(
+        self.bbp_nozzle_offset_05 = BlocksCustomCheckButton(
             parent=self.bbp_offset_steps_buttons_group_box
         )
         self.bbp_nozzle_offset_05.setMinimumSize(QtCore.QSize(100, 70))
@@ -285,7 +285,7 @@ def setupUI(self):
         )
 
         # 0.025mm button
-        self.bbp_nozzle_offset_025 = GroupButton(
+        self.bbp_nozzle_offset_025 = BlocksCustomCheckButton(
             parent=self.bbp_offset_steps_buttons_group_box
         )
         self.bbp_nozzle_offset_025.setMinimumSize(QtCore.QSize(100, 70))

BlocksScreen/lib/panels/widgets/confirmPage.py

@@ -11,7 +11,7 @@
 
 class ConfirmWidget(QtWidgets.QWidget):
     on_accept: typing.ClassVar[QtCore.pyqtSignal] = QtCore.pyqtSignal(
-        str, list, name="on_accept"
+        str, name="on_accept"
     )
     request_back: typing.ClassVar[QtCore.pyqtSignal] = QtCore.pyqtSignal(
         name="request-back"
@@ -31,7 +31,7 @@ def __init__(self, parent) -> None:
         self.filename = ""
         self.confirm_button.clicked.connect(
             lambda: self.on_accept.emit(
-                str(os.path.join(self.directory, self.filename)), self._thumbnails
+                str(os.path.join(self.directory, self.filename))
             )
         )
         self.back_btn.clicked.connect(self.request_back.emit)