fotolab 0.31.5__tar.gz → 0.31.8__tar.gz

{fotolab-0.31.5 → fotolab-0.31.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fotolab
-Version: 0.31.5
+Version: 0.31.8
 Summary: A console program that manipulate images.
 Keywords: photography,photo
 Author-email: Kian-Meng Ang <kianmeng@cpan.org>
@@ -31,19 +31,13 @@ A console program to manipulate photos.
 Stable version From PyPI using `uv`:
 
 ```console
-uv pip install fotolab
+uv tool install fotolab
 ```
 
 Upgrade to latest stable version:
 
 ```console
-uv pip install fotolab --upgrade
-```
-
-Latest development version from GitHub:
-
-```console
-uv pip install -e git+https://github.com/kianmeng/fotolab.git
+uv tool upgrade fotolab
 ```
 
 ## Usage

{fotolab-0.31.5 → fotolab-0.31.8}/README.md

@@ -7,19 +7,13 @@ A console program to manipulate photos.
 Stable version From PyPI using `uv`:
 
 ```console
-uv pip install fotolab
+uv tool install fotolab
 ```
 
 Upgrade to latest stable version:
 
 ```console
-uv pip install fotolab --upgrade
-```
-
-Latest development version from GitHub:
-
-```console
-uv pip install -e git+https://github.com/kianmeng/fotolab.git
+uv tool upgrade fotolab
 ```
 
 ## Usage

{fotolab-0.31.5 → fotolab-0.31.8}/fotolab/subcommands/__init__.py

@@ -24,7 +24,8 @@ def build_subparser(subparsers):
     iter_namespace = pkgutil.iter_modules(__path__, __name__ + ".")
 
     subcommands = {
-        name: importlib.import_module(name) for finder, name, ispkg in iter_namespace
+        name: importlib.import_module(name)
+        for finder, name, ispkg in iter_namespace
     }
 
     for subcommand in subcommands.values():

{fotolab-0.31.5 → fotolab-0.31.8}/fotolab/subcommands/animate.py

@@ -123,7 +123,9 @@ def build_subparser(subparsers) -> None:
         type=int,
         default=4,
         choices=range(0, 7),
-        help=("set WEBP encoding method (0=fast, 6=slow/best, default: '%(default)s')"),
+        help=(
+            "set WEBP encoding method (0=fast, 6=slow/best, default: '%(default)s')"
+        ),
         metavar="METHOD",
     )
 

{fotolab-0.31.5 → fotolab-0.31.8}/fotolab/subcommands/border.py

@@ -77,7 +77,9 @@ def build_subparser(subparsers: argparse._SubParsersAction) -> None:
         dest="width_right",
         type=int,
         default=0,
-        help=("set the width of right border in pixels (default: '%(default)s')"),
+        help=(
+            "set the width of right border in pixels (default: '%(default)s')"
+        ),
         metavar="WIDTH",
     )
 
@@ -87,7 +89,9 @@ def build_subparser(subparsers: argparse._SubParsersAction) -> None:
         dest="width_bottom",
         type=int,
         default=0,
-        help=("set the width of bottom border in pixels (default: '%(default)s')"),
+        help=(
+            "set the width of bottom border in pixels (default: '%(default)s')"
+        ),
         metavar="WIDTH",
     )
 

{fotolab-0.31.5 → fotolab-0.31.8}/fotolab/subcommands/contrast.py

@@ -31,7 +31,9 @@ def _validate_cutoff(value: str) -> float:
     try:
         f_value = float(value)
     except ValueError as e:
-        raise argparse.ArgumentTypeError(f"invalid float value: '{value}'") from e
+        raise argparse.ArgumentTypeError(
+            f"invalid float value: '{value}'"
+        ) from e
     if not 0 <= f_value <= 50:
         raise argparse.ArgumentTypeError(
             f"cutoff value {f_value} must be between 0 and 50"
@@ -41,7 +43,9 @@ def _validate_cutoff(value: str) -> float:
 
 def build_subparser(subparsers: argparse._SubParsersAction) -> None:
     """Build the subparser."""
-    contrast_parser = subparsers.add_parser("contrast", help="contrast an image.")
+    contrast_parser = subparsers.add_parser(
+        "contrast", help="contrast an image."
+    )
 
     contrast_parser.set_defaults(func=run)
 
@@ -99,6 +103,8 @@ 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)
+        contrast_image = ImageOps.autocontrast(
+            original_image, cutoff=args.cutoff
+        )
 
         save_image(args, contrast_image, image_filename, "contrast")

