fotolab 0.31.16__tar.gz → 0.32.0__tar.gz

{fotolab-0.31.16/src/fotolab.egg-info → fotolab-0.32.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fotolab
-Version: 0.31.16
+Version: 0.32.0
 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
@@ -20,6 +20,20 @@ Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE.md
 Requires-Dist: pillow
+Provides-Extra: test
+Requires-Dist: pytest; extra == "test"
+Requires-Dist: pytest-cov; extra == "test"
+Requires-Dist: pytest-randomly; extra == "test"
+Requires-Dist: pytest-xdist; extra == "test"
+Requires-Dist: scripttest; extra == "test"
+Provides-Extra: doc
+Requires-Dist: myst-parser; extra == "doc"
+Requires-Dist: sphinx; extra == "doc"
+Requires-Dist: sphinx-autodoc-typehints; extra == "doc"
+Requires-Dist: sphinx-copybutton; extra == "doc"
+Provides-Extra: lint
+Requires-Dist: pre-commit; extra == "lint"
+Requires-Dist: ruff; extra == "lint"
 Dynamic: license-file
 
 # fotolab

{fotolab-0.31.16 → fotolab-0.32.0}/pyproject.toml

@@ -7,7 +7,7 @@ where = ["src"]
 
 [project]
 name = "fotolab"
-version = "0.31.16"
+version = "0.32.0"
 authors = [{name = "Kian-Meng Ang", email = "kianmeng@cpan.org"}]
 requires-python = ">=3.9"
 readme = "README.md"
@@ -37,25 +37,41 @@ Source = "https://github.com/kianmeng/fotolab"
 [project.scripts]
 fotolab = "fotolab.cli:main"
 
-[dependency-groups]
-dev = [
-    "exceptiongroup",
-    "importlib-metadata",
-    "myst-parser",
-    "nox",
-    "pre-commit",
+[project.optional-dependencies]
+test = [
     "pytest",
     "pytest-cov",
     "pytest-randomly",
     "pytest-xdist",
-    "ruff",
     "scripttest",
+]
+
+doc = [
+    "myst-parser",
     "sphinx",
     "sphinx-autodoc-typehints",
     "sphinx-copybutton",
-    "tomli",
+]
+
+lint = [
+    "pre-commit",
+    "ruff",
 ]
 
 # verify through: uv run ruff check --show-settings
 [tool.ruff]
 line-length = 79
+target-version = "py310"
+exclude = [
+    "docs/",
+    "docs/source/conf.py",
+]
+
+[tool.ruff.lint]
+extend-select = [
+    "E",
+    "W",
+]
+
+[tool.ruff.lint.pydocstyle]
+convention = "google"

{fotolab-0.31.16 → fotolab-0.32.0}/src/fotolab/subcommands/auto.py

@@ -43,6 +43,16 @@ def build_subparser(subparsers) -> None:
         metavar="IMAGE_FILENAMES",
     )
 
+    auto_parser.add_argument(
+        "-t",
+        "--text",
+        dest="text",
+        help="set the watermark text (default: '%(default)s')",
+        type=str,
+        default="kianmeng.org",
+        metavar="WATERMARK_TEXT",
+    )
+
 
 def run(args: argparse.Namespace) -> None:
     """Run auto subcommand.
@@ -60,7 +70,7 @@ def run(args: argparse.Namespace) -> None:
         "radius": 1,
         "percent": 100,
         "threshold": 2,
-        "text": "kianmeng.org",
+        "text": f"{args.text if args.text else 'kianmeng.org'}",
         "position": "bottom-left",
         "font_size": 12,
         "font_color": "white",
@@ -69,13 +79,18 @@ def run(args: argparse.Namespace) -> None:
         "padding": 15,
         "camera": False,
         "canvas": False,
-        "lowercase": False,
+        "lowercase": True,
         "before_after": False,
         "alpha": 128,
     }
-    combined_args = argparse.Namespace(**vars(args), **extra_args)
+
+    # resolve error: argparse.Namespace() got multiple values for keyword
+    # argument 'text'
+    merged_args = {**vars(args), **extra_args}
+    combined_args = argparse.Namespace(**merged_args)
     combined_args.overwrite = True
     combined_args.open = False
+
     log.debug(args)
     log.debug(combined_args)
 

{fotolab-0.31.16 → fotolab-0.32.0}/src/fotolab/subcommands/watermark.py

@@ -110,7 +110,8 @@ def build_subparser(subparsers: argparse._SubParsersAction) -> None:
         type=int,
         default=2,
         help=(
-            "set the outline width of the watermark text (default: '%(default)s')"
+            "set the outline width of the watermark text "
+            "(default: '%(default)s')"
         ),
         metavar="OUTLINE_WIDTH",
     )
@@ -122,7 +123,8 @@ def build_subparser(subparsers: argparse._SubParsersAction) -> None:
         type=str,
         default="black",
         help=(
-            "set the outline color of the watermark text (default: '%(default)s')"
+            "set the outline color of the watermark text "
+            "(default: '%(default)s')"
         ),
         metavar="OUTLINE_COLOR",
     )
@@ -325,7 +327,7 @@ def prepare_text(args: argparse.Namespace, image: Image.Image) -> str:
     if args.lowercase:
         text = text.lower()
 
-    return text
+    return text.replace("\\n", "\n")
 
 
 def calc_font_size(image: Image.Image, args: argparse.Namespace) -> int:

{fotolab-0.31.16 → fotolab-0.32.0/src/fotolab.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fotolab
-Version: 0.31.16
+Version: 0.32.0
 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
@@ -20,6 +20,20 @@ Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE.md
 Requires-Dist: pillow
+Provides-Extra: test
+Requires-Dist: pytest; extra == "test"
+Requires-Dist: pytest-cov; extra == "test"
+Requires-Dist: pytest-randomly; extra == "test"
+Requires-Dist: pytest-xdist; extra == "test"
+Requires-Dist: scripttest; extra == "test"
+Provides-Extra: doc
+Requires-Dist: myst-parser; extra == "doc"
+Requires-Dist: sphinx; extra == "doc"
+Requires-Dist: sphinx-autodoc-typehints; extra == "doc"
+Requires-Dist: sphinx-copybutton; extra == "doc"
+Provides-Extra: lint
+Requires-Dist: pre-commit; extra == "lint"
+Requires-Dist: ruff; extra == "lint"
 Dynamic: license-file
 
 # fotolab

fotolab-0.32.0/src/fotolab.egg-info/requires.txt

@@ -0,0 +1,18 @@
+pillow
+
+[doc]
+myst-parser
+sphinx
+sphinx-autodoc-typehints
+sphinx-copybutton
+
+[lint]
+pre-commit
+ruff
+
+[test]
+pytest
+pytest-cov
+pytest-randomly
+pytest-xdist
+scripttest

fotolab-0.31.16/src/fotolab.egg-info/requires.txt

@@ -1 +0,0 @@
-pillow