remap-badblocks 0.8.1__py3-none-any.whl → 0.9__py3-none-any.whl

remap_badblocks/__init__.py

@@ -1,3 +1,3 @@
 from packaging.version import Version
 
-__version__ = Version("0.8.1")
+__version__ = Version("0.9")

remap_badblocks/cli/commands/update.py

@@ -9,7 +9,7 @@ from remap_badblocks.src.badblocks._find_badblocks import (
     get_all_badblocks, read_known_badblocks)
 from remap_badblocks.src.badblocks._mapping_generation import generate_mapping
 from remap_badblocks.src.badblocks._remap_badblocks import (
-    count_used_spare_sectors, iter_all_spare_sectors, iter_free_spare_sectors,
+    filter_out_used_and_bad_spare_sectors, iter_all_spare_sectors,
     remap_badblocks, simplify_mapping)
 from remap_badblocks.src.devices.device_config import DeviceConfig
 from remap_badblocks.src.devices.devices_config import DevicesConfig
@@ -165,13 +165,15 @@ def update_mapping(
             good_ranges,
         )
     else:
+        badblocks_ = set(badblocks)
         spare_sectors = iter_all_spare_sectors(n_spare_sectors, device.logical_range[0])
-        n_used_spare_sectors = count_used_spare_sectors(device.mapping, spare_sectors)
-        current_mapping = map(lambda x: x.to_tuple(), device.mapping)
+        spare_sectors = filter_out_used_and_bad_spare_sectors(
+            spare_sectors, device.mapping, badblocks_
+        )
         new_mapping = remap_badblocks(
-            current_mapping,
-            badblocks,
-            spare_sectors=iter_free_spare_sectors(spare_sectors, n_used_spare_sectors),
+            device.mapping,
+            badblocks_,
+            spare_sectors,
         )
 
     new_mapping = list(new_mapping)

remap_badblocks/src/badblocks/_remap_badblocks.py

@@ -1,13 +1,13 @@
-import itertools
-from typing import Iterable, Iterator, Optional, Union
+from collections.abc import Container, Generator, Iterable, Iterator
+from typing import Optional, Union
 
 from remap_badblocks.src.devices.devices_config import Mapping
 
 
 def remap_badblocks(
-    mapping: Iterable[tuple[int, int, int]],
+    mapping: Union[Iterable[tuple[int, int, int]], Mapping],
     badblocks: Iterable[int],
-    spare_sectors: Iterator[int],
+    usable_spare_sectors: Iterator[int],
 ) -> Iterable[tuple[int, int, int]]:
     sorted_badblocks = sorted(badblocks)
 
