fotolab 0.28.0__tar.gz → 0.28.2__tar.gz

{fotolab-0.28.0 → fotolab-0.28.2}/.gitignore

@@ -160,6 +160,7 @@ cython_debug/
 #.idea/
 
 # heatmaps
-TODO
 *.png
+.aider*
+TODO
 output

{fotolab-0.28.0 → fotolab-0.28.2}/.pre-commit-config.yaml

@@ -15,7 +15,7 @@ repos:
       - id: trailing-whitespace
 
   - repo: https://github.com/abravalheri/validate-pyproject
-    rev: v0.23
+    rev: v0.24
     hooks:
       - id: validate-pyproject
         name: validate-pyproject

{fotolab-0.28.0 → fotolab-0.28.2}/CHANGELOG.md

@@ -7,6 +7,23 @@ and this project adheres to [0-based versioning](https://0ver.org/).
 
 ## [Unreleased]
 
+## v0.28.2 (2025-03-23)
+
+- Accept width in integer instead of string
+- Bump pre-commit hook for validate-project
+- Handle file not found and other exceptions when opening/processing images
+- Remove all unnecessary exceptions handling
+- Use Union for border width return type to allow int or tuple
+
+## v0.28.1 (2025-03-16)
+
+- Add typehint to `_get_output_filename` function
+- Fix incorrect log message formatting in save_gif_image function
+- Handle `FileNotFoundError` and `IOError` exceptions when opening images
+- Handle `OSError` when opening image files.
+- Ignore aider files
+- Revert refactoring on open image using default program
+
 ## v0.28.0 (2025-03-09)
 
 - Handle exception of private function with exif info

{fotolab-0.28.0 → fotolab-0.28.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fotolab
-Version: 0.28.0
+Version: 0.28.2
 Summary: A console program that manipulate images.
 Keywords: photography,photo
 Author-email: Kian-Meng Ang <kianmeng@cpan.org>

{fotolab-0.28.0 → fotolab-0.28.2}/fotolab/__init__.py

@@ -23,7 +23,7 @@ from pathlib import Path
 
 from PIL import Image
 
-__version__ = "0.28.0"
+__version__ = "0.28.2"
 
 log = logging.getLogger(__name__)
 
@@ -43,7 +43,7 @@ def save_gif_image(
     )
     new_filename.parent.mkdir(parents=True, exist_ok=True)
 
-    log.info("f{subcommand} gif image: %s", new_filename)
+    log.info("%s gif image: %s", subcommand, new_filename)
     original_image.save(
         new_filename,
         format="gif",
@@ -79,7 +79,9 @@ def save_image(args, new_image, output_filename, subcommand):
         _open_image(new_filename)
 
 
-def _get_output_filename(args, image_file, subcommand):
+def _get_output_filename(
+    args: argparse.Namespace, image_file: Path, subcommand: str
+) -> Path:
     """Build and return output filename based on the command line options."""
     if args.overwrite:
         return image_file.with_name(image_file.name)
@@ -91,14 +93,14 @@ def _get_output_filename(args, image_file, subcommand):
 
 def _open_image(filename):
     """Open generated image using default program."""
-    platform_open_func = {
-        "linux": subprocess.call(["xdg-open", filename]),
-        "darwin": subprocess.call(["open", filename]),
-        "windows": subprocess.call(["start", filename]),
-    }
     try:
-        platform_open_func[sys.platform]
-    except KeyError:
-        print(f"Unsupported platform: {sys.platform}")
-    else:
+        if sys.platform == "linux":
+            subprocess.call(["xdg-open", filename])
+        elif sys.platform == "darwin":
+            subprocess.call(["open", filename])
+        elif sys.platform == "windows":
+            subprocess.Popen(["open", filename])
         log.info("open image: %s", filename.resolve())
+
+    except OSError as e:
+        log.error("Error opening image: %s -> %s", filename, e)

{fotolab-0.28.0 → fotolab-0.28.2}/fotolab/subcommands/border.py

@@ -17,6 +17,7 @@
 
 import argparse
 import logging
+from typing import Tuple, Union
 
 from PIL import Image, ImageColor, ImageOps
 
@@ -54,9 +55,9 @@ def build_subparser(subparsers) -> None:
         "-w",
         "--width",
         dest="width",
-        type=str,
+        type=int,
         default=10,
-        help="set the width of border (default: '%(default)s')",
+        help="set the width of border in pixels (default: '%(default)s')",
         metavar="WIDTH",
     )
 
@@ -64,9 +65,9 @@ def build_subparser(subparsers) -> None:
         "-wt",
         "--width-top",
         dest="width_top",
-        type=str,
+        type=int,
         default=0,
-        help="set the width of top border (default: '%(default)s')",
+        help="set the width of top border in pixels (default: '%(default)s')",
         metavar="WIDTH",
     )
 
@@ -74,9 +75,12 @@ def build_subparser(subparsers) -> None:
         "-wr",
         "--width-right",
         dest="width_right",
-        type=str,
+        type=int,
         default=0,
-        help="set the width of right border (default: '%(default)s')",
+        help=(
+            "set the width of right border in pixels"
+            " (default: '%(default)s')"
+        ),
         metavar="WIDTH",
     )
 
