diff --git a/src/fs/file.rs b/src/fs/file.rs index 3a63aaeb..1cd5f288 100644 --- a/src/fs/file.rs +++ b/src/fs/file.rs @@ -1,6 +1,6 @@ //! Files, and methods and fields to access their metadata. -use std::fs::{self, metadata}; +use std::fs; use std::io::Error as IOError; use std::io::Result as IOResult; use std::os::unix::fs::{MetadataExt, PermissionsExt, FileTypeExt}; @@ -9,8 +9,6 @@ use std::time::{UNIX_EPOCH, Duration}; use fs::dir::Dir; use fs::fields as f; -use options::Misfire; - /// A **File** is a wrapper around one of Rust's Path objects, along with /// associated data about the file. @@ -327,23 +325,27 @@ impl<'dir> File<'dir> { } /// This file’s last modified timestamp. - pub fn modified_time(&self) -> Duration { - self.metadata.modified().unwrap().duration_since(UNIX_EPOCH).unwrap() + pub fn modified_time(&self) -> Option { + self.metadata.modified().ok().map(|d| d.duration_since(UNIX_EPOCH).unwrap()) } /// This file’s last changed timestamp. - pub fn changed_time(&self) -> Duration { - Duration::new(self.metadata.ctime() as u64, self.metadata.ctime_nsec() as u32) + pub fn changed_time(&self) -> Option { + if cfg!(target_family = "unix") { + Some(Duration::new(self.metadata.ctime() as u64, self.metadata.ctime_nsec() as u32)) + } else { + None + } } /// This file’s last accessed timestamp. - pub fn accessed_time(&self) -> Duration { - self.metadata.accessed().unwrap().duration_since(UNIX_EPOCH).unwrap() + pub fn accessed_time(&self) -> Option { + self.metadata.accessed().ok().map(|d| d.duration_since(UNIX_EPOCH).unwrap()) } /// This file’s created timestamp. - pub fn created_time(&self) -> Duration { - self.metadata.created().unwrap().duration_since(UNIX_EPOCH).unwrap() + pub fn created_time(&self) -> Option { + self.metadata.created().ok().map(|d| d.duration_since(UNIX_EPOCH).unwrap()) } /// This file’s ‘type’. @@ -459,42 +461,6 @@ impl<'dir> FileTarget<'dir> { } } - -pub enum PlatformMetadata { - ModifiedTime, - ChangedTime, - AccessedTime, - CreatedTime, -} - -impl PlatformMetadata { - pub fn check_supported(&self) -> Result<(), Misfire> { - use std::env::temp_dir; - let result = match self { - // Call the functions that return a Result to see if it works - PlatformMetadata::AccessedTime => metadata(temp_dir()).unwrap().accessed(), - PlatformMetadata::ModifiedTime => metadata(temp_dir()).unwrap().modified(), - PlatformMetadata::CreatedTime => metadata(temp_dir()).unwrap().created(), - // We use the Unix API so we know it’s not available elsewhere - PlatformMetadata::ChangedTime => { - if cfg!(target_family = "unix") { - return Ok(()) - } else { - return Err(Misfire::Unsupported( - // for consistency, this error message similar to the one Rust - // use when created time is not available - "status modified time is not available on this platform currently".to_string())); - } - }, - }; - match result { - Ok(_) => Ok(()), - Err(err) => Err(Misfire::Unsupported(err.to_string())) - } - } -} - - /// More readable aliases for the permission bits exposed by libc. #[allow(trivial_numeric_casts)] mod modes { diff --git a/src/fs/mod.rs b/src/fs/mod.rs index f6ca48e2..3275ccf3 100644 --- a/src/fs/mod.rs +++ b/src/fs/mod.rs @@ -2,7 +2,7 @@ mod dir; pub use self::dir::{Dir, DotFilter}; mod file; -pub use self::file::{File, FileTarget, PlatformMetadata}; +pub use self::file::{File, FileTarget}; pub mod feature; pub mod fields; diff --git a/src/options/filter.rs b/src/options/filter.rs index ab9d9c24..d15bd92c 100644 --- a/src/options/filter.rs +++ b/src/options/filter.rs @@ -1,6 +1,6 @@ //! Parsing the options for `FileFilter`. -use fs::{DotFilter, PlatformMetadata}; +use fs::DotFilter; use fs::filter::{FileFilter, SortField, SortCase, IgnorePatterns, GitIgnore}; use options::{flags, Misfire}; @@ -67,23 +67,7 @@ impl SortField { _ => return Err(Misfire::BadArgument(&flags::SORT, word.into())) }; - match SortField::to_platform_metadata(field) { - Some(m) => match m.check_supported() { - Ok(_) => Ok(field), - Err(misfire) => Err(misfire), - }, - None => Ok(field), - } - } - - fn to_platform_metadata(field: Self) -> Option { - match field { - SortField::ModifiedDate => Some(PlatformMetadata::ModifiedTime), - SortField::ChangedDate => Some(PlatformMetadata::ChangedTime), - SortField::AccessedDate => Some(PlatformMetadata::AccessedTime), - SortField::CreatedDate => Some(PlatformMetadata::CreatedTime), - _ => None - } + Ok(field) } } diff --git a/src/options/view.rs b/src/options/view.rs index 23e9a444..cff430db 100644 --- a/src/options/view.rs +++ b/src/options/view.rs @@ -6,7 +6,6 @@ use output::time::TimeFormat; use options::{flags, Misfire, Vars}; use options::parser::MatchedFlags; -use fs::PlatformMetadata; use fs::feature::xattr; @@ -344,17 +343,6 @@ impl TimeTypes { TimeTypes::default() }; - let mut fields = vec![]; - if time_types.modified { fields.push(PlatformMetadata::ModifiedTime); } - if time_types.changed { fields.push(PlatformMetadata::ChangedTime); } - if time_types.accessed { fields.push(PlatformMetadata::AccessedTime); } - if time_types.created { fields.push(PlatformMetadata::CreatedTime); } - - for field in fields { - if let Err(misfire) = field.check_supported() { - return Err(misfire); - } - } Ok(time_types) } } @@ -542,15 +530,9 @@ mod test { test!(time_a: TimeTypes <- ["-t", "acc"]; Both => Ok(TimeTypes { modified: false, changed: false, accessed: true, created: false })); // Created - #[cfg(not(target_os = "linux"))] test!(cr: TimeTypes <- ["--created"]; Both => Ok(TimeTypes { modified: false, changed: false, accessed: false, created: true })); - #[cfg(target_os = "linux")] - test!(cr: TimeTypes <- ["--created"]; Both => err Misfire::Unsupported("creation time is not available on this platform currently".to_string())); - #[cfg(not(target_os = "linux"))] test!(c: TimeTypes <- ["-U"]; Both => Ok(TimeTypes { modified: false, changed: false, accessed: false, created: true })); - #[cfg(not(target_os = "linux"))] test!(time_cr: TimeTypes <- ["--time=created"]; Both => Ok(TimeTypes { modified: false, changed: false, accessed: false, created: true })); - #[cfg(not(target_os = "linux"))] test!(t_cr: TimeTypes <- ["-tcr"]; Both => Ok(TimeTypes { modified: false, changed: false, accessed: false, created: true })); // Multiples diff --git a/src/output/render/times.rs b/src/output/render/times.rs index ce4a791c..7ab94434 100644 --- a/src/output/render/times.rs +++ b/src/output/render/times.rs @@ -11,18 +11,22 @@ pub trait Render { format: &TimeFormat) -> TextCell; } -impl Render for std::time::Duration { +impl Render for Option { fn render(self, style: Style, tz: &Option, format: &TimeFormat) -> TextCell { - - if let Some(ref tz) = *tz { - let datestamp = format.format_zoned(self, tz); - TextCell::paint(style, datestamp) + if let Some(duration) = self { + if let Some(ref tz) = *tz { + let datestamp = format.format_zoned(duration, tz); + TextCell::paint(style, datestamp) + } + else { + let datestamp = format.format_local(duration); + TextCell::paint(style, datestamp) + } } else { - let datestamp = format.format_local(self); - TextCell::paint(style, datestamp) + TextCell::paint(style, String::from("-")) } } }