fotolab 0.34.2__tar.gz → 0.34.3__tar.gz

{fotolab-0.34.2/src/fotolab.egg-info → fotolab-0.34.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fotolab
-Version: 0.34.2
+Version: 0.34.3
 Summary: A console program to manipulate photos.
 Author-email: Kian-Meng Ang <kianmeng@cpan.org>
 License-Expression: AGPL-3.0-or-later

{fotolab-0.34.2 → fotolab-0.34.3}/pyproject.toml

@@ -1,13 +1,6 @@
-[build-system]
-requires = ["setuptools>=61.0"]
-build-backend = "setuptools.build_meta"
-
-[tool.setuptools.packages.find]
-where = ["src"]
-
 [project]
 name = "fotolab"
-version = "0.34.2"
+version = "0.34.3"
 description = "A console program to manipulate photos."
 authors = [{name = "Kian-Meng Ang", email = "kianmeng@cpan.org"}]
 requires-python = ">=3.10"
@@ -59,6 +52,13 @@ lint = [
     "ruff",
 ]
 
+[build-system]
+requires = ["setuptools>=61.0"]
+build-backend = "setuptools.build_meta"
+
+[tool.setuptools.packages.find]
+where = ["src"]
+
 # verify through: uv run ruff check --show-settings
 [tool.ruff]
 line-length = 79

{fotolab-0.34.2 → fotolab-0.34.3}/src/fotolab/subcommands/__init__.py

@@ -26,6 +26,7 @@ def build_subparser(subparsers):
     subcommands = {
         name: importlib.import_module(name)
         for finder, name, ispkg in iter_namespace
+        if not name.endswith(".common")
     }
 
     for subcommand in subcommands.values():

{fotolab-0.34.2 → fotolab-0.34.3}/src/fotolab/subcommands/animate.py

@@ -22,6 +22,7 @@ from contextlib import ExitStack
 
 
 from fotolab import load_image, open_image
+from .common import add_common_arguments, log_args_decorator
 
 log = logging.getLogger(__name__)
 
@@ -47,14 +48,7 @@ def build_subparser(subparsers) -> None:
 
     animate_parser.set_defaults(func=run)
 
-    animate_parser.add_argument(
-        dest="image_paths",
-        help="set the image filenames",
-        nargs="+",
-        type=str,
-        default=None,
-        metavar="IMAGE_PATHS",
-    )
+    add_common_arguments(animate_parser)
 
     animate_parser.add_argument(
         "-f",
@@ -90,15 +84,6 @@ def build_subparser(subparsers) -> None:
         metavar="LOOP",
     )
 
-    animate_parser.add_argument(
-        "-op",
-        "--open",
-        default=False,
-        action="store_true",
-        dest="open",
-        help="open the image using default program (default: '%(default)s')",
-    )
-
     animate_parser.add_argument(
         "--webp-quality",
         dest="webp_quality",
@@ -130,14 +115,6 @@ def build_subparser(subparsers) -> None:
         metavar="METHOD",
     )
 
-    animate_parser.add_argument(
-        "-od",
-        "--output-dir",
-        dest="output_dir",
-        default="output",
-        help="set default output folder (default: '%(default)s')",
-    )
-
     animate_parser.add_argument(
         "-of",
         "--output-filename",
@@ -147,6 +124,7 @@ def build_subparser(subparsers) -> None:
     )
 
 
+@log_args_decorator
 def run(args: argparse.Namespace) -> None:
     """Run animate subcommand.
 
@@ -156,7 +134,6 @@ def run(args: argparse.Namespace) -> None:
     Returns:
         None
     """
-    log.debug(args)
 
     image_filepaths = [Path(f) for f in args.image_paths]
     first_image_filepath = image_filepaths[0]

{fotolab-0.34.2 → fotolab-0.34.3}/src/fotolab/subcommands/auto.py

@@ -23,6 +23,7 @@ import fotolab.subcommands.contrast
 import fotolab.subcommands.resize
 import fotolab.subcommands.sharpen
 import fotolab.subcommands.watermark
+from .common import add_common_arguments, log_args_decorator
 
 log = logging.getLogger(__name__)
 
@@ -35,14 +36,7 @@ def build_subparser(subparsers) -> None:
 
     auto_parser.set_defaults(func=run)
 
-    auto_parser.add_argument(
-        dest="image_paths",
-        help="set the image filename",
-        nargs="+",
-        type=str,
-        default=None,
-        metavar="IMAGE_PATHS",
-    )
+    add_common_arguments(auto_parser)
 
     auto_parser.add_argument(
         "-t",
@@ -65,6 +59,7 @@ def build_subparser(subparsers) -> None:
     )
 
 
+@log_args_decorator
 def run(args: argparse.Namespace) -> None:
     """Run auto subcommand.
 
@@ -106,7 +101,6 @@ def run(args: argparse.Namespace) -> None:
     combined_args.overwrite = True
     combined_args.open = False
 
-    log.debug(args)
     log.debug(combined_args)
 
     fotolab.subcommands.resize.run(combined_args)
@@ -118,7 +112,6 @@ def run(args: argparse.Namespace) -> None:
         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

{fotolab-0.34.2 → fotolab-0.34.3}/src/fotolab/subcommands/border.py

@@ -23,6 +23,7 @@ from typing import Tuple
 from PIL import ImageColor, ImageOps
 
 from fotolab import load_image, save_image
+from .common import add_common_arguments, log_args_decorator
 
 log = logging.getLogger(__name__)
 
@@ -33,14 +34,7 @@ def build_subparser(subparsers: argparse._SubParsersAction) -> None:
 
     border_parser.set_defaults(func=run)
 
-    border_parser.add_argument(
-        dest="image_paths",
-        help="set the image filenames",
-        nargs="+",
-        type=str,
-        default=None,
-        metavar="IMAGE_PATHS",
-    )
+    add_common_arguments(border_parser)
 
     border_parser.add_argument(
         "-c",
@@ -106,24 +100,8 @@ def build_subparser(subparsers: argparse._SubParsersAction) -> None:
         metavar="WIDTH",
     )
 
-    border_parser.add_argument(
-        "-op",
-        "--open",
-        default=False,
-        action="store_true",
-        dest="open",
-        help="open the image using default program (default: '%(default)s')",
-    )
-
-    border_parser.add_argument(
-        "-od",
-        "--output-dir",
-        dest="output_dir",
-        default="output",
-        help="set default output folder (default: '%(default)s')",
-    )
-
 
+@log_args_decorator
 def run(args: argparse.Namespace) -> None:
     """Run border subcommand.
 
@@ -133,7 +111,6 @@ def run(args: argparse.Namespace) -> None:
     Returns:
         None
     """
-    log.debug(args)
 
     for image_filepath in [Path(f) for f in args.image_paths]:
         with load_image(image_filepath) as original_image:

fotolab-0.34.3/src/fotolab/subcommands/common.py

@@ -0,0 +1,68 @@
+# 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 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/>.
+
+"""Common argument parsing for subcommands."""
+
+import argparse
+import logging
+from functools import wraps
+from typing import Callable
+
+log = logging.getLogger(__name__)
+
+
+def log_args_decorator(func: Callable) -> Callable:
+    """Decorator to log the arguments passed to a function."""
+
+    @wraps(func)
+    def wrapper(args: argparse.Namespace) -> None:
+        log.debug(args)
+        return func(args)
+
+    return wrapper
+
+
+def add_common_arguments(parser: argparse.ArgumentParser) -> None:
+    """Add common arguments to a subparser.
+
+    Args:
+        parser (argparse.ArgumentParser): The subparser to add arguments to.
+    """
+    parser.add_argument(
+        dest="image_paths",
+        help="set the image filenames",
+        nargs="+",
+        type=str,
+        default=None,
+        metavar="IMAGE_PATHS",
+    )
+
+    parser.add_argument(
+        "-op",
+        "--open",
+        default=False,
+        action="store_true",
+        dest="open",
+        help="open the image using default program (default: '%(default)s')",
+    )
+
+    parser.add_argument(
+        "-od",
+        "--output-dir",
+        dest="output_dir",
+        default="output",
+        help="set default output folder (default: '%(default)s')",
+    )

{fotolab-0.34.2 → fotolab-0.34.3}/src/fotolab/subcommands/contrast.py

@@ -22,6 +22,7 @@ from pathlib import Path
 from PIL import ImageOps
 
 from fotolab import load_image, save_image
+from .common import add_common_arguments, log_args_decorator
 
 log = logging.getLogger(__name__)
 
@@ -50,14 +51,7 @@ def build_subparser(subparsers: argparse._SubParsersAction) -> None:
 
     contrast_parser.set_defaults(func=run)
 
-    contrast_parser.add_argument(
-        dest="image_paths",
-        help="set the image filename",
-        nargs="+",
-        type=str,
-        default=None,
-        metavar="IMAGE_PATHS",
-    )
+    add_common_arguments(contrast_parser)
 
     contrast_parser.add_argument(
         "-c",
@@ -73,24 +67,8 @@ def build_subparser(subparsers: argparse._SubParsersAction) -> None:
         metavar="CUTOFF",
     )
 
-    contrast_parser.add_argument(
-        "-op",
-        "--open",
-        default=False,
-        action="store_true",
-        dest="open",
-        help="open the image using default program (default: '%(default)s')",
-    )
-
-    contrast_parser.add_argument(
-        "-od",
-        "--output-dir",
-        dest="output_dir",
-        default="output",
-        help="set default output folder (default: '%(default)s')",
-    )
-
 
+@log_args_decorator
 def run(args: argparse.Namespace) -> None:
     """Run contrast subcommand.
 
@@ -100,7 +78,6 @@ def run(args: argparse.Namespace) -> None:
     Returns:
         None
     """
-    log.debug(args)
 
     for image_path_str in args.image_paths:
         with load_image(Path(image_path_str)) as original_image:

{fotolab-0.34.2 → fotolab-0.34.3}/src/fotolab/subcommands/halftone.py

@@ -24,6 +24,7 @@ from typing import NamedTuple
 from PIL import Image, ImageDraw
 
 from fotolab import load_image, save_gif_image, save_image
+from .common import add_common_arguments, log_args_decorator
 
 log = logging.getLogger(__name__)
 
@@ -44,14 +45,7 @@ def build_subparser(subparsers) -> None:
 
     halftone_parser.set_defaults(func=run)
 
-    halftone_parser.add_argument(
-        dest="image_paths",
-        help="set the image filename",
-        nargs="+",
-        type=str,
-        default=None,
-        metavar="IMAGE_PATHS",
-    )
+    add_common_arguments(halftone_parser)
 
     halftone_parser.add_argument(
         "-ba",
@@ -62,23 +56,6 @@ def build_subparser(subparsers) -> None:
         help="generate a GIF showing before and after changes",
     )
 
-    halftone_parser.add_argument(
-        "-op",
-        "--open",
-        default=False,
-        action="store_true",
-        dest="open",
-        help="open the image using default program (default: '%(default)s')",
-    )
-
-    halftone_parser.add_argument(
-        "-od",
-        "--output-dir",
-        dest="output_dir",
-        default="output",
-        help="set default output folder (default: '%(default)s')",
-    )
-
     halftone_parser.add_argument(
         "-c",
         "--cells",
@@ -100,6 +77,7 @@ def build_subparser(subparsers) -> None:
     )
 
 
+@log_args_decorator
 def run(args: argparse.Namespace) -> None:
     """Run halftone subcommand.
 
@@ -109,7 +87,6 @@ def run(args: argparse.Namespace) -> None:
     Returns:
         None
     """
-    log.debug(args)
 
     for image_path_str in args.image_paths:
         image_filename = Path(image_path_str)

{fotolab-0.34.2 → fotolab-0.34.3}/src/fotolab/subcommands/info.py

@@ -20,6 +20,8 @@ import logging
 
 from PIL import ExifTags, Image
 
+from .common import log_args_decorator
+
 log = logging.getLogger(__name__)
 
 
@@ -62,6 +64,7 @@ def build_subparser(subparsers) -> None:
     )
 
 
+@log_args_decorator
 def run(args: argparse.Namespace) -> None:
     """Run info subcommand.
 
@@ -71,7 +74,6 @@ def run(args: argparse.Namespace) -> None:
     Returns:
         None
     """
-    log.debug(args)
 
     with Image.open(args.image_filename) as image:
         exif_tags = extract_exif_tags(image, args.sort)

{fotolab-0.34.2 → fotolab-0.34.3}/src/fotolab/subcommands/montage.py

@@ -23,6 +23,7 @@ from contextlib import ExitStack
 from PIL import Image
 
 from fotolab import load_image, save_image
+from .common import add_common_arguments, log_args_decorator
 
 log = logging.getLogger(__name__)
 
@@ -35,33 +36,10 @@ def build_subparser(subparsers) -> None:
 
     montage_parser.set_defaults(func=run)
 
-    montage_parser.add_argument(
-        dest="image_paths",
-        help="set the image filenames",
-        nargs="+",
-        type=str,
-        default=None,
-        metavar="IMAGE_PATHS",
-    )
-
-    montage_parser.add_argument(
-        "-op",
-        "--open",
-        default=False,
-        action="store_true",
-        dest="open",
-        help="open the image using default program (default: '%(default)s')",
-    )
-
-    montage_parser.add_argument(
-        "-od",
-        "--output-dir",
-        dest="output_dir",
-        default="output",
-        help="set default output folder (default: '%(default)s')",
-    )
+    add_common_arguments(montage_parser)
 
 
+@log_args_decorator
 def run(args: argparse.Namespace) -> None:
     """Run montage subcommand.
 
@@ -71,7 +49,6 @@ def run(args: argparse.Namespace) -> None:
     Returns:
         None
     """
-    log.debug(args)
     images = []
     with ExitStack() as stack:
         for image_path_str in args.image_paths:

{fotolab-0.34.2 → fotolab-0.34.3}/src/fotolab/subcommands/resize.py

@@ -23,6 +23,7 @@ from pathlib import Path
 from PIL import Image, ImageColor
 
 from fotolab import load_image, save_image
+from .common import add_common_arguments, log_args_decorator
 
 log = logging.getLogger(__name__)
 
@@ -36,14 +37,7 @@ def build_subparser(subparsers) -> None:
 
     resize_parser.set_defaults(func=run)
 
-    resize_parser.add_argument(
-        dest="image_paths",
-        help="set the image filename",
-        nargs="+",
-        type=str,
-        default=None,
-        metavar="IMAGE_PATHS",
-    )
+    add_common_arguments(resize_parser)
 
     resize_parser.add_argument(
         "-c",
@@ -87,24 +81,8 @@ def build_subparser(subparsers) -> None:
         metavar="HEIGHT",
     )
 
-    resize_parser.add_argument(
-        "-op",
-        "--open",
-        default=False,
-        action="store_true",
-        dest="open",
-        help="open the image using default program (default: '%(default)s')",
-    )
-
-    resize_parser.add_argument(
-        "-od",
-        "--output-dir",
-        dest="output_dir",
-        default="output",
-        help="set default output folder (default: '%(default)s')",
-    )
-
 
+@log_args_decorator
 def run(args: argparse.Namespace) -> None:
     """Run resize subcommand.
 
@@ -114,7 +92,6 @@ def run(args: argparse.Namespace) -> None:
     Returns:
         None
     """
-    log.debug(args)
 
     width_provided = args.width != DEFAULT_WIDTH
     height_provided = args.height != DEFAULT_HEIGHT

{fotolab-0.34.2 → fotolab-0.34.3}/src/fotolab/subcommands/rotate.py

@@ -22,6 +22,7 @@ from pathlib import Path
 from PIL import Image
 
 from fotolab import load_image, save_image
+from .common import add_common_arguments, log_args_decorator
 
 log = logging.getLogger(__name__)
 
@@ -32,14 +33,7 @@ def build_subparser(subparsers) -> None:
 
     rotate_parser.set_defaults(func=run)
 
-    rotate_parser.add_argument(
-        dest="image_paths",
-        help="set the image filenames",
-        nargs="+",
-        type=str,
-        default=None,
-        metavar="IMAGE_PATHS",
-    )
+    add_common_arguments(rotate_parser)
 
     rotate_parser.add_argument(
         "-r",
@@ -56,24 +50,8 @@ def build_subparser(subparsers) -> None:
         help="Rotate clockwise (default: '%(default)s)",
     )
 
-    rotate_parser.add_argument(
-        "-op",
-        "--open",
-        default=False,
-        action="store_true",
-        dest="open",
-        help="open the image using default program (default: '%(default)s')",
-    )
-
-    rotate_parser.add_argument(
-        "-od",
-        "--output-dir",
-        dest="output_dir",
-        default="output",
-        help="set default output folder (default: '%(default)s')",
-    )
-
 
+@log_args_decorator
 def run(args: argparse.Namespace) -> None:
     """Run rotate subcommand.
 
@@ -83,7 +61,6 @@ def run(args: argparse.Namespace) -> None:
     Returns:
         None
     """
-    log.debug(args)
 
     rotation = -args.rotation if args.clockwise else args.rotation
     log.debug(f"Rotation angle: {rotation} degrees")

{fotolab-0.34.2 → fotolab-0.34.3}/src/fotolab/subcommands/sharpen.py

@@ -22,6 +22,7 @@ from pathlib import Path
 from PIL import ImageFilter
 
 from fotolab import load_image, save_gif_image, save_image
+from .common import add_common_arguments, log_args_decorator
 
 log = logging.getLogger(__name__)
 
@@ -32,14 +33,7 @@ def build_subparser(subparsers) -> None:
 
     sharpen_parser.set_defaults(func=run)
 
-    sharpen_parser.add_argument(
-        dest="image_paths",
-        help="set the image filenames",
-        nargs="+",
-        type=str,
-        default=None,
-        metavar="IMAGE_PATHS",
-    )
+    add_common_arguments(sharpen_parser)
 
     sharpen_parser.add_argument(
         "-r",
@@ -86,24 +80,8 @@ def build_subparser(subparsers) -> None:
         help="generate a GIF showing before and after changes",
     )
 
-    sharpen_parser.add_argument(
-        "-op",
-        "--open",
-        default=False,
-        action="store_true",
-        dest="open",
-        help="open the image using default program (default: '%(default)s')",
-    )
-
-    sharpen_parser.add_argument(
-        "-od",
-        "--output-dir",
-        dest="output_dir",
-        default="output",
-        help="set default output folder (default: '%(default)s')",
-    )
-
 
+@log_args_decorator
 def run(args: argparse.Namespace) -> None:
     """Run sharpen subcommand.
 
@@ -113,7 +91,6 @@ def run(args: argparse.Namespace) -> None:
     Returns:
         None
     """
-    log.debug(args)
 
     for image_path_str in args.image_paths:
         with load_image(Path(image_path_str)) as original_image:

{fotolab-0.34.2 → fotolab-0.34.3}/src/fotolab/subcommands/watermark.py

@@ -25,6 +25,7 @@ from PIL import Image, ImageColor, ImageDraw, ImageFont, ImageSequence
 
 from fotolab import load_image, save_image
 from fotolab.subcommands.info import get_formatted_camera_info
+from .common import add_common_arguments, log_args_decorator
 
 log: logging.Logger = logging.getLogger(__name__)
 
@@ -42,14 +43,7 @@ def build_subparser(subparsers: argparse._SubParsersAction) -> None:
 
     watermark_parser.set_defaults(func=run)
 
-    watermark_parser.add_argument(
-        dest="image_paths",
-        help="set the image filenames",
-        nargs="+",
-        type=str,
-        default=None,
-        metavar="IMAGE_PATHS",
-    )
+    add_common_arguments(watermark_parser)
 
     watermark_parser.add_argument(
         "-t",
@@ -161,24 +155,8 @@ def build_subparser(subparsers: argparse._SubParsersAction) -> None:
         help="lowercase the watermark text",
     )
 
-    watermark_parser.add_argument(
-        "-op",
-        "--open",
-        default=False,
-        action="store_true",
-        dest="open",
-        help="open the image using default program (default: '%(default)s')",
-    )
-
-    watermark_parser.add_argument(
-        "-od",
-        "--output-dir",
-        dest="output_dir",
-        default="output",
-        help="set default output folder (default: '%(default)s')",
-    )
-
 
+@log_args_decorator
 def run(args: argparse.Namespace) -> None:
     """Run watermark subcommand.
 
@@ -188,7 +166,6 @@ def run(args: argparse.Namespace) -> None:
     Returns:
         None
     """
-    log.debug(args)
 
     for image_path_str in args.image_paths:
         try:

{fotolab-0.34.2 → fotolab-0.34.3/src/fotolab.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fotolab
-Version: 0.34.2
+Version: 0.34.3
 Summary: A console program to manipulate photos.
 Author-email: Kian-Meng Ang <kianmeng@cpan.org>
 License-Expression: AGPL-3.0-or-later

{fotolab-0.34.2 → fotolab-0.34.3}/src/fotolab.egg-info/SOURCES.txt

@@ -14,6 +14,7 @@ src/fotolab/subcommands/__init__.py
 src/fotolab/subcommands/animate.py
 src/fotolab/subcommands/auto.py
 src/fotolab/subcommands/border.py
+src/fotolab/subcommands/common.py
 src/fotolab/subcommands/contrast.py
 src/fotolab/subcommands/env.py
 src/fotolab/subcommands/halftone.py