fotolab 0.32.0__tar.gz → 0.33.1__tar.gz

{fotolab-0.32.0/src/fotolab.egg-info → fotolab-0.33.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fotolab
-Version: 0.32.0
+Version: 0.33.1
 Author-email: Kian-Meng Ang <kianmeng@cpan.org>
 License-Expression: AGPL-3.0-or-later
 Project-URL: Changelog, https://github.com/kianmeng/fotolab/blob/master/CHANGELOG.md

{fotolab-0.32.0 → fotolab-0.33.1}/pyproject.toml

@@ -7,7 +7,7 @@ where = ["src"]
 
 [project]
 name = "fotolab"
-version = "0.32.0"
+version = "0.33.1"
 authors = [{name = "Kian-Meng Ang", email = "kianmeng@cpan.org"}]
 requires-python = ">=3.9"
 readme = "README.md"

{fotolab-0.32.0 → fotolab-0.33.1}/src/fotolab/__init__.py

@@ -31,30 +31,45 @@ log = logging.getLogger(__name__)
 
 def save_gif_image(
     args: argparse.Namespace,
-    image_filename: str,
+    image_filepath: Path,
     original_image: Image.Image,
     after_image: Image.Image,
     subcommand: str,
 ) -> None:
     """Save the original and after image."""
-    image_file = Path(image_filename)
-    new_filename = Path(
-        args.output_dir,
-        image_file.with_name(f"{subcommand}_gif_{image_file.stem}.gif"),
-    )
-    new_filename.parent.mkdir(parents=True, exist_ok=True)
-
-    log.info("%s gif image: %s", subcommand, new_filename)
-    original_image.save(
-        new_filename,
-        format="gif",
-        append_images=[after_image],
-        save_all=True,
-        duration=2500,
-        loop=0,
-        optimize=True,
+    gif_kwargs = {
+        "format": "gif",
+        "append_images": [after_image],
+        "save_all": True,
+        "duration": 2500,
+        "loop": 0,
+        "optimize": True,
+    }
+    _save_image_with_options(
+        args, original_image, image_filepath, subcommand, **gif_kwargs
     )
 
+
+def _save_image_with_options(
+    args: argparse.Namespace,
+    image: Image.Image,
+    output_filepath: Path,
+    subcommand: str,
+    **kwargs,
+) -> None:
+    """Save image with additional options and handle opening.
+
+    Args:
+        args (argparse.Namespace): Config from command line arguments.
+        image (Image.Image): The image to save.
+        output_filepath (Path): The path to save the image to.
+        subcommand (str): The name of the subcommand.
+        **kwargs: Additional keyword arguments for Image.save().
+    """
+    new_filename = _get_output_filename(args, output_filepath, subcommand)
+    log.info("%s image: %s", subcommand, new_filename.resolve())
+    image.save(new_filename, **kwargs)
+
     if args.open:
         _open_image(new_filename)
 
@@ -62,7 +77,7 @@ def save_gif_image(
 def save_image(
     args: argparse.Namespace,
     new_image: Image.Image,
-    output_filename: str,
+    output_filepath: Path,
     subcommand: str,
 ) -> None:
     """Save image after image operation.
@@ -70,13 +85,7 @@ def save_image(
     Returns:
         None
     """
-    image_file = Path(output_filename)
-    new_filename = _get_output_filename(args, image_file, subcommand)
-    log.info("%s image: %s", subcommand, new_filename.resolve())
-    new_image.save(new_filename)
-
-    if args.open:
-        _open_image(new_filename)
+    _save_image_with_options(args, new_image, output_filepath, subcommand)
 
 
 def _get_output_filename(
@@ -91,7 +100,7 @@ def _get_output_filename(
     return output_dir / image_file.with_name(f"{subcommand}_{image_file.name}")
 
 
-def _open_image(filename):
+def _open_image(filename: Path):
     """Open generated image using default program."""
     try:
         if sys.platform == "linux":

{fotolab-0.32.0 → fotolab-0.33.1}/src/fotolab/subcommands/animate.py

@@ -125,7 +125,8 @@ def build_subparser(subparsers) -> None:
         default=4,
         choices=range(0, 7),
         help=(
-            "set WEBP encoding method (0=fast, 6=slow/best, default: '%(default)s')"
+            "set WEBP encoding method "
+            "(0=fast, 6=slow/best, default: '%(default)s')"
         ),
         metavar="METHOD",
     )
@@ -138,6 +139,14 @@ def build_subparser(subparsers) -> None:
         help="set default output folder (default: '%(default)s')",
     )
 
+    animate_parser.add_argument(
+        "-of",
+        "--output-filename",
+        dest="output_filename",
+        default=None,
+        help="set output filename (default: '%(default)s')",
+    )
+
 
 def run(args: argparse.Namespace) -> None:
     """Run animate subcommand.
@@ -150,21 +159,27 @@ def run(args: argparse.Namespace) -> None:
     """
     log.debug(args)
 
-    first_image_filepath = args.image_filenames[0]
+    image_filepaths = [Path(f) for f in args.image_filenames]
+    first_image_filepath = image_filepaths[0]
     other_frames = []
 
     with ExitStack() as stack:
         main_frame = stack.enter_context(Image.open(first_image_filepath))
 
-        for image_filename in args.image_filenames[1:]:
-            img = stack.enter_context(Image.open(image_filename))
+        for image_filepath in image_filepaths[1:]:
+            img = stack.enter_context(Image.open(image_filepath))
             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}"),
-        )
+        if args.output_filename:
+            new_filename = Path(args.output_dir, args.output_filename)
+        else:
+            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)
@@ -175,14 +190,14 @@ def run(args: argparse.Namespace) -> None:
             "save_all": True,
             "duration": args.duration,
             "loop": args.loop,