@@ -37,10 +37,11 @@ def remap_badblocks(
                 yield current_start_virtual, current_start_real, end_real - current_start_real + 1
             for virt_to_remap in sorted_to_remap_virtual:
                 try:
-                    while (spare_sector := next(spare_sectors)) in badblocks:
-                        pass
+                    spare_sector = next(usable_spare_sectors)
                 except StopIteration:
-                    raise RuntimeError
+                    raise RuntimeError(
+                        "Not enough spare sectors to remap all new badblocks"
+                    )
                 # remap
                 yield virt_to_remap, spare_sector, 1
 
@@ -93,22 +94,21 @@ def iter_all_spare_sectors(
     return iter(range(first_spare_sector, first_spare_sector + n_spare_sectors))
 
 
-def iter_free_spare_sectors(
-    spare_sectors: Iterable[int], n_used_spare_sectors: int
-) -> Iterator[int]:
-    return itertools.islice(spare_sectors, n_used_spare_sectors, None)
-
-
-def count_used_spare_sectors(
-    mapping: Union[Iterable[tuple[int, int, int]], Mapping],
-    spare_sectors: Iterable[int],
-) -> int:
-    spare_sectors = set(spare_sectors)
-    used = 0
+def is_sector_used_in_mapping(
+    s: int, mapping: Union[Iterable[tuple[int, int, int]], Mapping]
+):
     for _, start, length in mapping:
         end = start + length
-        for s in spare_sectors:
-            if start <= s < end:
-                used += 1
+        if start <= s < end:
+            return True
+    return False
 
-    return used
+
+def filter_out_used_and_bad_spare_sectors(
+    spare_sectors: Iterable[int],
+    current_mapping: Mapping,
+    badblocks: Container[int],
+) -> Generator[int]:
+    for s in spare_sectors:
+        if s not in badblocks and not is_sector_used_in_mapping(s, current_mapping):
+            yield s

remap_badblocks/src/mapping.py

@@ -1,6 +1,6 @@
 import sqlite3
 from dataclasses import dataclass
-from typing import Collection, Iterator
+from typing import Collection, Iterable, Iterator
 
 from remap_badblocks.src.utils._iterable_bytes_converter import (
     iterable_from_bytes, iterable_to_bytes)
@@ -107,3 +107,7 @@ class Mapping:
 
     def __iter__(self) -> Iterator[MappingElement]:
         return iter(self.elements)
+
+    @classmethod
+    def from_tuples(cls, mapping_tuples: Iterable[tuple[int, int, int]]) -> "Mapping":
+        return cls(set(map(MappingElement.from_tuple, mapping_tuples)))

{remap_badblocks-0.8.1.dist-info → remap_badblocks-0.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: remap_badblocks
-Version: 0.8.1
+Version: 0.9
 Summary: CLI tool for remapping bad sectors on Linux disks using device-mapper
 Author-email: Luigi Privitera <priviteraluigi98@gmail.com>
 License-Expression: GPL-3.0-only
@@ -89,11 +89,11 @@ ls /dev/mapper/
 
 We welcome feedback, bug reports, feature ideas, code contributions, and help shaping the roadmap — or even rethinking the project from the ground up.
 
-Start with [CONTRIBUTING.md](./CONTRIBUTING.md), then open an issue or submit a merge request to get involved.
+Start with CONTRIBUTING.md, then open an issue or submit a merge request to get involved.
 
 ## License
 
-GPL v3 License — see [LICENSE](./LICENSE) for details.
+GPL v3 License — see LICENSE for details.
 
 ## Community
 

{remap_badblocks-0.8.1.dist-info → remap_badblocks-0.9.dist-info}/RECORD

@@ -1,4 +1,4 @@
-remap_badblocks/__init__.py,sha256=M-LWfLH5N-kMq3R47UMpl1RZ9ZK-XiHd5kRy6jemVPY,70
+remap_badblocks/__init__.py,sha256=uh9pQzPKdlMD_35fZuzjLFDquAyCl9a9KlBFbGf0sQI,68
 remap_badblocks/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 remap_badblocks/cli/__main__.py,sha256=9p8yZNyu012JYMfAkQVcVkhShaoyre44jcYzK0ow4NY,7132
 remap_badblocks/cli/commands/__init__.py,sha256=tGo7_yWZsDpvIIcA9y-4AlLB6grVlK2zaJ6VUKdpONo,216
@@ -6,15 +6,15 @@ remap_badblocks/cli/commands/add.py,sha256=XRNtzUlwRmFD-5VM2us-odvx5smUcIBM6MBF7
 remap_badblocks/cli/commands/apply.py,sha256=uwLqEGYz4HVV_5V5Fe3dDDpmS9pt6VUmdZBsVyCnwyk,2534
 remap_badblocks/cli/commands/get.py,sha256=qDb_KP4YZA9wiXMlXk2i19TDRGaHasPQKcnkWiVv2dA,740
 remap_badblocks/cli/commands/remove.py,sha256=C3eBGmujtRktBJlGCtvdCRHBVWjRaTDx0o-LQpLEKB8,1186
-remap_badblocks/cli/commands/update.py,sha256=h-PJNWNPSuobOV1byl4nlOtjCFuWG2zGjt2fc8O55RA,7109
+remap_badblocks/cli/commands/update.py,sha256=kX_ZGvkm5dx6tOsViLHc_6S9ybuBcBvAW1i9yFjMGrA,7042
 remap_badblocks/cli/commands/version.py,sha256=uJIZLqK8zlNEgXlx-V7-yhhvsZfBKAE1tlF76t_Fg2I,168
 remap_badblocks/src/devices_config_constants.py,sha256=spRtelXdR9kWw-MzFI-CWfmZ6QM0gXvVHbk4J1CeKcM,103
-remap_badblocks/src/mapping.py,sha256=o_r6fiPkzwmsUqzspVkWY7PjWGdRMgxjE5n4w1lEAls,3222
+remap_badblocks/src/mapping.py,sha256=1OI4Si8QTWa3IM9dG5ms7bHNVDjqAsvK8hqF9r1XvGM,3409
 remap_badblocks/src/test_utils.py,sha256=6kzIHJ04VJMQFYLYNw6wLX0Zy-i_aWDRmWc-zFsiw7Y,437
 remap_badblocks/src/badblocks/_compute_good_ranges.py,sha256=hMNiDurMvtxyt9VxJYTqF_i-8S0_zBLvzKybC6rA9Js,1425
 remap_badblocks/src/badblocks/_find_badblocks.py,sha256=aKgCsUpMj0KDPh_WhAXM5-sxTouVgy61ZS2UyPvcdfQ,2263
 remap_badblocks/src/badblocks/_mapping_generation.py,sha256=M9ENd3fol_C0PA2Pi7AcZ9KRPpUqiVAq8-8n7u_I0Ec,381
-remap_badblocks/src/badblocks/_remap_badblocks.py,sha256=G9ZAzGJmG_hGUrKAcGHjn6I3XGYU_BPJWPzryZY7RBk,3963
+remap_badblocks/src/badblocks/_remap_badblocks.py,sha256=XmdlXHucfW6hHitsO8xDxgBgo01uHmEa601bYVYWYcU,4063
 remap_badblocks/src/badblocks/badblocks.py,sha256=AYuh0VRG6vY7of_fqqTCeoe2METVJ-xy7ZvMZw7VqTI,1046
 remap_badblocks/src/devices/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 remap_badblocks/src/devices/device_config.py,sha256=5ZkCxvObgxGf1zVOgzy8GlEX4BfHp8KlD7XzdkJI4zs,1943
@@ -28,9 +28,9 @@ remap_badblocks/src/utils/_iterable_bytes_converter.py,sha256=H0PDLANQLTaakNBHMD
 remap_badblocks/src/utils/_parse_inputs.py,sha256=KggQ80y97LIAolbhS1OsBMVdt-XDXDO3w4glJQPd4Tw,2772
 remap_badblocks/src/utils/_run_command.py,sha256=3EXIPcjx7MFsXGSDDfnS2qBwXfV-98Efj_enfQS1C_Q,2435
 remap_badblocks/src/utils/_sort_devices.py,sha256=f9w3DoMbRdkDjjaoSrz8qnmDzfaOvk2I_mq4-wwS65A,876
-remap_badblocks-0.8.1.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-remap_badblocks-0.8.1.dist-info/METADATA,sha256=c8DLW8dbmZh0z89WOMUpIgyqWR6-zzt_ZJB_LTcMlXI,3329
-remap_badblocks-0.8.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-remap_badblocks-0.8.1.dist-info/entry_points.txt,sha256=JmLHnqW16bljetWHJrYYAuP0vBrxfO0QY0mFdaWqOKg,70
-remap_badblocks-0.8.1.dist-info/top_level.txt,sha256=FqRo65stYjF_GyJQCLGIQN1Tj0YQcaiinI5bvzd0OpY,16
-remap_badblocks-0.8.1.dist-info/RECORD,,
+remap_badblocks-0.9.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+remap_badblocks-0.9.dist-info/METADATA,sha256=AZAzZOzzYCrz2CF8d4BMXvdvNpCEpHQia03_ZBX53ww,3293
+remap_badblocks-0.9.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+remap_badblocks-0.9.dist-info/entry_points.txt,sha256=JmLHnqW16bljetWHJrYYAuP0vBrxfO0QY0mFdaWqOKg,70
+remap_badblocks-0.9.dist-info/top_level.txt,sha256=FqRo65stYjF_GyJQCLGIQN1Tj0YQcaiinI5bvzd0OpY,16
+remap_badblocks-0.9.dist-info/RECORD,,

{remap_badblocks-0.8.1.dist-info → remap_badblocks-0.9.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any