Lubuntu/ubuntu-dev-tools
3
0
Fork 0
mirror of https://git.launchpad.net/ubuntu-dev-tools synced 2025-03-27 02:41:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

ubuntutools/misc: return dst Path object from download()

Browse Source
This commit is contained in:
Dan Streetman 2021-11-19 07:18:34 -05:00
parent 1e2036399e
commit de295fe524
1 changed files with 5 additions and 2 deletions

7
ubuntutools/misc.py

@ -304,6 +304,8 @@ def download(src, dst, size=0, *, blocksize=DOWNLOAD_BLOCKSIZE_DEFAULT):
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.
This may throw a DownloadError. This may throw a DownloadError.
On success, this will return the dst as a Path object.
""" """
src = str(src) src = str(src)
parsedsrc = urlparse(src) parsedsrc = urlparse(src)
@ -322,11 +324,11 @@ def download(src, dst, size=0, *, blocksize=DOWNLOAD_BLOCKSIZE_DEFAULT):
if dst.exists(): if dst.exists():
if src.samefile(dst): if src.samefile(dst):
Logger.info(f'Using existing file {dst}') Logger.info(f'Using existing file {dst}')
return return dst
Logger.info(f'Replacing existing file {dst}') Logger.info(f'Replacing existing file {dst}')
Logger.info(f'Copying file {src} to {dst}') Logger.info(f'Copying file {src} to {dst}')
shutil.copyfile(src, dst) shutil.copyfile(src, dst)
return return dst
(src, username, password) = extract_authentication(src) (src, username, password) = extract_authentication(src)
auth = (username, password) if username or password else None auth = (username, password) if username or password else None
@ -347,6 +349,7 @@ def download(src, dst, size=0, *, blocksize=DOWNLOAD_BLOCKSIZE_DEFAULT):
except requests.exceptions.RequestException as e: except requests.exceptions.RequestException as e:
raise DownloadError(e) raise DownloadError(e)
shutil.move(tmpdst, dst) shutil.move(tmpdst, dst)
return dst
class _StderrProgressBar(object): class _StderrProgressBar(object):