feat: support Unix path backend for the SFTP provider (#3371)

Author: sxyazi

Cargo.lock

@@ -60,7 +60,7 @@ impl File {
 				Url::Archive { loc: Loc::saturated(to.as_os().ok()?, kind), domain }
 			}
 			UrlBuf::Sftp { domain, .. } => {
-				Url::Sftp { loc: Loc::saturated(to.as_os().ok()?, kind), domain }
+				Url::Sftp { loc: Loc::saturated(to.as_unix().ok()?, kind), domain }
 			}
 		})
 	}

yazi-fs/src/file.rs

@@ -36,7 +36,10 @@ fn expand_url_impl<'a>(url: Url<'a>) -> UrlCow<'a> {
 		Url::Regular(_) => UrlBuf::Regular(loc),
 		Url::Search { domain, .. } => UrlBuf::Search { loc, domain: domain.intern() },
 		Url::Archive { domain, .. } => UrlBuf::Archive { loc, domain: domain.intern() },
-		Url::Sftp { domain, .. } => UrlBuf::Sftp { loc, domain: domain.intern() },
+		Url::Sftp { domain, .. } => {
+			todo!();
+			// UrlBuf::Sftp { loc, domain: domain.intern() }
+		}
 	};
 
 	absolute_url(expanded)

yazi-fs/src/path/expand.rs

@@ -17,3 +17,4 @@ parking_lot = { workspace = true }
 russh       = { workspace = true }
 serde       = { workspace = true }
 tokio       = { workspace = true }
+typed-path  = { workspace = true }

yazi-sftp/Cargo.toml

@@ -1,47 +1,31 @@
-use std::{borrow::Cow, ffi::OsStr, path::PathBuf, sync::Arc};
+use std::sync::Arc;
 
-use crate::{ByteStr, fs::Attrs};
+use typed_path::UnixPathBuf;
+
+use crate::fs::Attrs;
 
 pub struct DirEntry {
-	pub(super) dir:       Arc<ByteStr<'static>>,
-	pub(super) name:      ByteStr<'static>,
-	pub(super) long_name: ByteStr<'static>,
+	pub(super) dir:       Arc<typed_path::UnixPathBuf>,
+	pub(super) name:      Vec<u8>,
+	pub(super) long_name: Vec<u8>,
 	pub(super) attrs:     Attrs,
 }
 
 impl DirEntry {
 	#[must_use]
-	pub fn path(&self) -> PathBuf { self.dir.join(&self.name) }
+	pub fn path(&self) -> UnixPathBuf { self.dir.join(&self.name) }
 
-	#[must_use]
-	pub fn name(&self) -> Cow<'_, OsStr> { self.name.to_os_str() }
+	pub fn name(&self) -> &[u8] { &self.name }
 
-	#[must_use]
-	pub fn long_name(&self) -> Cow<'_, OsStr> { self.long_name.to_os_str() }
+	pub fn long_name(&self) -> &[u8] { &self.long_name }
 
 	pub fn attrs(&self) -> &Attrs { &self.attrs }
 
 	pub fn nlink(&self) -> Option<u64> { str::from_utf8(self.long_name_field(1)?).ok()?.parse().ok() }
 
-	pub fn user(&self) -> Option<Cow<'_, OsStr>> {
-		let b = self.long_name_field(2)?;
-		Some(unsafe {
-			match ByteStr::from_str_bytes_unchecked(b).to_os_str() {
-				Cow::Borrowed(_) => OsStr::from_encoded_bytes_unchecked(b).into(),
-				Cow::Owned(s) => s.into(),
-			}
-		})
-	}
+	pub fn user(&self) -> Option<&[u8]> { self.long_name_field(2) }
 
-	pub fn group(&self) -> Option<Cow<'_, OsStr>> {
-		let b = self.long_name_field(3)?;
-		Some(unsafe {
-			match ByteStr::from_str_bytes_unchecked(b).to_os_str() {
-				Cow::Borrowed(_) => OsStr::from_encoded_bytes_unchecked(b).into(),
-				Cow::Owned(s) => s.into(),
-			}
-		})
-	}
+	pub fn group(&self) -> Option<&[u8]> { self.long_name_field(3) }
 
 	fn long_name_field(&self, n: usize) -> Option<&[u8]> {
 		self.long_name.split(|b| b.is_ascii_whitespace()).filter(|s| !s.is_empty()).nth(n)

yazi-sftp/src/byte_str.rs

@@ -1,10 +1,10 @@
 use std::{mem, sync::Arc};
 
-use crate::{ByteStr, Error, Session, fs::DirEntry, requests, responses};
+use crate::{Error, Session, SftpPath, fs::DirEntry, requests, responses};
 
 pub struct ReadDir {
 	session: Arc<Session>,
-	dir:     Arc<ByteStr<'static>>,
+	dir:     Arc<typed_path::UnixPathBuf>,
 	handle:  String,
 
 	name:   responses::Name<'static>,
@@ -13,7 +13,7 @@ pub struct ReadDir {
 }
 
 impl ReadDir {
-	pub(crate) fn new(session: &Arc<Session>, dir: ByteStr, handle: String) -> Self {
+	pub(crate) fn new(session: &Arc<Session>, dir: SftpPath, handle: String) -> Self {
 		Self {
 			session: session.clone(),
 			dir: Arc::new(dir.into_owned()),
@@ -33,11 +33,11 @@ impl ReadDir {
 			};
 
 			self.cursor += 1;
-			if item.name != "." && item.name != ".." {
+			if &*item.name != b"." && &*item.name != b".." {
 				return Ok(Some(DirEntry {
 					dir:       self.dir.clone(),
-					name:      item.name,
-					long_name: item.long_name,
+					name:      item.name.into_owned(),
+					long_name: item.long_name.into_owned(),
 					attrs:     item.attrs,
 				}));
 			}

yazi-sftp/src/fs/dir_entry.rs

@@ -4,23 +4,21 @@ pub mod fs;
 pub mod requests;
 pub mod responses;
 
-mod byte_str;
 mod de;
 mod error;
 mod id;
 mod macros;
 mod operator;
 mod packet;
+mod path;
 mod ser;
 mod session;
-#[cfg(windows)]
-mod wtf;
 
-pub use byte_str::*;
 pub(crate) use de::*;
 pub use error::*;
 pub(crate) use id::*;
 pub use operator::*;
 pub use packet::*;
+pub use path::*;
 pub(crate) use ser::*;
 pub use session::*;