Support documents with Archives

Allow "archives" parameters in Document creation.

Author: JorjMcKie

src/__init__.py

@@ -2897,7 +2897,7 @@ def __getitem__(self, i=0):
             raise IndexError(f"page {i} not in document")
         return self.load_page(i)
 
-    def __init__(self, filename=None, stream=None, filetype=None, rect=None, width=0, height=0, fontsize=11):
+    def __init__(self, filename=None, stream=None, filetype=None, archive=None, rect=None, width=0, height=0, fontsize=11):
         """Creates a document. Use 'open' as a synonym.
 
         Notes:
@@ -2943,7 +2943,17 @@ def __init__(self, filename=None, stream=None, filetype=None, rect=None, width=0
 
             self._name = filename
             self.stream = stream
-            
+            if isinstance(archive, pathlib.Path):
+                archive = Archive(archive.name)
+            elif isinstance(archive, str):
+                archive = Archive(archive)
+            if archive and not isinstance(archive, Archive):
+                raise TypeError(f"bad archive: {type(archive)=}.")
+            if archive:
+                archive_parm = archive.this  # pass this to open
+            else:
+                archive = Archive()
+                archive_parm = archive.this
             if stream is not None:
                 if filename is not None and filetype is None:
                     # 2025-05-06: Use <filename> as the filetype. This is
@@ -2958,6 +2968,8 @@ def __init__(self, filename=None, stream=None, filetype=None, rect=None, width=0
                     stream = stream.getvalue()
                 else:
                     raise TypeError(f"bad stream: {type(stream)=}.")
+
+                # this prevents bad things if original goes out of existence:
                 self.stream = stream
 
                 assert isinstance(stream, (bytes, memoryview))
@@ -2967,9 +2979,9 @@ def __init__(self, filename=None, stream=None, filetype=None, rect=None, width=0
                     # raise a specific exception.
                     raise EmptyFileError('Cannot open empty stream.')
 
-                stream2 = mupdf.fz_open_memory(mupdf.python_buffer_data(stream), len(stream))
+                fz_stream = mupdf.fz_open_memory(mupdf.python_buffer_data(stream), len(stream))
                 try:
-                    doc = mupdf.fz_open_document_with_stream(filetype if filetype else '', stream2)
+                    doc = mupdf.fz_open_document_with_stream_and_dir(filetype if filetype else '', fz_stream, archive_parm)
                 except Exception as e:
                     if g_exceptions_verbose > 1:    exception_info()
                     raise FileDataError('Failed to open stream') from e
@@ -2996,20 +3008,15 @@ def __init__(self, filename=None, stream=None, filetype=None, rect=None, width=0
                     raise EmptyFileError(f'Cannot open empty file: {filename=}.')
 
                 if filetype:
-                    # Override the type implied by <filename>. MuPDF does not
-                    # have a way to do this directly so we open via a stream.
-                    try:
-                        fz_stream = mupdf.fz_open_file(filename)
-                        doc = mupdf.fz_open_document_with_stream(filetype, fz_stream)
-                    except Exception as e:
-                        if g_exceptions_verbose > 1:    exception_info()
-                        raise FileDataError(f'Failed to open file {filename!r} as type {filetype!r}.') from e
+                    suffix = filetype
                 else:
-                    try:
-                        doc = mupdf.fz_open_document(filename)
-                    except Exception as e:
-                        if g_exceptions_verbose > 1:    exception_info()
-                        raise FileDataError(f'Failed to open file {filename!r}.') from e
+                    suffix = pathlib.Path(filename).suffix
+                try:
+                    fz_stream = mupdf.fz_open_file(filename)
+                    doc = mupdf.fz_open_document_with_stream_and_dir(suffix, fz_stream, archive_parm)
+                except Exception as e:
+                    if g_exceptions_verbose > 1:    exception_info()
+                    raise FileDataError(f'Failed to open file {filename!r} as type {suffix}.') from e
 
             else:
                 pdf = mupdf.PdfDocument()