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

fotolab/__init__.py

@@ -19,12 +19,42 @@ import logging
 import os
 import subprocess
 import sys
+from pathlib import Path
 
-__version__ = "0.9.0"
+__version__ = "0.9.1"
 
 log = logging.getLogger(__name__)
 
 
+def save_image(args, new_image):
+    """Run resize subcommand.
+
+    Args:
+        args (argparse.Namespace): Config from command line arguments
+        new_image(PIL.Image.Image): Modified image
+
+    Returns:
+        None
+    """
+    action = args.func.__module__.split(".")[-1]
+    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}"),
+        )
+        new_filename.parent.mkdir(parents=True, exist_ok=True)
+
+    log.info("%s image: %s", action, new_filename)
+    new_image.save(new_filename)
+
+    if args.open:
+        _open_image(new_filename)
+
+
 def _open_image(filename):
     """Open generated image using default program."""
     if sys.platform == "linux":

fotolab/auto.py

@@ -68,6 +68,7 @@ def run(args: argparse.Namespace) -> None:
     }
     combined_args = argparse.Namespace(**vars(args), **extra_args)
     combined_args.overwrite = True
+    combined_args.open = False
     log.debug(args)
     log.debug(combined_args)
 

fotolab/border.py

@@ -17,10 +17,11 @@
 
 import argparse
 import logging
-from pathlib import Path
 
 from PIL import Image, ImageColor, ImageOps
 
+from fotolab import save_image
+
 log = logging.getLogger(__name__)
 
 
@@ -110,8 +111,6 @@ def run(args: argparse.Namespace) -> None:
     """
     log.debug(args)
 
-    image_file = Path(args.image_filename)
-
     original_image = Image.open(args.image_filename)
 
     if (
@@ -135,13 +134,4 @@ def run(args: argparse.Namespace) -> None:
         fill=ImageColor.getrgb(args.color),
     )
 
-    if args.overwrite:
-        new_filename = image_file.with_name(image_file.name)
-    else:
-        new_filename = Path(
-            args.output_dir, image_file.with_name(f"border_{image_file.name}")
-        )
-        new_filename.parent.mkdir(parents=True, exist_ok=True)
-
-    log.info("creating image: %s", new_filename)
-    bordered_image.save(new_filename)
+    save_image(args, bordered_image)

fotolab/contrast.py

@@ -17,10 +17,11 @@
 
 import argparse
 import logging
-from pathlib import Path
 
 from PIL import Image, ImageOps
 
+from fotolab import save_image
+
 log = logging.getLogger(__name__)
 
 
@@ -66,19 +67,7 @@ def run(args: argparse.Namespace) -> None:
     """
     log.debug(args)
 
-    image_file = Path(args.image_filename)
-
     original_image = Image.open(args.image_filename)
     contrast_image = ImageOps.autocontrast(original_image, cutoff=args.cutoff)
 
-    if args.overwrite:
-        new_filename = image_file.with_name(image_file.name)
-    else:
-        new_filename = Path(
-            args.output_dir,
-            image_file.with_name(f"contrast_{image_file.name}"),
-        )
-        new_filename.parent.mkdir(parents=True, exist_ok=True)
-
-    log.info("contrasting image: %s", new_filename)
-    contrast_image.save(new_filename)
+    save_image(args, contrast_image)

fotolab/env.py

@@ -45,6 +45,8 @@ def run(args: argparse.Namespace) -> None:
     """
     log.debug(args)
 
+    sys_version = sys.version.replace("\n", "")
+
     print(f"fotolab: {__version__}")
-    print(f"python: {sys.version}")
+    print(f"python: {sys_version}")
     print(f"platform: {platform.platform()}")

fotolab/resize.py

@@ -17,10 +17,11 @@
 
 import argparse
 import logging
-from pathlib import Path
 
 from PIL import Image
 
+from fotolab import save_image
+
 log = logging.getLogger(__name__)
 
 
@@ -63,28 +64,17 @@ def run(args: argparse.Namespace) -> None:
     """Run resize subcommand.
 
     Args:
-        config (argparse.Namespace): Config from command line arguments
+        args (argparse.Namespace): Config from command line arguments
 
     Returns:
         None
     """
     log.debug(args)
 
-    image_file = Path(args.image_filename)
     original_image = Image.open(args.image_filename)
     resized_image = original_image.copy()
     resized_image = resized_image.resize(
         (args.width, args.height), Image.Resampling.LANCZOS
     )
 
-    if args.overwrite:
-        new_filename = image_file.with_name(image_file.name)
-    else:
-        new_filename = Path(
-            args.output_dir,
-            image_file.with_name(f"resize_{image_file.name}"),
-        )
-        new_filename.parent.mkdir(parents=True, exist_ok=True)
-
-    log.info("resizing image: %s", new_filename)
-    resized_image.save(new_filename)
+    save_image(args, resized_image)

fotolab/sharpen.py

@@ -17,10 +17,11 @@
 
 import argparse
 import logging
-from pathlib import Path
 
 from PIL import Image, ImageFilter
 
+from fotolab import save_image
+
 log = logging.getLogger(__name__)
 
 
@@ -86,22 +87,10 @@ def run(args: argparse.Namespace) -> None:
     """
     log.debug(args)
 
