perf: introduce URN to speed up large directory file sorting (#1622)

yazi-adapter/src/ueberzug.rs

@@ -82,7 +82,6 @@ impl Ueberzug {
 	}
 
 	fn create_demon(adapter: Adapter) -> Result<Child> {
-		// TODO: demon
 		let result = Command::new("ueberzugpp")
 			.args(["layer", "-so", &adapter.to_string()])
 			.env("SPDLOG_LEVEL", if cfg!(debug_assertions) { "debug" } else { "" })

yazi-core/src/manager/commands/bulk_rename.rs

@@ -95,6 +95,7 @@ impl Manager {
 			}
 		}
 
+		// FIXME: consider old and new in the different directories
 		if !succeeded.is_empty() {
 			Pubsub::pub_from_bulk(succeeded.iter().map(|(u, f)| (u, f.url())).collect());
 			FilesOp::Upserting(cwd, succeeded).emit();

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

@@ -40,9 +40,9 @@ impl Manager {
 		// Refresh watcher
 		let mut to_watch = HashSet::with_capacity(3 * self.tabs.len());
 		for tab in self.tabs.iter() {
-			to_watch.insert(&tab.current.cwd);
+			to_watch.insert(tab.cwd());
 			if let Some(ref p) = tab.parent {
-				to_watch.insert(&p.cwd);
+				to_watch.insert(&p.loc);
 			}
 			if let Some(h) = tab.current.hovered().filter(|&h| h.is_dir()) {
 				to_watch.insert(h.url());

yazi-core/src/manager/commands/open.rs

@@ -111,7 +111,7 @@ impl Manager {
 
 		let find = |folder: Option<&Folder>| {
 			folder.is_some_and(|folder| {
-				folder.cwd == p && folder.files.iter().any(|f| f.is_dir() && url == f.url())
+				p == *folder.loc && folder.files.iter().any(|f| f.is_dir() && url == f.url())
 			})
 		};
 

yazi-core/src/manager/commands/tab_create.rs

@@ -46,7 +46,7 @@ impl Tabs {
 		} else {
 			tab.conf = self.active().conf.clone();
 			tab.apply_files_attrs();
-			tab.cd(self.active().current.cwd.clone());
+			tab.cd(self.active().cwd().clone());
 		}
 
 		self.items.insert(self.cursor + 1, tab);

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

@@ -47,9 +47,9 @@ impl Manager {
 		let url = op.url();
 		tab.selected.apply_op(&op);
 
-		if tab.current.cwd == *url {
+		if url == tab.cwd() {
 			Self::update_current(tab, op, tasks);
-		} else if matches!(&tab.parent, Some(p) if p.cwd == *url) {
+		} else if matches!(&tab.parent, Some(p) if url == &*p.loc) {
 			Self::update_parent(tab, op);
 		} else if matches!(tab.current.hovered(), Some(h) if url == h.url()) {
 			Self::update_hovered(tab, op);
@@ -59,7 +59,7 @@ impl Manager {
 	}
 
 	fn update_parent(tab: &mut Tab, op: Cow<FilesOp>) {
-		let cwd = tab.current.cwd.clone();
+		let cwd = tab.cwd().clone();
 		let leave = matches!(*op, FilesOp::Deleting(_, ref urls) if urls.contains(&cwd));
 
 		if let Some(f) = tab.parent.as_mut() {
@@ -108,7 +108,7 @@ impl Manager {
 	}
 
 	fn update_history(tab: &mut Tab, op: Cow<FilesOp>) {
-		let leave = tab.parent.as_ref().and_then(|f| f.cwd.parent_url().map(|p| (&f.cwd, p))).is_some_and(
+		let leave = tab.parent.as_ref().and_then(|f| f.loc.parent_url().map(|p| (&f.loc, p))).is_some_and(
 			|(p, pp)| matches!(*op, FilesOp::Deleting(ref parent, ref urls) if *parent == pp && urls.contains(p)),
 		);
 

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

@@ -27,7 +27,7 @@ impl Manager {
 			return;
 		};
 
-		if opt.only_if.is_some_and(|u| u != self.current().cwd) {
+		if opt.only_if.is_some_and(|u| u != *self.active().cwd()) {
 			return;
 		}
 

yazi-core/src/manager/manager.rs

@@ -41,7 +41,7 @@ impl Manager {
 
 impl Manager {
 	#[inline]
-	pub fn cwd(&self) -> &Url { &self.current().cwd }
+	pub fn cwd(&self) -> &Url { &self.current().loc }
 
 	#[inline]
 	pub fn active(&self) -> &Tab { self.tabs.active() }

yazi-core/src/manager/watcher.rs

@@ -60,8 +60,11 @@ impl Watcher {
 	}
 
 	pub(super) fn trigger_dirs(&self, folders: &[&Folder]) {
-		let todo: Vec<_> =
-			folders.iter().filter(|&f| f.cwd.is_regular()).map(|&f| (f.cwd.clone(), f.cha)).collect();
+		let todo: Vec<_> = folders
+			.iter()
+			.filter(|&f| f.loc.is_regular())
+			.map(|&f| (f.loc.url().clone(), f.cha))
+			.collect();
 		if todo.is_empty() {
 			return;
 		}

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

@@ -39,33 +39,33 @@ impl Tab {
 			return self.cd_interactive();
 		}
 
-		if self.current.cwd == opt.target {
+		if opt.target == *self.cwd() {
 			return;
 		}
 
 		// Take parent to history
 		if let Some(rep) = self.parent.take() {
-			self.history.insert(rep.cwd.clone(), rep);
+			self.history.insert(rep.loc.url().clone(), rep);
 		}
 
 		// Current
-		let rep = self.history_new(&opt.target);
+		let rep = self.history.remove_or(&opt.target);
 		let rep = mem::replace(&mut self.current, rep);
-		if rep.cwd.is_regular() {
-			self.history.insert(rep.cwd.clone(), rep);
+		if rep.loc.is_regular() {
+			self.history.insert(rep.loc.url().clone(), rep);
 		}
 
 		// Parent
 		if let Some(parent) = opt.target.parent_url() {
-			self.parent = Some(self.history_new(&parent));
+			self.parent = Some(self.history.remove_or(&parent));
 		}
 
 		// Backstack
 		if opt.target.is_regular() {
 			self.backstack.push(opt.target.clone());
 		}
 
-		Pubsub::pub_from_cd(self.idx, &self.current.cwd);
+		Pubsub::pub_from_cd(self.idx, self.cwd());
 		ManagerProxy::refresh();
 		render!();
 	}

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

@@ -92,7 +92,7 @@ impl Tab {
 	}
 
 	pub fn escape_search(&mut self) -> bool {
-		let b = self.current.cwd.is_search();
+		let b = self.cwd().is_search();
 		self.search_stop();
 
 		render_and!(b)
@@ -108,7 +108,7 @@ impl Tab {
 		let urls: Vec<_> =
 			indices.into_iter().filter_map(|i| self.current.files.get(i)).map(|f| f.url()).collect();
 
-		let same = !self.current.cwd.is_search();
+		let same = !self.cwd().is_search();
 		if !select {
 			self.selected.remove_many(&urls, same);
 		} else if self.selected.add_many(&urls, same) != urls.len() {

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

@@ -16,8 +16,8 @@ impl Tab {
 			.current
 			.hovered()
 			.and_then(|h| h.parent())
-			.filter(|p| *p != self.current.cwd)
-			.or_else(|| self.current.cwd.parent_url())
+			.filter(|p| p != self.cwd())
+			.or_else(|| self.cwd().parent_url())
 			.map(|u| self.cd(u));
 	}
 }

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

@@ -44,11 +44,10 @@ impl Tab {
 			handle.abort();
 		}
 
-		let mut cwd = self.current.cwd.clone();
+		let cwd = self.cwd().to_search(&opt.subject);
 		let hidden = self.conf.show_hidden;
 
 		self.search = Some(tokio::spawn(async move {
-			cwd = cwd.into_search(opt.subject.clone());
 			let rx = if opt.via == SearchOptVia::Rg {
 				external::rg(external::RgOpt {
 					cwd: cwd.clone(),
@@ -82,8 +81,8 @@ impl Tab {
 		if let Some(handle) = self.search.take() {
 			handle.abort();
 		}
-		if self.current.cwd.is_search() {
-			let rep = self.history_new(&self.current.cwd.to_regular());
+		if self.cwd().is_search() {
+			let rep = self.history.remove_or(&self.cwd().to_regular());
 			drop(mem::replace(&mut self.current, rep));
 			ManagerProxy::refresh();
 		}

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

@@ -31,7 +31,7 @@ impl Tab {
 			None => iter.partition(|&u| self.selected.contains_key(u)),
 		};
 
-		let same = !self.current.cwd.is_search();
+		let same = !self.cwd().is_search();
 		render!(self.selected.remove_many(&removal, same) > 0);
 
 		let added = self.selected.add_many(&addition, same);

yazi-core/src/tab/history.rs

@@ -0,0 +1,26 @@
+use std::{collections::HashMap, ops::{Deref, DerefMut}};
+
+use yazi_fs::Folder;
+use yazi_shared::fs::Url;
+
+#[derive(Default)]
+pub struct History(HashMap<Url, Folder>);
+
+impl Deref for History {
+	type Target = HashMap<Url, Folder>;
+
+	#[inline]
+	fn deref(&self) -> &Self::Target { &self.0 }
+}
+
+impl DerefMut for History {
+	#[inline]
+	fn deref_mut(&mut self) -> &mut Self::Target { &mut self.0 }
+}
+
+impl History {
+	#[inline]
+	pub fn remove_or(&mut self, url: &Url) -> Folder {
+		self.0.remove(url).unwrap_or_else(|| Folder::from(url))
+	}
+}

yazi-core/src/tab/mod.rs

@@ -2,6 +2,7 @@ mod backstack;
 mod commands;
 mod config;
 mod finder;
+mod history;
 mod mode;
 mod preview;
 mod selected;
@@ -10,6 +11,7 @@ mod tab;
 pub use backstack::*;
 pub use config::*;
 pub use finder::*;
+pub use history::*;
 pub use mode::*;
 pub use preview::*;
 pub use selected::*;

yazi-core/src/tab/tab.rs

@@ -1,4 +1,4 @@
-use std::{collections::HashMap, iter};
+use std::iter;
 
 use anyhow::Result;
 use ratatui::layout::Rect;
@@ -8,7 +8,7 @@ use yazi_config::{popup::{Origin, Position}, LAYOUT};
 use yazi_fs::{Folder, FolderStage};
 use yazi_shared::{fs::Url, render};
 
-use super::{Backstack, Config, Finder, Mode, Preview};
+use super::{Backstack, Config, Finder, History, Mode, Preview};
 use crate::tab::Selected;
 
 #[derive(Default)]
@@ -20,7 +20,7 @@ pub struct Tab {
 	pub parent:  Option<Folder>,
 
 	pub backstack: Backstack<Url>,
-	pub history:   HashMap<Url, Folder>,
+	pub history:   History,
 	pub selected:  Selected,
 
 	pub preview: Preview,
@@ -38,6 +38,9 @@ impl Tab {
 
 impl Tab {
 	// --- Current
+	#[inline]
+	pub fn cwd(&self) -> &Url { &self.current.loc }
+
 	pub fn hovered_rect(&self) -> Option<Rect> {
 		let y = self.current.files.position(self.current.hovered()?.url())? - self.current.offset;
 
@@ -83,10 +86,6 @@ impl Tab {
 	}
 
 	// --- History
-	#[inline]
-	pub fn history_new(&mut self, url: &Url) -> Folder {
-		self.history.remove(url).unwrap_or_else(|| Folder::from(url))
-	}
 
 	#[inline]
 	pub fn hovered_folder(&self) -> Option<&Folder> {
@@ -113,8 +112,8 @@ impl Tab {
 			apply(parent);
 
 			// The parent should always track the CWD
-			parent.hover(&self.current.cwd);
-			parent.tracing = parent.hovered().map(|h| h.url()) == Some(&self.current.cwd);
+			parent.hover(&self.current.loc);
+			parent.tracing = parent.hovered().map(|h| h.url()) == Some(&self.current.loc);
 		}
 
 		self

yazi-fm/src/lives/file.rs

@@ -46,11 +46,11 @@ impl File {
 				Ok(cx.manager.mimetype.get(me.url()).cloned())
 			});
 			reg.add_method("prefix", |lua, me, ()| {
-				if !me.folder().cwd.is_search() {
+				if !me.folder().loc.is_search() {
 					return Ok(None);
 				}
 
-				let mut p = me.url().strip_prefix(&me.folder().cwd).unwrap_or(me.url()).components();
+				let mut p = me.url().strip_prefix(&me.folder().loc).unwrap_or(me.url()).components();
 				p.next_back();
 				Some(lua.create_string(p.as_path().as_os_str().as_encoded_bytes())).transpose()
 			});
@@ -77,7 +77,7 @@ impl File {
 			});
 			reg.add_method("is_marked", |_, me, ()| {
 				use yazi_core::tab::Mode::*;
-				if !me.tab().mode.is_visual() || me.folder().cwd != me.tab().current.cwd {
+				if !me.tab().mode.is_visual() || me.folder().loc != me.tab().current.loc {
 					return Ok(0u8);
 				}
 
@@ -89,11 +89,11 @@ impl File {
 			});
 			reg.add_method("is_selected", |_, me, ()| Ok(me.tab().selected.contains_key(me.url())));
 			reg.add_method("in_parent", |_, me, ()| {
-				Ok(me.tab().parent.as_ref().is_some_and(|f| me.folder().cwd == f.cwd))
+				Ok(me.tab().parent.as_ref().is_some_and(|f| me.folder().loc == f.loc))
 			});
-			reg.add_method("in_current", |_, me, ()| Ok(me.folder().cwd == me.tab().current.cwd));
+			reg.add_method("in_current", |_, me, ()| Ok(me.folder().loc == me.tab().current.loc));
 			reg.add_method("in_preview", |_, me, ()| {
-				Ok(me.tab().current.hovered().is_some_and(|f| me.folder().cwd == *f.url()))
+				Ok(me.tab().current.hovered().is_some_and(|f| f.url() == &*me.folder().loc))
 			});
 			reg.add_method("found", |lua, me, ()| {
 				let cx = lua.named_registry_value::<CtxRef>("cx")?;
@@ -113,7 +113,7 @@ impl File {
 				let Some(finder) = &cx.manager.active().finder else {
 					return Ok(None);
 				};
-				if me.folder().cwd != me.tab().current.cwd {
+				if me.folder().loc != me.tab().current.loc {
 					return Ok(None);
 				}
 				let Some(h) = finder.filter.highlighted(me.name()) else {

yazi-fm/src/lives/folder.rs

@@ -38,7 +38,7 @@ impl Folder {
 
 	pub(super) fn register(lua: &Lua) -> mlua::Result<()> {
 		lua.register_userdata_type::<Self>(|reg| {
-			reg.add_field_method_get("cwd", |lua, me| Url::cast(lua, me.cwd.clone()));
+			reg.add_field_method_get("cwd", |lua, me| Url::cast(lua, me.loc.url().clone()));
 			reg.add_field_method_get("files", |_, me| Files::make(0..me.files.len(), me, me.tab()));
 			reg.add_field_method_get("stage", |lua, me| lua.create_any_userdata(me.stage));
 			reg.add_field_method_get("window", |_, me| Files::make(me.window.clone(), me, me.tab()));

yazi-fm/src/lives/tab.rs

@@ -24,15 +24,7 @@ impl Tab {
 	pub(super) fn register(lua: &Lua) -> mlua::Result<()> {
 		lua.register_userdata_type::<Self>(|reg| {
 			reg.add_method("name", |lua, me, ()| {
-				Some(
-					lua.create_string(
-						me.current
-							.cwd
-							.file_name()
-							.map_or(me.current.cwd.as_os_str().as_encoded_bytes(), |n| n.as_encoded_bytes()),
-					),
-				)
-				.transpose()
+				Some(lua.create_string(me.current.loc.name().as_encoded_bytes())).transpose()
 			});
 
 			reg.add_field_method_get("mode", |_, me| Mode::make(&me.mode));