branch: externals/scanner
commit 45a3e1cc6f146408cdbebe77d7fadef5cb0fe972
Author: Raffael Stocker <[email protected]>
Commit: Raffael Stocker <[email protected]>
use finer argument tests in language and output selection
---
scanner-test.el | 4 ++++
scanner.el | 4 ++++
2 files changed, 8 insertions(+)
diff --git a/scanner-test.el b/scanner-test.el
index 28093d5..ef63da8 100644
--- a/scanner-test.el
+++ b/scanner-test.el
@@ -210,6 +210,8 @@
(should (equal '("deu" "eng") (scanner-select-languages '("deu" "eng"))))
(should-error (scanner-select-languages 42)
:type 'wrong-type-argument)
+ (should-error (scanner-select-languages '("eng" 42))
+ :type 'wrong-type-argument)
(ignore-errors
(should (equal '("eng") (scanner-select-languages 42))))))
@@ -220,6 +222,8 @@
(should (equal '("pdf" "txt") (scanner-select-outputs '("pdf" "txt"))))
(should-error (scanner-select-outputs 42)
:type 'wrong-type-argument)
+ (should-error (scanner-select-outputs '("pdf" 42))
+ :type 'wrong-type-argument)
(ignore-errors
(should (equal '("pdf") (scanner-select-outputs 42))))))
diff --git a/scanner.el b/scanner.el
index 590e2d0..c53f14f 100644
--- a/scanner.el
+++ b/scanner.el
@@ -401,6 +401,8 @@ availability of required options."
(list (completing-read-multiple "Languages: " langs nil t))))
(unless (consp languages)
(signal 'wrong-type-argument `(consp ,languages)))
+ (unless (cl-every #'stringp languages)
+ (signal 'wrong-type-argument `(stringp ,@languages)))
(setq scanner-tesseract-languages languages))
(defun scanner-select-outputs (outputs)
@@ -410,6 +412,8 @@ availability of required options."
(list (completing-read-multiple "Outputs: " configs nil t))))
(unless (consp outputs)
(signal 'wrong-type-argument `(consp ,outputs)))
+ (unless (cl-every #'stringp outputs)
+ (signal 'wrong-type-argument `(stringp ,@outputs)))
(setq scanner-tesseract-outputs outputs))
(defun scanner-set-image-resolution (resolution)
