fotolab 0.21.1__py3-none-any.whl → 0.22.1__py3-none-any.whl

fotolab/__init__.py

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

fotolab/cli.py

@@ -23,19 +23,9 @@
 import argparse
 import logging
 import sys
-from typing import Dict, Optional, Sequence
-
-import fotolab.animate
-import fotolab.auto
-import fotolab.border
-import fotolab.contrast
-import fotolab.env
-import fotolab.info
-import fotolab.montage
-import fotolab.resize
-import fotolab.rotate
-import fotolab.sharpen
-import fotolab.watermark
+from typing import Optional, Sequence
+
+import fotolab.subcommands
 from fotolab import __version__
 
 log = logging.getLogger(__name__)
@@ -49,18 +39,17 @@ def setup_logging(args: argparse.Namespace) -> None:
     if args.quiet:
         logging.disable(logging.NOTSET)
     else:
-        conf: Dict = {
-            True: {
-                "level": logging.DEBUG,
-                "msg": "[%(asctime)s] %(levelname)s: %(name)s: %(message)s",
-            },
-            False: {"level": logging.INFO, "msg": "%(message)s"},
-        }
+        level = logging.DEBUG if args.debug else logging.INFO
+        format_string = (
+            "[%(asctime)s] %(levelname)s: %(name)s: %(message)s"
+            if args.debug
+            else "%(message)s"
+        )
 
         logging.basicConfig(
-            level=conf[args.debug]["level"],
+            level=level,
+            format=format_string,
             stream=sys.stdout,
-            format=conf[args.debug]["msg"],
             datefmt="%Y-%m-%d %H:%M:%S",
         )
 
@@ -136,17 +125,7 @@ def build_parser() -> argparse.ArgumentParser:
     )
 
     subparsers = parser.add_subparsers(help="sub-command help")
-    fotolab.animate.build_subparser(subparsers)
-    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.rotate.build_subparser(subparsers)
-    fotolab.montage.build_subparser(subparsers)
-    fotolab.sharpen.build_subparser(subparsers)
-    fotolab.watermark.build_subparser(subparsers)
-    fotolab.env.build_subparser(subparsers)
+    fotolab.subcommands.build_subparser(subparsers)
 
     return parser
 

fotolab/subcommands/__init__.py

@@ -0,0 +1,32 @@
+# 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/>.
+
+"""Common utils for subcommand."""
+
+import importlib
+import pkgutil
+
+
+def build_subparser(subparsers):
+    """Build subparser for each subcommands."""
+    iter_namespace = pkgutil.iter_modules(__path__, __name__ + ".")
+
+    subcommands = {
+        name: importlib.import_module(name)
+        for finder, name, ispkg in iter_namespace
+    }
+
+    for subcommand in subcommands.values():
+        subcommand.build_subparser(subparsers)

fotolab/{auto.py → subcommands/auto.py}

@@ -18,10 +18,10 @@
 import argparse
 import logging
 
-import fotolab.contrast
-import fotolab.resize
-import fotolab.sharpen
-import fotolab.watermark
+import fotolab.subcommands.contrast
+import fotolab.subcommands.resize
+import fotolab.subcommands.sharpen
+import fotolab.subcommands.watermark
 
 log = logging.getLogger(__name__)
 
@@ -77,7 +77,7 @@ def run(args: argparse.Namespace) -> None:
     log.debug(args)
     log.debug(combined_args)
 
-    fotolab.resize.run(combined_args)
-    fotolab.contrast.run(combined_args)
-    fotolab.sharpen.run(combined_args)
-    fotolab.watermark.run(combined_args)
+    fotolab.subcommands.resize.run(combined_args)
+    fotolab.subcommands.contrast.run(combined_args)
+    fotolab.subcommands.sharpen.run(combined_args)
+    fotolab.subcommands.watermark.run(combined_args)

fotolab/{info.py → subcommands/info.py}

@@ -54,6 +54,14 @@ def build_subparser(subparsers) -> None:
         help="show the camera maker details",
     )
 
+    info_parser.add_argument(
+        "--datetime",
+        default=False,
+        action="store_true",
+        dest="datetime",
+        help="show the datetime",
+    )
+
 
 def run(args: argparse.Namespace) -> None:
     """Run info subcommand.
@@ -65,8 +73,16 @@ def run(args: argparse.Namespace) -> None:
         None
     """
     log.debug(args)
+    info = []
+
     if args.camera:
