fotolab 0.34.1__tar.gz → 0.34.3__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fotolab
-Version: 0.34.1
+Version: 0.34.3
 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.3}/pyproject.toml

@@ -1,13 +1,6 @@
-[build-system]
-requires = ["setuptools>=61.0"]
-build-backend = "setuptools.build_meta"
-
-[tool.setuptools.packages.find]
-where = ["src"]
-
 [project]
 name = "fotolab"
-version = "0.34.1"
+version = "0.34.3"
 description = "A console program to manipulate photos."
 authors = [{name = "Kian-Meng Ang", email = "kianmeng@cpan.org"}]
 requires-python = ">=3.10"
@@ -59,6 +52,13 @@ lint = [
     "ruff",
 ]
 
+[build-system]
+requires = ["setuptools>=61.0"]
+build-backend = "setuptools.build_meta"
+
+[tool.setuptools.packages.find]
+where = ["src"]
+
 # verify through: uv run ruff check --show-settings
 [tool.ruff]
 line-length = 79

{fotolab-0.34.1 → fotolab-0.34.3}/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.3}/src/fotolab/subcommands/__init__.py

@@ -26,6 +26,7 @@ def build_subparser(subparsers):
     subcommands = {
         name: importlib.import_module(name)
         for finder, name, ispkg in iter_namespace
+        if not name.endswith(".common")
     }
 
     for subcommand in subcommands.values():

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

@@ -20,9 +20,9 @@ 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
+from .common import add_common_arguments, log_args_decorator
 
 log = logging.getLogger(__name__)
 
@@ -48,14 +48,7 @@ def build_subparser(subparsers) -> None:
 
     animate_parser.set_defaults(func=run)
 
-    animate_parser.add_argument(
-        dest="image_paths",
-        help="set the image filenames",
-        nargs="+",
-        type=str,
-        default=None,
-        metavar="IMAGE_PATHS",
-    )
+    add_common_arguments(animate_parser)
 
     animate_parser.add_argument(
         "-f",
@@ -91,15 +84,6 @@ def build_subparser(subparsers) -> None:
         metavar="LOOP",
     )
 
-    animate_parser.add_argument(
-        "-op",
-        "--open",
-        default=False,
-        action="store_true",
-        dest="open",
-        help="open the image using default program (default: '%(default)s')",
-    )
-
     animate_parser.add_argument(
         "--webp-quality",
         dest="webp_quality",
@@ -131,14 +115,6 @@ def build_subparser(subparsers) -> None:
         metavar="METHOD",
     )
 
-    animate_parser.add_argument(
-        "-od",
-        "--output-dir",
-        dest="output_dir",
-        default="output",
-        help="set default output folder (default: '%(default)s')",
-    )
-
     animate_parser.add_argument(
         "-of",
         "--output-filename",
@@ -148,6 +124,7 @@ def build_subparser(subparsers) -> None:
     )
 
 
+@log_args_decorator
 def run(args: argparse.Namespace) -> None:
     """Run animate subcommand.
 
@@ -157,17 +134,16 @@ def run(args: argparse.Namespace) -> None:
     Returns:
         None
     """
-    log.debug(args)
 
     image_filepaths = [Path(f) for f in args.image_paths]
     first_image_filepath = image_filepaths[0]
     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.3}/src/fotolab/subcommands/auto.py

@@ -23,6 +23,7 @@ import fotolab.subcommands.contrast
 import fotolab.subcommands.resize
 import fotolab.subcommands.sharpen
 import fotolab.subcommands.watermark
+from .common import add_common_arguments, log_args_decorator
 
 log = logging.getLogger(__name__)
 
@@ -35,14 +36,7 @@ def build_subparser(subparsers) -> None:
 
     auto_parser.set_defaults(func=run)
 
-    auto_parser.add_argument(
-        dest="image_paths",
-        help="set the image filename",
-        nargs="+",
-        type=str,
-        default=None,
-        metavar="IMAGE_PATHS",
-    )
+    add_common_arguments(auto_parser)
 
     auto_parser.add_argument(
         "-t",
@@ -65,6 +59,7 @@ def build_subparser(subparsers) -> None:
     )
 
 
