fotolab 0.34.0__tar.gz → 0.34.2__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fotolab
-Version: 0.34.0
+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
@@ -112,10 +112,11 @@ fotolab animate -h
 usage: fotolab animate [-h] [-f FORMAT] [-d DURATION] [-l LOOP] [-op]
                        [--webp-quality QUALITY] [--webp-lossless]
                        [--webp-method METHOD] [-od OUTPUT_DIR]
-                       IMAGE_FILENAMES [IMAGE_FILENAMES ...]
+                       [-of OUTPUT_FILENAME]
+                       IMAGE_PATHS [IMAGE_PATHS ...]
 
 positional arguments:
-  IMAGE_FILENAMES       set the image filenames
+  IMAGE_PATHS           set the image filenames
 
 options:
   -h, --help            show this help message and exit
@@ -133,6 +134,8 @@ options:
                         default: '4')
   -od, --output-dir OUTPUT_DIR
                         set default output folder (default: 'output')
+  -of, --output-filename OUTPUT_FILENAME
+                        set output filename (default: 'None')
 ```
 
 <!--help-animate !-->
@@ -146,13 +149,17 @@ fotolab auto -h
 <!--help-auto !-->
 
 ```console
-usage: fotolab auto [-h] IMAGE_FILENAMES [IMAGE_FILENAMES ...]
+usage: fotolab auto [-h] [-t TITLE] [-w WATERMARK_TEXT]
+                    IMAGE_PATHS [IMAGE_PATHS ...]
 
 positional arguments:
-  IMAGE_FILENAMES  set the image filename
+  IMAGE_PATHS           set the image filename
 
 options:
-  -h, --help       show this help message and exit
+  -h, --help            show this help message and exit
+  -t, --title TITLE     set the tile (default: 'None')
+  -w, --watermark WATERMARK_TEXT
+                        set the watermark (default: 'kianmeng.org')
 ```
 
 <!--help-auto !-->
@@ -168,10 +175,10 @@ fotolab border -h
 ```console
 usage: fotolab border [-h] [-c COLOR] [-w WIDTH] [-wt WIDTH] [-wr WIDTH]
                       [-wb WIDTH] [-wl WIDTH] [-op] [-od OUTPUT_DIR]
-                      IMAGE_FILENAMES [IMAGE_FILENAMES ...]
+                      IMAGE_PATHS [IMAGE_PATHS ...]
 
 positional arguments:
-  IMAGE_FILENAMES       set the image filenames
+  IMAGE_PATHS           set the image filenames
 
 options:
   -h, --help            show this help message and exit
@@ -204,10 +211,10 @@ fotolab contrast -h
 
 ```console
 usage: fotolab contrast [-h] [-c CUTOFF] [-op] [-od OUTPUT_DIR]
-                        IMAGE_FILENAMES [IMAGE_FILENAMES ...]
+                        IMAGE_PATHS [IMAGE_PATHS ...]
 
 positional arguments:
-  IMAGE_FILENAMES       set the image filename
+  IMAGE_PATHS           set the image filename
 
 options:
   -h, --help            show this help message and exit
@@ -231,10 +238,10 @@ fotolab halftone -h
 
 ```console
 usage: fotolab halftone [-h] [-ba] [-op] [-od OUTPUT_DIR] [-c CELLS] [-g]
-                        IMAGE_FILENAMES [IMAGE_FILENAMES ...]
+                        IMAGE_PATHS [IMAGE_PATHS ...]
 
 positional arguments:
-  IMAGE_FILENAMES       set the image filename
+  IMAGE_PATHS           set the image filename
 
 options:
   -h, --help            show this help message and exit
