diff --git a/scripts/sync-flash.sh b/scripts/sync-flash.sh index 187f6f85..03eed2fe 100755 --- a/scripts/sync-flash.sh +++ b/scripts/sync-flash.sh @@ -166,7 +166,7 @@ while true ; do mkdir -vp "$DIR" - echo "Copying files from $1..." + echo "Copying files from ${BASE}/${DRIVE}..." $COPY $COPYFLAGS ${BASE}/${DRIVE}/* "$DIR" echo "Copying files: done." diff --git a/ui (gen4)/archive/media/img/my/work/process-archive.sh b/ui (gen4)/archive/media/img/my/work/process-archive.sh index 55fbd3b2..ad52036c 100755 --- a/ui (gen4)/archive/media/img/my/work/process-archive.sh +++ b/ui (gen4)/archive/media/img/my/work/process-archive.sh @@ -142,8 +142,7 @@ JSON_NAME="%-:1d/${METADATA_DIR}/%f.json" # - creates a file: $RAW-thumb.jpg # dcraw -c $RAW | pnmtojpeg -quality=90 > $JPG # - process raw and convert to jpeg (slow) -# TODO ignore (or err on) raw images located in the ARCHIVE_ROOT directly... -# ...to avoid creating directories outside of $ARCHIVE_ROOT... +# TODO ignore raw images located in the ARCHIVE_ROOT directly... # XXX need to also copy jpg originals to the preview dir (things that # were shot in jpeg in-camera)... @@ -272,6 +271,7 @@ cd "./${ARCHIVE_ROOT}" # make low-res previews... if [ -z $SKIP_PREVIEWS ] || [ $LOW_RES_PREVIEWS ] ; then + #find . -path '*hi-res (RAW)/*.jpg' -exec bash -c 'makepreview "$SIZE" "{}"' \; find . -path '*hi-res (RAW)/*.jpg' -print0 \ | xargs -0 -n 1 -P $THREADS -I {} bash -c 'makepreview "$SIZE" "{}"' fi diff --git a/ui (gen4)/archive/media/img/my/work/sync-flash.sh b/ui (gen4)/archive/media/img/my/work/sync-flash.sh index e280d0e5..03eed2fe 100755 --- a/ui (gen4)/archive/media/img/my/work/sync-flash.sh +++ b/ui (gen4)/archive/media/img/my/work/sync-flash.sh @@ -138,20 +138,19 @@ while true ; do esac fi + # XXX do a real three digit count... # single flash card... SCOUNT=`printf "%03d" $COUNT` if [ -z $MULTI ] ; then - DIR="${DATE}.${SCOUNT}" + DIR="${DATE}.${SCOUNT}${TITLE}" while [ -e *"$DIR"* ] ; do COUNT=$((COUNT+1)) SCOUNT=`printf "%03d" $COUNT` - DIR="${DATE}.${SCOUNT}" + DIR="${DATE}.${SCOUNT}${TITLE}" done BASE_DIR=$DIR - DIR="${DIR}${TITLE}" # multiple flash cards shoot... - # XXX need to check for matches on the root too... else BASE_DIR="${DATE}${TITLE}/" DIR="${BASE_DIR}/${DATE}.${SCOUNT}" @@ -167,7 +166,7 @@ while true ; do mkdir -vp "$DIR" - echo "Copying files from $1..." + echo "Copying files from ${BASE}/${DRIVE}..." $COPY $COPYFLAGS ${BASE}/${DRIVE}/* "$DIR" echo "Copying files: done."