fotolab 0.33.0__tar.gz → 0.33.2__tar.gz

{fotolab-0.33.0/src/fotolab.egg-info → fotolab-0.33.2}/PKG-INFO

@@ -1,6 +1,7 @@
 Metadata-Version: 2.4
 Name: fotolab
-Version: 0.33.0
+Version: 0.33.2
+Summary: A console program to manipulate photos.
 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

{fotolab-0.33.0 → fotolab-0.33.2}/pyproject.toml

@@ -7,7 +7,8 @@ where = ["src"]
 
 [project]
 name = "fotolab"
-version = "0.33.0"
+version = "0.33.2"
+description = "A console program to manipulate photos."
 authors = [{name = "Kian-Meng Ang", email = "kianmeng@cpan.org"}]
 requires-python = ">=3.9"
 readme = "README.md"

{fotolab-0.33.0 → fotolab-0.33.2}/src/fotolab/__init__.py

@@ -45,12 +45,10 @@ def save_gif_image(
         "loop": 0,
         "optimize": True,
     }
-    _save_image_with_options(
-        args, original_image, image_filepath, subcommand, **gif_kwargs
-    )
+    save_image(args, original_image, image_filepath, subcommand, **gif_kwargs)
 
 
-def _save_image_with_options(
+def save_image(
     args: argparse.Namespace,
     image: Image.Image,
     output_filepath: Path,
@@ -74,20 +72,6 @@ def _save_image_with_options(
         _open_image(new_filename)
 
 
-def save_image(
-    args: argparse.Namespace,
-    new_image: Image.Image,
-    output_filepath: Path,
-    subcommand: str,
-) -> None:
-    """Save image after image operation.
-
-    Returns:
-        None
-    """
-    _save_image_with_options(args, new_image, output_filepath, subcommand)
-
-
 def _get_output_filename(
     args: argparse.Namespace, image_file: Path, subcommand: str
 ) -> Path:

{fotolab-0.33.0 → fotolab-0.33.2}/src/fotolab/__main__.py

@@ -19,4 +19,3 @@ from fotolab.cli import main
 
 if __name__ == "__main__":
     main()
-    raise SystemExit()

{fotolab-0.33.0 → fotolab-0.33.2}/src/fotolab/subcommands/resize.py

@@ -168,26 +168,26 @@ def _resize_image(original_image, args):
 
 
 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_width = args.width
+    new_height = args.height
 
-        new_height = math.ceil(args.width * aspect_ratio)
-        log.debug("new height: %d", new_height)
+    original_aspect_ratio = old_width / old_height
 
-    if args.height != DEFAULT_HEIGHT:
-        aspect_ratio = old_width / old_height
-        log.debug("aspect ratio: %f", aspect_ratio)
+    if new_width != DEFAULT_WIDTH and new_height == DEFAULT_HEIGHT:
+        # user provided width, calculate height to maintain aspect ratio
+        new_height = math.ceil(new_width / original_aspect_ratio)
+        log.debug("new height calculated based on width: %d", new_height)
+    elif new_height != DEFAULT_HEIGHT and new_width == DEFAULT_WIDTH:
+        # user provided height, calculate width to maintain aspect ratio
+        new_width = math.ceil(new_height * original_aspect_ratio)
+        log.debug("new width calculated based on height: %d", new_width)
 
-        new_width = math.floor(args.height * aspect_ratio)
-        log.debug("new width: %d", new_width)
+    # if both are default, no calculation needed, use defaults
+    # due to argparse's mutually exclusive group, it's not possible for both
+    # new_width and new_height to be non-default when --canvas is False
 
     log.debug("new image dimension: %d x %d", new_width, new_height)
-
     return (new_width, new_height)

{fotolab-0.33.0 → fotolab-0.33.2/src/fotolab.egg-info}/PKG-INFO

@@ -1,6 +1,7 @@
 Metadata-Version: 2.4
 Name: fotolab
-Version: 0.33.0
+Version: 0.33.2
+Summary: A console program to manipulate photos.
 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