fotolab 0.16.17__py2.py3-none-any.whl → 0.18.1__py2.py3-none-any.whl

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/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/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/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/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/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.dist-info → fotolab-0.18.1.dist-info}/METADATA

@@ -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.18.1.dist-info/RECORD

@@ -0,0 +1,19 @@
+fotolab/__init__.py,sha256=XvtFiEJ4C6qZB4LfH3agFbx98-wD8x7tEH50NSKU8iE,2061
+fotolab/__main__.py,sha256=aboOURPs_snOXTEWYR0q8oq1UTY9e-NxCd1j33V0wHI,833
+fotolab/animate.py,sha256=ejimhTozo9DN7BbqqcV4x8zLnanZRKq1pxBBFeOdr6Q,2967
+fotolab/auto.py,sha256=SmEEbTXFiP1BiqaAFxPNTcGguVSUbAmLbSuWf_LgsBY,2270
+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/montage.py,sha256=lUVY-zDSH7mwH-s34_XefdNp7CoDJHkwpbTUGiyJGgs,2037
+fotolab/resize.py,sha256=cvPfh4wUfydM23Do7VnP6Bx2EqMHKfYFYrpiNhyWzCU,3259
+fotolab/rotate.py,sha256=l_vQgf0IcI8AR1TSVsk4PrMZtJ3j_wpU77rKiGJ-KTA,1715
+fotolab/sharpen.py,sha256=wUPtJdtB6mCRmcHrA0CoEVO0O0ROBJWhejTvUeL67QU,2655
+fotolab/watermark.py,sha256=WlZF6aV1iR6Bh6Y3pXLvCFyLkpo-IHyKbS4UlUcvhNU,7382
+fotolab-0.18.1.dist-info/entry_points.txt,sha256=mvw7AY_yZkIyjAxPtHNed9X99NZeLnMxEeAfEJUbrCM,44
+fotolab-0.18.1.dist-info/LICENSE.md,sha256=tGtFDwxWTjuR9syrJoSv1Hiffd2u8Tu8cYClfrXS_YU,31956
+fotolab-0.18.1.dist-info/WHEEL,sha256=Sgu64hAMa6g5FdzHxXv9Xdse9yxpGGMeagVtPMWpJQY,99
+fotolab-0.18.1.dist-info/METADATA,sha256=LdK1HE2kcKwjLyEeci6Rr5ax_0I-Buhvl1LrY6Z3LsY,10676
+fotolab-0.18.1.dist-info/RECORD,,

fotolab-0.16.17.dist-info/RECORD

@@ -1,19 +0,0 @@
-fotolab/__init__.py,sha256=qP6gvbqFk1sDJ5TBEb93V94RXlDx6CLNo3Td6D-12nQ,2062
-fotolab/__main__.py,sha256=aboOURPs_snOXTEWYR0q8oq1UTY9e-NxCd1j33V0wHI,833
-fotolab/animate.py,sha256=ejimhTozo9DN7BbqqcV4x8zLnanZRKq1pxBBFeOdr6Q,2967
-fotolab/auto.py,sha256=1Toxe8pA_tq15g1-imMFuHf1L94Ac7EthPTu7E8SAzE,2217
-fotolab/border.py,sha256=5ch2d7LVPhB2OFuuXSW5ci6Cn967CPDQu0qSfaO7uMg,3591
-fotolab/cli.py,sha256=XENJqvvMxOTHVYfch8gZJhkzGxhex0LUAe75ISNNWPo,5032
-fotolab/contrast.py,sha256=l7Bs5p8W8ypN9Cg3fFHnU-A20UwMKtjTiPk6D0PRwpM,2095
-fotolab/env.py,sha256=u63uuy1LG9bXy5Q-x1JfPiQaGCGwTYy-GJmWtzSkeFc,1477
-fotolab/info.py,sha256=DawXTQJiQDBwy0Ml5Ysk8MvKga3ikp_aIw73AR3LdZo,1687
-fotolab/montage.py,sha256=lUVY-zDSH7mwH-s34_XefdNp7CoDJHkwpbTUGiyJGgs,2037
-fotolab/resize.py,sha256=cvPfh4wUfydM23Do7VnP6Bx2EqMHKfYFYrpiNhyWzCU,3259
-fotolab/rotate.py,sha256=l_vQgf0IcI8AR1TSVsk4PrMZtJ3j_wpU77rKiGJ-KTA,1715
-fotolab/sharpen.py,sha256=wUPtJdtB6mCRmcHrA0CoEVO0O0ROBJWhejTvUeL67QU,2655
-fotolab/watermark.py,sha256=JnCIB--WZ2COG1BNrFY14GaWznz7BqBlwOVz4uW8H3Q,6546
-fotolab-0.16.17.dist-info/entry_points.txt,sha256=mvw7AY_yZkIyjAxPtHNed9X99NZeLnMxEeAfEJUbrCM,44
-fotolab-0.16.17.dist-info/LICENSE.md,sha256=tGtFDwxWTjuR9syrJoSv1Hiffd2u8Tu8cYClfrXS_YU,31956
-fotolab-0.16.17.dist-info/WHEEL,sha256=Sgu64hAMa6g5FdzHxXv9Xdse9yxpGGMeagVtPMWpJQY,99
-fotolab-0.16.17.dist-info/METADATA,sha256=f8SorvhIK70fPa4tyenLO4Nr6RN44gRtfu8wHQJaXk8,10549
-fotolab-0.16.17.dist-info/RECORD,,