fotolab 0.26.1__py3-none-any.whl → 0.26.3__py3-none-any.whl

fotolab/__init__.py

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

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/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):
@@ -123,7 +140,7 @@ def save_gif_image(args, image_filename, original_image, sharpen_image):
         format="gif",
         append_images=[sharpen_image],
         save_all=True,
-        duration=2500,
+        duration=1000,
         loop=0,
         optimize=True,
     )

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

{fotolab-0.26.1.dist-info → fotolab-0.26.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fotolab
-Version: 0.26.1
+Version: 0.26.3
 Summary: A console program that manipulate images.
 Keywords: photography,photo
 Author-email: Kian-Meng Ang <kianmeng@cpan.org>
@@ -61,7 +61,7 @@ fotolab -h
 
 ```console
 usage: fotolab [-h] [-o] [-op] [-od OUTPUT_DIR] [-q] [-v] [-d] [-V]
-               {animate,auto,border,contrast,env,info,montage,resize,rotate,sharpen,watermark} ...
+               {animate,auto,border,contrast,env,halftone,info,montage,resize,rotate,sharpen,watermark} ...
 
 A console program to manipulate photos.
 
@@ -70,13 +70,14 @@ changelog: https://github.com/kianmeng/fotolab/blob/master/CHANGELOG.md
 issues: https://github.com/kianmeng/fotolab/issues
 
 positional arguments:
-  {animate,auto,border,contrast,env,info,montage,resize,rotate,sharpen,watermark}
+  {animate,auto,border,contrast,env,halftone,info,montage,resize,rotate,sharpen,watermark}
                     sub-command help
     animate         animate an image
     auto            auto adjust (resize, contrast, and watermark) a photo
     border          add border to image
     contrast        contrast an image
     env             print environment information for bug reporting
+    halftone        halftone an image
     info            info an image
     montage         montage a list of image
     resize          resize an image

{fotolab-0.26.1.dist-info → fotolab-0.26.3.dist-info}/RECORD

@@ -1,21 +1,21 @@
-fotolab/__init__.py,sha256=a6JSYO39sXbb5tNuAR07eXw8gXocdIrxeHtn0LS7ZAo,2172
+fotolab/__init__.py,sha256=mQ7OaOJnNZcjO8usZi_l0a_bX5_dNrUENLnp8VQMp2k,2172
 fotolab/__main__.py,sha256=aboOURPs_snOXTEWYR0q8oq1UTY9e-NxCd1j33V0wHI,833
 fotolab/cli.py,sha256=9rhS-yhX1nE_zKBfR05QyEt-S7Y43mIP0yUQA6bsgV8,4326
 fotolab/subcommands/__init__.py,sha256=l3DlIaJ3u3jGjnC1H1yV8LZ_nPqOLJ6gikD4BCaMAQ0,1129
 fotolab/subcommands/animate.py,sha256=Zp0LPM7ktg6V2rIAP8pof2mmPAph_0O3TEySvg55-h8,2972
 fotolab/subcommands/auto.py,sha256=p_e1f4mcrIFLqBXMNKvPQRDkNrAlK7FR6sdR5NAR0t8,2427
-fotolab/subcommands/border.py,sha256=v5rdLb7Yq1kQI0MTSfVb0iroBroTV8oxOk-jMLB2who,3637
+fotolab/subcommands/border.py,sha256=SwxGWzKxQACZH0u2z2jIvuqdx_OvXKDaCVptP5K7D7c,3941
 fotolab/subcommands/contrast.py,sha256=8uPCd5xI-aUsL7rjdEPmfSskdzMwM-1tv0eRRONkW2M,2100
 fotolab/subcommands/env.py,sha256=JamU3a2xWPbwlAj5iThHs58KYkLmjpUphZfTQODBp_4,1471
-fotolab/subcommands/halftone.py,sha256=EEXq3ZZES3h2ZzLTc0IpkkuApR5O_kdeZ7N3vRFv-UI,3820
+fotolab/subcommands/halftone.py,sha256=Xlbj3nVzqBXLzfemhF66nWV9U-PJHcG1Q2m2HiDhjI0,4322
 fotolab/subcommands/info.py,sha256=DANbfBNy2SzFfeE4KqOViAZkaME6xujfZvJTHIaZyCY,3312
 fotolab/subcommands/montage.py,sha256=hhRH9LsWxXa86_qtVDKGvk--Eap2nP17OTy81kq3Xjk,2048
 fotolab/subcommands/resize.py,sha256=d2Nlslzlvri9L2rqmE-HbmnLozylSk3U1Hi3DF1q3Mc,5023
 fotolab/subcommands/rotate.py,sha256=vhtiAD5r0i5humpjyAbkoxh2nQsSuBYUD-TgcECwUwE,2149
 fotolab/subcommands/sharpen.py,sha256=xz8RW8cRPM4eUvJTO1Stsur3G67DBftVGza8kF5j2Pc,3700
-fotolab/subcommands/watermark.py,sha256=zKIFMreqSRaTD89JPjtLZljfTw-5ZkbZNBAyLeFveGw,8905
-fotolab-0.26.1.dist-info/entry_points.txt,sha256=mvw7AY_yZkIyjAxPtHNed9X99NZeLnMxEeAfEJUbrCM,44
-fotolab-0.26.1.dist-info/LICENSE.md,sha256=tGtFDwxWTjuR9syrJoSv1Hiffd2u8Tu8cYClfrXS_YU,31956
-fotolab-0.26.1.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
-fotolab-0.26.1.dist-info/METADATA,sha256=pTDOM47SsAvo1xgsN6RlL2_ocSwcRm5W3TrSkJE9dyw,11058
-fotolab-0.26.1.dist-info/RECORD,,
+fotolab/subcommands/watermark.py,sha256=a4GEVZG64B1giUigweXvDGS-Y7PeBXFyyrsHuko6ClQ,8124
+fotolab-0.26.3.dist-info/entry_points.txt,sha256=mvw7AY_yZkIyjAxPtHNed9X99NZeLnMxEeAfEJUbrCM,44
+fotolab-0.26.3.dist-info/LICENSE.md,sha256=tGtFDwxWTjuR9syrJoSv1Hiffd2u8Tu8cYClfrXS_YU,31956
+fotolab-0.26.3.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
+fotolab-0.26.3.dist-info/METADATA,sha256=unUGTv1OHqdprfMt-jC5fCEeeBpIi2TQxeq81y2jGmg,11114
+fotolab-0.26.3.dist-info/RECORD,,