fotolab 0.22.1__tar.gz → 0.23.0__tar.gz

fotolab-0.23.0/.python-version

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

{fotolab-0.22.1 → fotolab-0.23.0}/CHANGELOG.md

@@ -7,6 +7,14 @@ and this project adheres to [0-based versioning](https://0ver.org/).
 
 ## [Unreleased]
 
+## 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

{fotolab-0.22.1 → fotolab-0.23.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fotolab
-Version: 0.22.1
+Version: 0.23.0
 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 !-->

{fotolab-0.22.1 → fotolab-0.23.0}/README.md

@@ -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 !-->

{fotolab-0.22.1 → fotolab-0.23.0}/fotolab/__init__.py

@@ -21,7 +21,7 @@ import subprocess
 import sys
 from pathlib import Path
 
-__version__ = "0.22.1"
+__version__ = "0.23.0"
 
 log = logging.getLogger(__name__)
 

{fotolab-0.22.1 → fotolab-0.23.0}/fotolab/cli.py

@@ -32,26 +32,31 @@ 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:
-        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"
-        )
+        return
 
-        logging.basicConfig(
-            level=level,
-            format=format_string,
-            stream=sys.stdout,
-            datefmt="%Y-%m-%d %H:%M:%S",
-        )
+    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:

{fotolab-0.22.1 → fotolab-0.23.0}/fotolab/subcommands/rotate.py

@@ -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.1 → fotolab-0.23.0}/fotolab/subcommands/watermark.py

@@ -237,19 +237,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))

fotolab-0.22.1/.python-version

@@ -1,5 +0,0 @@
-3.9.20
-3.10.15
-3.11.10
-3.12.7
-3.13.0