fix: runtime error

wendajiang · wendajiang · commit aebb9d52bac7 · 2022-10-22T23:51:10.000+08:00
diff --git a/src/cmds/edit.rs b/src/cmds/edit.rs
@@ -51,7 +51,11 @@ impl Command for EditCommand {
         use std::io::Write;
         use std::path::Path;
 
-        let id: i32 = m.get_one::<&str>("id").ok_or(Error::NoneError)?.parse()?;
+        let id: i32 = m
+            .get_one::<String>("id")
+            .map(|s| s.as_str())
+            .ok_or(Error::NoneError)?
+            .parse()?;
         let cache = Cache::new()?;
         let problem = cache.get_problem(id)?;
         let mut conf = cache.to_owned().0.conf;
@@ -62,7 +66,8 @@ impl Command for EditCommand {
         // condition language
         if m.contains_id("lang") {
             conf.code.lang = m
-                .get_one::<&str>("lang")
+                .get_one::<String>("lang")
+                .map(|s| s.as_str())
                 .ok_or(Error::NoneError)?
                 .to_string();
             conf.sync()?;
diff --git a/src/cmds/exec.rs b/src/cmds/exec.rs
@@ -41,7 +41,11 @@ impl Command for ExecCommand {
     async fn handler(m: &ArgMatches) -> Result<(), crate::Error> {
         use crate::cache::{Cache, Run};
 
-        let id: i32 = m.get_one::<&str>("id").ok_or(Error::NoneError)?.parse()?;
+        let id: i32 = m
+            .get_one::<String>("id")
+            .map(|s| s.as_str())
+            .ok_or(Error::NoneError)?
+            .parse()?;
         let cache = Cache::new()?;
         let res = cache.exec_problem(id, Run::Submit, None).await?;
 
diff --git a/src/cmds/list.rs b/src/cmds/list.rs
@@ -156,7 +156,7 @@ impl Command for ListCommand {
         // filter tag
         if m.contains_id("tag") {
             let ids = cache
-                .get_tagged_questions(m.get_one::<&str>("tag").copied().unwrap_or(""))
+                .get_tagged_questions(m.get_one::<String>("tag").map(|s| s.as_str()).unwrap_or(""))
                 .await?;
             crate::helper::squash(&mut ps, ids)?;
         }
@@ -165,15 +165,18 @@ impl Command for ListCommand {
         if m.contains_id("category") {
             ps.retain(|x| {
                 x.category
-                    == m.get_one::<&str>("category")
-                        .copied()
+                    == m.get_one::<String>("category")
+                        .map(|s| s.as_str())
                         .unwrap_or("algorithms")
             });
         }
 
         // filter query
         if m.contains_id("query") {
-            let query = m.get_one::<&str>("query").ok_or(Error::NoneError)?;
+            let query = m
+                .get_one::<String>("query")
+                .map(|s| s.as_str())
+                .ok_or(Error::NoneError)?;
             crate::helper::filter(&mut ps, query.to_string());
         }
 
@@ -189,7 +192,7 @@ impl Command for ListCommand {
         }
 
         // retain if keyword exists
-        if let Some(keyword) = m.get_one::<&str>("keyword") {
+        if let Some(keyword) = m.get_one::<String>("keyword").map(|s| s.as_str()) {
             let lowercase_kw = keyword.to_lowercase();
             ps.retain(|x| x.name.to_lowercase().contains(&lowercase_kw));
         }
diff --git a/src/cmds/pick.rs b/src/cmds/pick.rs
@@ -2,7 +2,7 @@
 use super::Command;
 use crate::err::Error;
 use async_trait::async_trait;
-use clap::{Arg, ArgMatches, Command as ClapCommand};
+use clap::{Arg, ArgAction, ArgMatches, Command as ClapCommand};
 /// Abstract pick command
 ///
 /// ```sh
@@ -73,8 +73,8 @@ impl Command for PickCommand {
                 Arg::new("daily")
                     .short('d')
                     .long("daily")
-                    .num_args(1)
-                    .help("Pick today's daily challenge"),
+                    .help("Pick today's daily challenge")
+                    .action(ArgAction::SetTrue),
             )
     }
 
@@ -96,7 +96,11 @@ impl Command for PickCommand {
         #[cfg(feature = "pym")]
         {
             if m.contains_id("plan") {
-                let ids = crate::pym::exec(m.get_one::<&str>("plan").unwrap_or(&""))?;
+                let ids = crate::pym::exec(
+                    m.get_one::<String>("plan")
+                        .map(|s| s.as_str())
+                        .unwrap_or(""),
+                )?;
                 crate::helper::squash(&mut problems, ids)?;
             }
         }
@@ -105,14 +109,17 @@ impl Command for PickCommand {
         if m.contains_id("tag") {
             let ids = cache
                 .clone()
-                .get_tagged_questions(m.get_one::<&str>("tag").unwrap_or(&""))
+                .get_tagged_questions(m.get_one::<String>("tag").map(|s| s.as_str()).unwrap_or(""))
                 .await?;
             crate::helper::squash(&mut problems, ids)?;
         }
 
         // query filter
         if m.contains_id("query") {
-            let query = m.get_one::<&str>("query").ok_or(Error::NoneError)?;
+            let query = m
+                .get_one::<String>("query")
+                .map(|s| s.as_str())
+                .ok_or(Error::NoneError)?;
             crate::helper::filter(&mut problems, query.to_string());
         }
 
@@ -123,7 +130,8 @@ impl Command for PickCommand {
         };
 
         let fid = m
-            .get_one::<&str>("id")
+            .get_one::<String>("id")
+            .map(|s| s.as_str())
             .and_then(|id| id.parse::<i32>().ok())
             .or(daily_id)
             .unwrap_or_else(|| {
diff --git a/src/cmds/test.rs b/src/cmds/test.rs
@@ -46,8 +46,12 @@ impl Command for TestCommand {
     /// `test` handler
     async fn handler(m: &ArgMatches) -> Result<(), Error> {
         use crate::cache::{Cache, Run};
-        let id: i32 = m.get_one::<&str>("id").ok_or(Error::NoneError)?.parse()?;
-        let testcase = m.get_one::<&str>("testcase");
+        let id: i32 = m
+            .get_one::<String>("id")
+            .map(|s| s.as_str())
+            .ok_or(Error::NoneError)?
+            .parse()?;
+        let testcase = m.get_one::<String>("testcase").map(|s| s.as_str());
         let case_str: Option<String> = match testcase {
             Some(case) => Option::from(case.replace("\\n", "\n")),
             _ => None,
