adding behaviour so total number of existing files is retained and does not change with the decorator

Author: LAShemilt

rfi_file_monitor/engines/file_watchdog_engine.py

@@ -146,13 +146,17 @@ def _search_for_existing_files(self, directory: Path) -> List[RegularFile]:
                         FileStatus.SAVED,
                     )
                     rv.append(_file)
+        GLib.idle_add(
+            self._engine._appwindow._queue_manager.get_total_files_in_path,
+            len(rv),
+            priority=GLib.PRIORITY_DEFAULT_IDLE,
+        )
 
         return rv
 
     @do_bulk_upload
     def process_existing_files(self, existing_files):
         try:
-
             GLib.idle_add(
                 self._engine._appwindow._queue_manager.add,
                 existing_files,

rfi_file_monitor/queue_manager.py

@@ -38,6 +38,7 @@ def __init__(self, appwindow):
         self._files_dict: OrderedDictType[str, File] = OrderedDict()
         self._jobs_list: Final[List[Job]] = list()
         self._njobs_running: int = 0
+        self._total_files_in_path: int = 0
 
         kwargs = dict(
             halign=Gtk.Align.FILL,
@@ -453,6 +454,9 @@ def stop(self):
         self._running = False
         self.notify("running")
 
+    def get_total_files_in_path(self, number_of_files: int):
+        self._total_files_in_path = number_of_files
+
     def _files_dict_timeout_cb(self, *user_data):
         """
         This function runs every second, and will take action based on the status of all files in the dict
@@ -563,7 +567,7 @@ def _files_dict_timeout_cb(self, *user_data):
             # update status bar
             self._appwindow._status_grid.get_child_at(
                 0, 0
-            ).props.label = f"Total: {len(self._files_dict)}"
+            ).props.label = f"Total: {self._total_files_in_path }"
             for _status, _counter in status_counters.items():
                 self._appwindow._status_grid.get_child_at(
                     int(_status), 0

rfi_file_monitor/utils/decorators.py

@@ -210,13 +210,12 @@ def wrapper(self: Engine, existing_files: List):
             n = 1
             processed_files = 0
             for rv in chunked_input:
-                chunk_weight = sum(
-                    [Path(file.filename).stat().st_size for file in rv]
-                )
+                # chunk_weight = sum(
+                #     [Path(file.filename).stat().st_size for file in rv]
+                # )
                 process_existing_files(self, rv)
 
-                while processed_files < chunk_size*n*0.9: # refresh the list when we are at 90% of the size
-                    j = 0
+                while processed_files < chunk_size*n*0.9:  # refresh the list when we are at 90% of the size
                     processed_files = sum([
                         item
                         for item in self._engine._appwindow._queue_manager._files_dict.values()

setup.cfg

@@ -65,7 +65,7 @@ rfi_file_monitor.files =
     WeightedRegularFile = rfi_file_monitor.files.regular_file:WeightedRegularFile
     S3Object = rfi_file_monitor.files.s3_object:S3Object
     Directory = rfi_file_monitor.files.directory:Directory
-gui_scripts =
+console_scripts =
     rfi-file-monitor = rfi_file_monitor:main
 
 [bdist_wheel]