feat: fine-grained peek and watch (#2655)

Author: sxyazi

yazi-core/src/mgr/commands/hover.rs

@@ -1,5 +1,3 @@
-use std::collections::HashSet;
-
 use yazi_dds::Pubsub;
 use yazi_macro::render;
 use yazi_shared::{Id, event::{CmdCow, Data}, url::{Url, Urn}};
@@ -29,21 +27,8 @@ impl Mgr {
 			self.current_or_mut(opt.tab).arrow(0);
 		}
 
-		// Repeek
-		self.peek(false);
-
 		// Refresh watcher
-		let mut to_watch = HashSet::with_capacity(3 * self.tabs.len());
-		for tab in self.tabs.iter() {
-			to_watch.insert(tab.cwd());
-			if let Some(ref p) = tab.parent {
-				to_watch.insert(&p.url);
-			}
-			if let Some(h) = tab.hovered().filter(|&h| h.is_dir()) {
-				to_watch.insert(&h.url);
-			}
-		}
-		self.watcher.watch(to_watch);
+		self.watch(());
 
 		// Publish through DDS
 		Pubsub::pub_from_hover(self.active().id, self.hovered().map(|h| &h.url));

yazi-core/src/mgr/commands/mod.rs

@@ -25,5 +25,6 @@ yazi_macro::mod_flat!(
 	update_paged
 	update_tasks
 	update_yanked
+	watch
 	yank
 );

yazi-core/src/mgr/commands/refresh.rs

@@ -21,7 +21,8 @@ impl Mgr {
 			self.watcher.trigger_dirs(&[self.current()]);
 		}
 
-		self.hover(None);
+		self.watch(());
+		self.peek(false);
 		self.update_paged((), tasks);
 
 		tasks.prework_sorted(&self.current().files);

yazi-core/src/mgr/commands/update_files.rs

@@ -22,14 +22,20 @@ impl Mgr {
 			return;
 		};
 
+		let revision = self.current().files.revision;
 		let linked: Vec<_> = LINKED.read().from_dir(opt.op.cwd()).map(|u| opt.op.rebase(u)).collect();
 		for op in [opt.op].into_iter().chain(linked) {
 			self.yanked.apply_op(&op);
 			self.update_tab(op, tasks);
 		}
 
 		render!(self.yanked.catchup_revision(false));
-		self.active_mut().apply_files_attrs();
+		if revision != self.current().files.revision {
+			self.active_mut().apply_files_attrs();
+			self.hover(None);
+			self.peek(false);
+			self.update_paged((), tasks);
+		}
 	}
 
 	fn update_tab(&mut self, op: FilesOp, tasks: &Tasks) {
@@ -71,8 +77,6 @@ impl Mgr {
 			return;
 		}
 
-		self.hover(None); // Re-hover
-		self.update_paged((), tasks); // Update for paged files
 		if calc {
 			tasks.prework_sorted(&self.current().files);
 		}

yazi-core/src/mgr/commands/update_paged.rs

@@ -20,7 +20,7 @@ impl From<()> for Opt {
 
 impl Mgr {
 	pub fn update_paged(&mut self, opt: impl TryInto<Opt>, tasks: &Tasks) {
-		let Ok(opt) = opt.try_into() else {
+		let Ok(opt): Result<Opt, _> = opt.try_into() else {
 			return;
 		};
 
@@ -29,7 +29,9 @@ impl Mgr {
 		}
 
 		let targets = self.current().paginate(opt.page.unwrap_or(self.current().page));
-		tasks.fetch_paged(targets, &self.mimetype);
-		tasks.preload_paged(targets, &self.mimetype);
+		if !targets.is_empty() {
+			tasks.fetch_paged(targets, &self.mimetype);
+			tasks.preload_paged(targets, &self.mimetype);
+		}
 	}
 }

yazi-core/src/mgr/commands/watch.rs

@@ -0,0 +1,31 @@
+use std::collections::HashSet;
+
+use yazi_shared::event::CmdCow;
+
+use crate::mgr::Mgr;
+
+struct Opt;
+
+impl From<CmdCow> for Opt {
+	fn from(_: CmdCow) -> Self { Self }
+}
+impl From<()> for Opt {
+	fn from((): ()) -> Self { Self }
+}
+
+impl Mgr {
+	#[yazi_codegen::command]
+	pub fn watch(&mut self, _: Opt) {
+		let mut to_watch = HashSet::with_capacity(3 * self.tabs.len());
+		for tab in self.tabs.iter() {
+			to_watch.insert(tab.cwd());
+			if let Some(ref p) = tab.parent {
+				to_watch.insert(&p.url);
+			}
+			if let Some(h) = tab.hovered().filter(|&h| h.is_dir()) {
+				to_watch.insert(&h.url);
+			}
+		}
+		self.watcher.watch(to_watch);
+	}
+}

yazi-core/src/tab/commands/arrow.rs

@@ -37,6 +37,7 @@ impl Tab {
 		}
 
 		MgrProxy::hover(None, self.id);
+		MgrProxy::peek(false);
 		render!();
 	}
 }

yazi-core/src/tab/commands/filter_do.rs

@@ -28,6 +28,7 @@ impl Tab {
 		self.current.repos(hovered.as_ref());
 		if self.hovered().map(|f| f.urn()) != hovered.as_ref().map(|u| u.as_urn()) {
 			MgrProxy::hover(None, self.id);
+			MgrProxy::peek(false);
 		}
 
 		render!();

yazi-core/src/tab/commands/hidden.rs

@@ -16,6 +16,7 @@ impl Tab {
 
 		if hovered.as_ref() != self.hovered().map(|f| &f.url) {
 			MgrProxy::hover(hovered, self.id);
+			MgrProxy::peek(false);
 		} else if self.hovered().is_some_and(|f| f.is_dir()) {
 			MgrProxy::peek(true);
 		}

yazi-core/src/tab/commands/reveal.rs

@@ -30,7 +30,9 @@ impl Tab {
 		};
 
 		self.cd(parent.clone());
+		// TODO
 		FilesOp::Creating(parent, vec![File::from_dummy(opt.target.clone(), None)]).emit();
 		MgrProxy::hover(Some(opt.target), self.id);
+		MgrProxy::peek(false);
 	}
 }