WIP - Update bin/compress

Author: wibimaster

bin/compress

@@ -42,6 +42,12 @@ readonly REGEXP="^(.*)_(resize|crop)_(ldpi|mdpi|hdpi|xhdpi|xxhdpi|xxxhdpi)_(320|
 readonly SCRIPT_NAME=`basename "$0"`;
 readonly VERSION="1.0.0";
 
+if [[ -x "$(command -v convert)" ]]; then
+  CONVERT="convert"
+else
+  CONVERT="${DIR}/convert-im6.q16"
+fi
+
 ########################################
 ## Signal handler for SIGINT
 ## Returns:
@@ -105,19 +111,15 @@ function generate() {
   local width=$7
   local height=$8
 
+  mkdir -p ${IMAGE_DIR}/${name}
   for target_width in ${FORMATS_WIDTH[*]}
   do
     for target_dpi_name in "${!DPI[@]}"
     do
-      filename="${name}_${resize,,}_${target_dpi_name,,}_${target_width}"
+      filename="${name}/${target_dpi_name,,}_${target_width}"
       echo '------';
       info "File to generate: ${filename}"
 
-      if [[ -f "${IMAGE_DIR}/${filename}" ]]; then
-        info "  already done";
-        continue;
-      fi
-
       if [[ "$resize" == "RESIZE" ]]; then
         info "   Go to resize";
       elif [[ "$resize" == "CROP" ]]; then
@@ -136,17 +138,32 @@ function generate() {
         if [[ $new_width_dpi -gt $width ]]; then
           warn "Warning: new width superior to original width ($new_width_dpi VS $width)";
           crop_from=$(ceil $(echo "scale=2; ($new_real_width_dpi_ratio - $new_width_dpi)/2" | bc))
-          echo "CROP FROM = $crop_from";
-          $DIR/cwebp -q 80 -o $IMAGE_DIR/tmp.webp -resize $new_real_width_dpi_ratio 0 -- $file
-          $DIR/cwebp -q 80 -o $IMAGE_DIR/$filename.webp -crop $crop_from 0 $new_width_dpi $new_real_height_dpi_ratio -- $IMAGE_DIR/tmp.webp
-          rm $IMAGE_DIR/tmp.webp
-          convert $file -resize ${new_real_width_dpi_ratio}x${new_real_height_dpi_ratio} $IMAGE_DIR/tmp.jpg
-          convert $IMAGE_DIR/tmp.jpg -crop ${new_width_dpi}x${new_real_height_dpi_ratio}+${crop_from}+0 -quality 60 $IMAGE_DIR/$filename.jpg
-          rm $IMAGE_DIR/tmp.jpg
+          if [[ -f "${IMAGE_DIR}/${filename}.webp" ]]; then
+            info "  WebP already done";
+          else
+            $DIR/cwebp -q 80 -o $IMAGE_DIR/tmp.webp -resize $new_real_width_dpi_ratio 0 -- $file
+            $DIR/cwebp -q 80 -o $IMAGE_DIR/$filename.webp -crop $crop_from 0 $new_width_dpi $new_real_height_dpi_ratio -- $IMAGE_DIR/tmp.webp
+            rm $IMAGE_DIR/tmp.webp
+          fi
+          if [[ -f "${IMAGE_DIR}/${filename}.jpg" ]]; then
+            info "  JPG already done";
+          else
+            $CONVERT $file -resize ${new_real_width_dpi_ratio}x${new_real_height_dpi_ratio} $IMAGE_DIR/tmp.jpg
+            $CONVERT $IMAGE_DIR/tmp.jpg -crop ${new_width_dpi}x${new_real_height_dpi_ratio}+${crop_from}+0 -quality 60 $IMAGE_DIR/$filename.jpg
+            rm $IMAGE_DIR/tmp.jpg
+          fi
         else
           crop_from=$(ceil $(echo "scale=2; ($width - $new_width_dpi)/2" | bc))
-          $DIR/cwebp -q 80 -o $IMAGE_DIR/$filename.webp -crop $crop_from 0 $new_width_dpi $height -- $file
-          convert $file -crop ${new_width_dpi}x${height}+${crop_from}+0 -quality 60 $IMAGE_DIR/$filename.jpg
+          if [[ -f "${IMAGE_DIR}/${filename}.webp" ]]; then
+            info "  WebP already done";
+          else
+            $DIR/cwebp -q 80 -o $IMAGE_DIR/$filename.webp -crop $crop_from 0 $new_width_dpi $height -- $file
+          fi
+          if [[ -f "${IMAGE_DIR}/${filename}.jpg" ]]; then
+            info "  JPG already done";
+          else
+            $CONVERT $file -crop ${new_width_dpi}x${height}+${crop_from}+0 -quality 60 $IMAGE_DIR/$filename.jpg
+          fi
         fi
       else
         warn "   Unknown resize '${resize}'";