diff options
Diffstat (limited to 'wikiget/dl.py')
| -rw-r--r-- | wikiget/dl.py | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/wikiget/dl.py b/wikiget/dl.py index aa79ae3..949f09e 100644 --- a/wikiget/dl.py +++ b/wikiget/dl.py @@ -23,7 +23,7 @@ from mwclient import APIError, InvalidResponse, LoginError, Site from requests import ConnectionError, HTTPError from tqdm import tqdm -from wikiget import CHUNKSIZE, DEFAULT_SITE, USER_AGENT +import wikiget from wikiget.validations import valid_file, verify_hash @@ -33,7 +33,7 @@ def download(dl, args): if url.netloc: filename = url.path site_name = url.netloc - if args.site is not DEFAULT_SITE and not args.quiet: + if args.site is not wikiget.DEFAULT_SITE and not args.quiet: # this will work even if the user specifies 'commons.wikimedia.org' print("Warning: target is a URL, ignoring site specified with --site") else: @@ -55,21 +55,21 @@ def download(dl, args): dest = args.output or filename - if args.verbose >= 2: - print(f"User agent: {USER_AGENT}") + if args.verbose >= wikiget.VERY_VERBOSE: + print(f"User agent: {wikiget.USER_AGENT}") # connect to site and identify ourselves - if args.verbose >= 1: + if args.verbose >= wikiget.STD_VERBOSE: print(f"Site name: {site_name}") try: - site = Site(site_name, path=args.path, clients_useragent=USER_AGENT) + site = Site(site_name, path=args.path, clients_useragent=wikiget.USER_AGENT) if args.username and args.password: site.login(args.username, args.password) except ConnectionError as e: # usually this means there is no such site, or there's no network # connection, though it could be a certificate problem print("Error: couldn't connect to specified site.") - if args.verbose >= 2: + if args.verbose >= wikiget.VERY_VERBOSE: print("Full error message:") print(e) sys.exit(1) @@ -79,7 +79,7 @@ def download(dl, args): "Error: couldn't find the specified wiki's api.php. " "Check the value of --path." ) - if args.verbose >= 2: + if args.verbose >= wikiget.VERY_VERBOSE: print("Full error message:") print(e) sys.exit(1) @@ -100,7 +100,7 @@ def download(dl, args): "Error: access denied. Try providing credentials with " "--username and --password." ) - if args.verbose >= 2: + if args.verbose >= wikiget.VERY_VERBOSE: print("Full error message:") for i in e.args: print(i) @@ -113,7 +113,7 @@ def download(dl, args): file_size = file.imageinfo["size"] file_sha1 = file.imageinfo["sha1"] - if args.verbose >= 1: + if args.verbose >= wikiget.STD_VERBOSE: print( f"Info: downloading '{filename}' " f"({file_size} bytes) from {site.host}", @@ -136,7 +136,7 @@ def download(dl, args): sys.exit(1) else: # download the file(s) - if args.verbose >= 1: + if args.verbose >= wikiget.STD_VERBOSE: leave_bars = True else: leave_bars = False @@ -145,23 +145,23 @@ def download(dl, args): total=file_size, unit="B", unit_scale=True, - unit_divisor=CHUNKSIZE, + unit_divisor=wikiget.CHUNKSIZE, ) as progress_bar: with fd: res = site.connection.get(file_url, stream=True) progress_bar.set_postfix(file=dest, refresh=False) - for chunk in res.iter_content(CHUNKSIZE): + for chunk in res.iter_content(wikiget.CHUNKSIZE): fd.write(chunk) progress_bar.update(len(chunk)) # verify file integrity and optionally print details dl_sha1 = verify_hash(dest) - if args.verbose >= 1: + if args.verbose >= wikiget.STD_VERBOSE: print(f"Info: downloaded file SHA1 is {dl_sha1}") print(f"Info: server file SHA1 is {file_sha1}") if dl_sha1 == file_sha1: - if args.verbose >= 1: + if args.verbose >= wikiget.STD_VERBOSE: print("Info: hashes match!") # at this point, we've successfully downloaded the file else: |