fotolab 0.28.5__py3-none-any.whl → 0.29.0__py3-none-any.whl

fotolab/__init__.py

@@ -17,13 +17,14 @@
 
 import argparse
 import logging
+import os
 import subprocess
 import sys
 from pathlib import Path
 
 from PIL import Image
 
-__version__ = "0.28.5"
+__version__ = "0.29.0"
 
 log = logging.getLogger(__name__)
 
@@ -98,10 +99,9 @@ def _open_image(filename):
             subprocess.call(["xdg-open", filename])
         elif sys.platform == "darwin":
             subprocess.call(["open", filename])
-        elif sys.platform == "windows":
-            with subprocess.Popen(["open", filename], shell=True) as proc:
-                proc.wait()
+        elif sys.platform == "win32":
+            os.startfile(filename)
         log.info("open image: %s", filename.resolve())
 
-    except OSError as error:
+    except (OSError, FileNotFoundError) as error:
         log.error("Error opening image: %s -> %s", filename, error)

fotolab/cli.py

@@ -1,17 +1,17 @@
 # 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
-# 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 General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+# 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/>.
 
 """A console program to manipulate photos.
 
@@ -115,6 +115,7 @@ def build_parser() -> argparse.ArgumentParser:
     subparsers = parser.add_subparsers(
         help="sub-command help",
         dest="command",
+        required=True,
     )
     fotolab.subcommands.build_subparser(subparsers)
 
@@ -128,16 +129,24 @@ def main(args: Optional[Sequence[str]] = None) -> None:
 
     try:
         parser = build_parser()
-        if len(args) == 0:
-            parser.print_help(sys.stderr)
-            return
-
         parsed_args = parser.parse_args(args)
         setup_logging(parsed_args)
 
-        if hasattr(parsed_args, "func"):
+        if parsed_args.command is not None:
             log.debug(parsed_args)
-            parsed_args.func(parsed_args)
+            # Ensure the function attribute exists (set by set_defaults in
+            # subcommands)
+            if hasattr(parsed_args, "func"):
+                parsed_args.func(parsed_args)
+            else:
+                # This case should ideally not happen if subcommands are set up
+                # correctly
+                log.error(
+                    "subcommand '%s' is missing its execution function.",
+                    parsed_args.command
+                )
+                parser.print_help(sys.stderr)
+                raise SystemExit(1)
         else:
             parser.print_help(sys.stderr)
 

fotolab/subcommands/halftone.py

@@ -69,6 +69,24 @@ def build_subparser(subparsers) -> None:
         help="set default output folder (default: '%(default)s')",
     )
 
+    halftone_parser.add_argument(
+        "-c",
+        "--cells",
+        dest="cells",
+        type=int,
+        default=50,
+        help="set number of cells across the image width (default: %(default)s)",
+    )
+
+    halftone_parser.add_argument(
+        "-g",
+        "--grayscale",
+        default=False,
+        action="store_true",
+        dest="grayscale",
+        help="convert image to grayscale before applying halftone",
+    )
+
 
 def run(args: argparse.Namespace) -> None:
     """Run halftone subcommand.
@@ -83,7 +101,9 @@ def run(args: argparse.Namespace) -> None:
 
     for image_filename in args.image_filenames:
         original_image = Image.open(image_filename)
