dissect.squashfs 1.4.dev1__tar.gz → 1.4.dev3__tar.gz

{dissect.squashfs-1.4.dev1/dissect.squashfs.egg-info → dissect.squashfs-1.4.dev3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dissect.squashfs
-Version: 1.4.dev1
+Version: 1.4.dev3
 Summary: A Dissect module implementing a parser for the SquashFS file system, commonly used in appliance or device firmware
 Author-email: Dissect Team <dissect@fox-it.com>
 License: Affero General Public License v3
@@ -26,7 +26,7 @@ Requires-Dist: dissect.cstruct<4.0.dev,>=3.0.dev
 Requires-Dist: dissect.util<4.0.dev,>=3.0.dev
 Provides-Extra: full
 Requires-Dist: lz4; extra == "full"
-Requires-Dist: python-lzo; extra == "full"
+Requires-Dist: python-lzo; (platform_system != "Windows" or platform_python_implementation != "PyPy") and extra == "full"
 Requires-Dist: zstandard; extra == "full"
 
 # dissect.squashfs

{dissect.squashfs-1.4.dev1 → dissect.squashfs-1.4.dev3}/dissect/squashfs/squashfs.py

@@ -46,6 +46,11 @@ class SquashFS:
         self.minor = self.sb.s_minor
         self.size = self.sb.bytes_used
 
+        self._read_block = lru_cache(1024)(self._read_block)
+        self._lookup_id = lru_cache(1024)(self._lookup_id)
+        self._lookup_inode = lru_cache(1024)(self._lookup_inode)
+        self._lookup_fragment = lru_cache(1024)(self._lookup_fragment)
+
         self._compression_options = None
         if (self.sb.flags >> c_squashfs.SQUASHFS_COMP_OPT) & 1:
             self._compression_options = self._read_block(len(self.sb))[1]
@@ -131,7 +136,6 @@ class SquashFS:
 
         return block, offset, b"".join(result)
 
-    @lru_cache(1024)
     def _read_block(self, block: int, length: Optional[int] = None) -> tuple[int, bytes]:
         if length is not None:
             # Data block
@@ -162,13 +166,11 @@ class SquashFS:
         _, data = self._read_block(entry.start_block, entry.size)
         return data[offset : offset + length]
 
-    @lru_cache(1024)
     def _lookup_id(self, id: int) -> int:
         block, offset = divmod(id * 4, c_squashfs.SQUASHFS_METADATA_SIZE)
         _, _, data = self._read_metadata(self.id_table[block], offset, 4)
         return struct.unpack("<I", data)[0]
 
-    @lru_cache(1024)
     def _lookup_inode(self, inode_number: int) -> INode:
         if inode_number <= 0 or inode_number > self.sb.inodes:
             raise IndexError(f"inode number out of bounds (1, {self.sb.inodes}): {inode_number}")
@@ -176,7 +178,6 @@ class SquashFS:
         _, _, data = self._read_metadata(self.lookup_table[block], offset, 8)
         return self.get(struct.unpack("<Q", data)[0])
 
-    @lru_cache(1024)
     def _lookup_fragment(self, fragment: int) -> bytes:
         fragment_offset = fragment * len(c_squashfs.squashfs_fragment_entry)
         block, offset = divmod(fragment_offset, c_squashfs.SQUASHFS_METADATA_SIZE)

{dissect.squashfs-1.4.dev1 → dissect.squashfs-1.4.dev3/dissect.squashfs.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dissect.squashfs
-Version: 1.4.dev1
+Version: 1.4.dev3
 Summary: A Dissect module implementing a parser for the SquashFS file system, commonly used in appliance or device firmware
 Author-email: Dissect Team <dissect@fox-it.com>
 License: Affero General Public License v3
@@ -26,7 +26,7 @@ Requires-Dist: dissect.cstruct<4.0.dev,>=3.0.dev
 Requires-Dist: dissect.util<4.0.dev,>=3.0.dev
 Provides-Extra: full
 Requires-Dist: lz4; extra == "full"
-Requires-Dist: python-lzo; extra == "full"
+Requires-Dist: python-lzo; (platform_system != "Windows" or platform_python_implementation != "PyPy") and extra == "full"
 Requires-Dist: zstandard; extra == "full"
 
 # dissect.squashfs

{dissect.squashfs-1.4.dev1 → dissect.squashfs-1.4.dev3}/dissect.squashfs.egg-info/requires.txt

@@ -3,5 +3,7 @@ dissect.util<4.0.dev,>=3.0.dev
 
 [full]
 lz4
-python-lzo
 zstandard
+
+[full:platform_system != "Windows" or platform_python_implementation != "PyPy"]
+python-lzo

{dissect.squashfs-1.4.dev1 → dissect.squashfs-1.4.dev3}/pyproject.toml

@@ -38,7 +38,9 @@ repository = "https://github.com/fox-it/dissect.squashfs"
 [project.optional-dependencies]
 full = [
     "lz4",
-    "python-lzo",
+    # There are no Windows PyPy wheels available for python-lzo
+    # So we use a pure python fallback for it.
+    "python-lzo; platform_system != 'Windows' or platform_python_implementation != 'PyPy'",
     "zstandard",
 ]