Fetch packages from cache if available.

diff --git a/pakfire/index.py b/pakfire/index.py
index dd7021c2e6682b262f7409330ea2fb8e64564575..841511e8c0ae7e884675c8bdc6291dd486c6eb45 100644 (file)
--- a/pakfire/index.py
+++ b/pakfire/index.py
@@ -185,12 +185,30 @@ class DatabaseIndex(Index):
                # Reopen the database
                self.db = database.RemotePackageDatabase(self.pakfire, cache.abspath(cache_filename))
 
+       def __get_from_cache(self, pkg):
+               """
+                       Check if package is already in cache and return an instance of
+                       BinaryPackage instead.
+               """
+               if hasattr(self.repo, "cache"):
+                       filename = os.path.join("packages", os.path.basename(pkg.filename))
+
+                       if self.repo.cache.exists(filename):
+                               filename = self.repo.cache.abspath(filename)
+
+                               pkg = packages.BinaryPackage(self.pakfire, self.repo, filename)
+
+               return pkg
+
        def get_all_by_name(self, name):
                c = self.db.cursor()
                c.execute("SELECT * FROM packages WHERE name = ?", name)
 
                for pkg in c:
-                       yield package.DatabasePackage(self.pakfire, self.repo, self.db, pkg)
+                       pkg = package.DatabasePackage(self.pakfire, self.repo, self.db, pkg)
+
+                       # Try to get package from cache.
+                       yield self.__get_from_cache(pkg)
 
                c.close()
 
@@ -210,7 +228,10 @@ class DatabaseIndex(Index):
                c.execute("SELECT * FROM packages")
 
                for pkg in c:
-                       yield packages.DatabasePackage(self.pakfire, self.repo, self.db, pkg)
+                       pkg = packages.DatabasePackage(self.pakfire, self.repo, self.db, pkg)
+
+                       # Try to get package from cache.
+                       yield self.__get_from_cache(pkg)
 
                c.close()