X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=common%2Fpython%2Frift%2Fdownloader%2Furl.py;fp=common%2Fpython%2Frift%2Fdownloader%2Furl.py;h=3aa9ac27957cd7150956472a13bafd693b33629e;hb=4870d0ee29789b859931e4e2c73e13dcb29537d5;hp=b6921c560212b6550b9d28f7a287b7848955e4cf;hpb=6f1a3fe149e4a6b9803382cb299c902f4cf58ec9;p=osm%2FSO.git diff --git a/common/python/rift/downloader/url.py b/common/python/rift/downloader/url.py index b6921c56..3aa9ac27 100644 --- a/common/python/rift/downloader/url.py +++ b/common/python/rift/downloader/url.py @@ -34,6 +34,7 @@ from requests.packages.urllib3.exceptions import InsecureRequestWarning requests.packages.urllib3.disable_warnings(InsecureRequestWarning) from . import base +from .local_file import LocalFileAdapter as LocalFileAdapter class UrlDownloader(base.AbstractDownloader): """Handles downloads of URL with some basic retry strategy. @@ -105,6 +106,7 @@ class UrlDownloader(base.AbstractDownloader): retries = Retry(total=2, backoff_factor=1) session.mount("http://", HTTPAdapter(max_retries=retries)) session.mount("https://", HTTPAdapter(max_retries=retries)) + session.mount("file://", LocalFileAdapter()) return session @@ -196,7 +198,7 @@ class UrlDownloader(base.AbstractDownloader): self.meta.update_data_with_head(response.headers) self.meta.start_download() - self.download_started() + self.download_progress() url_options["stream"] = True, request = self.session.get(self.url, **url_options) @@ -218,7 +220,7 @@ class UrlDownloader(base.AbstractDownloader): chunk = self.check_and_decompress(chunk) self._fh.write(chunk) - self.download_progress() + #self.download_progress() self.meta.end_download() self.close()