God

wimf/__init__.py

@@ -47,9 +47,9 @@ def save(path, image, **kwargs):
     raw = encoder.encode(**encode_args)
 
     try:
-        from . import wimf_cpp
+        from .wimf_cpp import c_save_file
 
-        wimf_cpp.c_save_file(path, raw)
+        c_save_file(path, raw)
     except (ImportError, AttributeError):
         with _builtins.open(path, "wb") as f:
             f.write(raw)

wimf/animation.py

@@ -10,7 +10,9 @@
 try:
     from . import wimf_cpp  # type: ignore[attr-defined]
 except ImportError:
-    pass
+    logging.getLogger(__name__).debug(
+        "Optional module '.wimf_cpp' could not be imported; using Python implementation."
+    )
 
 logger = logging.getLogger(__name__)
 

wimf/cat.py

@@ -14,7 +14,7 @@ def render_terminal(wimf_img, width=None):
     if width is None:
         try:
             width = os.get_terminal_size().columns
-        except:
+        except OSError:
             width = 80
 
     # Account for terminal character aspect ratio (~2:1)

wimf/cli.py

@@ -12,8 +12,6 @@
 import numpy as np
 from PIL import ExifTags, Image, ImageSequence
 
-from wimf.io import loadImage, saveImage
-
 logger = logging.getLogger(__name__)
 
 
@@ -39,7 +37,7 @@
 
         if in_ext in [".wimf", ".wif", ".awif"]:
             # open wimf and turn it back to pixels
             w, h, pixels, loaded_meta = loadImage(input_path, roi=roi, mip_level=mip_level)
 
             w, h = w >> mip_level, h >> mip_level
             if roi:
@@ -172,7 +170,7 @@
             w, h = img.size
             p_bytes = pixels.tobytes() if isinstance(pixels, np.ndarray) else pixels
 
             saveImage(
                 output_path, w, h, p_bytes, compression=compression, quality=quality, metadata=meta, preset=preset
             )
 
@@ -263,7 +261,7 @@
         meta["watermark_payload"] = args.embed_secret
 
     if args.extract_secret:
         _, _, _, loaded_meta = loadImage(args.input[0])
         return
 
     # wildcards are a pain

wimf/codec.py

@@ -8,8 +8,9 @@
 
 try:
     from . import wimf_cpp  # type: ignore[attr-defined]
-except ImportError:
-    pass
+except ImportError as exc:
+    # Optional C++ acceleration module is unavailable; fall back to Python implementation.
+    logger.debug("wimf_cpp extension not available, using Python codec path: %s", exc)
 import multiprocessing
 from concurrent.futures import ThreadPoolExecutor
 

wimf/test_core.py

@@ -1,5 +1,3 @@
-import os
-
 import numpy as np
 from PIL import Image
 

wimf/viewer.py

@@ -177,7 +177,7 @@ def main():
 
     if os.path.exists(p):
         root = tk.Tk()
-        viewer = WIMFViewer(root, p)
+        WIMFViewer(root, p)
         root.mainloop()
     else:
         print(f"File not found: {p}")