improve ArchiveEntry properties that can be unset

The attributes `atime`, `mtime`, `ctime`, `birthtime` and `size` now have the value `None` instead of `0` when they're unset.

Author: Changaco

libarchive/entry.py

@@ -112,13 +112,17 @@ def isdev(self):
 
     @property
     def atime(self):
+        if not ffi.entry_atime_is_set(self._entry_p):
+            return None
         sec_val = ffi.entry_atime(self._entry_p)
         nsec_val = ffi.entry_atime_nsec(self._entry_p)
         return format_time(sec_val, nsec_val)
 
     @atime.setter
     def atime(self, value):
-        if isinstance(value, int):
+        if value is None:
+            ffi.entry_unset_atime(self._entry_p)
+        elif isinstance(value, int):
             self.set_atime(value)
         elif isinstance(value, tuple):
             self.set_atime(*value)
@@ -132,13 +136,17 @@ def set_atime(self, timestamp_sec, timestamp_nsec):
 
     @property
     def mtime(self):
+        if not ffi.entry_mtime_is_set(self._entry_p):
+            return None
         sec_val = ffi.entry_mtime(self._entry_p)
         nsec_val = ffi.entry_mtime_nsec(self._entry_p)
         return format_time(sec_val, nsec_val)
 
     @mtime.setter
     def mtime(self, value):
-        if isinstance(value, int):
+        if value is None:
+            ffi.entry_unset_mtime(self._entry_p)
+        elif isinstance(value, int):
             self.set_mtime(value)
         elif isinstance(value, tuple):
             self.set_mtime(*value)
@@ -152,13 +160,17 @@ def set_mtime(self, timestamp_sec, timestamp_nsec):
 
     @property
     def ctime(self):
+        if not ffi.entry_ctime_is_set(self._entry_p):
+            return None
         sec_val = ffi.entry_ctime(self._entry_p)
         nsec_val = ffi.entry_ctime_nsec(self._entry_p)
         return format_time(sec_val, nsec_val)
 
     @ctime.setter
     def ctime(self, value):
-        if isinstance(value, int):
+        if value is None:
+            ffi.entry_unset_ctime(self._entry_p)
+        elif isinstance(value, int):
             self.set_ctime(value)
         elif isinstance(value, tuple):
             self.set_ctime(*value)
@@ -172,13 +184,17 @@ def set_ctime(self, timestamp_sec, timestamp_nsec):
 
     @property
     def birthtime(self):
+        if not ffi.entry_birthtime_is_set(self._entry_p):
+            return None
         sec_val = ffi.entry_birthtime(self._entry_p)
         nsec_val = ffi.entry_birthtime_nsec(self._entry_p)
         return format_time(sec_val, nsec_val)
 
     @birthtime.setter
     def birthtime(self, value):
-        if isinstance(value, int):
+        if value is None:
+            ffi.entry_unset_birthtime(self._entry_p)
+        elif isinstance(value, int):
             self.set_birthtime(value)
         elif isinstance(value, tuple):
             self.set_birthtime(*value)
@@ -231,7 +247,10 @@ def size(self):
 
     @size.setter
     def size(self, value):
-        ffi.entry_set_size(self._entry_p, value)
+        if value is None:
+            ffi.entry_unset_size(self._entry_p)
+        else:
+            ffi.entry_set_size(self._entry_p, value)
 
     @property
     def mode(self):

libarchive/ffi.py

@@ -177,6 +177,10 @@ def get_write_filter_function(filter_name):
 ffi('entry_birthtime_nsec', [c_archive_entry_p], c_long)
 ffi('entry_mtime_nsec', [c_archive_entry_p], c_long)
 ffi('entry_ctime_nsec', [c_archive_entry_p], c_long)
+ffi('entry_atime_is_set', [c_archive_entry_p], c_int)
+ffi('entry_birthtime_is_set', [c_archive_entry_p], c_int)
+ffi('entry_mtime_is_set', [c_archive_entry_p], c_int)
+ffi('entry_ctime_is_set', [c_archive_entry_p], c_int)
 ffi('entry_pathname', [c_archive_entry_p], c_char_p)
 ffi('entry_pathname_w', [c_archive_entry_p], c_wchar_p)
 ffi('entry_sourcepath', [c_archive_entry_p], c_char_p)
@@ -206,6 +210,11 @@ def get_write_filter_function(filter_name):
 ffi('entry_set_birthtime', [c_archive_entry_p, c_time_t, c_long], None)
 ffi('entry_set_rdevmajor', [c_archive_entry_p, c_uint], None)
 ffi('entry_set_rdevminor', [c_archive_entry_p, c_uint], None)
+ffi('entry_unset_size', [c_archive_entry_p], None)
+ffi('entry_unset_atime', [c_archive_entry_p], None)
+ffi('entry_unset_mtime', [c_archive_entry_p], None)
+ffi('entry_unset_ctime', [c_archive_entry_p], None)
+ffi('entry_unset_birthtime', [c_archive_entry_p], None)
 
 ffi('entry_update_pathname_utf8', [c_archive_entry_p, c_char_p], c_int, check_int)
 ffi('entry_update_link_utf8', [c_archive_entry_p, c_char_p], c_int, check_int)