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

fotolab/__init__.py

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

fotolab/subcommands/__init__.py

@@ -24,8 +24,7 @@ def build_subparser(subparsers):
     iter_namespace = pkgutil.iter_modules(__path__, __name__ + ".")
 
     subcommands = {
-        name: importlib.import_module(name)
-        for finder, name, ispkg in iter_namespace
+        name: importlib.import_module(name) for finder, name, ispkg in iter_namespace
     }
 
     for subcommand in subcommands.values():

fotolab/subcommands/animate.py

@@ -73,7 +73,10 @@ def build_subparser(subparsers) -> None:
         dest="duration",
         type=_validate_duration,
         default=2500,
-        help="set the duration in milliseconds (must be a positive integer, default: '%(default)s')",
+        help=(
+            "set the duration in milliseconds "
+            "(must be a positive integer, default: '%(default)s')"
+        ),
         metavar="DURATION",
     )
 
@@ -120,7 +123,7 @@ def build_subparser(subparsers) -> None:
         type=int,
         default=4,
         choices=range(0, 7),
-        help="set WEBP encoding method (0=fast, 6=slow/best, default: '%(default)s')",
+        help=("set WEBP encoding method (0=fast, 6=slow/best, default: '%(default)s')"),
         metavar="METHOD",
     )
 
@@ -170,17 +173,17 @@ def run(args: argparse.Namespace) -> None:
             "save_all": True,
             "duration": args.duration,
             "loop": args.loop,
-            "optimize": True,  # General optimization, good for GIF
+            "optimize": True,
         }
 
+        # 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.
         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:

fotolab/subcommands/auto.py

@@ -71,6 +71,7 @@ def run(args: argparse.Namespace) -> None:
         "canvas": False,
         "lowercase": False,
         "before_after": False,
+        "alpha": 128,
     }
     combined_args = argparse.Namespace(**vars(args), **extra_args)
     combined_args.overwrite = True

fotolab/subcommands/border.py

@@ -17,7 +17,7 @@
 
 import argparse
 import logging
-from typing import Tuple, Union
+from typing import Tuple
 
 from PIL import Image, ImageColor, ImageOps
 
@@ -77,10 +77,7 @@ def build_subparser(subparsers: argparse._SubParsersAction) -> None:
         dest="width_right",
         type=int,
         default=0,
-        help=(
-            "set the width of right border in pixels"
-            " (default: '%(default)s')"
-        ),
+        help=("set the width of right border in pixels (default: '%(default)s')"),
         metavar="WIDTH",
     )
 
@@ -90,10 +87,7 @@ def build_subparser(subparsers: argparse._SubParsersAction) -> None:
         dest="width_bottom",
         type=int,
         default=0,
-        help=(
-            "set the width of bottom border in pixels"
-            " (default: '%(default)s')"
-        ),
+        help=("set the width of bottom border in pixels (default: '%(default)s')"),
         metavar="WIDTH",
     )
 

fotolab/subcommands/contrast.py

@@ -31,9 +31,7 @@ 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"
@@ -43,9 +41,7 @@ def _validate_cutoff(value: str) -> float:
 
 def build_subparser(subparsers: argparse._SubParsersAction) -> None:
     """Build the subparser."""
-    contrast_parser = subparsers.add_parser(
-        "contrast", help="contrast an image."
-    )
+    contrast_parser = subparsers.add_parser("contrast", help="contrast an image.")
 
     contrast_parser.set_defaults(func=run)
 
@@ -103,8 +99,6 @@ def run(args: argparse.Namespace) -> None:
 
     for image_filename in args.image_filenames:
         original_image = Image.open(image_filename)
-        contrast_image = ImageOps.autocontrast(
-            original_image, cutoff=args.cutoff
-        )
+        contrast_image = ImageOps.autocontrast(original_image, cutoff=args.cutoff)
 
         save_image(args, contrast_image, image_filename, "contrast")

fotolab/subcommands/halftone.py

@@ -37,9 +37,7 @@ class HalftoneCell(NamedTuple):
 
 def build_subparser(subparsers) -> None:
     """Build the subparser."""
