mroot/yazi
1
0
Fork 0
mirror of https://github.com/sxyazi/yazi.git synced 2026-07-25 08:41:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

feat: Enable the ability to sort the which key

Browse source 
formatted properly
This commit is contained in:
coolabhays 2024-02-11 20:36:03 +05:30
parent f6b4c923b4
commit 79f63a9ae2
7 changed files with 64 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
yazi-config/src/lib.rs
View file

@ -17,8 +17,8 @@ mod priority;
mod tasks; mod tasks;
pub mod theme; pub mod theme;
mod validation; mod validation;
mod xdg;
pub mod which; pub mod which;
mod xdg;
pub use layout::*; pub use layout::*;
pub(crate) use pattern::*; pub(crate) use pattern::*;

9
yazi-config/src/which/sorting.rs
View file

@ -20,7 +20,7 @@ impl FromStr for SortBy {
"none" => Self::None, "none" => Self::None,
"key" => Self::Key, "key" => Self::Key,
"desc" => Self::Desc, "desc" => Self::Desc,
_ => bail!("Invalid sort option: {s}") _ => bail!("Invalid sort option: {s}"),
}) })
} }
} }
@ -28,9 +28,7 @@ impl FromStr for SortBy {
impl TryFrom<String> for SortBy { impl TryFrom<String> for SortBy {
type Error = anyhow::Error; type Error = anyhow::Error;
fn try_from(value: String) -> Result<Self, Self::Error> { fn try_from(value: String) -> Result<Self, Self::Error> { Self::from_str(&value) }
Self::from_str(&value)
}
} }
impl ToString for SortBy { impl ToString for SortBy {
@ -39,6 +37,7 @@ impl ToString for SortBy {
Self::None => "none", Self::None => "none",
Self::Key => "key", Self::Key => "key",
Self::Desc => "desc", Self::Desc => "desc",
}.to_string() }
.to_string()
} }
} }

7
yazi-core/src/which/config.rs
View file

@ -22,12 +22,6 @@ impl Default for Config {
} }
impl Config { impl Config {
#[allow(unused)]
pub(super) fn patch<F: FnOnce(&mut Self)>(&mut self, f: F) -> bool {
let old = self.clone();
f(self);
*self != old
}
#[inline] #[inline]
pub(super) fn sorter(&self) -> WhichSorter { pub(super) fn sorter(&self) -> WhichSorter {
@ -38,4 +32,3 @@ impl Config {
} }
} }
} }

4
yazi-core/src/which/mod.rs
View file

@ -1,8 +1,8 @@
mod commands; mod commands;
mod which;
mod config; mod config;
mod sorter; mod sorter;
mod which;
pub use which::*;
pub use config::*; pub use config::*;
pub use sorter::*; pub use sorter::*;
pub use which::*;

5
yazi-core/src/which/sorter.rs
View file

@ -1,4 +1,4 @@
use yazi_config::{which::SortBy, keymap::ControlCow}; use yazi_config::{keymap::ControlCow, which::SortBy};
use yazi_shared::natsort; use yazi_shared::natsort;
#[derive(Clone, Copy, Default, PartialEq)] #[derive(Clone, Copy, Default, PartialEq)]
@ -30,10 +30,9 @@ impl WhichSorter {
// what if description isn't present (need to check if it's mandatory or not) // what if description isn't present (need to check if it's mandatory or not)
// in case if it is not present, should I just panic ? // in case if it is not present, should I just panic ?
by_alphabetical(a.desc.as_ref().unwrap(), b.desc.as_ref().unwrap()) by_alphabetical(a.desc.as_ref().unwrap(), b.desc.as_ref().unwrap())
}) }),
} }
true true
} }
} }