fotolab 0.14.0__tar.gz → 0.15.0__tar.gz

{fotolab-0.14.0 → fotolab-0.15.0}/CHANGELOG.md

@@ -7,6 +7,20 @@ and this project adheres to [0-based versioning](https://0ver.org/).
 
 ## [Unreleased]
 
+## v0.15.0 (2024-05-05)
+
+### Added
+
+- Add `-v` or `--verbose` flag to toggle the debug logs of PIL
+
+### Changed
+
+- Bump deps and `pre-commit` hooks
+- Resize image to the right aspect ratio based on image's dimension
+- Resize watermark font based on the image's dimension
+- Remove empty lines in help message
+- Show absolute image path in logs
+
 ## v0.14.0 (2024-04-28)
 
 ### Added

{fotolab-0.14.0 → fotolab-0.15.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fotolab
-Version: 0.14.0
+Version: 0.15.0
 Summary: A console program that manipulate images.
 Keywords: photography,photo
 Author-email: Kian-Meng Ang <kianmeng@cpan.org>
@@ -57,8 +57,7 @@ fotolab -h
 ```
 
 ```console
-
-usage: fotolab [-h] [-o] [-op] [-od OUTPUT_DIR] [-q] [-d] [-V]
+usage: fotolab [-h] [-o] [-op] [-od OUTPUT_DIR] [-q] [-v] [-d] [-V]
                {animate,auto,border,contrast,info,resize,montage,sharpen,watermark,env}
                ...
 
@@ -89,6 +88,7 @@ optional arguments:
   -od OUTPUT_DIR, --output-dir OUTPUT_DIR
                     set default output folder (default: 'output')
   -q, --quiet       suppress all logging
+  -v, --verbose     show verbosity of debugging log, use -vv, -vvv for more details
   -d, --debug       show debugging log and stacktrace
   -V, --version     show program's version number and exit
 ```
@@ -100,7 +100,6 @@ fotolab animate -h
 ```
 
 ```console
-
 usage: fotolab animate [-h] [-f FORMAT] [-d DURATION] [-l LOOP]
                        IMAGE_FILENAMES [IMAGE_FILENAMES ...]
 
@@ -204,7 +203,6 @@ fotolab montage -h
 ```
 
 ```console
-
 usage: fotolab montage [-h] IMAGE_FILENAMES [IMAGE_FILENAMES ...]
 
 positional arguments:
@@ -221,7 +219,7 @@ fotolab resize -h
 ```
 
 ```console
-usage: fotolab resize [-h] [-wh WIDTH] [-ht HEIGHT]
+usage: fotolab resize [-h] [-wh WIDTH | -ht HEIGHT]
                       IMAGE_FILENAMES [IMAGE_FILENAMES ...]
 
 positional arguments:

{fotolab-0.14.0 → fotolab-0.15.0}/Pipfile.lock

@@ -115,61 +115,61 @@
                 "toml"
             ],
             "hashes": [
-                "sha256:00838a35b882694afda09f85e469c96367daa3f3f2b097d846a7216993d37f4c",
-                "sha256:0513b9508b93da4e1716744ef6ebc507aff016ba115ffe8ecff744d1322a7b63",
-                "sha256:09c3255458533cb76ef55da8cc49ffab9e33f083739c8bd4f58e79fecfe288f7",
-                "sha256:09ef9199ed6653989ebbcaacc9b62b514bb63ea2f90256e71fea3ed74bd8ff6f",
-                "sha256:09fa497a8ab37784fbb20ab699c246053ac294d13fc7eb40ec007a5043ec91f8",
-                "sha256:0f9f50e7ef2a71e2fae92774c99170eb8304e3fdf9c8c3c7ae9bab3e7229c5cf",
-                "sha256:137eb07173141545e07403cca94ab625cc1cc6bc4c1e97b6e3846270e7e1fea0",
-                "sha256:1f384c3cc76aeedce208643697fb3e8437604b512255de6d18dae3f27655a384",
-                "sha256:201bef2eea65e0e9c56343115ba3814e896afe6d36ffd37bab783261db430f76",
-                "sha256:38dd60d7bf242c4ed5b38e094baf6401faa114fc09e9e6632374388a404f98e7",
-                "sha256:3b799445b9f7ee8bf299cfaed6f5b226c0037b74886a4e11515e569b36fe310d",
-                "sha256:3ea79bb50e805cd6ac058dfa3b5c8f6c040cb87fe83de10845857f5535d1db70",
-                "sha256:40209e141059b9370a2657c9b15607815359ab3ef9918f0196b6fccce8d3230f",
-                "sha256:41c9c5f3de16b903b610d09650e5e27adbfa7f500302718c9ffd1c12cf9d6818",
-                "sha256:54eb8d1bf7cacfbf2a3186019bcf01d11c666bd495ed18717162f7eb1e9dd00b",
-                "sha256:598825b51b81c808cb6f078dcb972f96af96b078faa47af7dfcdf282835baa8d",
-                "sha256:5fc1de20b2d4a061b3df27ab9b7c7111e9a710f10dc2b84d33a4ab25065994ec",
-                "sha256:623512f8ba53c422fcfb2ce68362c97945095b864cda94a92edbaf5994201083",
-                "sha256:690db6517f09336559dc0b5f55342df62370a48f5469fabf502db2c6d1cffcd2",
-                "sha256:69eb372f7e2ece89f14751fbcbe470295d73ed41ecd37ca36ed2eb47512a6ab9",
-                "sha256:73bfb9c09951125d06ee473bed216e2c3742f530fc5acc1383883125de76d9cd",
-                "sha256:742a76a12aa45b44d236815d282b03cfb1de3b4323f3e4ec933acfae08e54ade",
-                "sha256:7c95949560050d04d46b919301826525597f07b33beba6187d04fa64d47ac82e",
-                "sha256:8130a2aa2acb8788e0b56938786c33c7c98562697bf9f4c7d6e8e5e3a0501e4a",
-                "sha256:8a2b2b78c78293782fd3767d53e6474582f62443d0504b1554370bde86cc8227",
-                "sha256:8ce1415194b4a6bd0cdcc3a1dfbf58b63f910dcb7330fe15bdff542c56949f87",
-                "sha256:9ca28a302acb19b6af89e90f33ee3e1906961f94b54ea37de6737b7ca9d8827c",
-                "sha256:a4cdc86d54b5da0df6d3d3a2f0b710949286094c3a6700c21e9015932b81447e",
-                "sha256:aa5b1c1bfc28384f1f53b69a023d789f72b2e0ab1b3787aae16992a7ca21056c",
-                "sha256:aadacf9a2f407a4688d700e4ebab33a7e2e408f2ca04dbf4aef17585389eff3e",
-                "sha256:ae71e7ddb7a413dd60052e90528f2f65270aad4b509563af6d03d53e979feafd",
-                "sha256:b14706df8b2de49869ae03a5ccbc211f4041750cd4a66f698df89d44f4bd30ec",
-                "sha256:b1a93009cb80730c9bca5d6d4665494b725b6e8e157c1cb7f2db5b4b122ea562",
-                "sha256:b2991665420a803495e0b90a79233c1433d6ed77ef282e8e152a324bbbc5e0c8",
-                "sha256:b2c5edc4ac10a7ef6605a966c58929ec6c1bd0917fb8c15cb3363f65aa40e677",
-                "sha256:b4d33f418f46362995f1e9d4f3a35a1b6322cb959c31d88ae56b0298e1c22357",
-                "sha256:b91cbc4b195444e7e258ba27ac33769c41b94967919f10037e6355e998af255c",
-                "sha256:c74880fc64d4958159fbd537a091d2a585448a8f8508bf248d72112723974cbd",
-                "sha256:c901df83d097649e257e803be22592aedfd5182f07b3cc87d640bbb9afd50f49",
-                "sha256:cac99918c7bba15302a2d81f0312c08054a3359eaa1929c7e4b26ebe41e9b286",
-                "sha256:cc4f1358cb0c78edef3ed237ef2c86056206bb8d9140e73b6b89fbcfcbdd40e1",
-                "sha256:ccd341521be3d1b3daeb41960ae94a5e87abe2f46f17224ba5d6f2b8398016cf",
-                "sha256:ce4b94265ca988c3f8e479e741693d143026632672e3ff924f25fab50518dd51",
-                "sha256:cf271892d13e43bc2b51e6908ec9a6a5094a4df1d8af0bfc360088ee6c684409",
-                "sha256:d5ae728ff3b5401cc320d792866987e7e7e880e6ebd24433b70a33b643bb0384",
-                "sha256:d71eec7d83298f1af3326ce0ff1d0ea83c7cb98f72b577097f9083b20bdaf05e",
-                "sha256:d898fe162d26929b5960e4e138651f7427048e72c853607f2b200909794ed978",
-                "sha256:d89d7b2974cae412400e88f35d86af72208e1ede1a541954af5d944a8ba46c57",
-                "sha256:dfa8fe35a0bb90382837b238fff375de15f0dcdb9ae68ff85f7a63649c98527e",
-                "sha256:e0be5efd5127542ef31f165de269f77560d6cdef525fffa446de6f7e9186cfb2",
-                "sha256:fdfafb32984684eb03c2d83e1e51f64f0906b11e64482df3c5db936ce3839d48",
-                "sha256:ff7687ca3d7028d8a5f0ebae95a6e4827c5616b31a4ee1192bdfde697db110d4"
+                "sha256:075299460948cd12722a970c7eae43d25d37989da682997687b34ae6b87c0ef0",
+                "sha256:07dfdd492d645eea1bd70fb1d6febdcf47db178b0d99161d8e4eed18e7f62fe7",
+                "sha256:0cbdf2cae14a06827bec50bd58e49249452d211d9caddd8bd80e35b53cb04631",
+                "sha256:2055c4fb9a6ff624253d432aa471a37202cd8f458c033d6d989be4499aed037b",
+                "sha256:262fffc1f6c1a26125d5d573e1ec379285a3723363f3bd9c83923c9593a2ac25",
+                "sha256:280132aada3bc2f0fac939a5771db4fbb84f245cb35b94fae4994d4c1f80dae7",
+                "sha256:2b57780b51084d5223eee7b59f0d4911c31c16ee5aa12737c7a02455829ff067",
+                "sha256:2bd7065249703cbeb6d4ce679c734bef0ee69baa7bff9724361ada04a15b7e3b",
+                "sha256:3235d7c781232e525b0761730e052388a01548bd7f67d0067a253887c6e8df46",
+                "sha256:33c020d3322662e74bc507fb11488773a96894aa82a622c35a5a28673c0c26f5",
+                "sha256:357754dcdfd811462a725e7501a9b4556388e8ecf66e79df6f4b988fa3d0b39a",
+                "sha256:39793731182c4be939b4be0cdecde074b833f6171313cf53481f869937129ed3",
+                "sha256:3c2b77f295edb9fcdb6a250f83e6481c679335ca7e6e4a955e4290350f2d22a4",
+                "sha256:41327143c5b1d715f5f98a397608f90ab9ebba606ae4e6f3389c2145410c52b1",
+                "sha256:427e1e627b0963ac02d7c8730ca6d935df10280d230508c0ba059505e9233475",
+                "sha256:432949a32c3e3f820af808db1833d6d1631664d53dd3ce487aa25d574e18ad1c",
+                "sha256:4ba01d9ba112b55bfa4b24808ec431197bb34f09f66f7cb4fd0258ff9d3711b1",
+                "sha256:4d0e206259b73af35c4ec1319fd04003776e11e859936658cb6ceffdeba0f5be",
+                "sha256:51431d0abbed3a868e967f8257c5faf283d41ec882f58413cf295a389bb22e58",
+                "sha256:565b2e82d0968c977e0b0f7cbf25fd06d78d4856289abc79694c8edcce6eb2de",
+                "sha256:6782cd6216fab5a83216cc39f13ebe30adfac2fa72688c5a4d8d180cd52e8f6a",
+                "sha256:6afd2e84e7da40fe23ca588379f815fb6dbbb1b757c883935ed11647205111cb",
+                "sha256:710c62b6e35a9a766b99b15cdc56d5aeda0914edae8bb467e9c355f75d14ee95",
+                "sha256:84921b10aeb2dd453247fd10de22907984eaf80901b578a5cf0bb1e279a587cb",
+                "sha256:85a5dbe1ba1bf38d6c63b6d2c42132d45cbee6d9f0c51b52c59aa4afba057517",
+                "sha256:9c6384cc90e37cfb60435bbbe0488444e54b98700f727f16f64d8bfda0b84656",
+                "sha256:9dd88fce54abbdbf4c42fb1fea0e498973d07816f24c0e27a1ecaf91883ce69e",
+                "sha256:a81eb64feded34f40c8986869a2f764f0fe2db58c0530d3a4afbcde50f314880",
+                "sha256:a898c11dca8f8c97b467138004a30133974aacd572818c383596f8d5b2eb04a9",
+                "sha256:a9960dd1891b2ddf13a7fe45339cd59ecee3abb6b8326d8b932d0c5da208104f",
+                "sha256:a9a7ef30a1b02547c1b23fa9a5564f03c9982fc71eb2ecb7f98c96d7a0db5cf2",
+                "sha256:ad97ec0da94b378e593ef532b980c15e377df9b9608c7c6da3506953182398af",
+                "sha256:adf032b6c105881f9d77fa17d9eebe0ad1f9bfb2ad25777811f97c5362aa07f2",
+                "sha256:bbfe6389c5522b99768a93d89aca52ef92310a96b99782973b9d11e80511f932",
+                "sha256:bd4bacd62aa2f1a1627352fe68885d6ee694bdaebb16038b6e680f2924a9b2cc",
+                "sha256:bf0b4b8d9caa8d64df838e0f8dcf68fb570c5733b726d1494b87f3da85db3a2d",
+                "sha256:c379cdd3efc0658e652a14112d51a7668f6bfca7445c5a10dee7eabecabba19d",
+                "sha256:c58536f6892559e030e6924896a44098bc1290663ea12532c78cef71d0df8493",
+                "sha256:cbe6581fcff7c8e262eb574244f81f5faaea539e712a058e6707a9d272fe5b64",
+                "sha256:ced268e82af993d7801a9db2dbc1d2322e786c5dc76295d8e89473d46c6b84d4",
+                "sha256:cf3539007202ebfe03923128fedfdd245db5860a36810136ad95a564a2fdffff",
+                "sha256:cf62d17310f34084c59c01e027259076479128d11e4661bb6c9acb38c5e19bb8",
+                "sha256:d0194d654e360b3e6cc9b774e83235bae6b9b2cac3be09040880bb0e8a88f4a1",
+                "sha256:d3d117890b6eee85887b1eed41eefe2e598ad6e40523d9f94c4c4b213258e4a4",
+                "sha256:db2de4e546f0ec4b2787d625e0b16b78e99c3e21bc1722b4977c0dddf11ca84e",
+                "sha256:e768d870801f68c74c2b669fc909839660180c366501d4cc4b87efd6b0eee375",
+                "sha256:e7c211f25777746d468d76f11719e64acb40eed410d81c26cefac641975beb88",
+                "sha256:eed462b4541c540d63ab57b3fc69e7d8c84d5957668854ee4e408b50e92ce26a",
+                "sha256:f0bfe42523893c188e9616d853c47685e1c575fe25f737adf473d0405dcfa7eb",
+                "sha256:f609ebcb0242d84b7adeee2b06c11a2ddaec5464d21888b2c8255f5fd6a98ae4",
+                "sha256:fea9d3ca80bcf17edb2c08a4704259dadac196fe5e9274067e7a20511fad1743",
+                "sha256:fed7a72d54bd52f4aeb6c6e951f363903bd7d70bc1cad64dd1f087980d309ab9"
             ],
             "markers": "python_version >= '3.8'",
-            "version": "==7.4.4"
+            "version": "==7.5.0"
         },
         "distlib": {
             "hashes": [
@@ -197,11 +197,11 @@
         },
         "filelock": {
             "hashes": [
-                "sha256:404e5e9253aa60ad457cae1be07c0f0ca90a63931200a47d9b6a6af84fd7b45f",
-                "sha256:d13f466618bfde72bd2c18255e269f72542c6e70e7bac83a0232d6b1cc5c8cf4"
+                "sha256:43339835842f110ca7ae60f1e1c160714c5a6afd15a2873419ab185334975c0f",
+                "sha256:6ea72da3be9b8c82afd3edcf99f2fffbb5076335a5ae4d03248bb5b6c3eae78a"
             ],
             "markers": "python_version >= '3.8'",
-            "version": "==3.13.4"
+            "version": "==3.14.0"
         },
         "flake8": {
             "hashes": [
@@ -386,11 +386,11 @@
         },
         "platformdirs": {
             "hashes": [
-                "sha256:0614df2a2f37e1a662acbd8e2b25b92ccf8632929bc6d43467e17fe89c75e068",
-                "sha256:ef0cc731df711022c174543cb70a9b5bd22e5a9337c8624ef2c2ceb8ddad8768"
+                "sha256:031cd18d4ec63ec53e82dceaac0417d218a6863f7745dfcc9efe7793b7039bdf",
+                "sha256:17d5a1161b3fd67b390023cb2d3b026bbd40abde6fdb052dfbd3a29c3ba22ee1"
             ],
             "markers": "python_version >= '3.8'",
-            "version": "==4.2.0"
+            "version": "==4.2.1"
         },
         "pluggy": {
             "hashes": [
@@ -443,12 +443,12 @@
         },
         "pytest": {
             "hashes": [
-                "sha256:2a8386cfc11fa9d2c50ee7b2a57e7d898ef90470a7a34c4b949ff59662bb78b7",
-                "sha256:ac978141a75948948817d360297b7aae0fcb9d6ff6bc9ec6d514b85d5a65c044"
+                "sha256:1733f0620f6cda4095bbf0d9ff8022486e91892245bb9e7d5542c018f612f233",
+                "sha256:d507d4482197eac0ba2bae2e9babf0672eb333017bcedaa5fb1a3d42c1174b3f"
             ],
             "index": "pypi",
             "markers": "python_version >= '3.8'",
-            "version": "==8.1.1"
+            "version": "==8.2.0"
         },
         "pytest-cov": {
             "hashes": [
@@ -470,12 +470,12 @@
         },
         "pytest-xdist": {
             "hashes": [
-                "sha256:cbb36f3d67e0c478baa57fa4edc8843887e0f6cfc42d677530a36d7472b32d8a",
-                "sha256:d075629c7e00b611df89f490a5063944bee7a4362a5ff11c7cc7824a03dfce24"
+                "sha256:9ed4adfb68a016610848639bb7e02c9352d5d9f03d04809919e2dafc3be4cca7",
+                "sha256:ead156a4db231eec769737f57668ef58a2084a34b2e55c4a8fa20d861107300d"
             ],
             "index": "pypi",
-            "markers": "python_version >= '3.7'",
-            "version": "==3.5.0"
+            "markers": "python_version >= '3.8'",
+            "version": "==3.6.1"
         },
         "pyyaml": {
             "hashes": [
@@ -592,11 +592,11 @@
         },
         "virtualenv": {
             "hashes": [
-                "sha256:7bb554bbdfeaacc3349fa614ea5bff6ac300fc7c335e9facf3a3bcfc703f45be",
-                "sha256:8aac4332f2ea6ef519c648d0bc48a5b1d324994753519919bddbb1aff25a104e"
+                "sha256:604bfdceaeece392802e6ae48e69cec49168b9c5f4a44e483963f9242eb0e78b",
+                "sha256:7aa9982a728ae5892558bff6a2839c00b9ed145523ece2274fad6f414690ae75"
             ],
             "markers": "python_version >= '3.7'",
-            "version": "==20.25.3"
+            "version": "==20.26.1"
         },
         "zipp": {
             "hashes": [
@@ -860,12 +860,12 @@
         },
         "myst-parser": {
             "hashes": [
-                "sha256:0b4ae0b33a45800a748260cb40348c37089a8a456c35120609240bd1b32f9255",
-                "sha256:8ee926557b8e4c2940a1e62c5720e1667cfaf8480b94b1b9c77dc38e31d104aa"
+                "sha256:6457aaa33a5d474aca678b8ead9b3dc298e89c68e67012e73146ea6fd54babf1",
+                "sha256:88f0cb406cb363b077d176b51c476f62d60604d68a8dcdf4832e080441301a87"
             ],
             "index": "pypi",
             "markers": "python_version >= '3.8'",
-            "version": "==3.0.0"
+            "version": "==3.0.1"
         },
         "packaging": {
             "hashes": [

{fotolab-0.14.0 → fotolab-0.15.0}/README.md

@@ -35,8 +35,7 @@ fotolab -h
 ```
 
 ```console
-
-usage: fotolab [-h] [-o] [-op] [-od OUTPUT_DIR] [-q] [-d] [-V]
+usage: fotolab [-h] [-o] [-op] [-od OUTPUT_DIR] [-q] [-v] [-d] [-V]
                {animate,auto,border,contrast,info,resize,montage,sharpen,watermark,env}
                ...
 
@@ -67,6 +66,7 @@ optional arguments:
   -od OUTPUT_DIR, --output-dir OUTPUT_DIR
                     set default output folder (default: 'output')
   -q, --quiet       suppress all logging
+  -v, --verbose     show verbosity of debugging log, use -vv, -vvv for more details
   -d, --debug       show debugging log and stacktrace
   -V, --version     show program's version number and exit
 ```
@@ -78,7 +78,6 @@ fotolab animate -h
 ```
 
 ```console
-
 usage: fotolab animate [-h] [-f FORMAT] [-d DURATION] [-l LOOP]
                        IMAGE_FILENAMES [IMAGE_FILENAMES ...]
 
@@ -182,7 +181,6 @@ fotolab montage -h
 ```
 
 ```console
-
 usage: fotolab montage [-h] IMAGE_FILENAMES [IMAGE_FILENAMES ...]
 
 positional arguments:
@@ -199,7 +197,7 @@ fotolab resize -h
 ```
 
 ```console
-usage: fotolab resize [-h] [-wh WIDTH] [-ht HEIGHT]
+usage: fotolab resize [-h] [-wh WIDTH | -ht HEIGHT]
                       IMAGE_FILENAMES [IMAGE_FILENAMES ...]
 
 positional arguments:

{fotolab-0.14.0 → fotolab-0.15.0}/fotolab/__init__.py

@@ -21,7 +21,7 @@ import subprocess
 import sys
 from pathlib import Path
 
-__version__ = "0.14.0"
+__version__ = "0.15.0"
 
 log = logging.getLogger(__name__)
 
@@ -48,7 +48,7 @@ def save_image(args, new_image, output_filename, subcommand):
         )
         new_filename.parent.mkdir(parents=True, exist_ok=True)
 
-    log.info("%s image: %s", subcommand, new_filename)
+    log.info("%s image: %s", subcommand, new_filename.resolve())
     new_image.save(new_filename)
 
     if args.open:
@@ -64,4 +64,4 @@ def _open_image(filename):
     elif sys.platform == "windows":
         os.startfile(filename)
 
-    log.info("open image: %s using default program.", filename.resolve())
+    log.info("open image: %s", filename.resolve())

{fotolab-0.14.0 → fotolab-0.15.0}/fotolab/cli.py

@@ -42,6 +42,9 @@ log = logging.getLogger(__name__)
 
 def setup_logging(args: argparse.Namespace) -> None:
     """Set up logging by level."""
+    if args.verbose == 0:
+        logging.getLogger("PIL").setLevel(logging.ERROR)
+
     if args.quiet:
         logging.disable(logging.NOTSET)
     else:
@@ -105,6 +108,15 @@ def build_parser() -> argparse.ArgumentParser:
         help="suppress all logging",
     )
 
