Merge pull request #40 from UB-Mannheim/config-improvements

Improvements for handling configurations issues

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, some standard locations are searched 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):"/>

chrome/content/zoteroocr.js

@@ -30,10 +30,21 @@ Zotero.OCR = new function() {
 		let ocrEngine = Zotero.Prefs.get("zoteroocr.ocrPath");
 		let found = false;
 		if (ocrEngine) {
+			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) {
+					ocrEngine = OS.Path.join(ocrEngine, "tesseract.exe");
+				}
+				else {
+					ocrEngine = OS.Path.join(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 +60,7 @@ Zotero.OCR = new function() {
 			}
 		}
 		if (!found) {
-			alert("No " + ocrEngine + " executable found.");
+			alert("Tesseract executable not found. Tried: " + ocrEngine);
 			return;
 		}