fotolab 0.9.1__py2.py3-none-any.whl → 0.12.0__py2.py3-none-any.whl

fotolab/__init__.py

@@ -21,34 +21,37 @@ import subprocess
 import sys
 from pathlib import Path
 
-__version__ = "0.9.1"
+__version__ = "0.12.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 "image_filenames" in args:
+        image_file = Path(args.image_filenames[0].name)
+    else:
+        image_file = Path(args.image_filename)
 
     if args.overwrite:
         new_filename = image_file.with_name(image_file.name)
     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/auto.py

@@ -65,6 +65,7 @@ def run(args: argparse.Namespace) -> None:
         "font_color": "white",
         "outline_width": 2,
         "outline_color": "black",
+        "padding": 15,
     }
     combined_args = argparse.Namespace(**vars(args), **extra_args)
     combined_args.overwrite = True

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/cli.py

@@ -29,6 +29,8 @@ import fotolab.auto
 import fotolab.border
 import fotolab.contrast
 import fotolab.env
+import fotolab.info
+import fotolab.montage
 import fotolab.resize
 import fotolab.sharpen
 import fotolab.watermark
@@ -82,7 +84,7 @@ def build_parser() -> argparse.ArgumentParser:
         default=False,
         action="store_true",
         dest="open",
-        help="open the image using default program (default: '%(default)s'",
+        help="open the image using default program (default: '%(default)s')",
     )
 
     parser.add_argument(
@@ -122,7 +124,9 @@ 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.montage.build_subparser(subparsers)
     fotolab.sharpen.build_subparser(subparsers)
     fotolab.watermark.build_subparser(subparsers)
     fotolab.env.build_subparser(subparsers)

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/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/montage.py

@@ -0,0 +1,70 @@
+# 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/>.
+
+"""Montage subcommand."""
+
+import argparse
+import logging
+
+from PIL import Image
+
+from fotolab import save_image
+
+log = logging.getLogger(__name__)
+
+
+def build_subparser(subparsers) -> None:
+    """Build the subparser."""
+    montage_parser = subparsers.add_parser(
+        "montage", help="montage a list of image"
+    )
+
+    montage_parser.set_defaults(func=run)
+
+    montage_parser.add_argument(
+        dest="image_filenames",
+        help="set the image filenames",
+        nargs="+",
+        type=argparse.FileType("r"),
+        default=None,
+        metavar="IMAGE_FILENAMES",
+    )
+
+
+def run(args: argparse.Namespace) -> None:
+    """Run montage subcommand.
+
+    Args:
+        config (argparse.Namespace): Config from command line arguments
+
+    Returns:
+        None
+    """
+    log.debug(args)
+    images = []
+    for image_filename in args.image_filenames:
+        images.append(Image.open(image_filename.name))
+
+    total_width = sum(img.width for img in images)
+    total_height = max(img.height for img in images)
+
+    montaged_image = Image.new("RGB", (total_width, total_height))
+
+    x_offset = 0
+    for img in images:
+        montaged_image.paste(img, (x_offset, 0))
+        x_offset += img.width
+
+    save_image(args, montaged_image, "montage")

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/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/watermark.py

@@ -62,6 +62,19 @@ def build_subparser(subparsers) -> None:
         default="bottom-left",
     )
 
