fotolab 0.26.2__tar.gz → 0.26.3__tar.gz

{fotolab-0.26.2 → fotolab-0.26.3}/.pre-commit-config.yaml

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

{fotolab-0.26.2 → fotolab-0.26.3}/CHANGELOG.md

@@ -7,6 +7,12 @@ and this project adheres to [0-based versioning](https://0ver.org/).
 
 ## [Unreleased]
 
+## v0.26.3 (2025-02-09)
+
+- Bump `pre-commit` hooks
+- Refactor text generation or saving image for `watermark` subcommand
+- Refactor `halftone` and `border` subcommand
+
 ## v0.26.2 (2025-02-02)
 
 - Add missing changelog item

{fotolab-0.26.2 → fotolab-0.26.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fotolab
-Version: 0.26.2
+Version: 0.26.3
 Summary: A console program that manipulate images.
 Keywords: photography,photo
 Author-email: Kian-Meng Ang <kianmeng@cpan.org>

{fotolab-0.26.2 → fotolab-0.26.3}/fotolab/__init__.py

@@ -20,7 +20,7 @@ import subprocess
 import sys
 from pathlib import Path
 
-__version__ = "0.26.2"
+__version__ = "0.26.3"
 
 log = logging.getLogger(__name__)
 

{fotolab-0.26.2 → fotolab-0.26.3}/fotolab/subcommands/border.py

@@ -125,13 +125,23 @@ def run(args: argparse.Namespace) -> None:
         save_image(args, bordered_image, image_filename, "border")
 
 
-def get_border(args: argparse.Namespace) -> tuple:
-    """Calculate the border."""
-    if (
-        args.width_left
-        or args.width_top
-        or args.width_right
-        or args.width_bottom
+def get_border(args: argparse.Namespace) -> tuple[int, int, int, int]:
+    """Calculate the border dimensions.
+
+    Args:
+        args (argparse.Namespace): Command line arguments
+
+    Returns:
+        tuple[int, int, int, int]: Border dimensions in pixesl. If individual
+        widths are not specified, returns a uniform width for all sides.
+    """
+    if any(
+        [
+            args.width_left,
+            args.width_top,
+            args.width_right,
+            args.width_bottom,
+        ]
     ):
         return (
             int(args.width_left),

{fotolab-0.26.2 → fotolab-0.26.3}/fotolab/subcommands/halftone.py

@@ -67,45 +67,62 @@ def run(args: argparse.Namespace) -> None:
 
     for image_filename in args.image_filenames:
         original_image = Image.open(image_filename)
-        grayscale_image = original_image.convert("L")
-        width, height = original_image.size
+        halftone_image = create_halftone_image(original_image)
+
+        if args.before_after:
+            save_gif_image(
+                args, image_filename, original_image, halftone_image
+            )
+        else:
+            save_image(args, halftone_image, image_filename, "halftone")
 
-        halftone_image = Image.new("L", (width, height), "black")
-        draw = ImageDraw.Draw(halftone_image)
 
-        # modified from the circular halftone effect processing.py example from
-        # https://tabreturn.github.io/code/processing/python/2019/02/09/processing.py_in_ten_lessons-6.3-_halftones.html
-        coltotal = 50
-        cellsize = width / coltotal
-        rowtotal = math.ceil(height / cellsize)
+def create_halftone_image(
+    original_image: Image.Image, cell_count: int = 50
+) -> Image.Image:
+    """Create a halftone version of the input image.
 
-        col = 0
-        row = 0
+    Modified from the circular halftone effect processing.py example from
+    https://tabreturn.github.io/code/processing/python/2019/02/09/processing.py_in_ten_lessons-6.3-_halftones.html
 
-        for _ in range(int(coltotal * rowtotal)):
-            x = int(col * cellsize)
-            y = int(row * cellsize)
-            col += 1
+    Args:
+        original_image: The source image to convert
+        cell_count: Number of cells across the width (default: 50)
 
-            if col >= coltotal:
-                col = 0
-                row += 1
+    Returns:
+        Image.Image: The halftone converted image
+    """
+    grayscale_image = original_image.convert("L")
+    width, height = original_image.size
 
-            x = int(x + cellsize / 2)
-            y = int(y + cellsize / 2)
+    halftone_image = Image.new("L", (width, height), "black")
+    draw = ImageDraw.Draw(halftone_image)
 
+    cellsize = width / cell_count
+    rowtotal = math.ceil(height / cellsize)
+
+    for row in range(rowtotal):
+        for col in range(cell_count):
+            # Calculate center point of current cell
+            x = int(col * cellsize + cellsize / 2)
+            y = int(row * cellsize + cellsize / 2)
+
+            # Get brightness and calculate dot size
             brightness = grayscale_image.getpixel((x, y))
-            amp = 10 * brightness / 200
+            dot_size = 10 * brightness / 200
+
+            # Draw the dot
             draw.ellipse(
-                [x - amp / 2, y - amp / 2, x + amp / 2, y + amp / 2], fill=255
+                [
+                    x - dot_size / 2,
+                    y - dot_size / 2,
+                    x + dot_size / 2,
+                    y + dot_size / 2,
+                ],
+                fill=255,
             )
 
-        if args.before_after:
-            save_gif_image(
-                args, image_filename, original_image, halftone_image
-            )
-        else:
-            save_image(args, halftone_image, image_filename, "halftone")
+    return halftone_image
 
 
 def save_gif_image(args, image_filename, original_image, sharpen_image):

{fotolab-0.26.2 → fotolab-0.26.3}/fotolab/subcommands/watermark.py

@@ -167,46 +167,10 @@ def run(args: argparse.Namespace) -> None:
 
 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)
+        watermarked_frame = watermark_image(args, frame.convert("RGBA"))
+        frames.append(watermarked_frame)
 
     frames[0].save(
         "foo.gif",
@@ -223,20 +187,20 @@ def watermark_non_gif_image(
     original_image: Image.Image, args: argparse.Namespace
 ):
     """Watermark the image."""
-    watermarked_image = original_image.copy()
+    return watermark_image(args, original_image)
+
 
+def watermark_image(
+    args: argparse.Namespace, original_image: Image.Image
+) -> Image.Image:
+    """Watermark an image."""
+    watermarked_image = original_image.copy()
     draw = ImageDraw.Draw(watermarked_image)
 
     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()
-
+    text = prepare_text(args, original_image)
     (left, top, right, bottom) = draw.textbbox(xy=(0, 0), text=text, font=font)
     text_width = right - left
     text_height = bottom - top
@@ -259,6 +223,18 @@ def watermark_non_gif_image(
     return watermarked_image
 
 
+def prepare_text(args, image) -> str:
+    """Prepare the watermark text."""
+    text = args.text
+    if args.camera and camera_metadata(image):
+        text = camera_metadata(image)
+
+    if args.lowercase:
+        text = text.lower()
+
+    return text
+
+
 def calc_font_size(image, args) -> int:
     """Calculate the font size based on the width of the image."""
     width, _height = image.size