fotolab 0.31.15__py3-none-any.whl → 0.32.0__py3-none-any.whl

fotolab/__init__.py

@@ -20,12 +20,11 @@ import logging
 import os
 import subprocess
 import sys
-from importlib import metadata
 from pathlib import Path
 
 from PIL import Image
 
-__version__ = metadata.version("fotolab")
+__version__ = "0.31.15"
 
 log = logging.getLogger(__name__)
 

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/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.15.dist-info → fotolab-0.32.0.dist-info}/METADATA

@@ -1,14 +1,14 @@
 Metadata-Version: 2.4
 Name: fotolab
-Version: 0.31.15
-Summary: A console program that manipulate images.
-Keywords: photography,photo
+Version: 0.32.0
 Author-email: Kian-Meng Ang <kianmeng@cpan.org>
-Requires-Python: >=3.9
-Description-Content-Type: text/markdown
+License-Expression: AGPL-3.0-or-later
+Project-URL: Changelog, https://github.com/kianmeng/fotolab/blob/master/CHANGELOG.md
+Project-URL: Issues, https://github.com/kianmeng/fotolab/issues
+Project-URL: Source, https://github.com/kianmeng/fotolab
+Keywords: photography,photo
 Classifier: Development Status :: 3 - Alpha
 Classifier: Environment :: Console
-Classifier: License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
@@ -16,11 +16,25 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python
+Requires-Python: >=3.9
+Description-Content-Type: text/markdown
 License-File: LICENSE.md
 Requires-Dist: pillow
-Project-URL: Changelog, https://github.com/kianmeng/fotolab/blob/master/CHANGELOG.md
-Project-URL: Issues, https://github.com/kianmeng/fotolab/issues
-Project-URL: Source, https://github.com/kianmeng/fotolab
+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
 
@@ -471,4 +485,3 @@ The fish logo used in the documentation generated by Sphinx is a public domain
 drawing of male freshwater phase [Sockeye (red) salmon (Oncorhynchus nerka)]
 (https://en.wikipedia.org/w/index.php?oldid=1186575702) from
 <https://commons.wikimedia.org/entity/M2787002>.
-

{fotolab-0.31.15.dist-info → fotolab-0.32.0.dist-info}/RECORD

@@ -1,9 +1,9 @@
-fotolab/__init__.py,sha256=7XrkZPbYLVCnsak061vye7L9hFC7zj7cP7XWdjunAk8,3137
+fotolab/__init__.py,sha256=F1sYdgd88MdxeT60olYsMzaMY7EipL8lJlL44BuFYj4,3088
 fotolab/__main__.py,sha256=aboOURPs_snOXTEWYR0q8oq1UTY9e-NxCd1j33V0wHI,833
 fotolab/cli.py,sha256=oFiQXmsu3wIsM_DpZnL4B94sAoB62L16Am-cjxGmosY,4406
 fotolab/subcommands/__init__.py,sha256=l3DlIaJ3u3jGjnC1H1yV8LZ_nPqOLJ6gikD4BCaMAQ0,1129
 fotolab/subcommands/animate.py,sha256=t1F0ekbYWVlQcCtnwsW_gsWjkFdGDqcr4R8VUztUuzI,5481
-fotolab/subcommands/auto.py,sha256=3Hl1cCdu65GcfwvwiMRAcex6c7zA-KqIY6AFnB6nI3w,2447
+fotolab/subcommands/auto.py,sha256=8QXSCd0BzvLiIKEGp8SUUq9XGIEoYZ9l6BueW0xQVUg,2849
 fotolab/subcommands/border.py,sha256=VYs8SorNYMwk7bVhD7jyolvFly7XdV-s9tNVQQYZPtA,4671
 fotolab/subcommands/contrast.py,sha256=fcXmHnxDw74j5ZUDQ5cwWh0N4tpyqqvEjymnpITgrEk,3027
 fotolab/subcommands/env.py,sha256=QoxRvzZKgmoHTUxDV4QYhdChCpMWs5TbXFY_qIpIQpE,1469
@@ -13,9 +13,10 @@ fotolab/subcommands/montage.py,sha256=ouwOnJQeXJTzsXi-4uby8c6k_VWg0Yo37FuvwAFx8M
 fotolab/subcommands/resize.py,sha256=eZGoHVMehpHrAX_y-M56s43lSvWmywMjHRVI_dYqpcA,5429
 fotolab/subcommands/rotate.py,sha256=uBFjHyjiBSQLtrtH1p9myODIHUDr1gkL4PpU-6Y1Ofo,2575
 fotolab/subcommands/sharpen.py,sha256=YNho2IPbc-lPvSy3Bsjehc2JOEy27LPqFSGRULs9MyY,3492
-fotolab/subcommands/watermark.py,sha256=cpdzmdzBXcaXWSrklYycnkPLjorLnTM-IXjPigPu0y0,11268
-fotolab-0.31.15.dist-info/entry_points.txt,sha256=mvw7AY_yZkIyjAxPtHNed9X99NZeLnMxEeAfEJUbrCM,44
-fotolab-0.31.15.dist-info/licenses/LICENSE.md,sha256=tGtFDwxWTjuR9syrJoSv1Hiffd2u8Tu8cYClfrXS_YU,31956
-fotolab-0.31.15.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
-fotolab-0.31.15.dist-info/METADATA,sha256=H03-P2JZnQ-3-DGimX2dyHsrmIrANSDuoYI403oL8pA,14307
-fotolab-0.31.15.dist-info/RECORD,,
+fotolab/subcommands/watermark.py,sha256=xLejXelEae695DTN9T6fLbCu1YgIQIH-tFYQotJuCPI,11319
+fotolab-0.32.0.dist-info/licenses/LICENSE.md,sha256=tGtFDwxWTjuR9syrJoSv1Hiffd2u8Tu8cYClfrXS_YU,31956
+fotolab-0.32.0.dist-info/METADATA,sha256=PDhVkW_L-sLLojnhkbwRkpmT_hGq7C3ibinBUFXIEq8,14765
+fotolab-0.32.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+fotolab-0.32.0.dist-info/entry_points.txt,sha256=0e1go9plFpqj5FP-OpV2acxTAx3ViI59PMXuhejvgcQ,45
+fotolab-0.32.0.dist-info/top_level.txt,sha256=XUJ3gdpsbjohoZCLdVlbQrxAUDkbQg7WwGQG2DaN0t4,8
+fotolab-0.32.0.dist-info/RECORD,,

{fotolab-0.31.15.dist-info → fotolab-0.32.0.dist-info}/WHEEL

@@ -1,4 +1,5 @@
 Wheel-Version: 1.0
-Generator: flit 3.12.0
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
+

fotolab-0.32.0.dist-info/entry_points.txt

@@ -0,0 +1,2 @@
+[console_scripts]
+fotolab = fotolab.cli:main

fotolab-0.32.0.dist-info/top_level.txt

@@ -0,0 +1 @@
+fotolab

fotolab-0.31.15.dist-info/entry_points.txt

@@ -1,3 +0,0 @@
-[console_scripts]
-fotolab=fotolab.cli:main
-