+@log_args_decorator
 def run(args: argparse.Namespace) -> None:
     """Run auto subcommand.
 
@@ -106,7 +101,6 @@ def run(args: argparse.Namespace) -> None:
     combined_args.overwrite = True
     combined_args.open = False
 
-    log.debug(args)
     log.debug(combined_args)
 
     fotolab.subcommands.resize.run(combined_args)
@@ -118,7 +112,6 @@ def run(args: argparse.Namespace) -> None:
         output_filename = (
             args.title.lower().replace(",", "").replace(" ", "_") + ".gif"
         )
-        combined_args.output_dir = "output"
         combined_args.format = "gif"
         combined_args.duration = 2500
         combined_args.loop = 0

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

@@ -20,9 +20,10 @@ 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
+from .common import add_common_arguments, log_args_decorator
 
 log = logging.getLogger(__name__)
 
@@ -33,14 +34,7 @@ def build_subparser(subparsers: argparse._SubParsersAction) -> None:
 
     border_parser.set_defaults(func=run)
 
-    border_parser.add_argument(
-        dest="image_paths",
-        help="set the image filenames",
-        nargs="+",
-        type=str,
-        default=None,
-        metavar="IMAGE_PATHS",
-    )
+    add_common_arguments(border_parser)
 
     border_parser.add_argument(
         "-c",
@@ -106,24 +100,8 @@ def build_subparser(subparsers: argparse._SubParsersAction) -> None:
         metavar="WIDTH",
     )
 
-    border_parser.add_argument(
-        "-op",
-        "--open",
-        default=False,
-        action="store_true",
-        dest="open",
-        help="open the image using default program (default: '%(default)s')",
-    )
-
-    border_parser.add_argument(
-        "-od",
-        "--output-dir",
-        dest="output_dir",
-        default="output",
-        help="set default output folder (default: '%(default)s')",
-    )
-
 
+@log_args_decorator
 def run(args: argparse.Namespace) -> None:
     """Run border subcommand.
 
@@ -133,18 +111,17 @@ def run(args: argparse.Namespace) -> None:
     Returns:
         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/src/fotolab/subcommands/montage.py → fotolab-0.34.3/src/fotolab/subcommands/common.py

@@ -2,6 +2,7 @@
 #
 # 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.
 #
@@ -13,28 +14,34 @@
 # 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/>.
 
-"""Montage subcommand."""
+"""Common argument parsing for subcommands."""
 
 import argparse
 import logging
-from pathlib import Path
+from functools import wraps
+from typing import Callable
 
-from PIL import Image
+log = logging.getLogger(__name__)
 
-from fotolab import save_image
 
-log = logging.getLogger(__name__)
+def log_args_decorator(func: Callable) -> Callable:
+    """Decorator to log the arguments passed to a function."""
 
+    @wraps(func)
+    def wrapper(args: argparse.Namespace) -> None:
+        log.debug(args)
+        return func(args)
+
+    return wrapper
 
-def build_subparser(subparsers) -> None:
-    """Build the subparser."""
-    montage_parser = subparsers.add_parser(
-        "montage", help="montage a list of image"
-    )
 
-    montage_parser.set_defaults(func=run)
+def add_common_arguments(parser: argparse.ArgumentParser) -> None:
+    """Add common arguments to a subparser.
 
-    montage_parser.add_argument(
+    Args:
+        parser (argparse.ArgumentParser): The subparser to add arguments to.
+    """
+    parser.add_argument(
         dest="image_paths",
         help="set the image filenames",
         nargs="+",
@@ -43,7 +50,7 @@ def build_subparser(subparsers) -> None:
         metavar="IMAGE_PATHS",
     )
 
