dissect.volume 3.13.dev1__tar.gz → 3.14.dev2__tar.gz

dissect_volume-3.14.dev2/.git-blame-ignore-revs

@@ -0,0 +1,6 @@
+# Formatting commits. You can ignore them during git-blame with `--ignore-rev` or `--ignore-revs-file`.
+#
+#   $ git config --add 'blame.ignoreRevsFile' '.git-blame-ignore-revs'
+#
+# Change linter to Ruff (#44)
+8fefd76a54ff43b2fdbedbbb3cd330c27b1a0b14

{dissect_volume-3.13.dev1 → dissect_volume-3.14.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: dissect.volume
-Version: 3.13.dev1
+Version: 3.14.dev2
 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: Affero General Public License v3

{dissect_volume-3.13.dev1 → dissect_volume-3.14.dev2}/dissect/volume/ddf/ddf.py

@@ -68,7 +68,7 @@ class DDFConfiguration(Configuration):
                 if pds != 0xFFFFFFFF:
                     i += 1
 
-        virtual_disks = [DDFVirtualDisk(vdcr_map[guid], vde_map[guid], vd_map[guid]) for guid in vd_map.keys()]
+        virtual_disks = [DDFVirtualDisk(vdcr_map[guid], vde_map[guid], vd_map[guid]) for guid in vd_map]
         super().__init__(physical_disks, virtual_disks)
 
 
@@ -84,7 +84,7 @@ class DDFVirtualDisk(VirtualDisk):
         self.disks = disks
 
         if (block_size := self.vdcr.block_size) == 0xFFFF:
-            block_size = list(disks.values())[0][1].block_size
+            block_size = next(iter(disks.values()))[1].block_size
 
         level, layout, num_disks = _convert_raid_layout(
             vdcr.primary_raid_level,

{dissect_volume-3.13.dev1 → dissect_volume-3.14.dev2}/dissect/volume/disk/disk.py

@@ -1,9 +1,13 @@
-from typing import BinaryIO, Optional
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, BinaryIO
 
-from dissect.volume.disk.partition import Partition
 from dissect.volume.disk.schemes import APM, BSD, GPT, MBR
 from dissect.volume.exceptions import DiskError
 
+if TYPE_CHECKING:
+    from dissect.volume.disk.partition import Partition
+
 
 class Disk:
     def __init__(self, fh: BinaryIO, sector_size: int = 512):
@@ -40,11 +44,11 @@ class Disk:
             else:
                 self.partitions.append(partition)
 
-        if isinstance(self.scheme, MBR) and any([p.type == 0xEE for p in self.partitions]):
+        if isinstance(self.scheme, MBR) and any(p.type == 0xEE for p in self.partitions):
             raise DiskError("Found GPT type partition, but MBR scheme detected. Maybe 4K sector size.")
 
     @property
-    def serial(self) -> Optional[int]:
+    def serial(self) -> int | None:
         if isinstance(self.scheme, MBR):
             return self.scheme.mbr.vol_no
         return None

{dissect_volume-3.13.dev1 → dissect_volume-3.14.dev2}/dissect/volume/disk/partition.py

@@ -1,9 +1,13 @@
-from typing import Any, BinaryIO, Optional, Union
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any, BinaryIO
 from uuid import UUID
 
-from dissect.cstruct import Structure
 from dissect.util.stream import RangeStream
 
+if TYPE_CHECKING:
+    from dissect.cstruct import Structure
+
 PARTITION_TYPES = {
     0x00: "Empty",
     0x01: "FAT12,CHS",
@@ -180,11 +184,11 @@ class Partition:
         number: int,
         offset: int,
         size: int,
-        vtype: Union[int, UUID],
+        vtype: int | UUID,
         name: str,
-        flags: Optional[int] = None,
-        guid: Optional[UUID] = None,
-        vtype_str: Optional[str] = None,
+        flags: int | None = None,
+        guid: UUID | None = None,
+        vtype_str: str | None = None,
         raw: Structure = None,
     ):
         self.disk = disk

{dissect_volume-3.13.dev1 → dissect_volume-3.14.dev2}/dissect/volume/disk/schemes/apm.py

@@ -1,10 +1,15 @@
-from typing import BinaryIO, Iterator
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, BinaryIO
 
 from dissect.cstruct import cstruct
 
 from dissect.volume.disk.partition import Partition
 from dissect.volume.exceptions import DiskError
 
+if TYPE_CHECKING:
+    from collections.abc import Iterator
+
 apm_def = """
 struct partition_entry {
     char    signature[2];
@@ -54,10 +59,7 @@ class APM:
     def _partitions(self) -> Iterator[Partition]:
         self.fh.seek(self._partitions_offset)
         for i in range(self.apm.partition_count):
-            if i == 0:
-                p = self.apm
-            else:
-                p = c_apm.partition_entry(self.fh)
+            p = self.apm if i == 0 else c_apm.partition_entry(self.fh)
 
             yield Partition(
                 disk=self,

{dissect_volume-3.13.dev1 → dissect_volume-3.14.dev2}/dissect/volume/disk/schemes/bsd.py

@@ -1,8 +1,9 @@
 # Reference:
 # - https://github.com/freebsd/freebsd-src/blob/main/sys/geom/part/g_part_bsd.c
+from __future__ import annotations
 
 import io
-from typing import BinaryIO, Iterator
+from typing import TYPE_CHECKING, BinaryIO
 from uuid import UUID
 
 from dissect.cstruct import cstruct
@@ -10,6 +11,9 @@ from dissect.cstruct import cstruct
 from dissect.volume.disk.partition import Partition
 from dissect.volume.exceptions import DiskError
 
+if TYPE_CHECKING:
+    from collections.abc import Iterator
+
 bsd_def = """
 /* The disk magic number */
 #define BSD_MAGIC           0x82564557
@@ -270,7 +274,7 @@ FS_NAMES = {
 class BSD:
     """BSD disklabel."""
 
-    TYPES = [
+    TYPES = (
         # MBR FreeBSD
         0xA5,
         # MBR OpenBSD
@@ -285,7 +289,7 @@ class BSD:
         UUID("3D48CE54-1D16-11DC-8696-01301BB8A9F5").bytes_le,
         # GPT FreeBSD disklabel
         UUID("516E7CB4-6ECF-11D6-8FF8-00022D09712B").bytes_le,
-    ]
+    )
 
     def __init__(self, fh: BinaryIO, sector_size: int = 512):
         self.fh = fh
@@ -313,8 +317,7 @@ class BSD:
             self.type = 64
         else:
             raise DiskError(
-                f"Invalid BSD disklabel magic, expected {c_bsd.BSD_MAGIC:#x} or {c_bsd.DISKMAGIC64:#x}, "
-                f"got {magic:#x}."
+                f"Invalid BSD disklabel magic, expected {c_bsd.BSD_MAGIC:#x} or {c_bsd.DISKMAGIC64:#x}, got {magic:#x}."
             )
 
         self._partitions_offset = offset + len(self.disklabel)

{dissect_volume-3.13.dev1 → dissect_volume-3.14.dev2}/dissect/volume/disk/schemes/gpt.py

@@ -1,4 +1,6 @@
-from typing import BinaryIO, Iterator
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, BinaryIO
 
 from dissect.cstruct import cstruct
 
@@ -6,6 +8,9 @@ from dissect.volume.disk.partition import Partition
 from dissect.volume.disk.schemes.mbr import MBR
 from dissect.volume.exceptions import DiskError
 
+if TYPE_CHECKING:
+    from collections.abc import Iterator
+
 gpt_def = """
 // http://en.wikipedia.org/wiki/GUID_Partition_Table
 struct GPT_HEADER {

{dissect_volume-3.13.dev1 → dissect_volume-3.14.dev2}/dissect/volume/disk/schemes/mbr.py

@@ -1,10 +1,15 @@
-from typing import BinaryIO, Iterator, Optional
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, BinaryIO
 
 from dissect.cstruct import cstruct
 
 from dissect.volume.disk.partition import Partition
 from dissect.volume.exceptions import DiskError
 
+if TYPE_CHECKING:
+    from collections.abc import Iterator
+
 mbr_def = """
 typedef struct part_s {
     uint8   bootable;       // +0: 0x80/0x00 - bootable/not bootable
@@ -52,7 +57,7 @@ class MBR:
         self.partitions: list[Partition] = list(self._partitions(self.mbr, self.offset))
 
     def _partitions(
-        self, mbr: c_mbr.mbr_s, offset: int, num_start: int = 0, ebr_offset: Optional[int] = None
+        self, mbr: c_mbr.mbr_s, offset: int, num_start: int = 0, ebr_offset: int | None = None
     ) -> Iterator[Partition]:
         for num, partition in enumerate(mbr.part):
             if partition.type == 0x00:

{dissect_volume-3.13.dev1 → dissect_volume-3.14.dev2}/dissect/volume/dm/btree.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from functools import lru_cache
-from typing import BinaryIO, Optional, Union
+from typing import BinaryIO
 
 from dissect.volume.dm.c_dm import SECTOR_SIZE, c_dm
 
@@ -19,7 +19,7 @@ class BTree:
         self.fh.seek(block * self._block_size_bytes)
         return Node(self.fh.read(self._block_size_bytes))
 
-    def lookup(self, keys: Union[int, list[int]], want_high: bool = False) -> Optional[bytes]:
+    def lookup(self, keys: int | list[int], want_high: bool = False) -> bytes | None:
         keys = [keys] if not isinstance(keys, list) else keys
 
         root = self.root
@@ -35,7 +35,7 @@ class BTree:
 
         return value
 
-    def _lookup(self, root: int, key: int, want_high: bool = False) -> tuple[Optional[int], Optional[bytes]]:
+    def _lookup(self, root: int, key: int, want_high: bool = False) -> tuple[int | None, bytes | None]:
         block = root
         while True:
             node = self._read_node(block)

{dissect_volume-3.13.dev1 → dissect_volume-3.14.dev2}/dissect/volume/dm/c_dm.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from dissect.cstruct import cstruct
 
 dm_def = """

{dissect_volume-3.13.dev1 → dissect_volume-3.14.dev2}/dissect/volume/dm/thin.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import BinaryIO, Optional
+from typing import BinaryIO
 
 from dissect.util.stream import AlignedStream
 
@@ -18,7 +18,7 @@ class ThinPool:
 
         self.metadata = Metadata(metadata_fh)
 
-    def open(self, device_id: int, size_hint: Optional[int] = None) -> ThinDevice:
+    def open(self, device_id: int, size_hint: int | None = None) -> ThinDevice:
         """Open a thin device on this pool.
 
         No size information is stored in the pool, so it's recommended to provide a size hint.
@@ -55,7 +55,7 @@ class ThinDevice(AlignedStream):
         size_hint: Optional device size hint.
     """
 
-    def __init__(self, pool: ThinPool, device_id: int, size_hint: Optional[int] = None):
+    def __init__(self, pool: ThinPool, device_id: int, size_hint: int | None = None):
         self.pool = pool
         self.device_id = device_id
         self.block_size = self.pool.metadata.data_block_size * SECTOR_SIZE

{dissect_volume-3.13.dev1 → dissect_volume-3.14.dev2}/dissect/volume/ldm.py

@@ -2,6 +2,8 @@
 #
 # This file is still a WIP
 
+from __future__ import annotations
+
 import logging
 import os
 

{dissect_volume-3.13.dev1 → dissect_volume-3.14.dev2}/dissect/volume/lvm/lvm2.py

@@ -2,8 +2,7 @@ from __future__ import annotations
 
 import logging
 import os
-from datetime import datetime
-from typing import BinaryIO, Optional, Union
+from typing import TYPE_CHECKING, BinaryIO
 
 from dissect.util import ts
 
@@ -11,6 +10,9 @@ from dissect.volume.exceptions import LVM2Error
 from dissect.volume.lvm.metadata import VolumeGroup
 from dissect.volume.lvm.physical import LVM2Device
 
+if TYPE_CHECKING:
+    from datetime import datetime
+
 log = logging.getLogger(__name__)
 log.setLevel(os.getenv("DISSECT_LOG_LVM", "CRITICAL"))
 
@@ -18,7 +20,7 @@ log.setLevel(os.getenv("DISSECT_LOG_LVM", "CRITICAL"))
 class LVM2:
     """Logical Volume Manager"""
 
-    def __init__(self, fh: Union[list[Union[BinaryIO, LVM2Device]], Union[BinaryIO, LVM2Device]]):
+    def __init__(self, fh: list[BinaryIO | LVM2Device] | BinaryIO | LVM2Device):
         self.fh = [fh] if not isinstance(fh, list) else fh
         if not self.fh:
             raise ValueError("At least one file-like object is required")
@@ -29,11 +31,11 @@ class LVM2:
         self.metadata = devices[0].metadata
         self.contents: str = self.metadata["contents"]
         self.version: int = self.metadata["version"]
-        self.description: Optional[str] = self.metadata.get("description")
-        self.creation_host: Optional[str] = self.metadata.get("creation_host")
-        self.creation_time: Optional[datetime] = None
+        self.description: str | None = self.metadata.get("description")
+        self.creation_host: str | None = self.metadata.get("creation_host")
+        self.creation_time: datetime | None = None
         if creation_time := self.metadata.get("creation_time"):
-            self.creation_time: Optional[datetime] = ts.from_unix(creation_time)
+            self.creation_time: datetime | None = ts.from_unix(creation_time)
 
         vg = [VolumeGroup.from_dict(value, name=key) for key, value in self.metadata.items() if isinstance(value, dict)]
         if len(vg) != 1: