feat!: support passing arguments to previewer/preloader/spotter/fetch…

…er (#1966)
sxyazi · Nov 29, 2024 · 43473db · 43473db
1 parent 37292ad
commit 43473db
Show file tree

Hide file tree

Showing 54 changed files with 631 additions and 438 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -19,7 +19,7 @@ crossterm     = { version = "0.28.1", features = [ "event-stream" ] }
 dirs          = "5.0.1"
 futures       = "0.3.31"
 globset       = "0.4.15"
-libc          = "0.2.164"
+libc          = "0.2.166"
 md-5          = "0.10.6"
 mlua          = { version = "0.10.1", features = [ "anyhow", "async", "error-send", "lua54", "macros", "serialize" ] }
 parking_lot   = "0.12.3"
@@ -32,6 +32,6 @@ shell-words   = "1.1.0"
 tokio         = { version = "1.41.1", features = [ "full" ] }
 tokio-stream  = "0.1.16"
 tokio-util    = "0.7.12"
-tracing       = { version = "0.1.40", features = [ "max_level_debug", "release_max_level_debug" ] }
+tracing       = { version = "0.1.41", features = [ "max_level_debug", "release_max_level_debug" ] }
 unicode-width = "0.2.0"
 uzers         = "0.12.1"
diff --git a/README.md b/README.md
@@ -57,7 +57,6 @@ https://github.com/sxyazi/yazi/assets/17523360/92ff23fa-0cd5-4f04-b387-894c12265
 | [Tabby](https://github.com/Eugeny/tabby)                                    | [Inline images protocol][iip]          | ✅ Built-in                                   |
 | [VSCode](https://github.com/microsoft/vscode)                               | [Inline images protocol][iip]          | ✅ Built-in                                   |
 | [Rio](https://github.com/raphamorim/rio)                                    | [Inline images protocol][iip]          | ❌ Rio doesn't correctly clear images (#1786) |
-| [Mintty](https://github.com/mintty/mintty) (Git Bash)                       | [Inline images protocol][iip]          | ✅ Built-in                                   |
 | [Black Box](https://gitlab.gnome.org/raggesilver/blackbox)                  | [Sixel graphics format][sixel]         | ✅ Built-in                                   |
 | [Hyper](https://github.com/vercel/hyper)                                    | [Inline images protocol][iip]          | ✅ Built-in                                   |
 | X11 / Wayland                                                               | Window system protocol                 | ☑️ [Überzug++][ueberzug] required             |

diff --git a/yazi-boot/Cargo.toml b/yazi-boot/Cargo.toml
@@ -24,4 +24,4 @@ clap                  = { workspace = true }
 clap_complete         = "4.5.38"
 clap_complete_fig     = "4.5.2"
 clap_complete_nushell = "4.5.4"
-vergen-gitcl          = { version = "1.0.1", features = [ "build", "rustc" ] }
+vergen-gitcl          = { version = "1.0.2", features = [ "build", "rustc" ] }
diff --git a/yazi-cli/Cargo.toml b/yazi-cli/Cargo.toml
@@ -31,7 +31,7 @@ clap_complete         = "4.5.38"
 clap_complete_fig     = "4.5.2"
 clap_complete_nushell = "4.5.4"
 serde_json            = { workspace = true }
-vergen-gitcl          = { version = "1.0.1", features = [ "build" ] }
+vergen-gitcl          = { version = "1.0.2", features = [ "build" ] }
 
 [target.'cfg(target_os = "macos")'.dependencies]
 crossterm = { workspace = true, features = [ "use-dev-tty", "libc" ] }

diff --git a/yazi-config/src/keymap/cow.rs b/yazi-config/src/keymap/cow.rs
@@ -1,4 +1,4 @@
-use std::{collections::VecDeque, ops::Deref};
+use std::ops::Deref;
 
 use yazi_shared::event::CmdCow;
 
@@ -34,10 +34,10 @@ impl Default for ChordCow {
 }
 
 impl ChordCow {
-	pub fn into_seq(self) -> VecDeque<CmdCow> {
+	pub fn into_seq(self) -> Vec<CmdCow> {
 		match self {
-			Self::Owned(c) => c.run.into_iter().map(|c| c.into()).collect(),
-			Self::Borrowed(c) => c.run.iter().map(|c| c.into()).collect(),
+			Self::Owned(c) => c.run.into_iter().rev().map(|c| c.into()).collect(),
+			Self::Borrowed(c) => c.run.iter().rev().map(|c| c.into()).collect(),
 		}
 	}
 }
diff --git a/yazi-config/src/plugin/fetcher.rs b/yazi-config/src/plugin/fetcher.rs
@@ -28,16 +28,3 @@ impl Fetcher {
 				|| self.name.as_ref().is_some_and(|p| p.match_path(path, mime == MIME_DIR)))
 	}
 }
-
-#[derive(Debug, Clone)]
-pub struct FetcherProps {
-	pub id:   u8,
-	pub name: &'static str,
-	pub prio: Priority,
-}
-
-impl From<&'static Fetcher> for FetcherProps {
-	fn from(fetcher: &'static Fetcher) -> Self {
-		Self { id: fetcher.idx, name: &fetcher.run.name, prio: fetcher.prio }
-	}
-}
diff --git a/yazi-config/src/plugin/preloader.rs b/yazi-config/src/plugin/preloader.rs
@@ -26,16 +26,3 @@ impl Preloader {
 			|| self.name.as_ref().is_some_and(|p| p.match_path(path, mime == MIME_DIR))
 	}
 }
-
-#[derive(Debug, Clone)]
-pub struct PreloaderProps {
-	pub id:   u8,
-	pub name: &'static str,
-	pub prio: Priority,
-}
-
-impl From<&'static Preloader> for PreloaderProps {
-	fn from(preloader: &'static Preloader) -> Self {
-		Self { id: preloader.idx, name: &preloader.run.name, prio: preloader.prio }
-	}
-}
diff --git a/yazi-core/src/manager/commands/open.rs b/yazi-core/src/manager/commands/open.rs
@@ -7,7 +7,7 @@ use yazi_fs::Folder;
 use yazi_macro::emit;
 use yazi_plugin::isolate;
 use yazi_proxy::{ManagerProxy, TasksProxy, options::OpenDoOpt};
-use yazi_shared::{MIME_DIR, event::{CmdCow, EventQuit}, fs::{File, Url}};
+use yazi_shared::{MIME_DIR, event::{Cmd, CmdCow, EventQuit}, fs::{File, Url}};
 
 use crate::{manager::Manager, tasks::Tasks};
 
@@ -65,7 +65,7 @@ impl Manager {
 			}
 
 			done.extend(files.iter().map(|f| (f.url_owned(), String::new())));
-			if let Err(e) = isolate::fetch("mime", files).await {
+			if let Err(e) = isolate::fetch(Cmd::new("mime").into(), files).await {
 				error!("Fetch `mime` failed in opening: {e}");
 			}
 

diff --git a/yazi-core/src/manager/commands/update_mimes.rs b/yazi-core/src/manager/commands/update_mimes.rs
@@ -1,4 +1,4 @@
-use std::collections::HashMap;
+use std::{borrow::Cow, collections::HashMap};
 
 use tracing::error;
 use yazi_macro::render;
@@ -7,7 +7,7 @@ use yazi_shared::{event::CmdCow, fs::Url};
 use crate::{manager::{LINKED, Manager}, tasks::Tasks};
 
 pub struct Opt {
-	updates: HashMap<String, String>,
+	updates: HashMap<Cow<'static, str>, String>,
 }
 
 impl TryFrom<CmdCow> for Opt {
@@ -28,7 +28,7 @@ impl Manager {
 		let updates = opt
 			.updates
 			.into_iter()
-			.map(|(url, mime)| (Url::from(url), mime))
+			.map(|(url, mime)| (Url::from(url.into_owned()), mime))
 			.filter(|(url, mime)| self.mimetype.get(url) != Some(mime))
 			.fold(HashMap::new(), |mut map, (u, m)| {
 				for u in linked.from_file(&u) {

diff --git a/yazi-core/src/manager/watcher.rs b/yazi-core/src/manager/watcher.rs
@@ -9,7 +9,7 @@ use tracing::error;
 use yazi_fs::{Files, Folder};
 use yazi_plugin::isolate;
 use yazi_proxy::WATCHER;
-use yazi_shared::{RoCell, fs::{Cha, File, FilesOp, Url, realname_unchecked}};
+use yazi_shared::{RoCell, event::Cmd, fs::{Cha, File, FilesOp, Url, realname_unchecked}};
 
 use super::Linked;
 
@@ -151,7 +151,7 @@ impl Watcher {
 			}
 
 			FilesOp::mutate(ops);
-			if let Err(e) = isolate::fetch("mime", reload).await {
+			if let Err(e) = isolate::fetch(Cmd::new("mime").into(), reload).await {
 				error!("Fetch `mime` failed in watcher: {e}");
 			}
 		}

diff --git a/yazi-core/src/tab/commands/escape.rs b/yazi-core/src/tab/commands/escape.rs
@@ -18,7 +18,7 @@ bitflags! {
 impl From<CmdCow> for Opt {
 	fn from(c: CmdCow) -> Self {
 		c.args.iter().fold(Opt::empty(), |acc, (k, v)| {
-			match (k.as_str(), v.as_bool().unwrap_or(false)) {
+			match (k.as_str().unwrap_or(""), v.as_bool().unwrap_or(false)) {
 				("all", true) => Self::all(),
 				("find", true) => acc | Self::FIND,
 				("visual", true) => acc | Self::VISUAL,

diff --git a/yazi-core/src/tasks/plugin.rs b/yazi-core/src/tasks/plugin.rs
@@ -1,15 +1,11 @@
-use yazi_shared::event::Data;
+use yazi_proxy::options::PluginOpt;
 
 use super::Tasks;
 
 impl Tasks {
 	#[inline]
-	pub fn plugin_micro(&self, name: String, args: Vec<Data>) {
-		self.scheduler.plugin_micro(name, args);
-	}
+	pub fn plugin_micro(&self, opt: PluginOpt) { self.scheduler.plugin_micro(opt); }
 
 	#[inline]
-	pub fn plugin_macro(&self, name: String, args: Vec<Data>) {
-		self.scheduler.plugin_macro(name, args);
-	}
+	pub fn plugin_macro(&self, opt: PluginOpt) { self.scheduler.plugin_macro(opt); }
 }
diff --git a/yazi-core/src/tasks/preload.rs b/yazi-core/src/tasks/preload.rs
@@ -13,6 +13,7 @@ impl Tasks {
 			let mime = if f.is_dir() { MIME_DIR } else { mimetype.get(&f.url).unwrap_or_default() };
 			let factors = |s: &str| match s {
 				"mime" => !mime.is_empty(),
+				"dummy" => f.cha.is_dummy(),
 				_ => false,
 			};
 

diff --git a/yazi-dds/Cargo.toml b/yazi-dds/Cargo.toml
@@ -29,7 +29,7 @@ tokio-util   = { workspace = true }
 tracing      = { workspace = true }
 
 [build-dependencies]
-vergen-gitcl = { version = "1.0.1", features = [ "build" ] }
+vergen-gitcl = { version = "1.0.2", features = [ "build" ] }
 
 [target."cfg(unix)".dependencies]
 uzers = { workspace = true }
diff --git a/yazi-dds/src/body/yank.rs b/yazi-dds/src/body/yank.rs
@@ -43,6 +43,7 @@ impl IntoLua for BodyYank<'static> {
 }
 
 // --- Iterator
+#[derive(Clone)]
 pub struct BodyYankIter {
 	pub cut:  bool,
 	pub urls: Vec<Url>,