Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions ext4/__init__.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,22 +83,7 @@
)

__all__ = [
"BlockDescriptor",
"BlockDevice",
"BlockIO",
"BlockIOBlocks",
"CharacterDevice",
"ChecksumError",
"Directory",
"DirectoryEntry",
"DirectoryEntry2",
"DirectoryEntryHash",
"DirectoryEntryTail",
"DotDirectoryEntry2",
"DX_HASH",
"DXEntry",
"DXRoot",
"DXRootInfo",
"EXT2_FLAGS",
"EXT4_BG",
"EXT4_CHKSUM",
Expand All@@ -119,6 +104,23 @@
"EXT4_NAME_LEN",
"EXT4_OS",
"EXT4_REV",
"FS_ENCRYPTION_MODE",
"MODE",
"BlockDescriptor",
"BlockDevice",
"BlockIO",
"BlockIOBlocks",
"CharacterDevice",
"ChecksumError",
"DXEntry",
"DXRoot",
"DXRootInfo",
"Directory",
"DirectoryEntry",
"DirectoryEntry2",
"DirectoryEntryHash",
"DirectoryEntryTail",
"DotDirectoryEntry2",
"ExtendedAttributeEntry",
"ExtendedAttributeError",
"ExtendedAttributeHeader",
Expand All@@ -130,7 +132,6 @@
"ExtentTail",
"Fifo",
"File",
"FS_ENCRYPTION_MODE",
"Hurd1",
"Hurd2",
"Inode",
Expand All@@ -141,7 +142,6 @@
"MagicError",
"Masix1",
"Masix2",
"MODE",
"Osd1",
"Osd2",
"Socket",
Expand Down
2 changes: 1 addition & 1 deletion ext4/_compat.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,4 +41,4 @@ def assert_cast(obj: Any, t: type[T], /) -> T:
return obj


__all__ = ["override", "ReadableStream", "PeekableStream", "assert_cast"]
__all__ = ["PeekableStream", "ReadableStream", "assert_cast", "override"]
4 changes: 2 additions & 2 deletions ext4/blockdescriptor.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ class BlockDescriptor(Ext4Struct):

_pack_ = 1
# _anonymous_ = ("bg_reserved",)
_fields_ = [
_fields_ = (
("bg_block_bitmap_lo", c_uint32),
("bg_inode_bitmap_lo", c_uint32),
("bg_inode_table_lo", c_uint32),
Expand All@@ -49,7 +49,7 @@ class BlockDescriptor(Ext4Struct):
("bg_block_bitmap_csum_hi", c_uint16),
("bg_inode_bitmap_csum_hi", c_uint16),
("bg_reserved", c_uint32),
]
)

def __init__(self, volume: "Volume", offset: int, bg_no: int) -> None:
super().__init__(volume, offset)
Expand Down
16 changes: 8 additions & 8 deletions ext4/directory.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -65,26 +65,26 @@ class DirectoryEntry(DirectoryEntryBase):
__slots__ = ()
_pack_ = 1
# _anonymous_ = ("l_i_reserved",)
_fields_ = [
_fields_ = (
("inode", c_uint32),
("rec_len", c_uint16),
("name_len", c_uint16),
("name", c_char * EXT4_NAME_LEN),
]
)


@final
class DirectoryEntry2(DirectoryEntryBase):
__slots__ = ()
_pack_ = 1
# _anonymous_ = ("l_i_reserved",)
_fields_ = [
_fields_ = (
("inode", c_uint32),
("rec_len", c_uint16),
("name_len", c_uint8),
("file_type", EXT4_FT.basetype),
("name", c_char * EXT4_NAME_LEN),
]
)

@DirectoryEntryBase.is_fake_entry.getter
def is_fake_entry(self) -> bool:
Expand All@@ -97,13 +97,13 @@ class DirectoryEntryTail(DirectoryEntryStruct):
__slots__ = ()
_pack_ = 1
# _anonymous_ = ("det_reserved_zero1", "det_reserved_zero2",)
_fields_ = [
_fields_ = (
("det_reserved_zero1", c_uint32),
("det_rec_len", c_uint16),
("det_reserved_zero2", c_uint8),
("det_reserved_ft", c_uint8), # EXT4_FT.DIR_CSUM
("det_checksum", c_uint32),
]
)

@Ext4Struct.magic.getter
def magic(self) -> int:
Expand All@@ -120,7 +120,7 @@ class DirectoryEntryHash(DirectoryEntryStruct):
__slots__ = ()
_pack_ = 1
# _anonymous_ = ("det_reserved_zero1", "det_reserved_zero2",)
_fields_ = [
_fields_ = (
("hash", c_uint32),
("minor_hash", c_uint32),
]
)
28 changes: 15 additions & 13 deletions ext4/enum.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
from typing import (
TYPE_CHECKING,
Any,
Self,
cast,
final,
)
Expand All@@ -17,8 +18,13 @@


def TypedEnumerationType(_type: type["SimpleCData"]): # noqa: ANN201
class EnumerationType(type(_type)): # type: ignore # pyright: ignore[reportGeneralTypeIssues, reportUntypedBaseClass] #noqa: ANN201
def __new__(cls, name: str, bases: tuple[type, ...], data: dict[str, Any]): # pyright: ignore[reportExplicitAny, reportUnknownParameterType] # noqa: ANN204
class EnumerationType(type(_type)): # type: ignore # pyright: ignore[reportGeneralTypeIssues, reportUntypedBaseClass]
def __new__(
cls,
name: str,
bases: tuple[type, ...],
data: dict[str, Any], # pyright: ignore[reportExplicitAny]
) -> Self:
_members_: dict[str, Any] # pyright: ignore[reportExplicitAny]
if "_members_" not in data:
_members_ = {}
Expand All@@ -32,11 +38,7 @@ def __new__(cls, name: str, bases: tuple[type, ...], data: dict[str, Any]): # p
_members_ = cast(dict[str, Any], data["_members_"]) # pyright: ignore[reportExplicitAny]

data["_reverse_map_"] = {v: k for k, v in _members_.items()} # pyright: ignore[reportAny]
cls = type(_type).__new__(cls, name, bases, data) # pyright: ignore[reportCallIssue, reportUnknownVariableType] # noqa: PLW0642
for key, value in cast(dict[str, Any], cls._members_).items(): # pyright: ignore[reportExplicitAny, reportAny]
globals()[key] = value

return cls # pyright: ignore[reportUnknownVariableType]
return type(_type).__new__(cls, name, bases, data) # pyright: ignore[reportCallIssue, reportUnknownVariableType]

@override
def __repr__(self) -> str:
Expand All@@ -46,8 +48,8 @@ def __repr__(self) -> str:


def TypedCEnumeration(_type: type["SimpleCData"]): # noqa: ANN201
class CEnumeration(_type, metaclass=TypedEnumerationType(_type)): # pyright: ignore[reportGeneralTypeIssues, reportUntypedBaseClass] # noqa: ANN201,PLW1641,PLW1641
_members_: dict[str, Any] = {} # pyright: ignore[reportExplicitAny]
class CEnumeration(_type, metaclass=TypedEnumerationType(_type)): # pyright: ignore[reportGeneralTypeIssues, reportUntypedBaseClass] # noqa: PLW1641
_members_: dict[str, Any] = {} # pyright: ignore[reportExplicitAny] # noqa: RUF012
basetype: type["SimpleCData"] = _type

@override
Expand All@@ -56,18 +58,18 @@ def __repr__(self) -> str:
return f"<{self.__class__.__name__}.{self._reverse_map_.get(value, '(unknown)')}: {value}>" # pyright: ignore[reportUnknownMemberType]

@override
def __eq__(self, other: Any) -> bool: # pyright: ignore[reportExplicitAny, reportAny]
def __eq__(self, other: object) -> bool:
if isinstance(other, int):
return self.value == other # pyright: ignore[reportUnknownMemberType, reportUnknownVariableType]

return isinstance(self, type(other)) and self.value == other.value # pyright: ignore[reportUnknownVariableType, reportAny, reportUnknownMemberType]
return isinstance(self, type(other)) and self.value == other.value # pyright: ignore[reportUnknownVariableType, reportUnknownMemberType, reportAttributeAccessIssue]

@override
def __ne__(self, other: Any) -> bool: # pyright: ignore[reportExplicitAny, reportAny]
def __ne__(self, other: object) -> bool:
if isinstance(other, int):
return self.value != other # pyright: ignore[reportUnknownMemberType, reportUnknownVariableType]

return isinstance(self, type(other)) and self.value != other.value # pyright: ignore[reportUnknownVariableType, reportAny, reportUnknownMemberType]
return isinstance(self, type(other)) and self.value != other.value # pyright: ignore[reportUnknownVariableType, reportUnknownMemberType, reportAttributeAccessIssue]

@override
def __and__(self, other: Any) -> int | bool: # pyright: ignore[reportExplicitAny, reportAny, reportGeneralTypeIssues]
Expand Down
18 changes: 8 additions & 10 deletions ext4/extent.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -89,13 +89,13 @@ class ExtentHeader(Ext4Struct):

_pack_ = 1
# _anonymous_ = ()
_fields_ = [
_fields_ = (
("eh_magic", c_uint16),
("eh_entries", c_uint16),
("eh_max", c_uint16),
("eh_depth", c_uint16),
("eh_generation", c_uint32),
]
)

def __init__(self, tree: "ExtentTree", offset: int) -> None:
self.tree: ExtentTree = tree
Expand All@@ -106,7 +106,7 @@ def __init__(self, tree: "ExtentTree", offset: int) -> None:

offset = self.offset + self.size
eh_entries = assert_cast(self.eh_entries, int) # pyright: ignore[reportAny]
for i in range(0, eh_entries):
for i in range(eh_entries):
if self.eh_depth == 0:
self.extents.append(Extent(self, offset, i))
offset += sizeof(Extent)
Expand DownExpand Up@@ -173,12 +173,12 @@ class ExtentIndex(Ext4Struct):

_pack_ = 1
# _anonymous_ = ("ei_unused",)
_fields_ = [
_fields_ = (
("ei_block", c_uint32),
("ei_leaf_lo", c_uint32),
("ei_leaf_hi", c_uint16),
("ei_unused", c_uint16),
]
)

def __init__(self, header: ExtentHeader, offset: int, ei_no: int) -> None:
self.ei_no: int = ei_no
Expand DownExpand Up@@ -210,12 +210,12 @@ class Extent(Ext4Struct):

_pack_ = 1
# _anonymous_ = ("ei_unused",)
_fields_ = [
_fields_ = (
("ee_block", c_uint32),
("ee_len", c_uint16),
("ee_start_hi", c_uint16),
("ee_start_lo", c_uint32),
]
)

def __init__(self, header: ExtentHeader, offset: int, ee_no: int) -> None:
super().__init__(header.inode.volume, offset)
Expand DownExpand Up@@ -258,9 +258,7 @@ class ExtentTail(Ext4Struct):
__slots__ = ("header",)

_pack_ = 1
_fields_ = [
("et_checksum", c_uint32),
]
_fields_ = (("et_checksum", c_uint32),)

def __init__(self, header: ExtentHeader, offset: int) -> None:
self.header: ExtentHeader = header
Expand Down
28 changes: 14 additions & 14 deletions ext4/htree.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -59,13 +59,13 @@ class DotDirectoryEntry2(LittleEndianStructureWithVolume):

_pack_ = 1
# _anonymous_ = ()
_fields_ = [
_fields_ = (
("inode", c_uint32),
("rec_len", c_uint16),
("name_len", c_uint8),
("file_type", c_uint8),
("name", c_char * 4), # b".\0\0\0" or b"..\0\0"
]
)

def verify(self) -> None:
name = assert_cast(self.name, bytes) # pyright: ignore[reportAny]
Expand All@@ -89,13 +89,13 @@ class DXRootInfo(LittleEndianStructure):
__slots__ = ()
_pack_ = 1
# _anonymous_ = ("reserved_zero")
_fields_ = [
_fields_ = (
("reserved_zero", c_uint32),
("hash_version", DX_HASH.basetype),
("info_length", c_uint8),
("indirect_levels", c_uint8),
("unused_flags", c_uint8),
]
)


class DXBase(Ext4Struct):
Expand DownExpand Up@@ -128,10 +128,10 @@ class DXEntry(DXBase):

_pack_ = 1
# _anonymous_ = ("")
_fields_ = [
_fields_ = (
("hash", c_uint32),
("block", c_uint32),
]
)

def __init__(self, parent: "DXEntriesBase", index: int) -> None:
self.index: int = index
Expand DownExpand Up@@ -321,15 +321,15 @@ def __init__(self, inode: "Directory") -> None:
super().__init__(inode, 0)

# _anonymous_ = ("")
_fields_ = [
_fields_ = (
("dot", DotDirectoryEntry2),
("dotdot", DotDirectoryEntry2),
("dx_root_info", DXRootInfo),
("limit", c_uint16),
("count", c_uint16),
("block", c_uint32),
# ("entries", DXEntry * self.count),
]
)

def compute_dx_hash(self, name: bytes, hash_version: int) -> tuple[int, int]:
seed = self.directory.volume.superblock.s_hash_seed # pyright: ignore[reportAny]
Expand DownExpand Up@@ -511,10 +511,10 @@ class DXFake(LittleEndianStructure):
__slots__ = ()
_pack_ = 1
# _anonymous_ = ("")
_fields_ = [
_fields_ = (
("inode", c_uint32), # 0
("rec_len", c_uint16),
]
)

@property
def expected_magic(self) -> int:
Expand All@@ -532,15 +532,15 @@ class DXNode(DXEntriesBase):

_pack_ = 1
# _anonymous_ = ("")
_fields_ = [
_fields_ = (
("fake", DXFake),
("name_len", c_uint8),
("file_type", c_uint8),
("limit", c_uint16),
("count", c_uint16),
("block", c_uint32),
# ("entries", DXEntry * self.count),
]
)

def __init__(self, directory: "Directory", offset: int) -> None:
super().__init__(directory, offset)
Expand All@@ -552,10 +552,10 @@ class DXTail(DXBase):

_pack_ = 1
# _anonymous_ = ("dt_reserved")
_fields_ = [
_fields_ = (
("dt_reserved", c_uint32),
("dt_checksum", c_uint16),
]
)

def __init__(self, parent: DXNode) -> None:
self.parent = parent
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions ext4/__init__.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,22 +83,7 @@
)

