fotolab 0.28.5__py3-none-any.whl → 0.28.6__py3-none-any.whl

fotolab/__init__.py

@@ -17,13 +17,14 @@
 
 import argparse
 import logging
+import os
 import subprocess
 import sys
 from pathlib import Path
 
 from PIL import Image
 
-__version__ = "0.28.5"
+__version__ = "0.28.6"
 
 log = logging.getLogger(__name__)
 
@@ -98,10 +99,9 @@ def _open_image(filename):
             subprocess.call(["xdg-open", filename])
         elif sys.platform == "darwin":
             subprocess.call(["open", filename])
-        elif sys.platform == "windows":
-            with subprocess.Popen(["open", filename], shell=True) as proc:
-                proc.wait()
+        elif sys.platform == "win32":
+            os.startfile(filename)
         log.info("open image: %s", filename.resolve())
 
-    except OSError as error:
+    except (OSError, FileNotFoundError) as error:
         log.error("Error opening image: %s -> %s", filename, error)

fotolab/cli.py

@@ -1,17 +1,17 @@
 # Copyright (C) 2024,2025 Kian-Meng Ang
 
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU 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 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/>.
+# 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/>.
 
 """A console program to manipulate photos.
 

fotolab/subcommands/watermark.py

@@ -19,23 +19,24 @@ import argparse
 import logging
 import math
 from pathlib import Path
+from typing import Tuple
 
 from PIL import Image, ImageColor, ImageDraw, ImageFont, ImageSequence
 
 from fotolab import save_image
 from fotolab.subcommands.info import camera_metadata
 
-log = logging.getLogger(__name__)
+log: logging.Logger = logging.getLogger(__name__)
 
-FONT_SIZE_ASPECT_RATIO = 12 / 600
-FONT_PADDING_ASPECT_RATIO = 15 / 600
-FONT_OUTLINE_WIDTH_ASPECT_RATIO = 2 / 600
-POSITIONS = ["top-left", "top-right", "bottom-left", "bottom-right"]
+FONT_SIZE_ASPECT_RATIO: float = 12 / 600
+FONT_PADDING_ASPECT_RATIO: float = 15 / 600
+FONT_OUTLINE_WIDTH_ASPECT_RATIO: float = 2 / 600
+POSITIONS: list[str] = ["top-left", "top-right", "bottom-left", "bottom-right"]
 
 
-def build_subparser(subparsers) -> None:
+def build_subparser(subparsers: argparse._SubParsersAction) -> None:
     """Build the subparser."""
-    watermark_parser = subparsers.add_parser(
+    watermark_parser: argparse.ArgumentParser = subparsers.add_parser(
         "watermark", help="watermark an image"
     )
 
@@ -175,11 +176,13 @@ def run(args: argparse.Namespace) -> None:
     log.debug(args)
 
     for image_filename in args.image_filenames:
-        image = Image.open(image_filename)
+        image: Image.Image = Image.open(image_filename)
         if image.format == "GIF":
             watermark_gif_image(image, image_filename, args)
         else:
-            watermarked_image = watermark_non_gif_image(image, args)
+            watermarked_image: Image.Image = watermark_non_gif_image(
+                image, args
+            )
             save_image(args, watermarked_image, image_filename, "watermark")
 
 
@@ -196,15 +199,17 @@ def watermark_gif_image(
     Returns:
         None
     """
-    frames = []
+    frames: list[Image.Image] = []
     for frame in ImageSequence.Iterator(original_image):
-        watermarked_frame = watermark_image(args, frame.convert("RGBA"))
+        watermarked_frame: Image.Image = watermark_image(
+            args, frame.convert("RGBA")
+        )
         frames.append(watermarked_frame)
 
-    image_file = Path(output_filename)
+    image_file: Path = Path(output_filename)
 
     if args.overwrite:
