fix: Restore original file timestamp when unzipping with chrono (#46)

* Set filetime

* Add chrono

* fix: Duplicate "chrono" entry in Cargo.toml

Signed-off-by: Chris Hennick <[email protected]>

* fix: typo in read.rs

Signed-off-by: Chris Hennick <[email protected]>

* fix: missing feature gate

Signed-off-by: Chris Hennick <[email protected]>

* Set filetime

* Add chrono

* fix: Duplicate "chrono" entry in Cargo.toml

Signed-off-by: Chris Hennick <[email protected]>

* fix: typo in read.rs

Signed-off-by: Chris Hennick <[email protected]>

* fix: Errors due to missing chrono feature gate

* fix: bad merge

* style: cargo fmt --all

* fix: chrono has renamed method to from_utc

* Revert "fix: chrono has renamed method to from_utc"

This reverts commit 38cc3ca.

* fix: from_utc is deprecated, but from_naive_utc_and_offset doesn't exist before 0.4.27

---------

Signed-off-by: Chris Hennick <[email protected]>
Co-authored-by: mass10 <[email protected]>

Author: Pr0methean

Cargo.toml

@@ -29,7 +29,7 @@ time = { version = "0.3.37", default-features = false }
 [dependencies]
 aes = { version = "0.8", optional = true }
 bzip2 = { version = "0.6.0", optional = true }
-chrono = { version = "0.4", optional = true }
+chrono = { version = "^0.4.27", optional = true }
 constant_time_eq = { version = "0.3.1", optional = true }
 crc32fast = "1.4"
 flate2 = { version = "1.1.1", default-features = false, optional = true }

src/read.rs

@@ -910,6 +910,7 @@ impl<R: Read + Seek> ZipArchive<R> {
             }
             let mut file = self.by_index(i)?;
             let mut outfile = fs::File::create(&outpath)?;
+
             io::copy(&mut file, &mut outfile)?;
             #[cfg(unix)]
             {
@@ -918,6 +919,15 @@ impl<R: Read + Seek> ZipArchive<R> {
                     files_by_unix_mode.push((outpath.clone(), mode));
                 }
             }
+            #[cfg(feature = "chrono")]
+            {
+                // Set original timestamp.
+                if let Some(last_modified) = file.last_modified() {
+                    if let Some(t) = datetime_to_systemtime(&last_modified) {
+                        outfile.set_modified(t)?;
+                    }
+                }
+            }
         }
         #[cfg(unix)]
         {
@@ -2024,6 +2034,35 @@ pub fn root_dir_common_filter(path: &Path) -> bool {
     true
 }
 
+#[cfg(feature = "chrono")]
+/// Generate a `SystemTime` from a `DateTime`.
+fn datetime_to_systemtime(datetime: &DateTime) -> Option<std::time::SystemTime> {
+    if let Some(t) = generate_chrono_datetime(datetime) {
+        let time = chrono::DateTime::<chrono::Utc>::from_naive_utc_and_offset(t, chrono::Utc);
+        return Some(time.into());
+    }
+    None
+}
+
+#[cfg(feature = "chrono")]
+/// Generate a `NaiveDateTime` from a `DateTime`.
+fn generate_chrono_datetime(datetime: &DateTime) -> Option<chrono::NaiveDateTime> {
+    if let Some(d) = chrono::NaiveDate::from_ymd_opt(
+        datetime.year().into(),
+        datetime.month().into(),
+        datetime.day().into(),
+    ) {
+        if let Some(d) = d.and_hms_opt(
+            datetime.hour().into(),
+            datetime.minute().into(),
+            datetime.second().into(),
+        ) {
+            return Some(d);
+        }
+    }
+    None
+}
+
 #[cfg(test)]
 mod test {
     use crate::result::ZipResult;