tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

windows: avoid picking up a default pdftotext: we want ours

Browse Source
This commit is contained in:
Jean-Francois Dockes 2019-10-07 11:39:27 +02:00
parent 9443173113
commit 0436b80956
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/filters/rclpdf.py
View File

@ -46,6 +46,7 @@ import rclconfig
import glob
import traceback
_mswindows = (sys.platform == "win32")
tmpdir = None
def finalcleanup():
@ -84,8 +85,10 @@ class PDFExtractor:
self.pdftk = None
self.em = em
self.tesseract = None
self.pdftotext = rclexecm.which("pdftotext")
# Avoid picking up a default version on Windows, we want ours
if not _mswindows:
self.pdftotext = rclexecm.which("pdftotext")
if not self.pdftotext:
self.pdftotext = rclexecm.which("poppler/pdftotext")
if not self.pdftotext:
@ -141,7 +144,8 @@ class PDFExtractor:
self.maybemaketmpdir()
def _initextrameta(self):
self.pdfinfo = rclexecm.which("pdfinfo")
if not _mswindows:
self.pdfinfo = rclexecm.which("pdfinfo")
if not self.pdfinfo:
self.pdfinfo = rclexecm.which("poppler/pdfinfo")
if not self.pdfinfo: