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

fotolab/__init__.py

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

fotolab/cli.py

@@ -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-0.28.6.dist-info → fotolab-0.29.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fotolab
-Version: 0.28.6
+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.6.dist-info → fotolab-0.29.0.dist-info}/RECORD

@@ -1,21 +1,21 @@
-fotolab/__init__.py,sha256=yiRE-ZW8LgYnZAJ7wKNY_XdaaPC9IbHRMnlRKLYjsdA,3262
+fotolab/__init__.py,sha256=E76E5fEYHIL3PDbEllLqBALGLmzPYpgtdk4B1-ujU_g,3262
 fotolab/__main__.py,sha256=aboOURPs_snOXTEWYR0q8oq1UTY9e-NxCd1j33V0wHI,833
-fotolab/cli.py,sha256=ffT3CbMN37Qehw4l7YvwUbPFY-SezLLn4Xthi0ejOmk,3956
+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=iEuek0BM2PJlGMLq8VZhHxaQ8BInuN2_mvssA7Dhgy8,10032
-fotolab-0.28.6.dist-info/entry_points.txt,sha256=mvw7AY_yZkIyjAxPtHNed9X99NZeLnMxEeAfEJUbrCM,44
-fotolab-0.28.6.dist-info/LICENSE.md,sha256=tGtFDwxWTjuR9syrJoSv1Hiffd2u8Tu8cYClfrXS_YU,31956
-fotolab-0.28.6.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
-fotolab-0.28.6.dist-info/METADATA,sha256=3E5duvvv00UeRQoiWsueL2cdsEj1l17jdkwxY7Nal68,12970
-fotolab-0.28.6.dist-info/RECORD,,
+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,,