fotolab 0.17.0__tar.gz → 0.18.1__tar.gz

{fotolab-0.17.0 → fotolab-0.18.1}/.pre-commit-config.yaml

@@ -15,7 +15,7 @@ repos:
       - id: trailing-whitespace
 
   - repo: https://github.com/abravalheri/validate-pyproject
-    rev: v0.19
+    rev: v0.20.2
     hooks:
       - id: validate-pyproject
         name: validate-pyproject

{fotolab-0.17.0 → fotolab-0.18.1}/.python-version

@@ -2,4 +2,4 @@
 3.9.20
 3.10.15
 3.11.10
-3.12.6
+3.12.7

{fotolab-0.17.0 → fotolab-0.18.1}/CHANGELOG.md

@@ -7,6 +7,18 @@ and this project adheres to [0-based versioning](https://0ver.org/).
 
 ## [Unreleased]
 
+## v0.18.1 (2024-10-06)
+
+- Bump deps and Python version in `pyenv`
+- Use `prog` field in `argparse` when show program version
+- Set watermark text default to lowercase
+
+## v0.18.0 (2024-09-29)
+
+- Add `--camera` flag to `watermark` subcommand to use camera's metadata as text
+- Add `--lowercase` flag to `watermark` subcommand to use lowercase the watermark text
+- Bump deps and `pre-commit` hooks
+
 ## v0.17.0 (2024-09-22)
 
 - Bump Python versions for `pyenv`

{fotolab-0.17.0 → fotolab-0.18.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fotolab
-Version: 0.17.0
+Version: 0.18.1
 Summary: A console program that manipulate images.
 Keywords: photography,photo
 Author-email: Kian-Meng Ang <kianmeng@cpan.org>
@@ -328,7 +328,7 @@ 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]
+                         [-ow OUTLINE_WIDTH] [-oc OUTLINE_COLOR] [--camera]
                          IMAGE_FILENAMES [IMAGE_FILENAMES ...]
 
 positional arguments:
@@ -355,6 +355,7 @@ options:
   -oc OUTLINE_COLOR, --outline-color OUTLINE_COLOR
                         set the outline color of the watermark text (default:
                         'black')
+  --camera              use camera metadata as watermark
 ```
 
 <!--help-watermark !-->

{fotolab-0.17.0 → fotolab-0.18.1}/Pipfile.lock

@@ -953,12 +953,12 @@
         },
         "tomli": {
             "hashes": [
-                "sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc",
-                "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"
+                "sha256:2ebe24485c53d303f690b0ec092806a085f07af5a5aa1464f3931eec36caaa38",
+                "sha256:d46d457a85337051c36524bc5349dd91b1877838e2979ac5ced3e710ed8a60ed"
             ],
             "index": "pypi",
-            "markers": "python_version >= '3.7'",
-            "version": "==2.0.1"
+            "markers": "python_version >= '3.8'",
+            "version": "==2.0.2"
         },
         "urllib3": {
             "hashes": [
@@ -970,11 +970,11 @@
         },
         "virtualenv": {
             "hashes": [
-                "sha256:4f3ac17b81fba3ce3bd6f4ead2749a72da5929c01774948e243db9ba41df4ff6",
-                "sha256:ce489cac131aa58f4b25e321d6d186171f78e6cb13fafbf32a840cee67733ff4"
+                "sha256:280aede09a2a5c317e409a00102e7077c6432c5a38f0ef938e643805a7ad2c48",
+                "sha256:7345cc5b25405607a624d8418154577459c3e0277f5466dd79c49d5e492995f2"
             ],
             "markers": "python_version >= '3.7'",
-            "version": "==20.26.5"
+            "version": "==20.26.6"
         },
         "zipp": {
             "hashes": [

{fotolab-0.17.0 → fotolab-0.18.1}/README.md

@@ -306,7 +306,7 @@ 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]
+                         [-ow OUTLINE_WIDTH] [-oc OUTLINE_COLOR] [--camera]
                          IMAGE_FILENAMES [IMAGE_FILENAMES ...]
 
 positional arguments:
@@ -333,6 +333,7 @@ options:
   -oc OUTLINE_COLOR, --outline-color OUTLINE_COLOR
                         set the outline color of the watermark text (default:
                         'black')
+  --camera              use camera metadata as watermark
 ```
 
 <!--help-watermark !-->

{fotolab-0.17.0 → fotolab-0.18.1}/fotolab/__init__.py

@@ -21,7 +21,7 @@ import subprocess
 import sys
 from pathlib import Path
 
-__version__ = "0.17.0"
+__version__ = "0.18.1"
 
 log = logging.getLogger(__name__)
 

{fotolab-0.17.0 → fotolab-0.18.1}/fotolab/auto.py

@@ -67,6 +67,8 @@ def run(args: argparse.Namespace) -> None:
         "outline_width": 2,
         "outline_color": "black",
         "padding": 15,
+        "camera": False,
+        "lowercase": False,
     }
     combined_args = argparse.Namespace(**vars(args), **extra_args)
     combined_args.overwrite = True

