fotolab 0.23.0__tar.gz → 0.25.0__tar.gz

{fotolab-0.23.0 → fotolab-0.25.0}/.pre-commit-config.yaml

@@ -107,7 +107,7 @@ repos:
           - --disable=R0801,W0212
 
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.13.0
+    rev: v1.14.1
     hooks:
       - id: mypy
         exclude: docs/

{fotolab-0.23.0 → fotolab-0.25.0}/CHANGELOG.md

@@ -7,6 +7,19 @@ and this project adheres to [0-based versioning](https://0ver.org/).
 
 ## [Unreleased]
 
+## v0.25.0 (2025-01-05)
+
+- Add `--before-after` or `-ba` flag to `sharpen` command
+- Bump `pre-commit` hook and deps
+- Bump copyright years
+
+## v0.24.0 (2024-12-29)
+
+- Bump `pre-commit` hook
+- Pass image instead of filename when process `info` and `watermark` subcommand
+- Refactor print result of `env` subcommand
+- Support watermarking `gif` image
+
 ## v0.23.0 (2024-12-22)
 
 - Add `-cw` or `--clockwise` option to `rotate` subcommand

{fotolab-0.23.0 → fotolab-0.25.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fotolab
-Version: 0.23.0
+Version: 0.25.0
 Summary: A console program that manipulate images.
 Keywords: photography,photo
 Author-email: Kian-Meng Ang <kianmeng@cpan.org>
@@ -385,7 +385,7 @@ options:
 
 ## Copyright and License
 
-Copyright (C) 2024 Kian-Meng Ang
+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

{fotolab-0.23.0 → fotolab-0.25.0}/README.md

@@ -362,7 +362,7 @@ options:
 
 ## Copyright and License
 
-Copyright (C) 2024 Kian-Meng Ang
+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

{fotolab-0.23.0 → fotolab-0.25.0}/fotolab/__init__.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2024 Kian-Meng Ang
+# 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
@@ -21,7 +21,7 @@ import subprocess
 import sys
 from pathlib import Path
 
-__version__ = "0.23.0"
+__version__ = "0.25.0"
 
 log = logging.getLogger(__name__)
 

{fotolab-0.23.0 → fotolab-0.25.0}/fotolab/cli.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2024 Kian-Meng Ang
+# 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 General Public License as published by

{fotolab-0.23.0 → fotolab-0.25.0}/fotolab/subcommands/__init__.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2024 Kian-Meng Ang
+# 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

{fotolab-0.23.0 → fotolab-0.25.0}/fotolab/subcommands/animate.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2024 Kian-Meng Ang
+# 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

{fotolab-0.23.0 → fotolab-0.25.0}/fotolab/subcommands/auto.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2024 Kian-Meng Ang
+# 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
@@ -70,6 +70,7 @@ def run(args: argparse.Namespace) -> None:
         "camera": False,
         "canvas": False,
         "lowercase": False,
+        "before_after": False,
     }
     combined_args = argparse.Namespace(**vars(args), **extra_args)
     combined_args.overwrite = True

{fotolab-0.23.0 → fotolab-0.25.0}/fotolab/subcommands/border.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2024 Kian-Meng Ang
+# 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

{fotolab-0.23.0 → fotolab-0.25.0}/fotolab/subcommands/contrast.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2024 Kian-Meng Ang
+# 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

{fotolab-0.23.0 → fotolab-0.25.0}/fotolab/subcommands/env.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2024 Kian-Meng Ang
+# 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
@@ -44,9 +44,9 @@ def run(_args: argparse.Namespace) -> None:
         None
     """
     sys_version = sys.version.replace("\n", "")
-    print(
+    env = [
         f"fotolab: {__version__}",
         f"python: {sys_version}",
         f"platform: {platform.platform()}",
-        sep="\n",
-    )
+    ]
+    print(*env, sep="\n")

{fotolab-0.23.0 → fotolab-0.25.0}/fotolab/subcommands/info.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2024 Kian-Meng Ang
+# 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
@@ -73,18 +73,20 @@ def run(args: argparse.Namespace) -> None:
         None
     """
     log.debug(args)
+
     info = []
+    image = Image.open(args.image_filename)
 
     if args.camera:
-        info.append(camera_metadata(args.image_filename))
+        info.append(camera_metadata(image))
 
     if args.datetime:
-        info.append(datetime(args.image_filename))
+        info.append(datetime(image))
 
     if info:
         print("\n".join(info))
     else:
-        exif_tags = extract_exif_tags(args.image_filename)
+        exif_tags = extract_exif_tags(image)
         if exif_tags:
             tag_name_width = max(map(len, exif_tags))
             for tag_name, tag_value in exif_tags.items():
@@ -93,9 +95,8 @@ def run(args: argparse.Namespace) -> None:
             print("No metadata found!")
 
 
-def extract_exif_tags(image_filename: str, sort: bool = False) -> dict:
+def extract_exif_tags(image: Image.Image, sort: bool = False) -> dict:
     """Extract Exif metadata from image."""
-    image = Image.open(image_filename)
     exif = image._getexif()
     log.debug(exif)
 
@@ -112,14 +113,14 @@ def extract_exif_tags(image_filename: str, sort: bool = False) -> dict:
     return filtered_info
 
 
-def datetime(image_filename):
+def datetime(image: Image.Image):
     """Extract datetime metadata."""
-    exif_tags = extract_exif_tags(image_filename)
+    exif_tags = extract_exif_tags(image)
     return exif_tags["DateTime"]
 
 
-def camera_metadata(image_filename):
+def camera_metadata(image: Image.Image):
     """Extract camera and model metadata."""
-    exif_tags = extract_exif_tags(image_filename)
+    exif_tags = extract_exif_tags(image)
     metadata = f'{exif_tags["Make"]} {exif_tags["Model"]}'
     return metadata.strip()

{fotolab-0.23.0 → fotolab-0.25.0}/fotolab/subcommands/montage.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2024 Kian-Meng Ang
+# 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

{fotolab-0.23.0 → fotolab-0.25.0}/fotolab/subcommands/resize.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2024 Kian-Meng Ang
+# 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

{fotolab-0.23.0 → fotolab-0.25.0}/fotolab/subcommands/rotate.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2024 Kian-Meng Ang
+# 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

{fotolab-0.23.0 → fotolab-0.25.0}/fotolab/subcommands/sharpen.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2024 Kian-Meng Ang
+# 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
@@ -17,10 +17,11 @@
 
 import argparse
 import logging
+from pathlib import Path
 
 from PIL import Image, ImageFilter
 
-from fotolab import save_image
+from fotolab import _open_image, save_image
 
 log = logging.getLogger(__name__)
 
@@ -76,6 +77,15 @@ def build_subparser(subparsers) -> None:
         metavar="THRESHOLD",
     )
 