-            "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":
+        # Specific WEBP params like 'method' and 'quality' control this.
+        # 'optimize' is removed for WEBP to avoid confusion.
+        if args.format == "gif":
+            save_kwargs["optimize"] = True
+        elif args.format == "webp":
             save_kwargs["quality"] = args.webp_quality
             save_kwargs["lossless"] = args.webp_lossless
             save_kwargs["method"] = args.webp_method

{fotolab-0.32.0 → fotolab-0.33.1}/src/fotolab/subcommands/auto.py

@@ -18,6 +18,7 @@
 import argparse
 import logging
 
+import fotolab.subcommands.animate
 import fotolab.subcommands.contrast
 import fotolab.subcommands.resize
 import fotolab.subcommands.sharpen
@@ -45,9 +46,19 @@ def build_subparser(subparsers) -> None:
 
     auto_parser.add_argument(
         "-t",
-        "--text",
-        dest="text",
-        help="set the watermark text (default: '%(default)s')",
+        "--title",
+        dest="title",
+        help="set the tile (default: '%(default)s')",
+        type=str,
+        default=None,
+        metavar="TITLE",
+    )
+
+    auto_parser.add_argument(
+        "-w",
+        "--watermark",
+        dest="watermark",
+        help="set the watermark (default: '%(default)s')",
         type=str,
         default="kianmeng.org",
         metavar="WATERMARK_TEXT",
@@ -63,6 +74,10 @@ def run(args: argparse.Namespace) -> None:
     Returns:
         None
     """
+    text = args.watermark
+    if args.title and args.watermark:
+        text = f"{args.title}\n{args.watermark}"
+
     extra_args = {
         "width": 600,
         "height": 277,
@@ -70,7 +85,7 @@ def run(args: argparse.Namespace) -> None:
         "radius": 1,
         "percent": 100,
         "threshold": 2,
-        "text": f"{args.text if args.text else 'kianmeng.org'}",
+        "text": text,
         "position": "bottom-left",
         "font_size": 12,
         "font_color": "white",
@@ -98,3 +113,14 @@ def run(args: argparse.Namespace) -> None:
     fotolab.subcommands.contrast.run(combined_args)
     fotolab.subcommands.sharpen.run(combined_args)
     fotolab.subcommands.watermark.run(combined_args)
+
+    if len(args.image_filenames) > 1:
+        output_filename = (
+            args.title.lower().replace(",", "").replace(" ", "_") + ".gif"
+        )
+        combined_args.output_dir = "output"
+        combined_args.format = "gif"
+        combined_args.duration = 2500
+        combined_args.loop = 0
+        combined_args.output_filename = output_filename
+        fotolab.subcommands.animate.run(combined_args)

{fotolab-0.32.0 → fotolab-0.33.1}/src/fotolab/subcommands/border.py

@@ -17,6 +17,7 @@
 
 import argparse
 import logging
+from pathlib import Path
 from typing import Tuple
 
 from PIL import Image, ImageColor, ImageOps
@@ -134,8 +135,8 @@ def run(args: argparse.Namespace) -> None:
     """
     log.debug(args)
 
-    for image_filename in args.image_filenames:
-        original_image = Image.open(image_filename)
+    for image_filepath in [Path(f) for f in args.image_filenames]:
+        original_image = Image.open(image_filepath)
         border = get_border(args)
         bordered_image = ImageOps.expand(
             original_image,
@@ -143,7 +144,7 @@ def run(args: argparse.Namespace) -> None:
             fill=ImageColor.getrgb(args.color),
         )
 
-        save_image(args, bordered_image, image_filename, "border")
+        save_image(args, bordered_image, image_filepath, "border")
 
 
 def get_border(

{fotolab-0.32.0 → fotolab-0.33.1}/src/fotolab/subcommands/contrast.py

@@ -17,6 +17,7 @@
 
 import argparse
 import logging
+from pathlib import Path
 
 from PIL import Image, ImageOps
 
@@ -107,4 +108,4 @@ def run(args: argparse.Namespace) -> None:
             original_image, cutoff=args.cutoff
         )
 
-        save_image(args, contrast_image, image_filename, "contrast")
+        save_image(args, contrast_image, Path(image_filename), "contrast")

{fotolab-0.32.0 → fotolab-0.33.1}/src/fotolab/subcommands/halftone.py

@@ -18,6 +18,7 @@
 import argparse
 import logging
 import math
+from pathlib import Path
 from typing import NamedTuple, Union
 
 from PIL import Image, ImageDraw
@@ -84,7 +85,9 @@ def build_subparser(subparsers) -> None:
         dest="cells",
         type=int,
         default=50,
-        help="set number of cells across the image width (default: %(default)s)",
+        help=(
+            "set number of cells across the image width (default: %(default)s)"
+        ),
     )
 
     halftone_parser.add_argument(
@@ -108,7 +111,8 @@ def run(args: argparse.Namespace) -> None:
     """
     log.debug(args)
 
-    for image_filename in args.image_filenames:
+    for image_filename_str in args.image_filenames:
+        image_filename = Path(image_filename_str)
         original_image = Image.open(image_filename)
         halftone_image = create_halftone_image(
             original_image, args.cells, args.grayscale

{fotolab-0.32.0 → fotolab-0.33.1}/src/fotolab/subcommands/montage.py

@@ -17,6 +17,7 @@
 
 import argparse
 import logging
+from pathlib import Path
 
 from PIL import Image
 
@@ -37,7 +38,7 @@ def build_subparser(subparsers) -> None:
         dest="image_filenames",
         help="set the image filenames",
         nargs="+",
-        type=argparse.FileType("r"),
+        type=str,
         default=None,
         metavar="IMAGE_FILENAMES",
     )
@@ -71,8 +72,9 @@ def run(args: argparse.Namespace) -> None:
     """
     log.debug(args)
     images = []
-    for image_filename in args.image_filenames:
-        images.append(Image.open(image_filename.name))
+    for image_filename_str in args.image_filenames:
+        image_filename = Path(image_filename_str)
+        images.append(Image.open(image_filename))
 
     if len(images) < 2:
         raise ValueError("at least two images is required for montage")
@@ -87,5 +89,5 @@ def run(args: argparse.Namespace) -> None:
         montaged_image.paste(image, (x_offset, 0))
         x_offset += image.width
 
-    output_image_filename = args.image_filenames[0].name
+    output_image_filename = Path(args.image_filenames[0])
     save_image(args, montaged_image, output_image_filename, "montage")

{fotolab-0.32.0 → fotolab-0.33.1}/src/fotolab/subcommands/resize.py

@@ -19,6 +19,7 @@ import argparse
 import logging
 import math
 import sys
+from pathlib import Path
 
 from PIL import Image, ImageColor
 
@@ -136,13 +137,13 @@ def run(args: argparse.Namespace) -> None:
     """
     log.debug(args)
 
-    for image_filename in args.image_filenames:
-        original_image = Image.open(image_filename)
+    for image_filepath in [Path(f) for f in args.image_filenames]:
+        original_image = Image.open(image_filepath)
         if args.canvas:
             resized_image = _resize_image_onto_canvas(original_image, args)
         else:
             resized_image = _resize_image(original_image, args)
-        save_image(args, resized_image, image_filename, "resize")
+        save_image(args, resized_image, image_filepath, "resize")
 
 
 def _resize_image_onto_canvas(original_image, args):
@@ -167,26 +168,26 @@ def _resize_image(original_image, args):
 
 
 def _calc_new_image_dimension(image, args) -> tuple:
-    new_width = args.width
-    new_height = args.height
-
     old_width, old_height = image.size
     log.debug("old image dimension: %d x %d", old_width, old_height)
 
-    if args.width != DEFAULT_WIDTH:
-        aspect_ratio = old_height / old_width
-        log.debug("aspect ratio: %f", aspect_ratio)
+    new_width = args.width
+    new_height = args.height
 
-        new_height = math.ceil(args.width * aspect_ratio)
-        log.debug("new height: %d", new_height)
+    original_aspect_ratio = old_width / old_height
 
-    if args.height != DEFAULT_HEIGHT:
-        aspect_ratio = old_width / old_height
-        log.debug("aspect ratio: %f", aspect_ratio)
+    if new_width != DEFAULT_WIDTH and new_height == DEFAULT_HEIGHT:
+        # user provided width, calculate height to maintain aspect ratio
+        new_height = math.ceil(new_width / original_aspect_ratio)
+        log.debug("new height calculated based on width: %d", new_height)
+    elif new_height != DEFAULT_HEIGHT and new_width == DEFAULT_WIDTH:
+        # user provided height, calculate width to maintain aspect ratio
+        new_width = math.ceil(new_height * original_aspect_ratio)
+        log.debug("new width calculated based on height: %d", new_width)
 
-        new_width = math.floor(args.height * aspect_ratio)
-        log.debug("new width: %d", new_width)
+    # if both are default, no calculation needed, use defaults
+    # due to argparse's mutually exclusive group, it's not possible for both
+    # new_width and new_height to be non-default when --canvas is False
 
     log.debug("new image dimension: %d x %d", new_width, new_height)
-
     return (new_width, new_height)

{fotolab-0.32.0 → fotolab-0.33.1}/src/fotolab/subcommands/rotate.py

@@ -17,6 +17,7 @@
 
 import argparse
 import logging
+from pathlib import Path
 
 from PIL import Image
 
@@ -85,9 +86,16 @@ def run(args: argparse.Namespace) -> None:
     log.debug(args)
 
     rotation = -args.rotation if args.clockwise else args.rotation
-    for image_filename in args.image_filenames:
+    log.debug(f"Rotation angle: {rotation} degrees")
+
+    for image_filename_str in args.image_filenames:
+        image_filename = Path(image_filename_str)
+        log.debug(f"Processing image: {image_filename}")
         original_image = Image.open(image_filename)
+        log.debug(f"Original image size: {original_image.size}")
         rotated_image = original_image.rotate(
             rotation, expand=True, resample=Image.Resampling.BICUBIC
         )
+        log.debug(f"Rotated image size: {rotated_image.size}")
         save_image(args, rotated_image, image_filename, "rotate")
+        log.debug(f"Image saved: {image_filename}")

{fotolab-0.32.0 → fotolab-0.33.1}/src/fotolab/subcommands/sharpen.py

@@ -17,6 +17,7 @@
 
 import argparse
 import logging
+from pathlib import Path
 
 from PIL import Image, ImageFilter
 
@@ -123,7 +124,11 @@ def run(args: argparse.Namespace) -> None:
         )
         if args.before_after:
             save_gif_image(
-                args, image_filename, original_image, sharpen_image, "sharpen"
+                args,
+                Path(image_filename),
+                original_image,
+                sharpen_image,
+                "sharpen",
             )
         else:
-            save_image(args, sharpen_image, image_filename, "sharpen")
+            save_image(args, sharpen_image, Path(image_filename), "sharpen")

{fotolab-0.32.0 → fotolab-0.33.1}/src/fotolab/subcommands/watermark.py

@@ -206,7 +206,9 @@ def run(args: argparse.Namespace) -> None:
             watermarked_image: Image.Image = watermark_non_gif_image(
                 image, args
             )
-            save_image(args, watermarked_image, image_filename, "watermark")
+            save_image(
+                args, watermarked_image, Path(image_filename), "watermark"
+            )
 
 
 def watermark_gif_image(

{fotolab-0.32.0 → fotolab-0.33.1/src/fotolab.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fotolab
-Version: 0.32.0
+Version: 0.33.1
 Author-email: Kian-Meng Ang <kianmeng@cpan.org>
 License-Expression: AGPL-3.0-or-later
 Project-URL: Changelog, https://github.com/kianmeng/fotolab/blob/master/CHANGELOG.md