PyPI - fotolab - Versions diffs - 0.22.0__tar.gz → 0.25.1__tar.gz - Mend

fotolab 0.22.0tar.gz → 0.25.1tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (43) hide show

{fotolab-0.22.0 → fotolab-0.25.1}/.pre-commit-config.yaml RENAMED Viewed

@@ -107,7 +107,7 @@ repos:
           - --disable=R0801,W0212
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.13.0
+    rev: v1.14.1
     hooks:
       - id: mypy
         exclude: docs/

fotolab-0.25.1/.python-version ADDED Viewed

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

{fotolab-0.22.0 → fotolab-0.25.1}/CHANGELOG.md RENAMED Viewed

@@ -7,6 +7,39 @@ and this project adheres to [0-based versioning](https://0ver.org/).
 ## [Unreleased]
+## v0.25.1 (2025-01-13)
+- Bump deps
+- Fix incorrect subcommand when saving image with border
+- Refactor calculate border
+## v0.25.0 (2025-01-05)
+- Add `--before-after` or `-ba` flag to `sharpen` command
+- Bump `pre-commit` hook and deps
+- Bump copyright years
+## v0.24.0 (2024-12-29)
+- Bump `pre-commit` hook
+- Pass image instead of filename when process `info` and `watermark` subcommand
+- Refactor print result of `env` subcommand
+- Support watermarking `gif` image
+## v0.23.0 (2024-12-22)
+- Add `-cw` or `--clockwise` option to `rotate` subcommand
+- Add `-r` or `--rotation` option to `rotate` subcommand
+- Refactor calculation of position of watermark
+- Refactor setup logging again
+- Use major Python versions for `pyenv`
+## v0.22.1 (2024-12-15)
+- Fix show all EXIF tags instead of selected fields
+- Refactor building subparser for each subcommand
+- Refactor setup logging
 ## v0.22.0 (2024-12-08)
 - Add `--datetime` to `info` subcommand

{fotolab-0.22.0 → fotolab-0.25.1}/PKG-INFO RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fotolab
-Version: 0.22.0
+Version: 0.25.1
 Summary: A console program that manipulate images.
 Keywords: photography,photo
 Author-email: Kian-Meng Ang <kianmeng@cpan.org>
@@ -61,7 +61,7 @@ fotolab -h
 ```console
 usage: fotolab [-h] [-o] [-op] [-od OUTPUT_DIR] [-q] [-v] [-d] [-V]
-               {animate,auto,border,contrast,info,resize,rotate,montage,sharpen,watermark,env} ...
+               {animate,auto,border,contrast,env,info,montage,resize,rotate,sharpen,watermark} ...
 A console program to manipulate photos.
@@ -70,19 +70,19 @@ changelog: https://github.com/kianmeng/fotolab/blob/master/CHANGELOG.md
 issues: https://github.com/kianmeng/fotolab/issues
 positional arguments:
-  {animate,auto,border,contrast,info,resize,rotate,montage,sharpen,watermark,env}
+  {animate,auto,border,contrast,env,info,montage,resize,rotate,sharpen,watermark}
                     sub-command help
     animate         animate an image
     auto            auto adjust (resize, contrast, and watermark) a photo
     border          add border to image
     contrast        contrast an image
+    env             print environment information for bug reporting
     info            info an image
+    montage         montage a list of image
     resize          resize an image
     rotate          rotate an image
-    montage         montage a list of image
     sharpen         sharpen an image
     watermark       watermark an image
-    env             print environment information for bug reporting
 options:
   -h, --help        show this help message and exit
@@ -206,7 +206,7 @@ fotolab info -h
 <!--help-info !-->
 ```console
-usage: fotolab info [-h] [-s] [--camera] IMAGE_FILENAME
+usage: fotolab info [-h] [-s] [--camera] [--datetime] IMAGE_FILENAME
 positional arguments:
   IMAGE_FILENAME  set the image filename
@@ -215,6 +215,7 @@ options:
   -h, --help      show this help message and exit
   -s, --sort      show image info by sorted field name
   --camera        show the camera maker details
+  --datetime      show the datetime
 ```
 <!--help-info !-->
@@ -228,13 +229,17 @@ fotolab rotate -h
 <!--help-rotate !-->
 ```console
-usage: fotolab rotate [-h] IMAGE_FILENAMES [IMAGE_FILENAMES ...]
+usage: fotolab rotate [-h] [-r ROTATION] [-cw]
+                      IMAGE_FILENAMES [IMAGE_FILENAMES ...]
 positional arguments:
-  IMAGE_FILENAMES  set the image filenames
+  IMAGE_FILENAMES       set the image filenames
 options:
-  -h, --help       show this help message and exit
+  -h, --help            show this help message and exit
+  -r, --rotation ROTATION
+                        Rotation angle in degrees (default: '0')
+  -cw, --clockwise      Rotate clockwise (default: 'False)
 ```
 <!--help-rotate !-->
@@ -295,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:
@@ -310,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 !-->
@@ -380,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.22.0 → fotolab-0.25.1}/Pipfile.lock RENAMED Viewed

@@ -22,85 +22,81 @@
         },
         "pillow": {
             "hashes": [
-                "sha256:00177a63030d612148e659b55ba99527803288cea7c75fb05766ab7981a8c1b7",
-                "sha256:006bcdd307cc47ba43e924099a038cbf9591062e6c50e570819743f5607404f5",
-                "sha256:084a07ef0821cfe4858fe86652fffac8e187b6ae677e9906e192aafcc1b69903",
-                "sha256:0ae08bd8ffc41aebf578c2af2f9d8749d91f448b3bfd41d7d9ff573d74f2a6b2",
-                "sha256:0e038b0745997c7dcaae350d35859c9715c71e92ffb7e0f4a8e8a16732150f38",
-                "sha256:1187739620f2b365de756ce086fdb3604573337cc28a0d3ac4a01ab6b2d2a6d2",
-                "sha256:16095692a253047fe3ec028e951fa4221a1f3ed3d80c397e83541a3037ff67c9",
-                "sha256:1a61b54f87ab5786b8479f81c4b11f4d61702830354520837f8cc791ebba0f5f",
-                "sha256:1c1d72714f429a521d8d2d018badc42414c3077eb187a59579f28e4270b4b0fc",
-                "sha256:1e2688958a840c822279fda0086fec1fdab2f95bf2b717b66871c4ad9859d7e8",
-                "sha256:20ec184af98a121fb2da42642dea8a29ec80fc3efbaefb86d8fdd2606619045d",
-                "sha256:21a0d3b115009ebb8ac3d2ebec5c2982cc693da935f4ab7bb5c8ebe2f47d36f2",
-                "sha256:224aaa38177597bb179f3ec87eeefcce8e4f85e608025e9cfac60de237ba6316",
-                "sha256:2679d2258b7f1192b378e2893a8a0a0ca472234d4c2c0e6bdd3380e8dfa21b6a",
-                "sha256:27a7860107500d813fcd203b4ea19b04babe79448268403172782754870dac25",
-                "sha256:290f2cc809f9da7d6d622550bbf4c1e57518212da51b6a30fe8e0a270a5b78bd",
-                "sha256:2e46773dc9f35a1dd28bd6981332fd7f27bec001a918a72a79b4133cf5291dba",
-                "sha256:3107c66e43bda25359d5ef446f59c497de2b5ed4c7fdba0894f8d6cf3822dafc",
-                "sha256:375b8dd15a1f5d2feafff536d47e22f69625c1aa92f12b339ec0b2ca40263273",
-                "sha256:45c566eb10b8967d71bf1ab8e4a525e5a93519e29ea071459ce517f6b903d7fa",
-                "sha256:499c3a1b0d6fc8213519e193796eb1a86a1be4b1877d678b30f83fd979811d1a",
-                "sha256:4ad70c4214f67d7466bea6a08061eba35c01b1b89eaa098040a35272a8efb22b",
-                "sha256:4b60c9520f7207aaf2e1d94de026682fc227806c6e1f55bba7606d1c94dd623a",
-                "sha256:5178952973e588b3f1360868847334e9e3bf49d19e169bbbdfaf8398002419ae",
-                "sha256:52a2d8323a465f84faaba5236567d212c3668f2ab53e1c74c15583cf507a0291",
-                "sha256:598b4e238f13276e0008299bd2482003f48158e2b11826862b1eb2ad7c768b97",
-                "sha256:5bd2d3bdb846d757055910f0a59792d33b555800813c3b39ada1829c372ccb06",
-                "sha256:5c39ed17edea3bc69c743a8dd3e9853b7509625c2462532e62baa0732163a904",
-                "sha256:5d203af30149ae339ad1b4f710d9844ed8796e97fda23ffbc4cc472968a47d0b",
-                "sha256:5ddbfd761ee00c12ee1be86c9c0683ecf5bb14c9772ddbd782085779a63dd55b",
-                "sha256:607bbe123c74e272e381a8d1957083a9463401f7bd01287f50521ecb05a313f8",
-                "sha256:61b887f9ddba63ddf62fd02a3ba7add935d053b6dd7d58998c630e6dbade8527",
-                "sha256:6619654954dc4936fcff82db8eb6401d3159ec6be81e33c6000dfd76ae189947",
-                "sha256:674629ff60030d144b7bca2b8330225a9b11c482ed408813924619c6f302fdbb",
-                "sha256:6ec0d5af64f2e3d64a165f490d96368bb5dea8b8f9ad04487f9ab60dc4bb6003",
-                "sha256:6f4dba50cfa56f910241eb7f883c20f1e7b1d8f7d91c750cd0b318bad443f4d5",
-                "sha256:70fbbdacd1d271b77b7721fe3cdd2d537bbbd75d29e6300c672ec6bb38d9672f",
-                "sha256:72bacbaf24ac003fea9bff9837d1eedb6088758d41e100c1552930151f677739",
-                "sha256:7326a1787e3c7b0429659e0a944725e1b03eeaa10edd945a86dead1913383944",
-                "sha256:73853108f56df97baf2bb8b522f3578221e56f646ba345a372c78326710d3830",
-                "sha256:73e3a0200cdda995c7e43dd47436c1548f87a30bb27fb871f352a22ab8dcf45f",
-                "sha256:75acbbeb05b86bc53cbe7b7e6fe00fbcf82ad7c684b3ad82e3d711da9ba287d3",
-                "sha256:8069c5179902dcdce0be9bfc8235347fdbac249d23bd90514b7a47a72d9fecf4",
-                "sha256:846e193e103b41e984ac921b335df59195356ce3f71dcfd155aa79c603873b84",
-                "sha256:8594f42df584e5b4bb9281799698403f7af489fba84c34d53d1c4bfb71b7c4e7",
-                "sha256:86510e3f5eca0ab87429dd77fafc04693195eec7fd6a137c389c3eeb4cfb77c6",
-                "sha256:8853a3bf12afddfdf15f57c4b02d7ded92c7a75a5d7331d19f4f9572a89c17e6",
-                "sha256:88a58d8ac0cc0e7f3a014509f0455248a76629ca9b604eca7dc5927cc593c5e9",
-                "sha256:8ba470552b48e5835f1d23ecb936bb7f71d206f9dfeee64245f30c3270b994de",
-                "sha256:8c676b587da5673d3c75bd67dd2a8cdfeb282ca38a30f37950511766b26858c4",
-                "sha256:8ec4a89295cd6cd4d1058a5e6aec6bf51e0eaaf9714774e1bfac7cfc9051db47",
-                "sha256:94f3e1780abb45062287b4614a5bc0874519c86a777d4a7ad34978e86428b8dd",
-                "sha256:9a0f748eaa434a41fccf8e1ee7a3eed68af1b690e75328fd7a60af123c193b50",
-                "sha256:a5629742881bcbc1f42e840af185fd4d83a5edeb96475a575f4da50d6ede337c",
-                "sha256:a65149d8ada1055029fcb665452b2814fe7d7082fcb0c5bed6db851cb69b2086",
-                "sha256:b3c5ac4bed7519088103d9450a1107f76308ecf91d6dabc8a33a2fcfb18d0fba",
-                "sha256:b4fd7bd29610a83a8c9b564d457cf5bd92b4e11e79a4ee4716a63c959699b306",
-                "sha256:bcd1fb5bb7b07f64c15618c89efcc2cfa3e95f0e3bcdbaf4642509de1942a699",
-                "sha256:c12b5ae868897c7338519c03049a806af85b9b8c237b7d675b8c5e089e4a618e",
-                "sha256:c26845094b1af3c91852745ae78e3ea47abf3dbcd1cf962f16b9a5fbe3ee8488",
-                "sha256:c6a660307ca9d4867caa8d9ca2c2658ab685de83792d1876274991adec7b93fa",
-                "sha256:c809a70e43c7977c4a42aefd62f0131823ebf7dd73556fa5d5950f5b354087e2",
-                "sha256:c8b2351c85d855293a299038e1f89db92a2f35e8d2f783489c6f0b2b5f3fe8a3",
-                "sha256:cb929ca942d0ec4fac404cbf520ee6cac37bf35be479b970c4ffadf2b6a1cad9",
-                "sha256:d2c0a187a92a1cb5ef2c8ed5412dd8d4334272617f532d4ad4de31e0495bd923",
-                "sha256:d69bfd8ec3219ae71bcde1f942b728903cad25fafe3100ba2258b973bd2bc1b2",
-                "sha256:daffdf51ee5db69a82dd127eabecce20729e21f7a3680cf7cbb23f0829189790",
-                "sha256:e58876c91f97b0952eb766123bfef372792ab3f4e3e1f1a2267834c2ab131734",
-                "sha256:eda2616eb2313cbb3eebbe51f19362eb434b18e3bb599466a1ffa76a033fb916",
-                "sha256:ee217c198f2e41f184f3869f3e485557296d505b5195c513b2bfe0062dc537f1",
-                "sha256:f02541ef64077f22bf4924f225c0fd1248c168f86e4b7abdedd87d6ebaceab0f",
-                "sha256:f1b82c27e89fffc6da125d5eb0ca6e68017faf5efc078128cfaa42cf5cb38798",
-                "sha256:fba162b8872d30fea8c52b258a542c5dfd7b235fb5cb352240c8d63b414013eb",
-                "sha256:fbbcb7b57dc9c794843e3d1258c0fbf0f48656d46ffe9e09b63bbd6e8cd5d0a2",
-                "sha256:fcb4621042ac4b7865c179bb972ed0da0218a076dc1820ffc48b1d74c1e37fe9"
+                "sha256:015c6e863faa4779251436db398ae75051469f7c903b043a48f078e437656f83",
+                "sha256:0a2f91f8a8b367e7a57c6e91cd25af510168091fb89ec5146003e424e1558a96",
+                "sha256:11633d58b6ee5733bde153a8dafd25e505ea3d32e261accd388827ee987baf65",
+                "sha256:2062ffb1d36544d42fcaa277b069c88b01bb7298f4efa06731a7fd6cc290b81a",
+                "sha256:31eba6bbdd27dde97b0174ddf0297d7a9c3a507a8a1480e1e60ef914fe23d352",
+                "sha256:3362c6ca227e65c54bf71a5f88b3d4565ff1bcbc63ae72c34b07bbb1cc59a43f",
+                "sha256:368da70808b36d73b4b390a8ffac11069f8a5c85f29eff1f1b01bcf3ef5b2a20",
+                "sha256:36ba10b9cb413e7c7dfa3e189aba252deee0602c86c309799da5a74009ac7a1c",
+                "sha256:3764d53e09cdedd91bee65c2527815d315c6b90d7b8b79759cc48d7bf5d4f114",
+                "sha256:3a5fe20a7b66e8135d7fd617b13272626a28278d0e578c98720d9ba4b2439d49",
+                "sha256:3cdcdb0b896e981678eee140d882b70092dac83ac1cdf6b3a60e2216a73f2b91",
+                "sha256:4637b88343166249fe8aa94e7c4a62a180c4b3898283bb5d3d2fd5fe10d8e4e0",
+                "sha256:4db853948ce4e718f2fc775b75c37ba2efb6aaea41a1a5fc57f0af59eee774b2",
+                "sha256:4dd43a78897793f60766563969442020e90eb7847463eca901e41ba186a7d4a5",
+                "sha256:54251ef02a2309b5eec99d151ebf5c9904b77976c8abdcbce7891ed22df53884",
+                "sha256:54ce1c9a16a9561b6d6d8cb30089ab1e5eb66918cb47d457bd996ef34182922e",
+                "sha256:593c5fd6be85da83656b93ffcccc2312d2d149d251e98588b14fbc288fd8909c",
+                "sha256:5bb94705aea800051a743aa4874bb1397d4695fb0583ba5e425ee0328757f196",
+                "sha256:67cd427c68926108778a9005f2a04adbd5e67c442ed21d95389fe1d595458756",
+                "sha256:70ca5ef3b3b1c4a0812b5c63c57c23b63e53bc38e758b37a951e5bc466449861",
+                "sha256:73ddde795ee9b06257dac5ad42fcb07f3b9b813f8c1f7f870f402f4dc54b5269",
+                "sha256:758e9d4ef15d3560214cddbc97b8ef3ef86ce04d62ddac17ad39ba87e89bd3b1",
+                "sha256:7d33d2fae0e8b170b6a6c57400e077412240f6f5bb2a342cf1ee512a787942bb",
+                "sha256:7fdadc077553621911f27ce206ffcbec7d3f8d7b50e0da39f10997e8e2bb7f6a",
+                "sha256:8000376f139d4d38d6851eb149b321a52bb8893a88dae8ee7d95840431977081",
+                "sha256:837060a8599b8f5d402e97197d4924f05a2e0d68756998345c829c33186217b1",
+                "sha256:89dbdb3e6e9594d512780a5a1c42801879628b38e3efc7038094430844e271d8",
+                "sha256:8c730dc3a83e5ac137fbc92dfcfe1511ce3b2b5d7578315b63dbbb76f7f51d90",
+                "sha256:8e275ee4cb11c262bd108ab2081f750db2a1c0b8c12c1897f27b160c8bd57bbc",
+                "sha256:9044b5e4f7083f209c4e35aa5dd54b1dd5b112b108648f5c902ad586d4f945c5",
+                "sha256:93a18841d09bcdd774dcdc308e4537e1f867b3dec059c131fde0327899734aa1",
+                "sha256:9409c080586d1f683df3f184f20e36fb647f2e0bc3988094d4fd8c9f4eb1b3b3",
+                "sha256:96f82000e12f23e4f29346e42702b6ed9a2f2fea34a740dd5ffffcc8c539eb35",
+                "sha256:9aa9aeddeed452b2f616ff5507459e7bab436916ccb10961c4a382cd3e03f47f",
+                "sha256:9ee85f0696a17dd28fbcfceb59f9510aa71934b483d1f5601d1030c3c8304f3c",
+                "sha256:a07dba04c5e22824816b2615ad7a7484432d7f540e6fa86af60d2de57b0fcee2",
+                "sha256:a3cd561ded2cf2bbae44d4605837221b987c216cff94f49dfeed63488bb228d2",
+                "sha256:a697cd8ba0383bba3d2d3ada02b34ed268cb548b369943cd349007730c92bddf",
+                "sha256:a76da0a31da6fcae4210aa94fd779c65c75786bc9af06289cd1c184451ef7a65",
+                "sha256:a85b653980faad27e88b141348707ceeef8a1186f75ecc600c395dcac19f385b",
+                "sha256:a8d65b38173085f24bc07f8b6c505cbb7418009fa1a1fcb111b1f4961814a442",
+                "sha256:aa8dd43daa836b9a8128dbe7d923423e5ad86f50a7a14dc688194b7be5c0dea2",
+                "sha256:ab8a209b8485d3db694fa97a896d96dd6533d63c22829043fd9de627060beade",
+                "sha256:abc56501c3fd148d60659aae0af6ddc149660469082859fa7b066a298bde9482",
+                "sha256:ad5db5781c774ab9a9b2c4302bbf0c1014960a0a7be63278d13ae6fdf88126fe",
+                "sha256:ae98e14432d458fc3de11a77ccb3ae65ddce70f730e7c76140653048c71bfcbc",
+                "sha256:b20be51b37a75cc54c2c55def3fa2c65bb94ba859dde241cd0a4fd302de5ae0a",
+                "sha256:b523466b1a31d0dcef7c5be1f20b942919b62fd6e9a9be199d035509cbefc0ec",
+                "sha256:b5d658fbd9f0d6eea113aea286b21d3cd4d3fd978157cbf2447a6035916506d3",
+                "sha256:b6123aa4a59d75f06e9dd3dac5bf8bc9aa383121bb3dd9a7a612e05eabc9961a",
+                "sha256:bd165131fd51697e22421d0e467997ad31621b74bfc0b75956608cb2906dda07",
+                "sha256:bf902d7413c82a1bfa08b06a070876132a5ae6b2388e2712aab3a7cbc02205c6",
+                "sha256:c12fc111ef090845de2bb15009372175d76ac99969bdf31e2ce9b42e4b8cd88f",
+                "sha256:c1eec9d950b6fe688edee07138993e54ee4ae634c51443cfb7c1e7613322718e",
+                "sha256:c640e5a06869c75994624551f45e5506e4256562ead981cce820d5ab39ae2192",
+                "sha256:cc1331b6d5a6e144aeb5e626f4375f5b7ae9934ba620c0ac6b3e43d5e683a0f0",
+                "sha256:cfd5cd998c2e36a862d0e27b2df63237e67273f2fc78f47445b14e73a810e7e6",
+                "sha256:d3d8da4a631471dfaf94c10c85f5277b1f8e42ac42bade1ac67da4b4a7359b73",
+                "sha256:d44ff19eea13ae4acdaaab0179fa68c0c6f2f45d66a4d8ec1eda7d6cecbcc15f",
+                "sha256:dd0052e9db3474df30433f83a71b9b23bd9e4ef1de13d92df21a52c0303b8ab6",
+                "sha256:dd0e081319328928531df7a0e63621caf67652c8464303fd102141b785ef9547",
+                "sha256:dda60aa465b861324e65a78c9f5cf0f4bc713e4309f83bc387be158b077963d9",
+                "sha256:e06695e0326d05b06833b40b7ef477e475d0b1ba3a6d27da1bb48c23209bf457",
+                "sha256:e1abe69aca89514737465752b4bcaf8016de61b3be1397a8fc260ba33321b3a8",
+                "sha256:e267b0ed063341f3e60acd25c05200df4193e15a4a5807075cd71225a2386e26",
+                "sha256:e5449ca63da169a2e6068dd0e2fcc8d91f9558aba89ff6d02121ca8ab11e79e5",
+                "sha256:e63e4e5081de46517099dc30abe418122f54531a6ae2ebc8680bcd7096860eab",
+                "sha256:f189805c8be5ca5add39e6f899e6ce2ed824e65fb45f3c28cb2841911da19070",
+                "sha256:f7955ecf5609dee9442cbface754f2c6e541d9e6eda87fad7f7a989b0bdb9d71",
+                "sha256:f86d3a7a9af5d826744fabf4afd15b9dfef44fe69a98541f666f66fbb8d3fef9",
+                "sha256:fbd43429d0d7ed6533b25fc993861b8fd512c42d04514a0dd6337fb3ccf22761"
             ],
             "index": "pypi",
             "markers": "python_version >= '3.9'",
-            "version": "==11.0.0"
+            "version": "==11.1.0"
         }
     },
     "develop": {

{fotolab-0.22.0 → fotolab-0.25.1}/README.md RENAMED Viewed

@@ -38,7 +38,7 @@ fotolab -h
 ```console
 usage: fotolab [-h] [-o] [-op] [-od OUTPUT_DIR] [-q] [-v] [-d] [-V]
-               {animate,auto,border,contrast,info,resize,rotate,montage,sharpen,watermark,env} ...
+               {animate,auto,border,contrast,env,info,montage,resize,rotate,sharpen,watermark} ...
 A console program to manipulate photos.
@@ -47,19 +47,19 @@ changelog: https://github.com/kianmeng/fotolab/blob/master/CHANGELOG.md
 issues: https://github.com/kianmeng/fotolab/issues
 positional arguments:
-  {animate,auto,border,contrast,info,resize,rotate,montage,sharpen,watermark,env}
+  {animate,auto,border,contrast,env,info,montage,resize,rotate,sharpen,watermark}
                     sub-command help
     animate         animate an image
     auto            auto adjust (resize, contrast, and watermark) a photo
     border          add border to image
     contrast        contrast an image
+    env             print environment information for bug reporting
     info            info an image
+    montage         montage a list of image
     resize          resize an image
     rotate          rotate an image
-    montage         montage a list of image
     sharpen         sharpen an image
     watermark       watermark an image
-    env             print environment information for bug reporting
 options:
   -h, --help        show this help message and exit
@@ -183,7 +183,7 @@ fotolab info -h
 <!--help-info !-->
 ```console
-usage: fotolab info [-h] [-s] [--camera] IMAGE_FILENAME
+usage: fotolab info [-h] [-s] [--camera] [--datetime] IMAGE_FILENAME
 positional arguments:
   IMAGE_FILENAME  set the image filename
@@ -192,6 +192,7 @@ options:
   -h, --help      show this help message and exit
   -s, --sort      show image info by sorted field name
   --camera        show the camera maker details
+  --datetime      show the datetime
 ```
 <!--help-info !-->
@@ -205,13 +206,17 @@ fotolab rotate -h
 <!--help-rotate !-->
 ```console
-usage: fotolab rotate [-h] IMAGE_FILENAMES [IMAGE_FILENAMES ...]
+usage: fotolab rotate [-h] [-r ROTATION] [-cw]
+                      IMAGE_FILENAMES [IMAGE_FILENAMES ...]
 positional arguments:
-  IMAGE_FILENAMES  set the image filenames
+  IMAGE_FILENAMES       set the image filenames
 options:
-  -h, --help       show this help message and exit
+  -h, --help            show this help message and exit
+  -r, --rotation ROTATION
+                        Rotation angle in degrees (default: '0')
+  -cw, --clockwise      Rotate clockwise (default: 'False)
 ```
 <!--help-rotate !-->
@@ -272,7 +277,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:
@@ -287,6 +292,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 !-->
@@ -357,7 +363,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.22.0 → fotolab-0.25.1}/fotolab/__init__.py RENAMED Viewed

@@ -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
@@ -21,7 +21,7 @@ import subprocess
 import sys
 from pathlib import Path
-__version__ = "0.22.0"
+__version__ = "0.25.1"
 log = logging.getLogger(__name__)

{fotolab-0.22.0 → fotolab-0.25.1}/fotolab/cli.py RENAMED Viewed

@@ -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
@@ -23,46 +23,40 @@
 import argparse
 import logging
 import sys
-from typing import Dict, Optional, Sequence
-import fotolab.animate
-import fotolab.auto
-import fotolab.border
-import fotolab.contrast
-import fotolab.env
-import fotolab.info
-import fotolab.montage
-import fotolab.resize
-import fotolab.rotate
-import fotolab.sharpen
-import fotolab.watermark
+from typing import Optional, Sequence
+import fotolab.subcommands
 from fotolab import __version__
 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)
