feat: support setting combined sort methods in keymaps

Author: SuniRein

yazi-actor/src/mgr/sort.rs

@@ -1,6 +1,6 @@
 use anyhow::Result;
 use yazi_core::tab::Folder;
-use yazi_fs::{FilesSorter, FolderStage, SortBys};
+use yazi_fs::{FilesSorter, FolderStage};
 use yazi_macro::{act, render, render_and, succ};
 use yazi_parser::mgr::SortOpt;
 use yazi_shared::event::Data;
@@ -16,7 +16,7 @@ impl Actor for Sort {
 
 	fn act(cx: &mut Ctx, opt: Self::Options) -> Result<Data> {
 		let pref = &mut cx.tab_mut().pref;
-		opt.by.inspect(|by| pref.sort_by = SortBys(by.clone()));
+		pref.sort_by = opt.by.unwrap_or_else(|| pref.sort_by.clone());
 		pref.sort_reverse = opt.reverse.unwrap_or(pref.sort_reverse);
 		pref.sort_dir_first = opt.dir_first.unwrap_or(pref.sort_dir_first);
 		pref.sort_sensitive = opt.sensitive.unwrap_or(pref.sort_sensitive);

yazi-parser/src/mgr/sort.rs

@@ -1,12 +1,12 @@
 use std::str::FromStr;
 
 use mlua::{ExternalError, FromLua, IntoLua, Lua, Value};
-use yazi_fs::SortBy;
+use yazi_fs::{SortBy, SortBys};
 use yazi_shared::event::CmdCow;
 
 #[derive(Debug, Default)]
 pub struct SortOpt {
-	pub by:        Option<Vec<SortBy>>,
+	pub by:        Option<SortBys>,
 	pub reverse:   Option<bool>,
 	pub dir_first: Option<bool>,
 	pub sensitive: Option<bool>,
@@ -17,9 +17,11 @@ impl TryFrom<CmdCow> for SortOpt {
 	type Error = anyhow::Error;
 
 	fn try_from(c: CmdCow) -> Result<Self, Self::Error> {
+		let by =
+			(0..).map_while(|i| c.str(i)).map(SortBy::from_str).collect::<Result<Vec<SortBy>, _>>()?;
+
 		Ok(Self {
-			// TODO(SuniRein): multiple sort by methods
-			by:        c.first_str().map(SortBy::from_str).transpose()?.map(|v| vec![v]),
+			by:        if by.is_empty() { None } else { Some(SortBys(by)) },
 			reverse:   c.maybe_bool("reverse"),
 			dir_first: c.maybe_bool("dir-first"),
 			sensitive: c.maybe_bool("sensitive"),