@@ -283,10 +290,10 @@ fotolab rotate -h
 
 ```console
 usage: fotolab rotate [-h] [-r ROTATION] [-cw] [-op] [-od OUTPUT_DIR]
-                      IMAGE_FILENAMES [IMAGE_FILENAMES ...]
+                      IMAGE_PATHS [IMAGE_PATHS ...]
 
 positional arguments:
-  IMAGE_FILENAMES       set the image filenames
+  IMAGE_PATHS           set the image filenames
 
 options:
   -h, --help            show this help message and exit
@@ -311,10 +318,10 @@ fotolab montage -h
 
 ```console
 usage: fotolab montage [-h] [-op] [-od OUTPUT_DIR]
-                       IMAGE_FILENAMES [IMAGE_FILENAMES ...]
+                       IMAGE_PATHS [IMAGE_PATHS ...]
 
 positional arguments:
-  IMAGE_FILENAMES       set the image filenames
+  IMAGE_PATHS           set the image filenames
 
 options:
   -h, --help            show this help message and exit
@@ -337,10 +344,10 @@ fotolab resize -h
 ```console
 usage: fotolab resize [-h] [-c] [-l CANVAS_COLOR] [-W WIDTH | -H HEIGHT] [-op]
                       [-od OUTPUT_DIR]
-                      IMAGE_FILENAMES [IMAGE_FILENAMES ...]
+                      IMAGE_PATHS [IMAGE_PATHS ...]
 
 positional arguments:
-  IMAGE_FILENAMES       set the image filename
+  IMAGE_PATHS           set the image filename
 
 options:
   -h, --help            show this help message and exit
@@ -369,10 +376,10 @@ fotolab sharpen -h
 ```console
 usage: fotolab sharpen [-h] [-r RADIUS] [-p PERCENT] [-t THRESHOLD] [-ba]
                        [-op] [-od OUTPUT_DIR]
-                       IMAGE_FILENAMES [IMAGE_FILENAMES ...]
+                       IMAGE_PATHS [IMAGE_PATHS ...]
 
 positional arguments:
-  IMAGE_FILENAMES       set the image filenames
+  IMAGE_PATHS           set the image filenames
 
 options:
   -h, --help            show this help message and exit
@@ -408,10 +415,10 @@ usage: fotolab watermark [-h] [-t WATERMARK_TEXT]
                          [-a ALPHA_VALUE] [--camera]
                          [-l | --lowercase | --no-lowercase] [-op]
                          [-od OUTPUT_DIR]
-                         IMAGE_FILENAMES [IMAGE_FILENAMES ...]
+                         IMAGE_PATHS [IMAGE_PATHS ...]
 
 positional arguments:
-  IMAGE_FILENAMES       set the image filenames
+  IMAGE_PATHS           set the image filenames
 
 options:
   -h, --help            show this help message and exit

{fotolab-0.34.0 → fotolab-0.34.2}/README.md

@@ -73,10 +73,11 @@ fotolab animate -h
 usage: fotolab animate [-h] [-f FORMAT] [-d DURATION] [-l LOOP] [-op]
                        [--webp-quality QUALITY] [--webp-lossless]
                        [--webp-method METHOD] [-od OUTPUT_DIR]
-                       IMAGE_FILENAMES [IMAGE_FILENAMES ...]
+                       [-of OUTPUT_FILENAME]
+                       IMAGE_PATHS [IMAGE_PATHS ...]
 
 positional arguments:
-  IMAGE_FILENAMES       set the image filenames
+  IMAGE_PATHS           set the image filenames
 
 options:
   -h, --help            show this help message and exit
@@ -94,6 +95,8 @@ options:
                         default: '4')
   -od, --output-dir OUTPUT_DIR
                         set default output folder (default: 'output')
+  -of, --output-filename OUTPUT_FILENAME
+                        set output filename (default: 'None')
 ```
 
 <!--help-animate !-->
@@ -107,13 +110,17 @@ fotolab auto -h
 <!--help-auto !-->
 
 ```console