__all__ = [
"BlockDescriptor",
"BlockDevice",
"BlockIO",
"BlockIOBlocks",
"CharacterDevice",
"ChecksumError",
"Directory",
"DirectoryEntry",
"DirectoryEntry2",
"DirectoryEntryHash",
"DirectoryEntryTail",
"DotDirectoryEntry2",
"DX_HASH",
"DXEntry",
"DXRoot",
"DXRootInfo",
"EXT2_FLAGS",
"EXT4_BG",
"EXT4_CHKSUM",
Expand All@@ -119,6 +104,23 @@
"EXT4_NAME_LEN",
"EXT4_OS",
"EXT4_REV",
"FS_ENCRYPTION_MODE",
"MODE",
"BlockDescriptor",
"BlockDevice",
"BlockIO",
"BlockIOBlocks",
"CharacterDevice",
"ChecksumError",
"DXEntry",
"DXRoot",
"DXRootInfo",
"Directory",
"DirectoryEntry",
"DirectoryEntry2",
"DirectoryEntryHash",
"DirectoryEntryTail",
"DotDirectoryEntry2",
"ExtendedAttributeEntry",
"ExtendedAttributeError",
"ExtendedAttributeHeader",
Expand All@@ -130,7 +132,6 @@
"ExtentTail",
"Fifo",
"File",
"FS_ENCRYPTION_MODE",
"Hurd1",
"Hurd2",
"Inode",
Expand All@@ -141,7 +142,6 @@
"MagicError",
"Masix1",
"Masix2",
"MODE",
"Osd1",
"Osd2",
"Socket",
Expand Down
2 changes: 1 addition & 1 deletion ext4/_compat.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,4 +41,4 @@ def assert_cast(obj: Any, t: type[T], /) -> T:
return obj


__all__ = ["override", "ReadableStream", "PeekableStream", "assert_cast"]
__all__ = ["PeekableStream", "ReadableStream", "assert_cast", "override"]
4 changes: 2 additions & 2 deletions ext4/blockdescriptor.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ class BlockDescriptor(Ext4Struct):

_pack_ = 1
# _anonymous_ = ("bg_reserved",)
_fields_ = [
_fields_ = (
("bg_block_bitmap_lo", c_uint32),
("bg_inode_bitmap_lo", c_uint32),
("bg_inode_table_lo", c_uint32),
Expand All@@ -49,7 +49,7 @@ class BlockDescriptor(Ext4Struct):
("bg_block_bitmap_csum_hi", c_uint16),
("bg_inode_bitmap_csum_hi", c_uint16),
("bg_reserved", c_uint32),
]
)

def __init__(self, volume: "Volume", offset: int, bg_no: int) -> None:
super().__init__(volume, offset)
Expand Down
16 changes: 8 additions & 8 deletions ext4/directory.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -65,26 +65,26 @@ class DirectoryEntry(DirectoryEntryBase):
__slots__ = ()
_pack_ = 1
# _anonymous_ = ("l_i_reserved",)
_fields_ = [
_fields_ = (
("inode", c_uint32),
("rec_len", c_uint16),
("name_len", c_uint16),
("name", c_char * EXT4_NAME_LEN),
]
)


@final
class DirectoryEntry2(DirectoryEntryBase):
__slots__ = ()
_pack_ = 1
# _anonymous_ = ("l_i_reserved",)
_fields_ = [
_fields_ = (
("inode", c_uint32),
("rec_len", c_uint16),
("name_len", c_uint8),
("file_type", EXT4_FT.basetype),
("name", c_char * EXT4_NAME_LEN),
]
)

@DirectoryEntryBase.is_fake_entry.getter
def is_fake_entry(self) -> bool:
Expand All@@ -97,13 +97,13 @@ class DirectoryEntryTail(DirectoryEntryStruct):
__slots__ = ()
_pack_ = 1
# _anonymous_ = ("det_reserved_zero1", "det_reserved_zero2",)
_fields_ = [
_fields_ = (
("det_reserved_zero1", c_uint32),
("det_rec_len", c_uint16),
("det_reserved_zero2", c_uint8),
("det_reserved_ft", c_uint8), # EXT4_FT.DIR_CSUM
("det_checksum", c_uint32),
]
)

@Ext4Struct.magic.getter
def magic(self) -> int:
Expand All@@ -120,7 +120,7 @@ class DirectoryEntryHash(DirectoryEntryStruct):
__slots__ = ()
_pack_ = 1
# _anonymous_ = ("det_reserved_zero1", "det_reserved_zero2",)
_fields_ = [
_fields_ = (
("hash", c_uint32),
("minor_hash", c_uint32),
]
)
28 changes: 15 additions & 13 deletions ext4/enum.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
from typing import (
TYPE_CHECKING,
Any,
Self,
cast,
final,
)
Expand All@@ -17,8 +18,13 @@


def TypedEnumerationType(_type: type["SimpleCData"]): # noqa: ANN201
class EnumerationType(type(_type)): # type: ignore # pyright: ignore[reportGeneralTypeIssues, reportUntypedBaseClass] #noqa: ANN201
def __new__(cls, name: str, bases: tuple[type, ...], data: dict[str, Any]): # pyright: ignore[reportExplicitAny, reportUnknownParameterType] # noqa: ANN204
class EnumerationType(type(_type)): # type: ignore # pyright: ignore[reportGeneralTypeIssues, reportUntypedBaseClass]
def __new__(
cls,
name: str,
bases: tuple[type, ...],
data: dict[str, Any], # pyright: ignore[reportExplicitAny]
) -> Self:
_members_: dict[str, Any] # pyright: ignore[reportExplicitAny]
if "_members_" not in data:
_members_ = {}
Expand All@@ -32,11 +38,7 @@ def __new__(cls, name: str, bases: tuple[type, ...], data: dict[str, Any]): # p
_members_ = cast(dict[str, Any], data["_members_"]) # pyright: ignore[reportExplicitAny]

data["_reverse_map_"] = {v: k for k, v in _members_.items()} # pyright: ignore[reportAny]
cls = type(_type).__new__(cls, name, bases, data) # pyright: ignore[reportCallIssue, reportUnknownVariableType] # noqa: PLW0642
for key, value in cast(dict[str, Any], cls._members_).items(): # pyright: ignore[reportExplicitAny, reportAny]
globals()[key] = value

return cls # pyright: ignore[reportUnknownVariableType]
return type(_type).__new__(cls, name, bases, data) # pyright: ignore[reportCallIssue, reportUnknownVariableType]

@override
def __repr__(self) -> str:
Expand All@@ -46,8 +48,8 @@ def __repr__(self) -> str:


def TypedCEnumeration(_type: type["SimpleCData"]): # noqa: ANN201
class CEnumeration(_type, metaclass=TypedEnumerationType(_type)): # pyright: ignore[reportGeneralTypeIssues, reportUntypedBaseClass] # noqa: ANN201,PLW1641,PLW1641
_members_: dict[str, Any] = {} # pyright: ignore[reportExplicitAny]
class CEnumeration(_type, metaclass=TypedEnumerationType(_type)): # pyright: ignore[reportGeneralTypeIssues, reportUntypedBaseClass] # noqa: PLW1641
_members_: dict[str, Any] = {} # pyright: ignore[reportExplicitAny] # noqa: RUF012
basetype: type["SimpleCData"] = _type

@override
Expand All@@ -56,18 +58,18 @@ def __repr__(self) -> str:
return f"<{self.__class__.__name__}.{self._reverse_map_.get(value, '(unknown)')}: {value}>" # pyright: ignore[reportUnknownMemberType]

@override
def __eq__(self, other: Any) -> bool: # pyright: ignore[reportExplicitAny, reportAny]
def __eq__(self, other: object) -> bool:
if isinstance(other, int):
return self.value == other # pyright: ignore[reportUnknownMemberType, reportUnknownVariableType]

return isinstance(self, type(other)) and self.value == other.value # pyright: ignore[reportUnknownVariableType, reportAny, reportUnknownMemberType]
return isinstance(self, type(other)) and self.value == other.value # pyright: ignore[reportUnknownVariableType, reportUnknownMemberType, reportAttributeAccessIssue]

@override
def __ne__(self, other: Any) -> bool: # pyright: ignore[reportExplicitAny, reportAny]
def __ne__(self, other: object) -> bool:
if isinstance(other, int):
return self.value != other # pyright: ignore[reportUnknownMemberType, reportUnknownVariableType]

return isinstance(self, type(other)) and self.value != other.value # pyright: ignore[reportUnknownVariableType, reportAny, reportUnknownMemberType]
return isinstance(self, type(other)) and self.value != other.value # pyright: ignore[reportUnknownVariableType, reportUnknownMemberType, reportAttributeAccessIssue]

@override
def __and__(self, other: Any) -> int | bool: # pyright: ignore[reportExplicitAny, reportAny, reportGeneralTypeIssues]
Expand Down
18 changes: 8 additions & 10 deletions ext4/extent.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -89,13 +89,13 @@ class ExtentHeader(Ext4Struct):

_pack_ = 1
# _anonymous_ = ()
_fields_ = [
_fields_ = (
("eh_magic", c_uint16),
("eh_entries", c_uint16),
("eh_max", c_uint16),
("eh_depth", c_uint16),
("eh_generation", c_uint32),
]
)

def __init__(self, tree: "ExtentTree", offset: int) -> None:
self.tree: ExtentTree = tree
Expand All@@ -106,7 +106,7 @@ def __init__(self, tree: "ExtentTree", offset: int) -> None:

offset = self.offset + self.size
eh_entries = assert_cast(self.eh_entries, int) # pyright: ignore[reportAny]
for i in range(0, eh_entries):
for i in range(eh_entries):
if self.eh_depth == 0:
self.extents.append(Extent(self, offset, i))
offset += sizeof(Extent)
Expand DownExpand Up@@ -173,12 +173,12 @@ class ExtentIndex(Ext4Struct):

_pack_ = 1
# _anonymous_ = ("ei_unused",)
_fields_ = [
_fields_ = (
("ei_block", c_uint32),
("ei_leaf_lo", c_uint32),
("ei_leaf_hi", c_uint16),
("ei_unused", c_uint16),
]
)

def __init__(self, header: ExtentHeader, offset: int, ei_no: int) -> None:
self.ei_no: int = ei_no
Expand DownExpand Up@@ -210,12 +210,12 @@ class Extent(Ext4Struct):

_pack_ = 1
# _anonymous_ = ("ei_unused",)
_fields_ = [
_fields_ = (
("ee_block", c_uint32),
("ee_len", c_uint16),
("ee_start_hi", c_uint16),
("ee_start_lo", c_uint32),
]
)

def __init__(self, header: ExtentHeader, offset: int, ee_no: int) -> None:
super().__init__(header.inode.volume, offset)
Expand DownExpand Up@@ -258,9 +258,7 @@ class ExtentTail(Ext4Struct):
__slots__ = ("header",)

_pack_ = 1
_fields_ = [
("et_checksum", c_uint32),
]
_fields_ = (("et_checksum", c_uint32),)

def __init__(self, header: ExtentHeader, offset: int) -> None:
self.header: ExtentHeader = header
Expand Down
28 changes: 14 additions & 14 deletions ext4/htree.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -59,13 +59,13 @@ class DotDirectoryEntry2(LittleEndianStructureWithVolume):

_pack_ = 1
# _anonymous_ = ()
_fields_ = [
_fields_ = (
("inode", c_uint32),
("rec_len", c_uint16),
("name_len", c_uint8),
("file_type", c_uint8),
("name", c_char * 4), # b".\0\0\0" or b"..\0\0"
]
)

def verify(self) -> None:
name = assert_cast(self.name, bytes) # pyright: ignore[reportAny]
Expand All@@ -89,13 +89,13 @@ class DXRootInfo(LittleEndianStructure):
__slots__ = ()
_pack_ = 1
# _anonymous_ = ("reserved_zero")
_fields_ = [
_fields_ = (
("reserved_zero", c_uint32),
("hash_version", DX_HASH.basetype),
("info_length", c_uint8),
("indirect_levels", c_uint8),
("unused_flags", c_uint8),
]
)


class DXBase(Ext4Struct):
Expand DownExpand Up@@ -128,10 +128,10 @@ class DXEntry(DXBase):

_pack_ = 1
# _anonymous_ = ("")
_fields_ = [
_fields_ = (
("hash", c_uint32),
("block", c_uint32),
]
)

def __init__(self, parent: "DXEntriesBase", index: int) -> None:
self.index: int = index
Expand DownExpand Up@@ -321,15 +321,15 @@ def __init__(self, inode: "Directory") -> None:
super().__init__(inode, 0)

# _anonymous_ = ("")
_fields_ = [
_fields_ = (
("dot", DotDirectoryEntry2),
("dotdot", DotDirectoryEntry2),
("dx_root_info", DXRootInfo),
("limit", c_uint16),
("count", c_uint16),
("block", c_uint32),
# ("entries", DXEntry * self.count),
]
)

def compute_dx_hash(self, name: bytes, hash_version: int) -> tuple[int, int]:
seed = self.directory.volume.superblock.s_hash_seed # pyright: ignore[reportAny]
Expand DownExpand Up@@ -511,10 +511,10 @@ class DXFake(LittleEndianStructure):
__slots__ = ()
_pack_ = 1
# _anonymous_ = ("")
_fields_ = [
_fields_ = (
("inode", c_uint32), # 0
("rec_len", c_uint16),
]
)

@property
def expected_magic(self) -> int:
Expand All@@ -532,15 +532,15 @@ class DXNode(DXEntriesBase):

_pack_ = 1
# _anonymous_ = ("")
_fields_ = [
_fields_ = (
("fake", DXFake),
("name_len", c_uint8),
("file_type", c_uint8),
("limit", c_uint16),
("count", c_uint16),
("block", c_uint32),
# ("entries", DXEntry * self.count),
]
)

def __init__(self, directory: "Directory", offset: int) -> None:
super().__init__(directory, offset)
Expand All@@ -552,10 +552,10 @@ class DXTail(DXBase):

_pack_ = 1
# _anonymous_ = ("dt_reserved")
_fields_ = [
_fields_ = (
("dt_reserved", c_uint32),
("dt_checksum", c_uint16),
]
)

def __init__(self, parent: DXNode) -> None:
self.parent = parent
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions ext4/__init__.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,22 +83,7 @@
)

