From aa57277ff81b23c390694eecf99bb78291837575 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Thu, 18 Aug 2016 08:39:19 +0200 Subject: [PATCH] Only report files as enqueued for analysis which actually are --- src/octoprint/filemanager/__init__.py | 4 ++-- src/octoprint/filemanager/analysis.py | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/octoprint/filemanager/__init__.py b/src/octoprint/filemanager/__init__.py index 184d8108..ec4d1eea 100644 --- a/src/octoprint/filemanager/__init__.py +++ b/src/octoprint/filemanager/__init__.py @@ -212,8 +212,8 @@ class FileManager(object): # we'll use the default printer profile for the backlog since we don't know better queue_entry = QueueEntry(entry, file_type, storage_type, path, self._printer_profile_manager.get_default()) - self._analysis_queue.enqueue(queue_entry, high_priority=False) - counter += 1 + if self._analysis_queue.enqueue(queue_entry, high_priority=False): + counter += 1 self._logger.info("Added {counter} items from storage type \"{storage_type}\" to analysis queue".format(**locals())) def add_storage(self, storage_type, storage_manager): diff --git a/src/octoprint/filemanager/analysis.py b/src/octoprint/filemanager/analysis.py index cd4ca7fd..95fdaa9b 100644 --- a/src/octoprint/filemanager/analysis.py +++ b/src/octoprint/filemanager/analysis.py @@ -68,9 +68,10 @@ class AnalysisQueue(object): def enqueue(self, entry, high_priority=False): if not entry.type in self._queues: - return + return False self._queues[entry.type].enqueue(entry, high_priority=high_priority) + return True def pause(self): for queue in self._queues.values():