-usage: fotolab auto [-h] IMAGE_FILENAMES [IMAGE_FILENAMES ...]
+usage: fotolab auto [-h] [-t TITLE] [-w WATERMARK_TEXT]
+                    IMAGE_PATHS [IMAGE_PATHS ...]
 
 positional arguments:
-  IMAGE_FILENAMES  set the image filename
+  IMAGE_PATHS           set the image filename
 
 options:
-  -h, --help       show this help message and exit
+  -h, --help            show this help message and exit
+  -t, --title TITLE     set the tile (default: 'None')
+  -w, --watermark WATERMARK_TEXT
+                        set the watermark (default: 'kianmeng.org')
 ```
 
 <!--help-auto !-->
@@ -129,10 +136,10 @@ fotolab border -h
 ```console
 usage: fotolab border [-h] [-c COLOR] [-w WIDTH] [-wt WIDTH] [-wr WIDTH]
                       [-wb WIDTH] [-wl WIDTH] [-op] [-od OUTPUT_DIR]
-                      IMAGE_FILENAMES [IMAGE_FILENAMES ...]
+                      IMAGE_PATHS [IMAGE_PATHS ...]
 
 positional arguments:
-  IMAGE_FILENAMES       set the image filenames
+  IMAGE_PATHS           set the image filenames
 
 options:
   -h, --help            show this help message and exit
@@ -165,10 +172,10 @@ fotolab contrast -h
 
 ```console
 usage: fotolab contrast [-h] [-c CUTOFF] [-op] [-od OUTPUT_DIR]
-                        IMAGE_FILENAMES [IMAGE_FILENAMES ...]
+                        IMAGE_PATHS [IMAGE_PATHS ...]
 
 positional arguments:
-  IMAGE_FILENAMES       set the image filename
+  IMAGE_PATHS           set the image filename
 
 options:
   -h, --help            show this help message and exit
@@ -192,10 +199,10 @@ fotolab halftone -h
 
 ```console
 usage: fotolab halftone [-h] [-ba] [-op] [-od OUTPUT_DIR] [-c CELLS] [-g]
-                        IMAGE_FILENAMES [IMAGE_FILENAMES ...]
+                        IMAGE_PATHS [IMAGE_PATHS ...]
 
 positional arguments:
-  IMAGE_FILENAMES       set the image filename
+  IMAGE_PATHS           set the image filename
 
 options:
   -h, --help            show this help message and exit
@@ -244,10 +251,10 @@ fotolab rotate -h
 
 ```console
 usage: fotolab rotate [-h] [-r ROTATION] [-cw] [-op] [-od OUTPUT_DIR]
-                      IMAGE_FILENAMES [IMAGE_FILENAMES ...]
+                      IMAGE_PATHS [IMAGE_PATHS ...]
 
 positional arguments:
-  IMAGE_FILENAMES       set the image filenames
+  IMAGE_PATHS           set the image filenames
 
 options:
   -h, --help            show this help message and exit
@@ -272,10 +279,10 @@ fotolab montage -h
 
 ```console
 usage: fotolab montage [-h] [-op] [-od OUTPUT_DIR]
-                       IMAGE_FILENAMES [IMAGE_FILENAMES ...]
+                       IMAGE_PATHS [IMAGE_PATHS ...]
 
 positional arguments:
-  IMAGE_FILENAMES       set the image filenames
+  IMAGE_PATHS           set the image filenames
 
 options:
   -h, --help            show this help message and exit
@@ -298,10 +305,10 @@ fotolab resize -h
 ```console
 usage: fotolab resize [-h] [-c] [-l CANVAS_COLOR] [-W WIDTH | -H HEIGHT] [-op]
                       [-od OUTPUT_DIR]
-                      IMAGE_FILENAMES [IMAGE_FILENAMES ...]
+                      IMAGE_PATHS [IMAGE_PATHS ...]
 
 positional arguments:
-  IMAGE_FILENAMES       set the image filename
+  IMAGE_PATHS           set the image filename
 
 options:
   -h, --help            show this help message and exit
@@ -330,10 +337,10 @@ fotolab sharpen -h
 ```console
 usage: fotolab sharpen [-h] [-r RADIUS] [-p PERCENT] [-t THRESHOLD] [-ba]
                        [-op] [-od OUTPUT_DIR]
