From: Scott Worley Date: Sun, 9 Mar 2014 06:49:03 +0000 (-0800) Subject: Be verbose about skipping work X-Git-Url: http://git.scottworley.com/picsort/commitdiff_plain/1365c024d315ebd2663e2b5c8303ae7447e9e85c?hp=1899b67c13aa5e1ab0f4851691999c85e4141ff7 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 8b8dcb4..6563cab 100755 --- 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" - 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 - 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 convert "$f" -geometry "x$SMALLHEIGHT" "sm/$f" fi fi