Use the correct filename for deleting

[picsort] / pics-preprocess

diff --git a/pics-preprocess b/pics-preprocess
index 780acdc794657b6f875e7aaee07d0c9f53fa2e90..a67f460eb1ef665efa132da12459b78fde222bf3 100755 (executable)
--- a/pics-preprocess
+++ b/pics-preprocess
@@ -4,9 +4,6 @@
 # This makes many variants of each .NEF file at different exposure levels
 # and makes reduced-size versions for faster browsing.
 
-GREEN=1.105
-TEMPERATURE=5500
-JPEGCOMPRESSION=95
 SMALLHEIGHT=700
 
 
@@ -16,22 +13,23 @@ for f;do
       mkdir -p {,sm/}"$level"
       base="$(basename "$f")"
       out="$level/${base%.NEF}.jpeg"
-      exposure=$(dc <<< "2k $level 4 / 3.5-p")  # 10 to 30 -> -1 to 4 in .25 steps
-      if [[ ! -s "$out" ]];then
-        ufraw-batch --out-type=jpeg \
-                    --green="$GREEN" \
-                    --temperature="$TEMPERATURE" \
-                    --compression="$JPEGCOMPRESSION" \
-                    --exposure="$exposure" \
-                    --output="$out" \
-                    "$f"
+      if [[ -s "$out" ]];then
+        echo "Skipping $out"
+      else
+        exposure=$(dc <<< "2k $level 4 / 3.5-p")  # 10 to 30 -> -1 to 4 in .25 steps
+        pics-run-ufraw "$exposure" "$f" "$out"
       fi
-      if [[ ! -s "sm/$out" ]];then
+      if [[ -s "sm/$out" ]];then
+        echo "Skipping sm/$out"
+      else
         convert "$out" -geometry "x$SMALLHEIGHT" "sm/$out"
       fi
     done
   else
-    if [[ ! -s "sm/$f" ]];then
+    if [[ -s "sm/$f" ]];then
+      echo "Skipping sm/$f"
+    else
+      mkdir -p sm
       convert "$f" -geometry "x$SMALLHEIGHT" "sm/$f"
     fi
   fi