From 3e2136024edde271e9d72d981ed4b1930dbdcb67 Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Wed, 9 Feb 2011 17:58:20 +0100 Subject: [PATCH] [entropy.client] drop urlFetcher and MultipleUrlFetcher properties, make them protected --- libraries/entropy/client/interfaces/client.py | 15 +++++++-------- libraries/entropy/client/interfaces/db.py | 2 +- libraries/entropy/client/interfaces/methods.py | 4 ++-- libraries/entropy/client/interfaces/package.py | 16 ++++++++-------- .../entropy/client/services/ugc/interfaces.py | 2 +- libraries/entropy/security.py | 2 +- sulfur/src/sulfur/entropyapi.py | 3 +-- 7 files changed, 21 insertions(+), 23 deletions(-) diff --git a/libraries/entropy/client/interfaces/client.py b/libraries/entropy/client/interfaces/client.py index 4bc3f041d..6172ab0d8 100644 --- a/libraries/entropy/client/interfaces/client.py +++ b/libraries/entropy/client/interfaces/client.py @@ -12,6 +12,7 @@ import os from entropy.core import Singleton +from entropy.fetchers import UrlFetcher, MultipleUrlFetcher from entropy.output import TextInterface, bold, red, darkred, blue from entropy.client.interfaces.loaders import LoadersMixin from entropy.client.interfaces.cache import CacheMixin @@ -635,14 +636,12 @@ class Client(Singleton, TextInterface, LoadersMixin, CacheMixin, CalculatorsMixi level = self._settings['system']['log_level'], filename = etpConst['entropylogfile'], header = "[client]") - self.MultipleUrlFetcher = multiple_url_fetcher - self.urlFetcher = url_fetcher - if self.urlFetcher == None: - from entropy.fetchers import UrlFetcher - self.urlFetcher = UrlFetcher - if self.MultipleUrlFetcher == None: - from entropy.fetchers import MultipleUrlFetcher - self.MultipleUrlFetcher = MultipleUrlFetcher + self._multiple_url_fetcher = multiple_url_fetcher + self._url_fetcher = url_fetcher + if url_fetcher is None: + self._url_fetcher = UrlFetcher + if multiple_url_fetcher is None: + self._multiple_url_fetcher = MultipleUrlFetcher self._cacher = EntropyCacher() diff --git a/libraries/entropy/client/interfaces/db.py b/libraries/entropy/client/interfaces/db.py index 48a4a740b..33b8d3107 100644 --- a/libraries/entropy/client/interfaces/db.py +++ b/libraries/entropy/client/interfaces/db.py @@ -820,7 +820,7 @@ class AvailablePackagesRepositoryUpdater(object): const_setup_perms(filepath_dir, etpConst['entropygid'], f_perms = 0o644) - fetcher = self._entropy.urlFetcher( + fetcher = self._entropy._url_fetcher( url, filepath, resume = False, diff --git a/libraries/entropy/client/interfaces/methods.py b/libraries/entropy/client/interfaces/methods.py index 165b2a49b..0f0246ec5 100644 --- a/libraries/entropy/client/interfaces/methods.py +++ b/libraries/entropy/client/interfaces/methods.py @@ -1539,8 +1539,8 @@ class MiscMixin: start_time = time.time() for idx in range(retries): - fetcher = self.urlFetcher(mirror, tmp_path, resume = False, - show_speed = False) + fetcher = self._url_fetcher(mirror, tmp_path, + resume = False, show_speed = False) fetcher.download() end_time = time.time() diff --git a/libraries/entropy/client/interfaces/package.py b/libraries/entropy/client/interfaces/package.py index aa4de499a..eb13121ab 100644 --- a/libraries/entropy/client/interfaces/package.py +++ b/libraries/entropy/client/interfaces/package.py @@ -171,13 +171,13 @@ class Package: for pkg_id, repo, url, dest_path, cksum in url_data: url_path_list.append((url, dest_path,)) self._setup_differential_download( - self._entropy.MultipleUrlFetcher, url, resume, dest_path, + self._entropy._multiple_url_fetcher, url, resume, dest_path, repo, pkg_id) # load class - fetch_intf = self._entropy.MultipleUrlFetcher(url_path_list, + fetch_intf = self._entropy._multiple_url_fetcher(url_path_list, resume = resume, abort_check_func = fetch_abort_function, - url_fetcher_class = self._entropy.urlFetcher, + url_fetcher_class = self._entropy._url_fetcher, checksum = checksum) try: data = fetch_intf.download() @@ -627,9 +627,9 @@ class Package: return [], 0.0, False fetch_abort_function = self.pkgmeta.get('fetch_abort_function') - fetch_intf = self._entropy.MultipleUrlFetcher(url_path_list, + fetch_intf = self._entropy._multiple_url_fetcher(url_path_list, resume = resume, abort_check_func = fetch_abort_function, - url_fetcher_class = self._entropy.urlFetcher) + url_fetcher_class = self._entropy._url_fetcher) try: data = fetch_intf.download() except KeyboardInterrupt: @@ -724,7 +724,7 @@ class Package: for delta_url, delta_save in download_plan: - delta_fetcher = self._entropy.urlFetcher(delta_url, + delta_fetcher = self._entropy._url_fetcher(delta_url, delta_save, resume = delta_resume, abort_check_func = fetch_abort_function) @@ -802,12 +802,12 @@ class Package: if os.path.isfile(save_path) and os.path.exists(save_path): existed_before = True - fetch_intf = self._entropy.urlFetcher(url, save_path, resume = resume, + fetch_intf = self._entropy._url_fetcher(url, save_path, resume = resume, abort_check_func = fetch_abort_function) if (download is not None) and (package_id is not None) and \ (repository is not None): fetch_path = self.__get_fetch_disk_path(download) - self._setup_differential_download(self._entropy.urlFetcher, url, + self._setup_differential_download(self._entropy._url_fetcher, url, resume, fetch_path, repository, package_id) # start to download diff --git a/libraries/entropy/client/services/ugc/interfaces.py b/libraries/entropy/client/services/ugc/interfaces.py index 28542e4fc..20c112277 100644 --- a/libraries/entropy/client/services/ugc/interfaces.py +++ b/libraries/entropy/client/services/ugc/interfaces.py @@ -673,7 +673,7 @@ class Cache: raise PermissionDenied("PermissionDenied: %s %s" % ( _("Cannot remove cache file"), cache_file,)) - fetcher = self.Service.Entropy.urlFetcher(doc_url, cache_file, + fetcher = self.Service.Entropy._url_fetcher(doc_url, cache_file, resume = False) rc = fetcher.download() if rc in ("-1", "-2", "-3", "-4"): diff --git a/libraries/entropy/security.py b/libraries/entropy/security.py index 3b91afd4c..ed60c4947 100644 --- a/libraries/entropy/security.py +++ b/libraries/entropy/security.py @@ -246,7 +246,7 @@ class System: @return: download status (True if download succeeded) @rtype: bool """ - fetcher = self._entropy.urlFetcher(url, save_to, resume = False, + fetcher = self._entropy._url_fetcher(url, save_to, resume = False, show_speed = show_speed) rc_fetch = fetcher.download() del fetcher diff --git a/sulfur/src/sulfur/entropyapi.py b/sulfur/src/sulfur/entropyapi.py index df496aead..ad4eb3b7d 100644 --- a/sulfur/src/sulfur/entropyapi.py +++ b/sulfur/src/sulfur/entropyapi.py @@ -309,7 +309,6 @@ class Equo(Client): self.progress = None self.progress_log = None self.std_output = None - self.urlFetcher = None Client.init_singleton(self, *args, **kwargs) self._progress_divider = 1 self.xcache = True # force xcache enabling @@ -323,7 +322,7 @@ class Equo(Client): def connect_to_gui(self, application): self.progress = application.progress GuiUrlFetcher.progress = application.progress - self.urlFetcher = GuiUrlFetcher + self._url_fetcher = GuiUrlFetcher self.progress_log = application.progress_log_write self.std_output = application.std_output self.ui = application.ui