Simplify the code

config/src/open/mod.rs

@@ -1,5 +1,7 @@
 mod open;
 mod opener;
+mod rule;
 
 pub use open::*;
 pub use opener::*;
+use rule::*;

config/src/open/open.rs

@@ -1,11 +1,11 @@
-use std::{collections::BTreeMap, fmt, path::Path};
+use std::{collections::BTreeMap, path::Path};
 
 use indexmap::IndexSet;
-use serde::{de::{self, Visitor}, Deserialize, Deserializer};
+use serde::{Deserialize, Deserializer};
 use shared::MIME_DIR;
 
 use super::Opener;
-use crate::{Pattern, MERGED_YAZI};
+use crate::{open::OpenRule, MERGED_YAZI};
 
 #[derive(Debug)]
 pub struct Open {
@@ -13,15 +13,6 @@ pub struct Open {
 	rules:   Vec<OpenRule>,
 }
 
-#[derive(Debug, Deserialize)]
-struct OpenRule {
-	name: Option<Pattern>,
-	mime: Option<Pattern>,
-	#[serde(rename = "use")]
-	#[serde(deserialize_with = "deserialize_from_str_or_vec")]
-	use_: Vec<String>,
-}
-
 impl Default for Open {
 	fn default() -> Self { toml::from_str(&MERGED_YAZI).unwrap() }
 }
@@ -40,15 +31,11 @@ impl Open {
 				let openers = rule
 					.use_
 					.iter()
-					.filter_map(|use_name| self.openers.get(use_name))
+					.filter_map(|use_| self.openers.get(use_))
 					.flatten()
 					.collect::<IndexSet<_>>();
 
-				if openers.is_empty() {
+				if openers.is_empty() { None } else { Some(openers) }
-					return None;
-				}
-
-				Some(openers)
 			} else {
 				None
 			}
@@ -61,13 +48,13 @@ impl Open {
 		P: AsRef<Path>,
 		M: AsRef<str>,
 	{
-		self.openers(path, mime).and_then(|o| o.iter().find(|o| o.block).copied())
+		self.openers(path, mime).and_then(|o| o.into_iter().find(|o| o.block))
 	}
 
 	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: Vec<_> = targets.iter().filter_map(|(p, m)| self.openers(p, m)).collect();
-		let flat = grouped.iter().flatten().collect::<IndexSet<_>>();
+		let flat: IndexSet<_> = grouped.iter().flatten().copied().collect();
-		flat.into_iter().filter(|&o| grouped.iter().all(|g| g.contains(o))).copied().collect()
+		flat.into_iter().filter(|&o| grouped.iter().all(|g| g.contains(o))).collect()
 	}
 }
 
@@ -91,45 +78,3 @@ impl<'de> Deserialize<'de> for Open {
 		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)
-}

config/src/open/rule.rs

@@ -0,0 +1,58 @@
+use std::fmt;
+
+use serde::{de::{self, Visitor}, Deserialize, Deserializer};
+
+use crate::pattern::Pattern;
+
+#[derive(Debug, Deserialize)]
+pub(super) struct OpenRule {
+	pub(super) name: Option<Pattern>,
+	pub(super) mime: Option<Pattern>,
+	#[serde(rename = "use")]
+	#[serde(deserialize_with = "OpenRule::deserialize")]
+	pub(super) use_: Vec<String>,
+}
+
+impl OpenRule {
+	fn deserialize<'de, D>(deserializer: D) -> Result<Vec<String>, D::Error>
+	where
+		D: Deserializer<'de>,
+	{
+		struct UseVisitor;
+
+		impl<'de> Visitor<'de> for UseVisitor {
+			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 uses = Vec::new();
+				while let Some(use_) = seq.next_element::<String>()? {
+					uses.push(use_);
+				}
+				Ok(uses)
+			}
+
+			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(UseVisitor)
+	}
+}

core/src/tasks/tasks.rs

@@ -133,12 +133,8 @@ impl Tasks {
 
 	pub fn file_open(&self, targets: &[(impl AsRef<Path>, impl AsRef<str>)]) -> bool {
 		let mut openers = BTreeMap::new();
-		let valid_openers = targets
+		for (path, mime) in targets {
-			.iter()
+			if let Some(opener) = OPEN.openers(path, mime).and_then(|o| o.first().copied()) {
-			.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());
 			}
 		}