add isal

.gitignore

@@ -140,3 +140,5 @@ result
 
 # vscode garbage
 .vscode
+
+x

pyproject.toml

@@ -11,6 +11,7 @@ repository = "https://github.com/StarrFox/wizwad"
 python = "^3.10"
 click = "^8.1.7"
 more-itertools = "^10.1.0"
+isal = "^1.5.3"
 
 [tool.poetry.scripts]
 wizwad = "wizwad.__main__:main"

wizwad/__main__.py

@@ -59,8 +59,8 @@ def extract(input_wad: Path, output_dir: Path):
 @click.option(
     "--compression-level",
     type=int,
-    default=9,
-    help="zlib compression level of the data blob",
+    default=2,
+    help="isal compression level of the data blob",
 )
 def pack(
     target_wad: Path,
@@ -86,8 +86,8 @@ def pack(
         click.echo("workers must be greater than 0")
         exit(1)
 
-    if not 1 <= compression_level <= 9:
-        click.echo("compression level must be 1-9")
+    if not 0 <= compression_level <= 3:
+        click.echo("compression level must be 0-3")
         exit(1)
 
     Wad.from_full_add(

wizwad/wad.py

@@ -2,13 +2,15 @@
 import logging
 import os
 import struct
-import zlib
+#import zlib
 from dataclasses import dataclass
 from io import BytesIO
 from mmap import ACCESS_READ, mmap
 from pathlib import Path
 from typing import Iterator, List, Optional, Union
 
+from isal import isal_zlib as zlib
+
 import more_itertools
 
 _NO_COMPRESS = frozenset(
@@ -229,7 +231,7 @@ def from_full_add(
         overwrite: bool = False,
         wad_version: int = 1,
         workers: int = 10,
-        compression_level: int = 9,
+        compression_level: int = 2,
     ):
         if isinstance(source_path, str):
             source_path = Path(source_path)
@@ -257,7 +259,7 @@ def _insert_all_fast(
         output_path: Path,
         wad_version: int = 1,
         workers: int = 100,
-        compression_level: int = 9,
+        compression_level: int = 2,
     ):
         to_write: list[Path] = []
         source_path_string = str(source_path)
@@ -341,7 +343,7 @@ def _calculate_chunk(
     files: Iterator[Path],
     start: int,
     source: Path,
-    compression_level: int = 9,
+    compression_level: int = 2,
 ) -> tuple[int, BytesIO, list[WadFileInfo]]:
     """
     returns end offset, data block, and journal entries
@@ -376,3 +378,11 @@ def _calculate_chunk(
         data_buffer.write(data)
 
     return current_offset, data_buffer, journal_entries
+
+
+if __name__ == "__main__":
+    _calculate_chunk(
+        iter([Path("wad.py")]),
+        0,
+        Path(__file__).absolute().parent
+    )