From ceeaedc76708bdc0489a1afe6091f3b2ae9a4da6 Mon Sep 17 00:00:00 2001 From: Toke Eskildsen <te@ekot.dk> Date: Mon, 13 Jan 2014 13:35:41 +0100 Subject: [PATCH] Related to #31: Shows progress for image pages, but not image processing --- quack.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/quack.sh b/quack.sh index af67d42..bfe0e75 100755 --- a/quack.sh +++ b/quack.sh @@ -698,8 +698,9 @@ function makePreviewPage() { if [ "true" != "$FORCE_PAGES" -a -e "$P" ]; then return fi - - echo " - ${P##*/}" +*** + TOTAL_PROCESSED=$((TOTAL_PROCESSED)) + echo " - ${P##*/} (${TOTAL_PROCESSED}/${TOTAL_IMAGES})" local ALTO_FILE="${BASE}${ALTO_EXT}" processALTO "$SRC_FOLDER" "$DEST_FOLDER" "$ALTO_FILE" $IMAGE_WIDTH $IMAGE_HEIGHT @@ -953,6 +954,10 @@ function makeIndex() { echo "Quack starting at `date`" copyFiles +pushd "$SOURCE" > /dev/null +TOTAL_IMAGES=`ls -R $IMAGE_GLOB 2> /dev/null | wc -l` +TOTAL_PROCESSED=0 +popd > /dev/null makeIndex "" "" "$SOURCE" "$DEST" echo "All done at `date`" echo "Please open ${DEST}/index.html in a browser" -- GitLab