fotolab 0.29.1__tar.gz → 0.30.0__tar.gz

{fotolab-0.29.1 → fotolab-0.30.0}/.pre-commit-config.yaml

@@ -48,7 +48,7 @@ repos:
     rev: 25.1.0
     hooks:
       - id: black
-        language_version: python3.12
+        language_version: python3.13
         args:
           - --line-length=79
           - --target-version=py38
@@ -74,13 +74,13 @@ repos:
           - --remove-all-unused-imports
         language: python
         files: \.py$
-        language_version: python3.12
+        language_version: python3.13
 
   - repo: https://github.com/PyCQA/flake8
     rev: 7.2.0
     hooks:
       - id: flake8
-        language_version: python3.12
+        language_version: python3.13
         additional_dependencies:
           - flake8-docstrings
           - flake8-pytest-style

{fotolab-0.29.1 → fotolab-0.30.0}/CHANGELOG.md

@@ -7,6 +7,23 @@ and this project adheres to [0-based versioning](https://0ver.org/).
 
 ## [Unreleased]
 
+## v0.30.0 (2025-05-18)
+
+- Add WEBP `quality`, `lossless`, and `method` args
+- Bump Python version for `pre-commit` check
+- Close image files after creating animation
+- Update help message generated by latest Python to readme
+- Update help message in readme
+- Validate duration for animate command
+
+## v0.29.2 (2025-05-11)
+
+- Bump deps
+- Code format
+- Improve info subcommand by adding error handling for missing keys
+- Remove default value for image filename argument in info subcommand
+- Use context manager to open image and remove redundant image close.
+
 ## v0.29.1 (2025-05-04)
 
 - Improve camera metadata handling in watermark subcommand.

{fotolab-0.29.1 → fotolab-0.30.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fotolab
-Version: 0.29.1
+Version: 0.30.0
 Summary: A console program that manipulate images.
 Keywords: photography,photo
 Author-email: Kian-Meng Ang <kianmeng@cpan.org>
@@ -106,7 +106,8 @@ fotolab animate -h
 
 ```console
 usage: fotolab animate [-h] [-f FORMAT] [-d DURATION] [-l LOOP] [-op]
-                       [-od OUTPUT_DIR]
+                       [--webp-quality QUALITY] [--webp-lossless]
+                       [--webp-method METHOD] [-od OUTPUT_DIR]
                        IMAGE_FILENAMES [IMAGE_FILENAMES ...]
 
 positional arguments:
@@ -116,10 +117,16 @@ options:
   -h, --help            show this help message and exit
   -f, --format FORMAT   set the image format (default: 'gif')
   -d, --duration DURATION
-                        set the duration in milliseconds (default: '2500')
+                        set the duration in milliseconds (must be a positive
+                        integer, default: '2500')
   -l, --loop LOOP       set the loop cycle (default: '0')
   -op, --open           open the image using default program (default:
                         'False')
+  --webp-quality QUALITY
+                        set WEBP quality (0-100, default: '80')
+  --webp-lossless       enable WEBP lossless compression (default: 'False')
+  --webp-method METHOD  set WEBP encoding method (0=fast, 6=slow/best,
+                        default: '4')
   -od, --output-dir OUTPUT_DIR
                         set default output folder (default: 'output')
 ```

{fotolab-0.29.1 → fotolab-0.30.0}/Pipfile.lock

@@ -16,10 +16,6 @@
         ]
     },
     "default": {
-        "fotolab": {
-            "file": ".",
-            "markers": "python_version >= '3.9'"
-        },
         "pillow": {
             "hashes": [
                 "sha256:014ca0050c85003620526b0ac1ac53f56fc93af128f7546623cc8e31875ab928",

{fotolab-0.29.1 → fotolab-0.30.0}/README.md

@@ -83,7 +83,8 @@ fotolab animate -h
 
 ```console
 usage: fotolab animate [-h] [-f FORMAT] [-d DURATION] [-l LOOP] [-op]
-                       [-od OUTPUT_DIR]
+                       [--webp-quality QUALITY] [--webp-lossless]
+                       [--webp-method METHOD] [-od OUTPUT_DIR]
                        IMAGE_FILENAMES [IMAGE_FILENAMES ...]
 
 positional arguments:
@@ -93,10 +94,16 @@ options:
   -h, --help            show this help message and exit
   -f, --format FORMAT   set the image format (default: 'gif')
   -d, --duration DURATION
-                        set the duration in milliseconds (default: '2500')
+                        set the duration in milliseconds (must be a positive
+                        integer, default: '2500')
   -l, --loop LOOP       set the loop cycle (default: '0')
   -op, --open           open the image using default program (default:
                         'False')
+  --webp-quality QUALITY
+                        set WEBP quality (0-100, default: '80')
+  --webp-lossless       enable WEBP lossless compression (default: 'False')
+  --webp-method METHOD  set WEBP encoding method (0=fast, 6=slow/best,
+                        default: '4')
   -od, --output-dir OUTPUT_DIR
                         set default output folder (default: 'output')
 ```

{fotolab-0.29.1 → fotolab-0.30.0}/fotolab/__init__.py

@@ -24,7 +24,7 @@ from pathlib import Path
 
 from PIL import Image
 
-__version__ = "0.29.1"
+__version__ = "0.30.0"
 
 log = logging.getLogger(__name__)
 

{fotolab-0.29.1 → fotolab-0.30.0}/fotolab/cli.py

@@ -15,9 +15,9 @@
 
 """A console program to manipulate photos.
 
-  website: https://github.com/kianmeng/fotolab
-  changelog: https://github.com/kianmeng/fotolab/blob/master/CHANGELOG.md
-  issues: https://github.com/kianmeng/fotolab/issues
+website: https://github.com/kianmeng/fotolab
+changelog: https://github.com/kianmeng/fotolab/blob/master/CHANGELOG.md
+issues: https://github.com/kianmeng/fotolab/issues
 """
 
 import argparse
@@ -143,7 +143,7 @@ def main(args: Optional[Sequence[str]] = None) -> None:
                 # correctly
                 log.error(
                     "subcommand '%s' is missing its execution function.",
-                    parsed_args.command
+                    parsed_args.command,
                 )
                 parser.print_help(sys.stderr)
                 raise SystemExit(1)

fotolab-0.30.0/fotolab/subcommands/animate.py

@@ -0,0 +1,193 @@
+# 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/>.
+
+"""Animate subcommand."""
+
+import argparse
+import logging
+from pathlib import Path
+
+from PIL import Image
+
+from fotolab import _open_image
+
+log = logging.getLogger(__name__)
+
+
+def _validate_duration(value: str) -> int:
+    """Validate that the duration is a positive integer."""
+    try:
+        ivalue = int(value)
+        if ivalue <= 0:
+            raise argparse.ArgumentTypeError(
+                f"duration must be a positive integer, but got {value}"
+            )
+        return ivalue
+    except ValueError as e:
+        raise argparse.ArgumentTypeError(
+            f"duration must be an integer, but got '{value}'"
+        ) from e
+
+
+def build_subparser(subparsers) -> None:
+    """Build the subparser."""
+    animate_parser = subparsers.add_parser("animate", help="animate an image")
+
+    animate_parser.set_defaults(func=run)
+
+    animate_parser.add_argument(
+        dest="image_filenames",
+        help="set the image filenames",
+        nargs="+",
+        type=str,
+        default=None,
+        metavar="IMAGE_FILENAMES",
+    )
+
+    animate_parser.add_argument(
+        "-f",
+        "--format",
+        dest="format",
+        type=str,
+        choices=["gif", "webp"],
+        default="gif",
+        help="set the image format (default: '%(default)s')",
+        metavar="FORMAT",
+    )
+
+    animate_parser.add_argument(
+        "-d",
+        "--duration",
+        dest="duration",
+        type=_validate_duration,
+        default=2500,
+        help="set the duration in milliseconds (must be a positive integer, default: '%(default)s')",
+        metavar="DURATION",
+    )
+
+    animate_parser.add_argument(
+        "-l",
+        "--loop",
+        dest="loop",
+        type=int,
+        default=0,
+        help="set the loop cycle (default: '%(default)s')",
+        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",
+        type=int,
+        default=80,
+        choices=range(0, 101),
+        help="set WEBP quality (0-100, default: '%(default)s')",
+        metavar="QUALITY",
+    )
+
+    animate_parser.add_argument(
+        "--webp-lossless",
+        dest="webp_lossless",
+        default=False,
+        action="store_true",
+        help="enable WEBP lossless compression (default: '%(default)s')",
+    )
+
+    animate_parser.add_argument(
+        "--webp-method",
+        dest="webp_method",
+        type=int,
+        default=4,
+        choices=range(0, 7),
+        help="set WEBP encoding method (0=fast, 6=slow/best, default: '%(default)s')",
+        metavar="METHOD",
+    )
+
+    animate_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 animate subcommand.
+
+    Args:
+        args (argparse.Namespace): Config from command line arguments
+
+    Returns:
+        None
+    """
+    log.debug(args)
+
+    first_image_filepath = args.image_filenames[0]
+    main_frame = None
+    other_frames = []
+
+    try:
+        main_frame = Image.open(first_image_filepath)
+
+        for image_filename in args.image_filenames[1:]:
+            img = Image.open(image_filename)
+            other_frames.append(img)
+
+        image_file = Path(first_image_filepath)
+        new_filename = Path(
+            args.output_dir,
+            image_file.with_name(f"animate_{image_file.stem}.{args.format}"),
+        )
+        new_filename.parent.mkdir(parents=True, exist_ok=True)
+
+        log.info("animate image: %s", new_filename)
+
+        save_kwargs = {
+            "format": args.format,
+            "append_images": other_frames,
+            "save_all": True,
+            "duration": args.duration,
+            "loop": args.loop,
+            "optimize": True,  # General optimization, good for GIF
+        }
+
+        if args.format == "webp":
+            save_kwargs["quality"] = args.webp_quality
+            save_kwargs["lossless"] = args.webp_lossless
+            save_kwargs["method"] = args.webp_method
+            # Pillow's WEBP save doesn't use a general 'optimize' like GIF.
+            # Specific WEBP params like 'method' and 'quality' control this.
+            # We can remove 'optimize' if it causes issues or is ignored for WEBP.
+            # For now, let's keep it, Pillow might handle it or ignore it.
+
+        main_frame.save(new_filename, **save_kwargs)
+    finally:
+        if main_frame:
+            main_frame.close()
+        for frame in other_frames:
+            frame.close()
+
+    if args.open:
+        _open_image(new_filename)

{fotolab-0.29.1 → fotolab-0.30.0}/fotolab/subcommands/contrast.py

@@ -31,7 +31,9 @@ def _validate_cutoff(value: str) -> float:
     try:
         f_value = float(value)
     except ValueError as e:
-        raise argparse.ArgumentTypeError(f"invalid float value: '{value}'") from e
+        raise argparse.ArgumentTypeError(
+            f"invalid float value: '{value}'"
+        ) from e
     if not 0 <= f_value <= 50:
         raise argparse.ArgumentTypeError(
             f"cutoff value {f_value} must be between 0 and 50"

{fotolab-0.29.1 → fotolab-0.30.0}/fotolab/subcommands/halftone.py

@@ -141,11 +141,13 @@ def _draw_halftone_dot(
     x = min(int(cell.col * cell.cellsize + cell.cellsize / 2), img_width - 1)
     y = min(int(cell.row * cell.cellsize + cell.cellsize / 2), img_height - 1)
 
-    # Ensure coordinates are non-negative (shouldn't happen with current logic, but safe)
+    # Ensure coordinates are non-negative (shouldn't happen with current logic,
+    # but safe)
     x = max(0, x)
     y = max(0, y)
 
-    # Get pixel value (brightness or color) from the source image using clamped coordinates
+    # Get pixel value (brightness or color) from the source image using clamped
+    # coordinates
     pixel_value = source_image.getpixel((x, y))
 
     if grayscale:
@@ -160,8 +162,8 @@ def _draw_halftone_dot(
         )
         dot_fill = pixel_value  # Use original color for color dots
 
-    # Calculate dot radius relative to cell size based on brightness
-    # Max radius is half the cell size. Scale by brightness (0-255).
+    # Calculate dot radius relative to cell size based on brightness Max radius
+    # is half the cell size. Scale by brightness (0-255).
     dot_radius = (brightness / 255.0) * (cell.cellsize / 2)
 
     # Draw the dot

{fotolab-0.29.1 → fotolab-0.30.0}/fotolab/subcommands/info.py

@@ -33,7 +33,6 @@ def build_subparser(subparsers) -> None:
         dest="image_filename",
         help="set the image filename",
         type=str,
-        default=None,
         metavar="IMAGE_FILENAME",
     )
 
@@ -74,29 +73,22 @@ def run(args: argparse.Namespace) -> None:
     """
     log.debug(args)
 
-    # TODO: Add error handling for file open
-    # TODO: Use context manager `with Image.open(...)`
-    image = Image.open(args.image_filename)
+    with Image.open(args.image_filename) as image:
+        exif_tags = extract_exif_tags(image, args.sort)
 
-    exif_tags = extract_exif_tags(image, args.sort)
+        if not exif_tags:
+            print("No metadata found!")
+            return
 
-    if not exif_tags:
-        print("No metadata found!")
-        # Close the image if opened outside a 'with' block
-        image.close()
-        return
-
-    output_info = []
+        output_info = []
     specific_info_requested = False
 
     if args.camera:
         specific_info_requested = True
-        # TODO: Add error handling for missing keys
         output_info.append(camera_metadata(exif_tags))
 
     if args.datetime:
         specific_info_requested = True
-        # TODO: Add error handling for missing keys
         output_info.append(datetime(exif_tags))
 
     if specific_info_requested:
@@ -107,9 +99,6 @@ def run(args: argparse.Namespace) -> None:
         for tag_name, tag_value in exif_tags.items():
             print(f"{tag_name:<{tag_name_width}}: {tag_value}")
 
-    # Close the image if opened outside a 'with' block
-    image.close()
-
 
 def extract_exif_tags(image: Image.Image, sort: bool = False) -> dict:
     """Extract Exif metadata from image."""
@@ -135,13 +124,11 @@ def extract_exif_tags(image: Image.Image, sort: bool = False) -> dict:
 
 def datetime(exif_tags: dict):
     """Extract datetime metadata."""
-    # TODO: Add error handling for missing key
-    return exif_tags["DateTime"]
+    return exif_tags.get("DateTime", "Not available")
 
 
 def camera_metadata(exif_tags: dict):
     """Extract camera and model metadata."""
-    # TODO: Add error handling for missing keys
     make = exif_tags.get("Make", "")
     model = exif_tags.get("Model", "")
     metadata = f"{make} {model}"

{fotolab-0.29.1 → fotolab-0.30.0}/noxfile.py

@@ -179,6 +179,7 @@ def release(session: nox.Session) -> None:
         session.run(
             "git",
             "commit",
+            "--no-verify",
             "-am",
             f"Bump {after_version} release",
             external=True,

fotolab-0.29.1/fotolab/subcommands/animate.py

@@ -1,131 +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/>.
-
-"""Animate subcommand."""
-
-import argparse
-import logging
-from pathlib import Path
-
-from PIL import Image
-
-from fotolab import _open_image
-
-log = logging.getLogger(__name__)
-
-
-def build_subparser(subparsers) -> None:
-    """Build the subparser."""
-    animate_parser = subparsers.add_parser("animate", help="animate an image")
-
-    animate_parser.set_defaults(func=run)
-
-    animate_parser.add_argument(
-        dest="image_filenames",
-        help="set the image filenames",
-        nargs="+",
-        type=str,
-        default=None,
-        metavar="IMAGE_FILENAMES",
-    )
-
-    animate_parser.add_argument(
-        "-f",
-        "--format",
-        dest="format",
-        type=str,
-        choices=["gif", "webp"],
-        default="gif",
-        help="set the image format (default: '%(default)s')",
-        metavar="FORMAT",
-    )
-
-    animate_parser.add_argument(
-        "-d",
-        "--duration",
-        dest="duration",
-        type=int,
-        default=2500,
-        help="set the duration in milliseconds (default: '%(default)s')",
-        metavar="DURATION",
-    )
-
-    animate_parser.add_argument(
-        "-l",
-        "--loop",
-        dest="loop",
-        type=int,
-        default=0,
-        help="set the loop cycle (default: '%(default)s')",
-        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(
-        "-od",
-        "--output-dir",
-        dest="output_dir",
-        default="output",
-        help="set default output folder (default: '%(default)s')",
-    )
-
-
-def run(args: argparse.Namespace) -> None:
-    """Run animate subcommand.
-
-    Args:
-        args (argparse.Namespace): Config from command line arguments
-
-    Returns:
-        None
-    """
-    log.debug(args)
-
-    first_image = args.image_filenames[0]
-    animated_image = Image.open(first_image)
-
-    append_images = []
-    for image_filename in args.image_filenames[1:]:
-        append_images.append(Image.open(image_filename))
-
-    image_file = Path(first_image)
-    new_filename = Path(
-        args.output_dir,
-        image_file.with_name(f"animate_{image_file.stem}.{args.format}"),
-    )
-    new_filename.parent.mkdir(parents=True, exist_ok=True)
-
-    log.info("animate image: %s", new_filename)
-
-    animated_image.save(
-        new_filename,
-        format=args.format,
-        append_images=append_images,
-        save_all=True,
-        duration=args.duration,
-        loop=args.loop,
-        optimize=True,
-    )
-
-    if args.open:
-        _open_image(new_filename)