almet/dangerzone
1
0
Fork 0
mirror of https://github.com/freedomofpress/dangerzone.git synced 2025-04-29 02:12:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Start conversion process earlier

Browse source 
Start the conversion process earlier, so that we have a reference to the
Popen object in case of an exception.
This commit is contained in:
Alex Pyrgiotis 2024-02-19 17:18:27 +02:00
parent e4a5dbce46
commit 6ee1d14c9a
No known key found for this signature in database
GPG key ID: B6C15EBA0357C9AA
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
dangerzone/isolation_provider/base.py
View file

@ -69,9 +69,11 @@ class IsolationProvider(ABC):
self.progress_callback = progress_callback
document.mark_as_converting()
try:
conversion_proc = self.start_doc_to_pixels_proc()
with tempfile.TemporaryDirectory() as t:
Path(f"{t}/pixels").mkdir()
self.doc_to_pixels(document, t)
self.doc_to_pixels(document, t, conversion_proc)
conversion_proc.wait(3)
# TODO: validate convert to pixels output
self.pixels_to_pdf(document, t, ocr_lang)
document.mark_as_safe()
@ -91,10 +93,11 @@ class IsolationProvider(ABC):
self.print_progress(document, True, str(e), 0)
document.mark_as_failed()
def doc_to_pixels(self, document: Document, tempdir: str) -> None:
def doc_to_pixels(
self, document: Document, tempdir: str, p: subprocess.Popen
) -> None:
percentage = 0.0
with open(document.input_filename, "rb") as f:
p = self.start_doc_to_pixels_proc()
try:
assert p.stdin is not None
p.stdin.write(f.read())