Lubuntu/ubuntu-dev-tools
3
0
Fork 0
mirror of https://git.launchpad.net/ubuntu-dev-tools synced 2025-03-13 16:11:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

ubuntutools/misc: allow specifying blocksize to download methods

Browse Source
This commit is contained in:
Dan Streetman 2021-11-19 08:11:15 -05:00
parent cfa45994d0
commit 85125e3c90
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ubuntutools/misc.py
View File

@ -288,7 +288,7 @@ def extract_authentication(url):
return (url, None, None) return (url, None, None)
def download(src, dst, size=0): def download(src, dst, size=0, *, blocksize=DOWNLOAD_BLOCKSIZE_DEFAULT):
""" download/copy a file/url to local file """ download/copy a file/url to local file
src: str or Path src: str or Path
@ -297,6 +297,8 @@ def download(src, dst, size=0):
Destination dir or filename Destination dir or filename
size: int size: int
Size of source, if known Size of source, if known
blocksize: int or None
Blocksize to use when downloading
If the URL contains authentication data in the URL 'netloc', If the URL contains authentication data in the URL 'netloc',
it will be stripped from the URL and passed to the requests library. it will be stripped from the URL and passed to the requests library.
@ -334,7 +336,7 @@ def download(src, dst, size=0):
try: try:
with requests.get(src, stream=True, auth=auth) as fsrc, tmpdst.open('wb') as fdst: with requests.get(src, stream=True, auth=auth) as fsrc, tmpdst.open('wb') as fdst:
fsrc.raise_for_status() fsrc.raise_for_status()
_download(fsrc, fdst, size) _download(fsrc, fdst, size, blocksize=blocksize)
except requests.exceptions.HTTPError as e: except requests.exceptions.HTTPError as e:
if e.response is not None and e.response.status_code == 404: if e.response is not None and e.response.status_code == 404:
raise NotFoundError(f'URL {src} not found: {e}') raise NotFoundError(f'URL {src} not found: {e}')
@ -376,7 +378,7 @@ class _StderrProgressBar(object):
sys.stderr.flush() sys.stderr.flush()
def _download(fsrc, fdst, size): def _download(fsrc, fdst, size, *, blocksize):
""" helper method to download src to dst using requests library. """ """ helper method to download src to dst using requests library. """
url = fsrc.url url = fsrc.url
Logger.debug(f'Using URL: {url}') Logger.debug(f'Using URL: {url}')
@ -408,7 +410,6 @@ def _download(fsrc, fdst, size):
progress_bar = _StderrProgressBar(max_width=terminal_width) progress_bar = _StderrProgressBar(max_width=terminal_width)
downloaded = 0 downloaded = 0
blocksize = DOWNLOAD_BLOCKSIZE_DEFAULT
try: try:
while True: while True:
block = fsrc.raw.read(blocksize) block = fsrc.raw.read(blocksize)
@ -425,28 +426,30 @@ def _download(fsrc, fdst, size):
size / 1024.0 / 1024)) size / 1024.0 / 1024))
def _download_text(src, binary): def _download_text(src, binary, *, blocksize):
with tempfile.TemporaryDirectory() as d: with tempfile.TemporaryDirectory() as d:
dst = Path(d) / 'dst' dst = Path(d) / 'dst'
download(src, dst) download(src, dst, blocksize=blocksize)
return dst.read_bytes() if binary else dst.read_text() return dst.read_bytes() if binary else dst.read_text()
def download_text(src, mode=None): def download_text(src, mode=None, *, blocksize=DOWNLOAD_BLOCKSIZE_DEFAULT):
""" Return the text content of a downloaded file """ Return the text content of a downloaded file
src: str or Path src: str or Path
Source to copy from (file path or url) Source to copy from (file path or url)
mode: str mode: str
Deprecated, ignored unless a string that contains 'b' Deprecated, ignored unless a string that contains 'b'
blocksize: int or None
Blocksize to use when downloading
Raises the same exceptions as download() Raises the same exceptions as download()
Returns text content of downloaded file Returns text content of downloaded file
""" """
return _download_text(src, binary='b' in (mode or '')) return _download_text(src, binary='b' in (mode or ''), blocksize=blocksize)
def download_bytes(src): def download_bytes(src, *, blocksize=DOWNLOAD_BLOCKSIZE_DEFAULT):
""" Same as download_text() but returns bytes """ """ Same as download_text() but returns bytes """
return _download_text(src, binary=True) return _download_text(src, binary=True, blocksize=blocksize)