feat: multiple openers for a single rule

This commit is contained in:
Linus789 2023-09-13 20:40:02 +02:00 committed by sxyazi
parent 8e72ae90c1
commit 1dabea1082
No known key found for this signature in database
3 changed files with 70 additions and 10 deletions

View file

@ -81,6 +81,8 @@ rules = [
# { mime = "application/json", use = "text" }, # { mime = "application/json", use = "text" },
{ name = "*.json", use = "text" }, { name = "*.json", use = "text" },
{ name = "*.html", use = [ "browser", "text" ] },
] ]
``` ```

View file

@ -1,7 +1,7 @@
use std::{collections::BTreeMap, path::Path}; use std::{collections::BTreeMap, fmt, path::Path};
use indexmap::IndexSet; use indexmap::IndexSet;
use serde::{Deserialize, Deserializer}; use serde::{de::{self, Visitor}, Deserialize, Deserializer};
use shared::MIME_DIR; use shared::MIME_DIR;
use super::Opener; use super::Opener;
@ -18,7 +18,8 @@ struct OpenRule {
name: Option<Pattern>, name: Option<Pattern>,
mime: Option<Pattern>, mime: Option<Pattern>,
#[serde(rename = "use")] #[serde(rename = "use")]
use_: String, #[serde(deserialize_with = "deserialize_from_str_or_vec")]
use_: Vec<String>,
} }
impl Default for Open { impl Default for Open {
@ -26,7 +27,7 @@ impl Default for Open {
} }
impl Open { impl Open {
pub fn openers<P, M>(&self, path: P, mime: M) -> Option<&IndexSet<Opener>> pub fn openers<P, M>(&self, path: P, mime: M) -> Option<IndexSet<&Opener>>
where where
P: AsRef<Path>, P: AsRef<Path>,
M: AsRef<str>, M: AsRef<str>,
@ -36,7 +37,18 @@ impl Open {
if rule.mime.as_ref().map_or(false, |m| m.matches(&mime)) if rule.mime.as_ref().map_or(false, |m| m.matches(&mime))
|| rule.name.as_ref().map_or(false, |n| n.match_path(&path, is_folder)) || rule.name.as_ref().map_or(false, |n| n.match_path(&path, is_folder))
{ {
self.openers.get(&rule.use_) let openers = rule
.use_
.iter()
.filter_map(|use_name| self.openers.get(use_name))
.flatten()
.collect::<IndexSet<_>>();
if openers.is_empty() {
return None;
}
Some(openers)
} else { } else {
None None
} }
@ -49,13 +61,13 @@ impl Open {
P: AsRef<Path>, P: AsRef<Path>,
M: AsRef<str>, M: AsRef<str>,
{ {
self.openers(path, mime).and_then(|o| o.iter().find(|o| o.block)) self.openers(path, mime).and_then(|o| o.iter().find(|o| o.block).copied())
} }
pub fn common_openers(&self, targets: &[(impl AsRef<Path>, impl AsRef<str>)]) -> Vec<&Opener> { pub fn common_openers(&self, targets: &[(impl AsRef<Path>, impl AsRef<str>)]) -> Vec<&Opener> {
let grouped = targets.iter().filter_map(|(p, m)| self.openers(p, m)).collect::<Vec<_>>(); let grouped = targets.iter().filter_map(|(p, m)| self.openers(p, m)).collect::<Vec<_>>();
let flat = grouped.iter().flat_map(|&g| g).collect::<IndexSet<_>>(); let flat = grouped.iter().flatten().collect::<IndexSet<_>>();
flat.into_iter().filter(|&o| grouped.iter().all(|g| g.contains(o))).collect() flat.into_iter().filter(|&o| grouped.iter().all(|g| g.contains(o))).copied().collect()
} }
} }
@ -79,3 +91,45 @@ impl<'de> Deserialize<'de> for Open {
Ok(Self { openers, rules: outer.open.rules }) Ok(Self { openers, rules: outer.open.rules })
} }
} }
fn deserialize_from_str_or_vec<'de, D>(deserializer: D) -> Result<Vec<String>, D::Error>
where
D: Deserializer<'de>,
{
struct StringVisitor;
impl<'de> Visitor<'de> for StringVisitor {
type Value = Vec<String>;
fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
formatter.write_str("a string, or array of strings")
}
fn visit_seq<A>(self, mut seq: A) -> Result<Self::Value, A::Error>
where
A: de::SeqAccess<'de>,
{
let mut strs = Vec::new();
while let Some(value) = seq.next_element::<String>()? {
strs.push(value);
}
Ok(strs)
}
fn visit_str<E>(self, value: &str) -> Result<Self::Value, E>
where
E: de::Error,
{
Ok(vec![value.to_owned()])
}
fn visit_string<E>(self, v: String) -> Result<Self::Value, E>
where
E: de::Error,
{
Ok(vec![v])
}
}
deserializer.deserialize_any(StringVisitor)
}

View file

@ -133,8 +133,12 @@ impl Tasks {
pub fn file_open(&self, targets: &[(impl AsRef<Path>, impl AsRef<str>)]) -> bool { pub fn file_open(&self, targets: &[(impl AsRef<Path>, impl AsRef<str>)]) -> bool {
let mut openers = BTreeMap::new(); let mut openers = BTreeMap::new();
for (path, mime) in targets { let valid_openers = targets
if let Some(opener) = OPEN.openers(path, mime).and_then(|o| o.first()) { .iter()
.filter_map(|(path, mime)| OPEN.openers(path, mime).map(|o| (path, o)))
.collect::<Vec<_>>();
for (path, opener) in &valid_openers {
if let Some(opener) = opener.first() {
openers.entry(opener).or_insert_with(Vec::new).push(path.as_ref().as_os_str()); openers.entry(opener).or_insert_with(Vec::new).push(path.as_ref().as_os_str());
} }
} }