pytest

Author: paulmueller

dcoraid/dbmodel/db_api_cached.py

@@ -125,7 +125,7 @@ def search_dataset(self, query="", limit=100):
         """
         return DBExtract(self._mc.search(query, limit))
 
-    def update(self, reset=False, abort_event=None):
+    def update(self, reset=False, abort_event=None, callback=None):
         """Update the local metadata cache based on the last local timestamp"""
         # Clear the fleeting cache.
         self._cache_fleeting.clear()
@@ -137,19 +137,29 @@ def update(self, reset=False, abort_event=None):
             self._mc.reset()
 
         # Call these methods now so they reflect the current database state.
-        self.get_circles()
-        self.get_collections()
+        circles = self.get_circles()
+        collections = self.get_collections()
 
         new_timestamp = time.time()
 
-        for cdict in self.get_circles():
+        datasets_new = 0
+
+        for cdict in circles:
+            if callback is not None:
+                callback({
+                    "circles": circles,
+                    "collections": collections,
+                    "datasets_new": datasets_new,
+                    "circle_current": cdict,
+                })
             logger.info(f"Fetching dataset from circle {cdict['name']}")
             dbe = self.ai.search_dataset_via_api(
                 since_time=self.local_timestamp,
                 circles=[cdict["name"]],
                 limit=0,
                 ret_db_extract=False,
             )
+            datasets_new += len(dbe)
             if abort_event and abort_event.is_set():
                 break
             self._mc.upsert_many(dbe, org_id=cdict["id"])

dcoraid/gui/main.py

@@ -212,6 +212,10 @@ def check_update_database(self, reset=False, force=False):
             prog.setModal(True)
             prog.show()
 
+
+            def prog_update_callback(circle_name, num_circles, num_datasets)
+
+
             thr = threading.Thread(target=self.database.update,
                                    args=(reset, abort_event))
             thr.start()

tests/conftest.py

@@ -8,7 +8,6 @@
 
 from PyQt6 import QtCore
 from PyQt6.QtCore import QStandardPaths
-import pytest
 
 from dcoraid.api import APIConflictError