revised to use pwiki

Author: fastily

requirements.txt

@@ -1,2 +1,3 @@
-Pillow==7.2.0
-requests==2.24.0
+Pillow==8.1.0
+requests==2.25.1
+rich==9.6.2

scu/__init__.py

@@ -1,2 +0,0 @@
-from .wiki import *
-from .wgen import *

scu/__main__.py

@@ -1,79 +1,76 @@
 import argparse
 import getpass
+import logging
 import re
+
 from datetime import date, datetime
 from pathlib import Path
 from textwrap import dedent
 
 from PIL import ExifTags, Image
+from rich.logging import RichHandler
+
+from pwiki import wgen
+from pwiki.wiki import Wiki
 
-from scu.wiki import Wiki, ColorLog
-from scu.wgen import Wgen
+log = logging.getLogger(__name__)
 
+MTC_FILE = Path.home() / ".scu.px.txt"
 
-def main():
-    MTC_FILE = Path.home() / ".scu.px.txt"
 
+def _main():
     cli_parser = argparse.ArgumentParser(description="Simple Commons Uploader")
-    cli_parser.add_argument('dirs', metavar='folders', type=str, nargs='*', help='folders with files to upload')
     cli_parser.add_argument('--user', type=str, help="username to use")
     cli_parser.add_argument('--pw', type=str, help="password to use")
     cli_parser.add_argument("-i", action='store_true', help="force interactive login")
     cli_parser.add_argument("--wgen", action='store_true', help="run wgen password manager")
+    cli_parser.add_argument('dirs', metavar='folders', type=Path, nargs='*', help='folders with files to upload')
     args = cli_parser.parse_args()
 
     if args.wgen:
-        Wgen.setup(MTC_FILE, False)
+        wgen.setup_px(MTC_FILE, False)
         return
 
     wiki = Wiki("commons.wikimedia.org")
     if args.i:
         wiki.login(input("Please login to continue.\nUsername: "), getpass.getpass())
     elif args.user:
         if not args.pw:
-            ColorLog.error("You didn't specify a password, --pw")
+            log.critical("No password specified, please pass the --pw flag with a pasword.")
             return
         wiki.login(args.user, args.pw)
     elif MTC_FILE.is_file():
-        pxd = Wgen.load_px(MTC_FILE)
-        if not pxd:
-            ColorLog.error(f"Please run with --wgen option or remove {MTC_FILE} from your home directory")
-        wiki.login(*pxd.popitem())
+        wiki.login(*wgen.load_px(MTC_FILE).popitem())
     else:
         cli_parser.print_help()
         return
 
     if not args.dirs:
-        ColorLog.warn("You didn't specify and directories to upload!  Goodbye.")
+        log.critical("You didn't specify and directories to upload!")
         return
 
-    ext_list = {"." + e for e in wiki.acceptable_file_extensions()}
+    ext_list = {"." + e for e in wiki.uploadable_filetypes()}
+    fails = []
 
-    for d in args.dirs:
-        base_dir = Path(d)
+    for base_dir in args.dirs:
         if not base_dir.is_dir():
             continue
 
         i = 1
-        fails = []
         for f in base_dir.iterdir():
             ext = f.suffix.lower()
-            if not f.is_file() or not ext in ext_list:
+            if not f.is_file() or ext not in ext_list:
                 continue
 
             timestamp = None
             if ext in (".jpg", ".jpeg"):
                 try:
                     with Image.open(f) as img:
-                        exif = {ExifTags.TAGS[k]: v for k, v in img._getexif().items() if k in ExifTags.TAGS}
-                    if "DateTimeOriginal" in exif:
-                        dto = exif["DateTimeOriginal"]
-
-                        if re.match(r"\d{4}:\d{2}:\d{2} \d{2}:\d{2}:\d{2}", dto):
+                        if dto := next((v for k, v in img.getexif().items() if ExifTags.TAGS.get(k) == "DateTimeOriginal" and re.match(r"\d{4}:\d{2}:\d{2} \d{2}:\d{2}:\d{2}", v)), None):
                             d, t = dto.split()
-                            timestamp = d.replace(":", "-") + " " + t
+                            timestamp = f"{d.replace(':', '-')} {t}"
                 except Exception as e:
-                    ColorLog.warn(f"Could not parse EXIF for {f}: {e}")
+                    log.warn("Could not parse EXIF for %s", f, exc_info=True)
 
             desc = f"""\
             =={{{{int:filedesc}}}}==
@@ -90,17 +87,19 @@ def main():
             [[Category:{base_dir.name}]]
             [[Category:Files by {wiki.username}]]"""
 
-            if not wiki.upload(str(f), f"{base_dir.name} {i} {date.today()}{ext}", dedent(desc), ""):
+            if not wiki.upload(f, f"{base_dir.name} {i} {date.today()}{ext}", dedent(desc)):
                 fails.append(f)
             i += 1
 
     if fails:
-        print("Failed to upload:")
-        for f in fails:
-            print(f)
+        log.warn("Failed to upload %d files: %s", len(fails), fails)
     else:
-        print("Complete, with no failures")
+        log.info("Finished with no failures")
 
 
 if __name__ == '__main__':
-    main()
+    for lg in (logging.getLogger("pwiki"), log):
+        lg.addHandler(RichHandler(rich_tracebacks=True))
+        lg.setLevel("INFO")
+
+    _main()

scu/wgen.py

@@ -14,7 +14,7 @@
     url="https://github.com/fastily/simple-commons-uploader",
     include_package_data=True,
     packages=setuptools.find_packages(),
-    install_requires=['Pillow', 'requests'],
+    install_requires=['Pillow', 'requests', 'rich'],
     entry_points={
         'console_scripts': [
             'scu = scu.__main__:main'
@@ -23,11 +23,10 @@
     classifiers=[
         "Natural Language :: English",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.6",
-        "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
         "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
         "Operating System :: OS Independent",
     ],
-    python_requires='>=3.6',
+    python_requires='>=3.8',
 )