fotolab 0.34.1__tar.gz → 0.34.2__tar.gz

{fotolab-0.34.1/src/fotolab.egg-info → fotolab-0.34.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fotolab
-Version: 0.34.1
+Version: 0.34.2
 Summary: A console program to manipulate photos.
 Author-email: Kian-Meng Ang <kianmeng@cpan.org>
 License-Expression: AGPL-3.0-or-later

{fotolab-0.34.1 → fotolab-0.34.2}/pyproject.toml

@@ -7,7 +7,7 @@ where = ["src"]
 
 [project]
 name = "fotolab"
-version = "0.34.1"
+version = "0.34.2"
 description = "A console program to manipulate photos."
 authors = [{name = "Kian-Meng Ang", email = "kianmeng@cpan.org"}]
 requires-python = ">=3.10"

{fotolab-0.34.1 → fotolab-0.34.2}/src/fotolab/__init__.py

@@ -22,6 +22,8 @@ import logging
 import os
 import subprocess
 import sys
+from contextlib import contextmanager
+from typing import Iterator
 
 from PIL import Image
 
@@ -98,3 +100,13 @@ def open_image(filename: Path):
 
     except (OSError, FileNotFoundError) as error:
         log.error("Error opening image: %s -> %s", filename, error)
+
+
+@contextmanager
+def load_image(filename: Path) -> Iterator[Image.Image]:
+    """Load image using a context manager to ensure file handle is closed."""
+    try:
+        image = Image.open(filename)
+        yield image
+    finally:
+        image.close()

{fotolab-0.34.1 → fotolab-0.34.2}/src/fotolab/subcommands/animate.py

@@ -20,9 +20,8 @@ import logging
 from pathlib import Path
 from contextlib import ExitStack
 
-from PIL import Image
 
-from fotolab import open_image
+from fotolab import load_image, open_image
 
 log = logging.getLogger(__name__)
 
@@ -164,10 +163,10 @@ def run(args: argparse.Namespace) -> None:
     other_frames = []
 
     with ExitStack() as stack:
-        main_frame = stack.enter_context(Image.open(first_image_filepath))
+        main_frame = stack.enter_context(load_image(first_image_filepath))
 
         for image_filepath in image_filepaths[1:]:
-            img = stack.enter_context(Image.open(image_filepath))
+            img = stack.enter_context(load_image(image_filepath))
             other_frames.append(img)
 
         if args.output_filename:

{fotolab-0.34.1 → fotolab-0.34.2}/src/fotolab/subcommands/border.py

@@ -20,9 +20,9 @@ import logging
 from pathlib import Path
 from typing import Tuple
 
-from PIL import Image, ImageColor, ImageOps
+from PIL import ImageColor, ImageOps
 
-from fotolab import save_image
+from fotolab import load_image, save_image
 
 log = logging.getLogger(__name__)
 
@@ -136,15 +136,15 @@ def run(args: argparse.Namespace) -> None:
     log.debug(args)
 
     for image_filepath in [Path(f) for f in args.image_paths]:
-        original_image = Image.open(image_filepath)
-        border = get_border(args)
-        bordered_image = ImageOps.expand(
-            original_image,
-            border=border,
-            fill=ImageColor.getrgb(args.color),
-        )
-
-        save_image(args, bordered_image, image_filepath, "border")
+        with load_image(image_filepath) as original_image:
+            border = get_border(args)
+            bordered_image = ImageOps.expand(
+                original_image,
+                border=border,
+                fill=ImageColor.getrgb(args.color),
+            )
+
+            save_image(args, bordered_image, image_filepath, "border")
 
 
 def get_border(

{fotolab-0.34.1 → fotolab-0.34.2}/src/fotolab/subcommands/contrast.py

@@ -19,9 +19,9 @@ import argparse
 import logging
 from pathlib import Path
 
-from PIL import Image, ImageOps
+from PIL import ImageOps
 
-from fotolab import save_image
+from fotolab import load_image, save_image
 
 log = logging.getLogger(__name__)
 
@@ -103,25 +103,25 @@ def run(args: argparse.Namespace) -> None:
     log.debug(args)
 
     for image_path_str in args.image_paths:
-        original_image = Image.open(image_path_str)
-
-        if original_image.mode == "RGBA":
-            # Split the image into RGB and Alpha channels
-            rgb_image = original_image.convert("RGB")
-            alpha_channel = original_image.getchannel("A")
-
-            # Apply autocontrast to the RGB part
-            contrasted_rgb = ImageOps.autocontrast(
-                rgb_image, cutoff=args.cutoff
-            )
-
-            # Merge the contrasted RGB part with the original Alpha channel
-            contrasted_rgb.putalpha(alpha_channel)
-            contrast_image = contrasted_rgb
-        else:
-            # For other modes (like RGB, L, etc.), apply autocontrast directly
-            contrast_image = ImageOps.autocontrast(
-                original_image, cutoff=args.cutoff
-            )
-
-        save_image(args, contrast_image, Path(image_path_str), "contrast")
+        with load_image(Path(image_path_str)) as original_image:
+            if original_image.mode == "RGBA":
+                # Split the image into RGB and Alpha channels
+                rgb_image = original_image.convert("RGB")
+                alpha_channel = original_image.getchannel("A")
+
+                # Apply autocontrast to the RGB part
+                contrasted_rgb = ImageOps.autocontrast(
+                    rgb_image, cutoff=args.cutoff
+                )
+
+                # Merge the contrasted RGB part with the original Alpha channel
+                contrasted_rgb.putalpha(alpha_channel)
+                contrast_image = contrasted_rgb
+            else:
+                # For other modes (like RGB, L, etc.), apply autocontrast
+                # directly
+                contrast_image = ImageOps.autocontrast(
+                    original_image, cutoff=args.cutoff
+                )
+
+            save_image(args, contrast_image, Path(image_path_str), "contrast")

{fotolab-0.34.1 → fotolab-0.34.2}/src/fotolab/subcommands/halftone.py

@@ -23,7 +23,7 @@ from typing import NamedTuple
 
 from PIL import Image, ImageDraw
 
-from fotolab import save_gif_image, save_image
+from fotolab import load_image, save_gif_image, save_image
 
 log = logging.getLogger(__name__)
 
@@ -113,21 +113,21 @@ def run(args: argparse.Namespace) -> None:
 
     for image_path_str in args.image_paths:
         image_filename = Path(image_path_str)
-        original_image = Image.open(image_filename)
-        halftone_image = create_halftone_image(
-            original_image, args.cells, args.grayscale
-        )
-
-        if args.before_after:
-            save_gif_image(
-                args,
-                image_filename,
-                original_image,
-                halftone_image,
-                "halftone",
+        with load_image(image_filename) as original_image:
+            halftone_image = create_halftone_image(
+                original_image, args.cells, args.grayscale
             )
-        else:
-            save_image(args, halftone_image, image_filename, "halftone")
+
+            if args.before_after:
+                save_gif_image(
+                    args,
+                    image_filename,
+                    original_image,
+                    halftone_image,
+                    "halftone",
+                )
+            else:
+                save_image(args, halftone_image, image_filename, "halftone")
 
 
 def _draw_halftone_dot(

{fotolab-0.34.1 → fotolab-0.34.2}/src/fotolab/subcommands/montage.py

@@ -18,10 +18,11 @@
 import argparse
 import logging
 from pathlib import Path
+from contextlib import ExitStack
 
 from PIL import Image
 
-from fotolab import save_image
+from fotolab import load_image, save_image
 
 log = logging.getLogger(__name__)
 
@@ -72,22 +73,23 @@ def run(args: argparse.Namespace) -> None:
     """
     log.debug(args)
     images = []
-    for image_path_str in args.image_paths:
-        image_filename = Path(image_path_str)
-        images.append(Image.open(image_filename))
+    with ExitStack() as stack:
+        for image_path_str in args.image_paths:
+            image_filename = Path(image_path_str)
+            images.append(stack.enter_context(load_image(image_filename)))
 
-    if len(images) < 2:
-        raise ValueError("at least two images is required for montage")
+        if len(images) < 2:
+            raise ValueError("at least two images is required for montage")
 
-    total_width = sum(img.width for img in images)
-    total_height = max(img.height for img in images)
+        total_width = sum(img.width for img in images)
+        total_height = max(img.height for img in images)
 
-    montaged_image = Image.new("RGB", (total_width, total_height))
+        montaged_image = Image.new("RGB", (total_width, total_height))
 
-    x_offset = 0
-    for image in images:
-        montaged_image.paste(image, (x_offset, 0))
-        x_offset += image.width
+        x_offset = 0
+        for image in images:
+            montaged_image.paste(image, (x_offset, 0))
+            x_offset += image.width
 
-    output_image_filename = Path(args.image_paths[0])
-    save_image(args, montaged_image, output_image_filename, "montage")
+        output_image_filename = Path(args.image_paths[0])
+        save_image(args, montaged_image, output_image_filename, "montage")

{fotolab-0.34.1 → fotolab-0.34.2}/src/fotolab/subcommands/resize.py

@@ -18,12 +18,11 @@
 import argparse
 import logging
 import math
-import sys
 from pathlib import Path
 
 from PIL import Image, ImageColor
 
-from fotolab import save_image
+from fotolab import load_image, save_image
 
 log = logging.getLogger(__name__)
 
@@ -65,48 +64,28 @@ def build_subparser(subparsers) -> None:
         ),
     )
 
-    if "-c" in sys.argv or "--canvas" in sys.argv:
-        resize_parser.add_argument(
-            "-W",
-            "--width",
-            dest="width",
-            help="set the width of the image (default: '%(default)s')",
-            type=int,
-            required=True,
-            metavar="WIDTH",
-        )
-
-        resize_parser.add_argument(
-            "-H",
-            "--height",
-            dest="height",
-            help="set the height of the image (default: '%(default)s')",
-            type=int,
-            required=True,
-            metavar="HEIGHT",
-        )
-    else:
-        group = resize_parser.add_mutually_exclusive_group(required=False)
-
-        group.add_argument(
-            "-W",
-            "--width",
-            dest="width",
-            help="set the width of the image (default: '%(default)s')",
-            type=int,
-            default=DEFAULT_WIDTH,
-            metavar="WIDTH",
-        )
-
-        group.add_argument(
-            "-H",
-            "--height",
-            dest="height",
-            help="set the height of the image (default: '%(default)s')",
-            type=int,
-            default=DEFAULT_HEIGHT,
-            metavar="HEIGHT",
-        )
+    # Define width and height arguments as optional with defaults.
+    # The conditional logic (required/mutually exclusive) is now handled in the
+    # run function.
+    resize_parser.add_argument(
+        "-W",
+        "--width",
+        dest="width",
+        help="set the width of the image (default: '%(default)s')",
+        type=int,
+        default=DEFAULT_WIDTH,
+        metavar="WIDTH",
+    )
+
+    resize_parser.add_argument(
+        "-H",
+        "--height",
+        dest="height",
+        help="set the height of the image (default: '%(default)s')",
+        type=int,
+        default=DEFAULT_HEIGHT,
+        metavar="HEIGHT",
+    )
 
     resize_parser.add_argument(
         "-op",
@@ -137,13 +116,31 @@ def run(args: argparse.Namespace) -> None:
     """
     log.debug(args)
 
+    width_provided = args.width != DEFAULT_WIDTH
+    height_provided = args.height != DEFAULT_HEIGHT
+
+    if args.canvas:
+        # Canvas mode: Both width and height are required
+        if not (width_provided and height_provided):
+            raise SystemExit(
+                "error: argument -W/--width and -H/--height are required when "
+                "using --canvas"
+            )
+    else:
+        # Resize mode: Width and height are mutually exclusive
+        if width_provided and height_provided:
+            raise SystemExit(
+                "error: argument -W/--width and -H/--height are mutually "
+                "exclusive when not using --canvas"
+            )
+
     for image_filepath in [Path(f) for f in args.image_paths]:
-        original_image = Image.open(image_filepath)
-        if args.canvas:
-            resized_image = _resize_image_onto_canvas(original_image, args)
-        else:
-            resized_image = _resize_image(original_image, args)
-        save_image(args, resized_image, image_filepath, "resize")
+        with load_image(image_filepath) as original_image:
+            if args.canvas:
+                resized_image = _resize_image_onto_canvas(original_image, args)
+            else:
+                resized_image = _resize_image(original_image, args)
+            save_image(args, resized_image, image_filepath, "resize")
 
 
 def _resize_image_onto_canvas(original_image, args):
@@ -176,18 +173,20 @@ def _calc_new_image_dimension(image, args) -> tuple:
 
     original_aspect_ratio = old_width / old_height
 
-    if new_width != DEFAULT_WIDTH and new_height == DEFAULT_HEIGHT:
-        # user provided width, calculate height to maintain aspect ratio
-        new_height = math.ceil(new_width / original_aspect_ratio)
-        log.debug("new height calculated based on width: %d", new_height)
-    elif new_height != DEFAULT_HEIGHT and new_width == DEFAULT_WIDTH:
-        # user provided height, calculate width to maintain aspect ratio
-        new_width = math.ceil(new_height * original_aspect_ratio)
-        log.debug("new width calculated based on height: %d", new_width)
-
-    # if both are default, no calculation needed, use defaults
-    # due to argparse's mutually exclusive group, it's not possible for both
-    # new_width and new_height to be non-default when --canvas is False
+    match (new_width != DEFAULT_WIDTH, new_height != DEFAULT_HEIGHT):
+        case (True, False):
+            # user provided width, calculate height to maintain aspect ratio
+            new_height = math.ceil(new_width / original_aspect_ratio)
+            log.debug("new height calculated based on width: %d", new_height)
+        case (False, True):
+            # user provided height, calculate width to maintain aspect ratio
+            new_width = math.ceil(new_height * original_aspect_ratio)
+            log.debug("new width calculated based on height: %d", new_width)
+        case _:
+            # if both are default, no calculation needed, use defaults.
+            # The case where both are non-default is disallowed by argparse
+            # when --canvas is False, so we do nothing here.
+            pass
 
     log.debug("new image dimension: %d x %d", new_width, new_height)
     return (new_width, new_height)

{fotolab-0.34.1 → fotolab-0.34.2}/src/fotolab/subcommands/rotate.py

@@ -21,7 +21,7 @@ from pathlib import Path
 
 from PIL import Image
 
-from fotolab import save_image
+from fotolab import load_image, save_image
 
 log = logging.getLogger(__name__)
 
@@ -91,11 +91,11 @@ def run(args: argparse.Namespace) -> None:
     for image_path_str in args.image_paths:
         image_filename = Path(image_path_str)
         log.debug(f"Processing image: {image_filename}")
-        original_image = Image.open(image_filename)
-        log.debug(f"Original image size: {original_image.size}")
-        rotated_image = original_image.rotate(
-            rotation, expand=True, resample=Image.Resampling.BICUBIC
-        )
-        log.debug(f"Rotated image size: {rotated_image.size}")
-        save_image(args, rotated_image, image_filename, "rotate")
-        log.debug(f"Image saved: {image_filename}")
+        with load_image(image_filename) as original_image:
+            log.debug(f"Original image size: {original_image.size}")
+            rotated_image = original_image.rotate(
+                rotation, expand=True, resample=Image.Resampling.BICUBIC
+            )
+            log.debug(f"Rotated image size: {rotated_image.size}")
+            save_image(args, rotated_image, image_filename, "rotate")
+            log.debug(f"Image saved: {image_filename}")

{fotolab-0.34.1 → fotolab-0.34.2}/src/fotolab/subcommands/sharpen.py

@@ -19,9 +19,9 @@ import argparse
 import logging
 from pathlib import Path
 
-from PIL import Image, ImageFilter
+from PIL import ImageFilter
 
-from fotolab import save_gif_image, save_image
+from fotolab import load_image, save_gif_image, save_image
 
 log = logging.getLogger(__name__)
 
@@ -116,19 +116,21 @@ def run(args: argparse.Namespace) -> None:
     log.debug(args)
 
     for image_path_str in args.image_paths:
-        original_image = Image.open(image_path_str)
-        sharpen_image = original_image.filter(
-            ImageFilter.UnsharpMask(
-                args.radius, percent=args.percent, threshold=args.threshold
+        with load_image(Path(image_path_str)) as original_image:
+            sharpen_image = original_image.filter(
+                ImageFilter.UnsharpMask(
+                    args.radius, percent=args.percent, threshold=args.threshold
+                )
             )
-        )
-        if args.before_after:
-            save_gif_image(
-                args,
-                Path(image_path_str),
-                original_image,
-                sharpen_image,
-                "sharpen",
-            )
-        else:
-            save_image(args, sharpen_image, Path(image_path_str), "sharpen")
+            if args.before_after:
+                save_gif_image(
+                    args,
+                    Path(image_path_str),
+                    original_image,
+                    sharpen_image,
+                    "sharpen",
+                )
+            else:
+                save_image(
+                    args, sharpen_image, Path(image_path_str), "sharpen"
+                )

{fotolab-0.34.1 → fotolab-0.34.2}/src/fotolab/subcommands/watermark.py

@@ -23,7 +23,7 @@ from typing import Tuple
 
 from PIL import Image, ImageColor, ImageDraw, ImageFont, ImageSequence
 
-from fotolab import save_image
+from fotolab import load_image, save_image
 from fotolab.subcommands.info import get_formatted_camera_info
 
 log: logging.Logger = logging.getLogger(__name__)
@@ -192,7 +192,19 @@ def run(args: argparse.Namespace) -> None:
 
     for image_path_str in args.image_paths:
         try:
-            image: Image.Image = Image.open(image_path_str)
+            with load_image(Path(image_path_str)) as image:
+                if image.format == "GIF":
+                    watermark_gif_image(image, image_path_str, args)
+                else:
+                    watermarked_image: Image.Image = watermark_non_gif_image(
+                        image, args
+                    )
+                    save_image(
+                        args,
+                        watermarked_image,
+                        Path(image_path_str),
+                        "watermark",
+                    )
         except FileNotFoundError:
             log.error("Image file not found: %s", image_path_str)
             continue
@@ -200,16 +212,6 @@ def run(args: argparse.Namespace) -> None:
             log.error("Could not open image %s: %s", image_path_str, e)
             continue
 
-        if image.format == "GIF":
-            watermark_gif_image(image, image_path_str, args)
-        else:
-            watermarked_image: Image.Image = watermark_non_gif_image(
-                image, args
-            )
-            save_image(
-                args, watermarked_image, Path(image_path_str), "watermark"
-            )
-
 
 def watermark_gif_image(
     original_image: Image.Image, output_filename: str, args: argparse.Namespace

{fotolab-0.34.1 → fotolab-0.34.2/src/fotolab.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fotolab
-Version: 0.34.1
+Version: 0.34.2
 Summary: A console program to manipulate photos.
 Author-email: Kian-Meng Ang <kianmeng@cpan.org>
 License-Expression: AGPL-3.0-or-later

fotolab-0.34.2/tests/test_resize_subcommand.py

@@ -0,0 +1,63 @@
+# Copyright (C) 2024,2025 Kian-Meng Ang
+
+# This program is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the Free
+# Software Foundation, either version 3 of the License, or (at your option) any
+# later version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+
+def test_resize_subcommand(cli_runner, image_file):
+    img_path = image_file("sample.png")
+    ret = cli_runner("resize", str(img_path), "--width", "200")
+    assert ret.returncode == 0
+
+
+def test_resize_subcommand_mutually_exclusive_failure(cli_runner, image_file):
+    img_path = image_file("sample.png")
+    ret = cli_runner(
+        "resize", str(img_path), "--width", "200", "--height", "200"
+    )
+    assert ret.returncode != 0
+    assert (
+        "error: argument -W/--width and -H/--height are mutually exclusive when not using --canvas"
+        in ret.stderr
+    )
+
+
+def test_resize_subcommand_canvas_required_failure(cli_runner, image_file):
+    img_path = image_file("sample.png")
+    ret = cli_runner("resize", str(img_path), "--canvas", "--width", "200")
+    assert ret.returncode != 0
+    assert (
+        "error: argument -W/--width and -H/--height are required when using --canvas"
+        in ret.stderr
+    )
+
+    ret = cli_runner("resize", str(img_path), "--canvas", "--height", "200")
+    assert ret.returncode != 0
+    assert (
+        "error: argument -W/--width and -H/--height are required when using --canvas"
+        in ret.stderr
+    )
+
+
+def test_resize_subcommand_canvas_success(cli_runner, image_file):
+    img_path = image_file("sample.png")
+    ret = cli_runner(
+        "resize",
+        str(img_path),
+        "--canvas",
+        "--width",
+        "200",
+        "--height",
+        "200",
+    )
+    assert ret.returncode == 0

fotolab-0.34.1/tests/test_resize_subcommand.py

@@ -1,20 +0,0 @@
-# Copyright (C) 2024,2025 Kian-Meng Ang
-
-# This program is free software: you can redistribute it and/or modify it under
-# the terms of the GNU Affero General Public License as published by the Free
-# Software Foundation, either version 3 of the License, or (at your option) any
-# later version.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
-# details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <https://www.gnu.org/licenses/>.
-
-
-def test_resize_subcommand(cli_runner, image_file):
-    img_path = image_file("sample.png")
-    ret = cli_runner("resize", str(img_path), "--width", "200")
-    assert ret.returncode == 0