Change linter to Ruff (#35)

Author: Schamper

dissect/vmfs/__init__.py

@@ -9,12 +9,12 @@
 from dissect.vmfs.vmfs import VMFS
 
 __all__ = [
+    "LVM",
+    "VMFS",
     "Error",
+    "Extent",
     "FileNotFoundError",
     "InvalidHeader",
     "NotADirectoryError",
     "NotASymlinkError",
-    "LVM",
-    "Extent",
-    "VMFS",
 ]

dissect/vmfs/c_vmfs.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import stat
 import struct
 
@@ -375,21 +377,22 @@
 FileType = c_vmfs.FileType
 
 
-def bsf(value, size=32):
+def bsf(value: int, size: int = 32) -> int:
     """Count the number of zero bits in an integer of a given size."""
     for i in range(size):
         if value & (1 << i):
             return i
+    return 0
 
 
-def type_to_mode(type_):
+def type_to_mode(type_: FileType) -> int:
     if type_ == FileType.Directory:
         return stat.S_IFDIR
-    elif type_ == FileType.Symlink:
+    if type_ == FileType.Symlink:
         return stat.S_IFLNK
     return stat.S_IFREG
 
 
-def vmfs_uuid(buf):
+def vmfs_uuid(buf: bytes) -> str:
     uuid1, uuid2, uuid3, uuid4 = struct.unpack("<IIH6s", buf)
     return f"{uuid1:08x}-{uuid2:08x}-{uuid3:04x}-{uuid4.hex()}"

dissect/vmfs/lvm.py

@@ -1,7 +1,9 @@
 # References:
 # - /usr/lib/vmware/vmkmod/lvmdriver
+from __future__ import annotations
 
 from bisect import bisect_right
+from typing import BinaryIO
 
 from dissect.util.stream import AlignedStream
 
@@ -26,8 +28,8 @@ class LVM(AlignedStream):
     VMFS should start at LVM dataOffset + 0x200000
     """
 
-    def __init__(self, fh):
-        fhs = [fh] if not type(fh) is list else fh
+    def __init__(self, fh: BinaryIO | list[BinaryIO]):
+        fhs = [fh] if type(fh) is not list else fh
 
         size = None
         self.uuid = None
@@ -56,7 +58,7 @@ def __init__(self, fh):
 
         super().__init__(size)
 
-    def _read(self, offset, length):
+    def _read(self, offset: int, length: int) -> bytes:
         r = []
 
         pe_offset = offset // VMFS_LVM_PE_SIZE
@@ -93,7 +95,7 @@ class Extent(AlignedStream):
     - 0x900000
     """
 
-    def __init__(self, fh):
+    def __init__(self, fh: BinaryIO):
         self.fh = fh
 
         fh.seek(c_vmfs.VMFS_LVM_DEVICE_META_BASE)
@@ -126,6 +128,6 @@ def __init__(self, fh):
 
         super().__init__(self.metadata.volumeSize)
 
-    def _read(self, offset, length):
+    def _read(self, offset: int, length: int) -> bytes:
         self.fh.seek(self.metadata.dataOffset + offset)
         return self.fh.read(length)