From: Daniel Axtens <dja@ucc.asn.au>
Date: Fri, 8 Apr 2011 08:11:56 +0000 (+0800)
Subject: Made some auto-detection of work already done work; enabled another force flag.
X-Git-Url: https://git.ucc.asn.au/?p=dja%2Fscandal.git;a=commitdiff_plain;h=5a22e3f88799a29482d078ba4e8ca76c5f4af3cc

Made some auto-detection of work already done work; enabled another force flag.
---

diff --git a/scan2pages.sh b/scan2pages.sh
index 9c08f6a..025205d 100755
--- a/scan2pages.sh
+++ b/scan2pages.sh
@@ -7,7 +7,7 @@ Convert pdffile - a pdf of scanned facing pages - to a set of images in outdir,
 each with only one page.
 OPTIONS:
 	-v: Be verbose.
-	-d depth: Use given depth. Default is 1 for black and white, 8 for colour.
+	-d depth: Use given depth. Default is 1 for black and white, 8 for colour/gray.
 		Unpaper can only handle up to 8.
 	-D dpi: Use given DPI. Colour scans on library scanners are usually 300, bw 400.
 	-F extension: use the output format signified by the extension. Default is png
@@ -15,7 +15,7 @@ OPTIONS:
 	-f: Forceably redo everything.
 	-p: Forceably redo pdf conversion. Implies options below, equivalent to -f.
 	-m: Forceably redo masking/trimming and other preprocessing. Impiles options below.
-	-u: Forceably redo unpaper processing. Implies option below. IGNORED
+	-u: Forceably redo unpaper processing. Implies option below.
 	-t: Forceably redo final trimming and cleaning. IGNORED
 	-b: Optimize for BeBook One.
 __EOF__
@@ -132,14 +132,14 @@ for pg in `$my_seq 1 $pages`; do
 	
 	# convert from pdf
 	origpnm=$dir/pg-${pgn}.pnm
-	if [[ ! $([ -e $origpnm ]) || $forcepdf ]]; then
+	if [ ! -e $origpnm ] || [[ $forcepdf ]]; then
 		convert $convertflags -depth $depth -density $dpi $file[$(expr $pg - 1)] \
 			$origpnm || exit 1
 	fi;
 	
 	# preprocess it!
 	preppnm=$dir/pg-pp-${pgn}.pnm
-	if [[ ! $skipmask && ( ! $([ -e $preppnm ]) || $forcemask ) ]]; then
+	if [[ ! $skipmask ]] && ( [ ! -e $preppnm ] || [[ $forcemask ]] ); then
 		# create mask: 
 		# ... downscale, blur,
 		convert $convertflags -resize 10% -depth 8 -blur 10 -median 2 $origpnm $dir/pg-mask-${pgn}.pnm ||exit 1
@@ -163,10 +163,11 @@ for pg in `$my_seq 1 $pages`; do
 	
 	#unpaper it
 	#names go a bit funny here
-	#also, ignore flags starting here
-	unppnm=$dir/upg-${pgn}-%01d.pnm
-	unpaper $unpaperflags --layout double --overwrite --no-blackfilter -ni 10 -op 2 $preppnm $unppnm || exit 1
-
+	unppnmbase=$dir/upg-${pgn}
+	if [ ! -e ${unppnmbase}-1.pnm ] || [ ! -e ${unppnmbase}-2.pnm ] || [[ $forceunpaper ]]; then
+		unpaper $unpaperflags --layout double --overwrite --no-blackfilter -ni 10 -op 2 $preppnm ${unppnmbase}-%01d.pnm || exit 1
+	fi;
+	
 	#detect if the page is 2-up
 	for subpg in $($my_seq 1 2); do
 		echo Processing subpg ${subpg}.