diff --git a/dangerzone/isolation_provider/base.py b/dangerzone/isolation_provider/base.py index 5e32b02..1bf6107 100644 --- a/dangerzone/isolation_provider/base.py +++ b/dangerzone/isolation_provider/base.py @@ -23,8 +23,6 @@ log = logging.getLogger(__name__) MAX_CONVERSION_LOG_CHARS = 150 * 50 # up to ~150 lines of 50 characters DOC_TO_PIXELS_LOG_START = "----- DOC TO PIXELS LOG START -----" DOC_TO_PIXELS_LOG_END = "----- DOC TO PIXELS LOG END -----" -PIXELS_TO_PDF_LOG_START = "----- PIXELS TO PDF LOG START -----" -PIXELS_TO_PDF_LOG_END = "----- PIXELS TO PDF LOG END -----" TIMEOUT_EXCEPTION = 15 TIMEOUT_GRACE = 15 diff --git a/dangerzone/isolation_provider/container.py b/dangerzone/isolation_provider/container.py index 891fd08..33f5300 100644 --- a/dangerzone/isolation_provider/container.py +++ b/dangerzone/isolation_provider/container.py @@ -228,31 +228,6 @@ class Container(IsolationProvider): """Unique container name for the pixels-to-pdf phase.""" return f"dangerzone-pixels-to-pdf-{document.id}" - def assert_field_type(self, val: Any, _type: object) -> None: - # XXX: Use a stricter check than isinstance because `bool` is a subclass of - # `int`. - # - # See https://stackoverflow.com/a/37888668 - if type(val) is not _type: - raise ValueError("Status field has incorrect type") - - def parse_progress_trusted(self, document: Document, line: str) -> None: - """ - Parses a line returned by the container. - """ - try: - status = json.loads(line) - text = status["text"] - self.assert_field_type(text, str) - error = status["error"] - self.assert_field_type(error, bool) - percentage = status["percentage"] - self.assert_field_type(percentage, float) - self.print_progress(document, error, text, percentage) - except Exception: - error_message = f"Invalid JSON returned from container:\n\n\t {line}" - self.print_progress(document, True, error_message, -1) - def exec( self, args: List[str],