mirror of
https://github.com/flynx/ImageGrid.git
synced 2025-10-29 18:30:09 +00:00
updated scripts with the current versions...
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
parent
400a1e7044
commit
d9dd64e014
@ -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."
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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."
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user