fotolab 0.34.1__py3-none-any.whl → 0.34.3__py3-none-any.whl

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/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/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/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/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/subcommands/common.py

@@ -0,0 +1,68 @@
+# 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/>.
+
+"""Common argument parsing for subcommands."""
+
+import argparse
+import logging
+from functools import wraps
+from typing import Callable
+
+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 add_common_arguments(parser: argparse.ArgumentParser) -> None:
+    """Add common arguments to a subparser.
+
+    Args:
+        parser (argparse.ArgumentParser): The subparser to add arguments to.
+    """
+    parser.add_argument(
+        dest="image_paths",
+        help="set the image filenames",
+        nargs="+",
+        type=str,
+        default=None,
+        metavar="IMAGE_PATHS",
+    )
+
+    parser.add_argument(
+        "-op",
+        "--open",
+        default=False,
+        action="store_true",
+        dest="open",
+        help="open the image using default program (default: '%(default)s')",
+    )
+
+    parser.add_argument(
+        "-od",
+        "--output-dir",
+        dest="output_dir",
+        default="output",
+        help="set default output folder (default: '%(default)s')",
+    )

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/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/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/subcommands/montage.py

@@ -18,10 +18,12 @@
 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
+from .common import add_common_arguments, log_args_decorator
 
 log = logging.getLogger(__name__)
 
@@ -34,33 +36,10 @@ def build_subparser(subparsers) -> None:
 
     montage_parser.set_defaults(func=run)
 
-    montage_parser.add_argument(
-        dest="image_paths",
-        help="set the image filenames",
-        nargs="+",
-        type=str,
-        default=None,
-        metavar="IMAGE_PATHS",
-    )
-
-    montage_parser.add_argument(
-        "-op",
-        "--open",
-        default=False,
-        action="store_true",
-        dest="open",
-        help="open the image using default program (default: '%(default)s')",
-    )
-
-    montage_parser.add_argument(
-        "-od",
-        "--output-dir",
-        dest="output_dir",
-        default="output",
-        help="set default output folder (default: '%(default)s')",
-    )
+    add_common_arguments(montage_parser)
 
 
+@log_args_decorator
 def run(args: argparse.Namespace) -> None:
     """Run montage subcommand.
 
@@ -70,24 +49,24 @@ def run(args: argparse.Namespace) -> None:
     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))
+    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/subcommands/resize.py

@@ -18,12 +18,12 @@
 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
+from .common import add_common_arguments, log_args_decorator
 
 log = logging.getLogger(__name__)
 
@@ -37,14 +37,7 @@ def build_subparser(subparsers) -> None:
 
     resize_parser.set_defaults(func=run)
 
-    resize_parser.add_argument(
-        dest="image_paths",
-        help="set the image filename",
-        nargs="+",
-        type=str,
-        default=None,
-        metavar="IMAGE_PATHS",
-    )
+    add_common_arguments(resize_parser)
 
     resize_parser.add_argument(
         "-c",
@@ -65,67 +58,31 @@ 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(
-        "-op",
-        "--open",
-        default=False,
-        action="store_true",
-        dest="open",
-        help="open the image using default program (default: '%(default)s')",
+        "-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(
-        "-od",
-        "--output-dir",
-        dest="output_dir",
-        default="output",
-        help="set default output folder (default: '%(default)s')",
+        "-H",
+        "--height",
+        dest="height",
+        help="set the height of the image (default: '%(default)s')",
+        type=int,
+        default=DEFAULT_HEIGHT,
+        metavar="HEIGHT",
     )
 
 
+@log_args_decorator
 def run(args: argparse.Namespace) -> None:
     """Run resize subcommand.
 
@@ -135,15 +92,32 @@ def run(args: argparse.Namespace) -> None:
     Returns:
         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 +150,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/subcommands/rotate.py

@@ -21,7 +21,8 @@ from pathlib import Path
 
 from PIL import Image
 
-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__)
 
@@ -32,14 +33,7 @@ def build_subparser(subparsers) -> None:
 
     rotate_parser.set_defaults(func=run)
 
-    rotate_parser.add_argument(
-        dest="image_paths",
-        help="set the image filenames",
-        nargs="+",
-        type=str,
-        default=None,
-        metavar="IMAGE_PATHS",
-    )
+    add_common_arguments(rotate_parser)
 
     rotate_parser.add_argument(
         "-r",
@@ -56,24 +50,8 @@ def build_subparser(subparsers) -> None:
         help="Rotate clockwise (default: '%(default)s)",
     )
 
-    rotate_parser.add_argument(
-        "-op",
-        "--open",
-        default=False,
-        action="store_true",
-        dest="open",
-        help="open the image using default program (default: '%(default)s')",
-    )
-
-    rotate_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 rotate subcommand.
 
