From 1c7d1bfa45576ba5c0c2914184ae49978431913b Mon Sep 17 00:00:00 2001 From: Jakub Kadlcik Date: Mar 21 2018 06:26:30 +0000 Subject: Move full download url construction to separate method Signed-off-by: Chenxiong Qi --- diff --git a/pyrpkg/lookaside.py b/pyrpkg/lookaside.py index 95f7284..5ced6e3 100644 --- a/pyrpkg/lookaside.py +++ b/pyrpkg/lookaside.py @@ -132,6 +132,13 @@ class CGILookasideCache(object): message = messages.get(http_status, default) raise UploadError(message, http_status=http_status) + def get_download_url(self, name, filename, hash, hashtype=None, **kwargs): + path_dict = {'name': name, 'filename': filename, + 'hash': hash, 'hashtype': hashtype} + path_dict.update(kwargs) + path = self.download_path % path_dict + return '%s/%s' % (self.download_url, path) + def download(self, name, filename, hash, outfile, hashtype=None, **kwargs): """Download a source file @@ -156,12 +163,7 @@ class CGILookasideCache(object): self.log.info("Downloading %s", filename) urled_file = filename.replace(' ', '%20') - - path_dict = {'name': name, 'filename': urled_file, 'hash': hash, - 'hashtype': hashtype} - path_dict.update(kwargs) - path = self.download_path % path_dict - url = '%s/%s' % (self.download_url, path) + url = self.get_download_url(name, urled_file, hash, hashtype, **kwargs) if isinstance(url, six.text_type): url = url.encode('utf-8') self.log.debug("Full url: %s", url)