__all__ = [
"BlockDescriptor",
"BlockDevice",
"BlockIO",
"BlockIOBlocks",
"CharacterDevice",
"ChecksumError",
"Directory",
"DirectoryEntry",
"DirectoryEntry2",
"DirectoryEntryHash",
"DirectoryEntryTail",
"DotDirectoryEntry2",
"DX_HASH",
"DXEntry",
"DXRoot",
"DXRootInfo",
"EXT2_FLAGS",
"EXT4_BG",
"EXT4_CHKSUM",
Expand All@@ -119,6 +104,23 @@
"EXT4_NAME_LEN",
"EXT4_OS",
"EXT4_REV",
"FS_ENCRYPTION_MODE",
"MODE",
"BlockDescriptor",
"BlockDevice",
"BlockIO",
"BlockIOBlocks",
"CharacterDevice",
"ChecksumError",
"DXEntry",
"DXRoot",
"DXRootInfo",
"Directory",
"DirectoryEntry",
"DirectoryEntry2",
"DirectoryEntryHash",
"DirectoryEntryTail",
"DotDirectoryEntry2",
"ExtendedAttributeEntry",
"ExtendedAttributeError",
"ExtendedAttributeHeader",
Expand All@@ -130,7 +132,6 @@
"ExtentTail",
"Fifo",
"File",
"FS_ENCRYPTION_MODE",
"Hurd1",
"Hurd2",
"Inode",
Expand All@@ -141,7 +142,6 @@
"MagicError",
"Masix1",
"Masix2",
"MODE",
"Osd1",
"Osd2",
"Socket",
Expand Down
2 changes: 1 addition & 1 deletion ext4/_compat.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,4 +41,4 @@ def assert_cast(obj: Any, t: type[T], /) -> T:
return obj


__all__ = ["override", "ReadableStream", "PeekableStream", "assert_cast"]
__all__ = ["PeekableStream", "ReadableStream", "assert_cast", "override"]
4 changes: 2 additions & 2 deletions ext4/blockdescriptor.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ class BlockDescriptor(Ext4Struct):

_pack_ = 1
# _anonymous_ = ("bg_reserved",)
_fields_ = [
_fields_ = (
("bg_block_bitmap_lo", c_uint32),
("bg_inode_bitmap_lo", c_uint32),
("bg_inode_table_lo", c_uint32),
Expand All@@ -49,7 +49,7 @@ class BlockDescriptor(Ext4Struct):
("bg_block_bitmap_csum_hi", c_uint16),
("bg_inode_bitmap_csum_hi", c_uint16),
("bg_reserved", c_uint32),
]
)

def __init__(self, volume: "Volume", offset: int, bg_no: int) -> None:
super().__init__(volume, offset)
Expand Down
16 changes: 8 additions & 8 deletions ext4/directory.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -65,26 +65,26 @@ class DirectoryEntry(DirectoryEntryBase):
__slots__ = ()
_pack_ = 1
# _anonymous_ = ("l_i_reserved",)
_fields_ = [
_fields_ = (
("inode", c_uint32),
("rec_len", c_uint16),
("name_len", c_uint16),
("name", c_char * EXT4_NAME_LEN),
]
)


@final
class DirectoryEntry2(DirectoryEntryBase):
__slots__ = ()
_pack_ = 1
# _anonymous_ = ("l_i_reserved",)
_fields_ = [
_fields_ = (
("inode", c_uint32),
("rec_len", c_uint16),
("name_len", c_uint8),
("file_type", EXT4_FT.basetype),
("name", c_char * EXT4_NAME_LEN),
]
)

@DirectoryEntryBase.is_fake_entry.getter
def is_fake_entry(self) -> bool:
Expand All@@ -97,13 +97,13 @@ class DirectoryEntryTail(DirectoryEntryStruct):
__slots__ = ()
_pack_ = 1
# _anonymous_ = ("det_reserved_zero1", "det_reserved_zero2",)
_fields_ = [
_fields_ = (
("det_reserved_zero1", c_uint32),
("det_rec_len", c_uint16),
("det_reserved_zero2", c_uint8),
("det_reserved_ft", c_uint8), # EXT4_FT.DIR_CSUM
("det_checksum", c_uint32),
]
)

@Ext4Struct.magic.getter
def magic(self) -> int:
Expand All@@ -120,7 +120,7 @@ class DirectoryEntryHash(DirectoryEntryStruct):
__slots__ = ()
_pack_ = 1
# _anonymous_ = ("det_reserved_zero1", "det_reserved_zero2",)
_fields_ = [
_fields_ = (
("hash", c_uint32),
("minor_hash", c_uint32),
]
)
28 changes: 15 additions & 13 deletions ext4/enum.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
from typing import (
TYPE_CHECKING,
Any,
Self,
cast,
final,
)
Expand All@@ -17,8 +18,13 @@


def TypedEnumerationType(_type: type["SimpleCData"]): # noqa: ANN201
class EnumerationType(type(_type)): # type: ignore # pyright: ignore[reportGeneralTypeIssues, reportUntypedBaseClass] #noqa: ANN201
def __new__(cls, name: str, bases: tuple[type, ...], data: dict[str, Any]): # pyright: ignore[reportExplicitAny, reportUnknownParameterType] # noqa: ANN204
class EnumerationType(type(_type)): # type: ignore # pyright: ignore[reportGeneralTypeIssues, reportUntypedBaseClass]
def __new__(
cls,
name: str,
bases: tuple[type, ...],
data: dict[str, Any], # pyright: ignore[reportExplicitAny]
) -> Self:
_members_: dict[str, Any] # pyright: ignore[reportExplicitAny]
if "_members_" not in data:
_members_ = {}
Expand All@@ -32,11 +38,7 @@ def __new__(cls, name: str, bases: tuple[type, ...], data: dict[str, Any]): # p
_members_ = cast(dict[str, Any], data["_members_"]) # pyright: ignore[reportExplicitAny]

data["_reverse_map_"] = {v: k for k, v in _members_.items()} # pyright: ignore[reportAny]
cls = type(_type).__new__(cls, name, bases, data) # pyright: ignore[reportCallIssue, reportUnknownVariableType] # noqa: PLW0642
for key, value in cast(dict[str, Any], cls._members_).items(): # pyright: ignore[reportExplicitAny, reportAny]
globals()[key] = value

return cls # pyright: ignore[reportUnknownVariableType]
return type(_type).__new__(cls, name, bases, data) # pyright: ignore[reportCallIssue, reportUnknownVariableType]

@override
def __repr__(self) -> str:
Expand All@@ -46,8 +48,8 @@ def __repr__(self) -> str:


def TypedCEnumeration(_type: type["SimpleCData"]): # noqa: ANN201
class CEnumeration(_type, metaclass=TypedEnumerationType(_type)): # pyright: ignore[reportGeneralTypeIssues, reportUntypedBaseClass] # noqa: ANN201,PLW1641,PLW1641
_members_: dict[str, Any] = {} # pyright: ignore[reportExplicitAny]
class CEnumeration(_type, metaclass=TypedEnumerationType(_type)): # pyright: ignore[reportGeneralTypeIssues, reportUntypedBaseClass] # noqa: PLW1641
_members_: dict[str, Any] = {} # pyright: ignore[reportExplicitAny] # noqa: RUF012
basetype: type["SimpleCData"] = _type

@override
Expand All@@ -56,18 +58,18 @@ def __repr__(self) -> str:
return f"<{self.__class__.__name__}.{self._reverse_map_.get(value, '(unknown)')}: {value}>" # pyright: ignore[reportUnknownMemberType]

@override
def __eq__(self, other: Any) -> bool: # pyright: ignore[reportExplicitAny, reportAny]
def __eq__(self, other: object) -> bool:
if isinstance(other, int):
return self.value == other # pyright: ignore[reportUnknownMemberType, reportUnknownVariableType]

return isinstance(self, type(other)) and self.value == other.value # pyright: ignore[reportUnknownVariableType, reportAny, reportUnknownMemberType]
return isinstance(self, type(other)) and self.value == other.value # pyright: ignore[reportUnknownVariableType, reportUnknownMemberType, reportAttributeAccessIssue]

@override
def __ne__(self, other: Any) -> bool: # pyright: ignore[reportExplicitAny, reportAny]
def __ne__(self, other: object) -> bool:
if isinstance(other, int):
return self.value != other # pyright: ignore[reportUnknownMemberType, reportUnknownVariableType]

return isinstance(self, type(other)) and self.value != other.value # pyright: ignore[reportUnknownVariableType, reportAny, reportUnknownMemberType]
return isinstance(self, type(other)) and self.value != other.value # pyright: ignore[reportUnknownVariableType, reportUnknownMemberType, reportAttributeAccessIssue]

@override
def __and__(self, other: Any) -> int | bool: # pyright: ignore[reportExplicitAny, reportAny, reportGeneralTypeIssues]
Expand Down
18 changes: 8 additions & 10 deletions ext4/extent.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -89,13 +89,13 @@ class ExtentHeader(Ext4Struct):

_pack_ = 1
# _anonymous_ = ()
_fields_ = [
_fields_ = (
("eh_magic", c_uint16),
("eh_entries", c_uint16),
("eh_max", c_uint16),
("eh_depth", c_uint16),
("eh_generation", c_uint32),
]
)

def __init__(self, tree: "ExtentTree", offset: int) -> None:
self.tree: ExtentTree = tree
Expand All@@ -106,7 +106,7 @@ def __init__(self, tree: "ExtentTree", offset: int) -> None:

offset = self.offset + self.size
eh_entries = assert_cast(self.eh_entries, int) # pyright: ignore[reportAny]
for i in range(0, eh_entries):
for i in range(eh_entries):
if self.eh_depth == 0:
self.extents.append(Extent(self, offset, i))
offset += sizeof(Extent)
Expand DownExpand Up@@ -173,12 +173,12 @@ class ExtentIndex(Ext4Struct):

_pack_ = 1
# _anonymous_ = ("ei_unused",)
_fields_ = [
_fields_ = (
("ei_block", c_uint32),
("ei_leaf_lo", c_uint32),
("ei_leaf_hi", c_uint16),
("ei_unused", c_uint16),
]
)

def __init__(self, header: ExtentHeader, offset: int, ei_no: int) -> None:
self.ei_no: int = ei_no
Expand DownExpand Up@@ -210,12 +210,12 @@ class Extent(Ext4Struct):

_pack_ = 1
# _anonymous_ = ("ei_unused",)
_fields_ = [
_fields_ = (
("ee_block", c_uint32),
("ee_len", c_uint16),
("ee_start_hi", c_uint16),
("ee_start_lo", c_uint32),
]
)

def __init__(self, header: ExtentHeader, offset: int, ee_no: int) -> None:
super().__init__(header.inode.volume, offset)
Expand DownExpand Up@@ -258,9 +258,7 @@ class ExtentTail(Ext4Struct):
__slots__ = ("header",)

_pack_ = 1
_fields_ = [
("et_checksum", c_uint32),
]
_fields_ = (("et_checksum", c_uint32),)

def __init__(self, header: ExtentHeader, offset: int) -> None:
self.header: ExtentHeader = header
Expand Down
28 changes: 14 additions & 14 deletions ext4/htree.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -59,13 +59,13 @@ class DotDirectoryEntry2(LittleEndianStructureWithVolume):

_pack_ = 1
# _anonymous_ = ()
_fields_ = [
_fields_ = (
("inode", c_uint32),
("rec_len", c_uint16),
("name_len", c_uint8),
("file_type", c_uint8),
("name", c_char * 4), # b".\0\0\0" or b"..\0\0"
]
)

def verify(self) -> None:
name = assert_cast(self.name, bytes) # pyright: ignore[reportAny]
Expand All@@ -89,13 +89,13 @@ class DXRootInfo(LittleEndianStructure):
__slots__ = ()
_pack_ = 1
# _anonymous_ = ("reserved_zero")
_fields_ = [
_fields_ = (
("reserved_zero", c_uint32),
("hash_version", DX_HASH.basetype),
("info_length", c_uint8),
("indirect_levels", c_uint8),
("unused_flags", c_uint8),
]
)


class DXBase(Ext4Struct):
Expand DownExpand Up@@ -128,10 +128,10 @@ class DXEntry(DXBase):

_pack_ = 1
# _anonymous_ = ("")
_fields_ = [
_fields_ = (
("hash", c_uint32),
("block", c_uint32),
]
)

def __init__(self, parent: "DXEntriesBase", index: int) -> None:
self.index: int = index
Expand DownExpand Up@@ -321,15 +321,15 @@ def __init__(self, inode: "Directory") -> None:
super().__init__(inode, 0)

# _anonymous_ = ("")
_fields_ = [
_fields_ = (
("dot", DotDirectoryEntry2),
("dotdot", DotDirectoryEntry2),
("dx_root_info", DXRootInfo),
("limit", c_uint16),
("count", c_uint16),
("block", c_uint32),
# ("entries", DXEntry * self.count),
]
)

def compute_dx_hash(self, name: bytes, hash_version: int) -> tuple[int, int]:
seed = self.directory.volume.superblock.s_hash_seed # pyright: ignore[reportAny]
Expand DownExpand Up@@ -511,10 +511,10 @@ class DXFake(LittleEndianStructure):
__slots__ = ()
_pack_ = 1
# _anonymous_ = ("")
_fields_ = [
_fields_ = (
("inode", c_uint32), # 0
("rec_len", c_uint16),
]
)

@property
def expected_magic(self) -> int:
Expand All@@ -532,15 +532,15 @@ class DXNode(DXEntriesBase):

_pack_ = 1
# _anonymous_ = ("")
_fields_ = [
_fields_ = (
("fake", DXFake),
("name_len", c_uint8),
("file_type", c_uint8),
("limit", c_uint16),
("count", c_uint16),
("block", c_uint32),
# ("entries", DXEntry * self.count),
]
)

def __init__(self, directory: "Directory", offset: int) -> None:
super().__init__(directory, offset)
Expand All@@ -552,10 +552,10 @@ class DXTail(DXBase):

_pack_ = 1
# _anonymous_ = ("dt_reserved")
_fields_ = [
_fields_ = (
("dt_reserved", c_uint32),
("dt_checksum", c_uint16),
]
)

def __init__(self, parent: DXNode) -> None:
self.parent = parent
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions ext4/__init__.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,22 +83,7 @@
)