+    """Sets up logging configuration based on command-line arguments.
+    Args:
+        args (argparse.Namespace): Namespace containing parsed arguments.
+    """
     if args.quiet:
         logging.disable(logging.NOTSET)
-    else:
-        conf: Dict = {
-            True: {
-                "level": logging.DEBUG,
-                "msg": "[%(asctime)s] %(levelname)s: %(name)s: %(message)s",
-            },
-            False: {"level": logging.INFO, "msg": "%(message)s"},
-        }
-        logging.basicConfig(
-            level=conf[args.debug]["level"],
-            stream=sys.stdout,
-            format=conf[args.debug]["msg"],
-            datefmt="%Y-%m-%d %H:%M:%S",
-        )
+        return
+    if args.verbose == 0:
+        logging.getLogger("PIL").setLevel(logging.ERROR)
+    level = logging.DEBUG if args.debug else logging.INFO
+    format_string = (
+        "[%(asctime)s] %(levelname)s: %(name)s: %(message)s"
+        if args.debug
+        else "%(message)s"
+    )
+    logging.basicConfig(
+        level=level,
+        format=format_string,
+        stream=sys.stdout,
+        datefmt="%Y-%m-%d %H:%M:%S",
+    )
 def build_parser() -> argparse.ArgumentParser:
