X-Git-Url: http://git.scottworley.com/picsort/blobdiff_plain/9952a1a7aaa0eb9254668d70b69d845f5f2fd984..36c88e594034eb6c25b711d0926d213434817ee5:/pics-preprocess?ds=sidebyside

diff --git a/pics-preprocess b/pics-preprocess
index 87eca8c..6563cab 100755
--- a/pics-preprocess
+++ b/pics-preprocess
@@ -1,27 +1,35 @@
 #!/bin/bash
 
-# Pass .NEF files as $@.
-# This makes many variants of each one at different exposure levels. 
+# Pass .NEF and .jpeg files as $@.
+# 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
 
 
 for f;do
-  for level in {10..30};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
-    ufraw-batch --out-type=jpeg \
-                --green="$GREEN" \
-                --temperature="$TEMPERATURE" \
-                --compression="$JPEGCOMPRESSION" \
-                --exposure="$exposure" \
-                --output="$out" \
-                "$f"
-    convert "$out" -geometry "x$SMALLHEIGHT" "sm/$out"
-  done
+  if [[ "$f" == *.NEF ]];then
+    for level in {10..30};do
+      mkdir -p {,sm/}"$level"
+      base="$(basename "$f")"
+      out="$level/${base%.NEF}.jpeg"
+      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
+        echo "Skipping sm/$out"
+      else
+        convert "$out" -geometry "x$SMALLHEIGHT" "sm/$out"
+      fi
+    done
+  else
+    if [[ -s "sm/$f" ]];then
+      echo "Skipping sm/$f"
+    else
+      convert "$f" -geometry "x$SMALLHEIGHT" "sm/$f"
+    fi
+  fi
 done