fotolab 0.9.1__tar.gz → 0.10.0__tar.gz

{fotolab-0.9.1 → fotolab-0.10.0}/.pre-commit-config.yaml

@@ -104,7 +104,7 @@ repos:
           - fotolab
           - tests
           - --unsafe-load-any-extension=y
-          - --disable=R0801
+          - --disable=R0801,W0212
 
   - repo: https://github.com/pre-commit/mirrors-mypy
     rev: v1.9.0

{fotolab-0.9.1 → fotolab-0.10.0}/CHANGELOG.md

@@ -7,6 +7,23 @@ and this project adheres to [0-based versioning](https://0ver.org/).
 
 ## [Unreleased]
 
+## v0.10.0 (2024-03-31)
+
+### Added
+
+- Add `info` subcommand to show EXIF data from image
+
+### Changed
+
+- Bump deps
+- Update help message in README
+- Ignore `pylint` W0212 rule
+
+### Fix
+
+- Fix incorrect action in log when running `auto` subcommand
+- Update incorrect comment for `save_image` helper function
+
 ## v0.9.1 (2024-03-24)
 
 ### Changed

{fotolab-0.9.1 → fotolab-0.10.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fotolab
-Version: 0.9.1
+Version: 0.10.0
 Summary: A console program that manipulate images.
 Keywords: photography,photo
 Author-email: Kian-Meng Ang <kianmeng@cpan.org>
@@ -57,9 +57,8 @@ fotolab -h
 ```
 
 ```console
-
 usage: fotolab [-h] [-o] [-op] [-od OUTPUT_DIR] [-q] [-d] [-V]
-               {auto,border,contrast,resize,sharpen,watermark,env} ...
+               {auto,border,contrast,info,resize,sharpen,watermark,env} ...
 
 A console program to manipulate photos.
 
@@ -68,11 +67,12 @@ A console program to manipulate photos.
   issues: https://github.com/kianmeng/fotolab/issues
 
 positional arguments:
-  {auto,border,contrast,resize,sharpen,watermark,env}
+  {auto,border,contrast,info,resize,sharpen,watermark,env}
                     sub-command help
     auto            auto adjust (resize, contrast, and watermark) a photo
     border          add border to image
     contrast        contrast an image
+    info            info an image
     resize          resize an image
     sharpen         sharpen an image
     watermark       watermark an image
@@ -135,6 +135,22 @@ optional arguments:
   -h, --help      show this help message and exit
 ```
 
+### fotolab info
+
+```console
+fotolab info -h
+```
+
+```console
+usage: fotolab info [-h] IMAGE_FILENAME
+
+positional arguments:
+  IMAGE_FILENAME  set the image filename
+
+optional arguments:
+  -h, --help      show this help message and exit
+```
+
 ### fotolab sharpen
 
 ```console

{fotolab-0.9.1 → fotolab-0.10.0}/Pipfile.lock

@@ -196,11 +196,11 @@
         },
         "filelock": {
             "hashes": [
-                "sha256:521f5f56c50f8426f5e03ad3b281b490a87ef15bc6c526f168290f0c7148d44e",
-                "sha256:57dbda9b35157b05fb3e58ee91448612eb674172fab98ee235ccb0b5bee19a1c"
+                "sha256:5ffa845303983e7a0b7ae17636509bc97997d58afeafa72fb141a17b152284cb",
+                "sha256:a79895a25bbefdf55d1a2a0a80968f7dbb28edcd6d4234a0afb3f37ecde4b546"
             ],
             "markers": "python_version >= '3.8'",
-            "version": "==3.13.1"
+            "version": "==3.13.3"
         },
         "flake8": {
             "hashes": [
@@ -450,12 +450,12 @@
         },
         "pytest-cov": {
             "hashes": [
-                "sha256:3904b13dfbfec47f003b8e77fd5b589cd11904a21ddf1ab38a64f204d6a10ef6",
-                "sha256:6ba70b9e97e69fcc3fb45bfeab2d0a138fb65c4d0d6a41ef33983ad114be8c3a"
+                "sha256:4f0764a1219df53214206bf1feea4633c3b558a2925c8b59f144f682861ce652",
+                "sha256:5837b58e9f6ebd335b0f8060eecce69b662415b16dc503883a02f45dfeb14857"
             ],
             "index": "pypi",
-            "markers": "python_version >= '3.7'",
-            "version": "==4.1.0"
+            "markers": "python_version >= '3.8'",
+            "version": "==5.0.0"
         },
         "pytest-randomly": {
             "hashes": [

{fotolab-0.9.1 → fotolab-0.10.0}/README.md

@@ -35,9 +35,8 @@ fotolab -h
 ```
 
 ```console
-
 usage: fotolab [-h] [-o] [-op] [-od OUTPUT_DIR] [-q] [-d] [-V]
-               {auto,border,contrast,resize,sharpen,watermark,env} ...
+               {auto,border,contrast,info,resize,sharpen,watermark,env} ...
 
 A console program to manipulate photos.
 
@@ -46,11 +45,12 @@ A console program to manipulate photos.
   issues: https://github.com/kianmeng/fotolab/issues
 
 positional arguments:
-  {auto,border,contrast,resize,sharpen,watermark,env}
+  {auto,border,contrast,info,resize,sharpen,watermark,env}
                     sub-command help
     auto            auto adjust (resize, contrast, and watermark) a photo
     border          add border to image
     contrast        contrast an image
+    info            info an image
     resize          resize an image
     sharpen         sharpen an image
     watermark       watermark an image
@@ -113,6 +113,22 @@ optional arguments:
   -h, --help      show this help message and exit
 ```
 
+### fotolab info
+
+```console
+fotolab info -h
+```
+
+```console
+usage: fotolab info [-h] IMAGE_FILENAME
+
+positional arguments:
+  IMAGE_FILENAME  set the image filename
+
+optional arguments:
+  -h, --help      show this help message and exit
+```
+
 ### fotolab sharpen
 
 ```console

{fotolab-0.9.1 → fotolab-0.10.0}/fotolab/__init__.py

@@ -21,22 +21,22 @@ import subprocess
 import sys
 from pathlib import Path
 
-__version__ = "0.9.1"
+__version__ = "0.10.0"
 
 log = logging.getLogger(__name__)
 
 
-def save_image(args, new_image):
-    """Run resize subcommand.
+def save_image(args, new_image, subcommand):
+    """Save image after image operation.
 
     Args:
         args (argparse.Namespace): Config from command line arguments
         new_image(PIL.Image.Image): Modified image
+        subcommand(str): Subcommand used to call this function
 
     Returns:
         None
     """
-    action = args.func.__module__.split(".")[-1]
     image_file = Path(args.image_filename)
 
     if args.overwrite:
@@ -44,11 +44,11 @@ def save_image(args, new_image):
     else:
         new_filename = Path(
             args.output_dir,
-            image_file.with_name(f"{action}_{image_file.name}"),
+            image_file.with_name(f"{subcommand}_{image_file.name}"),
         )
         new_filename.parent.mkdir(parents=True, exist_ok=True)
 
-    log.info("%s image: %s", action, new_filename)
+    log.info("%s image: %s", subcommand, new_filename)
     new_image.save(new_filename)
 
     if args.open:

{fotolab-0.9.1 → fotolab-0.10.0}/fotolab/border.py

@@ -134,4 +134,4 @@ def run(args: argparse.Namespace) -> None:
         fill=ImageColor.getrgb(args.color),
     )
 
-    save_image(args, bordered_image)
+    save_image(args, bordered_image, "border")

{fotolab-0.9.1 → fotolab-0.10.0}/fotolab/cli.py

@@ -29,6 +29,7 @@ import fotolab.auto
 import fotolab.border
 import fotolab.contrast
 import fotolab.env
+import fotolab.info
 import fotolab.resize
 import fotolab.sharpen
 import fotolab.watermark
@@ -122,6 +123,7 @@ def build_parser() -> argparse.ArgumentParser:
     fotolab.auto.build_subparser(subparsers)
     fotolab.border.build_subparser(subparsers)
     fotolab.contrast.build_subparser(subparsers)
+    fotolab.info.build_subparser(subparsers)
     fotolab.resize.build_subparser(subparsers)
     fotolab.sharpen.build_subparser(subparsers)
     fotolab.watermark.build_subparser(subparsers)

{fotolab-0.9.1 → fotolab-0.10.0}/fotolab/contrast.py

@@ -70,4 +70,4 @@ def run(args: argparse.Namespace) -> None:
     original_image = Image.open(args.image_filename)
     contrast_image = ImageOps.autocontrast(original_image, cutoff=args.cutoff)
 
-    save_image(args, contrast_image)
+    save_image(args, contrast_image, "contrast")

fotolab-0.10.0/fotolab/info.py

@@ -0,0 +1,58 @@
+# Copyright (C) 2024 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/>.
+
+"""Info subcommand."""
+
+import argparse
+import logging
+
+from PIL import ExifTags, Image
+
+log = logging.getLogger(__name__)
+
+
+def build_subparser(subparsers) -> None:
+    """Build the subparser."""
+    info_parser = subparsers.add_parser("info", help="info an image")
+
+    info_parser.set_defaults(func=run)
+
+    info_parser.add_argument(
+        dest="image_filename",
+        help="set the image filename",
+        type=str,
+        default=None,
+        metavar="IMAGE_FILENAME",
+    )
+
+
+def run(args: argparse.Namespace) -> None:
+    """Run info subcommand.
+
+    Args:
+        config (argparse.Namespace): Config from command line arguments
+
+    Returns:
+        None
+    """
+    log.debug(args)
+
+    image = Image.open(args.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}")

{fotolab-0.9.1 → fotolab-0.10.0}/fotolab/resize.py

@@ -77,4 +77,4 @@ def run(args: argparse.Namespace) -> None:
         (args.width, args.height), Image.Resampling.LANCZOS
     )
 
-    save_image(args, resized_image)
+    save_image(args, resized_image, "resize")

{fotolab-0.9.1 → fotolab-0.10.0}/fotolab/sharpen.py

@@ -93,4 +93,4 @@ def run(args: argparse.Namespace) -> None:
             args.radius, percent=args.percent, threshold=args.threshold
         )
     )
-    save_image(args, sharpen_image)
+    save_image(args, sharpen_image, "sharpen")

{fotolab-0.9.1 → fotolab-0.10.0}/fotolab/watermark.py

@@ -145,7 +145,7 @@ def run(args: argparse.Namespace) -> None:
         stroke_fill=ImageColor.getrgb(args.outline_color),
     )
 
-    save_image(args, watermarked_image)
+    save_image(args, watermarked_image, "watermark")
 
 
 def calculate_position(image, text_width, text_height, position) -> tuple: