Merge pull request #22 from p/no-mode

Add --mode-hw-default option to not set --mode
This commit is contained in:
Raman Gupta 2021-07-27 10:49:52 -04:00 committed by GitHub
commit 9f4eb852a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 4 deletions

View File

@ -52,7 +52,9 @@ OPTIONS
-d, --duplex
Duplex scanning
-m, --mode
Mode e.g. Lineart (default), Halftone, Gray, Color, etc.
Mode e.g. Lineart (default), Halftone, Gray, Color, etc. Use --mode-hw-default to not set any mode
--mode-hw-default
Do not set the mode explicitly, use the hardware default
-r, --resolution
Resolution e.g 300 (default)
-a, --append

22
scan
View File

@ -10,6 +10,8 @@ USEARRAY=0
APPEND=0
RESOLUTION=300
MODE=Lineart
MODE_CHANGED=0
MODE_HW_DEFAULT=0
SCRIPT="$DIR/scan_perpage"
DUPLEX=0
UNPAPER=0
@ -45,7 +47,9 @@ while [[ $# > 0 ]]; do
-d|--duplex) DUPLEX=1 ;;
-m|--mode) shift; MODE=$1 ;;
-m|--mode) shift; MODE=$1; MODE_CHANGED=1 ;;
--mode-hw-default) shift; MODE_HW_DEFAULT=1 ;;
-r|--resolution) shift; RESOLUTION=$1 ;;
@ -100,7 +104,9 @@ if [[ $HELP == 1 ]]; then
echo " -d, --duplex"
echo " Duplex scanning"
echo " -m, --mode"
echo " Mode e.g. Lineart (default), Halftone, Gray, Color, etc."
echo " Mode e.g. Lineart (default), Halftone, Gray, Color, etc. Use --mode-hw-default to not set any mode"
echo " --mode-hw-default"
echo " Do not set the mode explicitly, use the hardware default"
echo " -r, --resolution"
echo " Resolution e.g 300 (default)"
echo " -a, --append"
@ -148,6 +154,11 @@ if [[ $USEARRAY == 1 && $USEOUTPUT == 1 ]]; then
exit 1
fi
if [[ $MODE_CHANGED == 1 && $MODE_HW_DEFAULT == 1 ]]; then
echo >&2 "Use one of --mode or --mode-hardware-default. Aborting."
exit 1
fi
if [[ $USEOUTPUT == 1 && "$OUTPUT" == "" ]]; then
echo >&2 "Output file must be specified. Aborting."
exit 1
@ -245,7 +256,12 @@ fi;
echo >&2 "Scanning..."
#eval strace -f -o /tmp/scan-trace.txt scanadf -d $DEVICE $MAXPAGE $PGHEIGHT $PGWIDTH -S $SCRIPT --script-wait --resolution $RESOLUTION --mode $MODE $DESKEW $CROP $SOURCE -o scan-%04d
eval scanadf -d \'"$DEVICE"\' $MAXPAGE $PGHEIGHT $PGWIDTH -S $SCRIPT --script-wait --resolution $RESOLUTION --mode $MODE $DESKEW $CROP $DRIVER_OPTION $SOURCE -o $TMP_DIR/scan-%04d
if [[ $MODE_HW_DEFAULT == 1 ]]; then
MODE=
else
MODE="--mode $MODE"
fi
eval scanadf -d \'"$DEVICE"\' $MAXPAGE $PGHEIGHT $PGWIDTH -S $SCRIPT --script-wait --resolution $RESOLUTION $MODE $DESKEW $CROP $DRIVER_OPTION $SOURCE -o $TMP_DIR/scan-%04d
shopt -s extglob nullglob
pdffiles=($TMP_DIR/scan-[0-9]*.pdf)