fix symlinks not being handled correctly

Signed-off-by: Zen <[email protected]>

Author: desultory

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pycpio"
-version = "0.9.0"
+version = "0.9.1"
 authors = [
   { name="Desultory", email="[email protected]" },
 ]
@@ -16,7 +16,7 @@ classifiers = [
     "License :: OSI Approved :: GNU General Public License v2 (GPLv2)",
     "Operating System :: OS Independent",
 ]
-dependencies = ["zenlib >= 1.7.1"]
+dependencies = ["zenlib >= 1.7.3"]
 
 [project.scripts]
 pycpio = "pycpio.main:main"

src/pycpio/cpio/data.py

@@ -21,7 +21,7 @@ def from_dir(path: Path, parent=None, relative=None, *args, **kwargs):
         """
         Returns a list of CPIOData objects from a directory
 
-        If the path is a symlink, it will be resolved and the resolved path will be used.
+        Resolves the path and checks if it is a directory.
 
         If relative is set, the name will be relative to that path.
         The path will be unaltered, since it is used for header stats and data.
@@ -54,7 +54,7 @@ def from_dir(path: Path, parent=None, relative=None, *args, **kwargs):
             else:
                 kwargs['name'] = str(child_path)
 
-            if child.is_dir():
+            if child.is_dir() and not child.is_symlink():
                 data.extend(CPIOData.from_dir(path=child_path, parent=parent, relative=relative, *args, **kwargs))
             else:
                 data.append(CPIOData.from_path(path=child_path, relative=relative, *args, **kwargs))

src/pycpio/masks/modes.py

@@ -39,10 +39,10 @@ def mode_bytes_from_path(file_path: Path) -> CPIOModes:
     """
     Gets the mode type bytes from the given path.
     """
-    if file_path.is_dir():
-        return CPIOModes.Dir.value
-    elif file_path.is_symlink():
+    if file_path.is_symlink():
         return CPIOModes.Symlink.value
+    elif file_path.is_dir():
+        return CPIOModes.Dir.value
     elif file_path.is_block_device():
         return CPIOModes.BlkDev.value
     elif file_path.is_char_device():