Refactor download processing code and add some tests

2 files changed, 31 insertions, 31 deletions

diff --git a/src/wikiget/dl.py b/src/wikiget/dl.py
index c0af6e9..20d8a07 100644
--- a/src/wikiget/dl.py
+++ b/src/wikiget/dl.py
@@ -49,6 +49,35 @@ def prep_download(dl: str, args: Namespace) -> File:
     return file
 
 
+def process_download(args: Namespace) -> None:
+    if args.batch:
+        # batch download mode
+        errors = batch_download(args)
+        if errors:
+            # return non-zero exit code if any problems were encountered, even if some
+            # downloads completed successfully
+            logger.warning(
+                f"{errors} problem{'s'[:errors^1]} encountered during batch processing"
+            )
+            sys.exit(1)  # completed with errors
+    else:
+        # single download mode
+        try:
+            file = prep_download(args.FILE, args)
+        except ParseError as e:
+            logger.error(e)
+            sys.exit(1)
+        except FileExistsError as e:
+            logger.warning(e)
+            sys.exit(1)
+        except (ConnectionError, HTTPError, InvalidResponse, LoginError, APIError):
+            sys.exit(1)
+
+        errors = download(file, args)
+        if errors:
+            sys.exit(1)  # completed with errors
+
+
 def batch_download(args: Namespace) -> int:
     errors = 0
 
diff --git a/src/wikiget/wikiget.py b/src/wikiget/wikiget.py
index f42da35..33f7b2c 100644
--- a/src/wikiget/wikiget.py
+++ b/src/wikiget/wikiget.py
@@ -17,14 +17,9 @@
 
 import argparse
 import logging
-import sys
-
-from mwclient import APIError, InvalidResponse, LoginError
-from requests import ConnectionError, HTTPError
 
 import wikiget
-from wikiget.dl import batch_download, download, prep_download
-from wikiget.exceptions import ParseError
+from wikiget.dl import process_download
 from wikiget.logging import configure_logging
 
 logger = logging.getLogger(__name__)
@@ -134,28 +129,4 @@ def main() -> None:
     logger.info(f"Starting download session using wikiget {wikiget.__version__}")
     logger.debug(f"User agent: {wikiget.USER_AGENT}")
 
-    if args.batch:
-        # batch download mode
-        errors = batch_download(args)
-        if errors:
-            # return non-zero exit code if any problems were encountered, even if some
-            # downloads completed successfully
-            logger.warning(
-                f"{errors} problem{'s'[:errors^1]} encountered during batch processing"
-            )
-            sys.exit(1)  # completed with errors
-    else:
-        # single download mode
-        try:
-            file = prep_download(args.FILE, args)
-        except ParseError as e:
-            logger.error(e)
-            sys.exit(1)
-        except FileExistsError:
-            sys.exit(1)
-        except (ConnectionError, HTTPError, InvalidResponse, LoginError, APIError):
-            sys.exit(1)
-
-        errors = download(file, args)
-        if errors:
-            sys.exit(1)  # completed with errors
+    process_download(args)