Skip to content

Commit

Permalink
Fix handling of potentially unsupported time metadata
Browse files Browse the repository at this point in the history
- Checking on a directory doesn’t tell us if supported elsewhere
(some filesystems, like tmpfs, don’t support created time)
- We want to be able to display a column even if some subfiles or
subdirectories don’t support it

So now if unsupported a time of zero is used, and displayed as `-`
  • Loading branch information
ariasuni committed Dec 20, 2019
1 parent 89c861f commit a636d08
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 75 deletions.
50 changes: 12 additions & 38 deletions src/fs/file.rs
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,10 @@ 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()
match self.metadata.modified() {
Ok(system_time) => system_time.duration_since(UNIX_EPOCH).unwrap(),
Err(_) => Duration::new(0, 0),
}
}

/// This file’s last changed timestamp.
Expand All @@ -338,12 +341,18 @@ impl<'dir> File<'dir> {

/// This file’s last accessed timestamp.
pub fn accessed_time(&self) -> Duration {
self.metadata.accessed().unwrap().duration_since(UNIX_EPOCH).unwrap()
match self.metadata.accessed() {
Ok(system_time) => system_time.duration_since(UNIX_EPOCH).unwrap(),
Err(_) => Duration::new(0, 0),
}
}

/// This file’s created timestamp.
pub fn created_time(&self) -> Duration {
self.metadata.created().unwrap().duration_since(UNIX_EPOCH).unwrap()
match self.metadata.created() {
Ok(system_time) => system_time.duration_since(UNIX_EPOCH).unwrap(),
Err(_) => Duration::new(0, 0),
}
}

/// This file’s ‘type’.
Expand Down Expand Up @@ -460,41 +469,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 {
Expand Down
2 changes: 1 addition & 1 deletion src/fs/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
20 changes: 2 additions & 18 deletions src/options/filter.rs
Original file line number Diff line number Diff line change
@@ -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};
Expand Down Expand Up @@ -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<PlatformMetadata> {
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)
}
}

Expand Down
18 changes: 0 additions & 18 deletions src/options/view.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ use output::time::TimeFormat;
use options::{flags, Misfire, Vars};
use options::parser::MatchedFlags;

use fs::PlatformMetadata;
use fs::feature::xattr;


Expand Down Expand Up @@ -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)
}
}
Expand Down Expand Up @@ -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
Expand Down
7 changes: 7 additions & 0 deletions src/output/time.rs
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,9 @@ impl DefaultFormat {

#[allow(trivial_numeric_casts)]
fn format_local(&self, time: Duration) -> String {
if time.as_nanos() == 0 {
return "-".to_string();
}
let date = LocalDateTime::at(time.as_secs() as i64);

if self.is_recent(date) {
Expand All @@ -141,6 +144,10 @@ impl DefaultFormat {

#[allow(trivial_numeric_casts)]
fn format_zoned(&self, time: Duration, zone: &TimeZone) -> String {
if time.as_nanos() == 0 {
return "-".to_string();
}

let date = zone.to_zoned(LocalDateTime::at(time.as_secs() as i64));

if self.is_recent(date) {
Expand Down

0 comments on commit a636d08

Please sign in to comment.