fotolab 0.27.0__py3-none-any.whl → 0.27.2__py3-none-any.whl

fotolab/__init__.py

@@ -20,7 +20,7 @@ import subprocess
 import sys
 from pathlib import Path
 
-__version__ = "0.27.0"
+__version__ = "0.27.2"
 
 log = logging.getLogger(__name__)
 
@@ -31,6 +31,7 @@ def save_image(args, new_image, output_filename, subcommand):
     Args:
         args (argparse.Namespace): Config from command line arguments
         new_image(PIL.Image.Image): Modified image
+        output_filename(str): Save filename image
         subcommand(str): Subcommand used to call this function
 
     Returns:

fotolab/cli.py

@@ -8,7 +8,7 @@
 # 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 Generals Public License for more details.
+# GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
@@ -147,15 +147,16 @@ def main(args: Optional[Sequence[str]] = None) -> None:
         parser = build_parser()
         if len(args) == 0:
             parser.print_help(sys.stderr)
+            return
+
+        parsed_args = parser.parse_args(args)
+        setup_logging(parsed_args)
+
+        if hasattr(parsed_args, "func"):
+            log.debug(parsed_args)
+            parsed_args.func(parsed_args)
         else:
-            parsed_args = parser.parse_args(args)
-            setup_logging(parsed_args)
-
-            if hasattr(parsed_args, "func"):
-                log.debug(parsed_args)
-                parsed_args.func(parsed_args)
-            else:
-                parser.print_help(sys.stderr)
+            parser.print_help(sys.stderr)
 
     except Exception as error:
         log.error(

fotolab/subcommands/animate.py

@@ -77,7 +77,7 @@ def run(args: argparse.Namespace) -> None:
     """Run animate subcommand.
 
     Args:
-        config (argparse.Namespace): Config from command line arguments
+        args (argparse.Namespace): Config from command line arguments
 
     Returns:
         None

fotolab/subcommands/auto.py

@@ -48,7 +48,7 @@ def run(args: argparse.Namespace) -> None:
     """Run auto subcommand.
 
     Args:
-        config (argparse.Namespace): Config from command line arguments
+        args (argparse.Namespace): Config from command line arguments
 
     Returns:
         None

fotolab/subcommands/border.py

@@ -105,7 +105,7 @@ def run(args: argparse.Namespace) -> None:
     """Run border subcommand.
 
     Args:
-        config (argparse.Namespace): Config from command line arguments
+        args (argparse.Namespace): Config from command line arguments
 
     Returns:
         None

fotolab/subcommands/contrast.py

@@ -61,7 +61,7 @@ def run(args: argparse.Namespace) -> None:
     """Run contrast subcommand.
 
     Args:
-        config (argparse.Namespace): Config from command line arguments
+        args (argparse.Namespace): Config from command line arguments
 
     Returns:
         None

fotolab/subcommands/env.py

@@ -38,7 +38,7 @@ def run(_args: argparse.Namespace) -> None:
     """Run env subcommand.
 
     Args:
-        config (argparse.Namespace): Config from command line arguments
+        args (argparse.Namespace): Config from command line arguments
 
     Returns:
         None

fotolab/subcommands/halftone.py

@@ -58,7 +58,7 @@ def run(args: argparse.Namespace) -> None:
     """Run halftone subcommand.
 
     Args:
-        config (argparse.Namespace): Config from command line arguments
+        args (argparse.Namespace): Config from command line arguments
 
     Returns:
         None

fotolab/subcommands/info.py

@@ -67,7 +67,7 @@ def run(args: argparse.Namespace) -> None:
     """Run info subcommand.
 
     Args:
-        config (argparse.Namespace): Config from command line arguments
+        args (argparse.Namespace): Config from command line arguments
 
     Returns:
         None

fotolab/subcommands/montage.py

@@ -47,7 +47,7 @@ def run(args: argparse.Namespace) -> None:
     """Run montage subcommand.
 
     Args:
-        config (argparse.Namespace): Config from command line arguments
+        args (argparse.Namespace): Config from command line arguments
 
     Returns:
         None

fotolab/subcommands/rotate.py

@@ -60,7 +60,7 @@ def run(args: argparse.Namespace) -> None:
     """Run rotate subcommand.
 
     Args:
-        config (argparse.Namespace): Config from command line arguments
+        args (argparse.Namespace): Config from command line arguments
 
     Returns:
         None

fotolab/subcommands/sharpen.py

@@ -91,7 +91,7 @@ def run(args: argparse.Namespace) -> None:
     """Run sharpen subcommand.
 
     Args:
-        config (argparse.Namespace): Config from command line arguments
+        args (argparse.Namespace): Config from command line arguments
 
     Returns:
         None
@@ -111,7 +111,12 @@ def run(args: argparse.Namespace) -> None:
             save_image(args, sharpen_image, image_filename, "sharpen")
 
 
-def save_gif_image(args, image_filename, original_image, sharpen_image):
+def save_gif_image(
+    args: argparse.Namespace,
+    image_filename: str,
+    original_image: Image.Image,
+    sharpen_image: Image.Image,
+) -> None:
     """Save the original and sharpen image."""
     image_file = Path(image_filename)
     new_filename = Path(

fotolab/subcommands/watermark.py

@@ -18,6 +18,7 @@
 import argparse
 import logging
 import math
+from pathlib import Path
 
 from PIL import Image, ImageColor, ImageDraw, ImageFont, ImageSequence
 
@@ -159,24 +160,47 @@ def run(args: argparse.Namespace) -> None:
     for image_filename in args.image_filenames:
         image = Image.open(image_filename)
         if image.format == "GIF":
-            watermark_gif_image(image, args)
+            watermark_gif_image(image, image_filename, args)
         else:
             watermarked_image = watermark_non_gif_image(image, args)
             save_image(args, watermarked_image, image_filename, "watermark")
 
 
-def watermark_gif_image(original_image: Image.Image, args: argparse.Namespace):
-    """Watermark the image."""
+def watermark_gif_image(
+    original_image: Image.Image, output_filename: str, args: argparse.Namespace
+) -> None:
+    """Watermark a GIF image.
+
+    Args:
+        original_image (Image.Image): The original GIF image
+        output_filename (str): Path to save the watermarked GIF
+        args (argparse.Namespace): Command line arguments
+
+    Returns:
+        None
+    """
     frames = []
     for frame in ImageSequence.Iterator(original_image):
         watermarked_frame = watermark_image(args, frame.convert("RGBA"))
         frames.append(watermarked_frame)
 
+    image_file = Path(output_filename)
+
+    if args.overwrite:
+        new_filename = original_image.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("%s image: %s", "watermark", new_filename.resolve())
+
     frames[0].save(
-        "foo.gif",
-        format="GIF",
-        append_images=frames[1:],
+        new_filename,
         save_all=True,
+        append_images=frames[1:],
         duration=original_image.info.get("duration", 100),
         loop=original_image.info.get("loop", 0),
         disposal=original_image.info.get("disposal", 2),
@@ -185,8 +209,16 @@ def watermark_gif_image(original_image: Image.Image, args: argparse.Namespace):
 
 def watermark_non_gif_image(
     original_image: Image.Image, args: argparse.Namespace
-):
-    """Watermark the image."""
+) -> Image.Image:
+    """Watermark a non-GIF image.
+
+    Args:
+        original_image (Image.Image): The original image
+        args (argparse.Namespace): Command line arguments
+
+    Returns:
+        Image.Image: The watermarked image
+    """
     return watermark_image(args, original_image)
 
 

{fotolab-0.27.0.dist-info → fotolab-0.27.2.dist-info}/METADATA

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

fotolab-0.27.2.dist-info/RECORD

@@ -0,0 +1,21 @@
+fotolab/__init__.py,sha256=Kr5BlzHH7WlWdyJr8dGmgyL7QSgpCWNRqjhn6jEspCk,2222
+fotolab/__main__.py,sha256=aboOURPs_snOXTEWYR0q8oq1UTY9e-NxCd1j33V0wHI,833
+fotolab/cli.py,sha256=a72F2y8OJo1pscwn-bSqiWVt4e6nhvvDWu9xdCO5p8A,4342
+fotolab/subcommands/__init__.py,sha256=l3DlIaJ3u3jGjnC1H1yV8LZ_nPqOLJ6gikD4BCaMAQ0,1129
+fotolab/subcommands/animate.py,sha256=MJQ-QXy35bXWpYmX3NcLN83n1NEDyAUOXcsyhLc2YjU,2970
+fotolab/subcommands/auto.py,sha256=ia-xegV1Z4HvYsbKgmTzf1NfNFdTDPWfZe7vQ1_90Ik,2425
+fotolab/subcommands/border.py,sha256=CPE1nZyBwgBRihvzccqktFHlRtLt2Tt2bxaStQj2M-0,3939
+fotolab/subcommands/contrast.py,sha256=jgauUBlvCdGa0t_TujBe5FYTmo8It0ped94T1xxB67w,2098
+fotolab/subcommands/env.py,sha256=QoxRvzZKgmoHTUxDV4QYhdChCpMWs5TbXFY_qIpIQpE,1469
+fotolab/subcommands/halftone.py,sha256=5Nx_deJUc4LhK9omqGZUQzFTDcDd9RkqjmCMnXRm1WA,4320
+fotolab/subcommands/info.py,sha256=V15NU2Edk4RwFbtmxJQmVFhF9QOn1PUTV8o3PxS8y8c,3310
+fotolab/subcommands/montage.py,sha256=LVJ8sqkPv46PlHv4pKDEHVIYfV67vDe7BvF7SVrM5-M,2143
+fotolab/subcommands/resize.py,sha256=d2Nlslzlvri9L2rqmE-HbmnLozylSk3U1Hi3DF1q3Mc,5023
+fotolab/subcommands/rotate.py,sha256=jk7W6HwCtZPQHekPpgUyYDrpZr_HkojEgaOAWwQF0kE,2154
+fotolab/subcommands/sharpen.py,sha256=DhnhH0GGfzk4GdhoI-ucsp6MEICdmeskLQo2H5D9hFs,3776
+fotolab/subcommands/watermark.py,sha256=jqkdi1dLZ8K6PWxqhFUhTogsNl0fBez7yGEs-N1gFm0,9022
+fotolab-0.27.2.dist-info/entry_points.txt,sha256=mvw7AY_yZkIyjAxPtHNed9X99NZeLnMxEeAfEJUbrCM,44
+fotolab-0.27.2.dist-info/LICENSE.md,sha256=tGtFDwxWTjuR9syrJoSv1Hiffd2u8Tu8cYClfrXS_YU,31956
+fotolab-0.27.2.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
+fotolab-0.27.2.dist-info/METADATA,sha256=6AFvwNEaWV-4TMqloJ8F-d75chxlH7U2QT49oZCqCyY,11114
+fotolab-0.27.2.dist-info/RECORD,,

fotolab-0.27.0.dist-info/RECORD

@@ -1,21 +0,0 @@
-fotolab/__init__.py,sha256=JLPVtm3Ac88Il9-YmaGXkWsbUdbl71qnktYpM3BKhvo,2172
-fotolab/__main__.py,sha256=aboOURPs_snOXTEWYR0q8oq1UTY9e-NxCd1j33V0wHI,833
-fotolab/cli.py,sha256=fwSpCFW64ACEhH9JZER9OqxULbBzm5eVtkch3E6wwv4,4365
-fotolab/subcommands/__init__.py,sha256=l3DlIaJ3u3jGjnC1H1yV8LZ_nPqOLJ6gikD4BCaMAQ0,1129
-fotolab/subcommands/animate.py,sha256=Zp0LPM7ktg6V2rIAP8pof2mmPAph_0O3TEySvg55-h8,2972
-fotolab/subcommands/auto.py,sha256=p_e1f4mcrIFLqBXMNKvPQRDkNrAlK7FR6sdR5NAR0t8,2427
-fotolab/subcommands/border.py,sha256=SwxGWzKxQACZH0u2z2jIvuqdx_OvXKDaCVptP5K7D7c,3941
-fotolab/subcommands/contrast.py,sha256=8uPCd5xI-aUsL7rjdEPmfSskdzMwM-1tv0eRRONkW2M,2100
-fotolab/subcommands/env.py,sha256=JamU3a2xWPbwlAj5iThHs58KYkLmjpUphZfTQODBp_4,1471
-fotolab/subcommands/halftone.py,sha256=Xlbj3nVzqBXLzfemhF66nWV9U-PJHcG1Q2m2HiDhjI0,4322
-fotolab/subcommands/info.py,sha256=DANbfBNy2SzFfeE4KqOViAZkaME6xujfZvJTHIaZyCY,3312
-fotolab/subcommands/montage.py,sha256=TrMcYIeuzNHev-QGbBCA3htBfDjxPomtMXNtlKGBRmw,2145
-fotolab/subcommands/resize.py,sha256=d2Nlslzlvri9L2rqmE-HbmnLozylSk3U1Hi3DF1q3Mc,5023
-fotolab/subcommands/rotate.py,sha256=wRWRG4PMLmw5kOi6NsLsNkh0Aw2WaBAdScWfBwGjDeM,2156
-fotolab/subcommands/sharpen.py,sha256=xz8RW8cRPM4eUvJTO1Stsur3G67DBftVGza8kF5j2Pc,3700
-fotolab/subcommands/watermark.py,sha256=a4GEVZG64B1giUigweXvDGS-Y7PeBXFyyrsHuko6ClQ,8124
-fotolab-0.27.0.dist-info/entry_points.txt,sha256=mvw7AY_yZkIyjAxPtHNed9X99NZeLnMxEeAfEJUbrCM,44
-fotolab-0.27.0.dist-info/LICENSE.md,sha256=tGtFDwxWTjuR9syrJoSv1Hiffd2u8Tu8cYClfrXS_YU,31956
-fotolab-0.27.0.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
-fotolab-0.27.0.dist-info/METADATA,sha256=MmQBQofr3eMnOji4Vx9jGooDml3k_5GCqS3ak3I0wto,11114
-fotolab-0.27.0.dist-info/RECORD,,