From 2ab449cd5f17f6f385bfee046c2f7b6b28034216 Mon Sep 17 00:00:00 2001
From: Philipp Zumstein <philipp.zumstein@uni-mannheim.de>
Date: Sun, 22 May 2022 21:04:44 +0200
Subject: [PATCH 1/4] Improve two labels in preferences

---
 chrome/content/preferences.xul | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/chrome/content/preferences.xul b/chrome/content/preferences.xul
index 4e763cf..742282b 100644
--- a/chrome/content/preferences.xul
+++ b/chrome/content/preferences.xul
@@ -34,9 +34,9 @@
         </preferences>
         <groupbox>
             <caption label="OCR parameters"/>
-            <label value="You can indicate here the path to your OCR engine:"/>
+            <label value="Full location of the tesseract executable (when empty, the usual locations are search for it):"/>
             <textbox id="pref-zoteroocr-ocrPath-value" flex="1" preference="pref-zoteroocr-ocrPath"/>
-            <label value="You can indicate here the path to pdftoppm:"/>
+            <label value="Full location of the pdftoppm executable:"/>
             <textbox id="pref-zoteroocr-pdftoppmPath-value" flex="1" preference="pref-zoteroocr-pdftoppmPath"/>
             <hbox>
                 <label value="Choose a language/script you want to use for recognition (default is eng):"/>

From 066ad30a91058068f771deb3cc5900886d86f45e Mon Sep 17 00:00:00 2001
From: Philipp Zumstein <philipp.zumstein@uni-mannheim.de>
Date: Sun, 22 May 2022 21:05:04 +0200
Subject: [PATCH 2/4] Handle some cases for possible configuration problems

---
 chrome/content/zoteroocr.js | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/chrome/content/zoteroocr.js b/chrome/content/zoteroocr.js
index dc43bee..34c5c9f 100644
--- a/chrome/content/zoteroocr.js
+++ b/chrome/content/zoteroocr.js
@@ -30,10 +30,25 @@ Zotero.OCR = new function() {
 		let ocrEngine = Zotero.Prefs.get("zoteroocr.ocrPath");
 		let found = false;
 		if (ocrEngine) {
+			if (!ocrEngine.endsWith("tesseract") && !ocrEngine.endsWith("tesseract.exe")) {
+				if (Zotero.isWin) {
+					if (!ocrEngine.endsWith("\\")) {
+						ocrEngine += "\\";
+					}
+					ocrEngine += "tesseract.exe";
+				}
+				else {
+					if (!ocrEngine.endsWith("/")) {
+						ocrEngine += "/";
+					}
+					ocrEngine += "tesseract";
+				}
+				Zotero.Prefs.set("zoteroocr.ocrPath", ocrEngine);
+			}
 			found = yield OS.File.exists(ocrEngine);
 		}
 		else {
-			let path = ["/usr/local/bin/", "/usr/bin/", "C:\\Program Files\\Tesseract-OCR\\", ""];
+			let path = ["", "/usr/local/bin/", "/usr/bin/", "C:\\Program Files\\Tesseract-OCR\\", "/opt/homebrew/bin/", "/usr/local/homebrew/bin/"];
 			for (ocrEngine of path) {
 				ocrEngine += "tesseract";
 				if (Zotero.isWin) {
@@ -49,7 +64,7 @@ Zotero.OCR = new function() {
 			}
 		}
 		if (!found) {
-			alert("No " + ocrEngine + " executable found.");
+			alert("Tesseract executable not found. Tried: " + ocrEngine);
 			return;
 		}
 

From 6b1b0f67c27e8dc5dba86ec755550086e69916f2 Mon Sep 17 00:00:00 2001
From: Philipp Zumstein <philipp.zumstein@uni-mannheim.de>
Date: Tue, 24 May 2022 18:23:07 +0200
Subject: [PATCH 3/4] Improve testing for a directory in the config

---
 chrome/content/zoteroocr.js | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/chrome/content/zoteroocr.js b/chrome/content/zoteroocr.js
index 34c5c9f..a4d11ff 100644
--- a/chrome/content/zoteroocr.js
+++ b/chrome/content/zoteroocr.js
@@ -30,18 +30,14 @@ Zotero.OCR = new function() {
 		let ocrEngine = Zotero.Prefs.get("zoteroocr.ocrPath");
 		let found = false;
 		if (ocrEngine) {
-			if (!ocrEngine.endsWith("tesseract") && !ocrEngine.endsWith("tesseract.exe")) {
+			let pathOrFile = FileUtils.File(ocrEngine);
+			// If a directory is given, then try for the standard name of the tool.
+			if (pathOrFile.isDirectory()) {
 				if (Zotero.isWin) {
-					if (!ocrEngine.endsWith("\\")) {
-						ocrEngine += "\\";
-					}
-					ocrEngine += "tesseract.exe";
+					ocrEngine = OS.Path.join(ocrEngine, "tesseract.exe");
 				}
 				else {
-					if (!ocrEngine.endsWith("/")) {
-						ocrEngine += "/";
-					}
-					ocrEngine += "tesseract";
+					ocrEngine = OS.Path.join(ocrEngine, "tesseract");
 				}
 				Zotero.Prefs.set("zoteroocr.ocrPath", ocrEngine);
 			}

From 52f4d2f69d7096527cd1474c868fa2fe4354940c Mon Sep 17 00:00:00 2001
From: Philipp Zumstein <zuphilip@users.noreply.github.com>
Date: Tue, 24 May 2022 18:23:45 +0200
Subject: [PATCH 4/4] Update chrome/content/preferences.xul

Co-authored-by: Stefan Weil <sw@weilnetz.de>
---
 chrome/content/preferences.xul | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chrome/content/preferences.xul b/chrome/content/preferences.xul
index 742282b..f5e7aca 100644
--- a/chrome/content/preferences.xul
+++ b/chrome/content/preferences.xul
@@ -34,7 +34,7 @@
         </preferences>
         <groupbox>
             <caption label="OCR parameters"/>
-            <label value="Full location of the tesseract executable (when empty, the usual locations are search for it):"/>
+            <label value="Full location of the tesseract executable (when empty, some standard locations are searched for it):"/>
             <textbox id="pref-zoteroocr-ocrPath-value" flex="1" preference="pref-zoteroocr-ocrPath"/>
             <label value="Full location of the pdftoppm executable:"/>
             <textbox id="pref-zoteroocr-pdftoppmPath-value" flex="1" preference="pref-zoteroocr-pdftoppmPath"/>