Added APFS number of links support (log2timeline#669)

joachimmetz · Aug 7, 2022 · 73b1d8e · 73b1d8e
1 parent dd05c84
commit 73b1d8e
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 8 deletions.
diff --git a/config/dpkg/control b/config/dpkg/control
@@ -9,7 +9,7 @@ Homepage: https://github.com/log2timeline/dfvfs
 
 Package: python3-dfvfs
 Architecture: all
-Depends: libbde-python3 (>= 20220121), libewf-python3 (>= 20131210), libfsapfs-python3 (>= 20220501), libfsext-python3 (>= 20220112), libfshfs-python3 (>= 20220427), libfsntfs-python3 (>= 20211229), libfsxfs-python3 (>= 20220113), libfvde-python3 (>= 20220121), libfwnt-python3 (>= 20210717), libluksde-python3 (>= 20220121), libmodi-python3 (>= 20210405), libphdi-python3 (>= 20220228), libqcow-python3 (>= 20201213), libsigscan-python3 (>= 20191221), libsmdev-python3 (>= 20140529), libsmraw-python3 (>= 20140612), libvhdi-python3 (>= 20201014), libvmdk-python3 (>= 20140421), libvsgpt-python3 (>= 20211115), libvshadow-python3 (>= 20160109), libvslvm-python3 (>= 20160109), python3-cffi-backend (>= 1.9.1), python3-cryptography (>= 2.0.2), python3-dfdatetime (>= 20211113), python3-dtfabric (>= 20220219), python3-idna (>= 2.5), python3-pytsk3 (>= 20210419), python3-pyxattr (>= 0.7.2), python3-yaml (>= 3.10), ${misc:Depends}
+Depends: libbde-python3 (>= 20220121), libewf-python3 (>= 20131210), libfsapfs-python3 (>= 20220709), libfsext-python3 (>= 20220112), libfshfs-python3 (>= 20220427), libfsntfs-python3 (>= 20211229), libfsxfs-python3 (>= 20220113), libfvde-python3 (>= 20220121), libfwnt-python3 (>= 20210717), libluksde-python3 (>= 20220121), libmodi-python3 (>= 20210405), libphdi-python3 (>= 20220228), libqcow-python3 (>= 20201213), libsigscan-python3 (>= 20191221), libsmdev-python3 (>= 20140529), libsmraw-python3 (>= 20140612), libvhdi-python3 (>= 20201014), libvmdk-python3 (>= 20140421), libvsgpt-python3 (>= 20211115), libvshadow-python3 (>= 20160109), libvslvm-python3 (>= 20160109), python3-cffi-backend (>= 1.9.1), python3-cryptography (>= 2.0.2), python3-dfdatetime (>= 20211113), python3-dtfabric (>= 20220219), python3-idna (>= 2.5), python3-pytsk3 (>= 20210419), python3-pyxattr (>= 0.7.2), python3-yaml (>= 3.10), ${misc:Depends}
 Description: Python 3 module of dfVFS
  dfVFS, or Digital Forensics Virtual File System, provides read-only access to
  file-system objects from various storage media types and file formats. The goal

diff --git a/dependencies.ini b/dependencies.ini
@@ -50,7 +50,7 @@ version_property: get_version()
 [pyfsapfs]
 dpkg_name: libfsapfs-python3
 l2tbinaries_name: libfsapfs
-minimum_version: 20220501
+minimum_version: 20220709
 pypi_name: libfsapfs-python
 rpm_name: libfsapfs-python3
 version_property: get_version()

diff --git a/dfvfs/vfs/apfs_file_entry.py b/dfvfs/vfs/apfs_file_entry.py
@@ -113,8 +113,7 @@ def _GetStatAttribute(self):
     stat_attribute.group_identifier = self._fsapfs_file_entry.group_identifier
     stat_attribute.inode_number = self._fsapfs_file_entry.identifier
     stat_attribute.mode = self._fsapfs_file_entry.file_mode
-    # TODO: implement number of hard links support in pyfsapfs
-    # stat_attribute.number_of_links = self._fsapfs_file_entry.number_of_links
+    stat_attribute.number_of_links = self._fsapfs_file_entry.number_of_links
     stat_attribute.owner_identifier = self._fsapfs_file_entry.owner_identifier
     stat_attribute.size = self._fsapfs_file_entry.size
     stat_attribute.type = self.entry_type

diff --git a/requirements.txt b/requirements.txt
@@ -6,7 +6,7 @@ dfdatetime >= 20211113
 dtfabric >= 20220219
 libbde-python >= 20220121
 libewf-python >= 20131210
-libfsapfs-python >= 20220501
+libfsapfs-python >= 20220709
 libfsext-python >= 20220112
 libfshfs-python >= 20220427
 libfsntfs-python >= 20211229

diff --git a/setup.cfg b/setup.cfg
@@ -19,7 +19,7 @@ doc_files = ACKNOWLEDGEMENTS
 build_requires = python3-setuptools
 requires = libbde-python3 >= 20220121
            libewf-python3 >= 20131210
-           libfsapfs-python3 >= 20220501
+           libfsapfs-python3 >= 20220709
            libfsext-python3 >= 20220112
            libfshfs-python3 >= 20220427
            libfsntfs-python3 >= 20211229

diff --git a/tests/vfs/apfs_file_entry.py b/tests/vfs/apfs_file_entry.py
@@ -184,8 +184,7 @@ def testGetStatAttribute(self):
     self.assertEqual(stat_attribute.group_identifier, 99)
     self.assertEqual(stat_attribute.inode_number, 19)
     self.assertEqual(stat_attribute.mode, 0o100644)
-    # TODO: implement number of hard links support in pyfshfs
-    # self.assertEqual(stat_attribute.number_of_links, 1)
+    self.assertEqual(stat_attribute.number_of_links, 1)
     self.assertEqual(stat_attribute.owner_identifier, 99)
     self.assertEqual(stat_attribute.size, 22)
     self.assertEqual(stat_attribute.type, stat_attribute.TYPE_FILE)