-        print(camera_metadata(args.image_filename))
+        info.append(camera_metadata(args.image_filename))
+
+    if args.datetime:
+        info.append(datetime(args.image_filename))
+
+    if info:
+        print("\n".join(info))
     else:
         exif_tags = extract_exif_tags(args.image_filename)
         if exif_tags:
@@ -96,6 +112,12 @@ def extract_exif_tags(image_filename: str, sort: bool = False) -> dict:
     return filtered_info
 
 
+def datetime(image_filename):
+    """Extract datetime metadata."""
+    exif_tags = extract_exif_tags(image_filename)
+    return exif_tags["DateTime"]
+
+
 def camera_metadata(image_filename):
     """Extract camera and model metadata."""
     exif_tags = extract_exif_tags(image_filename)

fotolab/{watermark.py → subcommands/watermark.py}

@@ -22,7 +22,7 @@ import math
 from PIL import Image, ImageColor, ImageDraw, ImageFont
 
 from fotolab import save_image
-from fotolab.info import extract_exif_tags
+from fotolab.subcommands.info import camera_metadata
 
 log = logging.getLogger(__name__)
 
@@ -139,7 +139,7 @@ def build_subparser(subparsers) -> None:
         "-l",
         "--lowercase",
         default=True,
-        action="store_true",
+        action=argparse.BooleanOptionalAction,
         dest="lowercase",
         help="lowercase the watermark text",
     )
@@ -200,13 +200,6 @@ def watermark_image(image_filename, args):
     return watermarked_image
 
 
-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.21.1.dist-info → fotolab-0.22.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fotolab
-Version: 0.21.1
+Version: 0.22.1
 Summary: A console program that manipulate images.
 Keywords: photography,photo
 Author-email: Kian-Meng Ang <kianmeng@cpan.org>
@@ -206,7 +206,7 @@ fotolab info -h
 <!--help-info !-->
 
 ```console
-usage: fotolab info [-h] [-s] IMAGE_FILENAME
+usage: fotolab info [-h] [-s] [--camera] IMAGE_FILENAME
 
 positional arguments:
   IMAGE_FILENAME  set the image filename
@@ -214,6 +214,7 @@ positional arguments:
 options:
   -h, --help      show this help message and exit
   -s, --sort      show image info by sorted field name
+  --camera        show the camera maker details
 ```
 
 <!--help-info !-->
@@ -326,7 +327,7 @@ 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] [--camera]
-                         [-l]
+                         [-l | --lowercase | --no-lowercase]
                          IMAGE_FILENAMES [IMAGE_FILENAMES ...]
 
 positional arguments:
@@ -354,7 +355,8 @@ options:
                         set the outline color of the watermark text (default:
                         'black')
   --camera              use camera metadata as watermark