{fotolab-0.31.5 → fotolab-0.31.8}/fotolab/subcommands/halftone.py

@@ -18,7 +18,7 @@
 import argparse
 import logging
 import math
-from typing import NamedTuple
+from typing import NamedTuple, Union
 
 from PIL import Image, ImageDraw
 
@@ -37,7 +37,9 @@ class HalftoneCell(NamedTuple):
 
 def build_subparser(subparsers) -> None:
     """Build the subparser."""
-    halftone_parser = subparsers.add_parser("halftone", help="halftone an image")
+    halftone_parser = subparsers.add_parser(
+        "halftone", help="halftone an image"
+    )
 
     halftone_parser.set_defaults(func=run)
 
@@ -129,22 +131,22 @@ def _draw_halftone_dot(
     source_image: Image.Image,
     cell: HalftoneCell,
     grayscale: bool,
-    fill_color_dot,
+    fill_color_dot: int,
 ) -> None:
     """Calculate properties and draw a single halftone dot."""
-    # Calculate center point of current cell
+    # calculate center point of current cell
     img_width, img_height = source_image.size
 
-    # Calculate center point of current cell and clamp to image bounds
+    # calculate center point of current cell and clamp to image bounds
     x = min(int(cell.col * cell.cellsize + cell.cellsize / 2), img_width - 1)
     y = min(int(cell.row * cell.cellsize + cell.cellsize / 2), img_height - 1)
 
-    # Ensure coordinates are non-negative (shouldn't happen with current logic,
+    # ensure coordinates are non-negative (shouldn't happen with current logic,
     # but safe)
     x = max(0, x)
     y = max(0, y)
 
-    # Get pixel value (brightness or color) from the source image using clamped
+    # get pixel value (brightness or color) from the source image using clamped
     # coordinates
     pixel_value = source_image.getpixel((x, y))
 
