Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 20 additions & 11 deletions src/hwpx/opc/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -490,16 +490,25 @@ def _save_to_zip(self, pkg_file: str | Path | BinaryIO) -> None:
self._version.mark_clean()
self._validate_structure()
with ZipFile(pkg_file, "w") as zf:
self._write_mimetype(zf)
for name in sorted(self._files):
if name == self.MIMETYPE_PATH:
continue
data = self._files[name]
info = ZipInfo(name)
info.compress_type = ZIP_DEFLATED
zf.writestr(info, data)
self._write_archive(zf)

def _write_archive(self, zf: ZipFile) -> None:
self._write_mimetype(zf)
for name in sorted(self._files):
if name == self.MIMETYPE_PATH:
continue
self._write_zip_entry(zf, name, self._files[name], ZIP_DEFLATED)

@staticmethod
def _write_zip_entry(zf: ZipFile, path: str, payload: bytes, compress_type: int) -> None:
info = ZipInfo(path)
info.compress_type = compress_type
zf.writestr(info, payload)

def _write_mimetype(self, zf: ZipFile) -> None:
info = ZipInfo(self.MIMETYPE_PATH)
info.compress_type = ZIP_STORED
zf.writestr(info, self._files[self.MIMETYPE_PATH])
self._write_zip_entry(
zf,
self.MIMETYPE_PATH,
self._files[self.MIMETYPE_PATH],
ZIP_STORED,
)
13 changes: 13 additions & 0 deletions tests/test_opc_package.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,3 +66,16 @@ def test_missing_required_files_raise_structure_error() -> None:

with pytest.raises(HwpxStructureError):
HwpxPackage.open(_build_package(include_version=False))


def test_save_preserves_expected_compress_type_per_entry() -> None:
package = HwpxPackage.open(_build_package())

output = package.save()
with ZipFile(io.BytesIO(output), "r") as archive:
infos = archive.infolist()

assert infos[0].filename == "mimetype"
assert infos[0].compress_type == ZIP_STORED
for info in infos[1:]:
assert info.compress_type == ZIP_DEFLATED