fotolab 0.16.18__tar.gz → 0.18.0__tar.gz

{fotolab-0.16.18 → fotolab-0.18.0}/.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.18.0/.python-version

@@ -0,0 +1,5 @@
+3.8.20
+3.9.20
+3.10.15
+3.11.10
+3.12.6

{fotolab-0.16.18 → fotolab-0.18.0}/CHANGELOG.md

@@ -7,6 +7,18 @@ and this project adheres to [0-based versioning](https://0ver.org/).
 
 ## [Unreleased]
 
+## 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`
+- Filter out image with `None` info field name
+- Show image info by sorted field name using `-s` or `--sort` flag
+
 ## v0.16.18 (2024-09-15)
 
 - Bump deps

{fotolab-0.16.18 → fotolab-0.18.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fotolab
-Version: 0.16.18
+Version: 0.18.0
 Summary: A console program that manipulate images.
 Keywords: photography,photo
 Author-email: Kian-Meng Ang <kianmeng@cpan.org>
@@ -210,13 +210,14 @@ fotolab info -h
 <!--help-info !-->
 
 ```console
-usage: fotolab info [-h] IMAGE_FILENAME
+usage: fotolab info [-h] [-s] IMAGE_FILENAME
 
 positional arguments:
   IMAGE_FILENAME  set the image filename
 
 options:
   -h, --help      show this help message and exit
+  -s, --sort      show image info by sorted field name
 ```
 
 <!--help-info !-->
@@ -327,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:
@@ -354,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.16.18 → fotolab-0.18.0}/Pipfile.lock

@@ -372,11 +372,11 @@
         },
         "filelock": {
             "hashes": [
-                "sha256:81de9eb8453c769b63369f87f11131a7ab04e367f8d97ad39dc230daa07e3bec",
-                "sha256:f6ed4c963184f4c84dd5557ce8fece759a3724b37b80c6c4f20a2f63a4dc6609"
+                "sha256:2082e5703d51fbf98ea75855d9d5527e33d8ff23099bec374a134febee6946b0",
+                "sha256:c249fbfcd5db47e5e2d6d62198e565475ee65e4831e2561c8e313fa7eb961435"
             ],
             "markers": "python_version >= '3.8'",
-            "version": "==3.16.0"
+            "version": "==3.16.1"
         },
         "flake8": {
             "hashes": [
@@ -436,19 +436,19 @@
         },
         "identify": {
             "hashes": [
-                "sha256:cb171c685bdc31bcc4c1734698736a7d5b6c8bf2e0c15117f4d469c8640ae5cf",
-                "sha256:e79ae4406387a9d300332b5fd366d8994f1525e8414984e1a59e058b2eda2dd0"
+                "sha256:53863bcac7caf8d2ed85bd20312ea5dcfc22226800f6d6881f232d861db5a8f0",
+                "sha256:91478c5fb7c3aac5ff7bf9b4344f803843dc586832d5f110d672b19aa1984c98"
             ],
             "markers": "python_version >= '3.8'",
-            "version": "==2.6.0"
+            "version": "==2.6.1"
         },
         "idna": {
             "hashes": [
-                "sha256:050b4e5baadcd44d760cedbd2b8e639f2ff89bbc7a5730fcc662954303377aac",
-                "sha256:d838c2c0ed6fced7693d5e8ab8e734d5f8fda53a039c0164afb0b82e771e3603"
+                "sha256:12f65c9b470abda6dc35cf8e63cc574b1c52b11df2c86030af0ac09b01b13ea9",
+                "sha256:946d195a0d259cbba61165e88e65941f16e9b36ea6ddb97f00452bae8b1287d3"
             ],
             "markers": "python_version >= '3.6'",
-            "version": "==3.8"
+            "version": "==3.10"
         },
         "imagesize": {
             "hashes": [
@@ -704,11 +704,11 @@
         },
         "platformdirs": {
             "hashes": [
-                "sha256:9e5e27a08aa095dd127b9f2e764d74254f482fef22b0970773bfba79d091ab8c",
-                "sha256:eb1c8582560b34ed4ba105009a4badf7f6f85768b30126f351328507b2beb617"
+                "sha256:357fb2acbc885b0419afd3ce3ed34564c13c9b95c89360cd9563f73aa5e2b907",
+                "sha256:73e575e1408ab8103900836b97580d5307456908a03e92031bab39e4554cc3fb"
             ],
             "markers": "python_version >= '3.8'",
-            "version": "==4.3.2"
+            "version": "==4.3.6"
         },
         "pluggy": {
             "hashes": [
@@ -887,12 +887,12 @@
         },
         "sphinx-autodoc-typehints": {
             "hashes": [
-                "sha256:af37abb816ebd2cf56c7a8174fd2f34d0f2f84fbf58265f89429ae107212fe6f",
-                "sha256:cfe410920cecf08ade046bb387b0007edb83e992de59686c62d194c762f1e45c"
+                "sha256:940de2951fd584d147e46772579fdc904f945c5f1ee1a78c614646abfbbef18b",
+                "sha256:e743512da58b67a06579a1462798a6907664ab77460758a43234adeac350afbf"
             ],
             "index": "pypi",
             "markers": "python_version >= '3.10'",
-            "version": "==2.4.1"
+            "version": "==2.4.4"
         },
         "sphinx-copybutton": {
             "hashes": [
@@ -970,11 +970,11 @@
         },
         "virtualenv": {
             "hashes": [
-                "sha256:48f2695d9809277003f30776d155615ffc11328e6a0a8c1f0ec80188d7874a55",
-                "sha256:c17f4e0f3e6036e9f26700446f85c76ab11df65ff6d8a9cbfad9f71aabfcf23c"
+                "sha256:4f3ac17b81fba3ce3bd6f4ead2749a72da5929c01774948e243db9ba41df4ff6",
+                "sha256:ce489cac131aa58f4b25e321d6d186171f78e6cb13fafbf32a840cee67733ff4"
             ],
             "markers": "python_version >= '3.7'",
-            "version": "==20.26.4"
+            "version": "==20.26.5"
         },
         "zipp": {
             "hashes": [

{fotolab-0.16.18 → fotolab-0.18.0}/README.md

@@ -188,13 +188,14 @@ fotolab info -h
 <!--help-info !-->
 
 ```console
-usage: fotolab info [-h] IMAGE_FILENAME
+usage: fotolab info [-h] [-s] IMAGE_FILENAME
 
 positional arguments:
   IMAGE_FILENAME  set the image filename
 
 options:
   -h, --help      show this help message and exit
+  -s, --sort      show image info by sorted field name
 ```
 
 <!--help-info !-->
@@ -305,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:
@@ -332,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.16.18 → fotolab-0.18.0}/fotolab/__init__.py

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

{fotolab-0.16.18 → fotolab-0.18.0}/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.16.18 → fotolab-0.18.0}/fotolab/info.py

@@ -37,6 +37,15 @@ def build_subparser(subparsers) -> None:
         metavar="IMAGE_FILENAME",
     )
 
+    info_parser.add_argument(
+        "-s",
+        "--sort",
+        default=False,
+        action="store_true",
+        dest="sort",
+        help="show image info by sorted field name",
+    )
+
 
 def run(args: argparse.Namespace) -> None:
     """Run info subcommand.
@@ -49,10 +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}
 
-    tag_name_width = max(map(len, info))
-    for tag_name, tag_value in info.items():
-        print(f"{tag_name:<{tag_name_width}}: {tag_value}")
+    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

{fotolab-0.16.18 → fotolab-0.18.0}/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,6 +127,23 @@ 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=False,
+        action="store_true",
+        dest="lowercase",
+        help="lowercase the watermark text",
+    )
+
 
 def run(args: argparse.Namespace) -> None:
     """Run watermark subcommand.
@@ -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

{fotolab-0.16.18 → fotolab-0.18.0}/noxfile.py

@@ -152,12 +152,7 @@ def release(_session: nox.Session) -> None:
 
 def _pipenv_install(session: nox.Session) -> None:
     session.install("pipenv")
-    session.run(
-        "pipenv",
-        "install",
-        "--dev",
-        env={"PIPENV_VERBOSITY": "-1"}
-    )
+    session.run("pipenv", "install", "--dev", env={"PIPENV_VERBOSITY": "-1"})
 
 
 def _search_and_replace(file, search, replace) -> None:

fotolab-0.16.18/.python-version

@@ -1,5 +0,0 @@
-3.8.19
-3.9.19
-3.10.14
-3.11.9
-3.12.5