mroot/yazi
1
0
Fork 0
mirror of https://github.com/sxyazi/yazi.git synced 2026-07-25 08:41:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Simplify the code

Browse source
This commit is contained in:
sxyazi 2024-02-18 19:23:06 +08:00
parent 24243e6c60
commit ce6a9e486b
No known key found for this signature in database
2 changed files with 17 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
yazi-core/src/notify/commands/tick.rs
View file

@ -38,7 +38,7 @@ impl Notify {
if m.timeout.is_zero() {
m.percent = m.percent.saturating_sub(20);
} else if m.percent < 100 {
m.percent = m.percent.saturating_add(20);
m.percent += 20;
} else {
m.timeout = m.timeout.saturating_sub(opt.interval);
}

37
yazi-core/src/tab/commands/escape.rs
View file

@ -103,28 +103,23 @@ impl Tab {
return true;
};
let results: Vec<_> = indices
.iter()
.filter_map(|i| self.current.files.get(*i))
.map(|f| {
if state {
self.selected.add(&f.url)
} else {
self.selected.remove(&f.url);
true
}
})
.collect();
render!(!results.is_empty());
if results.into_iter().all(|b| b) {
return true;
let mut success = true;
for f in indices.iter().filter_map(|i| self.current.files.get(*i)) {
if state {
success &= self.selected.add(&f.url);
} else {
self.selected.remove(&f.url);
}
}
Notify::_push_warn(
"Escape visual mode",
"Some files cannot be selected due to path nesting conflict.",
);
false
if !success {
Notify::_push_warn(
"Escape visual mode",
"Some files cannot be selected, due to path nesting conflict.",
);
}
render!();
success
}
}