dissect.btrfs 1.7.dev2__tar.gz → 1.8.dev1__tar.gz

dissect_btrfs-1.8.dev1/.gitattributes

@@ -0,0 +1 @@
+tests/_data/** filter=lfs diff=lfs merge=lfs -text

{dissect_btrfs-1.7.dev2 → dissect_btrfs-1.8.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: dissect.btrfs
-Version: 1.7.dev2
+Version: 1.8.dev1
 Summary: A Dissect module implementing a parser for the Btrfs file system, a commonly used Linux filesystem.
 Author-email: Dissect Team <dissect@fox-it.com>
 License: Affero General Public License v3
@@ -23,7 +23,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 License-File: COPYRIGHT
 Requires-Dist: dissect.cstruct<5,>=4
-Requires-Dist: dissect.util<4,>=3
+Requires-Dist: dissect.util<4,>=3.22.dev
 Provides-Extra: full
 Requires-Dist: zstandard; extra == "full"
 Provides-Extra: gcrc32
@@ -33,7 +33,8 @@ Requires-Dist: python-lzo; (platform_system != "Windows" or platform_python_impl
 Provides-Extra: dev
 Requires-Dist: dissect.btrfs[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"
+Requires-Dist: dissect.util<4.0.dev,>=3.22.dev; extra == "dev"
+Dynamic: license-file
 
 # dissect.btrfs
 

{dissect_btrfs-1.7.dev2 → dissect_btrfs-1.8.dev1}/dissect/btrfs/btrfs.py

@@ -22,7 +22,7 @@ try:
         warnings.simplefilter("ignore")
         from google_crc32c import extend as crc32c
 except ImportError:
-    from dissect.util.crc32c import update as crc32c
+    from dissect.util.hash.crc32c import update as crc32c
 
 from dissect.btrfs.c_btrfs import FT_MAP, c_btrfs
 from dissect.btrfs.exceptions import (

{dissect_btrfs-1.7.dev2 → dissect_btrfs-1.8.dev1}/dissect/btrfs/c_btrfs.py

@@ -879,8 +879,6 @@ BTRFS_BLOCK_GROUP = c_btrfs.BTRFS_BLOCK_GROUP
 
 BTRFS_BLOCK_GROUP_TYPE_MASK = BTRFS_BLOCK_GROUP.DATA | BTRFS_BLOCK_GROUP.SYSTEM | BTRFS_BLOCK_GROUP.METADATA
 
-BTRFS_BLOCK_GROUP_TYPE_MASK = BTRFS_BLOCK_GROUP.DATA | BTRFS_BLOCK_GROUP.SYSTEM | BTRFS_BLOCK_GROUP.METADATA
-
 BTRFS_BLOCK_GROUP_PROFILE_MASK = (
     BTRFS_BLOCK_GROUP.RAID0
     | BTRFS_BLOCK_GROUP.RAID1

{dissect_btrfs-1.7.dev2 → dissect_btrfs-1.8.dev1}/dissect.btrfs.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: dissect.btrfs
-Version: 1.7.dev2
+Version: 1.8.dev1
 Summary: A Dissect module implementing a parser for the Btrfs file system, a commonly used Linux filesystem.
 Author-email: Dissect Team <dissect@fox-it.com>
 License: Affero General Public License v3
@@ -23,7 +23,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 License-File: COPYRIGHT
 Requires-Dist: dissect.cstruct<5,>=4
-Requires-Dist: dissect.util<4,>=3
+Requires-Dist: dissect.util<4,>=3.22.dev
 Provides-Extra: full
 Requires-Dist: zstandard; extra == "full"
 Provides-Extra: gcrc32
@@ -33,7 +33,8 @@ Requires-Dist: python-lzo; (platform_system != "Windows" or platform_python_impl
 Provides-Extra: dev
 Requires-Dist: dissect.btrfs[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"
+Requires-Dist: dissect.util<4.0.dev,>=3.22.dev; extra == "dev"
+Dynamic: license-file
 
 # dissect.btrfs
 

dissect_btrfs-1.8.dev1/dissect.btrfs.egg-info/SOURCES.txt

@@ -0,0 +1,54 @@
+.git-blame-ignore-revs
+.gitattributes
+COPYRIGHT
+LICENSE
+MANIFEST.in
+README.md
+pyproject.toml
+tox.ini
+dissect.btrfs.egg-info/PKG-INFO
+dissect.btrfs.egg-info/SOURCES.txt
+dissect.btrfs.egg-info/dependency_links.txt
+dissect.btrfs.egg-info/requires.txt
+dissect.btrfs.egg-info/top_level.txt
+dissect/btrfs/__init__.py
+dissect/btrfs/btrfs.py
+dissect/btrfs/c_btrfs.py
+dissect/btrfs/exceptions.py
+dissect/btrfs/stream.py
+dissect/btrfs/tree.py
+tests/__init__.py
+tests/conftest.py
+tests/test_btrfs.py
+tests/test_exceptions.py
+tests/_data/btrfs-compression.bin.gz
+tests/_data/btrfs-default.bin.gz
+tests/_data/btrfs-dup-1.bin.gz
+tests/_data/btrfs-dup-2.bin.gz
+tests/_data/btrfs-raid0-1.bin.gz
+tests/_data/btrfs-raid0-2.bin.gz
+tests/_data/btrfs-raid1-1.bin.gz
+tests/_data/btrfs-raid1-2.bin.gz
+tests/_data/btrfs-raid10-1.bin.gz
+tests/_data/btrfs-raid10-2.bin.gz
+tests/_data/btrfs-raid1c3-1.bin.gz
+tests/_data/btrfs-raid1c3-2.bin.gz
+tests/_data/btrfs-raid1c3-3.bin.gz
+tests/_data/btrfs-raid1c4-1.bin.gz
+tests/_data/btrfs-raid1c4-2.bin.gz
+tests/_data/btrfs-raid1c4-3.bin.gz
+tests/_data/btrfs-raid1c4-4.bin.gz
+tests/_data/btrfs-raid5-1.bin.gz
+tests/_data/btrfs-raid5-2.bin.gz
+tests/_data/btrfs-raid6-1.bin.gz
+tests/_data/btrfs-raid6-2.bin.gz
+tests/_data/btrfs-raid6-3.bin.gz
+tests/_data/btrfs-sparse.bin.gz
+tests/_data/btrfs-subvolume-custom-default.bin.gz
+tests/_data/btrfs-subvolume-nested.bin.gz
+tests/_data/btrfs-subvolume-snapshot.bin.gz
+tests/_data/btrfs-subvolume.bin.gz
+tests/_docs/Makefile
+tests/_docs/__init__.py
+tests/_docs/conf.py
+tests/_docs/index.rst

{dissect_btrfs-1.7.dev2 → dissect_btrfs-1.8.dev1}/dissect.btrfs.egg-info/requires.txt

@@ -1,10 +1,10 @@
 dissect.cstruct<5,>=4
-dissect.util<4,>=3
+dissect.util<4,>=3.22.dev
 
 [dev]
 dissect.btrfs[full]
 dissect.cstruct<5.0.dev,>=4.0.dev
-dissect.util<4.0.dev,>=3.0.dev
+dissect.util<4.0.dev,>=3.22.dev
 
 [full]
 zstandard

{dissect_btrfs-1.7.dev2 → dissect_btrfs-1.8.dev1}/pyproject.toml

@@ -26,7 +26,7 @@ classifiers = [
 ]
 dependencies = [
     "dissect.cstruct>=4,<5",
-    "dissect.util>=3,<4",
+    "dissect.util>=3.22.dev,<4", #TODO: Remove once we release a new dissect version
 ]
 dynamic = ["version"]
 
@@ -50,7 +50,7 @@ lzo = [
 dev = [
     "dissect.btrfs[full]",
     "dissect.cstruct>=4.0.dev,<5.0.dev",
-    "dissect.util>=3.0.dev,<4.0.dev",
+    "dissect.util>=3.22.dev,<4.0.dev", #TODO: Remove once we release a new dissect version
 ]
 
 [tool.ruff]

dissect_btrfs-1.8.dev1/tests/_docs/Makefile

@@ -0,0 +1,24 @@
+# Minimal makefile for Sphinx documentation
+#
+
+# You can set these variables from the command line, and also
+# from the environment for the first two.
+SPHINXOPTS    ?= -jauto -w $(BUILDDIR)/warnings.log --fail-on-warning
+SPHINXBUILD   ?= sphinx-build
+SOURCEDIR     = .
+BUILDDIR      = build
+
+# Put it first so that "make" without argument is like "make help".
+help:
+	@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
+
+.PHONY: clean help Makefile
+
+clean: Makefile
+	rm -rf api
+	@$(SPHINXBUILD) -M clean "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
+
+# Catch-all target: route all unknown targets to Sphinx using the new
+# "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).
+%: Makefile
+	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)

dissect_btrfs-1.8.dev1/tests/_docs/conf.py

@@ -0,0 +1,41 @@
+project = "dissect.btrfs"
+
+extensions = [
+    "autoapi.extension",
+    "sphinx.ext.autodoc",
+    "sphinx.ext.autosectionlabel",
+    "sphinx.ext.doctest",
+    "sphinx.ext.napoleon",
+    "sphinx_argparse_cli",
+]
+
+exclude_patterns = []
+
+html_theme = "furo"
+
+autoapi_type = "python"
+autoapi_dirs = ["../../dissect/"]
+autoapi_ignore = ["*tests*", "*.tox*", "*venv*", "*examples*"]
+autoapi_python_use_implicit_namespaces = True
+autoapi_add_toctree_entry = False
+autoapi_root = "api"
+autoapi_options = [
+    "members",
+    "undoc-members",
+    "show-inheritance",
+    "show-module-summary",
+    "special-members",
+    "imported-members",
+]
+autoapi_keep_files = True
+autoapi_template_dir = "_templates/autoapi"
+
+autodoc_typehints = "signature"
+autodoc_member_order = "groupwise"
+
+autosectionlabel_prefix_document = True
+
+suppress_warnings = [
+    # https://github.com/readthedocs/sphinx-autoapi/issues/285
+    "autoapi.python_import_resolution",
+]

dissect_btrfs-1.8.dev1/tests/_docs/index.rst

@@ -0,0 +1,8 @@
+API Reference
+=============
+
+.. toctree::
+    :maxdepth: 1
+    :glob:
+
+    /api/*/*/index

