fotolab 0.33.1__py3-none-any.whl → 0.34.0__py3-none-any.whl

fotolab/__init__.py

@@ -15,16 +15,17 @@
 
 """A console program that manipulate images."""
 
+from importlib import metadata
+from pathlib import Path
 import argparse
 import logging
 import os
 import subprocess
 import sys
-from pathlib import Path
 
 from PIL import Image
 
-__version__ = "0.31.15"
+__version__ = metadata.version("fotolab")
 
 log = logging.getLogger(__name__)
 
@@ -45,12 +46,10 @@ def save_gif_image(
         "loop": 0,
         "optimize": True,
     }
-    _save_image_with_options(
-        args, original_image, image_filepath, subcommand, **gif_kwargs
-    )
+    save_image(args, original_image, image_filepath, subcommand, **gif_kwargs)
 
 
-def _save_image_with_options(
+def save_image(
     args: argparse.Namespace,
     image: Image.Image,
     output_filepath: Path,
@@ -71,21 +70,7 @@ def _save_image_with_options(
     image.save(new_filename, **kwargs)
 
     if args.open:
-        _open_image(new_filename)
-
-
-def save_image(
-    args: argparse.Namespace,
-    new_image: Image.Image,
-    output_filepath: Path,
-    subcommand: str,
-) -> None:
-    """Save image after image operation.
-
-    Returns:
-        None
-    """
-    _save_image_with_options(args, new_image, output_filepath, subcommand)
+        open_image(new_filename)
 
 
 def _get_output_filename(
@@ -100,7 +85,7 @@ def _get_output_filename(
     return output_dir / image_file.with_name(f"{subcommand}_{image_file.name}")
 
 
-def _open_image(filename: Path):
+def open_image(filename: Path):
     """Open generated image using default program."""
     try:
         if sys.platform == "linux":

fotolab/__main__.py

@@ -19,4 +19,3 @@ from fotolab.cli import main
 
 if __name__ == "__main__":
     main()
-    raise SystemExit()

fotolab/cli.py

@@ -23,7 +23,9 @@ issues: https://github.com/kianmeng/fotolab/issues
 import argparse
 import logging
 import sys
-from typing import Optional, Sequence
+from typing import Sequence
+
+from PIL import Image
 
 import fotolab.subcommands
 from fotolab import __version__
@@ -122,7 +124,7 @@ def build_parser() -> argparse.ArgumentParser:
     return parser
 
 
-def main(args: Optional[Sequence[str]] = None) -> None:
+def main(args: Sequence[str] | None = None) -> None:
     """Run the main program flow."""
     args = args or sys.argv[1:]
     log.debug(args)
@@ -150,7 +152,11 @@ def main(args: Optional[Sequence[str]] = None) -> None:
         else:
             parser.print_help(sys.stderr)
 
-    except Exception as error:
+    except (
+        FileNotFoundError,
+        ValueError,
+        Image.UnidentifiedImageError,
+    ) as error:
         log.error(
             "error: %s",
             getattr(error, "message", str(error)),

fotolab/subcommands/animate.py

@@ -22,7 +22,7 @@ from contextlib import ExitStack
 
 from PIL import Image
 
-from fotolab import _open_image
+from fotolab import open_image
 
 log = logging.getLogger(__name__)
 
@@ -205,4 +205,4 @@ def run(args: argparse.Namespace) -> None:
         main_frame.save(new_filename, **save_kwargs)
 
     if args.open:
-        _open_image(new_filename)
+        open_image(new_filename)

fotolab/subcommands/contrast.py

@@ -104,8 +104,24 @@ def run(args: argparse.Namespace) -> None:
 
     for image_filename in args.image_filenames:
         original_image = Image.open(image_filename)
-        contrast_image = ImageOps.autocontrast(
-            original_image, cutoff=args.cutoff
-        )
+
+        if original_image.mode == "RGBA":
+            # Split the image into RGB and Alpha channels
+            rgb_image = original_image.convert("RGB")
+            alpha_channel = original_image.getchannel("A")
+
+            # Apply autocontrast to the RGB part
+            contrasted_rgb = ImageOps.autocontrast(
+                rgb_image, cutoff=args.cutoff
+            )
+
+            # Merge the contrasted RGB part with the original Alpha channel
+            contrasted_rgb.putalpha(alpha_channel)
+            contrast_image = contrasted_rgb
+        else:
+            # For other modes (like RGB, L, etc.), apply autocontrast directly
+            contrast_image = ImageOps.autocontrast(
+                original_image, cutoff=args.cutoff
+            )
 
         save_image(args, contrast_image, Path(image_filename), "contrast")

fotolab/subcommands/halftone.py

@@ -19,7 +19,7 @@ import argparse
 import logging
 import math
 from pathlib import Path
-from typing import NamedTuple, Union
+from typing import NamedTuple
 
 from PIL import Image, ImageDraw
 
@@ -200,7 +200,7 @@ def create_halftone_image(
         Image.Image: The halftone converted image
     """
     output_mode: str
-    fill_color_black: Union[int, tuple[int, int, int]]
+    fill_color_black: int | tuple[int, int, int]
     fill_color_dot_for_grayscale: int
 
     if grayscale:

{fotolab-0.33.1.dist-info → fotolab-0.34.0.dist-info}/METADATA

@@ -1,6 +1,7 @@
 Metadata-Version: 2.4
 Name: fotolab
-Version: 0.33.1
+Version: 0.34.0
+Summary: A console program to manipulate photos.
 Author-email: Kian-Meng Ang <kianmeng@cpan.org>
 License-Expression: AGPL-3.0-or-later
 Project-URL: Changelog, https://github.com/kianmeng/fotolab/blob/master/CHANGELOG.md
@@ -10,13 +11,13 @@ Keywords: photography,photo
 Classifier: Development Status :: 3 - Alpha
 Classifier: Environment :: Console
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Programming Language :: Python
-Requires-Python: >=3.9
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE.md
 Requires-Dist: pillow

{fotolab-0.33.1.dist-info → fotolab-0.34.0.dist-info}/RECORD

@@ -1,22 +1,22 @@
-fotolab/__init__.py,sha256=Wb9aauJu-aXInocnVSuzUwpWoMSC6moNLQ1dLORbEgQ,3442
-fotolab/__main__.py,sha256=aboOURPs_snOXTEWYR0q8oq1UTY9e-NxCd1j33V0wHI,833
-fotolab/cli.py,sha256=oFiQXmsu3wIsM_DpZnL4B94sAoB62L16Am-cjxGmosY,4406
+fotolab/__init__.py,sha256=0UZ6OZFCRkc2Fwc4LT1UtE9JdK3uq0uL8fSSVSOuVyo,3161
+fotolab/__main__.py,sha256=Wk11t_zKs3wJ-okM3yv7Mtj1pRwQZu3NCmpteBwn4Hs,810
+fotolab/cli.py,sha256=Ebx6RQM5Dr8PsIqQ4NOySxnGMzGGI0U7CTawYfHROlk,4499
 fotolab/subcommands/__init__.py,sha256=l3DlIaJ3u3jGjnC1H1yV8LZ_nPqOLJ6gikD4BCaMAQ0,1129
-fotolab/subcommands/animate.py,sha256=iEor831HVQtQ04Y2-kHxnU4--BfS75mXggVIblxrO6g,5881
+fotolab/subcommands/animate.py,sha256=pyoMfRtE-07EhFni2yS8xEoRV9up5T4VcF4Qw8me4Hs,5879
 fotolab/subcommands/auto.py,sha256=gkpZ15JwzSlQPYSqGSeeGu0SLKps3A2cEn1dYpyQEyk,3584
 fotolab/subcommands/border.py,sha256=TSr1rqAPWe1ZThkZan_WiMQdSTuua2YPXg6fYcvFitQ,4715
-fotolab/subcommands/contrast.py,sha256=1RD3B-7NTIReMvACmb_FQtLxx_RZdmpqKmvsEuYjy2Y,3058
+fotolab/subcommands/contrast.py,sha256=yoIcJbqz3S0kzMOD39MVIcLMj2GTtVN3uPI8wsoHysQ,3711
 fotolab/subcommands/env.py,sha256=QoxRvzZKgmoHTUxDV4QYhdChCpMWs5TbXFY_qIpIQpE,1469
-fotolab/subcommands/halftone.py,sha256=56RRkyIhCyc6MPBujV2PIbuR9HobuFhqVQaq58A5ivQ,6781
+fotolab/subcommands/halftone.py,sha256=a0rZWE6elXhMSCyE-w_FKEMoDGK9Afs9oF3yT09ZhcA,6768
 fotolab/subcommands/info.py,sha256=H3voMi67cKoHT2Mu4RUNQBPdb_MspetPjhOvy-YyNnE,3563
 fotolab/subcommands/montage.py,sha256=ax-TG5FixBRFHPGkVTq8kOtRL900K6nujeBYHZ0yBAE,2622
 fotolab/subcommands/resize.py,sha256=d1-_xoTB8Vf62bm7H_9MfXrMaJhlzLiUbePgTdYzaKs,5816
 fotolab/subcommands/rotate.py,sha256=-yZ7pNW7PDOPBWbKPDut9z8bBe1NocfVBV_6V6tqq-4,2945
 fotolab/subcommands/sharpen.py,sha256=vGBJHHHUaQ2_SHS-E1mHfNVIfnnNYcCk5ritajWTik8,3594
 fotolab/subcommands/watermark.py,sha256=BkUa1tH86Ii_u03ypj9Tm0u9v7s9y9Jiz3aLpjmFDb8,11355
-fotolab-0.33.1.dist-info/licenses/LICENSE.md,sha256=tGtFDwxWTjuR9syrJoSv1Hiffd2u8Tu8cYClfrXS_YU,31956
-fotolab-0.33.1.dist-info/METADATA,sha256=ZtAGsATHK5aXwOeCLN2x_nTYrIq-O1duinmONnfCHxo,14765
-fotolab-0.33.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-fotolab-0.33.1.dist-info/entry_points.txt,sha256=0e1go9plFpqj5FP-OpV2acxTAx3ViI59PMXuhejvgcQ,45
-fotolab-0.33.1.dist-info/top_level.txt,sha256=XUJ3gdpsbjohoZCLdVlbQrxAUDkbQg7WwGQG2DaN0t4,8
-fotolab-0.33.1.dist-info/RECORD,,
+fotolab-0.34.0.dist-info/licenses/LICENSE.md,sha256=tGtFDwxWTjuR9syrJoSv1Hiffd2u8Tu8cYClfrXS_YU,31956
+fotolab-0.34.0.dist-info/METADATA,sha256=AFHeSlX8rf-ueN9HHsJ9nBzfu_Nw2UoeGSJaqsFDBrc,14816
+fotolab-0.34.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+fotolab-0.34.0.dist-info/entry_points.txt,sha256=0e1go9plFpqj5FP-OpV2acxTAx3ViI59PMXuhejvgcQ,45
+fotolab-0.34.0.dist-info/top_level.txt,sha256=XUJ3gdpsbjohoZCLdVlbQrxAUDkbQg7WwGQG2DaN0t4,8
+fotolab-0.34.0.dist-info/RECORD,,