Merge pull request ogham#557 from BrennanMcDonald/master

ogham · web-flow · commit c5a1e8e103cc · 2020-01-19T00:39:40.000Z
Added checks for modified/accessed/created metadata
diff --git a/src/fs/file.rs b/src/fs/file.rs
@@ -5,7 +5,7 @@ use std::io::Error as IOError;
 use std::io::Result as IOResult;
 use std::os::unix::fs::{MetadataExt, PermissionsExt, FileTypeExt};
 use std::path::{Path, PathBuf};
-use std::time::{UNIX_EPOCH, Duration};
+use std::time::{SystemTime, UNIX_EPOCH, Duration};
 
 use log::{debug, error};
 
@@ -329,8 +329,13 @@ impl<'dir> File<'dir> {
     }
 
     /// This file’s last modified timestamp.
+    /// If the file's time is invalid, assume it was modified today
     pub fn modified_time(&self) -> Duration {
-        self.metadata.modified().unwrap().duration_since(UNIX_EPOCH).unwrap()
+        if self.metadata.modified().unwrap() < UNIX_EPOCH {
+            return SystemTime::now().duration_since(UNIX_EPOCH).unwrap()
+        } else {
+            return self.metadata.modified().unwrap().duration_since(UNIX_EPOCH).unwrap()
+        }
     }
 
     /// This file’s last changed timestamp.
@@ -339,13 +344,23 @@ impl<'dir> File<'dir> {
     }
 
     /// This file’s last accessed timestamp.
+    /// If the file's time is invalid, assume it was accessed today
     pub fn accessed_time(&self) -> Duration {
-        self.metadata.accessed().unwrap().duration_since(UNIX_EPOCH).unwrap()
+        if self.metadata.accessed().unwrap() < UNIX_EPOCH{
+            return SystemTime::now().duration_since(UNIX_EPOCH).unwrap()
+        } else {
+            return self.metadata.accessed().unwrap().duration_since(UNIX_EPOCH).unwrap()
+        }
     }
 
     /// This file’s created timestamp.
+    /// If the file's time is invalid, assume it was created today
     pub fn created_time(&self) -> Duration {
-        self.metadata.created().unwrap().duration_since(UNIX_EPOCH).unwrap()
+        if self.metadata.created().unwrap() < UNIX_EPOCH {
+            return SystemTime::now().duration_since(UNIX_EPOCH).unwrap()
+        } else {
+            return self.metadata.created().unwrap().duration_since(UNIX_EPOCH).unwrap()
+        }
     }
 
     /// This file’s ‘type’.
