From: Bastian Dehn <hhaalo@arcor.de>
Date: Tue, 22 Jul 2025 16:39:50 +0000 (+0200)
Subject: change check keywords name pattern first
X-Git-Tag: v1.1.0^2~2
X-Git-Url: https://gitweb.hhaalo.de/?a=commitdiff_plain;h=95892d6b633f10706ea5ce0f856c22698c22f9ad;p=scantopdf.git

change check keywords name pattern first
---

diff --git a/src/scanbasic.sh b/src/scanbasic.sh
index 96033d5..f31bcbf 100644
--- a/src/scanbasic.sh
+++ b/src/scanbasic.sh
@@ -224,10 +224,6 @@ add_keywords()
 
 	[ -z "$keywords" ] && return 0
 
-	[[ "$file_name" =~ [0-9]{4}\-[0-9]{2}\-[0-9]{2}_.*\.pdf ]] \
-		|| errlog "file name mismatch pattern" \
-		|| return $?
-
 	local title=$(get_title_from_file_name "$file_name")
 	local date=$(get_date_from_file_name "$file_name")
 
@@ -260,6 +256,10 @@ scantopdf() {
 	[ -n "$output" ] \
 		|| errlog "missing output" \
 		|| return $?
+	[ -z "$keywords" ] \
+		|| [[ "$output" =~ [0-9]{4}\-[0-9]{2}\-[0-9]{2}_.*\.pdf ]] \
+		|| errlog "file name mismatch pattern" \
+		|| return $?
 
 	scanimage --source=DocumentFeeder \
 		--mode=$mode \
diff --git a/tests/scanbasic.bats b/tests/scanbasic.bats
index 8fefc46..d3bc804 100755
--- a/tests/scanbasic.bats
+++ b/tests/scanbasic.bats
@@ -325,12 +325,29 @@ setup() {
 	assert_success
 }
 
-@test "should success add keywords" {
+@test "should success scantopdf with keywords" {
+	scanimage() {
+		:
+	}
+	createonepdf() {
+		:
+	}
 	exiftool() {
 		:
 	}
 
-	run add_keywords "2025-07-22_test_word.pdf"
+	run scantopdf "Color" "1" "2025-07-22_test_word.pdf" "keywords"
 
 	assert_success
 }
+
+@test "should failure add keywords wrong file name" {
+	scanimage() {
+		:
+	}
+
+	run scantopdf "Color" "1" "wrong_name.pdf" "keywords"
+
+	assert_failure
+	assert_line --index 0 "❌ ERROR: file name mismatch pattern"
+}