@@ -83,7 +61,6 @@ def run(args: argparse.Namespace) -> None:
     Returns:
         None
     """
-    log.debug(args)
 
     rotation = -args.rotation if args.clockwise else args.rotation
     log.debug(f"Rotation angle: {rotation} degrees")
@@ -91,11 +68,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/subcommands/sharpen.py

@@ -19,9 +19,10 @@ 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
+from .common import add_common_arguments, log_args_decorator
 
 log = logging.getLogger(__name__)
 
@@ -32,14 +33,7 @@ def build_subparser(subparsers) -> None:
 
     sharpen_parser.set_defaults(func=run)
 
-    sharpen_parser.add_argument(
-        dest="image_paths",
-        help="set the image filenames",
-        nargs="+",
-        type=str,
-        default=None,
-        metavar="IMAGE_PATHS",
-    )
+    add_common_arguments(sharpen_parser)
 
     sharpen_parser.add_argument(
         "-r",
@@ -86,24 +80,8 @@ def build_subparser(subparsers) -> None:
         help="generate a GIF showing before and after changes",
     )
 
-    sharpen_parser.add_argument(
-        "-op",
-        "--open",
-        default=False,
-        action="store_true",
-        dest="open",
-        help="open the image using default program (default: '%(default)s')",
-    )
-
-    sharpen_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 sharpen subcommand.
 
@@ -113,22 +91,23 @@ 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)
-        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",
+        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
+                )
             )
-        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/subcommands/watermark.py

@@ -23,8 +23,9 @@ 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
+from .common import add_common_arguments, log_args_decorator
 
 log: logging.Logger = logging.getLogger(__name__)
 
@@ -42,14 +43,7 @@ def build_subparser(subparsers: argparse._SubParsersAction) -> None:
 
     watermark_parser.set_defaults(func=run)
 
-    watermark_parser.add_argument(
-        dest="image_paths",
-        help="set the image filenames",
-        nargs="+",
-        type=str,
-        default=None,
-        metavar="IMAGE_PATHS",
-    )
+    add_common_arguments(watermark_parser)
 
     watermark_parser.add_argument(
         "-t",
@@ -161,24 +155,8 @@ def build_subparser(subparsers: argparse._SubParsersAction) -> None:
         help="lowercase the watermark text",
     )
 
-    watermark_parser.add_argument(
-        "-op",
-        "--open",
-        default=False,
-        action="store_true",
-        dest="open",
-        help="open the image using default program (default: '%(default)s')",
-    )
-
-    watermark_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 watermark subcommand.
 
@@ -188,11 +166,22 @@ def run(args: argparse.Namespace) -> None:
     Returns:
         None
     """
-    log.debug(args)
 
     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 +189,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.dist-info → fotolab-0.34.3.dist-info}/METADATA

@@ -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.3.dist-info/RECORD

@@ -0,0 +1,23 @@
+fotolab/__init__.py,sha256=xYHsuP-sNzx6xCzWpierNFJfW1qKEzDd54-UYsHgX5o,3481
+fotolab/__main__.py,sha256=Wk11t_zKs3wJ-okM3yv7Mtj1pRwQZu3NCmpteBwn4Hs,810
+fotolab/cli.py,sha256=Ebx6RQM5Dr8PsIqQ4NOySxnGMzGGI0U7CTawYfHROlk,4499
+fotolab/subcommands/__init__.py,sha256=LHKTjyxfB_s5NZwmT9zYuQuP_86rYjcio7FOGdqD1_M,1169
+fotolab/subcommands/animate.py,sha256=JU0eAXyciXUivRJJVq14YuoM_S6h5Yq9RAy0pDUcXMk,5339
+fotolab/subcommands/auto.py,sha256=Lt_htnIYxUavWfd2hAjduGuhG0TxS2ZkCVXW0-gg7Xo,3434
+fotolab/subcommands/border.py,sha256=W31MgIYpLM6PrxN3nVM1U-eqAfh-DHY6iS6ONDKEhNk,4227
+fotolab/subcommands/common.py,sha256=oSoCcL8rWlmV4_rZ-zc3VFISlG1zbC6xkYMKbS7TP9s,1930
+fotolab/subcommands/contrast.py,sha256=kO9t3uThdz225vssPUJ1GpTNtQSa3u5qBGYD9UoAEs4,3283
+fotolab/subcommands/env.py,sha256=QoxRvzZKgmoHTUxDV4QYhdChCpMWs5TbXFY_qIpIQpE,1469
+fotolab/subcommands/halftone.py,sha256=6XVhGvL4sf1rn8V9wv1ZXZwgRc36tIH9V8l4TAPXH1s,6446
+fotolab/subcommands/info.py,sha256=pfCiLYE1zfaMdGtgaGYvwuOkaSDCeTFuvaflp25HS0U,3603
+fotolab/subcommands/montage.py,sha256=QZ-VPVJG29nPGHpiFv5fLpEF4XfBBE3cvQUJgluiKho,2233
+fotolab/subcommands/resize.py,sha256=AoynJy-GwbhFStAFQ_909AOp98usACz6428WvO-zinU,5483
+fotolab/subcommands/rotate.py,sha256=jNcvsuTrktHjf6B2HC7ygHBezykF4YEZ08dqBsLT3oI,2456
+fotolab/subcommands/sharpen.py,sha256=r7bvE6zmoaKsA6LBqLuAqWbSXWeZj8WAojLhQnFVb4g,3180
+fotolab/subcommands/watermark.py,sha256=2wi5fU6Ax2q2B9133J7_smPPSafeWeR0jkA--_oi8Sw,10977
+fotolab-0.34.3.dist-info/licenses/LICENSE.md,sha256=tGtFDwxWTjuR9syrJoSv1Hiffd2u8Tu8cYClfrXS_YU,31956
+fotolab-0.34.3.dist-info/METADATA,sha256=F8bwUkjAIJ1UF-FcEGIuOcvlWx-GM4eAeXz2R7q07Qw,15101
+fotolab-0.34.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+fotolab-0.34.3.dist-info/entry_points.txt,sha256=0e1go9plFpqj5FP-OpV2acxTAx3ViI59PMXuhejvgcQ,45
+fotolab-0.34.3.dist-info/top_level.txt,sha256=XUJ3gdpsbjohoZCLdVlbQrxAUDkbQg7WwGQG2DaN0t4,8
+fotolab-0.34.3.dist-info/RECORD,,

