dissect.volume 3.17.dev3__tar.gz → 3.18.dev1__tar.gz

{dissect_volume-3.17.dev3 → dissect_volume-3.18.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dissect.volume
-Version: 3.17.dev3
+Version: 3.18.dev1
 Summary: A Dissect module implementing a parser for different disk volume and partition systems, for example LVM2, GPT and MBR
 Author-email: Dissect Team <dissect@fox-it.com>
 License-Expression: AGPL-3.0-or-later

{dissect_volume-3.17.dev3 → dissect_volume-3.18.dev1}/dissect/volume/disk/partition.py

@@ -218,27 +218,27 @@ class Partition:
         self.name = name
         self.flags = flags
         self.guid = guid
-        self.type_str = type_str
+        self.type_str = type_str or translate_partition_type(self.type)
+        self.type_name = translate_partition_type(self.type, False)
         self.raw = raw
 
     def __repr__(self) -> str:
-        type_str = self.type_str
-
-        if isinstance(self.type, int):
-            type = hex(self.type)
-            type_key = self.type
-        elif isinstance(self.type, bytes):
-            type = UUID(bytes_le=self.type)
-            type_key = type
-        elif isinstance(self.type, str):
-            type_str = self.type
-
-        type_str = type_str or f"{type} ({PARTITION_TYPES.get(type_key, 'Unknown')})"
         return (
             f"<Partition number={self.number} offset=0x{self.offset:x} "
-            f"size=0x{self.size:x} type={type_str} name={self.name!r}>"
+            f"size=0x{self.size:x} type={self.type_str!r} name={self.name!r}>"
         )
 
     def open(self) -> BinaryIO:
         """Open a stream to the partition."""
         return RangeStream(self.disk.fh, offset=self.offset, size=self.size)
+
+
+def translate_partition_type(type: int | str | UUID, prepend_type: bool = True) -> str:
+    """Translate a partition type to a human-readable format."""
+
+    if not isinstance(type, str):
+        name = PARTITION_TYPES.get(type, "Unknown")
+        type = hex(type) if isinstance(type, int) else type
+        return f"{type} ({name})" if prepend_type else name
+
+    return type

{dissect_volume-3.17.dev3 → dissect_volume-3.18.dev1}/dissect.volume.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dissect.volume
-Version: 3.17.dev3
+Version: 3.18.dev1
 Summary: A Dissect module implementing a parser for different disk volume and partition systems, for example LVM2, GPT and MBR
 Author-email: Dissect Team <dissect@fox-it.com>
 License-Expression: AGPL-3.0-or-later

{dissect_volume-3.17.dev3 → dissect_volume-3.18.dev1}/tests/disk/test_apm.py

@@ -21,6 +21,9 @@ def test_apm(apm: BinaryIO) -> None:
     assert d.partitions[0].size == 0x7E00
     assert d.partitions[0].type == "Apple_partition_map"
     assert d.partitions[0].name == "Apple"
+    assert repr(d.partitions[0]) == (
+        "<Partition number=1 offset=0x200 size=0x7e00 type='Apple_partition_map' name='Apple'>"
+    )
 
     assert d.partitions[1].number == 2
     assert d.partitions[1].offset == 0x8000

{dissect_volume-3.17.dev3 → dissect_volume-3.18.dev1}/tests/disk/test_bsd.py

@@ -17,6 +17,7 @@ def test_bsd(bsd: BinaryIO) -> None:
     assert vs.partitions[0].size == 0x200
     assert vs.partitions[0].type == 7
     assert vs.partitions[0].guid is None
+    assert repr(vs.partitions[0]) == "<Partition number=1 offset=0x800 size=0x200 type='4.2BSD' name=None>"
     assert vs.partitions[0].open().read() == b"\x01" * 512
 
     assert vs.partitions[1].number == 2

{dissect_volume-3.17.dev3 → dissect_volume-3.18.dev1}/tests/disk/test_gpt.py

@@ -23,15 +23,25 @@ def test_gpt(gpt: BinaryIO) -> None:
     assert d.partitions[0].offset == 20480
     assert d.partitions[0].size == 0xC7FFE00
     assert d.partitions[0].type == UUID("c12a7328-f81f-11d2-ba4b-00a0c93ec93b")
+    assert d.partitions[0].type_str == "c12a7328-f81f-11d2-ba4b-00a0c93ec93b (EFI System partition)"
+    assert d.partitions[0].type_name == "EFI System partition"
     assert d.partitions[0].guid == UUID("27d920bc-e414-45e0-9503-2606de7a1056")
     assert d.partitions[0].name == "EFI System Partition"
+    assert repr(d.partitions[0]) == (
+        "<Partition number=1 offset=0x5000 size=0xc7ffe00 type='c12a7328-f81f-11d2-ba4b-00a0c93ec93b (EFI System partition)' name='EFI System Partition'>"  # noqa: E501
+    )
 
     assert d.partitions[1].number == 2
     assert d.partitions[1].offset == 0xC900000
     assert d.partitions[1].size == 0x7465FFE00
     assert d.partitions[1].type == UUID("ebd0a0a2-b9e5-4433-87c0-68b6b72699c7")
+    assert d.partitions[1].type_str == "ebd0a0a2-b9e5-4433-87c0-68b6b72699c7 (Windows Basic data partition)"
+    assert d.partitions[1].type_name == "Windows Basic data partition"
     assert d.partitions[1].guid == UUID("a14cecf3-b364-4d6d-a540-e245e6df9d11")
     assert d.partitions[1].name == ""
+    assert repr(d.partitions[1]) == (
+        "<Partition number=2 offset=0xc900000 size=0x7465ffe00 type='ebd0a0a2-b9e5-4433-87c0-68b6b72699c7 (Windows Basic data partition)' name=''>"  # noqa: E501
+    )
 
 
 def test_gpt_invalid(gpt: BinaryIO) -> None:
@@ -54,6 +64,7 @@ def test_hybrid_gpt(gpt_hybrid: BinaryIO) -> None:
     assert d.partitions[0].type == 0x83
     assert d.partitions[0].guid is None
     assert d.partitions[0].name is None
+    assert repr(d.partitions[0]) == "<Partition number=1 offset=0x100000 size=0x80200 type='0x83 (Linux)' name=None>"
 
     assert d.partitions[1].number == 2
     assert d.partitions[1].offset == 0x180200
@@ -61,6 +72,7 @@ def test_hybrid_gpt(gpt_hybrid: BinaryIO) -> None:
     assert d.partitions[1].type == 0x83
     assert d.partitions[1].guid is None
     assert d.partitions[1].name is None
+    assert repr(d.partitions[1]) == "<Partition number=2 offset=0x180200 size=0x7bc00 type='0x83 (Linux)' name=None>"
 
     assert d.partitions[2].number == 1
     assert d.partitions[2].offset == 0x100000
@@ -68,6 +80,9 @@ def test_hybrid_gpt(gpt_hybrid: BinaryIO) -> None:
     assert d.partitions[2].type == UUID("0fc63daf-8483-4772-8e79-3d69d8477de4")
     assert d.partitions[2].guid == UUID("44eea528-8489-4bbc-a480-56bd208cd233")
     assert d.partitions[2].name == "Linux filesystem"
+    assert repr(d.partitions[2]) == (
+        "<Partition number=1 offset=0x100000 size=0x80000 type='0fc63daf-8483-4772-8e79-3d69d8477de4 (Linux filesystem data)' name='Linux filesystem'>"  # noqa: E501
+    )
 
     assert d.partitions[3].number == 2
     assert d.partitions[3].offset == 0x4400
@@ -151,6 +166,9 @@ def test_gpt_esxi(gpt_esxi: BinaryIO) -> None:
     assert d.partitions[3].type == UUID("4eb2ea39-7855-4790-a79e-fae495e21f8d")
     assert d.partitions[3].guid == UUID("fc7f0906-62a5-47b2-8f40-98d9427fefe0")
     assert d.partitions[3].name == "OSDATA"
+    assert repr(d.partitions[3]) == (
+        "<Partition number=7 offset=0x206600000 size=0x1df99ffe00 type='4eb2ea39-7855-4790-a79e-fae495e21f8d (Unknown)' name='OSDATA'>"  # noqa: E501
+    )
 
     assert d.partitions[4].number == 8
     assert d.partitions[4].offset == 0x2000100000

{dissect_volume-3.17.dev3 → dissect_volume-3.18.dev1}/tests/disk/test_mbr.py

@@ -20,6 +20,7 @@ def test_mbr(mbr: BinaryIO) -> None:
     assert d.partitions[0].offset == 0x100000
     assert d.partitions[0].size == 0x1F400000
     assert d.partitions[0].type == 0x7
+    assert repr(d.partitions[0]) == "<Partition number=1 offset=0x100000 size=0x1f400000 type='0x7 (NTFS)' name=None>"
 
     assert d.partitions[1].number == 2
     assert d.partitions[1].offset == 0x1F500000