@@ -136,17 +130,7 @@ def build_parser() -> argparse.ArgumentParser:
     )
     subparsers = parser.add_subparsers(help="sub-command help")
-    fotolab.animate.build_subparser(subparsers)
-    fotolab.auto.build_subparser(subparsers)
-    fotolab.border.build_subparser(subparsers)
-    fotolab.contrast.build_subparser(subparsers)
-    fotolab.info.build_subparser(subparsers)
-    fotolab.resize.build_subparser(subparsers)
-    fotolab.rotate.build_subparser(subparsers)
-    fotolab.montage.build_subparser(subparsers)
-    fotolab.sharpen.build_subparser(subparsers)
-    fotolab.watermark.build_subparser(subparsers)
-    fotolab.env.build_subparser(subparsers)
+    fotolab.subcommands.build_subparser(subparsers)
     return parser

fotolab-0.25.1/fotolab/subcommands/__init__.py ADDED Viewed

@@ -0,0 +1,32 @@
+# 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/>.
+"""Common utils for subcommand."""
+import importlib
+import pkgutil
+def build_subparser(subparsers):
+    """Build subparser for each subcommands."""
+    iter_namespace = pkgutil.iter_modules(__path__, __name__ + ".")
+    subcommands = {
+        name: importlib.import_module(name)
+        for finder, name, ispkg in iter_namespace
+    }
+    for subcommand in subcommands.values():
+        subcommand.build_subparser(subparsers)