{fotolab-0.17.0 → fotolab-0.18.1}/fotolab/cli.py

@@ -132,7 +132,7 @@ def build_parser() -> argparse.ArgumentParser:
         "-V",
         "--version",
         action="version",
-        version=f"fotolab {__version__}",
+        version=f"%(prog)s {__version__}",
     )
 
     subparsers = parser.add_subparsers(help="sub-command help")

{fotolab-0.17.0 → fotolab-0.18.1}/fotolab/env.py

@@ -34,7 +34,7 @@ def build_subparser(subparsers) -> None:
     env_parser.set_defaults(func=run)
 
 
-def run(args: argparse.Namespace) -> None:
+def run(_args: argparse.Namespace) -> None:
     """Run env subcommand.
 
     Args:
@@ -43,8 +43,6 @@ def run(args: argparse.Namespace) -> None:
     Returns:
         None
     """
-    log.debug(args)
-
     sys_version = sys.version.replace("\n", "")
     print(
         f"fotolab: {__version__}",

{fotolab-0.17.0 → fotolab-0.18.1}/fotolab/info.py

@@ -58,16 +58,22 @@ def run(args: argparse.Namespace) -> None:
     """
     log.debug(args)
 
-    image = Image.open(args.image_filename)
+    exif_tags = extract_exif_tags(args.image.filename)
+    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_filename: str, sort: bool = False) -> dict:
+    """Extract Exif metadata from image."""
+    image = Image.open(image_filename)
     exif = image._getexif()
     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
     }
-    if args.sort:
+    if sort:
         filtered_info = dict(sorted(filtered_info.items()))
 
-    tag_name_width = max(map(len, filtered_info))
-    for tag_name, tag_value in filtered_info.items():
-        print(f"{tag_name:<{tag_name_width}}: {tag_value}")
+    return filtered_info

{fotolab-0.17.0 → fotolab-0.18.1}/fotolab/watermark.py

@@ -22,6 +22,7 @@ import math
 from PIL import Image, ImageColor, ImageDraw, ImageFont
 
 from fotolab import save_image
+from fotolab.info import extract_exif_tags
 
 log = logging.getLogger(__name__)
 
@@ -126,12 +127,29 @@ def build_subparser(subparsers) -> None:
         metavar="OUTLINE_COLOR",
     )
 
+    watermark_parser.add_argument(
+        "--camera",
+        default=False,
+        action="store_true",
+        dest="camera",
+        help="use camera metadata as watermark",
+    )
+
+    watermark_parser.add_argument(
+        "-l",
+        "--lowercase",
+        default=True,
+        action="store_true",
+        dest="lowercase",
+        help="lowercase the watermark text",
+    )
+
 
 def run(args: argparse.Namespace) -> None:
     """Run watermark subcommand.
 
     Args:
-        config (argparse.Namespace): Config from command line arguments
+        args (argparse.Namespace): Config from command line arguments
 
     Returns:
         None
@@ -147,8 +165,15 @@ def run(args: argparse.Namespace) -> None:
         font = ImageFont.load_default(calc_font_size(original_image, args))
         log.debug("default font: %s", " ".join(font.getname()))
 
+        text = args.text
+        if args.camera and camera_metadata(image_filename):
+            text = camera_metadata(image_filename)
+
+        if args.lowercase:
+            text = text.lower()
+
         (left, top, right, bottom) = draw.textbbox(
-            xy=(0, 0), text=args.text, font=font
+            xy=(0, 0), text=text, font=font
         )
         text_width = right - left
         text_height = bottom - top
@@ -162,7 +187,7 @@ def run(args: argparse.Namespace) -> None:
 
         draw.text(
             (position_x, position_y),
-            args.text,
+            text,
             font=font,
             fill=(*ImageColor.getrgb(args.font_color), 128),
             stroke_width=calc_font_outline_width(original_image, args),
@@ -172,6 +197,13 @@ def run(args: argparse.Namespace) -> None:
         save_image(args, watermarked_image, image_filename, "watermark")
 
 
+def camera_metadata(image_filename):
+    """Extract camera and model metadata."""
+    exif_tags = extract_exif_tags(image_filename)
+    metadata = f'{exif_tags["Make"]} {exif_tags["Model"]}'
+    return metadata.strip()
+
+
 def calc_font_size(image, args) -> int:
     """Calculate the font size based on the width of the image."""
     width, _height = image.size