fotolab 0.24.0__py3-none-any.whl → 0.26.0__py3-none-any.whl

fotolab/__init__.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2024 Kian-Meng Ang
+# 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 Affero General Public License as published by the Free
@@ -16,12 +16,11 @@
 """A console program that manipulate images."""
 
 import logging
-import os
 import subprocess
 import sys
 from pathlib import Path
 
-__version__ = "0.24.0"
+__version__ = "0.26.0"
 
 log = logging.getLogger(__name__)
 
@@ -57,11 +56,14 @@ def save_image(args, new_image, output_filename, subcommand):
 
 def _open_image(filename):
     """Open generated image using default program."""
-    if sys.platform == "linux":
-        subprocess.call(["xdg-open", filename])
-    elif sys.platform == "darwin":
-        subprocess.call(["open", filename])
-    elif sys.platform == "windows":
-        os.startfile(filename)
-
-    log.info("open image: %s", filename.resolve())
+    platform_open_func = {
+        "linux": subprocess.call(["xdg-open", filename]),
+        "darwin": subprocess.call(["open", filename]),
+        "windows": subprocess.Popen(["start", filename]),
+    }
+    try:
+        platform_open_func[sys.platform]
+    except KeyError:
+        print(f"Unsupported platform: {sys.platform}")
+    else:
+        log.info("open image: %s", filename.resolve())

fotolab/cli.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2024 Kian-Meng Ang
+# 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

fotolab/subcommands/__init__.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2024 Kian-Meng Ang
+# 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 Affero General Public License as published by the Free

fotolab/subcommands/animate.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2024 Kian-Meng Ang
+# 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 Affero General Public License as published by the Free

fotolab/subcommands/auto.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2024 Kian-Meng Ang
+# 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 Affero General Public License as published by the Free
@@ -70,6 +70,7 @@ def run(args: argparse.Namespace) -> None:
         "camera": False,
         "canvas": False,
         "lowercase": False,
+        "before_after": False,
     }
     combined_args = argparse.Namespace(**vars(args), **extra_args)
     combined_args.overwrite = True

fotolab/subcommands/border.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2024 Kian-Meng Ang
+# 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 Affero General Public License as published by the Free
@@ -115,25 +115,28 @@ def run(args: argparse.Namespace) -> None:
     for image_filename in args.image_filenames:
         original_image = Image.open(image_filename)
 
-        if (
-            args.width_left
-            or args.width_top
-            or args.width_right
-            or args.width_bottom
-        ):
-            border = (
-                int(args.width_left),
-                int(args.width_top),
-                int(args.width_right),
-                int(args.width_bottom),
-            )
-        else:
-            border = args.width
-
+        border = get_border(args)
         bordered_image = ImageOps.expand(
             original_image,
             border=border,
             fill=ImageColor.getrgb(args.color),
         )
 
-        save_image(args, bordered_image, image_filename, "watermark")
+        save_image(args, bordered_image, image_filename, "border")
+
+
+def get_border(args: argparse.Namespace) -> tuple:
+    """Calculate the border."""
+    if (
+        args.width_left
+        or args.width_top
+        or args.width_right
+        or args.width_bottom
+    ):
+        return (
+            int(args.width_left),
+            int(args.width_top),
+            int(args.width_right),
+            int(args.width_bottom),
+        )
+    return args.width

fotolab/subcommands/contrast.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2024 Kian-Meng Ang
+# 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 Affero General Public License as published by the Free

fotolab/subcommands/env.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2024 Kian-Meng Ang
+# 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 Affero General Public License as published by the Free

fotolab/subcommands/halftone.py

