fix flatbed page sizes

Author: wuan

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "scan-pdf"
-version = "0.4.6"
+version = "0.4.7"
 description = "Tools for using scanners with document feeder"
 authors = ["Andreas Würl <[email protected]>"]
 license = "Apache-2.0"

scan_pdf/scan.py

@@ -28,7 +28,12 @@ class Scanner:
     page_file_suffix = ".pnm"
 
     def __init__(self, options: argparse.Namespace):
-        args = ["scanimage", "-b", "--format=pnm"]
+        args = ["scanimage"]
+
+        if options.flatbed:
+            args += ["--output-file=out.pnm"]
+        else:
+            args += ["-b", "--format=pnm"]
 
         if options.device:
             args += ["-d", options.device]
@@ -41,7 +46,7 @@ def __init__(self, options: argparse.Namespace):
         args += ["--mode", color_mode]
 
         if options.flatbed:
-            args += ["--source", "Flatbed", "--batch-count", "1"]
+            args += ["--source", "Flatbed"]
         else:
             args += ["--source", "Automatic Document Feeder"]
             args += ["--adf-mode", "Duplex" if options.duplex else "Simplex"]

tests/test_scan.py

@@ -68,16 +68,13 @@ def test_convert_flatbed_A5_device(self, subprocess, options):
         subprocess.call.assert_called_with(
             [
                 "scanimage",
-                "-b",
-                "--format=pnm",
+                "--output-file=out.pnm",
                 "-d",
                 "foo",
                 "--mode",
                 "Color",
                 "--source",
                 "Flatbed",
-                "--batch-count",
-                "1",
                 "--resolution",
                 "150",
                 "-l",