diff options
author | Benjamin Nguyen <benjamin.van.nguyen@gmail.com> | 2023-08-06 13:08:41 -0700 |
---|---|---|
committer | Benjamin Nguyen <benjamin.van.nguyen@gmail.com> | 2023-08-06 13:08:41 -0700 |
commit | cbbbe3ff750d7cd3413047db0593aa2c0b762336 (patch) | |
tree | 112f358bd2271ca59ce198207cfdf61744c2ac4d | |
parent | 07b7017c09bfdcfb7e969e968c534267506f3716 (diff) |
fix sort definitions
-rw-r--r-- | src/context/sort.rs | 6 | ||||
-rw-r--r-- | src/tree/mod.rs | 4 | ||||
-rw-r--r-- | src/tree/node/cmp.rs | 22 |
3 files changed, 16 insertions, 16 deletions
diff --git a/src/context/sort.rs b/src/context/sort.rs index 60a34a6..b7d9043 100644 --- a/src/context/sort.rs +++ b/src/context/sort.rs @@ -16,20 +16,26 @@ pub enum Type { Rsize, /// Sort entries by newer to older Accessing Date + #[value(alias("atime"))] Access, /// Sort entries by older to newer Accessing Date + #[value(alias("ratime"))] Raccess, /// Sort entries by newer to older Creation Date + #[value(alias("ctime"))] Create, /// Sort entries by older to newer Creation Date + #[value(alias("rctime"))] Rcreate, /// Sort entries by newer to older Alteration Date + #[value(alias("mtime"))] Mod, /// Sort entries by older to newer Alteration Date + #[value(alias("rmtime"))] Rmod, } diff --git a/src/tree/mod.rs b/src/tree/mod.rs index f4c4845..7e32fa6 100644 --- a/src/tree/mod.rs +++ b/src/tree/mod.rs @@ -221,10 +221,6 @@ impl Tree { let node = tree[index].get(); - #[cfg(unix)] - Self::update_column_properties(column_properties, node, ctx); - - #[cfg(not(unix))] Self::update_column_properties(column_properties, node, ctx); // If a hard-link is already accounted for then don't increment parent dir size. diff --git a/src/tree/node/cmp.rs b/src/tree/node/cmp.rs index cac2bda..9535b2b 100644 --- a/src/tree/node/cmp.rs +++ b/src/tree/node/cmp.rs @@ -63,16 +63,18 @@ fn base_comparator(sort_type: sort::Type) -> Box<NodeComparator> { } mod time_stamping { + pub(self) use crate::tree::node::Node; + pub(self) use core::cmp::Ordering; + pub(self) use std::time::SystemTime; + pub mod accessed { - use crate::tree::node::Node; - use core::cmp::Ordering; - use std::time::SystemTime; + use super::*; /// Comparator that sorts [Node]s by Last Access timestamp, newer to older. pub fn comparator(a: &Node, b: &Node) -> Ordering { let a_stamp = a.accessed().unwrap_or_else(SystemTime::now); let b_stamp = b.accessed().unwrap_or_else(SystemTime::now); - a_stamp.cmp(&b_stamp) + b_stamp.cmp(&a_stamp) } /// Comparator that sorts [Node]s by Access timestamp, older to newer. @@ -82,15 +84,13 @@ mod time_stamping { } pub mod created { - use crate::tree::node::Node; - use core::cmp::Ordering; - use std::time::SystemTime; + use super::*; /// Comparator that sorts [Node]s by Creation timestamp, newer to older. pub fn comparator(a: &Node, b: &Node) -> Ordering { let a_stamp = a.created().unwrap_or_else(SystemTime::now); let b_stamp = b.created().unwrap_or_else(SystemTime::now); - a_stamp.cmp(&b_stamp) + b_stamp.cmp(&a_stamp) } /// Comparator that sorts [Node]s by Creation timestamp, older to newer. @@ -100,15 +100,13 @@ mod time_stamping { } pub mod modified { - use crate::tree::node::Node; - use core::cmp::Ordering; - use std::time::SystemTime; + use super::*; /// Comparator that sorts [Node]s by Alteration timestamp, newer to older. pub fn comparator(a: &Node, b: &Node) -> Ordering { let a_stamp = a.modified().unwrap_or_else(SystemTime::now); let b_stamp = b.modified().unwrap_or_else(SystemTime::now); - a_stamp.cmp(&b_stamp) + b_stamp.cmp(&a_stamp) } /// Comparator that sorts [Node]s by Alteration timestamp, older to newer. |