aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCody Logan <cody@lokken.dev>2023-11-07 12:31:55 -0800
committerCody Logan <cody@lokken.dev>2023-11-07 12:31:55 -0800
commit356a4c8bfbaeb9c5a720f57940098f0832ddb737 (patch)
treeea6edb0eb1aaf956b94a713ba1a3782ff1564b49 /src
parentdfd38c4e30febfaba2302eba352f2095816a629c (diff)
downloadwikiget-356a4c8bfbaeb9c5a720f57940098f0832ddb737.tar.gz
wikiget-356a4c8bfbaeb9c5a720f57940098f0832ddb737.zip
Simplify return logic of process_download
Diffstat (limited to 'src')
-rw-r--r--src/wikiget/dl.py21
1 files changed, 11 insertions, 10 deletions
diff --git a/src/wikiget/dl.py b/src/wikiget/dl.py
index a29e049..898e6ab 100644
--- a/src/wikiget/dl.py
+++ b/src/wikiget/dl.py
@@ -50,6 +50,8 @@ def prep_download(dl: str, args: Namespace) -> File:
def process_download(args: Namespace) -> int:
+ exit_code = 0
+
if args.batch:
# batch download mode
errors = batch_download(args)
@@ -59,25 +61,24 @@ def process_download(args: Namespace) -> int:
logger.warning(
f"{errors} problem{'s'[:errors^1]} encountered during batch processing"
)
- return 1 # completed with errors
- return 0
+ exit_code = 1 # completed with errors
else:
# single download mode
try:
file = prep_download(args.FILE, args)
except ParseError as e:
logger.error(e)
- return 1
+ exit_code = 1
except FileExistsError as e:
logger.warning(e)
- return 1
+ exit_code = 1
except (ConnectionError, HTTPError, InvalidResponse, LoginError, APIError):
- return 1
-
- errors = download(file, args)
- if errors:
- return 1 # completed with errors
- return 0
+ exit_code = 1
+ else:
+ errors = download(file, args)
+ if errors:
+ exit_code = 1 # completed with errors
+ return exit_code
def batch_download(args: Namespace) -> int: