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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dissect.volume
-Version: 3.17.dev4
+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.dev4 → dissect_volume-3.18.dev1}/dissect/volume/disk/partition.py

@@ -218,25 +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 type_str is None:
-            if isinstance(self.type, int):
-                type_str = f"{hex(self.type)} ({PARTITION_TYPES.get(self.type, 'Unknown')})"
-            elif isinstance(self.type, UUID):
-                type_str = f"{self.type} ({PARTITION_TYPES.get(self.type, 'Unknown')})"
-            else:
-                type_str = self.type
-
         return (
             f"<Partition number={self.number} offset=0x{self.offset:x} "
-            f"size=0x{self.size:x} type={type_str!r} 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.dev4 → 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.dev4
+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.dev4 → dissect_volume-3.18.dev1}/tests/disk/test_gpt.py

@@ -23,6 +23,8 @@ 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]) == (
@@ -33,6 +35,8 @@ def test_gpt(gpt: BinaryIO) -> None:
     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]) == (