+    sharpen_parser.add_argument(
+        "-ba",
+        "--before-after",
+        default=False,
+        action="store_true",
+        dest="before_after",
+        help="generate a GIF showing before and after changes",
+    )
+
 
 def run(args: argparse.Namespace) -> None:
     """Run sharpen subcommand.
@@ -95,4 +105,31 @@ def run(args: argparse.Namespace) -> None:
                 args.radius, percent=args.percent, threshold=args.threshold
             )
         )
-        save_image(args, sharpen_image, image_filename, "sharpen")
+        if args.before_after:
+            save_gif_image(args, image_filename, original_image, sharpen_image)
+        else:
+            save_image(args, sharpen_image, image_filename, "sharpen")
+
+
+def save_gif_image(args, image_filename, original_image, sharpen_image):
+    """Save the original and sharpen image."""
+    image_file = Path(image_filename)
+    new_filename = Path(
+        args.output_dir,
+        image_file.with_name(f"sharpen_gif_{image_file.stem}.gif"),
+    )
+    new_filename.parent.mkdir(parents=True, exist_ok=True)
+
+    log.info("sharpen gif image: %s", new_filename)
+    original_image.save(
+        new_filename,
+        format="gif",
+        append_images=[sharpen_image],
+        save_all=True,
+        duration=2500,
+        loop=0,
+        optimize=True,
+    )
+
+    if args.open:
+        _open_image(new_filename)

{fotolab-0.23.0 → fotolab-0.25.0}/fotolab/subcommands/watermark.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2024 Kian-Meng Ang
+# 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
@@ -19,7 +19,7 @@ import argparse
 import logging
 import math
 
-from PIL import Image, ImageColor, ImageDraw, ImageFont
+from PIL import Image, ImageColor, ImageDraw, ImageFont, ImageSequence
 
 from fotolab import save_image
 from fotolab.subcommands.info import camera_metadata
@@ -157,13 +157,72 @@ def run(args: argparse.Namespace) -> None:
     log.debug(args)
 
     for image_filename in args.image_filenames:
-        watermarked_image = watermark_image(image_filename, args)
-        save_image(args, watermarked_image, image_filename, "watermark")
+        image = Image.open(image_filename)
+        if image.format == "GIF":
+            watermark_gif_image(image, args)
+        else:
+            watermarked_image = watermark_non_gif_image(image, args)
+            save_image(args, watermarked_image, image_filename, "watermark")
 
 
-def watermark_image(image_filename, args):
+def watermark_gif_image(original_image: Image.Image, args: argparse.Namespace):
+    """Watermark the image."""
+    watermarked_image = original_image.copy()
+
+    frames = []
+
+    for frame in ImageSequence.Iterator(original_image):
+        frame = frame.convert("RGBA")
+        draw = ImageDraw.Draw(frame)
+
+        font = ImageFont.load_default(calc_font_size(original_image, args))
+        log.debug("default font: %s", " ".join(font.getname()))
+
+        text = args.text
+        if args.camera and camera_metadata(original_image):
+            text = camera_metadata(original_image)
+
+        if args.lowercase:
+            text = text.lower()
+
+        (left, top, right, bottom) = draw.textbbox(
+            xy=(0, 0), text=text, font=font
+        )
+        text_width = right - left
+        text_height = bottom - top
+        (position_x, position_y) = calc_position(
+            watermarked_image,
+            text_width,
+            text_height,
+            args.position,
+            calc_padding(original_image, args),
+        )
+
+        draw.text(
+            (position_x, position_y),
+            text,
+            font=font,
+            fill=(*ImageColor.getrgb(args.font_color), 128),
+            stroke_width=calc_font_outline_width(original_image, args),
+            stroke_fill=(*ImageColor.getrgb(args.outline_color), 128),
+        )
+        frames.append(frame)
+
+    frames[0].save(
+        "foo.gif",
+        format="GIF",
+        append_images=frames[1:],
+        save_all=True,
+        duration=original_image.info.get("duration", 100),
+        loop=original_image.info.get("loop", 0),
+        disposal=original_image.info.get("disposal", 2),
+    )
+
+
+def watermark_non_gif_image(
+    original_image: Image.Image, args: argparse.Namespace
+):
     """Watermark the image."""
-    original_image = Image.open(image_filename)
     watermarked_image = original_image.copy()
 
     draw = ImageDraw.Draw(watermarked_image)
@@ -172,8 +231,8 @@ def watermark_image(image_filename, args):
     log.debug("default font: %s", " ".join(font.getname()))
 
     text = args.text
-    if args.camera and camera_metadata(image_filename):
-        text = camera_metadata(image_filename)
+    if args.camera and camera_metadata(original_image):
+        text = camera_metadata(original_image)
 
     if args.lowercase:
         text = text.lower()