-    image_file = Path(args.image_filename)
-
     original_image = Image.open(args.image_filename)
     sharpen_image = original_image.filter(
         ImageFilter.UnsharpMask(
             args.radius, percent=args.percent, threshold=args.threshold
         )
     )
-
-    if args.overwrite:
-        new_filename = image_file.with_name(image_file.name)
-    else:
-        new_filename = Path(
-            args.output_dir, image_file.with_name(f"sharpen_{image_file.name}")
-        )
-        new_filename.parent.mkdir(parents=True, exist_ok=True)
-
-    log.info("sharpening image: %s", new_filename)
-    sharpen_image.save(new_filename)
+    save_image(args, sharpen_image)

fotolab/watermark.py

@@ -17,10 +17,11 @@
 
 import argparse
 import logging
-from pathlib import Path
 
 from PIL import Image, ImageColor, ImageDraw, ImageFont
 
+from fotolab import save_image
+
 log = logging.getLogger(__name__)
 
 POSITIONS = ["top-left", "top-right", "bottom-left", "bottom-right"]
@@ -119,8 +120,6 @@ def run(args: argparse.Namespace) -> None:
     """
     log.debug(args)
 
-    image_file = Path(args.image_filename)
-
     original_image = Image.open(args.image_filename)
     watermarked_image = original_image.copy()
 
@@ -146,17 +145,7 @@ def run(args: argparse.Namespace) -> None:
         stroke_fill=ImageColor.getrgb(args.outline_color),
     )
 
-    if args.overwrite:
-        new_filename = image_file.with_name(image_file.name)
-    else:
-        new_filename = Path(
-            args.output_dir,
-            image_file.with_name(f"watermark_{image_file.name}"),
-        )
-        new_filename.parent.mkdir(parents=True, exist_ok=True)
-
-    log.info("watermarking image: %s", new_filename)
-    watermarked_image.save(new_filename)
+    save_image(args, watermarked_image)
 
 
 def calculate_position(image, text_width, text_height, position) -> tuple:

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

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

fotolab-0.9.1.dist-info/RECORD

@@ -0,0 +1,15 @@
+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,,

fotolab-0.9.0.dist-info/RECORD

@@ -1,15 +0,0 @@
-fotolab/__init__.py,sha256=a0NCJBRDthqiPJOuVD1dvsVwDXvm-ruruL26QiEL6q8,1237
-fotolab/__main__.py,sha256=aboOURPs_snOXTEWYR0q8oq1UTY9e-NxCd1j33V0wHI,833
-fotolab/auto.py,sha256=q_d_lOZh410nvh9yGNS3k-jg5mB0zQrhOfxSmi-nShA,2142
-fotolab/border.py,sha256=QBA-rJ0phv_3ace20NW18PlhLIbYDjdGVJwX13vDKdI,3776
-fotolab/cli.py,sha256=4IEk0DRrCPIG0PB37f4zSyWUEbrZrLSKi5qJxb1M0Is,4433
-fotolab/contrast.py,sha256=dtQ39YBDmBhFlRS0jB8XqLsoNGEz96ZYfgg71MyeLFg,2350
-fotolab/env.py,sha256=XUwy3TAFFcTMvtXAT0tLJbo-ianBo_FPK2IQfvBOhic,1400
-fotolab/resize.py,sha256=ax4IacQR4vuGGxGI3B-ito6ldiT054QkaKympiv4y20,2505
-fotolab/sharpen.py,sha256=PP1xYXupOetQxQxXijzWiUlrKNlu80lfInG37VQhVYw,2902
-fotolab/watermark.py,sha256=X7u-HlOONfOhU8VRyvOgIvXYUu_q9IKHBMEkIf-oem4,5031
-fotolab-0.9.0.dist-info/entry_points.txt,sha256=mvw7AY_yZkIyjAxPtHNed9X99NZeLnMxEeAfEJUbrCM,44
-fotolab-0.9.0.dist-info/LICENSE.md,sha256=tGtFDwxWTjuR9syrJoSv1Hiffd2u8Tu8cYClfrXS_YU,31956
-fotolab-0.9.0.dist-info/WHEEL,sha256=Sgu64hAMa6g5FdzHxXv9Xdse9yxpGGMeagVtPMWpJQY,99
-fotolab-0.9.0.dist-info/METADATA,sha256=i_R7skWGswlLGC1_GbZWdXWkXTup2iGeQ17iaHRZ8vc,6688
-fotolab-0.9.0.dist-info/RECORD,,