{fotolab-0.22.0/fotolab → fotolab-0.25.1/fotolab/subcommands}/animate.py RENAMED Viewed

@@ -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.22.0/fotolab → fotolab-0.25.1/fotolab/subcommands}/auto.py RENAMED Viewed

@@ -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
@@ -18,10 +18,10 @@
 import argparse
 import logging
-import fotolab.contrast
-import fotolab.resize
-import fotolab.sharpen
-import fotolab.watermark
+import fotolab.subcommands.contrast
+import fotolab.subcommands.resize
+import fotolab.subcommands.sharpen
+import fotolab.subcommands.watermark
 log = logging.getLogger(__name__)
@@ -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
@@ -77,7 +78,7 @@ def run(args: argparse.Namespace) -> None:
     log.debug(args)
     log.debug(combined_args)
-    fotolab.resize.run(combined_args)
-    fotolab.contrast.run(combined_args)
-    fotolab.sharpen.run(combined_args)
-    fotolab.watermark.run(combined_args)
+    fotolab.subcommands.resize.run(combined_args)
+    fotolab.subcommands.contrast.run(combined_args)
+    fotolab.subcommands.sharpen.run(combined_args)
+    fotolab.subcommands.watermark.run(combined_args)

{fotolab-0.22.0/fotolab → fotolab-0.25.1/fotolab/subcommands}/border.py RENAMED Viewed

