# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1561887308 -7200
# Node ID ab1b43f959957b3548a79457246fc3ebb5cda394
# Parent  4d023db682334fc0ba0570d2a2d01a958b01ecc7
sane-backends/sane.cgi: do not limit parameters

diff -r 4d023db68233 -r ab1b43f95995 fake-sane/stuff/sane-fake.log
--- a/fake-sane/stuff/sane-fake.log	Sat Jun 29 09:29:50 2019 +0100
+++ b/fake-sane/stuff/sane-fake.log	Sun Jun 30 11:35:08 2019 +0200
@@ -1,1 +1,1 @@
-fake-sane/fake:brother:bus1;dev2,[fake] Brother MFC-8420|fake-sane/fake:hpoj:mlc:usb:psc_1200_series,[fake] Hewlett-Packard psc 1200 series|fake-sane/fake:hpaio::usb:PSC_1600_series:serial=MY5CJF3044L0,[fake] hp PSC_1600_series|fake-sane/fake:brother:bus1;dev2.patched,[fake+patched] Brother MFC-8420|fake-sane/fake:hpoj:mlc:usb:psc_1200_series.patched,[fake+patched] Hewlett-Packard psc 1200 series|fake-sane/fake:pixma:04A91709,[fake] PIXMA MP150|
+fake-sane/fake:brother:bus1;dev2,[fake] Brother MFC-8420|fake-sane/fake:hpoj:mlc:usb:psc_1200_series,[fake] Hewlett-Packard psc 1200 series|fake-sane/fake:hpaio::usb:PSC_1600_series:serial=MY5CJF3044L0,[fake] hp PSC_1600_series|fake-sane/fake:brother:bus1;dev2.patched,[fake+patched] Brother MFC-8420|fake-sane/fake:hpoj:mlc:usb:psc_1200_series.patched,[fake+patched] Hewlett-Packard psc 1200 series|fake-sane/fake:pixma:04A91709,[fake] CANON PIXMA MP150|
diff -r 4d023db68233 -r ab1b43f95995 sane-backends/stuff/tazpanel/sane.cgi
--- a/sane-backends/stuff/tazpanel/sane.cgi	Sat Jun 29 09:29:50 2019 +0100
+++ b/sane-backends/stuff/tazpanel/sane.cgi	Sun Jun 30 11:35:08 2019 +0200
@@ -44,8 +44,18 @@
 		CMD="$CMD -$i $j"
 		ARGS="$ARGS $j"
 	done
-	for i in mode source contrast brightness ; do
-		[ "$(xPOST $i)" ] && CMD="$CMD --$i '$(xPOST $i)'"
+	for i in $(POST) ; do
+		case $i in
+		preview|format|resolution|res_min|res_max|l_min|l_max);;
+		geometry_l|t_min|t_max|geometry_t|x_min|x_max|geometry_x);;
+		y_min|y_max|geometry_y|tmpreview|device|params);;
+		*)  v="$(xPOST $i)"; i="--${i//_/-}"
+		    case "$v" in
+			'')	;;
+			yes|no) CMD="$CMD $i=$v" ;;
+			*)	CMD="$CMD $i '$v'" ;;
+		    esac
+		esac
 	done
 	resolution=${1:-0}
 	if [ $resolution -eq 0 ]; then
@@ -72,12 +82,12 @@
 ')"
 		suf="png"; [ "$1" ] && suf="pnm"
 		cat <<EOT
-if convert -crop $c $mode $f /tmp/sane$$.$suf 2> /dev/null ; then
+if convert -crop $c $mode $f /tmp/sane$$.$suf ; then
 	cat /tmp/sane$$.$suf
 	rm -f /tmp/sane$$.$suf
 else
 	cat $f
-fi
+fi 2> /dev/null
 EOT
 		;;
 	*)	echo -n "scanimage -d '$(echo $device | sed 's/,.*//')' --resolution '$(inrange $resolution $(xPOST res_min) $(xPOST res_max))dpi'$CMD"
@@ -165,6 +175,7 @@
 	eval "$(getgeometry)" > $tmp.pnm 2> $tmp.err
 	if [ -s "$tmp.pnm" ]; then
 		convert $tmp.pnm $tmpreview > /dev/null 2>&1 ||
+		pnm2png < $tmp.pnm > $tmpreview ||
 		cp $tmp.pnm $tmpreview
 	else
 		error="$(sed 's|$|<br />|' $tmp.err)"
@@ -180,6 +191,18 @@
 [ -n "$error" ] && msg warn "$error"
 [ -n "$info" ] && msg tip "$info"
 if [ -z "$device" ]; then
+	suggested=""
+	while read exe pkg msg; do
+		[ "$(which $exe 2> /dev/null)" ] && continue
+		suggested="$suggested
+<li><a href=\"/user/pkgs.cgi?info=$pkg\">$pkg</a>&nbsp;$msg</li>"
+	done <<EOT
+convert		imagemagick	$(_ "to preview images and support more image formats (recommended)")
+gocr		gocr		$(_ "a basic optical character recognition")
+tesseract	tesseract-ocr	$(_ "a better optical character recognition")
+EOT
+	[ "$suggested" ] &&
+	msg tip "$(_ "You may need to install:") <ol>$suggested</ol>"
 	all="$(scanimage -f '%d,%v %m|'|\
 		cat - sane-fake.log fake-sane/sane-fake.log |sed 's/|/\n/g')"
 	case "$(echo "$all" | wc -l)" in
@@ -190,20 +213,23 @@
 			xhtml_footer
 			exit 0
 		fi