@@ -0,0 +1,93 @@
+# 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 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/>.
+
+"""Halftone subcommand."""
+
+import argparse
+import logging
+import math
+
+from PIL import Image, ImageDraw
+
+from fotolab import save_image
+
+log = logging.getLogger(__name__)
+
+
+def build_subparser(subparsers) -> None:
+    """Build the subparser."""
+    halftone_parser = subparsers.add_parser(
+        "halftone", help="halftone an image"
+    )
+
+    halftone_parser.set_defaults(func=run)
+
+    halftone_parser.add_argument(
+        dest="image_filenames",
+        help="set the image filename",
+        nargs="+",
+        type=str,
+        default=None,
+        metavar="IMAGE_FILENAMES",
+    )
+
+
+def run(args: argparse.Namespace) -> None:
+    """Run halftone subcommand.
+
+    Args:
+        config (argparse.Namespace): Config from command line arguments
+
+    Returns:
+        None
+    """
+    log.debug(args)
+
+    for image_filename in args.image_filenames:
+        original_image = Image.open(image_filename)
+        grayscale_image = original_image.convert("L")
+        width, height = original_image.size
+
+        halftone_image = Image.new("L", (width, height), "black")
+        draw = ImageDraw.Draw(halftone_image)
+
+        # modified from the circular halftone effect processing.py example from
+        # https://tabreturn.github.io/code/processing/python/2019/02/09/processing.py_in_ten_lessons-6.3-_halftones.html
+        coltotal = 50
+        cellsize = width / coltotal
+        rowtotal = math.ceil(height / cellsize)
+
+        col = 0
+        row = 0
+
+        for _ in range(int(coltotal * rowtotal)):
+            x = int(col * cellsize)
+            y = int(row * cellsize)
+            col += 1
+
+            if col >= coltotal:
+                col = 0
+                row += 1
+
+            x = int(x + cellsize / 2)
+            y = int(y + cellsize / 2)
+
+            brightness = grayscale_image.getpixel((x, y))
+            amp = 10 * brightness / 200
+            draw.ellipse(
+                [x - amp / 2, y - amp / 2, x + amp / 2, y + amp / 2], fill=255
+            )
+
+        save_image(args, halftone_image, image_filename, "halftone")

fotolab/subcommands/info.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2024 Kian-Meng Ang
+# 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 Affero General Public License as published by the Free
@@ -97,7 +97,6 @@ def run(args: argparse.Namespace) -> None:
 
 def extract_exif_tags(image: Image.Image, sort: bool = False) -> dict:
     """Extract Exif metadata from image."""
-    print(type(image))
     exif = image._getexif()
     log.debug(exif)
 

fotolab/subcommands/montage.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2024 Kian-Meng Ang
+# 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 Affero General Public License as published by the Free
@@ -63,9 +63,9 @@ def run(args: argparse.Namespace) -> None:
     montaged_image = Image.new("RGB", (total_width, total_height))
 
     x_offset = 0
-    for img in images:
-        montaged_image.paste(img, (x_offset, 0))
-        x_offset += img.width
+    for image in images:
+        montaged_image.paste(image, (x_offset, 0))
+        x_offset += image.width
 
     output_image_filename = args.image_filenames[0].name
     save_image(args, montaged_image, output_image_filename, "montage")

fotolab/subcommands/resize.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2024 Kian-Meng Ang
+# 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 Affero General Public License as published by the Free

fotolab/subcommands/rotate.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2024 Kian-Meng Ang
+# 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 Affero General Public License as published by the Free

fotolab/subcommands/sharpen.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2024 Kian-Meng Ang
+# 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 Affero General Public License as published by the Free
@@ -17,10 +17,11 @@
 
 import argparse
 import logging
+from pathlib import Path
 
 from PIL import Image, ImageFilter
 
-from fotolab import save_image
+from fotolab import _open_image, save_image
 
 log = logging.getLogger(__name__)
 
@@ -76,6 +77,15 @@ def build_subparser(subparsers) -> None:
         metavar="THRESHOLD",
     )
 
