From 456316f882834c33e90a2ddfa8d4c5e47966dc5e Mon Sep 17 00:00:00 2001
From: Cody Logan <cody@lokken.dev>
Date: Wed, 8 Nov 2023 09:42:51 -0800
Subject: Ensure downloaded file handler is always closed

---
 src/wikiget/dl.py | 34 ++++++++++++++++------------------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/src/wikiget/dl.py b/src/wikiget/dl.py
index deb82a4..980ce1d 100644
--- a/src/wikiget/dl.py
+++ b/src/wikiget/dl.py
@@ -149,30 +149,28 @@ def download(f: File, args: Namespace) -> int:
 
         if args.dry_run:
             adapter.warning("Dry run; download skipped")
-            return 0
+            return errors
 
         try:
-            fd = open(dest, "wb")
+            with tqdm(
+                desc=dest,
+                leave=args.verbose >= wikiget.STD_VERBOSE,
+                total=file_size,
+                unit="B",
+                unit_scale=True,
+                unit_divisor=wikiget.CHUNKSIZE,
+            ) as progress_bar, open(dest, "wb") as fd:
+                # download the file using the existing Site session
+                res = site.connection.get(file_url, stream=True)
+                for chunk in res.iter_content(wikiget.CHUNKSIZE):
+                    fd.write(chunk)
+                    progress_bar.update(len(chunk))
         except OSError as e:
             adapter.error(f"File could not be written: {e}")
             errors += 1
             return errors
-        # download the file(s)
-        leave_bars = args.verbose >= wikiget.STD_VERBOSE
-        with tqdm(
-            desc=dest,
-            leave=leave_bars,
-            total=file_size,
-            unit="B",
-            unit_scale=True,
-            unit_divisor=wikiget.CHUNKSIZE,
-        ) as progress_bar, fd:
-            res = site.connection.get(file_url, stream=True)
-            for chunk in res.iter_content(wikiget.CHUNKSIZE):
-                fd.write(chunk)
-                progress_bar.update(len(chunk))
-
-        # verify file integrity and log details
+
+        # verify file integrity and log the details
         try:
             dl_sha1 = verify_hash(dest)
         except OSError as e:
-- 
cgit v1.2.3