feat: clean up term map

README.rst

@@ -101,8 +101,6 @@ Sharing
 +------------------------------------+---------------+-----------------------------------------------------------------------------------+-----------+
 | sharing.directories                | array[object] | List of shared directories:                                                       | <not set> |
 +------------------------------------+---------------+-----------------------------------------------------------------------------------+-----------+
-| sharing.index.store_interval       | integer       | Shared items index automatically gets stored, this parameter defines the interval | 120       |
-+------------------------------------+---------------+-----------------------------------------------------------------------------------+-----------+
 
 The `sharing.directories` list contains objects which have the following parameters:
 

src/aioslsk/resources/default_settings.yaml

@@ -10,9 +10,6 @@ network:
   upnp:
     enabled: true
     lease_duration: 0
-  timeout:
-    peer: 10
-    distributed: 120
   reconnect:
     auto: true
     timeout: 10
@@ -35,8 +32,6 @@ sharing:
     upload_speed_kbps: 0
     download_speed_kbps: 0
   download: null
-  index:
-    store_interval: 120
   directories: []
 
 chats:

src/aioslsk/shares/manager.py

@@ -210,7 +210,13 @@ async def create_directory(self, absolute_path: str) -> str:
             logger.info(f"creating directory : {absolute_path}")
             await asyncos.makedirs(absolute_path, exist_ok=True)
 
-    def build_term_map(self, shared_directory: SharedDirectory):
+    def rebuild_term_map(self):
+        logger.info("rebuilding term map")
+        self._term_map = {}
+        for shared_directory in self.shared_directories:
+            self._build_term_map(shared_directory)
+
+    def _build_term_map(self, shared_directory: SharedDirectory):
         """Builds a list of valid terms for the given shared directory"""
         for item in shared_directory.items:
             self._add_item_to_term_map(item)
@@ -312,6 +318,8 @@ def remove_shared_directory(self, directory: SharedDirectory):
             parent = parents[-1]
             parent.items |= directory.items
 
+        self._cleanup_term_map()
+
     async def scan_directory_files(self, shared_directory: SharedDirectory):
         """Scans the files for the given `shared_directory`
 
@@ -347,7 +355,8 @@ async def scan_directory_files(self, shared_directory: SharedDirectory):
             # set
             shared_directory.items -= (shared_directory.items ^ shared_items)
 
-        self.build_term_map(shared_directory)
+        self._build_term_map(shared_directory)
+        self._cleanup_term_map()
 
     async def scan_directory_file_attributes(self, shared_directory: SharedDirectory):
         """Scans the file attributes for files in the given `shared_directory`.
@@ -637,6 +646,12 @@ def _add_item_to_term_map(self, item: SharedItem):
                 self._term_map[term] = WeakSet()
             self._term_map[term].add(item)
 
+    def _cleanup_term_map(self):
+        self._term_map = {
+            term: values for term, values in self._term_map.items()
+            if len(values) > 0
+        }
+
     def _get_parent_directories(self, shared_directory: SharedDirectory) -> List[SharedDirectory]:
         """Returns a list of parent shared directories. The parent directories
         will be sorted by length of the absolute path (longest last)

tests/unit/shares/test_shares_manager.py

@@ -78,7 +78,7 @@ def manager(tmp_path):
 def manager_query(tmp_path):
     manager = SharesManager(Settings(DEFAULT_SETTINGS), InternalEventBus())
     manager._shared_directories = [SHARED_DIRECTORY]
-    manager.build_term_map(SHARED_DIRECTORY)
+    manager._build_term_map(SHARED_DIRECTORY)
 
     return manager