bugfix and examples

functorism · Oct 9, 2023 · 06b66ee · 06b66ee
1 parent 4cf96a2
commit 06b66ee
Show file tree

Hide file tree

Showing 29 changed files with 63 additions and 6 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "snapcrop"
 description = "CLI for crop/resize of large amounts of images with configurable resolutions"
-version = "0.1.0"
+version = "0.1.1"
 edition = "2021"
 license = "MIT"
 

diff --git a/README.md b/README.md
@@ -81,6 +81,50 @@ Options:
           Print help (see a summary with '-h')
 ```
 
+## Visual examples
+
+```
+snapcrop squares --res 256
+```
+![](./examples/squares/4de26fac0cc3162259bf785a64e836fb88e5550082ff2233d8f58de5263facf6.png)
+![](./examples/squares/50a5a51eb1d57307579b86508196fbb44fb770e7cd170257f573b3260b0b8feb.png)
+![](./examples/squares/653d96fb41779dda5ff6cc7a10745d33f4775e1267cd232403854b3656028678.png)
+![](./examples/squares/6b6fe23717af8d18ca11788013f0e789d90e40f6f4debff0cd2fcfb725d2a7d4.png)
+
+```
+snapcrop landscape --res 256x128
+```
+![](./examples/landscape/4de26fac0cc3162259bf785a64e836fb88e5550082ff2233d8f58de5263facf6.png)
+![](./examples/landscape/50a5a51eb1d57307579b86508196fbb44fb770e7cd170257f573b3260b0b8feb.png)
+![](./examples/landscape/653d96fb41779dda5ff6cc7a10745d33f4775e1267cd232403854b3656028678.png)
+![](./examples/landscape/6b6fe23717af8d18ca11788013f0e789d90e40f6f4debff0cd2fcfb725d2a7d4.png)
+
+
+```
+snapcrop portrait --res 128x256
+```
+![](./examples/portrait/4de26fac0cc3162259bf785a64e836fb88e5550082ff2233d8f58de5263facf6.png)
+![](./examples/portrait/50a5a51eb1d57307579b86508196fbb44fb770e7cd170257f573b3260b0b8feb.png)
+![](./examples/portrait/653d96fb41779dda5ff6cc7a10745d33f4775e1267cd232403854b3656028678.png)
+![](./examples/portrait/6b6fe23717af8d18ca11788013f0e789d90e40f6f4debff0cd2fcfb725d2a7d4.png)
+
+
+```
+snapcrop mixed --res 256,[128x256]
+```
+![](./examples/mixed/4de26fac0cc3162259bf785a64e836fb88e5550082ff2233d8f58de5263facf6.png)
+![](./examples/mixed/50a5a51eb1d57307579b86508196fbb44fb770e7cd170257f573b3260b0b8feb.png)
+![](./examples/mixed/653d96fb41779dda5ff6cc7a10745d33f4775e1267cd232403854b3656028678.png)
+![](./examples/mixed/6b6fe23717af8d18ca11788013f0e789d90e40f6f4debff0cd2fcfb725d2a7d4.png)
+
+```
+snapcrop steps --res [128:256:8x128:256:8]
+```
+![](./examples/steps/4de26fac0cc3162259bf785a64e836fb88e5550082ff2233d8f58de5263facf6.png)
+![](./examples/steps/50a5a51eb1d57307579b86508196fbb44fb770e7cd170257f573b3260b0b8feb.png)
+![](./examples/steps/653d96fb41779dda5ff6cc7a10745d33f4775e1267cd232403854b3656028678.png)
+![](./examples/steps/6b6fe23717af8d18ca11788013f0e789d90e40f6f4debff0cd2fcfb725d2a7d4.png)
+
 ## Dependencies
 The main libraries this CLI uses are:
 
@@ -90,4 +134,4 @@ The main libraries this CLI uses are:
 - rayon: For parallel processing.
 - clap: For command-line argument parsing.
 - simplelog: For logging.
-- blake3: For hashing the image content.
+- blake3: For hashing the image content.
diff --git a/.../landscape/4de26fac0cc3162259bf785a64e836fb88e5550082ff2233d8f58de5263facf6.png b/.../landscape/4de26fac0cc3162259bf785a64e836fb88e5550082ff2233d8f58de5263facf6.png
diff --git a/.../landscape/50a5a51eb1d57307579b86508196fbb44fb770e7cd170257f573b3260b0b8feb.png b/.../landscape/50a5a51eb1d57307579b86508196fbb44fb770e7cd170257f573b3260b0b8feb.png
diff --git a/.../landscape/653d96fb41779dda5ff6cc7a10745d33f4775e1267cd232403854b3656028678.png b/.../landscape/653d96fb41779dda5ff6cc7a10745d33f4775e1267cd232403854b3656028678.png
diff --git a/.../landscape/6b6fe23717af8d18ca11788013f0e789d90e40f6f4debff0cd2fcfb725d2a7d4.png b/.../landscape/6b6fe23717af8d18ca11788013f0e789d90e40f6f4debff0cd2fcfb725d2a7d4.png
diff --git a/...ples/mixed/4de26fac0cc3162259bf785a64e836fb88e5550082ff2233d8f58de5263facf6.png b/...ples/mixed/4de26fac0cc3162259bf785a64e836fb88e5550082ff2233d8f58de5263facf6.png
diff --git a/...ples/mixed/50a5a51eb1d57307579b86508196fbb44fb770e7cd170257f573b3260b0b8feb.png b/...ples/mixed/50a5a51eb1d57307579b86508196fbb44fb770e7cd170257f573b3260b0b8feb.png
diff --git a/...ples/mixed/653d96fb41779dda5ff6cc7a10745d33f4775e1267cd232403854b3656028678.png b/...ples/mixed/653d96fb41779dda5ff6cc7a10745d33f4775e1267cd232403854b3656028678.png
diff --git a/...ples/mixed/6b6fe23717af8d18ca11788013f0e789d90e40f6f4debff0cd2fcfb725d2a7d4.png b/...ples/mixed/6b6fe23717af8d18ca11788013f0e789d90e40f6f4debff0cd2fcfb725d2a7d4.png
diff --git a/...s/portrait/4de26fac0cc3162259bf785a64e836fb88e5550082ff2233d8f58de5263facf6.png b/...s/portrait/4de26fac0cc3162259bf785a64e836fb88e5550082ff2233d8f58de5263facf6.png
diff --git a/...s/portrait/50a5a51eb1d57307579b86508196fbb44fb770e7cd170257f573b3260b0b8feb.png b/...s/portrait/50a5a51eb1d57307579b86508196fbb44fb770e7cd170257f573b3260b0b8feb.png
diff --git a/...s/portrait/653d96fb41779dda5ff6cc7a10745d33f4775e1267cd232403854b3656028678.png b/...s/portrait/653d96fb41779dda5ff6cc7a10745d33f4775e1267cd232403854b3656028678.png
diff --git a/...s/portrait/6b6fe23717af8d18ca11788013f0e789d90e40f6f4debff0cd2fcfb725d2a7d4.png b/...s/portrait/6b6fe23717af8d18ca11788013f0e789d90e40f6f4debff0cd2fcfb725d2a7d4.png
diff --git a/examples/run.sh b/examples/run.sh
@@ -0,0 +1,9 @@
+#! /usr/bin/env bash
+
+rm -f {squares,landscape,portrait,mixed,steps}/*
+
+find source -type f | ../target/release/snapcrop squares --res 256
+find source -type f | ../target/release/snapcrop landscape --res 256x128
+find source -type f | ../target/release/snapcrop portrait --res 128x256
+find source -type f | ../target/release/snapcrop mixed --res "256,[128x256]"
+find source -type f | ../target/release/snapcrop steps --res "[128:256:8x128:256:8]"
diff --git a/examples/source/fruit-bowl-square.jpg b/examples/source/fruit-bowl-square.jpg
diff --git a/examples/source/mieming-panorama-landscape.jpg b/examples/source/mieming-panorama-landscape.jpg
diff --git a/examples/source/stockholm-landscape.jpg b/examples/source/stockholm-landscape.jpg
diff --git a/examples/source/stockholm-portrait.jpg b/examples/source/stockholm-portrait.jpg
diff --git a/...es/squares/4de26fac0cc3162259bf785a64e836fb88e5550082ff2233d8f58de5263facf6.png b/...es/squares/4de26fac0cc3162259bf785a64e836fb88e5550082ff2233d8f58de5263facf6.png
diff --git a/...es/squares/50a5a51eb1d57307579b86508196fbb44fb770e7cd170257f573b3260b0b8feb.png b/...es/squares/50a5a51eb1d57307579b86508196fbb44fb770e7cd170257f573b3260b0b8feb.png
diff --git a/...es/squares/653d96fb41779dda5ff6cc7a10745d33f4775e1267cd232403854b3656028678.png b/...es/squares/653d96fb41779dda5ff6cc7a10745d33f4775e1267cd232403854b3656028678.png
diff --git a/...es/squares/6b6fe23717af8d18ca11788013f0e789d90e40f6f4debff0cd2fcfb725d2a7d4.png b/...es/squares/6b6fe23717af8d18ca11788013f0e789d90e40f6f4debff0cd2fcfb725d2a7d4.png
diff --git a/...ples/steps/4de26fac0cc3162259bf785a64e836fb88e5550082ff2233d8f58de5263facf6.png b/...ples/steps/4de26fac0cc3162259bf785a64e836fb88e5550082ff2233d8f58de5263facf6.png
diff --git a/...ples/steps/50a5a51eb1d57307579b86508196fbb44fb770e7cd170257f573b3260b0b8feb.png b/...ples/steps/50a5a51eb1d57307579b86508196fbb44fb770e7cd170257f573b3260b0b8feb.png
diff --git a/...ples/steps/653d96fb41779dda5ff6cc7a10745d33f4775e1267cd232403854b3656028678.png b/...ples/steps/653d96fb41779dda5ff6cc7a10745d33f4775e1267cd232403854b3656028678.png
diff --git a/...ples/steps/6b6fe23717af8d18ca11788013f0e789d90e40f6f4debff0cd2fcfb725d2a7d4.png b/...ples/steps/6b6fe23717af8d18ca11788013f0e789d90e40f6f4debff0cd2fcfb725d2a7d4.png
diff --git a/src/main.rs b/src/main.rs
@@ -169,6 +169,8 @@ fn resize_and_crop(src_view: fr::DynamicImageView, res: Vec<(u32, u32)>) -> Resu
         })
         .ok_or_else(|| anyhow!("Could not find a valid resolution target"))?;
 
+    println!("{}x{} -> {}x{}", img_w, img_h, valid_w, valid_h);
+
     if img_w < valid_w || img_h < valid_h {
         return Err(anyhow!(
             "Image too small, skipping: {}x{} < {}x{}",
@@ -179,11 +181,12 @@ fn resize_and_crop(src_view: fr::DynamicImageView, res: Vec<(u32, u32)>) -> Resu
         ));
     }
 
-    // Determine the resize dimensions
     let (resize_w, resize_h) = if img_ratio > valid_w as f64 / valid_h as f64 {
-        (valid_w, (valid_w as f64 / img_ratio).round() as u32)
+        // If the image is more "landscape" than the target, match its height to the target height
+        ((img_w as f64 * valid_h as f64 / img_h as f64).round() as u32, valid_h)
     } else {
-        ((valid_h as f64 * img_ratio).round() as u32, valid_h)
+        // If the image is more "portrait" or equal to the target, match its width to the target width
+        (valid_w, (valid_w as f64 * img_h as f64 / img_w as f64).round() as u32)
     };
 
     // Resize the image while maintaining its original aspect ratio
@@ -283,6 +286,7 @@ fn main() -> Result<()> {
 
     res.sort();
     res.dedup();
+    res.reverse();
 
     // Ensure res is not empty and no dimension is 0
     if res.is_empty() || res.iter().any(|&(w, h)| w == 0 || h == 0) {