fotolab 0.29.2__py3-none-any.whl → 0.31.0__py3-none-any.whl

fotolab/__init__.py

@@ -24,7 +24,7 @@ from pathlib import Path
 
 from PIL import Image
 
-__version__ = "0.29.2"
+__version__ = "0.31.0"
 
 log = logging.getLogger(__name__)
 
@@ -59,15 +59,14 @@ def save_gif_image(
         _open_image(new_filename)
 
 
-def save_image(args, new_image, output_filename, subcommand):
+def save_image(
+    args: argparse.Namespace,
+    new_image: Image.Image,
+    output_filename: str,
+    subcommand: str,
+) -> None:
     """Save image after image operation.
 
-    Args:
-        args (argparse.Namespace): Config from command line arguments
-        new_image(PIL.Image.Image): Modified image
-        output_filename(str): Save filename image
-        subcommand(str): Subcommand used to call this function
-
     Returns:
         None
     """

fotolab/cli.py

@@ -15,9 +15,9 @@
 
 """A console program to manipulate photos.
 
-  website: https://github.com/kianmeng/fotolab
-  changelog: https://github.com/kianmeng/fotolab/blob/master/CHANGELOG.md
-  issues: https://github.com/kianmeng/fotolab/issues
+website: https://github.com/kianmeng/fotolab
+changelog: https://github.com/kianmeng/fotolab/blob/master/CHANGELOG.md
+issues: https://github.com/kianmeng/fotolab/issues
 """
 
 import argparse
@@ -143,7 +143,7 @@ def main(args: Optional[Sequence[str]] = None) -> None:
                 # correctly
                 log.error(
                     "subcommand '%s' is missing its execution function.",
-                    parsed_args.command
+                    parsed_args.command,
                 )
                 parser.print_help(sys.stderr)
                 raise SystemExit(1)

fotolab/subcommands/animate.py

@@ -26,6 +26,21 @@ from fotolab import _open_image
 log = logging.getLogger(__name__)
 
 
+def _validate_duration(value: str) -> int:
+    """Validate that the duration is a positive integer."""
+    try:
+        ivalue = int(value)
+        if ivalue <= 0:
+            raise argparse.ArgumentTypeError(
+                f"duration must be a positive integer, but got {value}"
+            )
+        return ivalue
+    except ValueError as e:
+        raise argparse.ArgumentTypeError(
+            f"duration must be an integer, but got '{value}'"
+        ) from e
+
+
 def build_subparser(subparsers) -> None:
     """Build the subparser."""
     animate_parser = subparsers.add_parser("animate", help="animate an image")
@@ -56,9 +71,9 @@ def build_subparser(subparsers) -> None:
         "-d",
         "--duration",
         dest="duration",
-        type=int,
+        type=_validate_duration,
         default=2500,
-        help="set the duration in milliseconds (default: '%(default)s')",
+        help="set the duration in milliseconds (must be a positive integer, default: '%(default)s')",
         metavar="DURATION",
     )
 
@@ -81,6 +96,34 @@ def build_subparser(subparsers) -> None:
         help="open the image using default program (default: '%(default)s')",
     )
 