__all__ = [
"BlockDescriptor",
"BlockDevice",
"BlockIO",
"BlockIOBlocks",
"CharacterDevice",
"ChecksumError",
"Directory",
"DirectoryEntry",
"DirectoryEntry2",
"DirectoryEntryHash",
"DirectoryEntryTail",
"DotDirectoryEntry2",
"DX_HASH",
"DXEntry",
"DXRoot",
"DXRootInfo",
"EXT2_FLAGS",
"EXT4_BG",
"EXT4_CHKSUM",
Expand All@@ -119,6 +104,23 @@
"EXT4_NAME_LEN",
"EXT4_OS",
"EXT4_REV",
"FS_ENCRYPTION_MODE",
"MODE",
"BlockDescriptor",
"BlockDevice",
"BlockIO",
"BlockIOBlocks",
"CharacterDevice",
"ChecksumError",
"DXEntry",
"DXRoot",
"DXRootInfo",
"Directory",
"DirectoryEntry",
"DirectoryEntry2",
"DirectoryEntryHash",
"DirectoryEntryTail",
"DotDirectoryEntry2",
"ExtendedAttributeEntry",
"ExtendedAttributeError",
"ExtendedAttributeHeader",
Expand All@@ -130,7 +132,6 @@
"ExtentTail",
"Fifo",
"File",
"FS_ENCRYPTION_MODE",
"Hurd1",
"Hurd2",
"Inode",
Expand All@@ -141,7 +142,6 @@
"MagicError",
"Masix1",
"Masix2",
"MODE",
"Osd1",
"Osd2",
"Socket",
Expand Down
2 changes: 1 addition & 1 deletion ext4/_compat.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,4 +41,4 @@ def assert_cast(obj: Any, t: type[T], /) -> T:
return obj


__all__ = ["override", "ReadableStream", "PeekableStream", "assert_cast"]
__all__ = ["PeekableStream", "ReadableStream", "assert_cast", "override"]
4 changes: 2 additions & 2 deletions ext4/blockdescriptor.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ class BlockDescriptor(Ext4Struct):

_pack_ = 1
# _anonymous_ = ("bg_reserved",)
_fields_ = [
_fields_ = (
("bg_block_bitmap_lo", c_uint32),
("bg_inode_bitmap_lo", c_uint32),
("bg_inode_table_lo", c_uint32),
Expand All@@ -49,7 +49,7 @@ class BlockDescriptor(Ext4Struct):
("bg_block_bitmap_csum_hi", c_uint16),
("bg_inode_bitmap_csum_hi", c_uint16),
("bg_reserved", c_uint32),
]
)

def __init__(self, volume: "Volume", offset: int, bg_no: int) -> None:
super().__init__(volume, offset)
Expand Down
16 changes: 8 additions & 8 deletions ext4/directory.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -65,26 +65,26 @@ class DirectoryEntry(DirectoryEntryBase):
__slots__ = ()
_pack_ = 1
# _anonymous_ = ("l_i_reserved",)
_fields_ = [
_fields_ = (
("inode", c_uint32),
("rec_len", c_uint16),
("name_len", c_uint16),
("name", c_char * EXT4_NAME_LEN),
]
)


@final
class DirectoryEntry2(DirectoryEntryBase):
__slots__ = ()
_pack_ = 1
# _anonymous_ = ("l_i_reserved",)
_fields_ = [
_fields_ = (
("inode", c_uint32),
("rec_len", c_uint16),
("name_len", c_uint8),
("file_type", EXT4_FT.basetype),
("name", c_char * EXT4_NAME_LEN),
]
)

@DirectoryEntryBase.is_fake_entry.getter
def is_fake_entry(self) -> bool:
Expand All@@ -97,13 +97,13 @@ class DirectoryEntryTail(DirectoryEntryStruct):
__slots__ = ()
_pack_ = 1
# _anonymous_ = ("det_reserved_zero1", "det_reserved_zero2",)
_fields_ = [
_fields_ = (
("det_reserved_zero1", c_uint32),
("det_rec_len", c_uint16),
("det_reserved_zero2", c_uint8),
("det_reserved_ft", c_uint8), # EXT4_FT.DIR_CSUM
("det_checksum", c_uint32),
]
)

@Ext4Struct.magic.getter
def magic(self) -> int:
Expand All@@ -120,7 +120,7 @@ class DirectoryEntryHash(DirectoryEntryStruct):
__slots__ = ()
_pack_ = 1
# _anonymous_ = ("det_reserved_zero1", "det_reserved_zero2",)
_fields_ = [
_fields_ = (
("hash", c_uint32),
("minor_hash", c_uint32),
]
)
28 changes: 15 additions & 13 deletions ext4/enum.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
from typing import (
TYPE_CHECKING,
Any,
Self,
cast,
final,
)
Expand All@@ -17,8 +18,13 @@


def TypedEnumerationType(_type: type["SimpleCData"]): # noqa: ANN201
class EnumerationType(type(_type)): # type: ignore # pyright: ignore[reportGeneralTypeIssues, reportUntypedBaseClass] #noqa: ANN201
def __new__(cls, name: str, bases: tuple[type, ...], data: dict[str, Any]): # pyright: ignore[reportExplicitAny, reportUnknownParameterType] # noqa: ANN204
class EnumerationType(type(_type)): # type: ignore # pyright: ignore[reportGeneralTypeIssues, reportUntypedBaseClass]
def __new__(
cls,
name: str,
bases: tuple[type, ...],
data: dict[str, Any], # pyright: ignore[reportExplicitAny]
) -> Self:
_members_: dict[str, Any] # pyright: ignore[reportExplicitAny]
if "_members_" not in data:
_members_ = {}
Expand All@@ -32,11 +38,7 @@ def __new__(cls, name: str, bases: tuple[type, ...], data: dict[str, Any]): # p
_members_ = cast(dict[str, Any], data["_members_"]) # pyright: ignore[reportExplicitAny]

data["_reverse_map_"] = {v: k for k, v in _members_.items()} # pyright: ignore[reportAny]
cls = type(_type).__new__(cls, name, bases, data) # pyright: ignore[reportCallIssue, reportUnknownVariableType] # noqa: PLW0642
for key, value in cast(dict[str, Any], cls._members_).items(): # pyright: ignore[reportExplicitAny, reportAny]
globals()[key] = value

return cls # pyright: ignore[reportUnknownVariableType]
return type(_type).__new__(cls, name, bases, data) # pyright: ignore[reportCallIssue, reportUnknownVariableType]

@override
def __repr__(self) -> str:
Expand All@@ -46,8 +48,8 @@ def __repr__(self) -> str:


def TypedCEnumeration(_type: type["SimpleCData"]): # noqa: ANN201
class CEnumeration(_type, metaclass=TypedEnumerationType(_type)): # pyright: ignore[reportGeneralTypeIssues, reportUntypedBaseClass] # noqa: ANN201,PLW1641,PLW1641
_members_: dict[str, Any] = {} # pyright: ignore[reportExplicitAny]
class CEnumeration(_type, metaclass=TypedEnumerationType(_type)): # pyright: ignore[reportGeneralTypeIssues, reportUntypedBaseClass] # noqa: PLW1641
_members_: dict[str, Any] = {} # pyright: ignore[reportExplicitAny] # noqa: RUF012
basetype: type["SimpleCData"] = _type

@override
Expand All@@ -56,18 +58,18 @@ def __repr__(self) -> str:
return f"<{self.__class__.__name__}.{self._reverse_map_.get(value, '(unknown)')}: {value}>" # pyright: ignore[reportUnknownMemberType]

@override
def __eq__(self, other: Any) -> bool: # pyright: ignore[reportExplicitAny, reportAny]
def __eq__(self, other: object) -> bool:
if isinstance(other, int):
return self.value == other # pyright: ignore[reportUnknownMemberType, reportUnknownVariableType]

return isinstance(self, type(other)) and self.value == other.value # pyright: ignore[reportUnknownVariableType, reportAny, reportUnknownMemberType]
return isinstance(self, type(other)) and self.value == other.value # pyright: ignore[reportUnknownVariableType, reportUnknownMemberType, reportAttributeAccessIssue]

@override
def __ne__(self, other: Any) -> bool: # pyright: ignore[reportExplicitAny, reportAny]
def __ne__(self, other: object) -> bool:
if isinstance(other, int):
return self.value != other # pyright: ignore[reportUnknownMemberType, reportUnknownVariableType]

return isinstance(self, type(other)) and self.value != other.value # pyright: ignore[reportUnknownVariableType, reportAny, reportUnknownMemberType]
return isinstance(self, type(other)) and self.value != other.value # pyright: ignore[reportUnknownVariableType, reportUnknownMemberType, reportAttributeAccessIssue]

@override
def __and__(self, other: Any) -> int | bool: # pyright: ignore[reportExplicitAny, reportAny, reportGeneralTypeIssues]
Expand Down
18 changes: 8 additions & 10 deletions ext4/extent.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -89,13 +89,13 @@ class ExtentHeader(Ext4Struct):

_pack_ = 1
# _anonymous_ = ()
_fields_ = [
_fields_ = (
("eh_magic", c_uint16),
("eh_entries", c_uint16),
("eh_max", c_uint16),
("eh_depth", c_uint16),
("eh_generation", c_uint32),
]
)

def __init__(self, tree: "ExtentTree", offset: int) -> None:
self.tree: ExtentTree = tree
Expand All@@ -106,7 +106,7 @@ def __init__(self, tree: "ExtentTree", offset: int) -> None:

offset = self.offset + self.size
eh_entries = assert_cast(self.eh_entries, int) # pyright: ignore[reportAny]
for i in range(0, eh_entries):
for i in range(eh_entries):
if self.eh_depth == 0:
self.extents.append(Extent(self, offset, i))
offset += sizeof(Extent)
Expand DownExpand Up@@ -173,12 +173,12 @@ class ExtentIndex(Ext4Struct):

_pack_ = 1
# _anonymous_ = ("ei_unused",)
_fields_ = [
_fields_ = (
("ei_block", c_uint32),
("ei_leaf_lo", c_uint32),
("ei_leaf_hi", c_uint16),
("ei_unused", c_uint16),
]
)

def __init__(self, header: ExtentHeader, offset: int, ei_no: int) -> None:
self.ei_no: int = ei_no
Expand DownExpand Up@@ -210,12 +210,12 @@ class Extent(Ext4Struct):

_pack_ = 1
# _anonymous_ = ("ei_unused",)
_fields_ = [
_fields_ = (
("ee_block", c_uint32),
("ee_len", c_uint16),
("ee_start_hi", c_uint16),
("ee_start_lo", c_uint32),
]
)

def __init__(self, header: ExtentHeader, offset: int, ee_no: int) -> None:
super().__init__(header.inode.volume, offset)
Expand DownExpand Up@@ -258,9 +258,7 @@ class ExtentTail(Ext4Struct):
__slots__ = ("header",)

_pack_ = 1
_fields_ = [
("et_checksum", c_uint32),
]
_fields_ = (("et_checksum", c_uint32),)

def __init__(self, header: ExtentHeader, offset: int) -> None:
self.header: ExtentHeader = header
Expand Down
28 changes: 14 additions & 14 deletions ext4/htree.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -59,13 +59,13 @@ class DotDirectoryEntry2(LittleEndianStructureWithVolume):

_pack_ = 1
# _anonymous_ = ()
_fields_ = [
_fields_ = (
("inode", c_uint32),
("rec_len", c_uint16),
("name_len", c_uint8),
("file_type", c_uint8),
("name", c_char * 4), # b".\0\0\0" or b"..\0\0"
]
)

def verify(self) -> None:
name = assert_cast(self.name, bytes) # pyright: ignore[reportAny]
Expand All@@ -89,13 +89,13 @@ class DXRootInfo(LittleEndianStructure):
__slots__ = ()
_pack_ = 1
# _anonymous_ = ("reserved_zero")
_fields_ = [
_fields_ = (
("reserved_zero", c_uint32),
("hash_version", DX_HASH.basetype),
("info_length", c_uint8),
("indirect_levels", c_uint8),
("unused_flags", c_uint8),
]
)


class DXBase(Ext4Struct):
Expand DownExpand Up@@ -128,10 +128,10 @@ class DXEntry(DXBase):

_pack_ = 1
# _anonymous_ = ("")
_fields_ = [
_fields_ = (
("hash", c_uint32),
("block", c_uint32),
]
)

def __init__(self, parent: "DXEntriesBase", index: int) -> None:
self.index: int = index
Expand DownExpand Up@@ -321,15 +321,15 @@ def __init__(self, inode: "Directory") -> None:
super().__init__(inode, 0)

# _anonymous_ = ("")
_fields_ = [
_fields_ = (
("dot", DotDirectoryEntry2),
("dotdot", DotDirectoryEntry2),
("dx_root_info", DXRootInfo),
("limit", c_uint16),
("count", c_uint16),
("block", c_uint32),
# ("entries", DXEntry * self.count),
]
)

def compute_dx_hash(self, name: bytes, hash_version: int) -> tuple[int, int]:
seed = self.directory.volume.superblock.s_hash_seed # pyright: ignore[reportAny]
Expand DownExpand Up@@ -511,10 +511,10 @@ class DXFake(LittleEndianStructure):
__slots__ = ()
_pack_ = 1
# _anonymous_ = ("")
_fields_ = [
_fields_ = (
("inode", c_uint32), # 0
("rec_len", c_uint16),
]
)

@property
def expected_magic(self) -> int:
Expand All@@ -532,15 +532,15 @@ class DXNode(DXEntriesBase):

_pack_ = 1
# _anonymous_ = ("")
_fields_ = [
_fields_ = (
("fake", DXFake),
("name_len", c_uint8),
("file_type", c_uint8),
("limit", c_uint16),
("count", c_uint16),
("block", c_uint32),
# ("entries", DXEntry * self.count),
]
)

def __init__(self, directory: "Directory", offset: int) -> None:
super().__init__(directory, offset)
Expand All@@ -552,10 +552,10 @@ class DXTail(DXBase):

_pack_ = 1
# _anonymous_ = ("dt_reserved")
_fields_ = [
_fields_ = (
("dt_reserved", c_uint32),
("dt_checksum", c_uint16),
]
)

def __init__(self, parent: DXNode) -> None:
self.parent = parent
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions ext4/__init__.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,22 +83,7 @@
)

