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

Do not show file previews in case of exceptions

Browse source 
If a Qubes conversion encounters an exception that is not a subclass of
ConversionException, it will still show a preview of a file that does
not exist.

Send an error progress report in that case, so that the GUI code can
detect that an error occurred and not open a file preview

Fixes #581
This commit is contained in:
Alex Pyrgiotis 2023-10-05 10:46:09 +03:00
parent bdf3f8babc
commit 3daf0e2cb7
No known key found for this signature in database
GPG key ID: B6C15EBA0357C9AA
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
dangerzone/isolation_provider/base.py
View file

@ -39,12 +39,13 @@ class IsolationProvider(ABC):
success = self._convert(document, ocr_lang) success = self._convert(document, ocr_lang)
except ConversionException as e: except ConversionException as e:
success = False success = False
self.print_progress_trusted(document, True, e.error_message, 0) self.print_progress_trusted(document, True, str(e), 0)
except Exception as e: except Exception as e:
success = False success = False
log.exception( log.exception(
f"An exception occurred while converting document '{document.id}'" f"An exception occurred while converting document '{document.id}'"
) )
self.print_progress_trusted(document, True, str(e), 0)
if success: if success:
document.mark_as_safe() document.mark_as_safe()
if document.archive_after_conversion: if document.archive_after_conversion: