Support .jpeg files mixed in with .NEF files

[picsort] / pics-preprocess

diff --git a/pics-preprocess b/pics-preprocess
index d5400602b06f8ec5c2f8b579c3cdd733abd7336e..780acdc794657b6f875e7aaee07d0c9f53fa2e90 100755 (executable)
--- a/pics-preprocess
+++ b/pics-preprocess
@@ -1,25 +1,38 @@
 #!/bin/bash
 
 #!/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
 
 GREEN=1.105
 TEMPERATURE=5500
 JPEGCOMPRESSION=95

+SMALLHEIGHT=700

 
 
 for f;do
 
 
 for f;do

-  for level in {10..30};do
-    mkdir -p "$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"
-  done
+  if [[ "$f" == *.NEF ]];then
+    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
+      if [[ ! -s "$out" ]];then
+        ufraw-batch --out-type=jpeg \
+                    --green="$GREEN" \
+                    --temperature="$TEMPERATURE" \
+                    --compression="$JPEGCOMPRESSION" \
+                    --exposure="$exposure" \
+                    --output="$out" \
+                    "$f"
+      fi
+      if [[ ! -s "sm/$out" ]];then
+        convert "$out" -geometry "x$SMALLHEIGHT" "sm/$out"
+      fi
+    done
+  else
+    if [[ ! -s "sm/$f" ]];then
+      convert "$f" -geometry "x$SMALLHEIGHT" "sm/$f"
+    fi
+  fi

 done
 done