robin/zox
1
0
Fork 0
mirror of https://github.com/icewind1991/zox synced 2026-06-03 18:34:07 +02:00
Code Issues Releases Wiki Activity

ordering and repeating matters

Browse source
This commit is contained in:
Robin Appelman 2021-02-21 16:03:18 +01:00
commit 80307c9b16
1 changed files with 33 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/main.rs
View file

@ -66,9 +66,15 @@ impl History {
} }
pub fn matches(&self, pattern: &[String]) -> bool { pub fn matches(&self, pattern: &[String]) -> bool {
pattern let mut remaining = self.path.as_str();
.iter()
.all(|pat| self.path.to_lowercase().contains(pat)) for pat in pattern {
match remaining.find(pat) {
Some(index) => remaining = &remaining[index + pat.len()..],
None => return false,
}
}
true
} }
pub fn get_sort(&self, sort: SortBy, current_time: u64) -> f64 { pub fn get_sort(&self, sort: SortBy, current_time: u64) -> f64 {
@ -81,13 +87,35 @@ impl History {
} }
#[test] #[test]
fn test_history_match() { fn test_history_match_order() {
assert!(History { assert!(History {
path: "/foo/bar".into(), path: "/foo/bar".into(),
time: 0, time: 0,
rank: 0.0, rank: 0.0,
} }
.matches(&["foo".into(), "bar".into()])) .matches(&["foo".into(), "bar".into()]));
assert!(!History {
path: "/foo/bar".into(),
time: 0,
rank: 0.0,
}
.matches(&["bar".into(), "foo".into()]));
}
#[test]
fn test_history_match_repeat() {
assert!(History {
path: "/foo/foo".into(),
time: 0,
rank: 0.0,
}
.matches(&["foo".into(), "foo".into()]));
assert!(!History {
path: "/foo/bar".into(),
time: 0,
rank: 0.0,
}
.matches(&["foo".into(), "foo".into()]));
} }
fn now() -> u64 { fn now() -> u64 {