+    animate_parser.add_argument(
+        "--webp-quality",
+        dest="webp_quality",
+        type=int,
+        default=80,
+        choices=range(0, 101),
+        help="set WEBP quality (0-100, default: '%(default)s')",
+        metavar="QUALITY",
+    )
+
+    animate_parser.add_argument(
+        "--webp-lossless",
+        dest="webp_lossless",
+        default=False,
+        action="store_true",
+        help="enable WEBP lossless compression (default: '%(default)s')",
+    )
+
+    animate_parser.add_argument(
+        "--webp-method",
+        dest="webp_method",
+        type=int,
+        default=4,
+        choices=range(0, 7),
+        help="set WEBP encoding method (0=fast, 6=slow/best, default: '%(default)s')",
+        metavar="METHOD",
+    )
+
     animate_parser.add_argument(
         "-od",
         "--output-dir",
@@ -101,31 +144,50 @@ def run(args: argparse.Namespace) -> None:
     """
     log.debug(args)
 
-    first_image = args.image_filenames[0]
-    animated_image = Image.open(first_image)
-
-    append_images = []
-    for image_filename in args.image_filenames[1:]:
-        append_images.append(Image.open(image_filename))
-
-    image_file = Path(first_image)
-    new_filename = Path(
-        args.output_dir,
-        image_file.with_name(f"animate_{image_file.stem}.{args.format}"),
-    )
-    new_filename.parent.mkdir(parents=True, exist_ok=True)
-
-    log.info("animate image: %s", new_filename)
-
-    animated_image.save(
-        new_filename,
-        format=args.format,
-        append_images=append_images,
-        save_all=True,
-        duration=args.duration,
-        loop=args.loop,
-        optimize=True,
-    )
+    first_image_filepath = args.image_filenames[0]
+    main_frame = None
+    other_frames = []
+
+    try:
+        main_frame = Image.open(first_image_filepath)
+
+        for image_filename in args.image_filenames[1:]:
+            img = Image.open(image_filename)
+            other_frames.append(img)
+
+        image_file = Path(first_image_filepath)
+        new_filename = Path(
+            args.output_dir,
+            image_file.with_name(f"animate_{image_file.stem}.{args.format}"),
+        )
+        new_filename.parent.mkdir(parents=True, exist_ok=True)
+
+        log.info("animate image: %s", new_filename)
+
+        save_kwargs = {
+            "format": args.format,
+            "append_images": other_frames,
+            "save_all": True,
+            "duration": args.duration,
+            "loop": args.loop,
+            "optimize": True,  # General optimization, good for GIF
+        }
+
+        if args.format == "webp":
+            save_kwargs["quality"] = args.webp_quality
+            save_kwargs["lossless"] = args.webp_lossless
+            save_kwargs["method"] = args.webp_method
+            # Pillow's WEBP save doesn't use a general 'optimize' like GIF.
+            # Specific WEBP params like 'method' and 'quality' control this.
+            # We can remove 'optimize' if it causes issues or is ignored for WEBP.
+            # For now, let's keep it, Pillow might handle it or ignore it.
+
+        main_frame.save(new_filename, **save_kwargs)
+    finally:
+        if main_frame:
+            main_frame.close()
+        for frame in other_frames:
+            frame.close()
 
     if args.open:
         _open_image(new_filename)

fotolab/subcommands/border.py

@@ -26,7 +26,7 @@ from fotolab import save_image
 log = logging.getLogger(__name__)
 
 
-def build_subparser(subparsers) -> None:
+def build_subparser(subparsers: argparse._SubParsersAction) -> None:
     """Build the subparser."""
     border_parser = subparsers.add_parser("border", help="add border to image")
 
@@ -150,17 +150,16 @@ def run(args: argparse.Namespace) -> None:
 
 def get_border(
     args: argparse.Namespace,
-) -> Union[Tuple[int, int, int, int], int]:
+) -> Tuple[int, int, int, int]:
     """Calculate the border dimensions.
 
     Args:
         args (argparse.Namespace): Command line arguments
 
     Returns:
-        Union[Tuple[int, int, int, int], int]: Border dimensions in pixels.
-        If individual widths are specified, returns a tuple of (left, top,
-        right, bottom) widths.  Otherwise, returns a uniform width for all
-        sides.
+        Tuple[int, int, int, int]: Border dimensions in pixels as (left, top,
+        right, bottom) widths. If individual widths are not specified,
+        a uniform width is returned for all sides.
     """
     if any(
         [
@@ -176,4 +175,5 @@ def get_border(
             args.width_right,
             args.width_bottom,
         )
-    return args.width
+    # If no individual widths are specified, use the general width for all sides
+    return (args.width, args.width, args.width, args.width)

fotolab/subcommands/contrast.py

@@ -31,7 +31,9 @@ def _validate_cutoff(value: str) -> float:
     try:
         f_value = float(value)
     except ValueError as e:
-        raise argparse.ArgumentTypeError(f"invalid float value: '{value}'") from e
+        raise argparse.ArgumentTypeError(
+            f"invalid float value: '{value}'"
+        ) from e
     if not 0 <= f_value <= 50:
         raise argparse.ArgumentTypeError(
             f"cutoff value {f_value} must be between 0 and 50"

fotolab/subcommands/watermark.py

@@ -129,6 +129,21 @@ def build_subparser(subparsers: argparse._SubParsersAction) -> None:
         metavar="OUTLINE_COLOR",
     )
 
+    watermark_parser.add_argument(
+        "-a",
+        "--alpha",
+        dest="alpha",
+        type=int,
+        default=128,
+        choices=range(0, 256),
+        metavar="ALPHA_VALUE",
+        help=(
+            "set the transparency of the watermark text (0-255, "
+            "where 0 is fully transparent and 255 is fully opaque; "
+            "default: '%(default)s')"
+        ),
+    )
+
     watermark_parser.add_argument(
         "--camera",
         default=False,
@@ -176,7 +191,15 @@ def run(args: argparse.Namespace) -> None:
     log.debug(args)
 
     for image_filename in args.image_filenames:
-        image: Image.Image = Image.open(image_filename)
+        try:
+            image: Image.Image = Image.open(image_filename)
+        except FileNotFoundError:
+            log.error("Image file not found: %s", image_filename)
+            continue
+        except Exception as e:
+            log.error("Could not open image %s: %s", image_filename, e)
+            continue
+
         if image.format == "GIF":
             watermark_gif_image(image, image_filename, args)
         else:
@@ -202,7 +225,7 @@ def watermark_gif_image(
     frames: list[Image.Image] = []
     for frame in ImageSequence.Iterator(original_image):
         watermarked_frame: Image.Image = watermark_image(
-            args, frame.convert("RGBA")
+            args, frame.convert("RGBA"), args.alpha
         )
         frames.append(watermarked_frame)
 
@@ -241,11 +264,11 @@ def watermark_non_gif_image(
     Returns:
         Image.Image: The watermarked image
     """
-    return watermark_image(args, original_image)
+    return watermark_image(args, original_image, args.alpha)
 
 
 def watermark_image(
-    args: argparse.Namespace, original_image: Image.Image
+    args: argparse.Namespace, original_image: Image.Image, alpha: int
 ) -> Image.Image:
     """Watermark an image."""
     watermarked_image: Image.Image = original_image.copy()
@@ -268,13 +291,21 @@ def watermark_image(
         calc_padding(original_image, args),
     )
 
+    try:
+        font_fill_color = ImageColor.getrgb(args.font_color)
+        stroke_fill_color = ImageColor.getrgb(args.outline_color)
+    except ValueError:
+        log.error("Invalid font or outline color specified. Using defaults.")
+        font_fill_color = ImageColor.getrgb("white")
+        stroke_fill_color = ImageColor.getrgb("black")
+
     draw.text(
         (position_x, position_y),
         text,
         font=font,
-        fill=(*ImageColor.getrgb(args.font_color), 128),
+        fill=(*font_fill_color, alpha),
         stroke_width=calc_font_outline_width(original_image, args),
-        stroke_fill=(*ImageColor.getrgb(args.outline_color), 128),
+        stroke_fill=(*stroke_fill_color, alpha),
     )
     return watermarked_image
 

{fotolab-0.29.2.dist-info → fotolab-0.31.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fotolab
-Version: 0.29.2
+Version: 0.31.0
 Summary: A console program that manipulate images.
 Keywords: photography,photo
 Author-email: Kian-Meng Ang <kianmeng@cpan.org>
@@ -106,7 +106,8 @@ fotolab animate -h
 
 ```console
 usage: fotolab animate [-h] [-f FORMAT] [-d DURATION] [-l LOOP] [-op]
-                       [-od OUTPUT_DIR]
+                       [--webp-quality QUALITY] [--webp-lossless]
+                       [--webp-method METHOD] [-od OUTPUT_DIR]
                        IMAGE_FILENAMES [IMAGE_FILENAMES ...]
 
 positional arguments:
@@ -116,10 +117,16 @@ options:
   -h, --help            show this help message and exit
   -f, --format FORMAT   set the image format (default: 'gif')
   -d, --duration DURATION
-                        set the duration in milliseconds (default: '2500')
+                        set the duration in milliseconds (must be a positive
+                        integer, default: '2500')
   -l, --loop LOOP       set the loop cycle (default: '0')
   -op, --open           open the image using default program (default:
                         'False')
+  --webp-quality QUALITY
+                        set WEBP quality (0-100, default: '80')
+  --webp-lossless       enable WEBP lossless compression (default: 'False')
+  --webp-method METHOD  set WEBP encoding method (0=fast, 6=slow/best,
+                        default: '4')
   -od, --output-dir OUTPUT_DIR
                         set default output folder (default: 'output')
 ```

{fotolab-0.29.2.dist-info → fotolab-0.31.0.dist-info}/RECORD

@@ -1,11 +1,11 @@
-fotolab/__init__.py,sha256=x3KFWNlsAU6oD0mfatPwnN0mtrqpZrMk6ndICOBKR8o,3262
+fotolab/__init__.py,sha256=TKTFXeMPGcnb4yYlrnCjAsghD_bbcPvtFrlRNRWVX6U,3087
 fotolab/__main__.py,sha256=aboOURPs_snOXTEWYR0q8oq1UTY9e-NxCd1j33V0wHI,833
-fotolab/cli.py,sha256=NH_u73SJhzwDJSRqpi1I4dc8wBfcqbDxNne3cio163A,4411
+fotolab/cli.py,sha256=oFiQXmsu3wIsM_DpZnL4B94sAoB62L16Am-cjxGmosY,4406
 fotolab/subcommands/__init__.py,sha256=l3DlIaJ3u3jGjnC1H1yV8LZ_nPqOLJ6gikD4BCaMAQ0,1129
-fotolab/subcommands/animate.py,sha256=OcS6Q6JM1TW6HF0dSgBsV9mpEGwDMcJlQssupkf0_ZA,3393
+fotolab/subcommands/animate.py,sha256=vmviz3cLnHfVENxFKiTimhx8nmbGbzumOP6dUd_UiUI,5524
 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/border.py,sha256=3RbTAMyKZRRTWKXHHsM584_Z6qzl5_leQn-U9DD4dCk,4702
+fotolab/subcommands/contrast.py,sha256=fcXmHnxDw74j5ZUDQ5cwWh0N4tpyqqvEjymnpITgrEk,3027
 fotolab/subcommands/env.py,sha256=QoxRvzZKgmoHTUxDV4QYhdChCpMWs5TbXFY_qIpIQpE,1469
 fotolab/subcommands/halftone.py,sha256=lt6RV0OuZkGs1LigTC1EcCCY42CocPFHWaJTDjJ5LFM,6693
 fotolab/subcommands/info.py,sha256=vie578cEOesAyHohm0xCWwZBqXpblYJtdHGSyBgxsoU,3581
@@ -13,9 +13,9 @@ fotolab/subcommands/montage.py,sha256=d_3EcyRSFS8fKkczlHO8IRP-mrKhQUtkQndjfd0MKs
 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=qRGUp1Lc22fZSJDFRqQGPiz8RSB293ebvOVTdsDLUE4,10351
-fotolab-0.29.2.dist-info/entry_points.txt,sha256=mvw7AY_yZkIyjAxPtHNed9X99NZeLnMxEeAfEJUbrCM,44
-fotolab-0.29.2.dist-info/LICENSE.md,sha256=tGtFDwxWTjuR9syrJoSv1Hiffd2u8Tu8cYClfrXS_YU,31956
-fotolab-0.29.2.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
-fotolab-0.29.2.dist-info/METADATA,sha256=GOyjpDfTCDNXKoRm2_ZB6fsc55dx5Ktfae4tFgtu8VI,12980
-fotolab-0.29.2.dist-info/RECORD,,
+fotolab/subcommands/watermark.py,sha256=_l7u-l1D6LWd5G8B1l1XpUVw2HCyacjloWX2hOSRb7c,11358
+fotolab-0.31.0.dist-info/entry_points.txt,sha256=mvw7AY_yZkIyjAxPtHNed9X99NZeLnMxEeAfEJUbrCM,44
+fotolab-0.31.0.dist-info/LICENSE.md,sha256=tGtFDwxWTjuR9syrJoSv1Hiffd2u8Tu8cYClfrXS_YU,31956
+fotolab-0.31.0.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
+fotolab-0.31.0.dist-info/METADATA,sha256=T9NbfLt9R31dDV8BaBeHVM9aBWH-xNyfo0CsF7llIAI,13395
+fotolab-0.31.0.dist-info/RECORD,,