-  -l, --lowercase       lowercase the watermark text
+  -l, --lowercase, --no-lowercase
+                        lowercase the watermark text
 ```
 
 <!--help-watermark !-->

fotolab-0.22.1.dist-info/RECORD

@@ -0,0 +1,20 @@
+fotolab/__init__.py,sha256=xdrWwLKoyxvOtFkatJOEMd_hDaY3--OVKgHZh6wY0n8,2061
+fotolab/__main__.py,sha256=aboOURPs_snOXTEWYR0q8oq1UTY9e-NxCd1j33V0wHI,833
+fotolab/cli.py,sha256=L_N94EsPeM1Ev0B5iyVvt4HEo7JTBNdhLmGZhBRIDA4,4235
+fotolab/subcommands/__init__.py,sha256=5ncuu_LxuWphjNohm32Z_lD0FmJPWrAynBzeza0lyCU,1124
+fotolab/subcommands/animate.py,sha256=ejimhTozo9DN7BbqqcV4x8zLnanZRKq1pxBBFeOdr6Q,2967
+fotolab/subcommands/auto.py,sha256=ljvC0Z88Dva18YHyn3auAjlvVHqGrxsky-HGXwaIMZo,2391
+fotolab/subcommands/border.py,sha256=5ch2d7LVPhB2OFuuXSW5ci6Cn967CPDQu0qSfaO7uMg,3591
+fotolab/subcommands/contrast.py,sha256=l7Bs5p8W8ypN9Cg3fFHnU-A20UwMKtjTiPk6D0PRwpM,2095
+fotolab/subcommands/env.py,sha256=fzUoRWgYEiYJIWYEiiSLEb7dH_xVUOnhMpQgc1yjrTY,1457
+fotolab/subcommands/info.py,sha256=bkB41ZB5BewUCvY5XBn21D1pOyLcTjsI10dseYEARfE,3354
+fotolab/subcommands/montage.py,sha256=lUVY-zDSH7mwH-s34_XefdNp7CoDJHkwpbTUGiyJGgs,2037
+fotolab/subcommands/resize.py,sha256=2bH1Kgoe_DqU8ozJ1E_oA6a9JPtuwIlo5a4sq_4Yles,5018
+fotolab/subcommands/rotate.py,sha256=l_vQgf0IcI8AR1TSVsk4PrMZtJ3j_wpU77rKiGJ-KTA,1715
+fotolab/subcommands/sharpen.py,sha256=wUPtJdtB6mCRmcHrA0CoEVO0O0ROBJWhejTvUeL67QU,2655
+fotolab/subcommands/watermark.py,sha256=tUqZoGjZk_7XG8qo7OiedfgmDY08qAWRF1Gx2ihAHO0,7264
+fotolab-0.22.1.dist-info/entry_points.txt,sha256=mvw7AY_yZkIyjAxPtHNed9X99NZeLnMxEeAfEJUbrCM,44
+fotolab-0.22.1.dist-info/LICENSE.md,sha256=tGtFDwxWTjuR9syrJoSv1Hiffd2u8Tu8cYClfrXS_YU,31956
+fotolab-0.22.1.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
+fotolab-0.22.1.dist-info/METADATA,sha256=-KmtwWES6ulcPrR5TSgBxYBowTgOejyQ9Mg0aMb3k0c,10724
+fotolab-0.22.1.dist-info/RECORD,,

fotolab-0.21.1.dist-info/RECORD

@@ -1,19 +0,0 @@
-fotolab/__init__.py,sha256=fZZb0I229_RXcxunCTP3flULzE0p48prsOWsvTqLkyM,2061
-fotolab/__main__.py,sha256=aboOURPs_snOXTEWYR0q8oq1UTY9e-NxCd1j33V0wHI,833
-fotolab/animate.py,sha256=ejimhTozo9DN7BbqqcV4x8zLnanZRKq1pxBBFeOdr6Q,2967
-fotolab/auto.py,sha256=l_-Kf5V5Anvwz1QV1ET-42YsDWEeHf_okHkXWOycWAI,2295
-fotolab/border.py,sha256=5ch2d7LVPhB2OFuuXSW5ci6Cn967CPDQu0qSfaO7uMg,3591
-fotolab/cli.py,sha256=FBFSeMNqcOiJ6MuAcy0qUvc9cscdFUG946HlWZXBPtY,4984
-fotolab/contrast.py,sha256=l7Bs5p8W8ypN9Cg3fFHnU-A20UwMKtjTiPk6D0PRwpM,2095
-fotolab/env.py,sha256=fzUoRWgYEiYJIWYEiiSLEb7dH_xVUOnhMpQgc1yjrTY,1457
-fotolab/info.py,sha256=lY9n6HDnlDyRVDTRqYwzxm5xgPSyh0P8N3ybnnNtNtw,2892
-fotolab/montage.py,sha256=lUVY-zDSH7mwH-s34_XefdNp7CoDJHkwpbTUGiyJGgs,2037
-fotolab/resize.py,sha256=2bH1Kgoe_DqU8ozJ1E_oA6a9JPtuwIlo5a4sq_4Yles,5018
-fotolab/rotate.py,sha256=l_vQgf0IcI8AR1TSVsk4PrMZtJ3j_wpU77rKiGJ-KTA,1715
-fotolab/sharpen.py,sha256=wUPtJdtB6mCRmcHrA0CoEVO0O0ROBJWhejTvUeL67QU,2655
-fotolab/watermark.py,sha256=-YzxABVT5KJM1GgYLP3Z8X9YPfQzncOA9YnRJgNN6nA,7457
-fotolab-0.21.1.dist-info/entry_points.txt,sha256=mvw7AY_yZkIyjAxPtHNed9X99NZeLnMxEeAfEJUbrCM,44
-fotolab-0.21.1.dist-info/LICENSE.md,sha256=tGtFDwxWTjuR9syrJoSv1Hiffd2u8Tu8cYClfrXS_YU,31956
-fotolab-0.21.1.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
-fotolab-0.21.1.dist-info/METADATA,sha256=hH4mutSmdcXzZmt204mH0EdmgErcY18WK8KR9wtjw5o,10600
-fotolab-0.21.1.dist-info/RECORD,,