@@ -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-0.22.0/fotolab → fotolab-0.25.1/fotolab/subcommands}/contrast.py RENAMED Viewed

@@ -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.22.0/fotolab → fotolab-0.25.1/fotolab/subcommands}/env.py RENAMED Viewed

@@ -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
@@ -44,9 +44,9 @@ def run(_args: argparse.Namespace) -> None:
         None
     """
     sys_version = sys.version.replace("\n", "")
-    print(
+    env = [
         f"fotolab: {__version__}",
         f"python: {sys_version}",
         f"platform: {platform.platform()}",
-        sep="\n",
-    )
+    ]
+    print(*env, sep="\n")

{fotolab-0.22.0/fotolab → fotolab-0.25.1/fotolab/subcommands}/info.py RENAMED Viewed

@@ -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
@@ -73,12 +73,20 @@ def run(args: argparse.Namespace) -> None:
         None
     """
     log.debug(args)
+    info = []
+    image = Image.open(args.image_filename)
     if args.camera:
-        print(camera_metadata(args.image_filename))
+        info.append(camera_metadata(image))
     if args.datetime:
-        print(datetime(args.image_filename))
+        info.append(datetime(image))
+    if info:
+        print("\n".join(info))
     else:
-        exif_tags = extract_exif_tags(args.image_filename)
+        exif_tags = extract_exif_tags(image)
         if exif_tags:
             tag_name_width = max(map(len, exif_tags))
             for tag_name, tag_value in exif_tags.items():