__all__ = [
"BlockDescriptor",
"BlockDevice",
"BlockIO",
"BlockIOBlocks",
"CharacterDevice",
"ChecksumError",
"Directory",
"DirectoryEntry",
"DirectoryEntry2",
"DirectoryEntryHash",
"DirectoryEntryTail",
"DotDirectoryEntry2",
"DX_HASH",
"DXEntry",
"DXRoot",
"DXRootInfo",
"EXT2_FLAGS",
"EXT4_BG",
"EXT4_CHKSUM",
Expand All@@ -119,6 +104,23 @@
"EXT4_NAME_LEN",
"EXT4_OS",
"EXT4_REV",
"FS_ENCRYPTION_MODE",
"MODE",
"BlockDescriptor",
"BlockDevice",
"BlockIO",
"BlockIOBlocks",
"CharacterDevice",
"ChecksumError",
"DXEntry",
"DXRoot",
"DXRootInfo",
"Directory",
"DirectoryEntry",
"DirectoryEntry2",
"DirectoryEntryHash",
"DirectoryEntryTail",
"DotDirectoryEntry2",
"ExtendedAttributeEntry",
"ExtendedAttributeError",
"ExtendedAttributeHeader",
Expand All@@ -130,7 +132,6 @@
"ExtentTail",
"Fifo",
"File",
"FS_ENCRYPTION_MODE",
"Hurd1",
"Hurd2",
"Inode",
Expand All@@ -141,7 +142,6 @@
"MagicError",
"Masix1",
"Masix2",
"MODE",
"Osd1",
"Osd2",
"Socket",
Expand Down
2 changes: 1 addition & 1 deletion ext4/_compat.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,4 +41,4 @@ def assert_cast(obj: Any, t: type[T], /) -> T:
return obj


__all__ = ["override", "ReadableStream", "PeekableStream", "assert_cast"]
__all__ = ["PeekableStream", "ReadableStream", "assert_cast", "override"]
4 changes: 2 additions & 2 deletions ext4/blockdescriptor.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ class BlockDescriptor(Ext4Struct):

_pack_ = 1
# _anonymous_ = ("bg_reserved",)
_fields_ = [
_fields_ = (
("bg_block_bitmap_lo", c_uint32),
("bg_inode_bitmap_lo", c_uint32),
("bg_inode_table_lo", c_uint32),
Expand All@@ -49,7 +49,7 @@ class BlockDescriptor(Ext4Struct):
("bg_block_bitmap_csum_hi", c_uint16),
("bg_inode_bitmap_csum_hi", c_uint16),
("bg_reserved", c_uint32),
]
)

def __init__(self, volume: "Volume", offset: int, bg_no: int) -> None:
super().__init__(volume, offset)
Expand Down
16 changes: 8 additions & 8 deletions ext4/directory.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -65,26 +65,26 @@ class DirectoryEntry(DirectoryEntryBase):
__slots__ = ()
_pack_ = 1
# _anonymous_ = ("l_i_reserved",)
_fields_ = [
_fields_ = (
("inode", c_uint32),
("rec_len", c_uint16),
("name_len", c_uint16),
("name", c_char * EXT4_NAME_LEN),
]
)


@final
class DirectoryEntry2(DirectoryEntryBase):
__slots__ = ()
_pack_ = 1
# _anonymous_ = ("l_i_reserved",)
_fields_ = [
_fields_ = (
("inode", c_uint32),
("rec_len", c_uint16),
("name_len", c_uint8),
("file_type", EXT4_FT.basetype),
("name", c_char * EXT4_NAME_LEN),
]
)

@DirectoryEntryBase.is_fake_entry.getter
def is_fake_entry(self) -> bool:
Expand All@@ -97,13 +97,13 @@ class DirectoryEntryTail(DirectoryEntryStruct):
__slots__ = ()
_pack_ = 1
# _anonymous_ = ("det_reserved_zero1", "det_reserved_zero2",)
_fields_ = [
_fields_ = (
("det_reserved_zero1", c_uint32),
("det_rec_len", c_uint16),
("det_reserved_zero2", c_uint8),
("det_reserved_ft", c_uint8), # EXT4_FT.DIR_CSUM
("det_checksum", c_uint32),
]
)

@Ext4Struct.magic.getter
def magic(self) -> int:
Expand All@@ -120,7 +120,7 @@ class DirectoryEntryHash(DirectoryEntryStruct):
__slots__ = ()
_pack_ = 1
# _anonymous_ = ("det_reserved_zero1", "det_reserved_zero2",)
_fields_ = [
_fields_ = (
("hash", c_uint32),
("minor_hash", c_uint32),
]
)
28 changes: 15 additions & 13 deletions ext4/enum.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
from typing import (
TYPE_CHECKING,
Any,
Self,
cast,
final,
)
Expand All@@ -17,8 +18,13 @@


def TypedEnumerationType(_type: type["SimpleCData"]): # noqa: ANN201
class EnumerationType(type(_type)): # type: ignore # pyright: ignore[reportGeneralTypeIssues, reportUntypedBaseClass] #noqa: ANN201
def __new__(cls, name: str, bases: tuple[type, ...], data: dict[str, Any]): # pyright: ignore[reportExplicitAny, reportUnknownParameterType] # noqa: ANN204
class EnumerationType(type(_type)): # type: ignore # pyright: ignore[reportGeneralTypeIssues, reportUntypedBaseClass]
def __new__(
cls,
name: str,
bases: tuple[type, ...],
data: dict[str, Any], # pyright: ignore[reportExplicitAny]
) -> Self:
_members_: dict[str, Any] # pyright: ignore[reportExplicitAny]
if "_members_" not in data:
_members_ = {}
Expand All@@ -32,11 +38,7 @@ def __new__(cls, name: str, bases: tuple[type, ...], data: dict[str, Any]): # p
_members_ = cast(dict[str, Any], data["_members_"]) # pyright: ignore[reportExplicitAny]

data["_reverse_map_"] = {v: k for k, v in _members_.items()} # pyright: ignore[reportAny]
cls = type(_type).__new__(cls, name, bases, data) # pyright: ignore[reportCallIssue, reportUnknownVariableType] # noqa: PLW0642
for key, value in cast(dict[str, Any], cls._members_).items(): # pyright: ignore[reportExplicitAny, reportAny]
globals()[key] = value

return cls # pyright: ignore[reportUnknownVariableType]
return type(_type).__new__(cls, name, bases, data) # pyright: ignore[reportCallIssue, reportUnknownVariableType]

@override
def __repr__(self) -> str:
Expand All@@ -46,8 +48,8 @@ def __repr__(self) -> str:


def TypedCEnumeration(_type: type["SimpleCData"]): # noqa: ANN201
class CEnumeration(_type, metaclass=TypedEnumerationType(_type)): # pyright: ignore[reportGeneralTypeIssues, reportUntypedBaseClass] # noqa: ANN201,PLW1641,PLW1641
_members_: dict[str, Any] = {} # pyright: ignore[reportExplicitAny]
class CEnumeration(_type, metaclass=TypedEnumerationType(_type)): # pyright: ignore[reportGeneralTypeIssues, reportUntypedBaseClass] # noqa: PLW1641
_members_: dict[str, Any] = {} # pyright: ignore[reportExplicitAny] # noqa: RUF012
basetype: type["SimpleCData"] = _type

@override
Expand All@@ -56,18 +58,18 @@ def __repr__(self) -> str:
return f"<{self.__class__.__name__}.{self._reverse_map_.get(value, '(unknown)')}: {value}>" # pyright: ignore[reportUnknownMemberType]

@override
def __eq__(self, other: Any) -> bool: # pyright: ignore[reportExplicitAny, reportAny]
def __eq__(self, other: object) -> bool:
if isinstance(other, int):
return self.value == other # pyright: ignore[reportUnknownMemberType, reportUnknownVariableType]

return isinstance(self, type(other)) and self.value == other.value # pyright: ignore[reportUnknownVariableType, reportAny, reportUnknownMemberType]
return isinstance(self, type(other)) and self.value == other.value # pyright: ignore[reportUnknownVariableType, reportUnknownMemberType, reportAttributeAccessIssue]

@override
def __ne__(self, other: Any) -> bool: # pyright: ignore[reportExplicitAny, reportAny]
def __ne__(self, other: object) -> bool:
if isinstance(other, int):
return self.value != other # pyright: ignore[reportUnknownMemberType, reportUnknownVariableType]

return isinstance(self, type(other)) and self.value != other.value # pyright: ignore[reportUnknownVariableType, reportAny, reportUnknownMemberType]
return isinstance(self, type(other)) and self.value != other.value # pyright: ignore[reportUnknownVariableType, reportUnknownMemberType, reportAttributeAccessIssue]

@override
def __and__(self, other: Any) -> int | bool: # pyright: ignore[reportExplicitAny, reportAny, reportGeneralTypeIssues]
Expand Down
18 changes: 8 additions & 10 deletions ext4/extent.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -89,13 +89,13 @@ class ExtentHeader(Ext4Struct):

_pack_ = 1
# _anonymous_ = ()
_fields_ = [
_fields_ = (
("eh_magic", c_uint16),
("eh_entries", c_uint16),
("eh_max", c_uint16),
("eh_depth", c_uint16),
("eh_generation", c_uint32),
]
)

def __init__(self, tree: "ExtentTree", offset: int) -> None:
self.tree: ExtentTree = tree
Expand All@@ -106,7 +106,7 @@ def __init__(self, tree: "ExtentTree", offset: int) -> None:

offset = self.offset + self.size
eh_entries = assert_cast(self.eh_entries, int) # pyright: ignore[reportAny]
for i in range(0, eh_entries):
for i in range(eh_entries):
if self.eh_depth == 0:
self.extents.append(Extent(self, offset, i))
offset += sizeof(Extent)
Expand DownExpand Up@@ -173,12 +173,12 @@ class ExtentIndex(Ext4Struct):

_pack_ = 1
# _anonymous_ = ("ei_unused",)
_fields_ = [
_fields_ = (
("ei_block", c_uint32),
("ei_leaf_lo", c_uint32),
("ei_leaf_hi", c_uint16),
("ei_unused", c_uint16),
]
)

def __init__(self, header: ExtentHeader, offset: int, ei_no: int) -> None:
self.ei_no: int = ei_no
Expand DownExpand Up@@ -210,12 +210,12 @@ class Extent(Ext4Struct):

_pack_ = 1
# _anonymous_ = ("ei_unused",)
_fields_ = [
_fields_ = (
("ee_block", c_uint32),
("ee_len", c_uint16),
("ee_start_hi", c_uint16),
("ee_start_lo", c_uint32),
]
)

def __init__(self, header: ExtentHeader, offset: int, ee_no: int) -> None:
super().__init__(header.inode.volume, offset)
Expand DownExpand Up@@ -258,9 +258,7 @@ class ExtentTail(Ext4Struct):
__slots__ = ("header",)

_pack_ = 1
_fields_ = [
("et_checksum", c_uint32),
]
_fields_ = (("et_checksum", c_uint32),)

def __init__(self, header: ExtentHeader, offset: int) -> None:
self.header: ExtentHeader = header
Expand Down
28 changes: 14 additions & 14 deletions ext4/htree.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -59,13 +59,13 @@ class DotDirectoryEntry2(LittleEndianStructureWithVolume):

_pack_ = 1
# _anonymous_ = ()
_fields_ = [
_fields_ = (
("inode", c_uint32),
("rec_len", c_uint16),
("name_len", c_uint8),
("file_type", c_uint8),
("name", c_char * 4), # b".\0\0\0" or b"..\0\0"
]
)

def verify(self) -> None:
name = assert_cast(self.name, bytes) # pyright: ignore[reportAny]
Expand All@@ -89,13 +89,13 @@ class DXRootInfo(LittleEndianStructure):
__slots__ = ()
_pack_ = 1
# _anonymous_ = ("reserved_zero")
_fields_ = [
_fields_ = (
("reserved_zero", c_uint32),
("hash_version", DX_HASH.basetype),
("info_length", c_uint8),
("indirect_levels", c_uint8),
("unused_flags", c_uint8),
]
)


class DXBase(Ext4Struct):
Expand DownExpand Up@@ -128,10 +128,10 @@ class DXEntry(DXBase):

_pack_ = 1
# _anonymous_ = ("")
_fields_ = [
_fields_ = (
("hash", c_uint32),
("block", c_uint32),
]
)

def __init__(self, parent: "DXEntriesBase", index: int) -> None:
self.index: int = index
Expand DownExpand Up@@ -321,15 +321,15 @@ def __init__(self, inode: "Directory") -> None:
super().__init__(inode, 0)

# _anonymous_ = ("")
_fields_ = [
_fields_ = (
("dot", DotDirectoryEntry2),
("dotdot", DotDirectoryEntry2),
("dx_root_info", DXRootInfo),
("limit", c_uint16),
("count", c_uint16),
("block", c_uint32),
# ("entries", DXEntry * self.count),
]
)

def compute_dx_hash(self, name: bytes, hash_version: int) -> tuple[int, int]:
seed = self.directory.volume.superblock.s_hash_seed # pyright: ignore[reportAny]
Expand DownExpand Up@@ -511,10 +511,10 @@ class DXFake(LittleEndianStructure):
__slots__ = ()
_pack_ = 1
# _anonymous_ = ("")
_fields_ = [
_fields_ = (
("inode", c_uint32), # 0
("rec_len", c_uint16),
]
)

@property
def expected_magic(self) -> int:
Expand All@@ -532,15 +532,15 @@ class DXNode(DXEntriesBase):

_pack_ = 1
# _anonymous_ = ("")
_fields_ = [
_fields_ = (
("fake", DXFake),
("name_len", c_uint8),
("file_type", c_uint8),
("limit", c_uint16),
("count", c_uint16),
("block", c_uint32),
# ("entries", DXEntry * self.count),
]
)

def __init__(self, directory: "Directory", offset: int) -> None:
super().__init__(directory, offset)
Expand All@@ -552,10 +552,10 @@ class DXTail(DXBase):

_pack_ = 1
# _anonymous_ = ("dt_reserved")
_fields_ = [
_fields_ = (
("dt_reserved", c_uint32),
("dt_checksum", c_uint16),
]
)

def __init__(self, parent: DXNode) -> None:
self.parent = parent
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions ext4/__init__.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,22 +83,7 @@
)

