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

Add Preset::mix

Browse source
This commit is contained in:
sxyazi 2024-03-01 10:36:04 +08:00
parent ec4f7629ce
commit ee8f5e29bf
No known key found for this signature in database
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -5,7 +5,7 @@ use serde::{Deserialize, Deserializer};
use yazi_shared::MIME_DIR;
use super::Opener;
use crate::{open::OpenRule, MERGED_YAZI};
use crate::{open::OpenRule, Preset, MERGED_YAZI};
#[derive(Debug)]
pub struct Open {
@ -77,12 +77,15 @@ impl<'de> Deserialize<'de> for Open {
append_rules: Vec<OpenRule>,
}
let outer = Outer::deserialize(deserializer)?;
let mut outer = Outer::deserialize(deserializer)?;
Preset::mix(&mut outer.open.rules, outer.open.prepend_rules, outer.open.append_rules);
let openers = outer
.opener
.into_iter()
.map(|(k, v)| (k, v.into_iter().filter_map(|o| o.take()).collect::<IndexSet<_>>()))
.collect();
Ok(Self { rules: outer.open.rules, openers })
}
}