@@ -87,9 +95,8 @@ def run(args: argparse.Namespace) -> None:
             print("No metadata found!")
-def extract_exif_tags(image_filename: str, sort: bool = False) -> dict:
+def extract_exif_tags(image: Image.Image, sort: bool = False) -> dict:
     """Extract Exif metadata from image."""
-    image = Image.open(image_filename)
     exif = image._getexif()
     log.debug(exif)
@@ -106,14 +113,14 @@ def extract_exif_tags(image_filename: str, sort: bool = False) -> dict:
     return filtered_info
-def datetime(image_filename):
+def datetime(image: Image.Image):
     """Extract datetime metadata."""
-    exif_tags = extract_exif_tags(image_filename)
+    exif_tags = extract_exif_tags(image)
     return exif_tags["DateTime"]
-def camera_metadata(image_filename):
+def camera_metadata(image: Image.Image):
     """Extract camera and model metadata."""
-    exif_tags = extract_exif_tags(image_filename)
+    exif_tags = extract_exif_tags(image)
     metadata = f'{exif_tags["Make"]} {exif_tags["Model"]}'
     return metadata.strip()

{fotolab-0.22.0/fotolab → fotolab-0.25.1/fotolab/subcommands}/montage.py RENAMED Viewed

@@ -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-0.22.0/fotolab → fotolab-0.25.1/fotolab/subcommands}/resize.py RENAMED Viewed