__all__ = [
"BlockDescriptor",
"BlockDevice",
"BlockIO",
"BlockIOBlocks",
"CharacterDevice",
"ChecksumError",
"Directory",
"DirectoryEntry",
"DirectoryEntry2",
"DirectoryEntryHash",
"DirectoryEntryTail",
"DotDirectoryEntry2",
"DX_HASH",
"DXEntry",
"DXRoot",
"DXRootInfo",
"EXT2_FLAGS",
"EXT4_BG",
"EXT4_CHKSUM",
Expand All@@ -119,6 +104,23 @@
"EXT4_NAME_LEN",
"EXT4_OS",
"EXT4_REV",
"FS_ENCRYPTION_MODE",
"MODE",
"BlockDescriptor",
"BlockDevice",
"BlockIO",
"BlockIOBlocks",
"CharacterDevice",
"ChecksumError",
"DXEntry",
"DXRoot",
"DXRootInfo",
"Directory",
"DirectoryEntry",
"DirectoryEntry2",
"DirectoryEntryHash",
"DirectoryEntryTail",
"DotDirectoryEntry2",
"ExtendedAttributeEntry",
"ExtendedAttributeError",
"ExtendedAttributeHeader",
Expand All@@ -130,7 +132,6 @@
"ExtentTail",
"Fifo",
"File",
"FS_ENCRYPTION_MODE",
"Hurd1",
"Hurd2",
"Inode",
Expand All@@ -141,7 +142,6 @@
"MagicError",
"Masix1",
"Masix2",
"MODE",
"Osd1",
"Osd2",
"Socket",
Expand Down
2 changes: 1 addition & 1 deletion ext4/_compat.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,4 +41,4 @@ def assert_cast(obj: Any, t: type[T], /) -> T:
return obj


__all__ = ["override", "ReadableStream", "PeekableStream", "assert_cast"]
__all__ = ["PeekableStream", "ReadableStream", "assert_cast", "override"]
4 changes: 2 additions & 2 deletions ext4/blockdescriptor.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ class BlockDescriptor(Ext4Struct):

_pack_ = 1
# _anonymous_ = ("bg_reserved",)
_fields_ = [
_fields_ = (
("bg_block_bitmap_lo", c_uint32),
("bg_inode_bitmap_lo", c_uint32),
("bg_inode_table_lo", c_uint32),
Expand All@@ -49,7 +49,7 @@ class BlockDescriptor(Ext4Struct):
("bg_block_bitmap_csum_hi", c_uint16),
("bg_inode_bitmap_csum_hi", c_uint16),
("bg_reserved", c_uint32),
]
)

def __init__(self, volume: "Volume", offset: int, bg_no: int) -> None:
super().__init__(volume, offset)
Expand Down
16 changes: 8 additions & 8 deletions ext4/directory.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -65,26 +65,26 @@ class DirectoryEntry(DirectoryEntryBase):
__slots__ = ()
_pack_ = 1
# _anonymous_ = ("l_i_reserved",)
_fields_ = [
_fields_ = (
("inode", c_uint32),
("rec_len", c_uint16),
("name_len", c_uint16),
("name", c_char * EXT4_NAME_LEN),
]
)


@final
class DirectoryEntry2(DirectoryEntryBase):
__slots__ = ()
_pack_ = 1
# _anonymous_ = ("l_i_reserved",)
_fields_ = [
_fields_ = (
("inode", c_uint32),
("rec_len", c_uint16),
("name_len", c_uint8),
("file_type", EXT4_FT.basetype),
("name", c_char * EXT4_NAME_LEN),
]
)

@DirectoryEntryBase.is_fake_entry.getter
def is_fake_entry(self) -> bool:
Expand All@@ -97,13 +97,13 @@ class DirectoryEntryTail(DirectoryEntryStruct):
__slots__ = ()
_pack_ = 1
# _anonymous_ = ("det_reserved_zero1", "det_reserved_zero2",)
_fields_ = [
_fields_ = (
("det_reserved_zero1", c_uint32),
("det_rec_len", c_uint16),
("det_reserved_zero2", c_uint8),
("det_reserved_ft", c_uint8), # EXT4_FT.DIR_CSUM
("det_checksum", c_uint32),
]
)

@Ext4Struct.magic.getter
def magic(self) -> int:
Expand All@@ -120,7 +120,7 @@ class DirectoryEntryHash(DirectoryEntryStruct):
__slots__ = ()
_pack_ = 1
# _anonymous_ = ("det_reserved_zero1", "det_reserved_zero2",)
_fields_ = [
_fields_ = (
("hash", c_uint32),
("minor_hash", c_uint32),
]
)
28 changes: 15 additions & 13 deletions ext4/enum.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
from typing import (
TYPE_CHECKING,
Any,
Self,
cast,
final,
)
Expand All@@ -17,8 +18,13 @@


def TypedEnumerationType(_type: type["SimpleCData"]): # noqa: ANN201
class EnumerationType(type(_type)): # type: ignore # pyright: ignore[reportGeneralTypeIssues, reportUntypedBaseClass] #noqa: ANN201
def __new__(cls, name: str, bases: tuple[type, ...], data: dict[str, Any]): # pyright: ignore[reportExplicitAny, reportUnknownParameterType] # noqa: ANN204
class EnumerationType(type(_type)): # type: ignore # pyright: ignore[reportGeneralTypeIssues, reportUntypedBaseClass]
def __new__(
cls,
name: str,
bases: tuple[type, ...],
data: dict[str, Any], # pyright: ignore[reportExplicitAny]
) -> Self:
_members_: dict[str, Any] # pyright: ignore[reportExplicitAny]
if "_members_" not in data:
_members_ = {}
Expand All@@ -32,11 +38,7 @@ def __new__(cls, name: str, bases: tuple[type, ...], data: dict[str, Any]): # p
_members_ = cast(dict[str, Any], data["_members_"]) # pyright: ignore[reportExplicitAny]

data["_reverse_map_"] = {v: k for k, v in _members_.items()} # pyright: ignore[reportAny]
cls = type(_type).__new__(cls, name, bases, data) # pyright: ignore[reportCallIssue, reportUnknownVariableType] # noqa: PLW0642
for key, value in cast(dict[str, Any], cls._members_).items(): # pyright: ignore[reportExplicitAny, reportAny]
globals()[key] = value

return cls # pyright: ignore[reportUnknownVariableType]
return type(_type).__new__(cls, name, bases, data) # pyright: ignore[reportCallIssue, reportUnknownVariableType]

@override
def __repr__(self) -> str:
Expand All@@ -46,8 +48,8 @@ def __repr__(self) -> str:


def TypedCEnumeration(_type: type["SimpleCData"]): # noqa: ANN201
class CEnumeration(_type, metaclass=TypedEnumerationType(_type)): # pyright: ignore[reportGeneralTypeIssues, reportUntypedBaseClass] # noqa: ANN201,PLW1641,PLW1641
_members_: dict[str, Any] = {} # pyright: ignore[reportExplicitAny]
class CEnumeration(_type, metaclass=TypedEnumerationType(_type)): # pyright: ignore[reportGeneralTypeIssues, reportUntypedBaseClass] # noqa: PLW1641
_members_: dict[str, Any] = {} # pyright: ignore[reportExplicitAny] # noqa: RUF012
basetype: type["SimpleCData"] = _type

@override
Expand All@@ -56,18 +58,18 @@ def __repr__(self) -> str:
return f"<{self.__class__.__name__}.{self._reverse_map_.get(value, '(unknown)')}: {value}>" # pyright: ignore[reportUnknownMemberType]

@override
def __eq__(self, other: Any) -> bool: # pyright: ignore[reportExplicitAny, reportAny]
def __eq__(self, other: object) -> bool:
if isinstance(other, int):
return self.value == other # pyright: ignore[reportUnknownMemberType, reportUnknownVariableType]

return isinstance(self, type(other)) and self.value == other.value # pyright: ignore[reportUnknownVariableType, reportAny, reportUnknownMemberType]
return isinstance(self, type(other)) and self.value == other.value # pyright: ignore[reportUnknownVariableType, reportUnknownMemberType, reportAttributeAccessIssue]

@override
def __ne__(self, other: Any) -> bool: # pyright: ignore[reportExplicitAny, reportAny]
def __ne__(self, other: object) -> bool:
if isinstance(other, int):
return self.value != other # pyright: ignore[reportUnknownMemberType, reportUnknownVariableType]

return isinstance(self, type(other)) and self.value != other.value # pyright: ignore[reportUnknownVariableType, reportAny, reportUnknownMemberType]
return isinstance(self, type(other)) and self.value != other.value # pyright: ignore[reportUnknownVariableType, reportUnknownMemberType, reportAttributeAccessIssue]

@override
def __and__(self, other: Any) -> int | bool: # pyright: ignore[reportExplicitAny, reportAny, reportGeneralTypeIssues]
Expand Down
18 changes: 8 additions & 10 deletions ext4/extent.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -89,13 +89,13 @@ class ExtentHeader(Ext4Struct):

_pack_ = 1
# _anonymous_ = ()
_fields_ = [
_fields_ = (
("eh_magic", c_uint16),
("eh_entries", c_uint16),
("eh_max", c_uint16),
("eh_depth", c_uint16),
("eh_generation", c_uint32),
]
)

def __init__(self, tree: "ExtentTree", offset: int) -> None:
self.tree: ExtentTree = tree
Expand All@@ -106,7 +106,7 @@ def __init__(self, tree: "ExtentTree", offset: int) -> None:

offset = self.offset + self.size
eh_entries = assert_cast(self.eh_entries, int) # pyright: ignore[reportAny]
for i in range(0, eh_entries):
for i in range(eh_entries):
if self.eh_depth == 0:
self.extents.append(Extent(self, offset, i))
offset += sizeof(Extent)
Expand DownExpand Up@@ -173,12 +173,12 @@ class ExtentIndex(Ext4Struct):

_pack_ = 1
# _anonymous_ = ("ei_unused",)
_fields_ = [
_fields_ = (
("ei_block", c_uint32),
("ei_leaf_lo", c_uint32),
("ei_leaf_hi", c_uint16),
("ei_unused", c_uint16),
]
)

def __init__(self, header: ExtentHeader, offset: int, ei_no: int) -> None:
self.ei_no: int = ei_no
Expand DownExpand Up@@ -210,12 +210,12 @@ class Extent(Ext4Struct):

_pack_ = 1
# _anonymous_ = ("ei_unused",)
_fields_ = [
_fields_ = (
("ee_block", c_uint32),
("ee_len", c_uint16),
("ee_start_hi", c_uint16),
("ee_start_lo", c_uint32),
]
)

def __init__(self, header: ExtentHeader, offset: int, ee_no: int) -> None:
super().__init__(header.inode.volume, offset)
Expand DownExpand Up@@ -258,9 +258,7 @@ class ExtentTail(Ext4Struct):
__slots__ = ("header",)

_pack_ = 1
_fields_ = [
("et_checksum", c_uint32),
]
_fields_ = (("et_checksum", c_uint32),)

def __init__(self, header: ExtentHeader, offset: int) -> None:
self.header: ExtentHeader = header
Expand Down
28 changes: 14 additions & 14 deletions ext4/htree.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -59,13 +59,13 @@ class DotDirectoryEntry2(LittleEndianStructureWithVolume):

_pack_ = 1
# _anonymous_ = ()
_fields_ = [
_fields_ = (
("inode", c_uint32),
("rec_len", c_uint16),
("name_len", c_uint8),
("file_type", c_uint8),
("name", c_char * 4), # b".\0\0\0" or b"..\0\0"
]
)

def verify(self) -> None:
name = assert_cast(self.name, bytes) # pyright: ignore[reportAny]
Expand All@@ -89,13 +89,13 @@ class DXRootInfo(LittleEndianStructure):
__slots__ = ()
_pack_ = 1
# _anonymous_ = ("reserved_zero")
_fields_ = [
_fields_ = (
("reserved_zero", c_uint32),
("hash_version", DX_HASH.basetype),
("info_length", c_uint8),
("indirect_levels", c_uint8),
("unused_flags", c_uint8),
]
)


class DXBase(Ext4Struct):
Expand DownExpand Up@@ -128,10 +128,10 @@ class DXEntry(DXBase):

_pack_ = 1
# _anonymous_ = ("")
_fields_ = [
_fields_ = (
("hash", c_uint32),
("block", c_uint32),
]
)

def __init__(self, parent: "DXEntriesBase", index: int) -> None:
self.index: int = index
Expand DownExpand Up@@ -321,15 +321,15 @@ def __init__(self, inode: "Directory") -> None:
super().__init__(inode, 0)

# _anonymous_ = ("")
_fields_ = [
_fields_ = (
("dot", DotDirectoryEntry2),
("dotdot", DotDirectoryEntry2),
("dx_root_info", DXRootInfo),
("limit", c_uint16),
("count", c_uint16),
("block", c_uint32),
# ("entries", DXEntry * self.count),
]
)

def compute_dx_hash(self, name: bytes, hash_version: int) -> tuple[int, int]:
seed = self.directory.volume.superblock.s_hash_seed # pyright: ignore[reportAny]
Expand DownExpand Up@@ -511,10 +511,10 @@ class DXFake(LittleEndianStructure):
__slots__ = ()
_pack_ = 1
# _anonymous_ = ("")
_fields_ = [
_fields_ = (
("inode", c_uint32), # 0
("rec_len", c_uint16),
]
)

@property
def expected_magic(self) -> int:
Expand All@@ -532,15 +532,15 @@ class DXNode(DXEntriesBase):

_pack_ = 1
# _anonymous_ = ("")
_fields_ = [
_fields_ = (
("fake", DXFake),
("name_len", c_uint8),
("file_type", c_uint8),
("limit", c_uint16),
("count", c_uint16),
("block", c_uint32),
# ("entries", DXEntry * self.count),
]
)

def __init__(self, directory: "Directory", offset: int) -> None:
super().__init__(directory, offset)
Expand All@@ -552,10 +552,10 @@ class DXTail(DXBase):

_pack_ = 1
# _anonymous_ = ("dt_reserved")
_fields_ = [
_fields_ = (
("dt_reserved", c_uint32),
("dt_checksum", c_uint16),
]
)

def __init__(self, parent: DXNode) -> None:
self.parent = parent
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions ext4/__init__.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,22 +83,7 @@
)