{dissect_btrfs-1.7.dev2 → dissect_btrfs-1.8.dev1}/tests/conftest.py

@@ -32,61 +32,61 @@ def open_files_gz(names: list[str], mode: str = "rb") -> Iterator[list[gzip.Gzip
 
 @pytest.fixture
 def btrfs_default() -> Iterator[BinaryIO]:
-    yield from open_file_gz("data/btrfs-default.bin.gz")
+    yield from open_file_gz("_data/btrfs-default.bin.gz")
 
 
 @pytest.fixture
 def btrfs_sparse() -> Iterator[BinaryIO]:
-    yield from open_file_gz("data/btrfs-sparse.bin.gz")
+    yield from open_file_gz("_data/btrfs-sparse.bin.gz")
 
 
 @pytest.fixture
 def btrfs_subvolume() -> Iterator[BinaryIO]:
-    yield from open_file_gz("data/btrfs-subvolume.bin.gz")
+    yield from open_file_gz("_data/btrfs-subvolume.bin.gz")
 
 
 @pytest.fixture
 def btrfs_subvolume_nested() -> Iterator[BinaryIO]:
-    yield from open_file_gz("data/btrfs-subvolume-nested.bin.gz")
+    yield from open_file_gz("_data/btrfs-subvolume-nested.bin.gz")
 
 
 @pytest.fixture
 def btrfs_subvolume_custom_default() -> Iterator[BinaryIO]:
-    yield from open_file_gz("data/btrfs-subvolume-custom-default.bin.gz")
+    yield from open_file_gz("_data/btrfs-subvolume-custom-default.bin.gz")
 
 
 @pytest.fixture
 def btrfs_subvolume_snapshot() -> Iterator[BinaryIO]:
-    yield from open_file_gz("data/btrfs-subvolume-snapshot.bin.gz")
+    yield from open_file_gz("_data/btrfs-subvolume-snapshot.bin.gz")
 
 
 @pytest.fixture
 def btrfs_compression() -> Iterator[BinaryIO]:
-    yield from open_file_gz("data/btrfs-compression.bin.gz")
+    yield from open_file_gz("_data/btrfs-compression.bin.gz")
 
 
 @pytest.fixture
 def btrfs_profile_dup() -> Iterator[list[BinaryIO]]:
-    yield from open_files_gz(["data/btrfs-dup-1.bin.gz", "data/btrfs-dup-2.bin.gz"])
+    yield from open_files_gz(["_data/btrfs-dup-1.bin.gz", "_data/btrfs-dup-2.bin.gz"])
 
 
 @pytest.fixture
 def btrfs_profile_raid0() -> Iterator[list[BinaryIO]]:
-    yield from open_files_gz(["data/btrfs-raid0-1.bin.gz", "data/btrfs-raid0-2.bin.gz"])
+    yield from open_files_gz(["_data/btrfs-raid0-1.bin.gz", "_data/btrfs-raid0-2.bin.gz"])
 
 
 @pytest.fixture
 def btrfs_profile_raid1() -> Iterator[list[BinaryIO]]:
-    yield from open_files_gz(["data/btrfs-raid1-1.bin.gz", "data/btrfs-raid1-2.bin.gz"])
+    yield from open_files_gz(["_data/btrfs-raid1-1.bin.gz", "_data/btrfs-raid1-2.bin.gz"])
 
 
 @pytest.fixture
 def btrfs_profile_raid1c3() -> Iterator[list[BinaryIO]]:
     yield from open_files_gz(
         [
-            "data/btrfs-raid1c3-1.bin.gz",
-            "data/btrfs-raid1c3-2.bin.gz",
-            "data/btrfs-raid1c3-3.bin.gz",
+            "_data/btrfs-raid1c3-1.bin.gz",
+            "_data/btrfs-raid1c3-2.bin.gz",
+            "_data/btrfs-raid1c3-3.bin.gz",
         ]
     )
 
@@ -95,24 +95,24 @@ def btrfs_profile_raid1c3() -> Iterator[list[BinaryIO]]:
 def btrfs_profile_raid1c4() -> Iterator[list[BinaryIO]]:
     yield from open_files_gz(
         [
-            "data/btrfs-raid1c4-1.bin.gz",
-            "data/btrfs-raid1c4-2.bin.gz",
-            "data/btrfs-raid1c4-3.bin.gz",
-            "data/btrfs-raid1c4-4.bin.gz",
+            "_data/btrfs-raid1c4-1.bin.gz",
+            "_data/btrfs-raid1c4-2.bin.gz",
+            "_data/btrfs-raid1c4-3.bin.gz",
+            "_data/btrfs-raid1c4-4.bin.gz",
         ]
     )
 
 
 @pytest.fixture
 def btrfs_profile_raid5() -> Iterator[list[BinaryIO]]:
-    yield from open_files_gz(["data/btrfs-raid5-1.bin.gz", "data/btrfs-raid5-2.bin.gz"])
+    yield from open_files_gz(["_data/btrfs-raid5-1.bin.gz", "_data/btrfs-raid5-2.bin.gz"])
 
 
 @pytest.fixture
 def btrfs_profile_raid6() -> Iterator[list[BinaryIO]]:
-    yield from open_files_gz(["data/btrfs-raid6-1.bin.gz", "data/btrfs-raid6-2.bin.gz", "data/btrfs-raid6-3.bin.gz"])
+    yield from open_files_gz(["_data/btrfs-raid6-1.bin.gz", "_data/btrfs-raid6-2.bin.gz", "_data/btrfs-raid6-3.bin.gz"])
 
 
 @pytest.fixture
 def btrfs_profile_raid10() -> Iterator[list[BinaryIO]]:
-    yield from open_files_gz(["data/btrfs-raid10-1.bin.gz", "data/btrfs-raid10-2.bin.gz"])
+    yield from open_files_gz(["_data/btrfs-raid10-1.bin.gz", "_data/btrfs-raid10-2.bin.gz"])

{dissect_btrfs-1.7.dev2 → dissect_btrfs-1.8.dev1}/tox.ini

@@ -62,12 +62,12 @@ deps =
     sphinx-design
     furo
 commands =
-    make -C tests/docs clean
-    make -C tests/docs html
+    make -C tests/_docs clean
+    make -C tests/_docs html
 
 [testenv:docs-linkcheck]
 allowlist_externals = make
 deps = {[testenv:docs-build]deps}
 commands =
-    make -C tests/docs clean
-    make -C tests/docs linkcheck
+    make -C tests/_docs clean
+    make -C tests/_docs linkcheck

dissect_btrfs-1.7.dev2/.gitattributes

@@ -1,27 +0,0 @@
-tests/data/btrfs-default.bin.gz filter=lfs diff=lfs merge=lfs -text
-tests/data/btrfs-compression.bin.gz filter=lfs diff=lfs merge=lfs -text
-tests/data/btrfs-sparse.bin.gz filter=lfs diff=lfs merge=lfs -text
-tests/data/btrfs-subvolume.bin.gz filter=lfs diff=lfs merge=lfs -text
-tests/data/btrfs-subvolume-snapshot.bin.gz filter=lfs diff=lfs merge=lfs -text
-tests/data/btrfs-subvolume-nested.bin.gz filter=lfs diff=lfs merge=lfs -text
-tests/data/btrfs-subvolume-custom-default.bin.gz filter=lfs diff=lfs merge=lfs -text
-tests/data/btrfs-dup-1.bin.gz filter=lfs diff=lfs merge=lfs -text
-tests/data/btrfs-dup-2.bin.gz filter=lfs diff=lfs merge=lfs -text
-tests/data/btrfs-raid0-1.bin.gz filter=lfs diff=lfs merge=lfs -text
-tests/data/btrfs-raid0-2.bin.gz filter=lfs diff=lfs merge=lfs -text
-tests/data/btrfs-raid1-1.bin.gz filter=lfs diff=lfs merge=lfs -text
-tests/data/btrfs-raid1-2.bin.gz filter=lfs diff=lfs merge=lfs -text
-tests/data/btrfs-raid1c3-1.bin.gz filter=lfs diff=lfs merge=lfs -text
-tests/data/btrfs-raid1c3-2.bin.gz filter=lfs diff=lfs merge=lfs -text
-tests/data/btrfs-raid1c3-3.bin.gz filter=lfs diff=lfs merge=lfs -text
-tests/data/btrfs-raid1c4-1.bin.gz filter=lfs diff=lfs merge=lfs -text
-tests/data/btrfs-raid1c4-2.bin.gz filter=lfs diff=lfs merge=lfs -text
-tests/data/btrfs-raid1c4-3.bin.gz filter=lfs diff=lfs merge=lfs -text
-tests/data/btrfs-raid1c4-4.bin.gz filter=lfs diff=lfs merge=lfs -text
-tests/data/btrfs-raid10-1.bin.gz filter=lfs diff=lfs merge=lfs -text
-tests/data/btrfs-raid10-2.bin.gz filter=lfs diff=lfs merge=lfs -text
-tests/data/btrfs-raid5-1.bin.gz filter=lfs diff=lfs merge=lfs -text
-tests/data/btrfs-raid5-2.bin.gz filter=lfs diff=lfs merge=lfs -text
-tests/data/btrfs-raid6-1.bin.gz filter=lfs diff=lfs merge=lfs -text
-tests/data/btrfs-raid6-2.bin.gz filter=lfs diff=lfs merge=lfs -text
-tests/data/btrfs-raid6-3.bin.gz filter=lfs diff=lfs merge=lfs -text

dissect_btrfs-1.7.dev2/dissect.btrfs.egg-info/SOURCES.txt

@@ -1,50 +0,0 @@
-.git-blame-ignore-revs
-.gitattributes
-COPYRIGHT
-LICENSE
-MANIFEST.in
-README.md
-pyproject.toml
-tox.ini
-dissect.btrfs.egg-info/PKG-INFO
-dissect.btrfs.egg-info/SOURCES.txt
-dissect.btrfs.egg-info/dependency_links.txt
-dissect.btrfs.egg-info/requires.txt
-dissect.btrfs.egg-info/top_level.txt
-dissect/btrfs/__init__.py
-dissect/btrfs/btrfs.py
-dissect/btrfs/c_btrfs.py
-dissect/btrfs/exceptions.py
-dissect/btrfs/stream.py
-dissect/btrfs/tree.py
-tests/__init__.py
-tests/conftest.py
-tests/test_btrfs.py
-tests/test_exceptions.py
-tests/data/btrfs-compression.bin.gz
-tests/data/btrfs-default.bin.gz
-tests/data/btrfs-dup-1.bin.gz
-tests/data/btrfs-dup-2.bin.gz
-tests/data/btrfs-raid0-1.bin.gz
-tests/data/btrfs-raid0-2.bin.gz
-tests/data/btrfs-raid1-1.bin.gz
-tests/data/btrfs-raid1-2.bin.gz
-tests/data/btrfs-raid10-1.bin.gz
-tests/data/btrfs-raid10-2.bin.gz
-tests/data/btrfs-raid1c3-1.bin.gz
-tests/data/btrfs-raid1c3-2.bin.gz
-tests/data/btrfs-raid1c3-3.bin.gz
-tests/data/btrfs-raid1c4-1.bin.gz
-tests/data/btrfs-raid1c4-2.bin.gz
-tests/data/btrfs-raid1c4-3.bin.gz
-tests/data/btrfs-raid1c4-4.bin.gz
-tests/data/btrfs-raid5-1.bin.gz
-tests/data/btrfs-raid5-2.bin.gz
-tests/data/btrfs-raid6-1.bin.gz
-tests/data/btrfs-raid6-2.bin.gz
-tests/data/btrfs-raid6-3.bin.gz
-tests/data/btrfs-sparse.bin.gz
-tests/data/btrfs-subvolume-custom-default.bin.gz
-tests/data/btrfs-subvolume-nested.bin.gz
-tests/data/btrfs-subvolume-snapshot.bin.gz
-tests/data/btrfs-subvolume.bin.gz