-        halftone_image = create_halftone_image(original_image)
+        halftone_image = create_halftone_image(
+            original_image, args.cells, args.grayscale
+        )
 
         if args.before_after:
             save_gif_image(
@@ -98,7 +118,7 @@ def run(args: argparse.Namespace) -> None:
 
 
 def create_halftone_image(
-    original_image: Image.Image, cell_count: int = 50
+    original_image: Image.Image, cell_count: int, grayscale: bool = False
 ) -> Image.Image:
     """Create a halftone version of the input image.
 
@@ -107,15 +127,26 @@ def create_halftone_image(
 
     Args:
         original_image: The source image to convert
-        cell_count: Number of cells across the width (default: 50)
+        cell_count: Number of cells across the width
+        grayscale: Whether to convert to grayscale first (default: False)
 
     Returns:
         Image.Image: The halftone converted image
     """
-    grayscale_image = original_image.convert("L")
+    if grayscale:
+        source_image = original_image.convert("L")
+        output_mode = "L"
+        fill_color_black = 0
+        fill_color_dot = 255
+    else:
+        source_image = original_image.convert("RGB")
+        output_mode = "RGB"
+        fill_color_black = (0, 0, 0)
+
     width, height = original_image.size
 
-    halftone_image = Image.new("L", (width, height), "black")
+    # Create a new image for the output, initialized to black
+    halftone_image = Image.new(output_mode, (width, height), fill_color_black)
     draw = ImageDraw.Draw(halftone_image)
 
     cellsize = width / cell_count
@@ -127,19 +158,34 @@ def create_halftone_image(
             x = int(col * cellsize + cellsize / 2)
             y = int(row * cellsize + cellsize / 2)
 
-            # Get brightness and calculate dot size
-            brightness = grayscale_image.getpixel((x, y))
-            dot_size = 10 * brightness / 200
+            # Get pixel value (brightness or 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
+            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
+
+            # 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) * (cellsize / 2)
 
             # Draw the dot
             draw.ellipse(
                 [
-                    x - dot_size / 2,
-                    y - dot_size / 2,
-                    x + dot_size / 2,
-                    y + dot_size / 2,
+                    x - dot_radius,
+                    y - dot_radius,
+                    x + dot_radius,
+                    y + dot_radius,
                 ],
-                fill=255,
+                fill=dot_fill,
             )
 
     return halftone_image

fotolab/subcommands/watermark.py

@@ -19,23 +19,24 @@ import argparse
 import logging
 import math
 from pathlib import Path
+from typing import Tuple
 
 from PIL import Image, ImageColor, ImageDraw, ImageFont, ImageSequence
 
 from fotolab import save_image
 from fotolab.subcommands.info import camera_metadata
 
-log = logging.getLogger(__name__)
+log: logging.Logger = logging.getLogger(__name__)
 
-FONT_SIZE_ASPECT_RATIO = 12 / 600
-FONT_PADDING_ASPECT_RATIO = 15 / 600
-FONT_OUTLINE_WIDTH_ASPECT_RATIO = 2 / 600
-POSITIONS = ["top-left", "top-right", "bottom-left", "bottom-right"]
+FONT_SIZE_ASPECT_RATIO: float = 12 / 600
+FONT_PADDING_ASPECT_RATIO: float = 15 / 600
+FONT_OUTLINE_WIDTH_ASPECT_RATIO: float = 2 / 600
+POSITIONS: list[str] = ["top-left", "top-right", "bottom-left", "bottom-right"]
 
 
-def build_subparser(subparsers) -> None:
+def build_subparser(subparsers: argparse._SubParsersAction) -> None:
     """Build the subparser."""
-    watermark_parser = subparsers.add_parser(
+    watermark_parser: argparse.ArgumentParser = subparsers.add_parser(
         "watermark", help="watermark an image"
     )
 
@@ -175,11 +176,13 @@ def run(args: argparse.Namespace) -> None:
     log.debug(args)
 
     for image_filename in args.image_filenames:
-        image = Image.open(image_filename)
+        image: Image.Image = Image.open(image_filename)
         if image.format == "GIF":
             watermark_gif_image(image, image_filename, args)
         else:
-            watermarked_image = watermark_non_gif_image(image, args)
+            watermarked_image: Image.Image = watermark_non_gif_image(
+                image, args
+            )
             save_image(args, watermarked_image, image_filename, "watermark")
 
 
@@ -196,15 +199,17 @@ def watermark_gif_image(
     Returns:
         None
     """
-    frames = []
+    frames: list[Image.Image] = []
     for frame in ImageSequence.Iterator(original_image):
-        watermarked_frame = watermark_image(args, frame.convert("RGBA"))
+        watermarked_frame: Image.Image = watermark_image(
+            args, frame.convert("RGBA")
+        )
         frames.append(watermarked_frame)
 
-    image_file = Path(output_filename)
+    image_file: Path = Path(output_filename)
 
     if args.overwrite:
-        new_filename = original_image.with_name(image_file.name)
+        new_filename: Path = image_file.with_name(image_file.name)
     else:
         new_filename = Path(
             args.output_dir,
@@ -243,16 +248,18 @@ 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)
+    watermarked_image: Image.Image = original_image.copy()
+    draw: ImageDraw.ImageDraw = ImageDraw.Draw(watermarked_image)
 
-    font = ImageFont.load_default(calc_font_size(original_image, args))
+    font: ImageFont.FreeTypeFont = ImageFont.load_default(
+        calc_font_size(original_image, args)
+    )
     log.debug("default font: %s", " ".join(font.getname()))
 
-    text = prepare_text(args, original_image)
+    text: str = 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
+    text_width: int = right - left
+    text_height: int = bottom - top
     (position_x, position_y) = calc_position(
         watermarked_image,
         text_width,
@@ -272,9 +279,9 @@ def watermark_image(
     return watermarked_image
 
 
-def prepare_text(args, image) -> str:
+def prepare_text(args: argparse.Namespace, image: Image.Image) -> str:
     """Prepare the watermark text."""
-    text = args.text
+    text: str = args.text
     if args.camera and camera_metadata(image):
         text = camera_metadata(image)
 
@@ -284,10 +291,10 @@ def prepare_text(args, image) -> str:
     return text
 
 
-def calc_font_size(image, args) -> int:
+def calc_font_size(image: Image.Image, args: argparse.Namespace) -> int:
     """Calculate the font size based on the width of the image."""
     width, _height = image.size
-    new_font_size = args.font_size
+    new_font_size: int = args.font_size
     if width > 600:
         new_font_size = math.floor(FONT_SIZE_ASPECT_RATIO * width)
 
@@ -295,10 +302,12 @@ def calc_font_size(image, args) -> int:
     return new_font_size
 
 
-def calc_font_outline_width(image, args) -> int:
+def calc_font_outline_width(
+    image: Image.Image, args: argparse.Namespace
+) -> int:
     """Calculate the font padding based on the width of the image."""
     width, _height = image.size
-    new_font_outline_width = args.outline_width
+    new_font_outline_width: int = args.outline_width
     if width > 600:
         new_font_outline_width = math.floor(
             FONT_OUTLINE_WIDTH_ASPECT_RATIO * width
@@ -308,10 +317,10 @@ def calc_font_outline_width(image, args) -> int:
     return new_font_outline_width
 
 
-def calc_padding(image, args) -> int:
+def calc_padding(image: Image.Image, args: argparse.Namespace) -> int:
     """Calculate the font padding based on the width of the image."""
     width, _height = image.size
-    new_padding = args.padding
+    new_padding: int = args.padding
     if width > 600:
         new_padding = math.floor(FONT_PADDING_ASPECT_RATIO * width)
 
@@ -319,9 +328,15 @@ def calc_padding(image, args) -> int:
     return new_padding
 
 
-def calc_position(image, text_width, text_height, position, padding) -> tuple:
+def calc_position(
+    image: Image.Image,
+    text_width: int,
+    text_height: int,
+    position: str,
+    padding: int,
+) -> Tuple[int, int]:
     """Calculate the boundary coordinates of the watermark text."""
-    positions = {
+    positions: dict[str, Tuple[int, int]] = {
         "top-left": (padding, padding),
         "top-right": (image.width - text_width - padding, padding),
         "bottom-left": (padding, image.height - text_height - padding),

{fotolab-0.28.5.dist-info → fotolab-0.29.0.dist-info}/METADATA

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

{fotolab-0.28.5.dist-info → fotolab-0.29.0.dist-info}/RECORD

@@ -1,21 +1,21 @@
-fotolab/__init__.py,sha256=qytheZnIjS5g0aUnq6-ChflsFcLasoz97T7GReoaeeQ,3301
+fotolab/__init__.py,sha256=E76E5fEYHIL3PDbEllLqBALGLmzPYpgtdk4B1-ujU_g,3262
 fotolab/__main__.py,sha256=aboOURPs_snOXTEWYR0q8oq1UTY9e-NxCd1j33V0wHI,833
-fotolab/cli.py,sha256=fIApD9C4Vkn-u4CejOFTboSV5f-Ks9vBGxeb-_ca-Nw,3935
+fotolab/cli.py,sha256=NH_u73SJhzwDJSRqpi1I4dc8wBfcqbDxNne3cio163A,4411
 fotolab/subcommands/__init__.py,sha256=l3DlIaJ3u3jGjnC1H1yV8LZ_nPqOLJ6gikD4BCaMAQ0,1129
 fotolab/subcommands/animate.py,sha256=OcS6Q6JM1TW6HF0dSgBsV9mpEGwDMcJlQssupkf0_ZA,3393
 fotolab/subcommands/auto.py,sha256=ia-xegV1Z4HvYsbKgmTzf1NfNFdTDPWfZe7vQ1_90Ik,2425
 fotolab/subcommands/border.py,sha256=BS3BHytdWiNumxdKulKYK-WigbsKtPxECdvInUhUjSQ,4608
 fotolab/subcommands/contrast.py,sha256=ZHTvAJhRYZjNTrkHRZq3O6wba3LS7QjH1BfiGf4ZvGY,3005
 fotolab/subcommands/env.py,sha256=QoxRvzZKgmoHTUxDV4QYhdChCpMWs5TbXFY_qIpIQpE,1469
-fotolab/subcommands/halftone.py,sha256=bRGG_Bg1T5ZV3UWsdMszOdPmc6g9_R0yNp5mb0g8hcE,4152
+fotolab/subcommands/halftone.py,sha256=dtqmyZyGC8huzSGRCRgp8t11m51hFC15kvgfEJBm_0c,5714
 fotolab/subcommands/info.py,sha256=Qp-Zu7Xp1ptLK211hOkFM5oxZWGTrlNBqCpbx2IjL9Y,3371
 fotolab/subcommands/montage.py,sha256=d_3EcyRSFS8fKkczlHO8IRP-mrKhQUtkQndjfd0MKsc,2566
 fotolab/subcommands/resize.py,sha256=UOb2rg_5ArRj0gxPTDOww_ix3tqJRC0W5b_S-Lt1G4w,5444
 fotolab/subcommands/rotate.py,sha256=uBFjHyjiBSQLtrtH1p9myODIHUDr1gkL4PpU-6Y1Ofo,2575
 fotolab/subcommands/sharpen.py,sha256=YNho2IPbc-lPvSy3Bsjehc2JOEy27LPqFSGRULs9MyY,3492
-fotolab/subcommands/watermark.py,sha256=A_dUy_yf9wPHUexB9aIicFIS-BpWrjjfI8Hr4WCCBoc,9449
-fotolab-0.28.5.dist-info/entry_points.txt,sha256=mvw7AY_yZkIyjAxPtHNed9X99NZeLnMxEeAfEJUbrCM,44
-fotolab-0.28.5.dist-info/LICENSE.md,sha256=tGtFDwxWTjuR9syrJoSv1Hiffd2u8Tu8cYClfrXS_YU,31956
-fotolab-0.28.5.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
-fotolab-0.28.5.dist-info/METADATA,sha256=0SIqAZceh2lv4iQkVoJu-7nRab99nDecITkquNUXFuU,12970
-fotolab-0.28.5.dist-info/RECORD,,
+fotolab/subcommands/watermark.py,sha256=iEuek0BM2PJlGMLq8VZhHxaQ8BInuN2_mvssA7Dhgy8,10032
+fotolab-0.29.0.dist-info/entry_points.txt,sha256=mvw7AY_yZkIyjAxPtHNed9X99NZeLnMxEeAfEJUbrCM,44
+fotolab-0.29.0.dist-info/LICENSE.md,sha256=tGtFDwxWTjuR9syrJoSv1Hiffd2u8Tu8cYClfrXS_YU,31956
+fotolab-0.29.0.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
+fotolab-0.29.0.dist-info/METADATA,sha256=h3twSy_UW9ri5GZ0_Xyh0s2IYH6AdVCAll-TuKYc-Xg,12970
+fotolab-0.29.0.dist-info/RECORD,,