Merge pull request #103 from wendajiang/master

fix
1. list plan crash
2. #93 
3. some typo fix

Author: wendajiang

src/cache/models.rs

@@ -290,7 +290,7 @@ impl std::fmt::Display for VerifyResult {
 
         match &self.status.status_code {
             10 => {
-                if self.correct_answer {
+                if matches!(self.result_type, Run::Test) && self.correct_answer {
                     // Pass Tests
                     write!(
                         f,
@@ -305,17 +305,20 @@ impl std::fmt::Display for VerifyResult {
                         &"\nExpected:".after_spaces(6),
                         eca,
                     )?
-                } else if !self.submit.compare_result.is_empty() {
+                } else if matches!(self.result_type, Run::Submit)
+                    && !self.submit.compare_result.is_empty()
+                {
+                    // only Submit execute this branch
                     // Submit Successfully
-                    // TODO: result shoule be all 1;
+                    // TODO: result should be all 1;
                     // Lines below are sucks...
                     let cache = super::Cache::new().expect("cache gen failed");
                     cache
                         .update_after_ac(
                             self.submit
                                 .question_id
                                 .parse()
-                                .expect("submit succcessfully, parse question_id to i32 failed"),
+                                .expect("submit successfully, parse question_id to i32 failed"),
                         )
                         .expect("update ac to cache failed");
 

src/cli.rs

@@ -8,6 +8,7 @@ use crate::{
     flag::{Debug, Flag},
 };
 use clap::{crate_name, crate_version};
+use log::LevelFilter;
 
 /// This should be called before calling any cli method or printing any output.
 pub fn reset_signal_pipe_handler() {
@@ -22,7 +23,7 @@ pub fn reset_signal_pipe_handler() {
     }
 }
 
-/// Get maches
+/// Get matches
 pub async fn main() -> Result<(), Error> {
     reset_signal_pipe_handler();
     let m = clap::Command::new(crate_name!())
@@ -41,10 +42,11 @@ pub async fn main() -> Result<(), Error> {
         .arg_required_else_help(true)
         .get_matches();
 
-    if m.contains_id("debug") {
+    if m.get_flag("debug") {
         Debug::handler()?;
     } else {
-        env_logger::Builder::from_env(env_logger::Env::new().default_filter_or("info"))
+        env_logger::Builder::new()
+            .filter_level(LevelFilter::Info)
             .format_timestamp(None)
             .init();
     }

src/cmds/edit.rs

@@ -40,6 +40,7 @@ impl Command for EditCommand {
                 Arg::new("id")
                     .num_args(1)
                     .required(true)
+                    .value_parser(clap::value_parser!(i32))
                     .help("question id"),
             )
     }
@@ -51,11 +52,7 @@ impl Command for EditCommand {
         use std::io::Write;
         use std::path::Path;
 
-        let id: i32 = m
-            .get_one::<String>("id")
-            .map(|s| s.as_str())
-            .ok_or(Error::NoneError)?
-            .parse()?;
+        let id = *m.get_one::<i32>("id").ok_or(Error::NoneError)?;
         let cache = Cache::new()?;
         let problem = cache.get_problem(id)?;
         let mut conf = cache.to_owned().0.conf;
@@ -67,7 +64,6 @@ impl Command for EditCommand {
         if m.contains_id("lang") {
             conf.code.lang = m
                 .get_one::<String>("lang")
-                .map(|s| s.as_str())
                 .ok_or(Error::NoneError)?
                 .to_string();
             conf.sync()?;

src/cmds/exec.rs

@@ -33,6 +33,7 @@ impl Command for ExecCommand {
                 Arg::new("id")
                     .num_args(1)
                     .required(true)
+                    .value_parser(clap::value_parser!(i32))
                     .help("question id"),
             )
     }
@@ -41,11 +42,7 @@ impl Command for ExecCommand {
     async fn handler(m: &ArgMatches) -> Result<(), crate::Error> {
         use crate::cache::{Cache, Run};
 
-        let id: i32 = m
-            .get_one::<String>("id")
-            .map(|s| s.as_str())
-            .ok_or(Error::NoneError)?
-            .parse()?;
+        let id: i32 = *m.get_one::<i32>("id").ok_or(Error::NoneError)?;
         let cache = Cache::new()?;
         let res = cache.exec_problem(id, Run::Submit, None).await?;
 

src/cmds/list.rs

@@ -102,6 +102,7 @@ impl Command for ListCommand {
                     .short('r')
                     .long("range")
                     .num_args(2..)
+                    .value_parser(clap::value_parser!(i32))
                     .help("Filter questions by id range"),
             )
             .after_help(LIST_AFTER_HELP)
@@ -148,15 +149,15 @@ impl Command for ListCommand {
         #[cfg(feature = "pym")]
         {
             if m.contains_id("plan") {
-                let ids = crate::pym::exec(m.value_of("plan").unwrap_or(""))?;
+                let ids = crate::pym::exec(m.get_one::<String>("plan").unwrap_or(&"".to_string()))?;
                 crate::helper::squash(&mut ps, ids)?;
             }
         }
 
         // filter tag
         if m.contains_id("tag") {
             let ids = cache
-                .get_tagged_questions(m.get_one::<String>("tag").map(|s| s.as_str()).unwrap_or(""))
+                .get_tagged_questions(m.get_one::<String>("tag").unwrap_or(&"".to_string()))
                 .await?;
             crate::helper::squash(&mut ps, ids)?;
         }
@@ -165,34 +166,31 @@ impl Command for ListCommand {
         if m.contains_id("category") {
             ps.retain(|x| {
                 x.category
-                    == m.get_one::<String>("category")
-                        .map(|s| s.as_str())
-                        .unwrap_or("algorithms")
+                    == *m
+                        .get_one::<String>("category")
+                        .unwrap_or(&"algorithms".to_string())
             });
         }
 
         // filter query
         if m.contains_id("query") {
-            let query = m
-                .get_one::<String>("query")
-                .map(|s| s.as_str())
-                .ok_or(Error::NoneError)?;
+            let query = m.get_one::<String>("query").ok_or(Error::NoneError)?;
             crate::helper::filter(&mut ps, query.to_string());
         }
 
         // filter range
         if m.contains_id("range") {
             let num_range: Vec<i32> = m
-                .get_many::<String>("range")
+                .get_many::<i32>("range")
                 .ok_or(Error::NoneError)?
+                .map(|id| *id)
                 .into_iter()
-                .map(|x| x.parse::<i32>().unwrap_or(0))
                 .collect();
             ps.retain(|x| num_range[0] <= x.fid && x.fid <= num_range[1]);
         }
 
         // retain if keyword exists
-        if let Some(keyword) = m.get_one::<String>("keyword").map(|s| s.as_str()) {
+        if let Some(keyword) = m.get_one::<String>("keyword") {
             let lowercase_kw = keyword.to_lowercase();
             ps.retain(|x| x.name.to_lowercase().contains(&lowercase_kw));
         }

src/cmds/pick.rs

@@ -47,7 +47,12 @@ impl Command for PickCommand {
         ClapCommand::new("pick")
             .about("Pick a problem")
             .visible_alias("p")
-            .arg(Arg::new("id").help("Problem id").num_args(1))
+            .arg(
+                Arg::new("id")
+                    .value_parser(clap::value_parser!(i32))
+                    .help("Problem id")
+                    .num_args(1),
+            )
             .arg(
                 Arg::new("plan")
                     .short('p')
@@ -96,11 +101,7 @@ impl Command for PickCommand {
         #[cfg(feature = "pym")]
         {
             if m.contains_id("plan") {
-                let ids = crate::pym::exec(
-                    m.get_one::<String>("plan")
-                        .map(|s| s.as_str())
-                        .unwrap_or(""),
-                )?;
+                let ids = crate::pym::exec(m.get_one::<String>("plan").unwrap_or(&"".to_string()))?;
                 crate::helper::squash(&mut problems, ids)?;
             }
         }
@@ -109,17 +110,14 @@ impl Command for PickCommand {
         if m.contains_id("tag") {
             let ids = cache
                 .clone()
-                .get_tagged_questions(m.get_one::<String>("tag").map(|s| s.as_str()).unwrap_or(""))
+                .get_tagged_questions(m.get_one::<String>("tag").unwrap_or(&"".to_string()))
                 .await?;
             crate::helper::squash(&mut problems, ids)?;
         }
 
         // query filter
         if m.contains_id("query") {
-            let query = m
-                .get_one::<String>("query")
-                .map(|s| s.as_str())
-                .ok_or(Error::NoneError)?;
+            let query = m.get_one::<String>("query").ok_or(Error::NoneError)?;
             crate::helper::filter(&mut problems, query.to_string());
         }
 
@@ -130,9 +128,8 @@ impl Command for PickCommand {
         };
 
         let fid = m
-            .get_one::<String>("id")
-            .map(|s| s.as_str())
-            .and_then(|id| id.parse::<i32>().ok())
+            .get_one::<i32>("id")
+            .map(|id| *id)
             .or(daily_id)
             .unwrap_or_else(|| {
                 // Pick random without specify id

src/cmds/test.rs

@@ -33,6 +33,7 @@ impl Command for TestCommand {
                 Arg::new("id")
                     .num_args(1)
                     .required(true)
+                    .value_parser(clap::value_parser!(i32))
                     .help("question id"),
             )
             .arg(
@@ -46,12 +47,8 @@ impl Command for TestCommand {
     /// `test` handler
     async fn handler(m: &ArgMatches) -> Result<(), Error> {
         use crate::cache::{Cache, Run};
-        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 id: i32 = *m.get_one::<i32>("id").ok_or(Error::NoneError)?;
+        let testcase = m.get_one::<String>("testcase");
         let case_str: Option<String> = match testcase {
             Some(case) => Option::from(case.replace("\\n", "\n")),
             _ => None,

src/flag.rs

@@ -7,7 +7,7 @@
 //!     -V, --version    Prints version information
 //! ```
 use crate::err::Error;
-use clap::Arg;
+use clap::{Arg, ArgAction};
 use env_logger::Env;
 
 /// Abstract flag trait
@@ -25,10 +25,11 @@ impl Flag for Debug {
             .short('d')
             .long("debug")
             .help("debug mode")
+            .action(ArgAction::SetTrue)
     }
 
     fn handler() -> Result<(), Error> {
-        env_logger::Builder::from_env(Env::default().default_filter_or("leetcode")).init();
+        env_logger::Builder::from_env(Env::default().default_filter_or("debug")).init();
 
         Ok(())
     }