Merge pull request #18 from chnyda/master

Keep publishes and snapshots variable to get rid of http requests

Author: fpytloun

aptly/decorators.py

@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+
+
+class CachedMethod(object):
+    """
+    Decorator for caching of function results
+    """
+    def __init__(self, function):
+        self.function = function
+        self.mem = {}
+
+    def __call__(self, *args, **kwargs):
+        cached = kwargs.pop('cached', True)
+        if cached is True:
+            if (args, str(kwargs)) in self.mem:
+                return self.mem[args, str(kwargs)]
+
+        tmp = self.function(*args, **kwargs)
+        self.mem[args, str(kwargs)] = tmp
+        return tmp
+
+    def __get__(self, obj, objtype):
+        """ Support instance methods """
+        import functools
+        return functools.partial(self.__call__, obj)

aptly/publisher/__init__.py

@@ -6,6 +6,7 @@
 import yaml
 import apt_pkg
 from aptly.exceptions import AptlyException, NoSuchPublish
+from aptly.decorators import CachedMethod
 
 lg = logging.getLogger(__name__)
 
@@ -150,7 +151,7 @@ def get_repo_information(config, client, fill_repo=False, components=[]):
                 if components and repo.get('component') not in components:
                     continue
                 if fill_repo and origin == 'repo':
-                    packages = client.do_get('/{}/{}/{}'.format("repos", name, "packages"))
+                    packages = Publish._get_packages("repos", name)
                     repo_dict[name] = packages
                 for distribution in repo.get('distributions'):
                     publish_name = str.join('/', distribution.split('/')[:-1])
@@ -281,11 +282,26 @@ def compare(self, other, components=[]):
 
         return (diff, equal)
 
+    @staticmethod
+    @CachedMethod
+    def _get_packages(client, source_type, source_name):
+        return client.do_get('/{}/{}/packages'.format(source_type, source_name))
+
+    @staticmethod
+    @CachedMethod
+    def _get_publishes(client):
+        return client.do_get('/publish')
+
+    @staticmethod
+    @CachedMethod
+    def _get_snapshots(client):
+        return client.do_get('/snapshots', {'sort': 'time'})
+
     def _get_publish(self):
         """
         Find this publish on remote
         """
-        publishes = self.client.do_get('/publish')
+        publishes = self._get_publishes(self.client)
         for publish in publishes:
             if publish['Distribution'] == self.distribution and \
                     publish['Prefix'].replace("/", "_") == (self.prefix or '.') and \
@@ -350,7 +366,7 @@ def purge_publish(self, repo_dict, publish_dict, components=[], publish=False):
                     repo_dict[repo_name] = []
                 continue
 
-            packages = self.client.do_get('/{}/{}/{}'.format("snapshots", name, "packages"))
+            packages = self._get_packages(self.client, "snapshots", name)
             packages = sorted(packages, key=lambda x: self.parse_package_ref(x)[2], reverse=True, cmp=apt_pkg.version_compare)
 
             for package in packages:
@@ -503,7 +519,7 @@ def get_packages(self, component=None, components=[], packages=None):
                 # We don't want packages for this component
                 continue
 
-            component_refs = self.client.do_get('/snapshots/%s/packages' % snapshot['Name'])
+            component_refs = self._get_packages(self.client, "snapshots", snapshot['Name'])
             if packages:
                 # Filter package names
                 for ref in component_refs:
@@ -536,7 +552,7 @@ def _find_snapshot(self, name):
         """
         Find snapshot on remote by name or regular expression
         """
-        remote_snapshots = self.client.do_get('/snapshots', {'sort': 'time'})
+        remote_snapshots = self._get_snapshots(self.client)
         for remote in reversed(remote_snapshots):
             if remote["Name"] == name or \
                     re.match(name, remote["Name"]):
@@ -597,7 +613,7 @@ def merge_snapshots(self):
             package_refs = []
             for snapshot in snapshots:
                 # Get package refs from each snapshot
-                packages = self.client.do_get('/snapshots/%s/packages' % snapshot)
+                packages = self._get_packages(self.client, "snapshots", snapshot)
                 package_refs.extend(packages)
 
             try:

aptly/publisher/__main__.py

@@ -205,7 +205,7 @@ def find_publishes(client, source, target):
         lg.error("Source publish is regular expression but target does not refer any match groups. See help for more info.")
         sys.exit(1)
     lg.debug("Looking for source publishes matching regular expression: {0}".format(source))
-    publishes = client.do_get('/publish')
+    publishes = Publish._get_publishes(client)
     re_source = re.compile(source)
     for publish in publishes:
         name = "{}{}{}".format(publish['Storage']+":" if publish['Storage']
@@ -308,7 +308,7 @@ def action_publish(client, publishmgr, config_file, recreate=False,
                    only_latest=False, components=[]):
     if not architectures:
         architectures = []
-    snapshots = client.do_get('/snapshots', {'sort': 'time'})
+    snapshots = Publish._get_snapshots(client)
 
     config = load_config(config_file)
     for name, repo in config.get('mirror', {}).items():