@@ -152,17 +154,20 @@ def _draw_halftone_dot(
         brightness = pixel_value
         dot_fill = fill_color_dot  # Use white for grayscale dots
     else:
-        # Calculate brightness (luminance) from the RGB color
+        # calculate brightness (luminance) from the RGB color
         brightness = int(
-            0.299 * pixel_value[0] + 0.587 * pixel_value[1] + 0.114 * pixel_value[2]
+            0.299 * pixel_value[0]
+            + 0.587 * pixel_value[1]
+            + 0.114 * pixel_value[2]
         )
         dot_fill = pixel_value  # Use original color for color dots
 
-    # Calculate dot radius relative to cell size based on brightness Max radius
-    # is half the cell size. Scale by brightness (0-255).
+    # calculate dot radius relative to cell size based on brightness max radius
+    # is half the cell size
+    # scale by brightness (0-255).
     dot_radius = (brightness / 255.0) * (cell.cellsize / 2)
 
-    # Draw the dot
+    # draw the dot
     draw.ellipse(
         [
             x - dot_radius,
@@ -190,29 +195,30 @@ def create_halftone_image(
     Returns:
         Image.Image: The halftone converted image
     """
+    output_mode: str
+    fill_color_black: Union[int, tuple[int, int, int]]
+    fill_color_dot_for_grayscale: int
+
     if grayscale:
         source_image = original_image.convert("L")
         output_mode = "L"
         fill_color_black = 0
-        fill_color_dot = 255
+        fill_color_dot_for_grayscale = 255
     else:
         source_image = original_image.convert("RGB")
         output_mode = "RGB"
         fill_color_black = (0, 0, 0)
-        fill_color_dot = None  # Will be set inside the loop for color images
+        fill_color_dot_for_grayscale = 0
 
     width, height = original_image.size
 
-    # Create a new image for the output, initialized to black
+    # create a new image for the output, initialized to black
     halftone_image = Image.new(output_mode, (width, height), fill_color_black)
     draw = ImageDraw.Draw(halftone_image)
 
     cellsize = width / cell_count
     rowtotal = math.ceil(height / cellsize)
 
-    # Determine the fill color for dots once if grayscale
-    grayscale_fill_color_dot = fill_color_dot if grayscale else None
-
     for row in range(rowtotal):
         for col in range(cell_count):
             cell = HalftoneCell(col=col, row=row, cellsize=cellsize)
@@ -221,7 +227,7 @@ def create_halftone_image(
                 source_image,
                 cell,
                 grayscale,
-                grayscale_fill_color_dot,
+                fill_color_dot_for_grayscale,
             )
 
     return halftone_image

{fotolab-0.31.5 → fotolab-0.31.8}/fotolab/subcommands/info.py

@@ -107,7 +107,9 @@ def extract_exif_tags(image: Image.Image, sort: bool = False) -> dict:
     if exif:
         info = {ExifTags.TAGS.get(tag_id): exif.get(tag_id) for tag_id in exif}
 
-    filtered_info = {key: value for key, value in info.items() if key is not None}
+    filtered_info = {
+        key: value for key, value in info.items() if key is not None
+    }
     if sort:
         filtered_info = dict(sorted(filtered_info.items()))
 

{fotolab-0.31.5 → fotolab-0.31.8}/fotolab/subcommands/montage.py

@@ -27,7 +27,9 @@ log = logging.getLogger(__name__)
 
 def build_subparser(subparsers) -> None:
     """Build the subparser."""
-    montage_parser = subparsers.add_parser("montage", help="montage a list of image")
+    montage_parser = subparsers.add_parser(
+        "montage", help="montage a list of image"
+    )
 
     montage_parser.set_defaults(func=run)
 

{fotolab-0.31.5 → fotolab-0.31.8}/fotolab/subcommands/resize.py

@@ -59,7 +59,9 @@ def build_subparser(subparsers) -> None:
         "--canvas-color",
         default="black",
         dest="canvas_color",
-        help=("the color of the extended larger canvas(default: '%(default)s')"),
+        help=(
+            "the color of the extended larger canvas(default: '%(default)s')"
+        ),
     )
 
     if "-c" in sys.argv or "--canvas" in sys.argv:

{fotolab-0.31.5 → fotolab-0.31.8}/fotolab/subcommands/watermark.py

@@ -109,7 +109,9 @@ def build_subparser(subparsers: argparse._SubParsersAction) -> None:
         dest="outline_width",
         type=int,
         default=2,
-        help=("set the outline width of the watermark text (default: '%(default)s')"),
+        help=(
+            "set the outline width of the watermark text (default: '%(default)s')"
+        ),
         metavar="OUTLINE_WIDTH",
     )
 
@@ -119,7 +121,9 @@ def build_subparser(subparsers: argparse._SubParsersAction) -> None:
         dest="outline_color",
         type=str,
         default="black",
-        help=("set the outline color of the watermark text (default: '%(default)s')"),
+        help=(
+            "set the outline color of the watermark text (default: '%(default)s')"
+        ),
         metavar="OUTLINE_COLOR",
     )
 
@@ -197,7 +201,9 @@ def run(args: argparse.Namespace) -> None:
         if image.format == "GIF":
             watermark_gif_image(image, image_filename, args)
         else:
-            watermarked_image: Image.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")
 
 
@@ -333,12 +339,16 @@ def calc_font_size(image: Image.Image, args: argparse.Namespace) -> int:
     return new_font_size
 
 
-def calc_font_outline_width(image: Image.Image, args: argparse.Namespace) -> 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: int = args.outline_width
     if width > 600:
-        new_font_outline_width = math.floor(FONT_OUTLINE_WIDTH_ASPECT_RATIO * width)
+        new_font_outline_width = math.floor(
+            FONT_OUTLINE_WIDTH_ASPECT_RATIO * width
+        )
 
     log.debug("new font outline width: %d", new_font_outline_width)
     return new_font_outline_width

{fotolab-0.31.5 → fotolab-0.31.8}/pyproject.toml

@@ -20,7 +20,7 @@ classifiers = [
     "Programming Language :: Python :: 3.13",
     "Programming Language :: Python",
 ]
-version = "0.31.5"
+version = "0.31.8"
 dynamic = ["description"]
 keywords = ["photography", "photo"]
 dependencies = [
@@ -38,10 +38,6 @@ fotolab = "fotolab.cli:main"
 [dependency-groups]
 dev = [
     "exceptiongroup",
-    "flake8-docstrings",
-    "flake8-print",
-    "flake8-pytest-style",
-    "flake8-simplify",
     "flit",
     "importlib-metadata",
     "myst-parser",

fotolab-0.31.5/.coveragerc

@@ -1,17 +0,0 @@
-[run]
-parallel = true
-sigterm = true
-source = fotolab
-omit =
-    */fotolab/__main__.py
-
-[report]
-fail_under = 100
-ignore_errors = True
-show_missing = True
-sort=Cover
-exclude_also =
-    def __repr__
-
-[html]
-directory = cover

fotolab-0.31.5/.gitignore

@@ -1,167 +0,0 @@
-# Byte-compiled / optimized / DLL files
-__pycache__/
-*.py[cod]
-*$py.class
-
-# C extensions
-*.so
-
-# Distribution / packaging
-.Python
-build/
-develop-eggs/
-dist/
-downloads/
-eggs/
-.eggs/
-lib/
-lib64/
-parts/
-sdist/
-var/
-wheels/
-share/python-wheels/
-*.egg-info/
-.installed.cfg
-*.egg
-MANIFEST
-
-# PyInstaller
-#  Usually these files are written by a python script from a template
-#  before PyInstaller builds the exe, so as to inject date/other infos into it.
-*.manifest
-*.spec
-
-# Installer logs
-pip-log.txt
-pip-delete-this-directory.txt
-
-# Unit test / coverage reports
-htmlcov/
-.tox/
-.nox/
-.coverage
-.coverage.*
-.cache
-nosetests.xml
-coverage.xml
-*.cover
-*.py,cover
-.hypothesis/
-.pytest_cache/
-cover/
-
-# Translations
-*.mo
-*.pot
-
-# Django stuff:
-*.log
-local_settings.py
-db.sqlite3
-db.sqlite3-journal
-
-# Flask stuff:
-instance/
-.webassets-cache
-
-# Scrapy stuff:
-.scrapy
-
-# Sphinx documentation
-docs/_build/
-
-# PyBuilder
-.pybuilder/
-target/
-
-# Jupyter Notebook
-.ipynb_checkpoints
-
-# IPython
-profile_default/
-ipython_config.py
-
-# pyenv
-#   For a library or package, you might want to ignore these files since the code is
-#   intended to run in multiple environments; otherwise, check them in:
-# .python-version
-
-# pipenv
-#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
-#   However, in case of collaboration, if having platform-specific dependencies or dependencies
-#   having no cross-platform support, pipenv may install dependencies that don't work, or not
-#   install all needed dependencies.
-#Pipfile.lock
-
-# poetry
-#   Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
-#   This is especially recommended for binary packages to ensure reproducibility, and is more
-#   commonly ignored for libraries.
-#   https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
-#poetry.lock
-
-# pdm
-#   Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
-#pdm.lock
-#   pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
-#   in version control.
-#   https://pdm.fming.dev/#use-with-ide
-.pdm.toml
-
-# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
-__pypackages__/
-
-# Celery stuff
-celerybeat-schedule
-celerybeat.pid
-
-# SageMath parsed files
-*.sage.py
-
-# Environments
-.env
-.venv
-env/
-venv/
-ENV/
-env.bak/
-venv.bak/
-
-# Spyder project settings
-.spyderproject
-.spyproject
-
-# Rope project settings
-.ropeproject
-
-# mkdocs documentation
-/site
-
-# mypy
-.mypy_cache/
-.dmypy.json
-dmypy.json
-
-# Pyre type checker
-.pyre/
-
-# pytype static type analyzer
-.pytype/
-
-# Cython debug symbols
-cython_debug/
-
-# PyCharm
-#  JetBrains specific template is maintained in a separate JetBrains.gitignore that can
-#  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
-#  and can be added to the global gitignore or merged into this file.  For a more nuclear
-#  option (not recommended) you can uncomment the following to ignore the entire idea folder.
-#.idea/
-
-# heatmaps
-*.png
-.aider*
-.opencode
-TODO
-output

fotolab-0.31.5/.pre-commit-config.yaml

@@ -1,47 +0,0 @@
-# See https://pre-commit.com for more information
-# See https://pre-commit.com/hooks.html for more hooks
-repos:
-  - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v5.0.0
-    hooks:
-      - id: check-case-conflict
-      - id: check-merge-conflict
-      - id: check-toml
-      - id: check-yaml
-      - id: debug-statements
-      - id: detect-private-key
-      - id: end-of-file-fixer
-      - id: mixed-line-ending
-      - id: trailing-whitespace
-
-  - repo: https://github.com/abravalheri/validate-pyproject
-    rev: v0.24.1
-    hooks:
-      - id: validate-pyproject
-        name: validate-pyproject
-
-  - repo: https://github.com/codespell-project/codespell
-    rev: v2.4.1
-    hooks:
-      - id: codespell
-        args:
-          - --ignore-words-list=astroid
-
-  - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v4.0.0-alpha.8
-    hooks:
-      - id: prettier
-        exclude: (Pipfile.lock)
-
-  - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.12.0
-    hooks:
-      - id: ruff-check
-        args: [--fix]
-      - id: ruff-format
-
-  - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.16.1
-    hooks:
-      - id: mypy
-        exclude: docs/

fotolab-0.31.5/.python-version

@@ -1,5 +0,0 @@
-3.9
-3.10
-3.11
-3.12
-3.13