fotolab 0.20.1__py2.py3-none-any.whl → 0.21.0__py2.py3-none-any.whl

fotolab/__init__.py

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

fotolab/info.py

@@ -46,6 +46,14 @@ def build_subparser(subparsers) -> None:
         help="show image info by sorted field name",
     )
 
+    info_parser.add_argument(
+        "--camera",
+        default=False,
+        action="store_true",
+        dest="camera",
+        help="show the camera maker details",
+    )
+
 
 def run(args: argparse.Namespace) -> None:
     """Run info subcommand.
@@ -57,11 +65,13 @@ def run(args: argparse.Namespace) -> None:
         None
     """
     log.debug(args)
-
-    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}")
+    if args.camera:
+        print(camera_metadata(args.image_filename))
+    else:
+        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:
@@ -77,3 +87,10 @@ def extract_exif_tags(image_filename: str, sort: bool = False) -> dict:
         filtered_info = dict(sorted(filtered_info.items()))
 
     return filtered_info
+
+
+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()

fotolab/watermark.py

@@ -244,6 +244,8 @@ def calc_padding(image, args) -> int:
 
 def calc_position(image, text_width, text_height, position, padding) -> tuple:
     """Calculate the boundary coordinates of the watermark text."""
+    (position_x, position_y) = (0, 0)
+
     if position == "top-left":
         position_x = 0 + padding
         position_y = 0 + padding

{fotolab-0.20.1.dist-info → fotolab-0.21.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fotolab
-Version: 0.20.1
+Version: 0.21.0
 Summary: A console program that manipulate images.
 Keywords: photography,photo
 Author-email: Kian-Meng Ang <kianmeng@cpan.org>
@@ -9,11 +9,11 @@ Classifier: Development Status :: 3 - Alpha
 Classifier: Environment :: Console
 Classifier: License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python
 Requires-Dist: pillow
 Project-URL: Changelog, https://github.com/kianmeng/fotolab/blob/master/CHANGELOG.md

{fotolab-0.20.1.dist-info → fotolab-0.21.0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-fotolab/__init__.py,sha256=kFjveIbYfTI8In7w4thI9J-nbyQVC61T8YF6KxxAJ3c,2061
+fotolab/__init__.py,sha256=1XF9Lprg2Pk9MDISiqVACsaGeJztySkwXJ6-JaO81xA,2061
 fotolab/__main__.py,sha256=aboOURPs_snOXTEWYR0q8oq1UTY9e-NxCd1j33V0wHI,833
 fotolab/animate.py,sha256=ejimhTozo9DN7BbqqcV4x8zLnanZRKq1pxBBFeOdr6Q,2967
 fotolab/auto.py,sha256=l_-Kf5V5Anvwz1QV1ET-42YsDWEeHf_okHkXWOycWAI,2295
@@ -6,14 +6,14 @@ 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=kbKMIqdkK-Wn2lWLvnFL_Efc45K9KCaR_euTv9LIGzw,2256
+fotolab/info.py,sha256=FgLST4yxl4tX3Lag1PfJTz31kzVTE0SWFbHAJS4hTYI,2752
 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=zxmTT1k78tdqqzbRu13YVOFQ0Z1cKd7JHU4M0nV01DU,7418
-fotolab-0.20.1.dist-info/entry_points.txt,sha256=mvw7AY_yZkIyjAxPtHNed9X99NZeLnMxEeAfEJUbrCM,44
-fotolab-0.20.1.dist-info/LICENSE.md,sha256=tGtFDwxWTjuR9syrJoSv1Hiffd2u8Tu8cYClfrXS_YU,31956
-fotolab-0.20.1.dist-info/WHEEL,sha256=Sgu64hAMa6g5FdzHxXv9Xdse9yxpGGMeagVtPMWpJQY,99
-fotolab-0.20.1.dist-info/METADATA,sha256=GhF0LxtDve3dgZbjoKLf89Z4D-dPZQMUoXfSTwEoWiI,10576
-fotolab-0.20.1.dist-info/RECORD,,
+fotolab/watermark.py,sha256=-YzxABVT5KJM1GgYLP3Z8X9YPfQzncOA9YnRJgNN6nA,7457
+fotolab-0.21.0.dist-info/entry_points.txt,sha256=mvw7AY_yZkIyjAxPtHNed9X99NZeLnMxEeAfEJUbrCM,44
+fotolab-0.21.0.dist-info/LICENSE.md,sha256=tGtFDwxWTjuR9syrJoSv1Hiffd2u8Tu8cYClfrXS_YU,31956
+fotolab-0.21.0.dist-info/WHEEL,sha256=Sgu64hAMa6g5FdzHxXv9Xdse9yxpGGMeagVtPMWpJQY,99
+fotolab-0.21.0.dist-info/METADATA,sha256=NOPnTOeLUB51nhb-IekFBUOrWgTGZlA5VUPyBEvJr8s,10577
+fotolab-0.21.0.dist-info/RECORD,,