fotolab 0.16.17__tar.gz → 0.18.1__tar.gz

{fotolab-0.16.17 → 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.18.1/.python-version

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

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

@@ -7,6 +7,29 @@ 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`
+- 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
+- Refactor showing stacktrace based on raw args
+
 ## v0.16.17 (2024-09-08)
 
 - Add `posargs` to most sessions in `nox`

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fotolab
-Version: 0.16.17
+Version: 0.18.1
 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.17 → fotolab-0.18.1}/Pipfile.lock

@@ -372,11 +372,11 @@
         },
         "filelock": {
             "hashes": [
-                "sha256:2207938cbc1844345cb01a5a95524dae30f0ce089eba5b00378295a17e3e90cb",
-                "sha256:6ca1fffae96225dab4c6eaf1c4f4f28cd2568d3ec2a44e15a08520504de468e7"
+                "sha256:2082e5703d51fbf98ea75855d9d5527e33d8ff23099bec374a134febee6946b0",
+                "sha256:c249fbfcd5db47e5e2d6d62198e565475ee65e4831e2561c8e313fa7eb961435"
             ],
             "markers": "python_version >= '3.8'",
-            "version": "==3.15.4"
+            "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": [
@@ -460,12 +460,12 @@
         },
         "importlib-metadata": {
             "hashes": [
-                "sha256:66f342cc6ac9818fc6ff340576acd24d65ba0b3efabb2b4ac08b598965a4a2f1",
-                "sha256:9a547d3bc3608b025f93d403fdd1aae741c24fbb8314df4b155675742ce303c5"
+                "sha256:45e54197d28b7a7f1559e60b95e7c567032b602131fbd588f1497f47880aa68b",
+                "sha256:71522656f0abace1d072b9e5481a48f07c138e00f079c38c8f883823f9c26bd7"
             ],
             "index": "pypi",
             "markers": "python_version >= '3.8'",
-            "version": "==8.4.0"
+            "version": "==8.5.0"
         },
         "iniconfig": {
             "hashes": [
@@ -567,11 +567,11 @@
         },
         "mdit-py-plugins": {
             "hashes": [
-                "sha256:1020dfe4e6bfc2c79fb49ae4e3f5b297f5ccd20f010187acc52af2921e27dc6a",
-                "sha256:834b8ac23d1cd60cec703646ffd22ae97b7955a6d596eb1d304be1e251ae499c"
+                "sha256:0c673c3f889399a33b95e88d2f0d111b4447bdfea7f237dab2d488f459835636",
+                "sha256:5f2cd1fdb606ddf152d37ec30e46101a60512bc0e5fa1a7002c36647b09e26b5"
             ],
             "markers": "python_version >= '3.8'",
-            "version": "==0.4.1"
+            "version": "==0.4.2"
         },
         "mdurl": {
             "hashes": [
@@ -704,11 +704,11 @@
         },
         "platformdirs": {
             "hashes": [
-                "sha256:2d7a1657e36a80ea911db832a8a6ece5ee53d8de21edd5cc5879af6530b1bfee",
-                "sha256:38b7b51f512eed9e84a22788b4bce1de17c0adb134d6becb09836e37d8654cd3"
+                "sha256:357fb2acbc885b0419afd3ce3ed34564c13c9b95c89360cd9563f73aa5e2b907",
+                "sha256:73e575e1408ab8103900836b97580d5307456908a03e92031bab39e4554cc3fb"
             ],
             "markers": "python_version >= '3.8'",
-            "version": "==4.2.2"
+            "version": "==4.3.6"
         },
         "pluggy": {
             "hashes": [
@@ -761,12 +761,12 @@
         },
         "pytest": {
             "hashes": [
-                "sha256:4ba08f9ae7dcf84ded419494d229b48d0903ea6407b030eaec46df5e6a73bba5",
-                "sha256:c132345d12ce551242c87269de812483f5bcc87cdbb4722e48487ba194f9fdce"
+                "sha256:70b98107bd648308a7952b06e6ca9a50bc660be218d53c257cc1fc94fda10181",
+                "sha256:a6853c7375b2663155079443d2e45de913a911a11d669df02a50814944db57b2"
             ],
             "index": "pypi",
             "markers": "python_version >= '3.8'",
-            "version": "==8.3.2"
+            "version": "==8.3.3"
         },
         "pytest-cov": {
             "hashes": [
@@ -887,12 +887,12 @@
         },
         "sphinx-autodoc-typehints": {
             "hashes": [
-                "sha256:8f8281654ddf5709875429b7120d367f4edee39a131e13d5806e4f779a81bf0f",
-                "sha256:c9774d47e7d304cf975e073df49ebf19763dca94ac0295e7013b522b26cb18de"
+                "sha256:940de2951fd584d147e46772579fdc904f945c5f1ee1a78c614646abfbbef18b",
+                "sha256:e743512da58b67a06579a1462798a6907664ab77460758a43234adeac350afbf"
             ],
             "index": "pypi",
             "markers": "python_version >= '3.10'",
-            "version": "==2.4.0"
+            "version": "==2.4.4"
         },
         "sphinx-copybutton": {
             "hashes": [
@@ -953,36 +953,36 @@
         },
         "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": [
-                "sha256:a448b2f64d686155468037e1ace9f2d2199776e17f0a46610480d311f73e3472",
-                "sha256:dd505485549a7a552833da5e6063639d0d177c04f23bc3864e41e5dc5f612168"
+                "sha256:ca899ca043dcb1bafa3e262d73aa25c465bfb49e0bd9dd5d59f1d0acba2f8fac",
+                "sha256:e7d814a81dad81e6caf2ec9fdedb284ecc9c73076b62654547cc64ccdcae26e9"
             ],
             "markers": "python_version >= '3.8'",
-            "version": "==2.2.2"
+            "version": "==2.2.3"
         },
         "virtualenv": {
             "hashes": [
-                "sha256:4c43a2a236279d9ea36a0d76f98d84bd6ca94ac4e0f4a3b9d46d05e10fea542a",
-                "sha256:8cc4a31139e796e9a7de2cd5cf2489de1217193116a8fd42328f1bd65f434589"
+                "sha256:280aede09a2a5c317e409a00102e7077c6432c5a38f0ef938e643805a7ad2c48",
+                "sha256:7345cc5b25405607a624d8418154577459c3e0277f5466dd79c49d5e492995f2"
             ],
             "markers": "python_version >= '3.7'",
-            "version": "==20.26.3"
+            "version": "==20.26.6"
         },
         "zipp": {
             "hashes": [
-                "sha256:9960cd8967c8f85a56f920d5d507274e74f9ff813a0ab8889a5b5be2daf44064",
-                "sha256:c22b14cc4763c5a5b04134207736c107db42e9d3ef2d9779d465f5f1bcba572b"
+                "sha256:a817ac80d6cf4b23bf7f2828b7cabf326f15a001bea8b1f9b49631780ba28350",
+                "sha256:bc9eb26f4506fda01b81bcde0ca78103b6e62f991b381fec825435c836edbc29"
             ],
             "markers": "python_version >= '3.8'",
-            "version": "==3.20.1"
+            "version": "==3.20.2"
         }
     }
 }

{fotolab-0.16.17 → fotolab-0.18.1}/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.17 → fotolab-0.18.1}/fotolab/__init__.py

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

{fotolab-0.16.17 → 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.16.17 → 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")
@@ -154,7 +154,6 @@ def build_parser() -> argparse.ArgumentParser:
 def main(args: Optional[Sequence[str]] = None) -> None:
     """Run the main program flow."""
     args = args or sys.argv[1:]
-    parsed_args = argparse.Namespace(debug=True)
     log.debug(args)
 
     try:
@@ -175,7 +174,7 @@ def main(args: Optional[Sequence[str]] = None) -> None:
         log.error(
             "error: %s",
             getattr(error, "message", str(error)),
-            exc_info=getattr(parsed_args, "debug", True),
+            exc_info=("-d" in args or "--debug" in args),
         )
 
         raise SystemExit(1) from None

{fotolab-0.16.17 → 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.16.17 → fotolab-0.18.1}/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.17 → 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

{fotolab-0.16.17 → fotolab-0.18.1}/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.17/.python-version

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