dissect.apfs 1.1__tar.gz → 1.1.dev2__tar.gz

{dissect_apfs-1.1/dissect.apfs.egg-info → dissect_apfs-1.1.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dissect.apfs
-Version: 1.1
+Version: 1.1.dev2
 Summary: A Dissect module implementing a parser for the APFS file system, a commonly used Apple file system
 Author-email: Dissect Team <dissect@fox-it.com>
 License-Expression: AGPL-3.0-or-later

{dissect_apfs-1.1 → dissect_apfs-1.1.dev2}/dissect/apfs/objects/fs.py

@@ -792,27 +792,27 @@ class DirectoryEntry:
     @cached_property
     def type(self) -> int:
         """The file type of this directory entry."""
-        return (self.value.flags & c_apfs.DREC_TYPE_MASK) << 12
+        return self.value.flags & c_apfs.DREC_TYPE_MASK << 12
 
     def is_dir(self) -> bool:
         """Return whether this directory entry is a directory."""
-        return stat.S_ISDIR(self.type)
+        return stat.S_ISDIR(self.type << 12)
 
     def is_file(self) -> bool:
         """Return whether this directory entry is a regular file."""
-        return stat.S_ISREG(self.type)
+        return stat.S_ISREG(self.type << 12)
 
     def is_symlink(self) -> bool:
         """Return whether this directory entry is a symbolic link."""
-        return stat.S_ISLNK(self.type)
+        return stat.S_ISLNK(self.type << 12)
 
     def is_block_device(self) -> bool:
         """Return whether this directory entry is a block device."""
-        return stat.S_ISBLK(self.type)
+        return stat.S_ISBLK(self.type << 12)
 
     def is_character_device(self) -> bool:
         """Return whether this directory entry is a character device."""
-        return stat.S_ISCHR(self.type)
+        return stat.S_ISCHR(self.type << 12)
 
     def is_device(self) -> bool:
         """Return whether this directory entry is a device (block or character)."""
@@ -820,15 +820,15 @@ class DirectoryEntry:
 
     def is_fifo(self) -> bool:
         """Return whether this directory entry is a FIFO."""
-        return stat.S_ISFIFO(self.type)
+        return stat.S_ISFIFO(self.type << 12)
 
     def is_socket(self) -> bool:
         """Return whether this directory entry is a socket."""
-        return stat.S_ISSOCK(self.type)
+        return stat.S_ISSOCK(self.type << 12)
 
     def is_whiteout(self) -> bool:
         """Return whether this directory entry is a whiteout."""
-        return stat.S_ISWHT(self.type)
+        return stat.S_ISWHT(self.type << 12)
 
 
 class XAttr:

{dissect_apfs-1.1 → dissect_apfs-1.1.dev2/dissect.apfs.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dissect.apfs
-Version: 1.1
+Version: 1.1.dev2
 Summary: A Dissect module implementing a parser for the APFS file system, a commonly used Apple file system
 Author-email: Dissect Team <dissect@fox-it.com>
 License-Expression: AGPL-3.0-or-later

{dissect_apfs-1.1 → dissect_apfs-1.1.dev2}/pyproject.toml

@@ -122,3 +122,4 @@ known-third-party = ["dissect"]
 include = ["dissect.*"]
 
 [tool.setuptools_scm]
+local_scheme = "no-local-version"

{dissect_apfs-1.1 → dissect_apfs-1.1.dev2}/tests/test_apfs.py

@@ -36,11 +36,6 @@ def _assert_apfs_content(volume: FS, beta: bool) -> None:
         ]
     )
 
-    # Test direntry parsing
-    assert node.listdir()["dir"].is_dir()
-    assert node.listdir()["hardlink"].is_file()
-    assert node.listdir()["symlink-dir"].is_symlink()
-
     # Empty file
     node = volume.get("empty")
     assert node.name == "empty"
@@ -245,9 +240,6 @@ def _assert_apfs_content(volume: FS, beta: bool) -> None:
 
     if ".HFS+ Private Directory Data\r" not in volume.get("/").listdir() and not beta:
         # Special files
-        dirents = volume.get("dir").listdir()
-        assert dirents["blockdev"].is_block_device()
-
         node = volume.get("dir/blockdev")
         assert node.name == "blockdev"
         assert node.is_block_device()
@@ -271,8 +263,6 @@ def _assert_apfs_content(volume: FS, beta: bool) -> None:
             "chardev-svr4",
             "chardev-ultrix",
         ]:
-            assert dirents[name].is_character_device()
-
             node = volume.get(f"dir/{name}")
             assert node.name == name
             assert node.is_character_device()