menekis/OCRmyPDF
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup some cases where log was lazy and should be

Browse Source
This commit is contained in:
James R. Barlow
2018-06-23 01:50:27 -07:00
parent cd220d9ed9
commit 6333ec928c
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ocrmypdf/exec/ghostscript.py
+4 -2
View File
@@ -81,8 +81,10 @@ def extract_text(input_file, pageno=1):
p = run(args_gs, stdout=PIPE, stderr=PIPE)
if p.returncode != 0:
raise SubprocessOutputError(
'Ghostscript text extraction failed\n%s\n%s\n%s',
input_file, p.stdout.decode(), p.stderr.decode())
'Ghostscript text extraction failed\n%s\n%s\n%s' % (
input_file, p.stdout.decode(), p.stderr.decode()
)
)
return p.stdout
src/ocrmypdf/exec/qpdf.py
+7 -8
View File
@@ -43,8 +43,8 @@ def check(input_file, log=None):
check=True)
except CalledProcessError as e:
if e.returncode == 2:
log.error("{0}: not a valid PDF, and could not repair it.".format(
input_file))
log.error("%s: not a valid PDF, and could not repair it.",
input_file)
log.error("Details:")
log.error(e.output)
elif e.returncode == 3:
@@ -73,19 +73,18 @@ def repair(input_file, output_file, log):
check=True)
except CalledProcessError as e:
if e.returncode == 3 and e.output.find("operation succeeded"):
log.debug('qpdf found and fixed errors: ' + e.output)
log.debug('qpdf found and fixed errors: %s', e.output)
return
if _probably_encrypted(e):
raise EncryptedPdfError() from e
elif e.returncode == 2:
log.error("{0}: not a valid PDF, and could not repair it.".format(
input_file))
log.error("Details: " + e.output)
log.error("%s: not a valid PDF, and could not repair it.",
input_file)
log.error("Details: %s", e.output)
raise InputFileError() from e
else:
log.error("{0}: unknown error".format(
input_file))
log.error("%s: unknown error", input_file)
log.error(e.output)
raise SubprocessOutputError() from e