feat(pngquant): add --skip-if-larger option

It is extremely unstable when quality range is 0-100, disregarding almost all gains superior to 60% as "too lossy".
JamieMason · Feb 9, 2016 · 9904253 · 9904253
1 parent 908327a
commit 9904253
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 29 deletions.
diff --git a/README.md b/README.md
@@ -110,15 +110,16 @@ these guides.
 
     Options:
 
-      -d, --directory     directory of images to process
-      -a, --image-alpha   pre-process PNGs with ImageAlpha.app *
-      -j, --jpeg-mini     pre-process JPGs with JPEGmini.app **
-      -m, --min-quality   pngquant min quality parameter
-      -q, --quit          quit all apps when complete
-      -c, --no-color      disable color output
-      -h, --help          display this usage information
-      -e, --examples      display some example commands and uses
-      -v, --version       display the version number
+      -d, --directory     	directory of images to process
+      -a, --image-alpha   	pre-process PNGs with ImageAlpha.app *
+      -j, --jpeg-mini     	pre-process JPGs with JPEGmini.app **
+      -m, --min-quality   	pngquant min quality parameter
+      -s, --skip-if-larger	pngquant use --skip-if-larger
+      -q, --quit          	quit all apps when complete
+      -c, --no-color      	disable color output
+      -h, --help          	display this usage information
+      -e, --examples      	display some example commands and uses
+      -v, --version       	display the version number
 
     *  http://pngmini.com
     ** https://itunes.apple.com/us/app/jpegmini/id498944723

diff --git a/bin/imageOptim b/bin/imageOptim
@@ -32,6 +32,9 @@ while [ "$1" != "" ]; do
       shift;
       MIN_QUALITY="$1"
       ;;
+    -s | --skip-if-larger )
+      SKIP_IF_LARGER="true"
+      ;;
     -q | --quit )
       QUIT_ON_COMPLETE="true"
       ;;

diff --git a/bin/imageOptimBashLib b/bin/imageOptimBashLib
@@ -40,6 +40,9 @@ DIRECTORY_OPTION="false"
 # {Number} Optinally overriden with -m or --min-quality
 MIN_QUALITY="75"
 
+# {BooleanString} Optionally use -s or --skip-if-larger with pngquant
+SKIP_IF_LARGER="false"
+
 # {BooleanString} Optionally overridden with -a or --image-alpha.
 USE_IMAGE_ALPHA="false"
 
@@ -128,15 +131,16 @@ function usage {
   echo ""
   echo "Options:"
   echo ""
-  echo "  -d, --directory     directory of images to process"
-  echo "  -a, --image-alpha   pre-process PNGs with ImageAlpha.app *"
-  echo "  -j, --jpeg-mini     pre-process JPGs with JPEGmini.app **"
-  echo "  -m, --min-quality   pngquant min quality parameter"
-  echo "  -q, --quit          quit all apps when complete"
-  echo "  -c, --no-color      disable color output"
-  echo "  -h, --help          display this usage information"
-  echo "  -e, --examples      display some example commands and uses"
-  echo "  -v, --version       display the version number"
+  echo "  -d, --directory     	directory of images to process"
+  echo "  -a, --image-alpha   	pre-process PNGs with ImageAlpha.app *"
+  echo "  -j, --jpeg-mini     	pre-process JPGs with JPEGmini.app **"
+  echo "  -m, --min-quality   	pngquant min quality parameter"
+  echo "  -s, --skip-if-larger	pngquant use --skip-if-larger"
+  echo "  -q, --quit          	quit all apps when complete"
+  echo "  -c, --no-color      	disable color output"
+  echo "  -h, --help          	display this usage information"
+  echo "  -e, --examples      	display some example commands and uses"
+  echo "  -v, --version       	display the version number"
   echo ""
   echo "*  http://pngmini.com"
   echo "** https://itunes.apple.com/us/app/jpegmini/id498944723"
@@ -463,7 +467,11 @@ function get_jpegmini_app_name {
 function run_image_alpha {
   if [ "true" == "$USE_IMAGE_ALPHA" ]; then
     info "Running ImageAlpha..."
-    find "${TEMP_PATH}/png" -type f -print0 | xargs -n10 -P8 -0 "$PNGQUANT_PATH" --ext=.png --force --speed=1 --quality="$MIN_QUALITY"-100 --skip-if-larger --
+    local added_options
+    if [ "true" == "$SKIP_IF_LARGER" ]; then
+      added_options="--skip-if-larger"
+    fi
+    find "${TEMP_PATH}/png" -type f -print0 | xargs -n10 -P8 -0 "$PNGQUANT_PATH" --ext=.png --force --speed=1 --quality="$MIN_QUALITY"-100 ${added_options} --
   fi
 }
 

diff --git a/src/imageOptim b/src/imageOptim
@@ -32,6 +32,9 @@ while [ "$1" != "" ]; do
       shift;
       MIN_QUALITY="$1"
       ;;
+    -s | --skip-if-larger )
+      SKIP_IF_LARGER="true"
+      ;;
     -q | --quit )
       QUIT_ON_COMPLETE="true"
       ;;