-        new_filename = original_image.with_name(image_file.name)
+        new_filename: Path = image_file.with_name(image_file.name)
     else:
         new_filename = Path(
             args.output_dir,
@@ -243,16 +248,18 @@ def watermark_image(
     args: argparse.Namespace, original_image: Image.Image
 ) -> Image.Image:
     """Watermark an image."""
-    watermarked_image = original_image.copy()
-    draw = ImageDraw.Draw(watermarked_image)
+    watermarked_image: Image.Image = original_image.copy()
+    draw: ImageDraw.ImageDraw = ImageDraw.Draw(watermarked_image)
 
-    font = ImageFont.load_default(calc_font_size(original_image, args))
+    font: ImageFont.FreeTypeFont = ImageFont.load_default(
+        calc_font_size(original_image, args)
+    )
     log.debug("default font: %s", " ".join(font.getname()))
 
-    text = prepare_text(args, original_image)
+    text: str = prepare_text(args, original_image)
     (left, top, right, bottom) = draw.textbbox(xy=(0, 0), text=text, font=font)
-    text_width = right - left
-    text_height = bottom - top
+    text_width: int = right - left
+    text_height: int = bottom - top
     (position_x, position_y) = calc_position(
         watermarked_image,
         text_width,
@@ -272,9 +279,9 @@ def watermark_image(
     return watermarked_image
 
 
-def prepare_text(args, image) -> str:
+def prepare_text(args: argparse.Namespace, image: Image.Image) -> str:
     """Prepare the watermark text."""
-    text = args.text
+    text: str = args.text
     if args.camera and camera_metadata(image):
         text = camera_metadata(image)
 
@@ -284,10 +291,10 @@ def prepare_text(args, image) -> str:
     return text
 
 
-def calc_font_size(image, args) -> int:
+def calc_font_size(image: Image.Image, args: argparse.Namespace) -> int:
     """Calculate the font size based on the width of the image."""
     width, _height = image.size
-    new_font_size = args.font_size
+    new_font_size: int = args.font_size
     if width > 600:
         new_font_size = math.floor(FONT_SIZE_ASPECT_RATIO * width)
 
@@ -295,10 +302,12 @@ def calc_font_size(image, args) -> int:
     return new_font_size
 
 
-def calc_font_outline_width(image, args) -> int:
+def calc_font_outline_width(
+    image: Image.Image, args: argparse.Namespace
+) -> int:
     """Calculate the font padding based on the width of the image."""
     width, _height = image.size
-    new_font_outline_width = args.outline_width
+    new_font_outline_width: int = args.outline_width
     if width > 600:
         new_font_outline_width = math.floor(
             FONT_OUTLINE_WIDTH_ASPECT_RATIO * width
@@ -308,10 +317,10 @@ def calc_font_outline_width(image, args) -> int:
     return new_font_outline_width
 
 
-def calc_padding(image, args) -> int:
+def calc_padding(image: Image.Image, args: argparse.Namespace) -> int:
     """Calculate the font padding based on the width of the image."""
     width, _height = image.size
-    new_padding = args.padding
+    new_padding: int = args.padding
     if width > 600:
         new_padding = math.floor(FONT_PADDING_ASPECT_RATIO * width)
 
@@ -319,9 +328,15 @@ def calc_padding(image, args) -> int:
     return new_padding
 
 
-def calc_position(image, text_width, text_height, position, padding) -> tuple:
+def calc_position(
+    image: Image.Image,
+    text_width: int,
+    text_height: int,
+    position: str,
+    padding: int,
+) -> Tuple[int, int]:
     """Calculate the boundary coordinates of the watermark text."""
-    positions = {
+    positions: dict[str, Tuple[int, int]] = {
         "top-left": (padding, padding),
         "top-right": (image.width - text_width - padding, padding),
         "bottom-left": (padding, image.height - text_height - padding),

{fotolab-0.28.5.dist-info → fotolab-0.28.6.dist-info}/METADATA

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

{fotolab-0.28.5.dist-info → fotolab-0.28.6.dist-info}/RECORD

@@ -1,6 +1,6 @@
-fotolab/__init__.py,sha256=qytheZnIjS5g0aUnq6-ChflsFcLasoz97T7GReoaeeQ,3301
+fotolab/__init__.py,sha256=yiRE-ZW8LgYnZAJ7wKNY_XdaaPC9IbHRMnlRKLYjsdA,3262
 fotolab/__main__.py,sha256=aboOURPs_snOXTEWYR0q8oq1UTY9e-NxCd1j33V0wHI,833
-fotolab/cli.py,sha256=fIApD9C4Vkn-u4CejOFTboSV5f-Ks9vBGxeb-_ca-Nw,3935
+fotolab/cli.py,sha256=ffT3CbMN37Qehw4l7YvwUbPFY-SezLLn4Xthi0ejOmk,3956
 fotolab/subcommands/__init__.py,sha256=l3DlIaJ3u3jGjnC1H1yV8LZ_nPqOLJ6gikD4BCaMAQ0,1129
 fotolab/subcommands/animate.py,sha256=OcS6Q6JM1TW6HF0dSgBsV9mpEGwDMcJlQssupkf0_ZA,3393
 fotolab/subcommands/auto.py,sha256=ia-xegV1Z4HvYsbKgmTzf1NfNFdTDPWfZe7vQ1_90Ik,2425
@@ -13,9 +13,9 @@ fotolab/subcommands/montage.py,sha256=d_3EcyRSFS8fKkczlHO8IRP-mrKhQUtkQndjfd0MKs
 fotolab/subcommands/resize.py,sha256=UOb2rg_5ArRj0gxPTDOww_ix3tqJRC0W5b_S-Lt1G4w,5444
 fotolab/subcommands/rotate.py,sha256=uBFjHyjiBSQLtrtH1p9myODIHUDr1gkL4PpU-6Y1Ofo,2575
 fotolab/subcommands/sharpen.py,sha256=YNho2IPbc-lPvSy3Bsjehc2JOEy27LPqFSGRULs9MyY,3492
-fotolab/subcommands/watermark.py,sha256=A_dUy_yf9wPHUexB9aIicFIS-BpWrjjfI8Hr4WCCBoc,9449
-fotolab-0.28.5.dist-info/entry_points.txt,sha256=mvw7AY_yZkIyjAxPtHNed9X99NZeLnMxEeAfEJUbrCM,44
-fotolab-0.28.5.dist-info/LICENSE.md,sha256=tGtFDwxWTjuR9syrJoSv1Hiffd2u8Tu8cYClfrXS_YU,31956
-fotolab-0.28.5.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
-fotolab-0.28.5.dist-info/METADATA,sha256=0SIqAZceh2lv4iQkVoJu-7nRab99nDecITkquNUXFuU,12970
-fotolab-0.28.5.dist-info/RECORD,,
+fotolab/subcommands/watermark.py,sha256=iEuek0BM2PJlGMLq8VZhHxaQ8BInuN2_mvssA7Dhgy8,10032
+fotolab-0.28.6.dist-info/entry_points.txt,sha256=mvw7AY_yZkIyjAxPtHNed9X99NZeLnMxEeAfEJUbrCM,44
+fotolab-0.28.6.dist-info/LICENSE.md,sha256=tGtFDwxWTjuR9syrJoSv1Hiffd2u8Tu8cYClfrXS_YU,31956
+fotolab-0.28.6.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
+fotolab-0.28.6.dist-info/METADATA,sha256=3E5duvvv00UeRQoiWsueL2cdsEj1l17jdkwxY7Nal68,12970
+fotolab-0.28.6.dist-info/RECORD,,