refactor

Author: Changaco

libarchive/ffi.py

@@ -35,9 +35,6 @@
 ARCHIVE_FAILED = -25  # Current operation cannot complete.
 ARCHIVE_FATAL = -30   # No more operations are possible.
 
-ARCHIVE_SYMLINK_MODE_HYBRID = 'H'
-ARCHIVE_SYMLINK_MODE_LOGICAL = 'L'
-ARCHIVE_SYMLINK_MODE_PHYSICAL = 'P'
 
 # Callback types
 

libarchive/write.py

@@ -46,7 +46,7 @@ def add_entries(self, entries):
 
     def add_files(
         self, *paths, flags=0, lookup=False, pathname=None, recursive=True,
-        symlink_mode=ffi.ARCHIVE_SYMLINK_MODE_PHYSICAL, **attributes
+        symlink_mode=None, **attributes
     ):
         """Read files through the OS and add them to the archive.
 
@@ -63,11 +63,9 @@ def add_files(
             recursive (bool):
                 when False, if a path in `paths` is a directory,
                 only the directory itself is added.
-            symlink_mode (enum):
-                Determines how symlinks are traversed. Valid options are
-                ARCHIVE_SYMLINK_MODE_HYBRID, ARCHIVE_SYMLINK_MODE_LOGICAL, and
-                ARCHIVE_SYMLINK_MODE_PHYSICAL as defined in the ffi module.
-                Default value matches default from libarchive.
+            symlink_mode (Literal['hybrid', 'logical', 'physical'] | None):
+                how symbolic links should be handled; see `man archive_read_disk`
+                for meanings
             attributes (dict): passed to `ArchiveEntry.modify()`
 
         Raises:
@@ -80,18 +78,23 @@ def add_files(
         if block_size <= 0:
             block_size = 10240  # pragma: no cover
 
+        set_symlink_mode = None
+        if symlink_mode:
+            try:
+                set_symlink_mode = getattr(
+                    ffi, f'read_disk_set_symlink_{symlink_mode}'
+                )
+            except AttributeError:
+                raise ValueError(
+                    f"symlink_mode value {symlink_mode!r} is invalid"
+                ) from None
+
         entry = ArchiveEntry(header_codec=self.header_codec)
         entry_p = entry._entry_p
         for path in paths:
             with new_archive_read_disk(path, flags, lookup) as read_p:
-                if (symlink_mode == ffi.ARCHIVE_SYMLINK_MODE_PHYSICAL):
-                    ffi.read_disk_set_symlink_physical(read_p)
-                elif (symlink_mode == ffi.ARCHIVE_SYMLINK_MODE_LOGICAL):
-                    ffi.read_disk_set_symlink_logical(read_p)
-                elif (symlink_mode == ffi.ARCHIVE_SYMLINK_MODE_HYBRID):
-                    ffi.read_disk_set_symlink_hybrid(read_p)
-                else:
-                    raise ValueError(f"Bad symlink mode value {symlink_mode}")
+                if set_symlink_mode:
+                    set_symlink_mode(read_p)
                 while 1:
                     r = read_next_header2(read_p, entry_p)
                     if r == ARCHIVE_EOF: