From cb3cfaa055e2f6b2fca99657daf4f60ec4b1dbd7 Mon Sep 17 00:00:00 2001 From: "James R. Barlow" Date: Wed, 4 Dec 2019 15:56:18 -0800 Subject: [PATCH] Add Windows install advice --- src/ocrmypdf/_validation.py | 2 +- src/ocrmypdf/exec/__init__.py | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/ocrmypdf/_validation.py b/src/ocrmypdf/_validation.py index b02e4532..af518b2b 100644 --- a/src/ocrmypdf/_validation.py +++ b/src/ocrmypdf/_validation.py @@ -446,7 +446,7 @@ def report_output_file_size(options, input_file, output_file): def check_dependency_versions(options): check_external_program( program='tesseract', - package={'darwin': 'tesseract', 'linux': 'tesseract-ocr'}, + package={'linux': 'tesseract-ocr'}, version_checker=tesseract.version, need_version='4.0.0', # using backport for Travis CI ) diff --git a/src/ocrmypdf/exec/__init__.py b/src/ocrmypdf/exec/__init__.py index 1f5656e7..62ea5c47 100644 --- a/src/ocrmypdf/exec/__init__.py +++ b/src/ocrmypdf/exec/__init__.py @@ -132,23 +132,33 @@ On RPM-based systems (Red Hat, Fedora), search for instructions on installing the RPM for {program}. ''' +windows_install_advice = ''' +If not already installed, install the Chocolatey package manager. Then use +a command prompt to install the missing package: + choco install {package} +''' + def _get_platform(): if sys.platform.startswith('freebsd'): return 'freebsd' elif sys.platform.startswith('linux'): return 'linux' + elif sys.platform.startswith('win'): + return 'windows' return sys.platform def _error_trailer(program, package, **kwargs): if isinstance(package, Mapping): - package = package[_get_platform()] + package = package.get(_get_platform(), program) if _get_platform() == 'darwin': log.info(osx_install_advice.format(**locals())) elif _get_platform() == 'linux': log.info(linux_install_advice.format(**locals())) + elif _get_platform() == 'windows': + log.info(windows_install_advice.format(**locals())) def _error_missing_program(program, package, required_for, recommended):