@@ -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.22.0/fotolab → fotolab-0.25.1/fotolab/subcommands}/rotate.py RENAMED Viewed

@@ -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
@@ -40,6 +40,21 @@ def build_subparser(subparsers) -> None:
         metavar="IMAGE_FILENAMES",
     )
+    rotate_parser.add_argument(
+        "-r",
+        "--rotation",
+        type=int,
+        default=0,
+        help="Rotation angle in degrees (default: '%(default)s')",
+    )
+    rotate_parser.add_argument(
+        "-cw",
+        "--clockwise",
+        action="store_true",
+        help="Rotate clockwise (default: '%(default)s)",
+    )
 def run(args: argparse.Namespace) -> None:
     """Run rotate subcommand.
@@ -52,10 +67,14 @@ def run(args: argparse.Namespace) -> None:
     """
     log.debug(args)
+    rotation = args.rotation
+    if args.clockwise:
+        rotation = -rotation
     for image_filename in args.image_filenames:
         original_image = Image.open(image_filename)
         rotated_image = original_image.rotate(
-            180,
+            rotation,
             expand=True,
         )
         save_image(args, rotated_image, image_filename, "rotate")

{fotolab-0.22.0/fotolab → fotolab-0.25.1/fotolab/subcommands}/sharpen.py RENAMED Viewed