-                       IMAGE_FILENAMES [IMAGE_FILENAMES ...]
+                       IMAGE_PATHS [IMAGE_PATHS ...]
 
 positional arguments:
-  IMAGE_FILENAMES       set the image filenames
+  IMAGE_PATHS           set the image filenames
 
 options:
   -h, --help            show this help message and exit
@@ -369,10 +376,10 @@ usage: fotolab watermark [-h] [-t WATERMARK_TEXT]
                          [-a ALPHA_VALUE] [--camera]
                          [-l | --lowercase | --no-lowercase] [-op]
                          [-od OUTPUT_DIR]
-                         IMAGE_FILENAMES [IMAGE_FILENAMES ...]
+                         IMAGE_PATHS [IMAGE_PATHS ...]
 
 positional arguments:
-  IMAGE_FILENAMES       set the image filenames
+  IMAGE_PATHS           set the image filenames
 
 options:
   -h, --help            show this help message and exit

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

@@ -7,7 +7,7 @@ where = ["src"]
 
 [project]
 name = "fotolab"
-version = "0.34.0"
+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.0 → 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.0 → 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__)
 
@@ -49,12 +48,12 @@ def build_subparser(subparsers) -> None:
     animate_parser.set_defaults(func=run)
 
     animate_parser.add_argument(
-        dest="image_filenames",
+        dest="image_paths",
         help="set the image filenames",
         nargs="+",
         type=str,
         default=None,
-        metavar="IMAGE_FILENAMES",
+        metavar="IMAGE_PATHS",
     )
 
     animate_parser.add_argument(
@@ -159,15 +158,15 @@ def run(args: argparse.Namespace) -> None:
     """
     log.debug(args)
 
-    image_filepaths = [Path(f) for f in args.image_filenames]
+    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.0 → fotolab-0.34.2}/src/fotolab/subcommands/auto.py

@@ -36,12 +36,12 @@ def build_subparser(subparsers) -> None:
     auto_parser.set_defaults(func=run)
 
     auto_parser.add_argument(
-        dest="image_filenames",
+        dest="image_paths",
         help="set the image filename",
         nargs="+",
         type=str,
         default=None,
-        metavar="IMAGE_FILENAMES",
+        metavar="IMAGE_PATHS",
     )
 
     auto_parser.add_argument(
@@ -114,7 +114,7 @@ def run(args: argparse.Namespace) -> None:
     fotolab.subcommands.sharpen.run(combined_args)
     fotolab.subcommands.watermark.run(combined_args)
 
-    if len(args.image_filenames) > 1:
+    if len(args.image_paths) > 1:
         output_filename = (
             args.title.lower().replace(",", "").replace(" ", "_") + ".gif"
         )

{fotolab-0.34.0 → 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__)
 
@@ -34,12 +34,12 @@ def build_subparser(subparsers: argparse._SubParsersAction) -> None:
     border_parser.set_defaults(func=run)
 
     border_parser.add_argument(
-        dest="image_filenames",
+        dest="image_paths",
         help="set the image filenames",
         nargs="+",
         type=str,
         default=None,
-        metavar="IMAGE_FILENAMES",
+        metavar="IMAGE_PATHS",
     )
 
     border_parser.add_argument(
@@ -135,16 +135,16 @@ def run(args: argparse.Namespace) -> None:
     """
     log.debug(args)
 
-    for image_filepath in [Path(f) for f in args.image_filenames]:
-        original_image = Image.open(image_filepath)
-        border = get_border(args)
-        bordered_image = ImageOps.expand(
-            original_image,
-            border=border,
-            fill=ImageColor.getrgb(args.color),
-        )
+    for image_filepath in [Path(f) for f in args.image_paths]:
+        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")
+            save_image(args, bordered_image, image_filepath, "border")
 
 
 def get_border(

{fotolab-0.34.0 → 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__)
 
@@ -51,12 +51,12 @@ def build_subparser(subparsers: argparse._SubParsersAction) -> None:
     contrast_parser.set_defaults(func=run)
 
     contrast_parser.add_argument(
-        dest="image_filenames",
+        dest="image_paths",
         help="set the image filename",
         nargs="+",
         type=str,
         default=None,
-        metavar="IMAGE_FILENAMES",
+        metavar="IMAGE_PATHS",
     )
 
     contrast_parser.add_argument(
@@ -102,26 +102,26 @@ def run(args: argparse.Namespace) -> None:
     """
     log.debug(args)
 
-    for image_filename in args.image_filenames:
-        original_image = Image.open(image_filename)
-
-        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_filename), "contrast")
+    for image_path_str in args.image_paths:
+        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.0 → 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__)
 
@@ -45,12 +45,12 @@ def build_subparser(subparsers) -> None:
     halftone_parser.set_defaults(func=run)
 
     halftone_parser.add_argument(
-        dest="image_filenames",
+        dest="image_paths",
         help="set the image filename",
         nargs="+",
         type=str,
         default=None,
-        metavar="IMAGE_FILENAMES",
+        metavar="IMAGE_PATHS",
     )
 
     halftone_parser.add_argument(
@@ -111,28 +111,29 @@ def run(args: argparse.Namespace) -> None:
     """
     log.debug(args)
 
-    for image_filename_str in args.image_filenames:
-        image_filename = Path(image_filename_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",
+    for image_path_str in args.image_paths:
+        image_filename = Path(image_path_str)
+        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(
     draw: ImageDraw.ImageDraw,
     source_image: Image.Image,
+    brightness_map: Image.Image,
     cell: HalftoneCell,
     grayscale: bool,
     fill_color_dot: int,
@@ -150,21 +151,19 @@ def _draw_halftone_dot(
     x = max(0, x)
     y = max(0, y)
 
-    # get pixel value (brightness or color) from the source image using clamped
-    # coordinates
+    # Get brightness from the pre-calculated map (L mode)
+    brightness = brightness_map.getpixel((x, y))
+
+    # Get pixel value (color) from the source image
     pixel_value = source_image.getpixel((x, y))
 
     if grayscale:
-        brightness = pixel_value
-        dot_fill = fill_color_dot  # Use white for grayscale dots
+        # In grayscale mode, source_image is L mode, pixel_value is brightness
+        # dot_fill is the fixed color (255 for white dot on black background)
+        dot_fill = fill_color_dot
     else:
-        # calculate brightness (luminance) from the RGB color
-        brightness = int(
-            0.299 * pixel_value[0]
-            + 0.587 * pixel_value[1]
-            + 0.114 * pixel_value[2]
-        )
-        dot_fill = pixel_value  # Use original color for color dots
+        # In color mode, dot_fill is the original color
+        dot_fill = pixel_value
 
     # calculate dot radius relative to cell size based on brightness max radius
     # is half the cell size
@@ -203,8 +202,11 @@ def create_halftone_image(
     fill_color_black: int | tuple[int, int, int]
     fill_color_dot_for_grayscale: int
 
+    # Always create a grayscale version for brightness calculation (dot size)
+    brightness_map = original_image.convert("L")
+
     if grayscale:
-        source_image = original_image.convert("L")
+        source_image = brightness_map
         output_mode = "L"
         fill_color_black = 0
         fill_color_dot_for_grayscale = 255
@@ -229,6 +231,7 @@ def create_halftone_image(
             _draw_halftone_dot(
                 draw,
                 source_image,
+                brightness_map,
                 cell,
                 grayscale,
                 fill_color_dot_for_grayscale,