Reworks this logic so it doesn' need a test

This commit is contained in:
Trenton Holmes 2024-09-08 11:06:26 -07:00
parent 5921a551d9
commit aabfc32183
2 changed files with 16 additions and 16 deletions

View File

@ -78,7 +78,7 @@ def binaries_check(app_configs, **kwargs):
error = "Paperless can't find {}. Without it, consumption is impossible."
hint = "Either it's not in your ${PATH} or it's not installed."
binaries = (settings.CONVERT_BINARY, "tesseract")
binaries = (settings.CONVERT_BINARY, "tesseract", "gs")
check_messages = []
for binary in binaries:

View File

@ -21,10 +21,22 @@ def get_tesseract_langs():
@register()
def check_default_language_available(app_configs, **kwargs):
if shutil.which("tesseract") is None:
return [Error("Executable 'tesseract' was not located")]
# binaries_check in paperless will check and report if this doesn't exist
# So skip trying to do anything here and let that handle missing binaries
if shutil.which("tesseract") is not None:
installed_langs = get_tesseract_langs()
installed_langs = get_tesseract_langs()
specified_langs = settings.OCR_LANGUAGE.split("+")
for lang in specified_langs:
if lang not in installed_langs:
return [
Error(
f"The selected ocr language {lang} is "
f"not installed. Paperless cannot OCR your documents "
f"without it. Please fix PAPERLESS_OCR_LANGUAGE.",
),
]
if not settings.OCR_LANGUAGE:
return [
@ -34,16 +46,4 @@ def check_default_language_available(app_configs, **kwargs):
),
]
specified_langs = settings.OCR_LANGUAGE.split("+")
for lang in specified_langs:
if lang not in installed_langs:
return [
Error(
f"The selected ocr language {lang} is "
f"not installed. Paperless cannot OCR your documents "
f"without it. Please fix PAPERLESS_OCR_LANGUAGE.",
),
]
return []