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

fotolab/__init__.py

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

fotolab/watermark.py

@@ -157,44 +157,47 @@ def run(args: argparse.Namespace) -> None:
     log.debug(args)
 
     for image_filename in args.image_filenames:
-        original_image = Image.open(image_filename)
-        watermarked_image = original_image.copy()
+        watermarked_image = watermark_image(image_filename, args)
+        save_image(args, watermarked_image, image_filename, "watermark")
 
-        draw = ImageDraw.Draw(watermarked_image)
 
-        font = ImageFont.load_default(calc_font_size(original_image, args))
-        log.debug("default font: %s", " ".join(font.getname()))
+def watermark_image(image_filename, args):
+    """Watermark the image."""
+    original_image = Image.open(image_filename)
+    watermarked_image = original_image.copy()
 
-        text = args.text
-        if args.camera and camera_metadata(image_filename):
-            text = camera_metadata(image_filename)
+    draw = ImageDraw.Draw(watermarked_image)
 
-        if args.lowercase:
-            text = text.lower()
+    font = ImageFont.load_default(calc_font_size(original_image, args))
+    log.debug("default font: %s", " ".join(font.getname()))
 
-        (left, top, right, bottom) = draw.textbbox(
-            xy=(0, 0), text=text, font=font
-        )
-        text_width = right - left
-        text_height = bottom - top
-        (position_x, position_y) = calc_position(
-            watermarked_image,
-            text_width,
-            text_height,
-            args.position,
-            calc_padding(original_image, args),
-        )
+    text = args.text
+    if args.camera and camera_metadata(image_filename):
+        text = camera_metadata(image_filename)
 
-        draw.text(
-            (position_x, position_y),
-            text,
-            font=font,
-            fill=(*ImageColor.getrgb(args.font_color), 128),
-            stroke_width=calc_font_outline_width(original_image, args),
-            stroke_fill=(*ImageColor.getrgb(args.outline_color), 128),
-        )
+    if args.lowercase:
+        text = text.lower()
 
-        save_image(args, watermarked_image, image_filename, "watermark")
+    (left, top, right, bottom) = draw.textbbox(xy=(0, 0), text=text, font=font)
+    text_width = right - left
+    text_height = bottom - top
+    (position_x, position_y) = calc_position(
+        watermarked_image,
+        text_width,
+        text_height,
+        args.position,
+        calc_padding(original_image, args),
+    )
+
+    draw.text(
+        (position_x, position_y),
+        text,
+        font=font,
+        fill=(*ImageColor.getrgb(args.font_color), 128),
+        stroke_width=calc_font_outline_width(original_image, args),
+        stroke_fill=(*ImageColor.getrgb(args.outline_color), 128),
+    )
+    return watermarked_image
 
 
 def camera_metadata(image_filename):

{fotolab-0.18.1.dist-info → fotolab-0.18.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fotolab
-Version: 0.18.1
+Version: 0.18.2
 Summary: A console program that manipulate images.
 Keywords: photography,photo
 Author-email: Kian-Meng Ang <kianmeng@cpan.org>

{fotolab-0.18.1.dist-info → fotolab-0.18.2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-fotolab/__init__.py,sha256=XvtFiEJ4C6qZB4LfH3agFbx98-wD8x7tEH50NSKU8iE,2061
+fotolab/__init__.py,sha256=mdy2kMR-Cr-tVVuwVJ1rBYbGMe55I2WFJqz1-1PkC1o,2061
 fotolab/__main__.py,sha256=aboOURPs_snOXTEWYR0q8oq1UTY9e-NxCd1j33V0wHI,833
 fotolab/animate.py,sha256=ejimhTozo9DN7BbqqcV4x8zLnanZRKq1pxBBFeOdr6Q,2967
 fotolab/auto.py,sha256=SmEEbTXFiP1BiqaAFxPNTcGguVSUbAmLbSuWf_LgsBY,2270
@@ -11,9 +11,9 @@ 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/watermark.py,sha256=zxmTT1k78tdqqzbRu13YVOFQ0Z1cKd7JHU4M0nV01DU,7418
+fotolab-0.18.2.dist-info/entry_points.txt,sha256=mvw7AY_yZkIyjAxPtHNed9X99NZeLnMxEeAfEJUbrCM,44
+fotolab-0.18.2.dist-info/LICENSE.md,sha256=tGtFDwxWTjuR9syrJoSv1Hiffd2u8Tu8cYClfrXS_YU,31956
+fotolab-0.18.2.dist-info/WHEEL,sha256=Sgu64hAMa6g5FdzHxXv9Xdse9yxpGGMeagVtPMWpJQY,99
+fotolab-0.18.2.dist-info/METADATA,sha256=OR21owMk2s75EkPrTMspPlV8soyC_waOaLVhv5nEzog,10676
+fotolab-0.18.2.dist-info/RECORD,,