refactor: simplify the code

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

@@ -1,6 +1,4 @@
-use std::borrow::Cow;
-use std::ffi::{OsStr, OsString};
-use std::path::Path;
+use std::{borrow::Cow, ffi::{OsStr, OsString}, path::Path};
 
 use yazi_plugin::CLIPBOARD;
 use yazi_shared::event::Cmd;
@@ -8,13 +6,16 @@ use yazi_shared::event::Cmd;
 use crate::tab::Tab;
 
 struct Opt {
-	type_: String,
-	separator: PathSeparator,
+	type_:     String,
+	separator: Separator,
 }
 
 impl From<Cmd> for Opt {
 	fn from(mut c: Cmd) -> Self {
-		Self { type_: c.take_first_str().unwrap_or_default(), separator: PathSeparator::from(&c) }
+		Self {
+			type_:     c.take_first_str().unwrap_or_default(),
+			separator: c.str("separator").unwrap_or_default().into(),
+		}
 	}
 }
 
@@ -28,31 +29,13 @@ impl Tab {
 		let mut s = OsString::new();
 		let mut it = self.selected_or_hovered(true).peekable();
 		while let Some(u) = it.next() {
-			match opt.type_.as_str() {
-				"path" => {
-					match path_to_os_str(u, opt.separator) {
-						Cow::Borrowed(p) => s.push(p),
-						Cow::Owned(p) => s.push(&p),
-					};
-				}
-				"dirname" => {
-					if let Some(parent) = u.parent() {
-						match path_to_os_str(parent, opt.separator) {
-							Cow::Borrowed(p) => s.push(p),
-							Cow::Owned(p) => s.push(&p),
-						};
-					}
-				}
-				"filename" => {
-					s.push(u.name());
-				}
-				"name_without_ext" => {
-					if let Some(stem) = u.file_stem() {
-						s.push(stem);
-					}
-				}
+			s.push(match opt.type_.as_str() {
+				"path" => opt.separator.transform(u),
+				"dirname" => opt.separator.transform(u.parent().unwrap_or(Path::new(""))),
+				"filename" => opt.separator.transform(u.name()),
+				"name_without_ext" => opt.separator.transform(u.file_stem().unwrap_or_default()),
 				_ => return,
-			}
+			});
 			if it.peek().is_some() {
 				s.push("\n");
 			}
@@ -67,88 +50,31 @@ impl Tab {
 	}
 }
 
-#[derive(Default, Clone, Copy)]
-enum PathSeparator {
-	Unix,
-	#[default]
+// --- Separator
+#[derive(Clone, Copy, PartialEq, Eq)]
+enum Separator {
 	Auto,
+	Unix,
 }
 
-impl From<&Cmd> for PathSeparator {
-	fn from(c: &Cmd) -> Self {
-		match c.str("separator") {
-			Some("unix") => PathSeparator::Unix,
-			Some("auto") => PathSeparator::Auto,
-			_ => Default::default(),
+impl From<&str> for Separator {
+	fn from(value: &str) -> Self {
+		match value {
+			"unix" => Self::Unix,
+			_ => Self::Auto,
 		}
 	}
 }
 
-#[cfg(unix)]
-fn path_to_os_str(path: &Path, _separator: PathSeparator) -> Cow<'_, OsStr> {
-	Cow::Borrowed(path.as_os_str())
-}
-
-#[cfg(windows)]
-fn path_to_os_str(path: &Path, separator: PathSeparator) -> Cow<'_, OsStr> {
-	use yazi_shared::fs::backslash_to_slash;
-
-	match separator {
-		PathSeparator::Auto => Cow::Borrowed(path.as_os_str()),
-		PathSeparator::Unix => match backslash_to_slash(path) {
-			Cow::Borrowed(path) => Cow::Borrowed(path.as_os_str()),
-			Cow::Owned(path) => Cow::Owned(OsString::from(path)),
-		},
-	}
-}
-
-#[cfg(test)]
-mod tests {
-	use std::path::PathBuf;
-
-	use super::*;
-
-	#[cfg(windows)]
-	#[test]
-	fn test_path_to_os_str_windows_auto() {
-		let path = PathBuf::from("C:\\Users\\JohnDoe\\Downloads\\image.png");
-		assert_eq!(
-			path_to_os_str(&path, PathSeparator::Auto).to_str(),
-			Some("C:\\Users\\JohnDoe\\Downloads\\image.png"),
-			"windows-auto",
-		);
-	}
-
-	#[cfg(windows)]
-	#[test]
-	fn test_path_to_os_str_windows_unix() {
-		let path = PathBuf::from("C:\\Users\\JohnDoe\\Downloads\\image.png");
-		assert_eq!(
-			path_to_os_str(&path, PathSeparator::Unix).to_str(),
-			Some("C:/Users/JohnDoe/Downloads/image.png"),
-			"windows-unix",
-		);
-	}
-
-	#[cfg(unix)]
-	#[test]
-	fn test_path_to_os_str_unix_auto() {
-		let path = PathBuf::from("/home/johndoe/Downloads/image.png");
-		assert_eq!(
-			path_to_os_str(&path, PathSeparator::Auto).to_str(),
-			Some("/home/johndoe/Downloads/image.png"),
-			"unix-auto"
-		);
-	}
-
-	#[cfg(unix)]
-	#[test]
-	fn test_path_to_os_str_unix_unix() {
-		let path = PathBuf::from("/home/johndoe/Downloads/image.png");
-		assert_eq!(
-			path_to_os_str(&path, PathSeparator::Unix).to_str(),
-			Some("/home/johndoe/Downloads/image.png"),
-			"unix-unix"
-		);
+impl Separator {
+	fn transform<T: AsRef<Path> + ?Sized>(self, p: &T) -> Cow<OsStr> {
+		#[cfg(windows)]
+		if self == Self::Unix {
+			return match yazi_shared::fs::backslash_to_slash(p.as_ref()) {
+				Cow::Owned(p) => Cow::Owned(p.into_os_string()),
+				Cow::Borrowed(p) => Cow::Borrowed(p.as_os_str()),
+			};
+		}
+		Cow::Borrowed(p.as_ref().as_os_str())
 	}
 }