Merge branch 'main' into 147-sig-activity-changes

# Conflicts:
#	core/constants.py
#	pyproject.toml

core/cleanup.py

@@ -35,7 +35,7 @@ class CleanupTimer:
 
         self._stop_event.set()
         if self._thread:
-            self._thread.join(timeout=15)
+            self._thread.join(timeout=5)
             if self._thread.is_alive():
                 logger.warning("Cleanup worker thread did not exit on time and will be killed.")
 

core/data_providers.py

@@ -91,7 +91,7 @@ class DataProviders:
         for t in threads:
             t.start()
 
-        deadline = time.monotonic() + 40
+        deadline = time.monotonic() + 15
         for t in threads:
             t.join(timeout=max(0.0, deadline - time.monotonic()))
         still_running = [t for t in threads if t.is_alive()]

core/live_data_cache.py

@@ -77,7 +77,12 @@ class LiveDataCache:
             logger.exception(f"Failed to write snapshot to {self._snapshot_dir}")
 
     def _load_snapshot(self):
-        data = self._disk_cache.get("snapshot")
+        try:
+            data = self._disk_cache.get("snapshot")
+        except Exception:
+            logger.warning(f"Failed to load snapshot from {self._snapshot_dir}, clearing it.")
+            self._disk_cache.clear()
+            return
         if not data:
             return
 

core/single_object_data_cache.py

@@ -21,7 +21,13 @@ class SingleObjectDataCache:
         # This cache stores a single object, doesn't matter what it's called so "object" will do
         if "object" not in self._cache:
             self._cache.add("object", object_if_empty)
-        self._obj = self._cache.get("object")
+        try:
+            self._obj = self._cache.get("object")
+        except Exception:
+            logger.warning(f"Failed to load cache from {cache_dir}, clearing it.")
+            self._cache.clear()
+            self._cache.add("object", object_if_empty)
+            self._obj = object_if_empty
 
     def get(self):
         """Get the data object. This can then be manipulated as necessary across multiple threads. Any function