fotolab-0.34.1.dist-info/RECORD

@@ -1,22 +0,0 @@
-fotolab/__init__.py,sha256=0UZ6OZFCRkc2Fwc4LT1UtE9JdK3uq0uL8fSSVSOuVyo,3161
-fotolab/__main__.py,sha256=Wk11t_zKs3wJ-okM3yv7Mtj1pRwQZu3NCmpteBwn4Hs,810
-fotolab/cli.py,sha256=Ebx6RQM5Dr8PsIqQ4NOySxnGMzGGI0U7CTawYfHROlk,4499
-fotolab/subcommands/__init__.py,sha256=l3DlIaJ3u3jGjnC1H1yV8LZ_nPqOLJ6gikD4BCaMAQ0,1129
-fotolab/subcommands/animate.py,sha256=3nXWeQ0l6hFMrFfxba9py60b_6Hv2WJwR_VuYzzrexw,5867
-fotolab/subcommands/auto.py,sha256=j34xiZlbl8qFpW8kFr3Z-J0Xk08Qiz8Stn1O9I2y1io,3572
-fotolab/subcommands/border.py,sha256=N_ptzy3vgHcmd7WwGcnSgJ34usNGmlGNT4xJ5D0hD5I,4703
-fotolab/subcommands/contrast.py,sha256=JRnGPSQJYweZkqBIosFcJHYuO3bryC3WuHQStmlbYK0,3699
-fotolab/subcommands/env.py,sha256=QoxRvzZKgmoHTUxDV4QYhdChCpMWs5TbXFY_qIpIQpE,1469
-fotolab/subcommands/halftone.py,sha256=ScJB54gnmUpxh9wYCt_Y7ertZl-gYW_WPAPBHC44ReE,6894
-fotolab/subcommands/info.py,sha256=H3voMi67cKoHT2Mu4RUNQBPdb_MspetPjhOvy-YyNnE,3563
-fotolab/subcommands/montage.py,sha256=bjn-RlbXur38-5YNyyTs0kI2Z-caVDZtBt5EDuH5D1M,2598
-fotolab/subcommands/resize.py,sha256=8JKHLJii6qq9eQ3QvqF56tjriRpebPZewU71xOucdug,5804
-fotolab/subcommands/rotate.py,sha256=M6i34mgD10F9jFlXQGP6-l78BwZY8Nh-eNteAEBOjH4,2925
-fotolab/subcommands/sharpen.py,sha256=Swd2IBO2ENc0g-Ukl-Jtj7OXaytFcTN8qEx8MRchFGE,3582
-fotolab/subcommands/watermark.py,sha256=9mP2PWaXjAyoMsZR4mkemx18gL0pS90Qx9lT5CuOBkA,11343
-fotolab-0.34.1.dist-info/licenses/LICENSE.md,sha256=tGtFDwxWTjuR9syrJoSv1Hiffd2u8Tu8cYClfrXS_YU,31956
-fotolab-0.34.1.dist-info/METADATA,sha256=Nln4axVoaQ3tiFdDwyL0SkJMvpc9N_LixKjSD-Bkv2A,15101
-fotolab-0.34.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-fotolab-0.34.1.dist-info/entry_points.txt,sha256=0e1go9plFpqj5FP-OpV2acxTAx3ViI59PMXuhejvgcQ,45
-fotolab-0.34.1.dist-info/top_level.txt,sha256=XUJ3gdpsbjohoZCLdVlbQrxAUDkbQg7WwGQG2DaN0t4,8
-fotolab-0.34.1.dist-info/RECORD,,