__all__ = [
"BlockDescriptor",
"BlockDevice",
"BlockIO",
"BlockIOBlocks",
"CharacterDevice",
"ChecksumError",
"Directory",
"DirectoryEntry",
"DirectoryEntry2",
"DirectoryEntryHash",
"DirectoryEntryTail",
"DotDirectoryEntry2",
"DX_HASH",
"DXEntry",
"DXRoot",
"DXRootInfo",
"EXT2_FLAGS",
"EXT4_BG",
"EXT4_CHKSUM",
Expand All@@ -119,6 +104,23 @@
"EXT4_NAME_LEN",
"EXT4_OS",
"EXT4_REV",
"FS_ENCRYPTION_MODE",
"MODE",
"BlockDescriptor",
"BlockDevice",
"BlockIO",
"BlockIOBlocks",
"CharacterDevice",
"ChecksumError",
"DXEntry",
"DXRoot",
"DXRootInfo",
"Directory",
"DirectoryEntry",
"DirectoryEntry2",
"DirectoryEntryHash",
"DirectoryEntryTail",
"DotDirectoryEntry2",
"ExtendedAttributeEntry",
"ExtendedAttributeError",
"ExtendedAttributeHeader",
Expand All@@ -130,7 +132,6 @@
"ExtentTail",
"Fifo",
"File",
"FS_ENCRYPTION_MODE",
"Hurd1",
"Hurd2",
"Inode",
Expand All@@ -141,7 +142,6 @@
"MagicError",
"Masix1",
"Masix2",
"MODE",
"Osd1",
"Osd2",
"Socket",
Expand Down
2 changes: 1 addition & 1 deletion ext4/_compat.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,4 +41,4 @@ def assert_cast(obj: Any, t: type[T], /) -> T:
return obj


__all__ = ["override", "ReadableStream", "PeekableStream", "assert_cast"]
__all__ = ["PeekableStream", "ReadableStream", "assert_cast", "override"]
4 changes: 2 additions & 2 deletions ext4/blockdescriptor.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ class BlockDescriptor(Ext4Struct):

_pack_ = 1
# _anonymous_ = ("bg_reserved",)
_fields_ = [
_fields_ = (
("bg_block_bitmap_lo", c_uint32),
("bg_inode_bitmap_lo", c_uint32),
("bg_inode_table_lo", c_uint32),
Expand All@@ -49,7 +49,7 @@ class BlockDescriptor(Ext4Struct):
("bg_block_bitmap_csum_hi", c_uint16),
("bg_inode_bitmap_csum_hi", c_uint16),
("bg_reserved", c_uint32),
]
)

def __init__(self, volume: "Volume", offset: int, bg_no: int) -> None:
super().__init__(volume, offset)
Expand Down
16 changes: 8 additions & 8 deletions ext4/directory.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -65,26 +65,26 @@ class DirectoryEntry(DirectoryEntryBase):
__slots__ = ()
_pack_ = 1
# _anonymous_ = ("l_i_reserved",)
_fields_ = [
_fields_ = (
("inode", c_uint32),
("rec_len", c_uint16),
("name_len", c_uint16),
("name", c_char * EXT4_NAME_LEN),
]
)


@final
class DirectoryEntry2(DirectoryEntryBase):
__slots__ = ()
_pack_ = 1
# _anonymous_ = ("l_i_reserved",)
_fields_ = [
_fields_ = (
("inode", c_uint32),
("rec_len", c_uint16),
("name_len", c_uint8),
("file_type", EXT4_FT.basetype),
("name", c_char * EXT4_NAME_LEN),
]
)

@DirectoryEntryBase.is_fake_entry.getter
def is_fake_entry(self) -> bool:
Expand All@@ -97,13 +97,13 @@ class DirectoryEntryTail(DirectoryEntryStruct):
__slots__ = ()
_pack_ = 1
# _anonymous_ = ("det_reserved_zero1", "det_reserved_zero2",)
_fields_ = [
_fields_ = (
("det_reserved_zero1", c_uint32),
("det_rec_len", c_uint16),
("det_reserved_zero2", c_uint8),
("det_reserved_ft", c_uint8), # EXT4_FT.DIR_CSUM
("det_checksum", c_uint32),
]
)

@Ext4Struct.magic.getter
def magic(self) -> int:
Expand All@@ -120,7 +120,7 @@ class DirectoryEntryHash(DirectoryEntryStruct):
__slots__ = ()
_pack_ = 1
# _anonymous_ = ("det_reserved_zero1", "det_reserved_zero2",)
_fields_ = [
_fields_ = (
("hash", c_uint32),
("minor_hash", c_uint32),
]
)
28 changes: 15 additions & 13 deletions ext4/enum.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
from typing import (
TYPE_CHECKING,
Any,
Self,
cast,
final,
)
Expand All@@ -17,8 +18,13 @@


def TypedEnumerationType(_type: type["SimpleCData"]): # noqa: ANN201
class EnumerationType(type(_type)): # type: ignore # pyright: ignore[reportGeneralTypeIssues, reportUntypedBaseClass] #noqa: ANN201
def __new__(cls, name: str, bases: tuple[type, ...], data: dict[str, Any]): # pyright: ignore[reportExplicitAny, reportUnknownParameterType] # noqa: ANN204
class EnumerationType(type(_type)): # type: ignore # pyright: ignore[reportGeneralTypeIssues, reportUntypedBaseClass]
def __new__(
cls,
name: str,
bases: tuple[type, ...],
data: dict[str, Any], # pyright: ignore[reportExplicitAny]
) -> Self:
_members_: dict[str, Any] # pyright: ignore[reportExplicitAny]
if "_members_" not in data:
_members_ = {}
Expand All@@ -32,11 +38,7 @@ def __new__(cls, name: str, bases: tuple[type, ...], data: dict[str, Any]): # p
_members_ = cast(dict[str, Any], data["_members_"]) # pyright: ignore[reportExplicitAny]

data["_reverse_map_"] = {v: k for k, v in _members_.items()} # pyright: ignore[reportAny]
cls = type(_type).__new__(cls, name, bases, data) # pyright: ignore[reportCallIssue, reportUnknownVariableType] # noqa: PLW0642
for key, value in cast(dict[str, Any], cls._members_).items(): # pyright: ignore[reportExplicitAny, reportAny]
globals()[key] = value

return cls # pyright: ignore[reportUnknownVariableType]
return type(_type).__new__(cls, name, bases, data) # pyright: ignore[reportCallIssue, reportUnknownVariableType]

@override
def __repr__(self) -> str:
Expand All@@ -46,8 +48,8 @@ def __repr__(self) -> str:


def TypedCEnumeration(_type: type["SimpleCData"]): # noqa: ANN201
class CEnumeration(_type, metaclass=TypedEnumerationType(_type)): # pyright: ignore[reportGeneralTypeIssues, reportUntypedBaseClass] # noqa: ANN201,PLW1641,PLW1641
_members_: dict[str, Any] = {} # pyright: ignore[reportExplicitAny]
class CEnumeration(_type, metaclass=TypedEnumerationType(_type)): # pyright: ignore[reportGeneralTypeIssues, reportUntypedBaseClass] # noqa: PLW1641
_members_: dict[str, Any] = {} # pyright: ignore[reportExplicitAny] # noqa: RUF012
basetype: type["SimpleCData"] = _type

@override
Expand All@@ -56,18 +58,18 @@ def __repr__(self) -> str:
return f"<{self.__class__.__name__}.{self._reverse_map_.get(value, '(unknown)')}: {value}>" # pyright: ignore[reportUnknownMemberType]

@override
def __eq__(self, other: Any) -> bool: # pyright: ignore[reportExplicitAny, reportAny]
def __eq__(self, other: object) -> bool:
if isinstance(other, int):
return self.value == other # pyright: ignore[reportUnknownMemberType, reportUnknownVariableType]

return isinstance(self, type(other)) and self.value == other.value # pyright: ignore[reportUnknownVariableType, reportAny, reportUnknownMemberType]
return isinstance(self, type(other)) and self.value == other.value # pyright: ignore[reportUnknownVariableType, reportUnknownMemberType, reportAttributeAccessIssue]

@override
def __ne__(self, other: Any) -> bool: # pyright: ignore[reportExplicitAny, reportAny]
def __ne__(self, other: object) -> bool:
if isinstance(other, int):
return self.value != other # pyright: ignore[reportUnknownMemberType, reportUnknownVariableType]

return isinstance(self, type(other)) and self.value != other.value # pyright: ignore[reportUnknownVariableType, reportAny, reportUnknownMemberType]
return isinstance(self, type(other)) and self.value != other.value # pyright: ignore[reportUnknownVariableType, reportUnknownMemberType, reportAttributeAccessIssue]

@override
def __and__(self, other: Any) -> int | bool: # pyright: ignore[reportExplicitAny, reportAny, reportGeneralTypeIssues]
Expand Down
18 changes: 8 additions & 10 deletions ext4/extent.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -89,13 +89,13 @@ class ExtentHeader(Ext4Struct):

_pack_ = 1
# _anonymous_ = ()
_fields_ = [
_fields_ = (
("eh_magic", c_uint16),
("eh_entries", c_uint16),
("eh_max", c_uint16),
("eh_depth", c_uint16),
("eh_generation", c_uint32),
]
)

def __init__(self, tree: "ExtentTree", offset: int) -> None:
self.tree: ExtentTree = tree
Expand All@@ -106,7 +106,7 @@ def __init__(self, tree: "ExtentTree", offset: int) -> None:

offset = self.offset + self.size
eh_entries = assert_cast(self.eh_entries, int) # pyright: ignore[reportAny]
for i in range(0, eh_entries):
for i in range(eh_entries):
if self.eh_depth == 0:
self.extents.append(Extent(self, offset, i))
offset += sizeof(Extent)
Expand DownExpand Up@@ -173,12 +173,12 @@ class ExtentIndex(Ext4Struct):

_pack_ = 1
# _anonymous_ = ("ei_unused",)
_fields_ = [
_fields_ = (
("ei_block", c_uint32),
("ei_leaf_lo", c_uint32),
("ei_leaf_hi", c_uint16),
("ei_unused", c_uint16),
]
)

def __init__(self, header: ExtentHeader, offset: int, ei_no: int) -> None:
self.ei_no: int = ei_no
Expand DownExpand Up@@ -210,12 +210,12 @@ class Extent(Ext4Struct):

_pack_ = 1
# _anonymous_ = ("ei_unused",)
_fields_ = [
_fields_ = (
("ee_block", c_uint32),
("ee_len", c_uint16),
("ee_start_hi", c_uint16),
("ee_start_lo", c_uint32),
]
)

def __init__(self, header: ExtentHeader, offset: int, ee_no: int) -> None:
super().__init__(header.inode.volume, offset)
Expand DownExpand Up@@ -258,9 +258,7 @@ class ExtentTail(Ext4Struct):
__slots__ = ("header",)

_pack_ = 1
_fields_ = [
("et_checksum", c_uint32),
]
_fields_ = (("et_checksum", c_uint32),)

def __init__(self, header: ExtentHeader, offset: int) -> None:
self.header: ExtentHeader = header
Expand Down
28 changes: 14 additions & 14 deletions ext4/htree.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -59,13 +59,13 @@ class DotDirectoryEntry2(LittleEndianStructureWithVolume):

_pack_ = 1
# _anonymous_ = ()
_fields_ = [
_fields_ = (
("inode", c_uint32),
("rec_len", c_uint16),
("name_len", c_uint8),
("file_type", c_uint8),
("name", c_char * 4), # b".\0\0\0" or b"..\0\0"
]
)

def verify(self) -> None:
name = assert_cast(self.name, bytes) # pyright: ignore[reportAny]
Expand All@@ -89,13 +89,13 @@ class DXRootInfo(LittleEndianStructure):
__slots__ = ()
_pack_ = 1
# _anonymous_ = ("reserved_zero")
_fields_ = [
_fields_ = (
("reserved_zero", c_uint32),
("hash_version", DX_HASH.basetype),
("info_length", c_uint8),
("indirect_levels", c_uint8),
("unused_flags", c_uint8),
]
)


class DXBase(Ext4Struct):
Expand DownExpand Up@@ -128,10 +128,10 @@ class DXEntry(DXBase):

_pack_ = 1
# _anonymous_ = ("")
_fields_ = [
_fields_ = (
("hash", c_uint32),
("block", c_uint32),
]
)

def __init__(self, parent: "DXEntriesBase", index: int) -> None:
self.index: int = index
Expand DownExpand Up@@ -321,15 +321,15 @@ def __init__(self, inode: "Directory") -> None:
super().__init__(inode, 0)

# _anonymous_ = ("")
_fields_ = [
_fields_ = (
("dot", DotDirectoryEntry2),
("dotdot", DotDirectoryEntry2),
("dx_root_info", DXRootInfo),
("limit", c_uint16),
("count", c_uint16),
("block", c_uint32),
# ("entries", DXEntry * self.count),
]
)

def compute_dx_hash(self, name: bytes, hash_version: int) -> tuple[int, int]:
seed = self.directory.volume.superblock.s_hash_seed # pyright: ignore[reportAny]
Expand DownExpand Up@@ -511,10 +511,10 @@ class DXFake(LittleEndianStructure):
__slots__ = ()
_pack_ = 1
# _anonymous_ = ("")
_fields_ = [
_fields_ = (
("inode", c_uint32), # 0
("rec_len", c_uint16),
]
)

@property
def expected_magic(self) -> int:
Expand All@@ -532,15 +532,15 @@ class DXNode(DXEntriesBase):

_pack_ = 1
# _anonymous_ = ("")
_fields_ = [
_fields_ = (
("fake", DXFake),
("name_len", c_uint8),
("file_type", c_uint8),
("limit", c_uint16),
("count", c_uint16),
("block", c_uint32),
# ("entries", DXEntry * self.count),
]
)

def __init__(self, directory: "Directory", offset: int) -> None:
super().__init__(directory, offset)
Expand All@@ -552,10 +552,10 @@ class DXTail(DXBase):

_pack_ = 1
# _anonymous_ = ("dt_reserved")
_fields_ = [
_fields_ = (
("dt_reserved", c_uint32),
("dt_checksum", c_uint16),
]
)

def __init__(self, parent: DXNode) -> None:
self.parent = parent
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions ext4/__init__.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,22 +83,7 @@
)