+		if [ "$suggested" ]; then
+			cat <<EOT
+<section>
+	<header>
+		<form name="scanner" method="post">
+			<input type="hidden" name="device" value="$all">
+			Scanner ${all#*,}
+			<button data-icon="start">Continue</button>
+		</form>
+	</header>
+</section>
+EOT
+			xhtml_footer
+		exit 0
+		fi
 		device="${all%|}" ;;
 	*)
-		suggested=""
-		while read exe pkg msg; do
-			[ "$(which $exe 2> /dev/null)" ] && continue
-			suggested="$suggested
-<li><a href=\"/user/pkgs.cgi?info=$pkg\">$pkg</a>&nbsp;$msg</li>"
-		done <<EOT
-convert		imagemagick	$(_ "to preview images and support more image formats")
-gocr		gocr		$(_ "a basic optical character recognition")
-tesseract	tesseract-ocr	$(_ "a better optical character recognition")
-EOT
-		[ "$suggested" ] &&
-		msg tip "$(_ "You may need to install:") <ol>$suggested</ol>"
 		cat <<EOT
 <section>
 	<header>
@@ -239,7 +265,7 @@
 
 <table style="width:100%">
 <tr>
-<td>
+<td title="Sets the file format for the scanned image">
 <fieldset><legend>$(_ 'Format')</legend>
 <select name="format" size=1>
 $(imgformat list)
@@ -254,48 +280,63 @@
 	params="$({
 cat "$(echo $device | sed 's/,.*//').log" 2> /dev/null ||
 scanimage --help -d "$(echo $device | sed 's/,.*//')"
-} | awk '
+} | dos2unix | sed 's|\[=| [|;s/||/|/g' | awk '
 function minmax()
 {
+	inactive=1
 	if (match($2,"[0-9]")) {
 		i=$2; sub(/\.\..*/,"",i)
 		j=$2; sub(/.*\.\./,"",j)
 		sub(/\..*/,"",j); sub(/[dm%].*/,"",j)
 		k=$0; sub(/.* \[/,"",k); sub(/\].*/,"",k)
-		print $1 " " int(k) " " int(i) " " int(j)
+		printf("\n%s",$1 " " int(k) " " int(i) " " int(j))
+		inactive=0
 	}
 }
 
 function enum()
 {
 	i=$0
+	inactive=1
 	if (index(i,"|")) {
-		sub(/^ *--*[a-z]* */,"",i)
+		sub(/^ *--*[a-z-]* */,"",i)
+		sub(/\[\(/,"",i); sub(/\)\]/,"",i)
 		sub(/dpi .*/,"",i); gsub(/ \[.*\].*/,"",i)
 		k=$0; sub(/.* \[/,"",k); sub(/\].*/,"",k)
 		gsub(/ /,"=",k)
-		print $1 " " k " enum " i
+		gsub(/ /,"=",i)
+		printf("\n%s",$1 " " k " enum " i)
+		inactive=0
 	}
 	else minmax()
 }
 
-/Options specific to device/ { parse=1 }
 {
+	if (/scanimage --help/) end=1
+	if (end != 0) next
+	if (/:$/) parse=0
+	if (/Scan mode/ || /Mode/ || /Advanced/ || /Geometry/) parse=1
 	if (parse != 1) next
-	if (/\[inactive\]/) next
+	if (/\[inactive\]/) { inactive=1; next }
 	if (match("-l-t-x-y", $1)) minmax()
-	if (match("--resolution--brightness--contrast--source--mode", $1)) enum()
-}
-' | sed 's/||/|/g')"
+	else if (/^    --/) enum()
+	else if (!/:$/ && inactive == 0) printf(" %s",$0)
+} END { print "" }
+' | sed 1d)"
 fi
+echo "<!-- $params -->"
 output="$(n=$(echo "$params" | wc -l); echo "$params" | \
-while read name def min max ; do
-	name="${name##*-}"
+while read name def min max help; do
+	name="${name#-}"
+	name="${name#-}"
+	name="${name//-/_}"
+	help="$(echo $help | sed 's|  | |g;s|"|\&#34|g')"
 	def="${def//=/ }"
+	max="${max//=/ }"
 	if [ "$min" == "enum" ]; then
 		res_min=1000000
 		res_max=0
-		echo "<td><fieldset><legend>$name</legend>"
+		echo "<td title=\"$help\"><fieldset><legend>$name</legend>"
 		echo -n "<select name=\"$name\" size=1"
 		[ "$name" == "resolution" ] && echo -n " onchange=showGeometry()"
 		echo ">"
@@ -339,7 +380,7 @@
 EOT
 		esac
 		[ "$name" == "resolution" ] && f="$f onchange=showGeometry()"
-		echo "<td>$f type=\"text\" title=\"$min .. $max\" size=4 maxlength=4>$u"
+		echo "<td>$f type=\"text\" title=\"$min .. $max. $help\" size=4 maxlength=4>$u"
 		res_min=$min
 		res_max=$max
 	fi
diff -r 4d023db68233 -r ab1b43f95995 xscavenger/receipt
--- a/xscavenger/receipt	Sat Jun 29 09:29:50 2019 +0100
+++ b/xscavenger/receipt	Sun Jun 30 11:35:08 2019 +0200
@@ -6,7 +6,7 @@
 SHORT_DESC="Lode Runner rewritten for X11."
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://www.xdr.com/dash/scavenger.html"
+WEB_SITE="http://www.linuxmotors.com/scavenger/"
 TARBALL="$PACKAGE-$VERSION.tgz"
 ARCHIVE="https://web.archive.org/web/20120609005153if_/"
 WGET_URL="${ARCHIVE}$(dirname $WEB_SITE)/$TARBALL"