+    watermark_parser.add_argument(
+        "-pd",
+        "--padding",
+        dest="padding",
+        type=int,
+        default=15,
+        help=(
+            "set the padding of the watermark text relative to the image "
+            "(default: '%(default)s')"
+        ),
+        metavar="PADDING",
+    )
+
     watermark_parser.add_argument(
         "-fs",
         "--font-size",
@@ -133,24 +146,25 @@ def run(args: argparse.Namespace) -> None:
     text_width = right - left
     text_height = bottom - top
     (position_x, position_y) = calculate_position(
-        watermarked_image, text_width, text_height, args.position
+        watermarked_image, text_width, text_height, args.position, args.padding
     )
 
     draw.text(
         (position_x, position_y),
         args.text,
         font=font,
-        fill=ImageColor.getrgb(args.font_color),
+        fill=(*ImageColor.getrgb(args.font_color), 128),
         stroke_width=args.outline_width,
-        stroke_fill=ImageColor.getrgb(args.outline_color),
+        stroke_fill=(*ImageColor.getrgb(args.outline_color), 128),
     )
 
-    save_image(args, watermarked_image)
+    save_image(args, watermarked_image, "watermark")
 
 
-def calculate_position(image, text_width, text_height, position) -> tuple:
+def calculate_position(
+    image, text_width, text_height, position, padding
+) -> tuple:
     """Calculate the boundary coordinates of the watermark text."""
-    padding = 10
     if position == "top-left":
         position_x = 0 + padding
         position_y = 0 + padding

{fotolab-0.9.1.dist-info → fotolab-0.12.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fotolab
-Version: 0.9.1
+Version: 0.12.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
@@ -89,6 +89,22 @@ optional arguments:
   -V, --version     show program's version number and exit
 ```
 
+### fotolab auto
+
+```console
+fotolab auto -h
+```
+
+```console
+usage: fotolab auto [-h] IMAGE_FILENAME
+
+positional arguments:
+  IMAGE_FILENAME  set the image filename
+
+optional arguments:
+  -h, --help      show this help message and exit
+```
+
 ### fotolab border
 
 ```console
@@ -135,6 +151,43 @@ 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 resize
+
+```console
+fotolab resize -h
+```
+
+```console
+
+usage: fotolab resize [-h] [-wh WIDTH] [-ht HEIGHT] IMAGE_FILENAME
+
+positional arguments:
+  IMAGE_FILENAME        set the image filename
+
+optional arguments:
+  -h, --help            show this help message and exit
+  -wh WIDTH, --width WIDTH
+                        set the width of the image (default: '600')
+  -ht HEIGHT, --height HEIGHT
+                        set the height of the image (default: '277')
+```
+
 ### fotolab sharpen
 
 ```console
@@ -160,20 +213,23 @@ fotolab watermark -h
 ```console
 usage: fotolab watermark [-h] [-t WATERMARK_TEXT]
                          [-p {top-left,top-right,bottom-left,bottom-right}]
-                         [-fs FONT_SIZE] [-fc FONT_COLOR] [-ow OUTLINE_WIDTH]
-                         [-oc OUTLINE_COLOR]
+                         [-pd PADDING] [-fs FONT_SIZE] [-fc FONT_COLOR]
+                         [-ow OUTLINE_WIDTH] [-oc OUTLINE_COLOR]
                          IMAGE_FILENAME
 
 positional arguments:
   IMAGE_FILENAME        set the image filename
 
-options:
+optional arguments:
   -h, --help            show this help message and exit
   -t WATERMARK_TEXT, --text WATERMARK_TEXT
                         set the watermark text (default: 'kianmeng.org')
   -p {top-left,top-right,bottom-left,bottom-right}, --position {top-left,top-right,bottom-left,bottom-right}
                         set position of the watermark text (default: 'bottom-
                         left')
+  -pd PADDING, --padding PADDING
+                        set the padding of the watermark text relative to the
+                        image (default: '15')
   -fs FONT_SIZE, --font-size FONT_SIZE
                         set the font size of watermark text (default: '12')
   -fc FONT_COLOR, --font-color FONT_COLOR

fotolab-0.12.0.dist-info/RECORD

@@ -0,0 +1,17 @@
+fotolab/__init__.py,sha256=8ti89bThRtE551s8nHCPDhKpKl_n62Bh4QZW1JyvJGk,2165
+fotolab/__main__.py,sha256=aboOURPs_snOXTEWYR0q8oq1UTY9e-NxCd1j33V0wHI,833
+fotolab/auto.py,sha256=QvRBRhbhU9ZKEFDYiPkfENgYVOTP6Gt39zYGJd_BIDI,2196
+fotolab/border.py,sha256=vujylADWHQsFwoCjoUa2yOIi8aJhTrVBgZsqyxDHKV0,3423
+fotolab/cli.py,sha256=KoSDb752mewrtKE5wDs9icXF2McBVOKoEB98KYAV-jQ,4570
+fotolab/contrast.py,sha256=82dpsFHW6kW7tR0kekFn1UoZAuAq3EXWQNOmrtRGw2g,1981
+fotolab/env.py,sha256=NTTvfISWBBfIw5opWrUfg0BtkaAtdUtcISBAJC2gVUk,1449
+fotolab/info.py,sha256=DawXTQJiQDBwy0Ml5Ysk8MvKga3ikp_aIw73AR3LdZo,1687
+fotolab/montage.py,sha256=wQApMwQsOett6TwxCT8JhqM5X2DoS2tjEyTxsomiwM4,1957
+fotolab/resize.py,sha256=EkZYyWw9jHVmexIVbF3a9v5MYQEQxjVXlGGBMoB0IeQ,2138
+fotolab/sharpen.py,sha256=DGeIq24JHpfftAF_h26cTMJVwSsxmnB9bL7lPkynuco,2546
+fotolab/watermark.py,sha256=syNzsr4xIjQDPyDLwezzmy2Emi3AzZBKXwM422ZIVQc,4996
+fotolab-0.12.0.dist-info/entry_points.txt,sha256=mvw7AY_yZkIyjAxPtHNed9X99NZeLnMxEeAfEJUbrCM,44
+fotolab-0.12.0.dist-info/LICENSE.md,sha256=tGtFDwxWTjuR9syrJoSv1Hiffd2u8Tu8cYClfrXS_YU,31956
+fotolab-0.12.0.dist-info/WHEEL,sha256=Sgu64hAMa6g5FdzHxXv9Xdse9yxpGGMeagVtPMWpJQY,99
+fotolab-0.12.0.dist-info/METADATA,sha256=COUB8nxicWSmFFEIhAdDHmdAz--GN0Gb0lyShqPP1J8,7875
+fotolab-0.12.0.dist-info/RECORD,,

fotolab-0.9.1.dist-info/RECORD

@@ -1,15 +0,0 @@
-fotolab/__init__.py,sha256=3N1D57pcYWYmpOUqPIomNqEWg4qVTyVQP6AUvKRNGOg,2015
-fotolab/__main__.py,sha256=aboOURPs_snOXTEWYR0q8oq1UTY9e-NxCd1j33V0wHI,833
-fotolab/auto.py,sha256=k4DkHQp05m7UYUgHRrH9L1d0eSgOzrn2Cyk5BG27KyA,2173
-fotolab/border.py,sha256=-XNa118OpiXwCXptSCl1HdxTJ2SSnv62HSg6xfBChaY,3413
-fotolab/cli.py,sha256=4IEk0DRrCPIG0PB37f4zSyWUEbrZrLSKi5qJxb1M0Is,4433
-fotolab/contrast.py,sha256=chIjzw2h7TA_u63Y_ZNS_0otxtyXgHmHaCDOMUayS_A,1969
-fotolab/env.py,sha256=NTTvfISWBBfIw5opWrUfg0BtkaAtdUtcISBAJC2gVUk,1449
-fotolab/resize.py,sha256=6314jLmhwb_ktd6uKEToaNHW0ZOyPW2IiELosBsIcXs,2128
-fotolab/sharpen.py,sha256=5lLWZ2JOM-jfsqr6Lt9tlijZH1oz4KlvBytTL0-QLQI,2535
-fotolab/watermark.py,sha256=Hn3nUhQo3iFhvtlsLjGjFMGG8rqKFNGOYQBcwRS250M,4648
-fotolab-0.9.1.dist-info/entry_points.txt,sha256=mvw7AY_yZkIyjAxPtHNed9X99NZeLnMxEeAfEJUbrCM,44
-fotolab-0.9.1.dist-info/LICENSE.md,sha256=tGtFDwxWTjuR9syrJoSv1Hiffd2u8Tu8cYClfrXS_YU,31956
-fotolab-0.9.1.dist-info/WHEEL,sha256=Sgu64hAMa6g5FdzHxXv9Xdse9yxpGGMeagVtPMWpJQY,99
-fotolab-0.9.1.dist-info/METADATA,sha256=ukyF71SeL7LHXiYzH90aXgo6xzA94Q3aQ_iZjZDRr7s,6688
-fotolab-0.9.1.dist-info/RECORD,,