fix reading of dirs, let dir path ovveride be set with name

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

Author: desultory

src/pycpio/cpio/chardev.py

@@ -21,3 +21,7 @@ def __init__(self, *args, **kwargs):
         if int(self.header.mode, 16) & 0o777 == 0:
             self.logger.debug("Setting mode to 644")
             self.header.mode = (int(self.header.mode, 16) & 0o7777000) | (0o644)
+
+    def __bytes__(self):
+        """ Just return the header """
+        return bytes(self.header)

src/pycpio/cpio/data.py

@@ -23,10 +23,20 @@ def from_dir(path: Path, parent=None, relative=None, *args, **kwargs):
         if not path.is_dir():
             raise ValueError("Path is not a directory: %s" % path)
 
-        if relative:
+        if relative is True:
+            relative = path
+        elif relative:
             relative = Path(relative).resolve()
 
+        if relative:
+            kwargs['name'] = str(path.relative_to(relative))
+        else:
+            kwargs['name'] = str(path)
+
         data = []
+        data.append(CPIOData.from_path(path=path, relative=relative, *args, **kwargs))
+        if logger := kwargs.get('logger'):
+            logger.warning(data[0])
         for child in path.iterdir():
             if parent:
                 child_path = parent / child
@@ -42,7 +52,6 @@ def from_dir(path: Path, parent=None, relative=None, *args, **kwargs):
                 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))
-
         return data
 
     @staticmethod
@@ -55,10 +64,19 @@ def from_path(path: Path, relative: None, *args, **kwargs):
         """
         from pycpio.header import CPIOHeader
 
-        path = Path(path).resolve()
+        path = Path(path)
         if logger := kwargs.get('logger'):
             logger.debug(f"Creating CPIO entry from path: {path}")
 
+        relative = Path(relative).resolve() if relative else None
+        if logger := kwargs.get('logger'):
+            logger.debug("Creating CPIO entry relative to path: %s", relative)
+
+        if not path.is_symlink():
+            path = path.resolve()
+            if not path.exists():
+                raise ValueError("Path does not exist: %s" % path)
+
         kwargs['path'] = path
         if name := kwargs.pop('name', None):
             kwargs['name'] = name
@@ -70,11 +88,13 @@ def from_path(path: Path, relative: None, *args, **kwargs):
 
         kwargs['mode'] = mode_bytes_from_path(path)
 
+        data = b''
+
         header = CPIOHeader(*args, **kwargs)
-        data = CPIOData.get_subtype(b'', header, *args, **kwargs)
+        data = CPIOData.get_subtype(data, header, *args, **kwargs)
 
         if logger := kwargs.get('logger'):
-            logger.info(f"Created CPIO entry from path: {data}")
+            logger.debug(f"Created CPIO entry from path: {data}")
 
         return data
 

src/pycpio/cpio/dir.py

@@ -17,3 +17,6 @@ def __init__(self, *args, **kwargs):
             self.header.mtime = path.resolve().stat().st_mtime
             if path.is_absolute():
                 self.header.name = str(path.relative_to(path.anchor))
+
+        if name := kwargs.pop('name', None):
+            self.header.name = name

src/pycpio/cpio/symlink.py

@@ -18,7 +18,7 @@ def __setattr__(self, key, value):
             else:
                 raise ValueError("data must be a string or bytes")
 
-            if value[-1] != b'\0':
+            if value and value[-1] != b'\0':
                 value += b'\0'
             self.header.filesize = format(len(value), '08x').encode('ascii')
 
@@ -28,6 +28,9 @@ def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         if path := kwargs.pop('path', None):
             self.data = str(path.readlink()).encode('ascii')
+            self.header.mtime = path.stat().st_mtime
+        elif self.data is None:
+            raise ValueError("path must be specified for symlinks")
 
         self.header.mode = 0o120777  # symlink mode
 

src/pycpio/header/cpioheader.py

@@ -18,7 +18,7 @@ def __init__(self, header_data=b'', overrides={}, *args, **kwargs):
             self.logger.debug("Creating CPIOEntry from header data: %s", header_data)
             self.from_bytes(header_data)
         elif kwargs.get('name'):
-            self.logger.info("Creating CPIO Header with name: %s", kwargs['name'])
+            self.logger.debug("Creating CPIO Header with name: %s", kwargs['name'])
             self.from_args(*args, **kwargs)
         else:
             raise NotImplementedError("CPIOEntry must be initialized with header data or a name")

src/pycpio/main.py

@@ -29,8 +29,8 @@ def main():
     parser.add_argument('-s', '--symlink', action='store', help='create symlink')
     parser.add_argument('-c', '--chardev', action='store', help='create character device')
 
-    parser.add_argument('--rdevmajor', action='store', help='major number for character/block device')
-    parser.add_argument('--rdevminor', action='store', help='minor number for character/block device')
+    parser.add_argument('--major', action='store', help='major number for character/block device')
+    parser.add_argument('--minor', action='store', help='minor number for character/block device')
 
     parser.add_argument('-u', '--set-owner', action='store', help='set UID on all files')
     parser.add_argument('-g', '--set-group', action='store', help='set GID on all files')
@@ -86,9 +86,9 @@ def main():
         c.add_symlink(args.name, args.symlink)
 
     if args.chardev:
-        if not args.rdevmajor or not args.rdevminor:
+        if not args.major or not args.minor:
             raise ValueError('Character device requires major and minor numbers')
-        c.add_chardev(args.chardev, int(args.rdevmajor), int(args.rdevminor))
+        c.add_chardev(args.chardev, int(args.major), int(args.minor))
 
     if args.append:
         relative = args.relative if args.relative else None

src/pycpio/masks/modes.py

@@ -41,8 +41,6 @@ def mode_bytes_from_path(file_path: Path) -> CPIOModes:
     """
     if file_path.is_dir():
         return CPIOModes.Dir.value
-    elif file_path.is_file():
-        return CPIOModes.File.value
     elif file_path.is_symlink():
         return CPIOModes.Symlink.value
     elif file_path.is_block_device():
@@ -51,6 +49,8 @@ def mode_bytes_from_path(file_path: Path) -> CPIOModes:
         return CPIOModes.CharDev.value
     elif file_path.is_fifo():
         return CPIOModes.FIFO.value
+    elif file_path.is_file():
+        return CPIOModes.File.value
 
     raise ValueError(f"Invalid mode: {file_path}")
 

src/pycpio/writer/writer.py

@@ -25,6 +25,7 @@ def write(self):
         """
         inodes = set()
         offset = 0
+        self.logger.debug("Writing to: %s" % self.output_file)
         with open(self.output_file, "wb") as f:
             for entry in self.cpio_entries.values():
                 self.logger.log(5, "Writing entry: %s" % entry)