From: Scott Worley Date: Sat, 1 Mar 2014 08:33:30 +0000 (-0800) Subject: Support NEF rotation in pic-mv X-Git-Url: http://git.scottworley.com/picsort/commitdiff_plain/7e0b085a9d4119886d17e66f57008e32d071cd5a?ds=inline;hp=7a7a7a750c91bd80e6c7ae0a564c8914bc48298c Support NEF rotation in pic-mv Move ufraw-batch invocation out into a separate file: pics-run-ufraw --- diff --git a/pic-mv b/pic-mv index 2774a69..e1e18ac 100755 --- a/pic-mv +++ b/pic-mv @@ -24,18 +24,20 @@ else number=1 fi +out="$destdir/$name $number.jpeg" + if [[ "$file" == *.NEF ]];then base="${file%.NEF}" if [[ "$rotate" ]];then - echo "NEF rotation not yet implemented" >&2 - exit 1 + numeric_exposure=$(dc <<< "2k $exposure 4 / 3.5-p") + pics-run-ufraw "$numeric_exposure" "$file" "$out" "$rotate" else - mv -vi "$exposure/$base.jpeg" "$destdir/$name $number.jpeg" - mv -vi "$file" "$destdir/$name $number.NEF" + mv -vi "$exposure/$base.jpeg" "$out" fi + mv -vi "$file" "$destdir/$name $number.NEF" else if [[ "$rotate" ]];then sed -i "s/^# ROBOTS_INSERT_THINGS_HERE\$/&\n\"$name $number.jpeg\" => $rotate," "$destdir/rotations.php" fi - mv -vi "$file" "$destdir/$name $number.jpeg" + mv -vi "$file" "$out" fi diff --git a/pics-preprocess b/pics-preprocess index 780acdc..8b8dcb4 100755 --- 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 @@ -18,13 +15,7 @@ for f;do 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" + pics-run-ufraw "$exposure" "$f" "$out" fi if [[ ! -s "sm/$out" ]];then convert "$out" -geometry "x$SMALLHEIGHT" "sm/$out" diff --git a/pics-run-ufraw b/pics-run-ufraw new file mode 100755 index 0000000..dc35b99 --- /dev/null +++ b/pics-run-ufraw @@ -0,0 +1,19 @@ +#!/bin/bash + +GREEN=1.105 +TEMPERATURE=5500 +JPEGCOMPRESSION=95 + +exposure=$1 +file=$2 +out=$3 +rotate=$4 + +ufraw-batch --out-type=jpeg \ + --green="$GREEN" \ + --temperature="$TEMPERATURE" \ + --compression="$JPEGCOMPRESSION" \ + --exposure="$exposure" \ + --output="$out" \ + $( [[ "$rotate" ]] && echo --rotate="$rotate" ) \ + "$file"