fix: only scan added files, not copied/moved

However, ensure the data gets refreshed regardless, by hooking into the next client side file list update after seeing a copy/move.
OctoPrint · Sep 24, 2024 · 7a5ad52 · 7a5ad52
1 parent e81830b
commit 7a5ad52
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/octoprint_file_check/__init__.py b/octoprint_file_check/__init__.py
@@ -75,7 +75,10 @@ def get_assets(self):
     ##~~ EventHandlerPlugin API
 
     def on_event(self, event, payload):
-        if event == octoprint.events.Events.FILE_ADDED:
+        if (
+            event == octoprint.events.Events.FILE_ADDED
+            and payload.get("operation", "add") == "add"
+        ):
             self._executor.submit(
                 self._validate_file, payload["storage"], payload["path"], payload["type"]
             )

diff --git a/octoprint_file_check/static/js/file_check.js b/octoprint_file_check/static/js/file_check.js
@@ -17,6 +17,8 @@ $(function () {
 
         self.issueNotification = undefined;
 
+        self.checkUpdateOnNextFileRefresh = false;
+
         const ISSUES = {
             travel_speed: {
                 title: gettext("Travel Speed Placeholder"),
@@ -233,6 +235,12 @@ $(function () {
             }
         };
 
+        self.onEventFileAdded = (payload) => {
+            if (payload.operation && payload.operation !== "add") {
+                self.checkUpdateOnNextFileRefresh = true;
+            }
+        };
+
         self._handleNotification = function (data) {
             let severity = "warning";
 
@@ -345,6 +353,13 @@ $(function () {
                     self.requestData();
                 }
             );
+
+            self.filesViewModel.allItems.subscribe(() => {
+                if (self.checkUpdateOnNextFileRefresh) {
+                    self.checkUpdateOnNextFileRefresh = false;
+                    self.requestData();
+                }
+            });
         };
 
         self.onUserLoggedIn = self.onUserLoggedOut = function () {