feat: add ext() method to Url userdata (#1528)

Author: sxyazi

Cargo.lock

@@ -20,7 +20,7 @@ crossterm     = { version = "0.27.0", features = [ "event-stream" ] }
 dirs          = "5.0.1"
 futures       = "0.3.30"
 globset       = "0.4.14"
-libc          = "0.2.156"
+libc          = "0.2.158"
 md-5          = "0.10.6"
 mlua          = { version = "0.9.9", features = [ "lua54", "serialize", "macros", "async" ] }
 parking_lot   = "0.12.3"
@@ -30,7 +30,7 @@ scopeguard    = "1.2.0"
 serde         = { version = "1.0.208", features = [ "derive" ] }
 serde_json    = "1.0.125"
 shell-words   = "1.1.0"
-tokio         = { version = "1.39.2", features = [ "full" ] }
+tokio         = { version = "1.39.3", features = [ "full" ] }
 tokio-stream  = "0.1.15"
 tokio-util    = "0.7.11"
 tracing       = { version = "0.1.40", features = [ "max_level_debug", "release_max_level_warn" ] }

Cargo.toml

@@ -20,7 +20,7 @@ serde = { workspace = true }
 
 [build-dependencies]
 clap                  = { workspace = true }
-clap_complete         = "4.5.16"
+clap_complete         = "4.5.19"
 clap_complete_fig     = "4.5.2"
 clap_complete_nushell = "4.5.3"
 vergen-gitcl          = { version = "1.0.0", features = [ "build" ] }

yazi-boot/Cargo.toml

@@ -28,7 +28,7 @@ yazi-shared = { path = "../yazi-shared", version = "0.3.1" }
 # External build dependencies
 anyhow                = { workspace = true }
 clap                  = { workspace = true }
-clap_complete         = "4.5.16"
+clap_complete         = "4.5.19"
 clap_complete_fig     = "4.5.2"
 clap_complete_nushell = "4.5.3"
 serde_json            = { workspace = true }

yazi-cli/Cargo.toml

@@ -13,8 +13,8 @@ pub struct Pattern {
 
 impl Pattern {
 	#[inline]
-	pub fn match_mime(&self, str: impl AsRef<str>) -> bool {
-		self.is_star || self.inner.is_match(str.as_ref())
+	pub fn match_mime(&self, mime: impl AsRef<str>) -> bool {
+		self.is_star || (!mime.as_ref().is_empty() && self.inner.is_match(mime.as_ref()))
 	}
 
 	#[inline]

yazi-config/src/pattern.rs

@@ -22,10 +22,10 @@ pub struct Fetcher {
 
 impl Fetcher {
 	#[inline]
-	pub fn matches(&self, path: &Path, mime: Option<&str>, f: impl Fn(&str) -> bool + Copy) -> bool {
+	pub fn matches(&self, path: &Path, mime: &str, f: impl Fn(&str) -> bool + Copy) -> bool {
 		self.if_.as_ref().and_then(|c| c.eval(f)) != Some(false)
-			&& (self.mime.as_ref().zip(mime).map_or(false, |(p, m)| p.match_mime(m))
-				|| self.name.as_ref().is_some_and(|p| p.match_path(path, mime == Some(MIME_DIR))))
+			&& (self.mime.as_ref().is_some_and(|p| p.match_mime(mime))
+				|| self.name.as_ref().is_some_and(|p| p.match_path(path, mime == MIME_DIR)))
 	}
 }
 

yazi-config/src/plugin/fetcher.rs

@@ -16,7 +16,7 @@ impl Plugin {
 	pub fn fetchers<'a>(
 		&'a self,
 		path: &'a Path,
-		mime: Option<&'a str>,
+		mime: &'a str,
 		factor: impl Fn(&str) -> bool + Copy,
 	) -> impl Iterator<Item = &'a Fetcher> {
 		let mut seen = HashSet::new();
@@ -32,7 +32,7 @@ impl Plugin {
 	pub fn preloaders<'a>(
 		&'a self,
 		path: &'a Path,
-		mime: Option<&'a str>,
+		mime: &'a str,
 	) -> impl Iterator<Item = &'a Preloader> {
 		let mut next = true;
 		self.preloaders.iter().filter(move |&p| {