dissect.squashfs 1.5.dev4__tar.gz → 1.6.dev2__tar.gz

{dissect.squashfs-1.5.dev4/dissect.squashfs.egg-info → dissect_squashfs-1.6.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dissect.squashfs
-Version: 1.5.dev4
+Version: 1.6.dev2
 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,16 @@ Requires-Python: ~=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 License-File: COPYRIGHT
-Requires-Dist: dissect.cstruct<4.0.dev,>=3.0.dev
-Requires-Dist: dissect.util<4.0.dev,>=3.0.dev
+Requires-Dist: dissect.cstruct<5,>=4.dev
+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: dev
+Requires-Dist: dissect.squashfs[full]; extra == "dev"
+Requires-Dist: dissect.cstruct<5.0.dev,>=4.0.dev; extra == "dev"
+Requires-Dist: dissect.util<4.0.dev,>=3.0.dev; extra == "dev"
 
 # dissect.squashfs
 

{dissect.squashfs-1.5.dev4 → dissect_squashfs-1.6.dev2}/dissect/squashfs/c_squashfs.py

@@ -1,6 +1,6 @@
 import stat
 
-from dissect import cstruct
+from dissect.cstruct import cstruct
 
 squashfs_def = """
 #define SQUASHFS_MAGIC  0x73717368
@@ -319,8 +319,7 @@ struct zstd_comp_opts {
 };
 """
 
-c_squashfs = cstruct.cstruct()
-c_squashfs.load(squashfs_def)
+c_squashfs = cstruct().load(squashfs_def)
 
 INODE_STRUCT_MAP = {
     c_squashfs.SQUASHFS_DIR_TYPE: c_squashfs.squashfs_dir_inode_header,

{dissect.squashfs-1.5.dev4 → dissect_squashfs-1.6.dev2}/dissect/squashfs/squashfs.py

@@ -11,7 +11,6 @@ from datetime import datetime
 from functools import cache, cached_property, lru_cache
 from typing import BinaryIO, Iterator, Optional, Union
 
-from dissect.cstruct import Instance
 from dissect.util import ts
 from dissect.util.stream import RunlistStream
 
@@ -213,7 +212,27 @@ class INode:
     def __repr__(self) -> str:
         return f"<inode {self.inode_number} ({self.block}, {self.offset})>"
 
-    def _metadata(self) -> tuple[Instance, int, int]:
+    def _metadata(
+        self,
+    ) -> tuple[
+        c_squashfs.squashfs_base_inode_header
+        | c_squashfs.squashfs_dir_inode_header
+        | c_squashfs.squashfs_reg_inode_header
+        | c_squashfs.squashfs_symlink_inode_header
+        | c_squashfs.squashfs_dev_inode_header
+        | c_squashfs.squashfs_dev_inode_header
+        | c_squashfs.squashfs_base_inode_header
+        | c_squashfs.squashfs_base_inode_header
+        | c_squashfs.squashfs_ldir_inode_header
+        | c_squashfs.squashfs_lreg_inode_header
+        | c_squashfs.squashfs_symlink_inode_header
+        | c_squashfs.squashfs_ldev_inode_header
+        | c_squashfs.squashfs_ldev_inode_header
+        | c_squashfs.squashfs_lipc_inode_header
+        | c_squashfs.squashfs_lipc_inode_header,
+        int,
+        int,
+    ]:
         base_struct = c_squashfs.squashfs_base_inode_header
 
         block = self.fs.sb.inode_table_start + self.block
@@ -235,7 +254,25 @@ class INode:
         return header, data_block, data_offset
 
     @cached_property
-    def header(self) -> Instance:
+    def header(
+        self,
+    ) -> (
+        c_squashfs.squashfs_base_inode_header
+        | c_squashfs.squashfs_dir_inode_header
+        | c_squashfs.squashfs_reg_inode_header
+        | c_squashfs.squashfs_symlink_inode_header
+        | c_squashfs.squashfs_dev_inode_header
+        | c_squashfs.squashfs_dev_inode_header
+        | c_squashfs.squashfs_base_inode_header
+        | c_squashfs.squashfs_base_inode_header
+        | c_squashfs.squashfs_ldir_inode_header
+        | c_squashfs.squashfs_lreg_inode_header
+        | c_squashfs.squashfs_symlink_inode_header
+        | c_squashfs.squashfs_ldev_inode_header
+        | c_squashfs.squashfs_ldev_inode_header
+        | c_squashfs.squashfs_lipc_inode_header
+        | c_squashfs.squashfs_lipc_inode_header
+    ):
         header, _, _ = self._metadata()
         return header
 

{dissect.squashfs-1.5.dev4 → dissect_squashfs-1.6.dev2/dissect.squashfs.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dissect.squashfs
-Version: 1.5.dev4
+Version: 1.6.dev2
 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,16 @@ Requires-Python: ~=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 License-File: COPYRIGHT
-Requires-Dist: dissect.cstruct<4.0.dev,>=3.0.dev
-Requires-Dist: dissect.util<4.0.dev,>=3.0.dev
+Requires-Dist: dissect.cstruct<5,>=4.dev
+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: dev
+Requires-Dist: dissect.squashfs[full]; extra == "dev"
+Requires-Dist: dissect.cstruct<5.0.dev,>=4.0.dev; extra == "dev"
+Requires-Dist: dissect.util<4.0.dev,>=3.0.dev; extra == "dev"
 
 # dissect.squashfs
 

{dissect.squashfs-1.5.dev4 → dissect_squashfs-1.6.dev2}/dissect.squashfs.egg-info/requires.txt

@@ -1,4 +1,9 @@
-dissect.cstruct<4.0.dev,>=3.0.dev
+dissect.cstruct<5,>=4.dev
+dissect.util<4,>=3
+
+[dev]
+dissect.squashfs[full]
+dissect.cstruct<5.0.dev,>=4.0.dev
 dissect.util<4.0.dev,>=3.0.dev
 
 [full]

{dissect.squashfs-1.5.dev4 → dissect_squashfs-1.6.dev2}/pyproject.toml

@@ -25,8 +25,8 @@ classifiers = [
   "Topic :: Utilities",
 ]
 dependencies = [
-    "dissect.cstruct>=3.0.dev,<4.0.dev",
-    "dissect.util>=3.0.dev,<4.0.dev",
+    "dissect.cstruct>=4.dev,<5",
+    "dissect.util>=3,<4",
 ]
 dynamic = ["version"]
 
@@ -43,6 +43,11 @@ full = [
     "python-lzo; platform_system != 'Windows' or platform_python_implementation != 'PyPy'",
     "zstandard",
 ]
+dev = [
+    "dissect.squashfs[full]",
+    "dissect.cstruct>=4.0.dev,<5.0.dev",
+    "dissect.util>=3.0.dev,<4.0.dev",
+]
 
 [tool.black]
 line-length = 120

{dissect.squashfs-1.5.dev4 → dissect_squashfs-1.6.dev2}/tox.ini

@@ -5,13 +5,14 @@ envlist = lint, py3, pypy3
 # locally installed tox to have a minimum version 3.3.0. This means the names
 # of the configuration options are still according to the tox 3.x syntax.
 minversion = 4.4.3
-# This version of virtualenv will install setuptools version 65.5.0 and pip
-# 22.3. These versions fully support python projects defined only through a
-# pyproject.toml file (PEP-517/PEP-518/PEP-621)
-requires = virtualenv>=20.16.6
+# This version of virtualenv will install setuptools version 68.2.2 and pip
+# 23.3.1. These versions fully support python projects defined only through a
+# pyproject.toml file (PEP-517/PEP-518/PEP-621). This pip version also support
+# the proper version resolving with (sub-)dependencies defining dev extra's.
+requires = virtualenv>=20.24.6
 
 [testenv]
-extras = full
+extras = dev
 deps =
     pytest
     pytest-cov