-    halftone_parser = subparsers.add_parser(
-        "halftone", help="halftone an image"
-    )
+    halftone_parser = subparsers.add_parser("halftone", help="halftone an image")
 
     halftone_parser.set_defaults(func=run)
 
@@ -156,9 +154,7 @@ def _draw_halftone_dot(
     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]
+            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
 

fotolab/subcommands/info.py

@@ -81,31 +81,25 @@ def run(args: argparse.Namespace) -> None:
             return
 
         output_info = []
-    specific_info_requested = False
 
-    if args.camera:
-        specific_info_requested = True
-        output_info.append(camera_metadata(exif_tags))
+        if args.camera:
+            output_info.append(get_formatted_camera_info(exif_tags))
 
-    if args.datetime:
-        specific_info_requested = True
-        output_info.append(datetime(exif_tags))
+        if args.datetime:
+            output_info.append(get_formatted_datetime_info(exif_tags))
 
-    if specific_info_requested:
-        print("\n".join(output_info))
-    else:
-        # Print all tags if no specific info was requested
-        tag_name_width = max(map(len, exif_tags))
-        for tag_name, tag_value in exif_tags.items():
-            print(f"{tag_name:<{tag_name_width}}: {tag_value}")
+        if output_info:  # Check if any specific info was added
+            print("\n".join(output_info))
+        else:
+            # Print all tags if no specific info was requested
+            tag_name_width = max(map(len, exif_tags))
+            for tag_name, tag_value in exif_tags.items():
+                print(f"{tag_name:<{tag_name_width}}: {tag_value}")
 
 
 def extract_exif_tags(image: Image.Image, sort: bool = False) -> dict:
     """Extract Exif metadata from image."""
-    try:
-        exif = image._getexif()
-    except AttributeError:
-        exif = None
+    exif = image.getexif()
 
     log.debug(exif)
 
@@ -113,22 +107,20 @@ def extract_exif_tags(image: Image.Image, sort: bool = False) -> dict:
     if exif:
         info = {ExifTags.TAGS.get(tag_id): exif.get(tag_id) for tag_id in exif}
 
-    filtered_info = {
-        key: value for key, value in info.items() if key is not None
-    }
+    filtered_info = {key: value for key, value in info.items() if key is not None}
     if sort:
         filtered_info = dict(sorted(filtered_info.items()))
 
     return filtered_info
 
 
-def datetime(exif_tags: dict):
-    """Extract datetime metadata."""
+def get_formatted_datetime_info(exif_tags: dict):
+    """Extract and format datetime metadata."""
     return exif_tags.get("DateTime", "Not available")
 
 
-def camera_metadata(exif_tags: dict):
-    """Extract camera and model metadata."""
+def get_formatted_camera_info(exif_tags: dict):
+    """Extract and format camera make and model metadata."""
     make = exif_tags.get("Make", "")
     model = exif_tags.get("Model", "")
     metadata = f"{make} {model}"

fotolab/subcommands/montage.py

@@ -27,9 +27,7 @@ log = logging.getLogger(__name__)
 
 def build_subparser(subparsers) -> None:
     """Build the subparser."""
-    montage_parser = subparsers.add_parser(
-        "montage", help="montage a list of image"
-    )
+    montage_parser = subparsers.add_parser("montage", help="montage a list of image")
 
     montage_parser.set_defaults(func=run)
 

fotolab/subcommands/resize.py

@@ -59,10 +59,7 @@ def build_subparser(subparsers) -> None:
         "--canvas-color",
         default="black",
         dest="canvas_color",
-        help=(
-            "the color of the extended larger canvas"
-            "(default: '%(default)s')"
-        ),
+        help=("the color of the extended larger canvas(default: '%(default)s')"),
     )
 
     if "-c" in sys.argv or "--canvas" in sys.argv:

fotolab/subcommands/watermark.py

@@ -24,7 +24,7 @@ from typing import Tuple
 from PIL import Image, ImageColor, ImageDraw, ImageFont, ImageSequence
 
 from fotolab import save_image