+    parser.add_argument(
+        "-v",
+        "--verbose",
+        default=0,
+        action="count",
+        dest="verbose",
+        help="show verbosity of debugging log, use -vv, -vvv for more details",
+    )
+
     parser.add_argument(
         "-d",
         "--debug",

{fotolab-0.14.0 → fotolab-0.15.0}/fotolab/resize.py

@@ -17,6 +17,7 @@
 
 import argparse
 import logging
+import math
 
 from PIL import Image
 
@@ -24,6 +25,9 @@ from fotolab import save_image
 
 log = logging.getLogger(__name__)
 
+DEFAULT_WIDTH = 600
+DEFAULT_HEIGHT = 277
+
 
 def build_subparser(subparsers) -> None:
     """Build the subparser."""
@@ -40,23 +44,25 @@ def build_subparser(subparsers) -> None:
         metavar="IMAGE_FILENAMES",
     )
 
-    resize_parser.add_argument(
+    group = resize_parser.add_mutually_exclusive_group(required=False)
+
+    group.add_argument(
         "-wh",
         "--width",
         dest="width",
         help="set the width of the image (default: '%(default)s')",
         type=int,
-        default="600",
+        default=DEFAULT_WIDTH,
         metavar="WIDTH",
     )
 
-    resize_parser.add_argument(
+    group.add_argument(
         "-ht",
         "--height",
         dest="height",
         help="set the height of the image (default: '%(default)s')",
         type=int,
-        default="277",
+        default=DEFAULT_HEIGHT,
         metavar="HEIGHT",
     )
 
@@ -74,9 +80,37 @@ def run(args: argparse.Namespace) -> None:
 
     for image_filename in args.image_filenames:
         original_image = Image.open(image_filename)
+
+        new_width, new_height = _calc_new_image_dimension(original_image, args)
         resized_image = original_image.copy()
         resized_image = resized_image.resize(
-            (args.width, args.height), Image.Resampling.LANCZOS
+            (new_width, new_height), Image.Resampling.LANCZOS
         )
 
         save_image(args, resized_image, image_filename, "resize")
+
+
+def _calc_new_image_dimension(image, args) -> tuple:
+    new_width = args.width
+    new_height = args.height
+
+    old_width, old_height = image.size
+    log.debug("old image dimension: %d x %d", old_width, old_height)
+
+    if args.width != DEFAULT_WIDTH:
+        aspect_ratio = old_height / old_width
+        log.debug("aspect ratio: %f", aspect_ratio)
+
+        new_height = math.ceil(args.width * aspect_ratio)
+        log.debug("new height: %d", new_height)
+
+    if args.height != DEFAULT_HEIGHT:
+        aspect_ratio = old_width / old_height
+        log.debug("aspect ratio: %f", aspect_ratio)
+
+        new_width = math.floor(args.height * aspect_ratio)
+        log.debug("new width: %d", new_width)
+
+    log.debug("new image dimension: %d x %d", new_width, new_height)
+
+    return (new_width, new_height)

{fotolab-0.14.0 → fotolab-0.15.0}/fotolab/sharpen.py

@@ -44,7 +44,7 @@ def build_subparser(subparsers) -> None:
         "-r",
         "--radius",
         dest="radius",
-        type=str,
+        type=int,
         default=1,
         help="set the radius or size of edges (default: '%(default)s')",
         metavar="RADIUS",
@@ -54,7 +54,7 @@ def build_subparser(subparsers) -> None:
         "-p",
         "--percent",
         dest="percent",
-        type=str,
+        type=int,
         default=100,
         help=(
             "set the amount of overall strength of sharpening effect "
@@ -67,7 +67,7 @@ def build_subparser(subparsers) -> None:
         "-t",
         "--threshold",
         dest="threshold",
-        type=str,
+        type=int,
         default=3,
         help=(
             "set the minimum brightness changed to be sharpened "

{fotolab-0.14.0 → fotolab-0.15.0}/fotolab/watermark.py

@@ -17,6 +17,7 @@
 
 import argparse
 import logging
+import math
 
 from PIL import Image, ImageColor, ImageDraw, ImageFont
 
@@ -24,6 +25,9 @@ from fotolab import save_image
 
 log = logging.getLogger(__name__)
 
+FONT_SIZE_ASPECT_RATIO = 12 / 600
+FONT_PADDING_ASPECT_RATIO = 15 / 600
+FONT_OUTLINE_WIDTH_ASPECT_RATIO = 2 / 600
 POSITIONS = ["top-left", "top-right", "bottom-left", "bottom-right"]
 
 
@@ -140,19 +144,21 @@ def run(args: argparse.Namespace) -> None:
 
         draw = ImageDraw.Draw(watermarked_image)
 
-        font = ImageFont.truetype("arial.ttf", args.font_size)
+        font = ImageFont.truetype(
+            "arial.ttf", calc_font_size(original_image, args)
+        )
 
         (left, top, right, bottom) = draw.textbbox(
             xy=(0, 0), text=args.text, font=font
         )
         text_width = right - left
         text_height = bottom - top
-        (position_x, position_y) = calculate_position(
+        (position_x, position_y) = calc_position(
             watermarked_image,
             text_width,
             text_height,
             args.position,
-            args.padding,
+            calc_padding(original_image, args),
         )
 
         draw.text(
@@ -160,16 +166,49 @@ def run(args: argparse.Namespace) -> None:
             args.text,
             font=font,
             fill=(*ImageColor.getrgb(args.font_color), 128),
-            stroke_width=args.outline_width,
+            stroke_width=calc_font_outline_width(original_image, args),
             stroke_fill=(*ImageColor.getrgb(args.outline_color), 128),
         )
 
         save_image(args, watermarked_image, image_filename, "watermark")
 
 
-def calculate_position(
-    image, text_width, text_height, position, padding
-) -> tuple:
+def calc_font_size(image, args) -> int:
+    """Calculate the font size based on the width of the image."""
+    width, _height = image.size
+    new_font_size = args.font_size
+    if width > 600:
+        new_font_size = math.floor(FONT_SIZE_ASPECT_RATIO * width)
+
+    log.debug("new font size: %d", new_font_size)
+    return new_font_size
+
+
+def calc_font_outline_width(image, args) -> int:
+    """Calculate the font padding based on the width of the image."""
+    width, _height = image.size
+    new_font_outline_width = args.outline_width
+    if width > 600:
+        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
+
+
+def calc_padding(image, args) -> int:
+    """Calculate the font padding based on the width of the image."""
+    width, _height = image.size
+    new_padding = args.padding
+    if width > 600:
+        new_padding = math.floor(FONT_PADDING_ASPECT_RATIO * width)
+
+    log.debug("new padding: %d", new_padding)
+    return new_padding
+
+
+def calc_position(image, text_width, text_height, position, padding) -> tuple:
     """Calculate the boundary coordinates of the watermark text."""
     if position == "top-left":
         position_x = 0 + padding