From e8da17d8c6b7fd879e196ae425b8e62c78e579fe Mon Sep 17 00:00:00 2001
From: Cody Logan <cody@lokken.dev>
Date: Wed, 8 Nov 2023 09:56:10 -0800
Subject: Switch to pathlib for file processing

---
 src/wikiget/dl.py          | 6 +++---
 src/wikiget/validations.py | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/wikiget/dl.py b/src/wikiget/dl.py
index 980ce1d..85f1ccf 100644
--- a/src/wikiget/dl.py
+++ b/src/wikiget/dl.py
@@ -16,10 +16,10 @@
 # along with Wikiget. If not, see <https://www.gnu.org/licenses/>.
 
 import logging
-import os
 import sys
 from argparse import Namespace
 from concurrent.futures import ThreadPoolExecutor
+from pathlib import Path
 
 from mwclient import APIError, InvalidResponse, LoginError
 from requests import ConnectionError, HTTPError
@@ -40,7 +40,7 @@ def prep_download(dl: str, args: Namespace) -> File:
     file = get_dest(dl, args)
 
     # check if the destination file already exists; don't overwrite unless the user says
-    if os.path.isfile(file.dest) and not args.force:
+    if Path(file.dest).is_file() and not args.force:
         msg = f"[{file.dest}] File already exists; skipping download (use -f to force)"
         raise FileExistsError(msg)
 
@@ -159,7 +159,7 @@ def download(f: File, args: Namespace) -> int:
                 unit="B",
                 unit_scale=True,
                 unit_divisor=wikiget.CHUNKSIZE,
-            ) as progress_bar, open(dest, "wb") as fd:
+            ) as progress_bar, Path(dest).open("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):
diff --git a/src/wikiget/validations.py b/src/wikiget/validations.py
index cfbc5ef..ee73b87 100644
--- a/src/wikiget/validations.py
+++ b/src/wikiget/validations.py
@@ -19,6 +19,7 @@ from __future__ import annotations
 
 import hashlib
 import re
+from pathlib import Path
 
 from wikiget import BLOCKSIZE
 
@@ -68,7 +69,7 @@ def verify_hash(filename: str) -> str:
     :rtype: str
     """
     hasher = hashlib.sha1()  # noqa: S324
-    with open(filename, "rb") as dl:
+    with Path(filename).open("rb") as dl:
         buf = dl.read(BLOCKSIZE)
         while len(buf) > 0:
             hasher.update(buf)
-- 
cgit v1.2.3