@@ -84,9 +88,12 @@ def build_subparser(subparsers) -> None:
         "-wb",
         "--width-bottom",
         dest="width_bottom",
-        type=str,
+        type=int,
         default=0,
-        help="set the width of bottom border (default: '%(default)s')",
+        help=(
+            "set the width of bottom border in pixels"
+            " (default: '%(default)s')"
+        ),
         metavar="WIDTH",
     )
 
@@ -94,9 +101,9 @@ def build_subparser(subparsers) -> None:
         "-wl",
         "--width-left",
         dest="width_left",
-        type=str,
+        type=int,
         default=0,
-        help="set the width of left border (default: '%(default)s')",
+        help="set the width of left border in pixels (default: '%(default)s')",
         metavar="WIDTH",
     )
 
@@ -130,27 +137,34 @@ def run(args: argparse.Namespace) -> None:
     log.debug(args)
 
     for image_filename in args.image_filenames:
-        original_image = Image.open(image_filename)
-
-        border = get_border(args)
-        bordered_image = ImageOps.expand(
-            original_image,
-            border=border,
-            fill=ImageColor.getrgb(args.color),
-        )
+        try:
+            original_image = Image.open(image_filename)
+            border = get_border(args)
+            bordered_image = ImageOps.expand(
+                original_image,
+                border=border,
+                fill=ImageColor.getrgb(args.color),
+            )
+        except Exception as e:
+            log.error("Error adding border to %s: %s", image_filename, e)
+            continue
 
         save_image(args, bordered_image, image_filename, "border")
 
 
-def get_border(args: argparse.Namespace) -> tuple[int, int, int, int]:
+def get_border(
+    args: argparse.Namespace,
+) -> Union[Tuple[int, int, int, int], int]:
     """Calculate the border dimensions.
 
     Args:
         args (argparse.Namespace): Command line arguments
 
     Returns:
-        tuple[int, int, int, int]: Border dimensions in pixesl. If individual
-        widths are not specified, returns a uniform width for all sides.
+        Union[Tuple[int, int, int, int], int]: Border dimensions in pixels.
+        If individual widths are specified, returns a tuple of (left, top,
+        right, bottom) widths.  Otherwise, returns a uniform width for all
+        sides.
     """
     if any(
         [
@@ -161,9 +175,9 @@ def get_border(args: argparse.Namespace) -> tuple[int, int, int, int]:
         ]
     ):
         return (
-            int(args.width_left),
-            int(args.width_top),
-            int(args.width_right),
-            int(args.width_bottom),
+            args.width_left,
+            args.width_top,
+            args.width_right,
+            args.width_bottom,
         )
     return args.width

{fotolab-0.28.0 → fotolab-0.28.2}/fotolab/subcommands/contrast.py

@@ -86,9 +86,14 @@ def run(args: argparse.Namespace) -> None:
     log.debug(args)
 
     for image_filename in args.image_filenames:
-        original_image = Image.open(image_filename)
-        contrast_image = ImageOps.autocontrast(
-            original_image, cutoff=args.cutoff
-        )
-
-        save_image(args, contrast_image, image_filename, "contrast")
+        try:
+            original_image = Image.open(image_filename)
+            contrast_image = ImageOps.autocontrast(
+                original_image, cutoff=args.cutoff
+            )
+
+            save_image(args, contrast_image, image_filename, "contrast")
+        except FileNotFoundError:
+            log.error(f"Image file not found: {image_filename}")
+        except IOError:
+            log.error(f"Cannot open or read image file: {image_filename}")