fotolab 0.33.0__py3-none-any.whl → 0.33.2__py3-none-any.whl

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/__main__.py

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

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

@@ -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.dist-info → fotolab-0.33.2.dist-info}/RECORD

@@ -1,5 +1,5 @@
-fotolab/__init__.py,sha256=Wb9aauJu-aXInocnVSuzUwpWoMSC6moNLQ1dLORbEgQ,3442
-fotolab/__main__.py,sha256=aboOURPs_snOXTEWYR0q8oq1UTY9e-NxCd1j33V0wHI,833
+fotolab/__init__.py,sha256=IJXouBpHQPUSSB2Hrev5CPxWEdU73GkIwuVBvdxvrJA,3114
+fotolab/__main__.py,sha256=Wk11t_zKs3wJ-okM3yv7Mtj1pRwQZu3NCmpteBwn4Hs,810
 fotolab/cli.py,sha256=oFiQXmsu3wIsM_DpZnL4B94sAoB62L16Am-cjxGmosY,4406
 fotolab/subcommands/__init__.py,sha256=l3DlIaJ3u3jGjnC1H1yV8LZ_nPqOLJ6gikD4BCaMAQ0,1129
 fotolab/subcommands/animate.py,sha256=iEor831HVQtQ04Y2-kHxnU4--BfS75mXggVIblxrO6g,5881
@@ -10,13 +10,13 @@ fotolab/subcommands/env.py,sha256=QoxRvzZKgmoHTUxDV4QYhdChCpMWs5TbXFY_qIpIQpE,14
 fotolab/subcommands/halftone.py,sha256=56RRkyIhCyc6MPBujV2PIbuR9HobuFhqVQaq58A5ivQ,6781
 fotolab/subcommands/info.py,sha256=H3voMi67cKoHT2Mu4RUNQBPdb_MspetPjhOvy-YyNnE,3563
 fotolab/subcommands/montage.py,sha256=ax-TG5FixBRFHPGkVTq8kOtRL900K6nujeBYHZ0yBAE,2622
-fotolab/subcommands/resize.py,sha256=dMjgy52zrCIYpuvdOHyoP46X-jBolXNi0PLIQ-0x7eE,5473
+fotolab/subcommands/resize.py,sha256=d1-_xoTB8Vf62bm7H_9MfXrMaJhlzLiUbePgTdYzaKs,5816
 fotolab/subcommands/rotate.py,sha256=-yZ7pNW7PDOPBWbKPDut9z8bBe1NocfVBV_6V6tqq-4,2945
 fotolab/subcommands/sharpen.py,sha256=vGBJHHHUaQ2_SHS-E1mHfNVIfnnNYcCk5ritajWTik8,3594
 fotolab/subcommands/watermark.py,sha256=BkUa1tH86Ii_u03ypj9Tm0u9v7s9y9Jiz3aLpjmFDb8,11355
-fotolab-0.33.0.dist-info/licenses/LICENSE.md,sha256=tGtFDwxWTjuR9syrJoSv1Hiffd2u8Tu8cYClfrXS_YU,31956
-fotolab-0.33.0.dist-info/METADATA,sha256=T9V46riOT9o4ZsKI4gmTaxJ7VgdDVzvNo5YqTEnasfs,14765
-fotolab-0.33.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-fotolab-0.33.0.dist-info/entry_points.txt,sha256=0e1go9plFpqj5FP-OpV2acxTAx3ViI59PMXuhejvgcQ,45
-fotolab-0.33.0.dist-info/top_level.txt,sha256=XUJ3gdpsbjohoZCLdVlbQrxAUDkbQg7WwGQG2DaN0t4,8
-fotolab-0.33.0.dist-info/RECORD,,
+fotolab-0.33.2.dist-info/licenses/LICENSE.md,sha256=tGtFDwxWTjuR9syrJoSv1Hiffd2u8Tu8cYClfrXS_YU,31956
+fotolab-0.33.2.dist-info/METADATA,sha256=FSxPx0SV3Pbjy8ViHYTC9Yojsary_ILD2-YnbjfLHJY,14814
+fotolab-0.33.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+fotolab-0.33.2.dist-info/entry_points.txt,sha256=0e1go9plFpqj5FP-OpV2acxTAx3ViI59PMXuhejvgcQ,45
+fotolab-0.33.2.dist-info/top_level.txt,sha256=XUJ3gdpsbjohoZCLdVlbQrxAUDkbQg7WwGQG2DaN0t4,8
+fotolab-0.33.2.dist-info/RECORD,,