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

feat: merge wildcard preloader and previewer rules via append_preloaders and append_previewers

Browse source
This commit is contained in:
sxyazi 2024-02-09 12:37:46 +08:00
parent 20b6f26247
commit ed46456f8c
No known key found for this signature in database
3 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
yazi-config/src/pattern.rs
View file

@ -35,6 +35,9 @@ impl Pattern {
path.file_name().map_or_else(|| path.to_string_lossy(), |n| n.to_string_lossy()) path.file_name().map_or_else(|| path.to_string_lossy(), |n| n.to_string_lossy())
}) })
} }
#[inline]
pub fn is_wildcard(&self) -> bool { self.inner.as_str() == "*" || self.inner.as_str() == "*/" }
} }
impl TryFrom<&str> for Pattern { impl TryFrom<&str> for Pattern {

7
yazi-config/src/plugin/plugin.rs
View file

@ -52,6 +52,13 @@ impl Default for Plugin {
} }
let mut shadow = toml::from_str::<Outer>(&MERGED_YAZI).unwrap().plugin; let mut shadow = toml::from_str::<Outer>(&MERGED_YAZI).unwrap().plugin;
if shadow.append_preloaders.iter().any(|r| r.name.as_ref().is_some_and(|p| p.is_wildcard())) {
shadow.preloaders.retain(|r| !r.name.as_ref().is_some_and(|p| p.is_wildcard()));
}
if shadow.append_previewers.iter().any(|r| r.name.as_ref().is_some_and(|p| p.is_wildcard())) {
shadow.previewers.retain(|r| !r.name.as_ref().is_some_and(|p| p.is_wildcard()));
}
Preset::mix(&mut shadow.preloaders, shadow.prepend_preloaders, shadow.append_preloaders); Preset::mix(&mut shadow.preloaders, shadow.prepend_preloaders, shadow.append_preloaders);
Preset::mix(&mut shadow.previewers, shadow.prepend_previewers, shadow.append_previewers); Preset::mix(&mut shadow.previewers, shadow.prepend_previewers, shadow.append_previewers);

4
yazi-core/src/tasks/commands/cancel.rs
View file

@ -9,8 +9,8 @@ impl Tasks {
return; return;
} }
let len = self.scheduler.running.lock().len(); self.summaries = self.paginate();
self.cursor = self.cursor.min(len.saturating_sub(1)); self.arrow(0);
render!(); render!();
} }
} }