dissect.ntfs 3.10.dev5__tar.gz → 3.11.dev2__tar.gz

{dissect.ntfs-3.10.dev5/dissect.ntfs.egg-info → dissect_ntfs-3.11.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dissect.ntfs
-Version: 3.10.dev5
+Version: 3.11.dev2
 Summary: A Dissect module implementing a parser for the NTFS file system, used by the Windows operating system
 Author-email: Dissect Team <dissect@fox-it.com>
 License: Affero General Public License v3
@@ -22,8 +22,11 @@ Requires-Python: ~=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 License-File: COPYRIGHT
-Requires-Dist: dissect.cstruct<4.0.dev,>=3.0.dev
-Requires-Dist: dissect.util<4.0.dev,>=3.0.dev
+Requires-Dist: dissect.cstruct<5,>=4.dev
+Requires-Dist: dissect.util<4,>=3
+Provides-Extra: dev
+Requires-Dist: dissect.cstruct<5.0.dev,>=4.0.dev; extra == "dev"
+Requires-Dist: dissect.util<4.0.dev,>=3.0.dev; extra == "dev"
 
 # dissect.ntfs
 

{dissect.ntfs-3.10.dev5 → dissect_ntfs-3.11.dev2}/dissect/ntfs/c_ntfs.py

@@ -1,6 +1,6 @@
 import struct
 
-from dissect import cstruct
+from dissect.cstruct import cstruct
 
 ntfs_def = """
 /* ================ Generic stuff ================ */
@@ -552,8 +552,7 @@ typedef struct {
 } USN_RECORD_V4;
 """
 
-c_ntfs = cstruct.cstruct()
-c_ntfs.load(ntfs_def)
+c_ntfs = cstruct().load(ntfs_def)
 
 # Useful enums and flags
 ATTRIBUTE_TYPE_CODE = c_ntfs.ATTRIBUTE_TYPE_CODE
@@ -614,7 +613,7 @@ INDEX_ENTRY_NODE = 0x01
 INDEX_ENTRY_END = 0x02
 
 
-def segment_reference(reference: cstruct.Instance) -> int:
+def segment_reference(reference: c_ntfs._MFT_SEGMENT_REFERENCE) -> int:
     """Helper to calculate the complete segment number from a cstruct MFT segment reference.
 
     Args:

{dissect.ntfs-3.10.dev5 → dissect_ntfs-3.11.dev2}/dissect/ntfs/mft.py

@@ -6,8 +6,6 @@ from io import BytesIO
 from operator import itemgetter
 from typing import TYPE_CHECKING, Any, BinaryIO, Iterator, Optional, Union
 
-from dissect.cstruct import Instance
-
 from dissect.ntfs.attr import Attribute, AttributeHeader
 from dissect.ntfs.c_ntfs import (
     ATTRIBUTE_TYPE_CODE,
@@ -91,11 +89,11 @@ class Mft:
 
         return node
 
-    def get(self, ref: Union[int, str, Instance], root: Optional[MftRecord] = None) -> MftRecord:
+    def get(self, ref: Union[int, str, c_ntfs._MFT_SEGMENT_REFERENCE], root: Optional[MftRecord] = None) -> MftRecord:
         """Retrieve an MFT record using a variety of methods.
 
         Supported references are:
-            - ``_MFT_SEGMENT_REFERENCE`` cstruct instance
+            - ``_MFT_SEGMENT_REFERENCE`` cstruct structure
             - integer segment number
             - string file path
 
@@ -106,7 +104,7 @@ class Mft:
         Raises:
             TypeError: If the reference is of an unsupported type.
         """
-        if isinstance(ref, Instance) and ref._type == c_ntfs._MFT_SEGMENT_REFERENCE:
+        if isinstance(ref, c_ntfs._MFT_SEGMENT_REFERENCE):
             ref = segment_reference(ref)
 
         if isinstance(ref, int):
@@ -153,7 +151,7 @@ class MftRecord:
         self.segment: Optional[int] = None
         self.offset: Optional[int] = None
         self.data: Optional[bytes] = None
-        self.header: Optional[Instance] = None
+        self.header: Optional[c_ntfs._FILE_RECORD_SEGMENT_HEADER] = None
 
     def __repr__(self) -> str:
         return f"<MftRecord {self.segment}#{self.header.SequenceNumber}>"

{dissect.ntfs-3.10.dev5 → dissect_ntfs-3.11.dev2}/dissect/ntfs/secure.py

@@ -4,7 +4,6 @@ import io
 from typing import BinaryIO, Iterator
 from uuid import UUID
 
-from dissect.cstruct import Instance
 from dissect.util.sid import read_sid
 
 from dissect.ntfs.c_ntfs import ACE_OBJECT_FLAGS, ACE_TYPE, c_ntfs
@@ -39,7 +38,7 @@ class Secure:
         if not hasattr(self.sds, "size"):
             self.sds.size = self.sds.seek(0, io.SEEK_END)
 
-    def _iter_entries(self, offset: int = 0) -> Iterator[Instance]:
+    def _iter_entries(self, offset: int = 0) -> Iterator[c_ntfs._SECURITY_DESCRIPTOR_HEADER]:
         """Iterate over all SDS entries, optionally starting from a specific offset.
 
         Args:

{dissect.ntfs-3.10.dev5 → dissect_ntfs-3.11.dev2}/dissect/ntfs/util.py

@@ -4,7 +4,7 @@ import struct
 from collections import UserDict
 from typing import TYPE_CHECKING, Any, BinaryIO, Optional, Union
 
-from dissect.cstruct import EnumInstance, Instance
+from dissect.cstruct import Enum
 from dissect.util.stream import RunlistStream
 
 from dissect.ntfs.c_ntfs import (
@@ -13,6 +13,7 @@ from dissect.ntfs.c_ntfs import (
     FILE_NUMBER_ROOT,
     SECTOR_SHIFT,
     SECTOR_SIZE,
+    c_ntfs,
     segment_reference,
 )
 from dissect.ntfs.exceptions import FilenameNotAvailableError, VolumeNotAvailableError
@@ -38,18 +39,18 @@ class AttributeMap(UserDict):
     """  # noqa: E501
 
     def __getattr__(self, attr: str) -> AttributeCollection:
-        if attr in ATTRIBUTE_TYPE_CODE:
+        if attr in ATTRIBUTE_TYPE_CODE.__members__:
             return self[ATTRIBUTE_TYPE_CODE[attr]]
 
         return super().__getattribute__(attr)
 
     def __getitem__(self, item: Union[ATTRIBUTE_TYPE_CODE, int]) -> AttributeCollection:
-        if isinstance(item, EnumInstance):
+        if isinstance(item, Enum):
             item = item.value
         return self.data.get(item, AttributeCollection())
 
     def __contains__(self, key: Union[ATTRIBUTE_TYPE_CODE, int]) -> bool:
-        if isinstance(key, EnumInstance):
+        if isinstance(key, Enum):
             key = key.value
         return super().__contains__(key)
 
@@ -234,7 +235,7 @@ def ensure_volume(ntfs: NTFS) -> None:
         raise VolumeNotAvailableError()
 
 
-def get_full_path(mft: Mft, name: str, parent: Instance, seen: set[str] = None) -> str:
+def get_full_path(mft: Mft, name: str, parent: c_ntfs._MFT_SEGMENT_REFERENCE, seen: set[str] = None) -> str:
     """Walk up parent file references to construct a full path.
 
     Args:

{dissect.ntfs-3.10.dev5 → dissect_ntfs-3.11.dev2/dissect.ntfs.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dissect.ntfs
-Version: 3.10.dev5
+Version: 3.11.dev2
 Summary: A Dissect module implementing a parser for the NTFS file system, used by the Windows operating system
 Author-email: Dissect Team <dissect@fox-it.com>
 License: Affero General Public License v3
@@ -22,8 +22,11 @@ Requires-Python: ~=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 License-File: COPYRIGHT
-Requires-Dist: dissect.cstruct<4.0.dev,>=3.0.dev
-Requires-Dist: dissect.util<4.0.dev,>=3.0.dev
+Requires-Dist: dissect.cstruct<5,>=4.dev
+Requires-Dist: dissect.util<4,>=3
+Provides-Extra: dev
+Requires-Dist: dissect.cstruct<5.0.dev,>=4.0.dev; extra == "dev"
+Requires-Dist: dissect.util<4.0.dev,>=3.0.dev; extra == "dev"
 
 # dissect.ntfs
 

dissect_ntfs-3.11.dev2/dissect.ntfs.egg-info/requires.txt

@@ -0,0 +1,6 @@
+dissect.cstruct<5,>=4.dev
+dissect.util<4,>=3
+
+[dev]
+dissect.cstruct<5.0.dev,>=4.0.dev
+dissect.util<4.0.dev,>=3.0.dev

{dissect.ntfs-3.10.dev5 → dissect_ntfs-3.11.dev2}/pyproject.toml

@@ -25,8 +25,8 @@ classifiers = [
   "Topic :: Utilities",
 ]
 dependencies = [
-    "dissect.cstruct>=3.0.dev,<4.0.dev",
-    "dissect.util>=3.0.dev,<4.0.dev",
+    "dissect.cstruct>=4.dev,<5",
+    "dissect.util>=3,<4",
 ]
 dynamic = ["version"]
 
@@ -35,6 +35,12 @@ homepage = "https://dissect.tools"
 documentation = "https://docs.dissect.tools/en/latest/projects/dissect.ntfs"
 repository = "https://github.com/fox-it/dissect.ntfs"
 
+[project.optional-dependencies]
+dev = [
+    "dissect.cstruct>=4.0.dev,<5.0.dev",
+    "dissect.util>=3.0.dev,<4.0.dev",
+]
+
 [tool.black]
 line-length = 120
 

{dissect.ntfs-3.10.dev5 → dissect_ntfs-3.11.dev2}/tox.ini

@@ -5,12 +5,14 @@ envlist = lint, py3, pypy3
 # locally installed tox to have a minimum version 3.3.0. This means the names
 # of the configuration options are still according to the tox 3.x syntax.
 minversion = 4.4.3
-# This version of virtualenv will install setuptools version 65.5.0 and pip
-# 22.3. These versions fully support python projects defined only through a
-# pyproject.toml file (PEP-517/PEP-518/PEP-621)
-requires = virtualenv>=20.16.6
+# This version of virtualenv will install setuptools version 68.2.2 and pip
+# 23.3.1. These versions fully support python projects defined only through a
+# pyproject.toml file (PEP-517/PEP-518/PEP-621). This pip version also support
+# the proper version resolving with (sub-)dependencies defining dev extra's.
+requires = virtualenv>=20.24.6
 
 [testenv]
+extras = dev
 deps =
     pytest
     pytest-cov

dissect.ntfs-3.10.dev5/dissect.ntfs.egg-info/requires.txt

@@ -1,2 +0,0 @@
-dissect.cstruct<4.0.dev,>=3.0.dev
-dissect.util<4.0.dev,>=3.0.dev