-    montage_parser.add_argument(
+    parser.add_argument(
         "-op",
         "--open",
         default=False,
@@ -52,42 +59,10 @@ def build_subparser(subparsers) -> None:
         help="open the image using default program (default: '%(default)s')",
     )
 
-    montage_parser.add_argument(
+    parser.add_argument(
         "-od",
         "--output-dir",
         dest="output_dir",
         default="output",
         help="set default output folder (default: '%(default)s')",
     )
-
-
-def run(args: argparse.Namespace) -> None:
-    """Run montage subcommand.
-
-    Args:
-        args (argparse.Namespace): Config from command line arguments
-
-    Returns:
-        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))
-
-    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)
-
-    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
-
-    output_image_filename = Path(args.image_paths[0])
-    save_image(args, montaged_image, output_image_filename, "montage")

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

@@ -19,9 +19,10 @@ 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
+from .common import add_common_arguments, log_args_decorator
 
 log = logging.getLogger(__name__)
 
@@ -50,14 +51,7 @@ def build_subparser(subparsers: argparse._SubParsersAction) -> None:
 
     contrast_parser.set_defaults(func=run)
 
-    contrast_parser.add_argument(
-        dest="image_paths",
-        help="set the image filename",
-        nargs="+",
-        type=str,
-        default=None,
-        metavar="IMAGE_PATHS",
-    )
+    add_common_arguments(contrast_parser)
 
     contrast_parser.add_argument(
         "-c",
@@ -73,24 +67,8 @@ def build_subparser(subparsers: argparse._SubParsersAction) -> None:
         metavar="CUTOFF",
     )
 
-    contrast_parser.add_argument(
-        "-op",
-        "--open",
-        default=False,
-        action="store_true",
-        dest="open",
-        help="open the image using default program (default: '%(default)s')",
-    )
-
-    contrast_parser.add_argument(
-        "-od",
-        "--output-dir",
-        dest="output_dir",
-        default="output",
-        help="set default output folder (default: '%(default)s')",
-    )
-
 
+@log_args_decorator
 def run(args: argparse.Namespace) -> None:
     """Run contrast subcommand.
 
@@ -100,28 +78,27 @@ def run(args: argparse.Namespace) -> None:
     Returns:
         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.3}/src/fotolab/subcommands/halftone.py

@@ -23,7 +23,8 @@ 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
+from .common import add_common_arguments, log_args_decorator
 
 log = logging.getLogger(__name__)
 
@@ -44,14 +45,7 @@ def build_subparser(subparsers) -> None:
 
     halftone_parser.set_defaults(func=run)
 
-    halftone_parser.add_argument(
-        dest="image_paths",
-        help="set the image filename",
-        nargs="+",
-        type=str,
-        default=None,
-        metavar="IMAGE_PATHS",
-    )
+    add_common_arguments(halftone_parser)
 
     halftone_parser.add_argument(
         "-ba",
@@ -62,23 +56,6 @@ def build_subparser(subparsers) -> None:
         help="generate a GIF showing before and after changes",
     )
 
-    halftone_parser.add_argument(
-        "-op",
-        "--open",
-        default=False,
-        action="store_true",
-        dest="open",
-        help="open the image using default program (default: '%(default)s')",
-    )
-
-    halftone_parser.add_argument(
-        "-od",
-        "--output-dir",
-        dest="output_dir",
-        default="output",
-        help="set default output folder (default: '%(default)s')",
-    )
-
     halftone_parser.add_argument(
         "-c",
         "--cells",
@@ -100,6 +77,7 @@ def build_subparser(subparsers) -> None:
     )
 
 
+@log_args_decorator
 def run(args: argparse.Namespace) -> None:
     """Run halftone subcommand.
 
@@ -109,25 +87,24 @@ def run(args: argparse.Namespace) -> None:
     Returns:
         None
     """
-    log.debug(args)
 
     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.3}/src/fotolab/subcommands/info.py

@@ -20,6 +20,8 @@ import logging
 
 from PIL import ExifTags, Image
 
+from .common import log_args_decorator
+
 log = logging.getLogger(__name__)
 
 
@@ -62,6 +64,7 @@ def build_subparser(subparsers) -> None:
     )
 
 
+@log_args_decorator
 def run(args: argparse.Namespace) -> None:
     """Run info subcommand.
 
@@ -71,7 +74,6 @@ def run(args: argparse.Namespace) -> None:
     Returns:
         None
     """
-    log.debug(args)
 
     with Image.open(args.image_filename) as image:
         exif_tags = extract_exif_tags(image, args.sort)

fotolab-0.34.3/src/fotolab/subcommands/montage.py

@@ -0,0 +1,72 @@
+# 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/>.
+
+"""Montage subcommand."""
+
+import argparse
+import logging
+from pathlib import Path
+from contextlib import ExitStack
+
+from PIL import Image
+
+from fotolab import load_image, save_image
+from .common import add_common_arguments, log_args_decorator
+
+log = logging.getLogger(__name__)
+
+
+def build_subparser(subparsers) -> None:
+    """Build the subparser."""
+    montage_parser = subparsers.add_parser(
+        "montage", help="montage a list of image"
+    )
+
+    montage_parser.set_defaults(func=run)
+
+    add_common_arguments(montage_parser)
+
+
+@log_args_decorator
+def run(args: argparse.Namespace) -> None:
+    """Run montage subcommand.
+
+    Args:
+        args (argparse.Namespace): Config from command line arguments
+
+    Returns:
+        None
+    """
+    images = []
+    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")
+
+        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))
+
+        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")