refactor: introduce LocBuf (#3062)

Author: sxyazi

yazi-actor/src/cmp/trigger.rs

@@ -5,7 +5,7 @@ use yazi_fs::{CWD, path::expand_url, provider};
 use yazi_macro::{act, render, succ};
 use yazi_parser::cmp::{CmpItem, ShowOpt, TriggerOpt};
 use yazi_proxy::CmpProxy;
-use yazi_shared::{OsStrSplit, event::Data, natsort, url::{Url, UrnBuf}};
+use yazi_shared::{OsStrSplit, event::Data, natsort, url::{UrlBuf, UrnBuf}};
 
 use crate::{Actor, Ctx};
 
@@ -66,8 +66,8 @@ impl Actor for Trigger {
 }
 
 impl Trigger {
-	fn split_url(s: &str) -> Option<(Url, UrnBuf)> {
-		let (scheme, path, ..) = Url::parse(s.as_bytes()).ok()?;
+	fn split_url(s: &str) -> Option<(UrlBuf, UrnBuf)> {
+		let (scheme, path, ..) = UrlBuf::parse(s.as_bytes()).ok()?;
 
 		if !scheme.is_virtual() && path.as_os_str() == "~" {
 			return None; // We don't autocomplete a `~`, but `~/`
@@ -79,8 +79,8 @@ impl Trigger {
 		const SEP: char = std::path::MAIN_SEPARATOR;
 
 		Some(match path.as_os_str().rsplit_once(SEP) {
-			Some((p, c)) if p.is_empty() => (Url { loc: MAIN_SEPARATOR_STR.into(), scheme }, c.into()),
-			Some((p, c)) => (expand_url(Url { loc: p.into(), scheme }), c.into()),
+			Some((p, c)) if p.is_empty() => (UrlBuf { loc: MAIN_SEPARATOR_STR.into(), scheme }, c.into()),
+			Some((p, c)) => (expand_url(UrlBuf { loc: p.into(), scheme }), c.into()),
 			None => (CWD.load().as_ref().clone(), path.into()),
 		})
 	}
@@ -95,7 +95,7 @@ mod tests {
 	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()) {
-			p = Url::from(&**u);
+			p = UrlBuf::from(&**u);
 		}
 		assert_eq!((p, c.as_urn()), (parent.parse().unwrap(), Urn::new(child)));
 	}

yazi-actor/src/context.rs

@@ -3,7 +3,7 @@ use std::ops::{Deref, DerefMut};
 use anyhow::{Result, anyhow};
 use yazi_core::{Core, mgr::Tabs, tab::{Folder, Tab}, tasks::Tasks};
 use yazi_fs::File;
-use yazi_shared::{Source, event::Cmd, url::Url};
+use yazi_shared::{Source, event::Cmd, url::UrlBuf};
 
 pub struct Ctx<'a> {
 	pub core:   &'a mut Core,
@@ -68,7 +68,7 @@ impl<'a> Ctx<'a> {
 	pub fn tab_mut(&mut self) -> &mut Tab { &mut self.core.mgr.tabs[self.tab] }
 
 	#[inline]
-	pub fn cwd(&self) -> &Url { self.tab().cwd() }
+	pub fn cwd(&self) -> &UrlBuf { self.tab().cwd() }
 
 	#[inline]
 	pub fn parent(&self) -> Option<&Folder> { self.tab().parent.as_ref() }

yazi-actor/src/mgr/bulk_rename.rs

@@ -10,7 +10,7 @@ use yazi_fs::{File, FilesOp, max_common_root, maybe_exists, path::skip_url, path
 use yazi_macro::{err, succ};
 use yazi_parser::VoidOpt;
 use yazi_proxy::{AppProxy, HIDER, TasksProxy, WATCHER};
-use yazi_shared::{OsStrJoin, event::Data, terminal_clear, url::{Component, Url}};
+use yazi_shared::{OsStrJoin, event::Data, terminal_clear, url::{Component, UrlBuf}};
 use yazi_term::tty::TTY;
 
 use crate::{Actor, Ctx};
@@ -73,7 +73,12 @@ impl Actor for BulkRename {
 }
 
 impl BulkRename {
-	async fn r#do(root: usize, old: Vec<Tuple>, new: Vec<Tuple>, selected: Vec<Url>) -> Result<()> {
+	async fn r#do(
+		root: usize,
+		old: Vec<Tuple>,
+		new: Vec<Tuple>,
+		selected: Vec<UrlBuf>,
+	) -> Result<()> {
 		terminal_clear(TTY.writer())?;
 		if old.len() != new.len() {
 			#[rustfmt::skip]
@@ -108,7 +113,7 @@ 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): (Url, Url) = (
+			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(),
 			);
@@ -138,7 +143,7 @@ impl BulkRename {
 	}
 
 	fn opener() -> Option<&'static OpenerRule> {
-		YAZI.opener.block(YAZI.open.all(Url::from(Path::new("bulk-rename.txt")), "text/plain"))
+		YAZI.opener.block(YAZI.open.all(UrlBuf::from(Path::new("bulk-rename.txt")), "text/plain"))
 	}
 
 	async fn output_failed(failed: Vec<(Tuple, Tuple, anyhow::Error)>) -> Result<()> {

yazi-actor/src/mgr/cd.rs

@@ -9,7 +9,7 @@ use yazi_fs::{File, FilesOp, path::expand_url};
 use yazi_macro::{act, err, render, succ};
 use yazi_parser::mgr::CdOpt;
 use yazi_proxy::{CmpProxy, InputProxy, MgrProxy};
-use yazi_shared::{Debounce, errors::InputError, event::Data, url::Url};
+use yazi_shared::{Debounce, errors::InputError, event::Data, url::UrlBuf};
 
 use crate::{Actor, Ctx};
 
@@ -76,7 +76,7 @@ impl Cd {
 			while let Some(result) = rx.next().await {
 				match result {
 					Ok(s) => {
-						let Ok(url) = Url::try_from(s).map(expand_url) else { return };
+						let Ok(url) = UrlBuf::try_from(s).map(expand_url) else { return };
 
 						let Ok(file) = File::new(url.clone()).await else { return };
 						if file.is_dir() {

yazi-actor/src/mgr/create.rs

@@ -4,7 +4,7 @@ use yazi_fs::{File, FilesOp, maybe_exists, ok_or_not_found, provider, realname};
 use yazi_macro::succ;
 use yazi_parser::mgr::CreateOpt;
 use yazi_proxy::{ConfirmProxy, InputProxy, MgrProxy, WATCHER};
-use yazi_shared::{event::Data, url::{Url, UrnBuf}};
+use yazi_shared::{event::Data, url::{UrlBuf, UrnBuf}};
 
 use crate::{Actor, Ctx};
 
@@ -40,7 +40,7 @@ impl Actor for Create {
 }
 
 impl Create {
-	async fn r#do(new: Url, dir: bool) -> Result<()> {
+	async fn r#do(new: UrlBuf, dir: bool) -> Result<()> {
 		let Some(parent) = new.parent_url() else { return Ok(()) };
 		let _permit = WATCHER.acquire().await.unwrap();
 

yazi-actor/src/mgr/open.rs

@@ -9,7 +9,7 @@ use yazi_macro::{act, succ};
 use yazi_parser::mgr::{OpenDoOpt, OpenOpt};
 use yazi_plugin::isolate;
 use yazi_proxy::{MgrProxy, PickProxy, TasksProxy};
-use yazi_shared::{MIME_DIR, event::{CmdCow, Data}, url::Url};
+use yazi_shared::{MIME_DIR, event::{CmdCow, Data}, url::UrlBuf};
 
 use crate::{Actor, Ctx, mgr::Quit};
 
@@ -110,7 +110,7 @@ impl Actor for OpenDo {
 }
 
 impl Open {
-	fn guess_folder(cx: &Ctx, url: &Url) -> bool {
+	fn guess_folder(cx: &Ctx, url: &UrlBuf) -> bool {
 		let Some(p) = url.parent_url() else {
 			return true;
 		};

yazi-actor/src/mgr/quit.rs

@@ -8,7 +8,7 @@ use yazi_dds::spark::SparkKind;
 use yazi_macro::{emit, succ};
 use yazi_parser::mgr::{OpenOpt, QuitOpt};
 use yazi_proxy::ConfirmProxy;
-use yazi_shared::{event::{Data, EventQuit}, url::Url};
+use yazi_shared::{event::{Data, EventQuit}, url::UrlBuf};
 
 use crate::{Actor, Ctx};
 
@@ -69,7 +69,7 @@ impl Actor for Quit {
 impl Quit {
 	pub(super) fn quit_with_selected<'a, I>(opt: OpenOpt, selected: I) -> bool
 	where
-		I: Iterator<Item = &'a Url>,
+		I: Iterator<Item = &'a UrlBuf>,
 	{
 		if opt.interactive || ARGS.chooser_file.is_none() {
 			return false;

yazi-actor/src/mgr/rename.rs

@@ -5,7 +5,7 @@ use yazi_fs::{File, FilesOp, maybe_exists, ok_or_not_found, paths_to_same_file,
 use yazi_macro::{act, err, succ};
 use yazi_parser::mgr::RenameOpt;
 use yazi_proxy::{ConfirmProxy, InputProxy, MgrProxy, WATCHER};
-use yazi_shared::{Id, event::Data, url::{Url, UrnBuf}};
+use yazi_shared::{Id, event::Data, url::{UrlBuf, UrnBuf}};
 
 use crate::{Actor, Ctx};
 
@@ -47,7 +47,7 @@ impl Actor for Rename {
 				return;
 			}
 
-			let new = Url::from(old.parent().unwrap().join(name));
+			let new = UrlBuf::from(old.parent().unwrap().join(name));
 			if opt.force || !maybe_exists(&new).await || paths_to_same_file(&old, &new).await {
 				Self::r#do(tab, old, new).await.ok();
 			} else if ConfirmProxy::show(ConfirmCfg::overwrite(&new)).await {
@@ -59,7 +59,7 @@ impl Actor for Rename {
 }
 
 impl Rename {
-	async fn r#do(tab: Id, old: Url, new: Url) -> Result<()> {
+	async fn r#do(tab: Id, old: UrlBuf, new: UrlBuf) -> Result<()> {
 		let Some((p_old, n_old)) = old.pair() else { return Ok(()) };
 		let Some((p_new, n_new)) = new.pair() else { return Ok(()) };
 		let _permit = WATCHER.acquire().await.unwrap();
@@ -85,7 +85,7 @@ impl Rename {
 		Ok(())
 	}
 
-	fn empty_url_part(url: &Url, by: &str) -> String {
+	fn empty_url_part(url: &UrlBuf, by: &str) -> String {
 		if by == "all" {
 			return String::new();
 		}

yazi-actor/src/mgr/yank.rs

@@ -2,7 +2,7 @@ use anyhow::Result;
 use yazi_core::mgr::Yanked;
 use yazi_macro::{act, render};
 use yazi_parser::mgr::YankOpt;
-use yazi_shared::{event::Data, url::CovUrl};
+use yazi_shared::{event::Data, url::UrlCov};
 
 use crate::{Actor, Ctx};
 
@@ -17,7 +17,7 @@ impl Actor for Yank {
 		act!(mgr:escape_visual, cx)?;
 
 		cx.mgr.yanked =
-			Yanked::new(opt.cut, cx.tab().selected_or_hovered().cloned().map(CovUrl).collect());
+			Yanked::new(opt.cut, cx.tab().selected_or_hovered().cloned().map(UrlCov).collect());
 		render!(cx.mgr.yanked.catchup_revision(true));
 
 		act!(mgr:escape_select, cx)

yazi-adapter/src/adapter.rs

@@ -3,7 +3,7 @@ use std::{env, fmt::Display};
 use anyhow::Result;
 use ratatui::layout::Rect;
 use tracing::warn;
-use yazi_shared::{env_exists, url::Url};
+use yazi_shared::{env_exists, url::UrlBuf};
 
 use crate::{Emulator, SHOWN, TMUX, drivers};
 
@@ -35,7 +35,7 @@ impl Display for Adapter {
 }
 
 impl Adapter {
-	pub async fn image_show(self, url: &Url, max: Rect) -> Result<Rect> {
+	pub async fn image_show(self, url: &UrlBuf, max: Rect) -> Result<Rect> {
 		if max.is_empty() {
 			return Ok(Rect::default());
 		}