__all__ = [
"BlockDescriptor",
"BlockDevice",
"BlockIO",
"BlockIOBlocks",
"CharacterDevice",
"ChecksumError",
"Directory",
"DirectoryEntry",
"DirectoryEntry2",
"DirectoryEntryHash",
"DirectoryEntryTail",
"DotDirectoryEntry2",
"DX_HASH",
"DXEntry",
"DXRoot",
"DXRootInfo",
"EXT2_FLAGS",
"EXT4_BG",
"EXT4_CHKSUM",
Expand All@@ -119,6 +104,23 @@
"EXT4_NAME_LEN",
"EXT4_OS",
"EXT4_REV",
"FS_ENCRYPTION_MODE",
"MODE",
"BlockDescriptor",
"BlockDevice",
"BlockIO",
"BlockIOBlocks",
"CharacterDevice",
"ChecksumError",
"DXEntry",
"DXRoot",
"DXRootInfo",
"Directory",
"DirectoryEntry",
"DirectoryEntry2",
"DirectoryEntryHash",
"DirectoryEntryTail",
"DotDirectoryEntry2",
"ExtendedAttributeEntry",
"ExtendedAttributeError",
"ExtendedAttributeHeader",
Expand All@@ -130,7 +132,6 @@
"ExtentTail",
"Fifo",
"File",
"FS_ENCRYPTION_MODE",
"Hurd1",
"Hurd2",
"Inode",
Expand All@@ -141,7 +142,6 @@
"MagicError",
"Masix1",
"Masix2",
"MODE",
"Osd1",
"Osd2",
"Socket",
Expand Down
2 changes: 1 addition & 1 deletion ext4/_compat.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,4 +41,4 @@ def assert_cast(obj: Any, t: type[T], /) -> T:
return obj


__all__ = ["override", "ReadableStream", "PeekableStream", "assert_cast"]
__all__ = ["PeekableStream", "ReadableStream", "assert_cast", "override"]
4 changes: 2 additions & 2 deletions ext4/blockdescriptor.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ class BlockDescriptor(Ext4Struct):

_pack_ = 1
# _anonymous_ = ("bg_reserved",)
_fields_ = [
_fields_ = (
("bg_block_bitmap_lo", c_uint32),
("bg_inode_bitmap_lo", c_uint32),
("bg_inode_table_lo", c_uint32),
Expand All@@ -49,7 +49,7 @@ class BlockDescriptor(Ext4Struct):
("bg_block_bitmap_csum_hi", c_uint16),
("bg_inode_bitmap_csum_hi", c_uint16),
("bg_reserved", c_uint32),
]
)

def __init__(self, volume: "Volume", offset: int, bg_no: int) -> None:
super().__init__(volume, offset)
Expand Down
16 changes: 8 additions & 8 deletions ext4/directory.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -65,26 +65,26 @@ class DirectoryEntry(DirectoryEntryBase):
__slots__ = ()
_pack_ = 1
# _anonymous_ = ("l_i_reserved",)
_fields_ = [
_fields_ = (
("inode", c_uint32),
("rec_len", c_uint16),
("name_len", c_uint16),
("name", c_char * EXT4_NAME_LEN),
]
)


@final
class DirectoryEntry2(DirectoryEntryBase):
__slots__ = ()
_pack_ = 1
# _anonymous_ = ("l_i_reserved",)
_fields_ = [
_fields_ = (
("inode", c_uint32),
("rec_len", c_uint16),
("name_len", c_uint8),
("file_type", EXT4_FT.basetype),
("name", c_char * EXT4_NAME_LEN),
]
)

@DirectoryEntryBase.is_fake_entry.getter
def is_fake_entry(self) -> bool:
Expand All@@ -97,13 +97,13 @@ class DirectoryEntryTail(DirectoryEntryStruct):
__slots__ = ()
_pack_ = 1
# _anonymous_ = ("det_reserved_zero1", "det_reserved_zero2",)
_fields_ = [
_fields_ = (
("det_reserved_zero1", c_uint32),
("det_rec_len", c_uint16),
("det_reserved_zero2", c_uint8),
("det_reserved_ft", c_uint8), # EXT4_FT.DIR_CSUM
("det_checksum", c_uint32),
]
)

@Ext4Struct.magic.getter
def magic(self) -> int:
Expand All@@ -120,7 +120,7 @@ class DirectoryEntryHash(DirectoryEntryStruct):
__slots__ = ()
_pack_ = 1
# _anonymous_ = ("det_reserved_zero1", "det_reserved_zero2",)
_fields_ = [
_fields_ = (
("hash", c_uint32),
("minor_hash", c_uint32),
]
)
28 changes: 15 additions & 13 deletions ext4/enum.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
from typing import (
TYPE_CHECKING,
Any,
Self,
cast,
final,
)
Expand All@@ -17,8 +18,13 @@


def TypedEnumerationType(_type: type["SimpleCData"]): # noqa: ANN201
class EnumerationType(type(_type)): # type: ignore # pyright: ignore[reportGeneralTypeIssues, reportUntypedBaseClass] #noqa: ANN201
def __new__(cls, name: str, bases: tuple[type, ...], data: dict[str, Any]): # pyright: ignore[reportExplicitAny, reportUnknownParameterType] # noqa: ANN204
class EnumerationType(type(_type)): # type: ignore # pyright: ignore[reportGeneralTypeIssues, reportUntypedBaseClass]
def __new__(
cls,
name: str,
bases: tuple[type, ...],
data: dict[str, Any], # pyright: ignore[reportExplicitAny]
) -> Self:
_members_: dict[str, Any] # pyright: ignore[reportExplicitAny]
if "_members_" not in data:
_members_ = {}
Expand All@@ -32,11 +38,7 @@ def __new__(cls, name: str, bases: tuple[type, ...], data: dict[str, Any]): # p
_members_ = cast(dict[str, Any], data["_members_"]) # pyright: ignore[reportExplicitAny]

data["_reverse_map_"] = {v: k for k, v in _members_.items()} # pyright: ignore[reportAny]
cls = type(_type).__new__(cls, name, bases, data) # pyright: ignore[reportCallIssue, reportUnknownVariableType] # noqa: PLW0642
for key, value in cast(dict[str, Any], cls._members_).items(): # pyright: ignore[reportExplicitAny, reportAny]
globals()[key] = value

return cls # pyright: ignore[reportUnknownVariableType]
return type(_type).__new__(cls, name, bases, data) # pyright: ignore[reportCallIssue, reportUnknownVariableType]

@override
def __repr__(self) -> str:
Expand All@@ -46,8 +48,8 @@ def __repr__(self) -> str:


def TypedCEnumeration(_type: type["SimpleCData"]): # noqa: ANN201
class CEnumeration(_type, metaclass=TypedEnumerationType(_type)): # pyright: ignore[reportGeneralTypeIssues, reportUntypedBaseClass] # noqa: ANN201,PLW1641,PLW1641
_members_: dict[str, Any] = {} # pyright: ignore[reportExplicitAny]
class CEnumeration(_type, metaclass=TypedEnumerationType(_type)): # pyright: ignore[reportGeneralTypeIssues, reportUntypedBaseClass] # noqa: PLW1641
_members_: dict[str, Any] = {} # pyright: ignore[reportExplicitAny] # noqa: RUF012
basetype: type["SimpleCData"] = _type

@override
Expand All@@ -56,18 +58,18 @@ def __repr__(self) -> str:
return f"<{self.__class__.__name__}.{self._reverse_map_.get(value, '(unknown)')}: {value}>" # pyright: ignore[reportUnknownMemberType]

@override
def __eq__(self, other: Any) -> bool: # pyright: ignore[reportExplicitAny, reportAny]
def __eq__(self, other: object) -> bool:
if isinstance(other, int):
return self.value == other # pyright: ignore[reportUnknownMemberType, reportUnknownVariableType]

return isinstance(self, type(other)) and self.value == other.value # pyright: ignore[reportUnknownVariableType, reportAny, reportUnknownMemberType]
return isinstance(self, type(other)) and self.value == other.value # pyright: ignore[reportUnknownVariableType, reportUnknownMemberType, reportAttributeAccessIssue]

@override
def __ne__(self, other: Any) -> bool: # pyright: ignore[reportExplicitAny, reportAny]
def __ne__(self, other: object) -> bool:
if isinstance(other, int):
return self.value != other # pyright: ignore[reportUnknownMemberType, reportUnknownVariableType]

return isinstance(self, type(other)) and self.value != other.value # pyright: ignore[reportUnknownVariableType, reportAny, reportUnknownMemberType]
return isinstance(self, type(other)) and self.value != other.value # pyright: ignore[reportUnknownVariableType, reportUnknownMemberType, reportAttributeAccessIssue]

@override
def __and__(self, other: Any) -> int | bool: # pyright: ignore[reportExplicitAny, reportAny, reportGeneralTypeIssues]
Expand Down
18 changes: 8 additions & 10 deletions ext4/extent.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -89,13 +89,13 @@ class ExtentHeader(Ext4Struct):

_pack_ = 1
# _anonymous_ = ()
_fields_ = [
_fields_ = (
("eh_magic", c_uint16),
("eh_entries", c_uint16),
("eh_max", c_uint16),
("eh_depth", c_uint16),
("eh_generation", c_uint32),
]
)

def __init__(self, tree: "ExtentTree", offset: int) -> None:
self.tree: ExtentTree = tree
Expand All@@ -106,7 +106,7 @@ def __init__(self, tree: "ExtentTree", offset: int) -> None:

offset = self.offset + self.size
eh_entries = assert_cast(self.eh_entries, int) # pyright: ignore[reportAny]
for i in range(0, eh_entries):
for i in range(eh_entries):
if self.eh_depth == 0:
self.extents.append(Extent(self, offset, i))
offset += sizeof(Extent)
Expand DownExpand Up@@ -173,12 +173,12 @@ class ExtentIndex(Ext4Struct):

_pack_ = 1
# _anonymous_ = ("ei_unused",)
_fields_ = [
_fields_ = (
("ei_block", c_uint32),
("ei_leaf_lo", c_uint32),
("ei_leaf_hi", c_uint16),
("ei_unused", c_uint16),
]
)

def __init__(self, header: ExtentHeader, offset: int, ei_no: int) -> None:
self.ei_no: int = ei_no
Expand DownExpand Up@@ -210,12 +210,12 @@ class Extent(Ext4Struct):

_pack_ = 1
# _anonymous_ = ("ei_unused",)
_fields_ = [
_fields_ = (
("ee_block", c_uint32),
("ee_len", c_uint16),
("ee_start_hi", c_uint16),
("ee_start_lo", c_uint32),
]
)

def __init__(self, header: ExtentHeader, offset: int, ee_no: int) -> None:
super().__init__(header.inode.volume, offset)
Expand DownExpand Up@@ -258,9 +258,7 @@ class ExtentTail(Ext4Struct):
__slots__ = ("header",)

_pack_ = 1
_fields_ = [
("et_checksum", c_uint32),
]
_fields_ = (("et_checksum", c_uint32),)

def __init__(self, header: ExtentHeader, offset: int) -> None:
self.header: ExtentHeader = header
Expand Down
28 changes: 14 additions & 14 deletions ext4/htree.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -59,13 +59,13 @@ class DotDirectoryEntry2(LittleEndianStructureWithVolume):

_pack_ = 1
# _anonymous_ = ()
_fields_ = [
_fields_ = (
("inode", c_uint32),
("rec_len", c_uint16),
("name_len", c_uint8),
("file_type", c_uint8),
("name", c_char * 4), # b".\0\0\0" or b"..\0\0"
]
)

def verify(self) -> None:
name = assert_cast(self.name, bytes) # pyright: ignore[reportAny]
Expand All@@ -89,13 +89,13 @@ class DXRootInfo(LittleEndianStructure):
__slots__ = ()
_pack_ = 1
# _anonymous_ = ("reserved_zero")
_fields_ = [
_fields_ = (
("reserved_zero", c_uint32),
("hash_version", DX_HASH.basetype),
("info_length", c_uint8),
("indirect_levels", c_uint8),
("unused_flags", c_uint8),
]
)


class DXBase(Ext4Struct):
Expand DownExpand Up@@ -128,10 +128,10 @@ class DXEntry(DXBase):

_pack_ = 1
# _anonymous_ = ("")
_fields_ = [
_fields_ = (
("hash", c_uint32),
("block", c_uint32),
]
)

def __init__(self, parent: "DXEntriesBase", index: int) -> None:
self.index: int = index
Expand DownExpand Up@@ -321,15 +321,15 @@ def __init__(self, inode: "Directory") -> None:
super().__init__(inode, 0)

# _anonymous_ = ("")
_fields_ = [
_fields_ = (
("dot", DotDirectoryEntry2),
("dotdot", DotDirectoryEntry2),
("dx_root_info", DXRootInfo),
("limit", c_uint16),
("count", c_uint16),
("block", c_uint32),
# ("entries", DXEntry * self.count),
]
)

def compute_dx_hash(self, name: bytes, hash_version: int) -> tuple[int, int]:
seed = self.directory.volume.superblock.s_hash_seed # pyright: ignore[reportAny]
Expand DownExpand Up@@ -511,10 +511,10 @@ class DXFake(LittleEndianStructure):
__slots__ = ()
_pack_ = 1
# _anonymous_ = ("")
_fields_ = [
_fields_ = (
("inode", c_uint32), # 0
("rec_len", c_uint16),
]
)

@property
def expected_magic(self) -> int:
Expand All@@ -532,15 +532,15 @@ class DXNode(DXEntriesBase):

_pack_ = 1
# _anonymous_ = ("")
_fields_ = [
_fields_ = (
("fake", DXFake),
("name_len", c_uint8),
("file_type", c_uint8),
("limit", c_uint16),
("count", c_uint16),
("block", c_uint32),
# ("entries", DXEntry * self.count),
]
)

def __init__(self, directory: "Directory", offset: int) -> None:
super().__init__(directory, offset)
Expand All@@ -552,10 +552,10 @@ class DXTail(DXBase):

_pack_ = 1
# _anonymous_ = ("dt_reserved")
_fields_ = [
_fields_ = (
("dt_reserved", c_uint32),
("dt_checksum", c_uint16),
]
)

def __init__(self, parent: DXNode) -> None:
self.parent = parent
Expand Down
Loading