fix(hok|cat,home): sort candidates

Signed-off-by: Chawye Hsu <[email protected]>
chawyehsu · Jul 25, 2023 · c90f3f9 · c90f3f9
1 parent 28b56c5
commit c90f3f9
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/src/clap_app.rs b/src/clap_app.rs
@@ -232,6 +232,7 @@ pub fn build() -> Command {
                         .help("Turn regex off and use explicit matching")
                         .short('e')
                         .long("explicit")
+                        .requires("query")
                         .action(ArgAction::SetTrue),
                 )
                 .arg(

diff --git a/src/cmd/cat.rs b/src/cmd/cat.rs
@@ -8,7 +8,7 @@ pub fn cmd_cat(matches: &ArgMatches, session: &Session) -> Result<()> {
     if let Some(query) = matches.get_one::<String>("package") {
         let queries = vec![query.as_str()];
         let options = vec![QueryOption::Explicit];
-        let result = operation::package_query(session, queries, options, false)?;
+        let mut result = operation::package_query(session, queries, options, false)?;
 
         if result.is_empty() {
             eprintln!("Could not find package named '{}'.", query)
@@ -17,6 +17,8 @@ pub fn cmd_cat(matches: &ArgMatches, session: &Session) -> Result<()> {
             let package = if length == 1 {
                 &result[0]
             } else {
+                result.sort_by_key(|p| p.ident());
+
                 println!("Found multiple packages named '{}':\n", query);
                 for (idx, pkg) in result.iter().enumerate() {
                     println!(

diff --git a/src/cmd/home.rs b/src/cmd/home.rs
@@ -8,7 +8,7 @@ pub fn cmd_home(matches: &ArgMatches, session: &Session) -> Result<()> {
     if let Some(query) = matches.get_one::<String>("package") {
         let queries = vec![query.as_str()];
         let options = vec![QueryOption::Explicit];
-        let result = operation::package_query(session, queries, options, false)?;
+        let mut result = operation::package_query(session, queries, options, false)?;
 
         match result.len() {
             0 => eprintln!("Could not find package named '{}'.", query),
@@ -22,6 +22,8 @@ pub fn cmd_home(matches: &ArgMatches, session: &Session) -> Result<()> {
                     .spawn()?;
             }
             _ => {
+                result.sort_by_key(|p| p.ident());
+
                 println!("Found multiple packages named '{}':\n", query);
                 for (idx, pkg) in result.iter().enumerate() {
                     println!(