-from fotolab.subcommands.info import camera_metadata
+from fotolab.subcommands.info import get_formatted_camera_info
 
 log: logging.Logger = logging.getLogger(__name__)
 
@@ -109,10 +109,7 @@ def build_subparser(subparsers: argparse._SubParsersAction) -> None:
         dest="outline_width",
         type=int,
         default=2,
-        help=(
-            "set the outline width of the watermark text "
-            "(default: '%(default)s')"
-        ),
+        help=("set the outline width of the watermark text (default: '%(default)s')"),
         metavar="OUTLINE_WIDTH",
     )
 
@@ -122,10 +119,7 @@ def build_subparser(subparsers: argparse._SubParsersAction) -> None:
         dest="outline_color",
         type=str,
         default="black",
-        help=(
-            "set the outline color of the watermark text "
-            "(default: '%(default)s')"
-        ),
+        help=("set the outline color of the watermark text (default: '%(default)s')"),
         metavar="OUTLINE_COLOR",
     )
 
@@ -203,9 +197,7 @@ def run(args: argparse.Namespace) -> None:
         if image.format == "GIF":
             watermark_gif_image(image, image_filename, args)
         else:
-            watermarked_image: Image.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")
 
 
@@ -312,10 +304,10 @@ def watermark_image(
 
 def prepare_text(args: argparse.Namespace, image: Image.Image) -> str:
     """Prepare the watermark text."""
-    text: str = args.text  # Default text
+    text = args.text
     if args.camera:
-        metadata_text: str | None = camera_metadata(image)
-        if metadata_text:  # Use metadata only if it's not None or empty
+        metadata_text = get_formatted_camera_info(image)
+        if metadata_text:
             text = metadata_text
         else:
             log.warning(
@@ -341,16 +333,12 @@ def calc_font_size(image: Image.Image, args: argparse.Namespace) -> int:
     return new_font_size
 
 
-def calc_font_outline_width(
-    image: Image.Image, args: argparse.Namespace
-) -> 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: int = args.outline_width
     if width > 600:
-        new_font_outline_width = math.floor(
-            FONT_OUTLINE_WIDTH_ASPECT_RATIO * width
-        )
+        new_font_outline_width = math.floor(FONT_OUTLINE_WIDTH_ASPECT_RATIO * width)
 
     log.debug("new font outline width: %d", new_font_outline_width)
     return new_font_outline_width

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fotolab
-Version: 0.31.0
+Version: 0.31.2
 Summary: A console program that manipulate images.
 Keywords: photography,photo
 Author-email: Kian-Meng Ang <kianmeng@cpan.org>
@@ -371,7 +371,8 @@ fotolab watermark -h
 usage: fotolab watermark [-h] [-t WATERMARK_TEXT]
                          [-p {top-left,top-right,bottom-left,bottom-right}]
                          [-pd PADDING] [-fs FONT_SIZE] [-fc FONT_COLOR]
-                         [-ow OUTLINE_WIDTH] [-oc OUTLINE_COLOR] [--camera]
+                         [-ow OUTLINE_WIDTH] [-oc OUTLINE_COLOR]
+                         [-a ALPHA_VALUE] [--camera]
                          [-l | --lowercase | --no-lowercase] [-op]
                          [-od OUTPUT_DIR]
                          IMAGE_FILENAMES [IMAGE_FILENAMES ...]
@@ -400,6 +401,10 @@ options:
   -oc, --outline-color OUTLINE_COLOR
                         set the outline color of the watermark text (default:
                         'black')
+  -a, --alpha ALPHA_VALUE
+                        set the transparency of the watermark text (0-255,
+                        where 0 is fully transparent and 255 is fully opaque;
+                        default: '128')
   --camera              use camera metadata as watermark
   -l, --lowercase, --no-lowercase
                         lowercase the watermark text

fotolab-0.31.2.dist-info/RECORD

@@ -0,0 +1,21 @@
+fotolab/__init__.py,sha256=YnbcUmuDk3jXO4_lS-2boxLjzR1NHqL68fluo1CRt94,3087
+fotolab/__main__.py,sha256=aboOURPs_snOXTEWYR0q8oq1UTY9e-NxCd1j33V0wHI,833
+fotolab/cli.py,sha256=oFiQXmsu3wIsM_DpZnL4B94sAoB62L16Am-cjxGmosY,4406
+fotolab/subcommands/__init__.py,sha256=zPNE3lTK3yNjBq2zP1GiL13R4ywO_zh5MRFp5aOFp_g,1121
+fotolab/subcommands/animate.py,sha256=Bzp1Y708UZogcLFwZSoJBfLAxLNZ5c0PESp1xl03sQg,5512
+fotolab/subcommands/auto.py,sha256=3Hl1cCdu65GcfwvwiMRAcex6c7zA-KqIY6AFnB6nI3w,2447
+fotolab/subcommands/border.py,sha256=3mD6ebdPjGk39ldUq9766jEXCbszPlbyV48k13dmrSA,4621
+fotolab/subcommands/contrast.py,sha256=k-NGncYgm7x821CP-NhDbyZGzW1FPxaDgJi00xd97kw,2969
+fotolab/subcommands/env.py,sha256=QoxRvzZKgmoHTUxDV4QYhdChCpMWs5TbXFY_qIpIQpE,1469
+fotolab/subcommands/halftone.py,sha256=4YpHkp3zSYp36qJVPinWBOAUhTJjc-aGxiaNd1IkhXA,6655
+fotolab/subcommands/info.py,sha256=pT2NBZ-KBjBCJJRpC9HC04iZj3s6RhbLWTRG6vjsarg,3549
+fotolab/subcommands/montage.py,sha256=6-3VFMOQm3KOhcGaDfzStTKvBB5GHrotFkHU9kxZe5E,2552
+fotolab/subcommands/resize.py,sha256=h4t425Xf95lkh6Trp-qw_cu0bBgMgBSBvJvUIR4dqiE,5407
+fotolab/subcommands/rotate.py,sha256=uBFjHyjiBSQLtrtH1p9myODIHUDr1gkL4PpU-6Y1Ofo,2575
+fotolab/subcommands/sharpen.py,sha256=YNho2IPbc-lPvSy3Bsjehc2JOEy27LPqFSGRULs9MyY,3492
+fotolab/subcommands/watermark.py,sha256=uVcFynGt2hkTNF5RnfdHhBxSoLmlA7o8-_I65pe_di0,11166
+fotolab-0.31.2.dist-info/entry_points.txt,sha256=mvw7AY_yZkIyjAxPtHNed9X99NZeLnMxEeAfEJUbrCM,44
+fotolab-0.31.2.dist-info/LICENSE.md,sha256=tGtFDwxWTjuR9syrJoSv1Hiffd2u8Tu8cYClfrXS_YU,31956
+fotolab-0.31.2.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
+fotolab-0.31.2.dist-info/METADATA,sha256=D6VMZWUIsEYEuuPU7YcAJGUs3eOl3LhAmgKctMYSqd8,13656
+fotolab-0.31.2.dist-info/RECORD,,

fotolab-0.31.0.dist-info/RECORD

@@ -1,21 +0,0 @@
-fotolab/__init__.py,sha256=TKTFXeMPGcnb4yYlrnCjAsghD_bbcPvtFrlRNRWVX6U,3087
-fotolab/__main__.py,sha256=aboOURPs_snOXTEWYR0q8oq1UTY9e-NxCd1j33V0wHI,833
-fotolab/cli.py,sha256=oFiQXmsu3wIsM_DpZnL4B94sAoB62L16Am-cjxGmosY,4406
-fotolab/subcommands/__init__.py,sha256=l3DlIaJ3u3jGjnC1H1yV8LZ_nPqOLJ6gikD4BCaMAQ0,1129
-fotolab/subcommands/animate.py,sha256=vmviz3cLnHfVENxFKiTimhx8nmbGbzumOP6dUd_UiUI,5524
-fotolab/subcommands/auto.py,sha256=ia-xegV1Z4HvYsbKgmTzf1NfNFdTDPWfZe7vQ1_90Ik,2425
-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
-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=_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,,