Fix some documentation errors.

[quix0rs-apt-p2p.git] / apt_p2p / AptPackages.py

diff --git a/apt_p2p/AptPackages.py b/apt_p2p/AptPackages.py
index 4b6abe75ac3a917723451623846c0c4f4f14c217..f7681a7380c1c53050a8b77c19f0aeb503b5b3f9 100644 (file)
--- a/apt_p2p/AptPackages.py
+++ b/apt_p2p/AptPackages.py
@@ -92,6 +92,7 @@ class PackageFileList(DictMixin):
         if filename.lower() in TRACKED_FILES:
             log.msg("Registering package file: "+cache_path)
             self.packages[cache_path] = file_path
+            self.packages.sync()
             return True
         return False
 
@@ -103,6 +104,7 @@ class PackageFileList(DictMixin):
             if not self.packages[f].exists():
                 log.msg("File in packages database has been deleted: "+f)
                 del self.packages[f]
+        self.packages.sync()
 
     #{ Dictionary interface details
     def __getitem__(self, key): return self.packages[key]
@@ -129,6 +131,8 @@ class AptPackages:
     @type loading: L{twisted.internet.defer.Deferred}
     @ivar loading: if the cache is currently being loaded, this will be
         called when it is loaded, otherwise it is None
+    @type loading_unload: C{boolean}
+    @ivar loading_unload: whether there is an unload pending on the current load
     @type unload_later: L{twisted.internet.interfaces.IDelayedCall}
     @ivar unload_later: the delayed call to unload the apt cache
     @type indexrecords: C{dictionary}
@@ -203,6 +207,7 @@ class AptPackages:
         self.packages = PackageFileList(cache_dir)
         self.loaded = False
         self.loading = None
+        self.loading_unload = False
         self.unload_later = None
         
     def __del__(self):
@@ -251,6 +256,7 @@ class AptPackages:
         # Make sure it's not already being loaded
         if self.loading is None:
             log.msg('Loading the packages cache')
+            self.loading_unload = False
             self.loading = threads.deferToThread(self._load)
             self.loading.addCallback(self.doneLoading)
         return self.loading
@@ -258,6 +264,16 @@ class AptPackages:
     def doneLoading(self, loadResult):
         """Cache is loaded."""
         self.loading = None
+        
+        # Check for a pending unload
+        if self.loading_unload:
+            log.msg('Re-loading the packages cache')
+            self.unload()
+            self.loading_unload = False
+            self.loading = threads.deferToThread(self._load)
+            self.loading.addCallback(self.doneLoading)
+            return self.loading
+            
         # Must pass on the result for the next callback
         return loadResult
         
@@ -330,7 +346,9 @@ class AptPackages:
         if self.unload_later and self.unload_later.active():
             self.unload_later.cancel()
         self.unload_later = None
-        if self.loaded:
+        if self.loading:
+            self.loading_unload = True
+        elif self.loaded:
             log.msg('Unloading the packages cache')
             # This should save memory
             del self.cache