voussoir/voussoirkit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add vlogging to downloady.

Browse source
This commit is contained in:
voussoir 2021-03-10 16:37:07 -08:00
parent 7f5c298418
commit 6d6ae3bd5c
No known key found for this signature in database
GPG key ID: 5F7554F8C26DACCB
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
voussoirkit/downloady.py
View file

@ -11,6 +11,9 @@ from voussoirkit import dotdict
from voussoirkit import pathclass from voussoirkit import pathclass
from voussoirkit import ratelimiter from voussoirkit import ratelimiter
from voussoirkit import safeprint from voussoirkit import safeprint
from voussoirkit import vlogging
log = vlogging.getLogger(__name__, 'downloady')
warnings.simplefilter('ignore') warnings.simplefilter('ignore')
@ -60,16 +63,19 @@ def download_file(
url = sanitize_url(url) url = sanitize_url(url)
if localname in [None, '']: if localname in [None, '']:
localname = basename_from_url(url) localname = basename_from_url(url)
if os.path.isdir(localname):
localname = os.path.join(localname, basename_from_url(url)) localname = pathclass.Path(localname)
if localname.is_dir:
localname = localname.with_child(basename_from_url(url))
localname = localname.absolute_path
localname = sanitize_filename(localname) localname = sanitize_filename(localname)
if not is_special_file(localname): if not is_special_file(localname):
localname = os.path.abspath(localname) localname = os.path.abspath(localname)
if verbose: log.debug('URL: %s', url)
safeprint.safeprint(f' URL: {url}') log.debug('File: %s', localname)
safeprint.safeprint(f'File: {localname}')
plan = prepare_plan( plan = prepare_plan(
url, url,
@ -182,7 +188,7 @@ def prepare_plan(
real_exists = os.path.exists(real_localname) real_exists = os.path.exists(real_localname)
if real_exists and overwrite is False and not user_provided_range: if real_exists and overwrite is False and not user_provided_range:
print('File exists and overwrite is off. Nothing to do.') log.debug('File exists and overwrite is off. Nothing to do.')
return None return None
temp_exists = os.path.exists(temp_localname) temp_exists = os.path.exists(temp_localname)
@ -286,7 +292,7 @@ def prepare_plan(
return plan_partial return plan_partial
if server_respects_range: if server_respects_range:
print('Resume from byte %d' % plan_resume.seek_to) log.info('Resume from byte %d' % plan_resume.seek_to)
return plan_resume return plan_resume
else: else:
@ -467,6 +473,7 @@ def download_argparse(args):
def main(argv): def main(argv):
argv = vlogging.set_level_by_argv(log, argv)
parser = argparse.ArgumentParser() parser = argparse.ArgumentParser()
parser.add_argument('url') parser.add_argument('url')