Format files

Signed-off-by: Xuanwo <github@xuanwo.io>

yazi-config/src/lib.rs

@@ -19,13 +19,14 @@ pub mod theme;
 mod validation;
 pub mod which;
 
-use crate::schemes::Schemes;
 pub use layout::*;
 pub(crate) use pattern::*;
 pub(crate) use preset::*;
 pub use priority::*;
 use yazi_shared::fs::SCHEMES;
 
+use crate::schemes::Schemes;
+
 static MERGED_YAZI: RoCell<String> = RoCell::new();
 static MERGED_KEYMAP: RoCell<String> = RoCell::new();
 static MERGED_THEME: RoCell<String> = RoCell::new();

yazi-config/src/schemes/schemes.rs

@@ -1,6 +1,7 @@
+use std::collections::HashMap;
+
 use anyhow::Result;
 use serde::{Deserialize, Deserializer};
-use std::collections::HashMap;
 
 use crate::MERGED_YAZI;
 
@@ -11,9 +12,7 @@ pub struct Schemes {
 }
 
 impl Default for Schemes {
-	fn default() -> Self {
+	fn default() -> Self { toml::from_str(&MERGED_YAZI).unwrap() }
-		toml::from_str(&MERGED_YAZI).unwrap()
-	}
 }
 
 impl Schemes {
@@ -47,8 +46,8 @@ impl<'de> Deserialize<'de> for Schemes {
 /// Scheme in configuration file.
 #[derive(Debug, Deserialize)]
 pub struct Scheme {
-	pub name: String,
+	pub name:   String,
 	#[serde(rename = "type")]
-	pub typ: String,
+	pub typ:    String,
 	pub config: HashMap<String, String>,
 }

yazi-shared/src/fs/file.rs

@@ -1,31 +1,23 @@
-use std::ops::Add;
+use std::{cell::Cell, ffi::OsStr, fs::Metadata, ops::{Add, Deref}, time::{Duration, SystemTime}};
-use std::time::{Duration, SystemTime};
-use std::{cell::Cell, ffi::OsStr, fs::Metadata, ops::Deref};
 
 use anyhow::{anyhow, Result};
 use tokio::fs;
 
-use crate::fs::SCHEMES;
+use crate::{fs::{Cha, ChaKind, Url, SCHEMES}, theme::IconCache};
-use crate::{
-	fs::{Cha, ChaKind, Url},
-	theme::IconCache,
-};
 
 #[derive(Clone, Debug, Default)]
 pub struct File {
-	pub url: Url,
+	pub url:     Url,
-	pub cha: Cha,
+	pub cha:     Cha,
 	pub link_to: Option<Url>,
-	pub icon: Cell<IconCache>,
+	pub icon:    Cell<IconCache>,
 }
 
 impl Deref for File {
 	type Target = Cha;
 
 	#[inline]
-	fn deref(&self) -> &Self::Target {
+	fn deref(&self) -> &Self::Target { &self.cha }
-		&self.cha
-	}
 }
 
 impl File {
@@ -102,30 +94,20 @@ impl File {
 	}
 
 	#[inline]
-	pub fn from_dummy(url: &Url) -> Self {
+	pub fn from_dummy(url: &Url) -> Self { Self { url: url.to_owned(), ..Default::default() } }
-		Self { url: url.to_owned(), ..Default::default() }
-	}
 }
 
 impl File {
 	// --- Url
 	#[inline]
-	pub fn url(&self) -> Url {
+	pub fn url(&self) -> Url { self.url.clone() }
-		self.url.clone()
-	}
 
 	#[inline]
-	pub fn name(&self) -> Option<&OsStr> {
+	pub fn name(&self) -> Option<&OsStr> { self.url.file_name() }
-		self.url.file_name()
-	}
 
 	#[inline]
-	pub fn stem(&self) -> Option<&OsStr> {
+	pub fn stem(&self) -> Option<&OsStr> { self.url.file_stem() }
-		self.url.file_stem()
-	}
 
 	#[inline]
-	pub fn parent(&self) -> Option<Url> {
+	pub fn parent(&self) -> Option<Url> { self.url.parent_url() }
-		self.url.parent_url()
-	}
 }

yazi-shared/src/fs/schemes.rs

@@ -1,8 +1,9 @@
-use crate::RoCell;
+use std::{collections::HashMap, str::FromStr};
+
 use anyhow::{anyhow, Result};
 use opendal::Operator;
-use std::collections::HashMap;
+
-use std::str::FromStr;
+use crate::RoCell;
 
 /// SCHEMES is the read only cell of schemes that already loaded.
 pub static SCHEMES: RoCell<Schemes> = RoCell::new();

yazi-shared/src/fs/url.rs

@@ -1,9 +1,4 @@
-use std::{
+use std::{ffi::{OsStr, OsString}, fmt::{Debug, Display, Formatter}, ops::{Deref, DerefMut}, path::{Path, PathBuf}};
-	ffi::{OsStr, OsString},
-	fmt::{Debug, Display, Formatter},
-	ops::{Deref, DerefMut},
-	path::{Path, PathBuf},
-};
 
 use percent_encoding::{percent_decode_str, percent_encode, AsciiSet, CONTROLS};
 use serde::{Deserialize, Serialize};
@@ -13,8 +8,8 @@ const ENCODE_SET: &AsciiSet = &CONTROLS.add(b'#');
 #[derive(Clone, Default, Eq, Hash, Ord, PartialEq, PartialOrd)]
 pub struct Url {
 	scheme: UrlScheme,
-	path: PathBuf,
+	path:   PathBuf,
-	frag: String,
+	frag:   String,
 }
 
 #[derive(Clone, Default, Eq, Hash, Ord, PartialEq, PartialOrd)]
@@ -29,51 +24,35 @@ pub enum UrlScheme {
 impl Deref for Url {
 	type Target = PathBuf;
 
-	fn deref(&self) -> &Self::Target {
+	fn deref(&self) -> &Self::Target { &self.path }
-		&self.path
-	}
 }
 
 impl DerefMut for Url {
-	fn deref_mut(&mut self) -> &mut Self::Target {
+	fn deref_mut(&mut self) -> &mut Self::Target { &mut self.path }
-		&mut self.path
-	}
 }
 
 impl Debug for Url {
-	fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+	fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result { write!(f, "{}", self.path.display()) }
-		write!(f, "{}", self.path.display())
-	}
 }
 
 impl From<PathBuf> for Url {
-	fn from(path: PathBuf) -> Self {
+	fn from(path: PathBuf) -> Self { Self { path, ..Default::default() } }
-		Self { path, ..Default::default() }
-	}
 }
 
 impl From<&PathBuf> for Url {
-	fn from(path: &PathBuf) -> Self {
+	fn from(path: &PathBuf) -> Self { Self::from(path.clone()) }
-		Self::from(path.clone())
-	}
 }
 
 impl From<&Path> for Url {
-	fn from(path: &Path) -> Self {
+	fn from(path: &Path) -> Self { Self::from(path.to_path_buf()) }
-		Self::from(path.to_path_buf())
-	}
 }
 
 impl From<String> for Url {
-	fn from(path: String) -> Self {
+	fn from(path: String) -> Self { Self::from(path.as_str()) }
-		Self::from(path.as_str())
-	}
 }
 
 impl From<&String> for Url {
-	fn from(path: &String) -> Self {
+	fn from(path: &String) -> Self { Self::from(path.as_str()) }
-		Self::from(path.as_str())
-	}
 }
 
 impl From<&str> for Url {
@@ -107,21 +86,15 @@ impl From<&str> for Url {
 }
 
 impl AsRef<Url> for Url {
-	fn as_ref(&self) -> &Url {
+	fn as_ref(&self) -> &Url { self }
-		self
-	}
 }
 
 impl AsRef<Path> for Url {
-	fn as_ref(&self) -> &Path {
+	fn as_ref(&self) -> &Path { &self.path }
-		&self.path
-	}
 }
 
 impl AsRef<OsStr> for Url {
-	fn as_ref(&self) -> &OsStr {
+	fn as_ref(&self) -> &OsStr { self.path.as_os_str() }
-		self.path.as_os_str()
-	}
 }
 
 impl Display for Url {
@@ -175,9 +148,7 @@ impl Url {
 	}
 
 	#[inline]
-	pub fn into_os_string(self) -> OsString {
+	pub fn into_os_string(self) -> OsString { self.path.into_os_string() }
-		self.path.into_os_string()
-	}
 
 	#[cfg(unix)]
 	#[inline]
@@ -189,14 +160,10 @@ impl Url {
 impl Url {
 	// --- Scheme
 	#[inline]
-	pub fn is_regular(&self) -> bool {
+	pub fn is_regular(&self) -> bool { self.scheme == UrlScheme::Regular }
-		self.scheme == UrlScheme::Regular
-	}
 
 	#[inline]
-	pub fn to_regular(&self) -> Self {
+	pub fn to_regular(&self) -> Self { self.clone().into_regular() }
-		self.clone().into_regular()
-	}
 
 	#[inline]
 	pub fn into_regular(mut self) -> Self {
@@ -205,14 +172,10 @@ impl Url {
 	}
 
 	#[inline]
-	pub fn is_search(&self) -> bool {
+	pub fn is_search(&self) -> bool { self.scheme == UrlScheme::Search }
-		self.scheme == UrlScheme::Search
-	}
 
 	#[inline]
-	pub fn to_search(&self, frag: String) -> Self {
+	pub fn to_search(&self, frag: String) -> Self { self.clone().into_search(frag) }
-		self.clone().into_search(frag)
-	}
 
 	#[inline]
 	pub fn into_search(mut self, frag: String) -> Self {
@@ -222,14 +185,10 @@ impl Url {
 	}
 
 	#[inline]
-	pub fn is_archive(&self) -> bool {
+	pub fn is_archive(&self) -> bool { self.scheme == UrlScheme::Archive }
-		self.scheme == UrlScheme::Archive
-	}
 
 	#[inline]
-	pub fn to_archive(&self) -> Self {
+	pub fn to_archive(&self) -> Self { self.clone().into_archive() }
-		self.clone().into_archive()
-	}
 
 	#[inline]
 	pub fn into_archive(mut self) -> Self {
@@ -239,7 +198,8 @@ impl Url {
 
 	/// Check and fetch remote scheme.
 	///
-	/// Returns None if current url is not remote, otherwise returns `Some(scheme)`
+	/// Returns None if current url is not remote, otherwise returns
+	/// `Some(scheme)`
 	#[inline]
 	pub fn is_remote(&self) -> Option<&str> {
 		match &self.scheme {
@@ -250,15 +210,11 @@ impl Url {
 
 	// --- Path
 	#[inline]
-	pub fn set_path(&mut self, path: PathBuf) {
+	pub fn set_path(&mut self, path: PathBuf) { self.path = path; }
-		self.path = path;
-	}
 
 	// --- Frag
 	#[inline]
-	pub fn frag(&self) -> &str {
+	pub fn frag(&self) -> &str { &self.frag }
-		&self.frag
-	}
 }
 
 impl From<&str> for UrlScheme {