Be verbose about skipping work

Also, move the exposure calculation inside need-to-do-anything?
conditional, reducing the do-nothing case from two forks to one.

diff --git a/pics-preprocess b/pics-preprocess
index 8b8dcb4f4be6fd0fc1e01e770d228739ae99893f..6563cab5afb15d4d500d9d70da474b24b7c7525e 100755 (executable)
--- a/pics-preprocess
+++ b/pics-preprocess
@@ -13,16 +13,22 @@ for f;do
       mkdir -p {,sm/}"$level"
       base="$(basename "$f")"
       out="$level/${base%.NEF}.jpeg"
       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
+      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
         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
         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

       convert "$f" -geometry "x$SMALLHEIGHT" "sm/$f"
     fi
   fi
       convert "$f" -geometry "x$SMALLHEIGHT" "sm/$f"
     fi
   fi