+    sharpen_parser.add_argument(
+        "-ba",
+        "--before-after",
+        default=False,
+        action="store_true",
+        dest="before_after",
+        help="generate a GIF showing before and after changes",
+    )
+
 
 def run(args: argparse.Namespace) -> None:
     """Run sharpen subcommand.
@@ -95,4 +105,31 @@ def run(args: argparse.Namespace) -> None:
                 args.radius, percent=args.percent, threshold=args.threshold
             )
         )
-        save_image(args, sharpen_image, image_filename, "sharpen")
+        if args.before_after:
+            save_gif_image(args, image_filename, original_image, sharpen_image)
+        else:
+            save_image(args, sharpen_image, image_filename, "sharpen")
+
+
+def save_gif_image(args, image_filename, original_image, sharpen_image):
+    """Save the original and sharpen image."""
+    image_file = Path(image_filename)
+    new_filename = Path(
+        args.output_dir,
+        image_file.with_name(f"sharpen_gif_{image_file.stem}.gif"),
+    )
+    new_filename.parent.mkdir(parents=True, exist_ok=True)
+
+    log.info("sharpen gif image: %s", new_filename)
+    original_image.save(
+        new_filename,
+        format="gif",
+        append_images=[sharpen_image],
+        save_all=True,
+        duration=2500,
+        loop=0,
+        optimize=True,
+    )
+
+    if args.open:
+        _open_image(new_filename)

fotolab/subcommands/watermark.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2024 Kian-Meng Ang
+# 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 Affero General Public License as published by the Free

{fotolab-0.24.0.dist-info → fotolab-0.26.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fotolab
-Version: 0.24.0
+Version: 0.26.0
 Summary: A console program that manipulate images.
 Keywords: photography,photo
 Author-email: Kian-Meng Ang <kianmeng@cpan.org>
@@ -300,7 +300,7 @@ fotolab sharpen -h
 <!--help-sharpen !-->
 
 ```console
-usage: fotolab sharpen [-h] [-r RADIUS] [-p PERCENT] [-t THRESHOLD]
+usage: fotolab sharpen [-h] [-r RADIUS] [-p PERCENT] [-t THRESHOLD] [-ba]
                        IMAGE_FILENAMES [IMAGE_FILENAMES ...]
 
 positional arguments:
@@ -315,6 +315,7 @@ options:
   -t, --threshold THRESHOLD
                         set the minimum brightness changed to be sharpened
                         (default: '3')
+  -ba, --before-after   generate a GIF showing before and after changes
 ```
 
 <!--help-sharpen !-->
@@ -385,7 +386,7 @@ options:
 
 ## Copyright and License
 
-Copyright (C) 2024 Kian-Meng Ang
+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 Affero General Public License as published by the Free

fotolab-0.26.0.dist-info/RECORD

@@ -0,0 +1,21 @@
+fotolab/__init__.py,sha256=FdS_YCS6GmyfP-phGNKZHFHmHb-2iPRgPDb-VNHm9DI,2173
+fotolab/__main__.py,sha256=aboOURPs_snOXTEWYR0q8oq1UTY9e-NxCd1j33V0wHI,833
+fotolab/cli.py,sha256=9rhS-yhX1nE_zKBfR05QyEt-S7Y43mIP0yUQA6bsgV8,4326
+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=v5rdLb7Yq1kQI0MTSfVb0iroBroTV8oxOk-jMLB2who,3637
+fotolab/subcommands/contrast.py,sha256=8uPCd5xI-aUsL7rjdEPmfSskdzMwM-1tv0eRRONkW2M,2100
+fotolab/subcommands/env.py,sha256=JamU3a2xWPbwlAj5iThHs58KYkLmjpUphZfTQODBp_4,1471
+fotolab/subcommands/halftone.py,sha256=RNEdXqRbBK7-OnBJzVb1Jglr4uaq5RsgVCy9hDoo7S0,2748
+fotolab/subcommands/info.py,sha256=DANbfBNy2SzFfeE4KqOViAZkaME6xujfZvJTHIaZyCY,3312
+fotolab/subcommands/montage.py,sha256=hhRH9LsWxXa86_qtVDKGvk--Eap2nP17OTy81kq3Xjk,2048
+fotolab/subcommands/resize.py,sha256=d2Nlslzlvri9L2rqmE-HbmnLozylSk3U1Hi3DF1q3Mc,5023
+fotolab/subcommands/rotate.py,sha256=vhtiAD5r0i5humpjyAbkoxh2nQsSuBYUD-TgcECwUwE,2149
+fotolab/subcommands/sharpen.py,sha256=xz8RW8cRPM4eUvJTO1Stsur3G67DBftVGza8kF5j2Pc,3700
+fotolab/subcommands/watermark.py,sha256=zKIFMreqSRaTD89JPjtLZljfTw-5ZkbZNBAyLeFveGw,8905
+fotolab-0.26.0.dist-info/entry_points.txt,sha256=mvw7AY_yZkIyjAxPtHNed9X99NZeLnMxEeAfEJUbrCM,44
+fotolab-0.26.0.dist-info/LICENSE.md,sha256=tGtFDwxWTjuR9syrJoSv1Hiffd2u8Tu8cYClfrXS_YU,31956
+fotolab-0.26.0.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
+fotolab-0.26.0.dist-info/METADATA,sha256=CEe3EMlbCTfCuvSe_5MbbQueLiVl5XxI0NP2FTpfY3k,11058
+fotolab-0.26.0.dist-info/RECORD,,

fotolab-0.24.0.dist-info/RECORD

@@ -1,20 +0,0 @@
-fotolab/__init__.py,sha256=xMgr0qY4XC9waGeCumA3xk1SjuwsIC0tuMY3k_u0suU,2061
-fotolab/__main__.py,sha256=aboOURPs_snOXTEWYR0q8oq1UTY9e-NxCd1j33V0wHI,833
-fotolab/cli.py,sha256=vUS7eVcwEy2CWn4g5wTujLXS_GAzug9Np7j8-sM6GHU,4321
-fotolab/subcommands/__init__.py,sha256=5ncuu_LxuWphjNohm32Z_lD0FmJPWrAynBzeza0lyCU,1124
-fotolab/subcommands/animate.py,sha256=ejimhTozo9DN7BbqqcV4x8zLnanZRKq1pxBBFeOdr6Q,2967
-fotolab/subcommands/auto.py,sha256=ljvC0Z88Dva18YHyn3auAjlvVHqGrxsky-HGXwaIMZo,2391
-fotolab/subcommands/border.py,sha256=5ch2d7LVPhB2OFuuXSW5ci6Cn967CPDQu0qSfaO7uMg,3591
-fotolab/subcommands/contrast.py,sha256=l7Bs5p8W8ypN9Cg3fFHnU-A20UwMKtjTiPk6D0PRwpM,2095
-fotolab/subcommands/env.py,sha256=6vQDQ1sunJl2XBaSAHpLZUOiKiHy4STO45CMjXJd_Ow,1466
-fotolab/subcommands/info.py,sha256=vDzomRfHOKCNk9TON5CX9UB_km6GYBJT_nkDcwtARVA,3330
-fotolab/subcommands/montage.py,sha256=lUVY-zDSH7mwH-s34_XefdNp7CoDJHkwpbTUGiyJGgs,2037
-fotolab/subcommands/resize.py,sha256=2bH1Kgoe_DqU8ozJ1E_oA6a9JPtuwIlo5a4sq_4Yles,5018
-fotolab/subcommands/rotate.py,sha256=27Xrc8iV9n8WI6tOE-vBBMUeSYu2CtZAh-PGcF7JL-k,2144
-fotolab/subcommands/sharpen.py,sha256=wUPtJdtB6mCRmcHrA0CoEVO0O0ROBJWhejTvUeL67QU,2655
-fotolab/subcommands/watermark.py,sha256=5vsMDeJZhLT5qmftJQXY4jK2gtPQsbTYKXA6Ye2MqmA,8900
-fotolab-0.24.0.dist-info/entry_points.txt,sha256=mvw7AY_yZkIyjAxPtHNed9X99NZeLnMxEeAfEJUbrCM,44
-fotolab-0.24.0.dist-info/LICENSE.md,sha256=tGtFDwxWTjuR9syrJoSv1Hiffd2u8Tu8cYClfrXS_YU,31956
-fotolab-0.24.0.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
-fotolab-0.24.0.dist-info/METADATA,sha256=VH-jJMrow1yoLw1XXO4eVgl1putj9tJuLFd93Tg9MSE,10975
-fotolab-0.24.0.dist-info/RECORD,,