diff --git a/src/imageOptimBashLib b/src/imageOptimBashLib
@@ -40,6 +40,9 @@ DIRECTORY_OPTION="false"
 # {Number} Optinally overriden with -m or --min-quality
 MIN_QUALITY="75"
 
+# {BooleanString} Optionally use -s or --skip-if-larger with pngquant
+SKIP_IF_LARGER="false"
+
 # {BooleanString} Optionally overridden with -a or --image-alpha.
 USE_IMAGE_ALPHA="false"
 
@@ -407,7 +410,11 @@ function get_jpegmini_app_name {
 function run_image_alpha {
   if [ "true" == "$USE_IMAGE_ALPHA" ]; then
     info "Running ImageAlpha..."
-    find "${TEMP_PATH}/png" -type f -print0 | xargs -n10 -P8 -0 "$PNGQUANT_PATH" --ext=.png --force --speed=1 --quality="$MIN_QUALITY"-100 --skip-if-larger --
+    local added_options
+    if [ "true" == "$SKIP_IF_LARGER" ]; then
+      added_options="--skip-if-larger"
+    fi
+    find "${TEMP_PATH}/png" -type f -print0 | xargs -n10 -P8 -0 "$PNGQUANT_PATH" --ext=.png --force --speed=1 --quality="$MIN_QUALITY"-100 ${added_options} --
   fi
 }
 

diff --git a/src/usage.txt b/src/usage.txt
@@ -2,15 +2,16 @@ Usage: imageoptim [options]
 
 Options:
 
-  -d, --directory     directory of images to process
-  -a, --image-alpha   pre-process PNGs with ImageAlpha.app *
-  -j, --jpeg-mini     pre-process JPGs with JPEGmini.app **
-  -m, --min-quality   pngquant min quality parameter
-  -q, --quit          quit all apps when complete
-  -c, --no-color      disable color output
-  -h, --help          display this usage information
-  -e, --examples      display some example commands and uses
-  -v, --version       display the version number
+  -d, --directory     	directory of images to process
+  -a, --image-alpha   	pre-process PNGs with ImageAlpha.app *
+  -j, --jpeg-mini     	pre-process JPGs with JPEGmini.app **
+  -m, --min-quality   	pngquant min quality parameter
+  -s, --skip-if-larger	pngquant use --skip-if-larger
+  -q, --quit          	quit all apps when complete
+  -c, --no-color      	disable color output
+  -h, --help          	display this usage information
+  -e, --examples      	display some example commands and uses
+  -v, --version       	display the version number
 
 *  http://pngmini.com
 ** https://itunes.apple.com/us/app/jpegmini/id498944723