dissect.squashfs 1.6.dev2__tar.gz → 1.7.dev1__tar.gz

{dissect_squashfs-1.6.dev2/dissect.squashfs.egg-info → dissect_squashfs-1.7.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dissect.squashfs
-Version: 1.6.dev2
+Version: 1.7.dev1
 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
@@ -22,12 +22,14 @@ Requires-Python: ~=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 License-File: COPYRIGHT
-Requires-Dist: dissect.cstruct<5,>=4.dev
+Requires-Dist: dissect.cstruct<5,>=4
 Requires-Dist: dissect.util<4,>=3
 Provides-Extra: full
-Requires-Dist: lz4; extra == "full"
-Requires-Dist: python-lzo; (platform_system != "Windows" or platform_python_implementation != "PyPy") and extra == "full"
 Requires-Dist: zstandard; extra == "full"
+Provides-Extra: lzo
+Requires-Dist: python-lzo; (platform_system != "Windows" or platform_python_implementation != "PyPy") and extra == "lzo"
+Provides-Extra: lz4
+Requires-Dist: lz4; extra == "lz4"
 Provides-Extra: dev
 Requires-Dist: dissect.squashfs[full]; extra == "dev"
 Requires-Dist: dissect.cstruct<5.0.dev,>=4.0.dev; extra == "dev"
@@ -52,7 +54,17 @@ Information on the supported Python versions can be found in the Getting Started
 pip install dissect.squashfs
 ```
 
-This module is also automatically installed if you install the `dissect` package.
+This project decompresses lzo and lz4 compressed file systems and can use the faster, native (C-based) lz4 and lzo
+implementations when installed, instead of the slower pure Python implementation provided by `dissect.util`. To use
+these faster implementations, install the package with the lzo and lz4 extras:
+
+```bash
+pip install "dissect.squashfs[lz4,lzo]"
+```
+
+Unfortunately there is no binary `python-lzo` wheel for PyPy installations on Windows, so it won't be installed there
+
+This module including the lz4 and lzo extras is also automatically installed if you install the `dissect` package.
 
 ## Build and test instructions
 

{dissect_squashfs-1.6.dev2 → dissect_squashfs-1.7.dev1}/README.md

@@ -17,7 +17,17 @@ Information on the supported Python versions can be found in the Getting Started
 pip install dissect.squashfs
 ```
 
-This module is also automatically installed if you install the `dissect` package.
+This project decompresses lzo and lz4 compressed file systems and can use the faster, native (C-based) lz4 and lzo
+implementations when installed, instead of the slower pure Python implementation provided by `dissect.util`. To use
+these faster implementations, install the package with the lzo and lz4 extras:
+
+```bash
+pip install "dissect.squashfs[lz4,lzo]"
+```
+
+Unfortunately there is no binary `python-lzo` wheel for PyPy installations on Windows, so it won't be installed there
+
+This module including the lz4 and lzo extras is also automatically installed if you install the `dissect` package.
 
 ## Build and test instructions
 

{dissect_squashfs-1.6.dev2 → dissect_squashfs-1.7.dev1}/dissect/squashfs/compression.py

@@ -11,9 +11,9 @@ def initialize(id: int, options: Optional[bytes]) -> Compression:
     modules = {
         c_squashfs.ZLIB_COMPRESSION: (NativeZlib,),
         c_squashfs.LZMA_COMPRESSION: (NativeLZMA,),
-        c_squashfs.LZO_COMPRESSION: (NativeLZO, PythonLZO),
+        c_squashfs.LZO_COMPRESSION: (AvailableLZO,),
         c_squashfs.XZ_COMPRESSION: (NativeXZ,),
-        c_squashfs.LZ4_COMPRESSION: (NativeLZ4, PythonLZ4),
+        c_squashfs.LZ4_COMPRESSION: (AvailableLZ4,),
         c_squashfs.ZSTD_COMPRESSION: (NativeZSTD,),
     }
 
@@ -60,14 +60,7 @@ class NativeLZMA(Compression):
         return self._module.decompress(data)
 
 
-class NativeLZO(Compression):
-    module = "lzo"
-
-    def decompress(self, data: bytes, expected: int) -> bytes:
-        return self._module.decompress(data, False, expected)
-
-
-class PythonLZO(Compression):
+class AvailableLZO(Compression):
     module = "dissect.util.compression.lzo"
 
     def decompress(self, data: bytes, expected: int) -> bytes:
@@ -81,18 +74,11 @@ class NativeXZ(Compression):
         return self._module.decompress(data)
 
 
-class NativeLZ4(Compression):
-    module = "lz4.block"
-
-    def decompress(self, data: bytes, expected: int) -> bytes:
-        return self._module.decompress(data, expected)
-
-
-class PythonLZ4(Compression):
+class AvailableLZ4(Compression):
     module = "dissect.util.compression.lz4"
 
     def decompress(self, data: bytes, expected: int) -> bytes:
-        return self._module.decompress(data)
+        return self._module.decompress(data, uncompressed_size=expected)
 
 
 class NativeZSTD(Compression):

{dissect_squashfs-1.6.dev2 → dissect_squashfs-1.7.dev1/dissect.squashfs.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dissect.squashfs
-Version: 1.6.dev2
+Version: 1.7.dev1
 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
@@ -22,12 +22,14 @@ Requires-Python: ~=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 License-File: COPYRIGHT
-Requires-Dist: dissect.cstruct<5,>=4.dev
+Requires-Dist: dissect.cstruct<5,>=4
 Requires-Dist: dissect.util<4,>=3
 Provides-Extra: full
-Requires-Dist: lz4; extra == "full"
-Requires-Dist: python-lzo; (platform_system != "Windows" or platform_python_implementation != "PyPy") and extra == "full"
 Requires-Dist: zstandard; extra == "full"
+Provides-Extra: lzo
+Requires-Dist: python-lzo; (platform_system != "Windows" or platform_python_implementation != "PyPy") and extra == "lzo"
+Provides-Extra: lz4
+Requires-Dist: lz4; extra == "lz4"
 Provides-Extra: dev
 Requires-Dist: dissect.squashfs[full]; extra == "dev"
 Requires-Dist: dissect.cstruct<5.0.dev,>=4.0.dev; extra == "dev"
@@ -52,7 +54,17 @@ Information on the supported Python versions can be found in the Getting Started
 pip install dissect.squashfs
 ```
 
-This module is also automatically installed if you install the `dissect` package.
+This project decompresses lzo and lz4 compressed file systems and can use the faster, native (C-based) lz4 and lzo
+implementations when installed, instead of the slower pure Python implementation provided by `dissect.util`. To use
+these faster implementations, install the package with the lzo and lz4 extras:
+
+```bash
+pip install "dissect.squashfs[lz4,lzo]"
+```
+
+Unfortunately there is no binary `python-lzo` wheel for PyPy installations on Windows, so it won't be installed there
+
+This module including the lz4 and lzo extras is also automatically installed if you install the `dissect` package.
 
 ## Build and test instructions
 

{dissect_squashfs-1.6.dev2 → dissect_squashfs-1.7.dev1}/dissect.squashfs.egg-info/requires.txt

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

{dissect_squashfs-1.6.dev2 → dissect_squashfs-1.7.dev1}/pyproject.toml

@@ -25,7 +25,7 @@ classifiers = [
   "Topic :: Utilities",
 ]
 dependencies = [
-    "dissect.cstruct>=4.dev,<5",
+    "dissect.cstruct>=4,<5",
     "dissect.util>=3,<4",
 ]
 dynamic = ["version"]
@@ -37,11 +37,15 @@ repository = "https://github.com/fox-it/dissect.squashfs"
 
 [project.optional-dependencies]
 full = [
-    "lz4",
+    "zstandard",
+]
+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",
+]
+lz4 = [
+    "lz4",
 ]
 dev = [
     "dissect.squashfs[full]",