dissect.volume 3.14.dev4__tar.gz → 3.15.dev1__tar.gz

{dissect_volume-3.14.dev4 → dissect_volume-3.15.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: dissect.volume
-Version: 3.14.dev4
+Version: 3.15.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: Affero General Public License v3
@@ -27,6 +27,7 @@ Requires-Dist: dissect.util<4,>3
 Provides-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"
+Dynamic: license-file
 
 # dissect.volume
 

{dissect_volume-3.14.dev4 → dissect_volume-3.15.dev1}/dissect/volume/raid/raid.py

@@ -66,8 +66,11 @@ class VirtualDisk:
         if self.level == Level.RAID0:
             return RAID0Stream(self)
         if self.level == Level.RAID1:
-            # Don't really care which mirror to read from, so just open the first disk
-            return self.disk_map[0][1].open()
+            # Don't really care which mirror to read from, so just open the first disk we have.
+            # We don't know if we have the first disk or the n-th disk so we select the first
+            # available disk using an iterable.
+            _, (_, disk) = next(iter(self.disk_map.items()))
+            return disk.open()
         if self.level in (Level.RAID4, Level.RAID5, Level.RAID6):
             return RAID456Stream(self)
         if self.level == Level.RAID10:

{dissect_volume-3.14.dev4 → dissect_volume-3.15.dev1}/dissect.volume.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: dissect.volume
-Version: 3.14.dev4
+Version: 3.15.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: Affero General Public License v3
@@ -27,6 +27,7 @@ Requires-Dist: dissect.util<4,>3
 Provides-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"
+Dynamic: license-file
 
 # dissect.volume
 

{dissect_volume-3.14.dev4 → dissect_volume-3.15.dev1}/tests/test_md.py

@@ -38,7 +38,7 @@ def test_md_read(
 
     fh = vd.open()
     for i in range(1, num_test_blocks + 1):
-        assert fh.read(4096) == i.to_bytes(2, "little") * 2048
+        assert fh.read(4096) == i.to_bytes(2, "little") * 2048, f"Failed at block {i}"
 
 
 def test_md_raid0_zones(md_raid0: list[BinaryIO]) -> None:
@@ -69,3 +69,17 @@ def test_md_search_sb_none_size() -> None:
     fh.size = None
 
     assert find_super_block(fh) == (None, None, None)
+
+
+def test_md_raid1_multiple_disks(md_raid1: list[BinaryIO]) -> None:
+    md = MD(md_raid1[-1:])
+
+    conf = md.configurations
+    vd = conf[0].virtual_disks[0]
+
+    assert vd.level == 1
+    assert vd.size == 0x200000
+
+    fh = vd.open()
+    for i in range(1, 512 + 1):
+        assert fh.read(4096) == i.to_bytes(2, "little") * 2048, f"Failed at block {i}"