feat: multi-path architecture (#3334)

Author: sxyazi

Cargo.lock

@@ -48,6 +48,7 @@ scopeguard          = "1.2.0"
 serde               = { version = "1.0.228", features = [ "derive" ] }
 serde_json          = "1.0.145"
 syntect             = { version = "5.3.0", default-features = false, features = [ "parsing", "plist-load", "regex-onig" ] }
+thiserror           = "2.0.17"
 tokio               = { version = "1.48.0", features = [ "full" ] }
 tokio-stream        = "0.1.17"
 tokio-util          = "0.7.17"
@@ -61,4 +62,5 @@ uzers               = "0.12.1"
 format_push_string = "warn"
 implicit_clone     = "warn"
 module_inception   = "allow"
+unit_arg           = "allow"
 use_self           = "warn"

Cargo.toml

@@ -1 +1 @@
-{"language":"en","flagWords":[],"words":["Punct","KEYMAP","splitn","crossterm","YAZI","peekable","ratatui","syntect","pbpaste","pbcopy","oneshot","Posix","Lsar","XADDOS","zoxide","cands","Deque","precache","imageops","IFBLK","IFCHR","IFDIR","IFIFO","IFLNK","IFMT","IFSOCK","IRGRP","IROTH","IRUSR","ISGID","ISUID","ISVTX","IWGRP","IWOTH","IWUSR","IXGRP","IXOTH","IXUSR","libc","winsize","TIOCGWINSZ","xpixel","ypixel","ioerr","appender","Catppuccin","macchiato","gitmodules","Dotfiles","bashprofile","vimrc","flac","webp","exiftool","mediainfo","ripgrep","indexmap","indexmap","unwatch","canonicalize","serde","fsevent","Ueberzug","iterm","wezterm","sixel","chafa","ueberzugpp","Konsole","Überzug","pkgs","pdftoppm","poppler","singlefile","jpegopt","EXIF","rustfmt","mktemp","nanos","xclip","xsel","natord","Mintty","nixos","nixpkgs","SIGTSTP","SIGCONT","SIGCONT","mlua","nonstatic","userdata","metatable","natsort","backstack","luajit","Succ","Succ","cand","fileencoding","foldmethod","lightgreen","darkgray","lightred","lightyellow","lightcyan","nushell","msvc","aarch","linemode","sxyazi","rsplit","ZELLIJ","bitflags","bitflags","USERPROFILE","Neovim","vergen","gitcl","Renderable","preloaders","prec","Upserting","prio","Ghostty","Catmull","Lanczos","cmds","unyank","scrolloff","headsup","unsub","uzers","scopeguard","SPDLOG","globset","filetime","magick","magick","prefetcher","Prework","prefetchers","PREWORKERS","conds","translit","rxvt","Urxvt","realpath","realname","REPARSE","hardlink","hardlinking","nlink","nlink","linemodes","SIGSTOP","sevenzip","rsplitn","replacen","DECSET","DECRQM","repeek","cwds","tcsi","Hyprland","Wayfire","SWAYSOCK","btime","nsec","codegen","gethostname","fchmod","fdfind","Rustc","rustc","ffprobe","vframes","luma","obase","outln","errln","tmtheme","twox","cfgs","fstype","objc","rdev","runloop","exfat","rclone","DECRQSS","DECSCUSR","libvterm","Uninit","lockin","rposition","resvg","foldhash","tilded","futs","chdir","hashbrown","JEMALLOC","RUSTFLAGS","RDONLY","GETPATH","fcntl","casefold","inodes","Splatable","casefied"],"version":"0.2"}
+{"version":"0.2","flagWords":[],"language":"en","words":["Punct","KEYMAP","splitn","crossterm","YAZI","peekable","ratatui","syntect","pbpaste","pbcopy","oneshot","Posix","Lsar","XADDOS","zoxide","cands","Deque","precache","imageops","IFBLK","IFCHR","IFDIR","IFIFO","IFLNK","IFMT","IFSOCK","IRGRP","IROTH","IRUSR","ISGID","ISUID","ISVTX","IWGRP","IWOTH","IWUSR","IXGRP","IXOTH","IXUSR","libc","winsize","TIOCGWINSZ","xpixel","ypixel","ioerr","appender","Catppuccin","macchiato","gitmodules","Dotfiles","bashprofile","vimrc","flac","webp","exiftool","mediainfo","ripgrep","indexmap","indexmap","unwatch","canonicalize","serde","fsevent","Ueberzug","iterm","wezterm","sixel","chafa","ueberzugpp","Konsole","Überzug","pkgs","pdftoppm","poppler","singlefile","jpegopt","EXIF","rustfmt","mktemp","nanos","xclip","xsel","natord","Mintty","nixos","nixpkgs","SIGTSTP","SIGCONT","SIGCONT","mlua","nonstatic","userdata","metatable","natsort","backstack","luajit","Succ","Succ","cand","fileencoding","foldmethod","lightgreen","darkgray","lightred","lightyellow","lightcyan","nushell","msvc","aarch","linemode","sxyazi","rsplit","ZELLIJ","bitflags","bitflags","USERPROFILE","Neovim","vergen","gitcl","Renderable","preloaders","prec","Upserting","prio","Ghostty","Catmull","Lanczos","cmds","unyank","scrolloff","headsup","unsub","uzers","scopeguard","SPDLOG","globset","filetime","magick","magick","prefetcher","Prework","prefetchers","PREWORKERS","conds","translit","rxvt","Urxvt","realpath","realname","REPARSE","hardlink","hardlinking","nlink","nlink","linemodes","SIGSTOP","sevenzip","rsplitn","replacen","DECSET","DECRQM","repeek","cwds","tcsi","Hyprland","Wayfire","SWAYSOCK","btime","nsec","codegen","gethostname","fchmod","fdfind","Rustc","rustc","ffprobe","vframes","luma","obase","outln","errln","tmtheme","twox","cfgs","fstype","objc","rdev","runloop","exfat","rclone","DECRQSS","DECSCUSR","libvterm","Uninit","lockin","rposition","resvg","foldhash","tilded","futs","chdir","hashbrown","JEMALLOC","RUSTFLAGS","RDONLY","GETPATH","fcntl","casefold","inodes","Splatable","casefied","thiserror","memchr","memmem","russh","deadpool","keepalive","nodelay","publickey","deadpool"]}

cspell.json

@@ -1,9 +1,9 @@
-use std::{ffi::OsStr, mem, ops::ControlFlow};
+use std::{mem, ops::ControlFlow};
 
 use anyhow::Result;
 use yazi_macro::{render, succ};
 use yazi_parser::cmp::{CmpItem, ShowOpt};
-use yazi_shared::{data::Data, osstr_contains, osstr_starts_with};
+use yazi_shared::{data::Data, path::{AsPathDyn, PathDyn, PathLike}, strand::{AsStrand, StrandLike}};
 
 use crate::{Actor, Ctx};
 
@@ -30,7 +30,7 @@ impl Actor for Show {
 		};
 
 		cmp.ticket = opt.ticket;
-		cmp.cands = Self::match_candidates(opt.word.as_os_str(), cache);
+		cmp.cands = Self::match_candidates(opt.word.as_path_dyn(), cache);
 		if cmp.cands.is_empty() {
 			succ!(render!(mem::replace(&mut cmp.visible, false)));
 		}
@@ -43,16 +43,20 @@ impl Actor for Show {
 }
 
 impl Show {
-	fn match_candidates(word: &OsStr, cache: &[CmpItem]) -> Vec<CmpItem> {
-		let smart = !word.as_encoded_bytes().iter().any(|c| c.is_ascii_uppercase());
+	fn match_candidates(word: PathDyn, cache: &[CmpItem]) -> Vec<CmpItem> {
+		let smart = !word.encoded_bytes().iter().any(|&b| b.is_ascii_uppercase());
 
 		let flow = cache.iter().try_fold((Vec::new(), Vec::new()), |(mut exact, mut fuzzy), item| {
-			if osstr_starts_with(&item.name, word, smart) {
+			let name = item.name.as_strand();
+			let starts_with =
+				if smart { name.eq_ignore_ascii_case(word) } else { name.starts_with(word) };
+
+			if starts_with {
 				exact.push(item);
 				if exact.len() >= LIMIT {
 					return ControlFlow::Break((exact, fuzzy));
 				}
-			} else if fuzzy.len() < LIMIT - exact.len() && osstr_contains(&item.name, word) {
+			} else if fuzzy.len() < LIMIT - exact.len() && name.contains(word) {
 				// Here we don't break the control flow, since we want more exact matching.
 				fuzzy.push(item)
 			}

yazi-actor/src/cmp/show.rs

@@ -1,11 +1,11 @@
-use std::{ffi::OsString, mem, path::{MAIN_SEPARATOR_STR, PathBuf}};
+use std::{mem, path::MAIN_SEPARATOR_STR};
 
 use anyhow::Result;
 use yazi_fs::{CWD, path::expand_url, provider::{DirReader, FileHolder}};
 use yazi_macro::{act, render, succ};
 use yazi_parser::cmp::{CmpItem, ShowOpt, TriggerOpt};
 use yazi_proxy::CmpProxy;
-use yazi_shared::{OsStrSplit, data::Data, natsort, scheme::SchemeLike, url::{UrlBuf, UrlCow}};
+use yazi_shared::{AnyAsciiChar, data::Data, natsort, path::{AsPath, PathBufDyn, PathLike}, scheme::{SchemeCow, SchemeLike}, strand::StrandBufLike, url::{UrlBuf, UrlCow, UrlLike}};
 use yazi_vfs::provider;
 
 use crate::{Actor, Ctx};
@@ -32,7 +32,7 @@ impl Actor for Trigger {
 
 		if cmp.caches.contains_key(&parent) {
 			let ticket = cmp.ticket;
-			return act!(cmp:show, cx, ShowOpt { cache_name: parent, word, ticket, ..Default::default() });
+			return act!(cmp:show, cx, ShowOpt { cache: vec![], cache_name: parent, word, ticket });
 		}
 
 		let ticket = cmp.ticket;
@@ -42,8 +42,8 @@ impl Actor for Trigger {
 
 			// "/" is both a directory separator and the root directory per se
 			// As there's no parent directory for the FS root, it is a special case
-			if parent.loc.as_os_str() == "/" {
-				cache.push(CmpItem { name: OsString::new(), is_dir: true });
+			if parent.loc() == "/" {
+				cache.push(CmpItem { name: Default::default(), is_dir: true });
 			}
 
 			while let Ok(Some(ent)) = dir.next().await {
@@ -53,9 +53,8 @@ impl Actor for Trigger {
 			}
 
 			if !cache.is_empty() {
-				cache.sort_unstable_by(|a, b| {
-					natsort(a.name.as_encoded_bytes(), b.name.as_encoded_bytes(), false)
-				});
+				cache
+					.sort_unstable_by(|a, b| natsort(a.name.encoded_bytes(), b.name.encoded_bytes(), false));
 				CmpProxy::show(ShowOpt { cache, cache_name: parent, word, ticket });
 			}
 
@@ -67,37 +66,42 @@ impl Actor for Trigger {
 }
 
 impl Trigger {
-	fn split_url(s: &str) -> Option<(UrlBuf, PathBuf)> {
-		let (scheme, path, ..) = UrlCow::parse(s.as_bytes()).ok()?;
+	fn split_url(s: &str) -> Option<(UrlBuf, PathBufDyn)> {
+		let (scheme, path) = SchemeCow::parse(s.as_bytes()).ok()?;
 
-		if scheme.is_local() && path.as_os_str() == "~" {
+		if scheme.is_local() && path == "~" {
 			return None; // We don't autocomplete a `~`, but `~/`
 		}
 
-		#[cfg(windows)]
-		const SEP: &[char] = &['/', '\\'];
-		#[cfg(not(windows))]
-		const SEP: char = std::path::MAIN_SEPARATOR;
+		let sep = if cfg!(windows) {
+			AnyAsciiChar::new(&[b'/', b'\\']).unwrap()
+		} else {
+			AnyAsciiChar::new(&[b'/']).unwrap()
+		};
 
-		Some(match path.as_os_str().rsplit_once(SEP) {
+		Some(match path.as_path().rsplit_pred(sep) {
 			Some((p, c)) if p.is_empty() => {
-				(UrlBuf { loc: MAIN_SEPARATOR_STR.into(), scheme: scheme.into() }, c.into())
+				let root = PathBufDyn::with(scheme.kind(), MAIN_SEPARATOR_STR).expect("valid root");
+				(UrlCow::try_from((scheme, root)).ok()?.into_owned(), c.into())
+			}
+			Some((p, c)) => {
+				let parent = PathBufDyn::with(scheme.kind(), p.as_dyn()).expect("valid parent");
+				(expand_url(UrlCow::try_from((scheme, parent)).ok()?), c.into())
 			}
-			Some((p, c)) => (expand_url(UrlBuf { loc: p.into(), scheme: scheme.into() }), c.into()),
 			None => (CWD.load().as_ref().clone(), path.into()),
 		})
 	}
 }
 
 #[cfg(test)]
 mod tests {
-	use yazi_shared::url::UrlLike;
+	use yazi_shared::{path::PathBufLike, url::UrlLike};
 
 	use super::*;
 
 	fn compare(s: &str, parent: &str, child: &str) {
 		let (mut p, c) = Trigger::split_url(s).unwrap();
-		if let Some(u) = p.strip_prefix(yazi_fs::CWD.load().as_ref()) {
+		if let Ok(u) = p.try_strip_prefix(yazi_fs::CWD.load().as_ref()) {
 			p = UrlBuf::from(u);
 		}
 		assert_eq!((p, c.to_str().unwrap()), (parent.parse().unwrap(), child));

yazi-actor/src/cmp/trigger.rs

@@ -4,7 +4,7 @@ use mlua::{AnyUserData, IntoLua, UserData, UserDataFields, UserDataMethods, Valu
 use yazi_binding::Style;
 use yazi_config::THEME;
 use yazi_plugin::bindings::Range;
-use yazi_shared::url::UrlLike;
+use yazi_shared::{path::PathLike, url::UrlLike};
 
 use super::Lives;
 use crate::lives::PtrCell;
@@ -88,11 +88,8 @@ impl UserData for File {
 			if !me.url.has_trail() {
 				return Ok(None);
 			}
-			let Some(path) = me.url.as_path() else {
-				return Ok(None);
-			};
 
-			let mut comp = path.strip_prefix(me.url.loc.trail()).unwrap_or(path).components();
+			let mut comp = me.url.try_strip_prefix(me.url.trail()).unwrap_or(me.url.loc()).components();
 			comp.next_back();
 			Some(lua.create_string(comp.as_path().as_os_str().as_encoded_bytes())).transpose()
 		});

yazi-actor/src/lives/file.rs

@@ -2,7 +2,7 @@ use std::ops::Deref;
 
 use mlua::{AnyUserData, UserData, UserDataFields, UserDataMethods, Value};
 use yazi_binding::{Id, UrlRef, cached_field};
-use yazi_shared::url::UrlLike;
+use yazi_shared::{path::PathLike, strand::StrandLike, url::UrlLike};
 
 use super::{Finder, Folder, Lives, Mode, Preference, Preview, PtrCell, Selected};
 
@@ -47,7 +47,7 @@ impl UserData for Tab {
 		fields.add_field_method_get("id", |_, me| Ok(Id(me.id)));
 		cached_field!(fields, name, |lua, me| {
 			let url = &me.current.url;
-			lua.create_string(url.name().unwrap_or(url.loc.as_os_str()).as_encoded_bytes())
+			lua.create_string(url.name().map_or_else(|| url.loc().encoded_bytes(), |n| n.encoded_bytes()))
 		});
 
 		cached_field!(fields, mode, |_, me| Mode::make(&me.mode));

yazi-actor/src/lives/tab.rs

@@ -11,7 +11,7 @@ use yazi_fs::{File, FilesOp, Splatter, max_common_root, path::skip_url, provider
 use yazi_macro::{err, succ};
 use yazi_parser::VoidOpt;
 use yazi_proxy::{AppProxy, HIDER, TasksProxy};
-use yazi_shared::{OsStrJoin, data::Data, terminal_clear, url::{AsUrl, Component, UrlBuf, UrlCow, UrlLike}};
+use yazi_shared::{OsStrJoin, data::Data, path::PathDyn, terminal_clear, url::{AsUrl, UrlBuf, UrlCow, UrlLike}};
 use yazi_term::tty::TTY;
 use yazi_vfs::{VfsFile, maybe_exists, provider};
 use yazi_watcher::WATCHER;
@@ -50,7 +50,12 @@ impl Actor for BulkRename {
 				.write_all(old.join(OsStr::new("\n")).as_encoded_bytes())
 				.await?;
 
-			defer! { tokio::spawn(Local.remove_file(tmp.clone())); }
+			defer! {
+				let tmp = tmp.clone();
+				tokio::spawn(async move {
+					Local::regular(&tmp).remove_file().await
+				});
+			}
 			TasksProxy::process_exec(
 				cwd.into(),
 				Splatter::new(&[UrlCow::default(), tmp.as_url().into()]).splat(&opener.run),
@@ -64,8 +69,8 @@ impl Actor for BulkRename {
 			defer!(AppProxy::resume());
 			AppProxy::stop().await;
 
-			let new: Vec<_> = Local
-				.read_to_string(&tmp)
+			let new: Vec<_> = Local::regular(&tmp)
+				.read_to_string()
 				.await?
 				.lines()
 				.take(old.len())
@@ -120,10 +125,12 @@ impl BulkRename {
 		let permit = WATCHER.acquire().await.unwrap();
 		let (mut failed, mut succeeded) = (Vec::new(), HashMap::with_capacity(todo.len()));
 		for (o, n) in todo {
-			let (old, new): (UrlBuf, UrlBuf) = (
-				selected[o.0].components().take(root).chain([Component::Normal(&o)]).collect(),
-				selected[n.0].components().take(root).chain([Component::Normal(&n)]).collect(),
-			);
+			let (Ok(old), Ok(new)) =
+				(Self::replace_url(&selected[o.0], root, &o), Self::replace_url(&selected[n.0], root, &n))
+			else {
+				failed.push((o, n, anyhow!("Invalid new or old file name")));
+				continue;
+			};
 
 			if maybe_exists(&new).await && !provider::must_identical(&old, &new).await {
 				failed.push((o, n, anyhow!("Destination already exists")));
@@ -137,7 +144,7 @@ impl BulkRename {
 		}
 
 		if !succeeded.is_empty() {
-			let it = succeeded.iter().map(|(o, n)| (o, &n.url));
+			let it = succeeded.iter().map(|(o, n)| (o.as_url(), n.url.as_url()));
 			err!(Pubsub::pub_after_bulk(it));
 			FilesOp::rename(succeeded);
 		}
@@ -153,6 +160,10 @@ impl BulkRename {
 		YAZI.opener.block(YAZI.open.all(Path::new("bulk-rename.txt"), "text/plain"))
 	}
 
+	fn replace_url(url: &UrlBuf, take: usize, rep: &OsStr) -> Result<UrlBuf> {
+		Ok(url.try_replace(take, PathDyn::with(url.kind(), rep)?)?.into_owned())
+	}
+
 	async fn output_failed(failed: Vec<(Tuple, Tuple, anyhow::Error)>) -> Result<()> {
 		let mut stdout = TTY.lockout();
 		terminal_clear(&mut *stdout)?;

yazi-actor/src/mgr/bulk_rename.rs

@@ -1,5 +1,3 @@
-use std::ffi::OsString;
-
 use anyhow::{Result, bail};
 use yazi_macro::{act, succ};
 use yazi_parser::mgr::CopyOpt;
@@ -18,7 +16,7 @@ impl Actor for Copy {
 	fn act(cx: &mut Ctx, opt: Self::Options) -> Result<Data> {
 		act!(mgr:escape_visual, cx)?;
 
-		let mut s = OsString::new();
+		let mut s = Vec::<u8>::new();
 		let mut it = if opt.hovered {
 			Box::new(cx.hovered().map(|h| &h.url).into_iter())
 		} else {
@@ -30,29 +28,29 @@ impl Actor for Copy {
 			match opt.r#type.as_ref() {
 				// TODO: rename to "url"
 				"path" => {
-					s.push(opt.separator.transform(&u.os_str()));
+					s.extend_from_slice(&opt.separator.transform(&u.os_str()));
 				}
 				"dirname" => {
 					if let Some(p) = u.parent() {
-						s.push(opt.separator.transform(&p.os_str()));
+						s.extend_from_slice(&opt.separator.transform(&p.os_str()));
 					}
 				}
 				"filename" => {
-					s.push(opt.separator.transform(u.name().unwrap_or_default()));
+					s.extend_from_slice(&opt.separator.transform(&u.name().unwrap_or_default()));
 				}
 				"name_without_ext" => {
-					s.push(opt.separator.transform(u.stem().unwrap_or_default()));
+					s.extend_from_slice(&opt.separator.transform(&u.stem().unwrap_or_default()));
 				}
 				_ => bail!("Unknown copy type: {}", opt.r#type),
 			};
 			if it.peek().is_some() {
-				s.push("\n");
+				s.push(b'\n');
 			}
 		}
 
 		// Copy the CWD path regardless even if the directory is empty
 		if s.is_empty() && opt.r#type == "dirname" {
-			s.push(opt.separator.transform(&cx.cwd().os_str()));
+			s.extend_from_slice(&opt.separator.transform(&cx.cwd().os_str()));
 		}
 
 		futures::executor::block_on(CLIPBOARD.set(s));

yazi-actor/src/mgr/copy.rs

@@ -27,7 +27,10 @@ impl Actor for Create {
 				return;
 			}
 
-			let new = cwd.join(&name);
+			let Ok(new) = cwd.try_join(&name) else {
+				return;
+			};
+
 			if !opt.force
 				&& maybe_exists(&new).await
 				&& !ConfirmProxy::show(ConfirmCfg::overwrite(&new)).await