@@ -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-0.22.0/fotolab → fotolab-0.25.1/fotolab/subcommands}/watermark.py RENAMED Viewed

@@ -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
@@ -19,10 +19,10 @@ import argparse
 import logging
 import math
-from PIL import Image, ImageColor, ImageDraw, ImageFont
+from PIL import Image, ImageColor, ImageDraw, ImageFont, ImageSequence
 from fotolab import save_image
-from fotolab.info import camera_metadata
+from fotolab.subcommands.info import camera_metadata
 log = logging.getLogger(__name__)
@@ -157,13 +157,72 @@ def run(args: argparse.Namespace) -> None:
     log.debug(args)
     for image_filename in args.image_filenames:
-        watermarked_image = watermark_image(image_filename, args)
-        save_image(args, watermarked_image, image_filename, "watermark")
+        image = Image.open(image_filename)
+        if image.format == "GIF":
+            watermark_gif_image(image, args)
+        else:
+            watermarked_image = watermark_non_gif_image(image, args)
+            save_image(args, watermarked_image, image_filename, "watermark")
-def watermark_image(image_filename, args):
+def watermark_gif_image(original_image: Image.Image, args: argparse.Namespace):
+    """Watermark the image."""
+    watermarked_image = original_image.copy()
+    frames = []
+    for frame in ImageSequence.Iterator(original_image):
+        frame = frame.convert("RGBA")
+        draw = ImageDraw.Draw(frame)
+        font = ImageFont.load_default(calc_font_size(original_image, args))
+        log.debug("default font: %s", " ".join(font.getname()))
+        text = args.text
+        if args.camera and camera_metadata(original_image):
+            text = camera_metadata(original_image)
+        if args.lowercase:
+            text = text.lower()
+        (left, top, right, bottom) = draw.textbbox(
+            xy=(0, 0), text=text, font=font
+        )
+        text_width = right - left
+        text_height = bottom - top
+        (position_x, position_y) = calc_position(
+            watermarked_image,
+            text_width,
+            text_height,
+            args.position,
+            calc_padding(original_image, args),
+        )
+        draw.text(
+            (position_x, position_y),
+            text,
+            font=font,
+            fill=(*ImageColor.getrgb(args.font_color), 128),
+            stroke_width=calc_font_outline_width(original_image, args),
+            stroke_fill=(*ImageColor.getrgb(args.outline_color), 128),
+        )
+        frames.append(frame)
+    frames[0].save(
+        "foo.gif",
+        format="GIF",
+        append_images=frames[1:],
+        save_all=True,
+        duration=original_image.info.get("duration", 100),
+        loop=original_image.info.get("loop", 0),
+        disposal=original_image.info.get("disposal", 2),
+    )
+def watermark_non_gif_image(
+    original_image: Image.Image, args: argparse.Namespace
+):
     """Watermark the image."""
-    original_image = Image.open(image_filename)
     watermarked_image = original_image.copy()
     draw = ImageDraw.Draw(watermarked_image)
@@ -172,8 +231,8 @@ def watermark_image(image_filename, args):
     log.debug("default font: %s", " ".join(font.getname()))
     text = args.text
-    if args.camera and camera_metadata(image_filename):
-        text = camera_metadata(image_filename)
+    if args.camera and camera_metadata(original_image):
+        text = camera_metadata(original_image)
     if args.lowercase:
         text = text.lower()
@@ -237,19 +296,14 @@ def calc_padding(image, args) -> int:
 def calc_position(image, text_width, text_height, position, padding) -> tuple:
     """Calculate the boundary coordinates of the watermark text."""
-    (position_x, position_y) = (0, 0)
-    if position == "top-left":
-        position_x = 0 + padding
-        position_y = 0 + padding
-    elif position == "top-right":
-        position_x = image.width - text_width - padding
-        position_y = 0 + padding
-    elif position == "bottom-left":
-        position_x = 0 + padding
-        position_y = image.height - text_height - padding
-    elif position == "bottom-right":
-        position_x = image.width - text_width - padding
-        position_y = image.height - text_height - padding
-    return (position_x, position_y)
+    positions = {
+        "top-left": (padding, padding),
+        "top-right": (image.width - text_width - padding, padding),
+        "bottom-left": (padding, image.height - text_height - padding),
+        "bottom-right": (
+            image.width - text_width - padding,
+            image.height - text_height - padding,
+        ),
+    }
+    return positions.get(position, (0, 0))