Add pym mod and adapte the old config

clearloop · clearloop · commit 84bedb27de6a · 2020-01-08T02:25:21.000+08:00
diff --git a/Cargo.toml b/Cargo.toml
@@ -4,7 +4,7 @@ path = "src/bin/lc.rs"
 
 [package]
 name = "leetcode-cli"
-version = "0.2.2"
+version = "0.2.3"
 authors = ["clearloop <udtrokia@163.com>"]
 edition = "2018"
 description = "Leet your code in command-line."
@@ -31,4 +31,5 @@ reqwest = "0.9.24"
 serde = "1.0.104"
 serde_derive = "1.0.104"
 serde_json = "1.0.44"
+pyo3 = "0.8.5"
 toml = "0.5.5"
diff --git a/examples/pym.rs b/examples/pym.rs
@@ -0,0 +1,5 @@
+use leetcode_cli::pym;
+
+fn main() {
+    pym::exec("plan1").unwrap();
+}
diff --git a/src/cache/mod.rs b/src/cache/mod.rs
@@ -169,6 +169,10 @@ impl Cache {
         Ok(ids)
     }
 
+    pub fn get_tags(&self) -> Result<Vec<Tag>, Error> {
+        Ok(tags.load::<Tag>(&self.conn()?)?)
+    }
+
     /// run_code data
     fn pre_run_code(
         &self,
diff --git a/src/cfg.rs b/src/cfg.rs
@@ -7,7 +7,6 @@
 //! + Use `leetcode config` to update it
 use serde::{Deserialize, Serialize};
 use std::{collections::HashMap, fs, path::PathBuf};
-use toml;
 
 const DEFAULT_CONFIG: &str = r#"
 # usually you don't wanna change those
@@ -143,6 +142,7 @@ pub struct Storage {
     cache: String,
     code: String,
     root: String,
+    scripts: Option<String>,
 }
 
 impl Storage {
@@ -162,7 +162,7 @@ impl Storage {
             .to_string())
     }
 
-    /// get cache path
+    /// get code path
     pub fn code(&self) -> Result<String, crate::Error> {
         let root = &self.root()?;
         let p = PathBuf::from(root).join(&self.code);
@@ -172,6 +172,22 @@ impl Storage {
 
         Ok(p.to_string_lossy().to_string())
     }
+
+    /// get scripts path
+    pub fn scripts(mut self) -> Result<String, crate::Error> {
+        let root = &self.root()?;
+        if self.scripts.is_none() {
+            let tmp = toml::from_str::<Config>(&DEFAULT_CONFIG)?;
+            self.scripts = Some(tmp.storage.scripts?);
+        }
+
+        let p = PathBuf::from(root).join(&self.scripts?);
+        if !PathBuf::from(&p).exists() {
+            std::fs::create_dir(&p)?
+        }
+
+        Ok(p.to_string_lossy().to_string())
+    }
 }
 
 /// Locate lc's config file
@@ -182,12 +198,7 @@ pub fn locate() -> Result<Config, crate::Error> {
     }
 
     let s = fs::read_to_string(&conf)?;
-    let r = toml::from_str(&s);
-    if r.is_err() {
-        return Err(crate::Error::ParseError("toml parsed failed".to_string()));
-    }
-
-    Ok(r.unwrap())
+    Ok(toml::from_str::<Config>(&s)?)
 }
 
 /// Get root path of leetcode-cli
diff --git a/src/cli.rs b/src/cli.rs
@@ -13,7 +13,7 @@ use clap::{App, AppSettings};
 pub fn main() -> Result<(), Error> {
     let m = App::new("leetcode")
         .author("clearloop <udtrokia@163.com>")
-        .version("0.2.2")
+        .version("0.2.3")
         .about("Here's to the crazy ones 👻")
         .subcommands(vec![
             DataCommand::usage().display_order(1),
diff --git a/src/cmds/list.rs b/src/cmds/list.rs
@@ -80,6 +80,13 @@ impl Command for ListCommand {
                     .takes_value(true)
                     .help(CATEGORY_HELP),
             )
+            .arg(
+                Arg::with_name("plan")
+                    .short("p")
+                    .long("plan")
+                    .takes_value(true)
+                    .help("Invoking python scripts to filter questions"),
+            )
             .arg(
                 Arg::with_name("query")
                     .short("q")
@@ -114,7 +121,6 @@ impl Command for ListCommand {
     /// + matches with `-c` will override the default <all> keyword.
     /// + `-qs`
     fn handler(m: &ArgMatches) -> Result<(), Error> {
-        use std::collections::HashMap;
         trace!("Input list command...");
 
         let cache = Cache::new()?;
@@ -125,15 +131,16 @@ impl Command for ListCommand {
         }
 
         // filtering...
+        // pym scripts
+        if m.is_present("plan") {
+            let ids = crate::pym::exec(m.value_of("plan").unwrap_or(""))?;
+            crate::helper::squash(&mut ps, ids)?;
+        }
+
         // filter tag
         if m.is_present("tag") {
-            let mut map: HashMap<String, bool> = HashMap::new();
             let ids = cache.get_tagged_questions(m.value_of("tag").unwrap_or(""))?;
-            ids.iter().for_each(|x| {
-                map.insert(x.to_string(), true).unwrap_or_default();
-            });
-
-            ps.retain(|x| map.get(&x.id.to_string()).is_some());
+            crate::helper::squash(&mut ps, ids)?;
         }
 
         // filter category
diff --git a/src/cmds/pick.rs b/src/cmds/pick.rs
@@ -67,7 +67,6 @@ impl Command for PickCommand {
     fn handler(m: &ArgMatches) -> Result<(), Error> {
         use crate::cache::Cache;
         use rand::Rng;
-        use std::collections::HashMap;
 
         let cache = Cache::new()?;
         let mut problems = cache.get_problems()?;
@@ -76,17 +75,19 @@ impl Command for PickCommand {
             Self::handler(m)?
         }
 
+        // filtering...
+        // pym scripts
+        if m.is_present("plan") {
+            let ids = crate::pym::exec(m.value_of("plan").unwrap_or(""))?;
+            crate::helper::squash(&mut problems, ids)?;
+        }
+
         // tag filter
         if m.is_present("tag") {
-            let mut map: HashMap<String, bool> = HashMap::new();
             let ids = cache
                 .clone()
                 .get_tagged_questions(m.value_of("tag").unwrap_or(""))?;
-            ids.iter().for_each(|x| {
-                map.insert(x.to_string(), true).unwrap_or_default();
-            });
-
-            problems.retain(|x| map.get(&x.id.to_string()).is_some());
+            crate::helper::squash(&mut problems, ids)?;
         }
 
         // query filter
diff --git a/src/err.rs b/src/err.rs
@@ -1,4 +1,5 @@
 //! Errors in leetcode-cli
+use colored::Colorize;
 use std::error::Error as StdError;
 use std::fmt;
 
@@ -11,13 +12,13 @@ pub enum Error {
     ParseError(String),
     CacheError(String),
     FeatureError(String),
+    ScriptError(String),
     CookieError,
     DecryptError,
 }
 
 impl std::fmt::Debug for Error {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        use colored::Colorize;
         let e = "error:".bold().red();
         match self {
             Error::CacheError(s) => write!(f, "{} {}, please try again", e, s),
@@ -26,17 +27,20 @@ impl std::fmt::Debug for Error {
                 "{} {}{}{}{}{}",
                 e,
                 "Cannot get leetcode cookies from chrome, ",
-                "please make sure you have logined in leetcode.com with chrome. ".bold(),
+                "please make sure you have logined in leetcode.com with chrome. "
+                    .yellow()
+                    .bold(),
                 "Either you can handwrite your LEETCODE_SESSION and csrf to leetcode.toml, ",
                 "more info please checkout this: ",
                 "https://github.com/clearloop/leetcode-cli/blob/master/README.md#cookies"
             ),
             Error::DownloadError(s) => write!(f, "{} Download {} failed, please try again", e, s),
             Error::NetworkError(s) => write!(f, "{} {}, please try again", e, s),
-            Error::ParseError(s) => write!(f, "{} {}, please try again", e, s),
+            Error::ParseError(s) => write!(f, "{} {}", e, s),
             Error::FeatureError(s) => write!(f, "{} {}", e, s),
             Error::MatchError => write!(f, "{} Nothing matches", e),
             Error::DecryptError => write!(f, "{} openssl decrypt failed", e),
+            Error::ScriptError(s) => write!(f, "{} {}", e, s),
         }
     }
 }
@@ -72,7 +76,18 @@ impl std::convert::From<serde_json::error::Error> for Error {
 // toml
 impl std::convert::From<toml::de::Error> for Error {
     fn from(err: toml::de::Error) -> Self {
-        Error::ParseError(err.description().to_string())
+        Error::ParseError(format!(
+            "{}, {}{}{}{}{}{}{}{}",
+            err.description().to_string(),
+            "Parse config file failed, ",
+            "leetcode-cli has just generated a new leetcode.toml at ",
+            "~/.leetcode/leetcode_tmp.toml,".green().bold().underline(),
+            " the current one at ",
+            "~/.leetcode/leetcode.toml".yellow().bold().underline(),
+            "seems missing some keys, please compare to ",
+            "the tmp one and add them up : )\n",
+            ".",
+        ))
     }
 }
 
@@ -92,7 +107,13 @@ impl std::convert::From<std::io::Error> for Error {
 // options
 impl std::convert::From<std::option::NoneError> for Error {
     fn from(_: std::option::NoneError) -> Self {
-        Error::ParseError("json from response".to_string())
+        Error::ParseError(format!(
+            "{}{}{}{}",
+            "json from response parse failed, ",
+            "please open a new issue at: ",
+            "https://github.com/clearloop/leetcode-cli/".underline(),
+            "."
+        ))
     }
 }
 
@@ -102,3 +123,10 @@ impl std::convert::From<openssl::error::ErrorStack> for Error {
         Error::DecryptError
     }
 }
+
+// pyo3
+impl std::convert::From<pyo3::PyErr> for Error {
+    fn from(_: pyo3::PyErr) -> Self {
+        Error::ScriptError("Python script went Error".to_string())
+    }
+}
diff --git a/src/helper.rs b/src/helper.rs
@@ -1,7 +1,7 @@
 //! A set of helper traits
 pub use self::digit::Digit;
-pub use self::file::code_path;
-pub use self::filter::filter;
+pub use self::file::{code_path, load_script};
+pub use self::filter::{filter, squash};
 pub use self::html::HTML;
 
 /// Convert i32 to specific digits string.
@@ -76,6 +76,18 @@ mod filter {
             }
         }
     }
+
+    /// Squash questions and ids
+    pub fn squash(ps: &mut Vec<Problem>, ids: Vec<String>) -> Result<(), crate::Error> {
+        use std::collections::HashMap;
+
+        let mut map: HashMap<String, bool> = HashMap::new();
+        ids.iter().for_each(|x| {
+            map.insert(x.to_string(), true).unwrap_or_default();
+        });
+        ps.retain(|x| map.get(&x.id.to_string()).is_some());
+        Ok(())
+    }
 }
 
 /// Render html to command-line
@@ -214,4 +226,16 @@ mod file {
 
         Ok(path)
     }
+
+    /// Load python scripts
+    pub fn load_script(module: &str) -> Result<String, crate::Error> {
+        use std::fs::File;
+        use std::io::Read;
+        let conf = crate::cfg::locate()?;
+        let mut script = "".to_string();
+        File::open(format!("{}/{}.py", conf.storage.scripts()?, module))?
+            .read_to_string(&mut script)?;
+
+        Ok(script)
+    }
 }
diff --git a/src/lib.rs b/src/lib.rs
@@ -205,6 +205,7 @@ pub mod err;
 pub mod flag;
 pub mod helper;
 pub mod plugins;
+pub mod pym;
 // really pub
 pub mod cli;
 
diff --git a/src/plugins/chrome.rs b/src/plugins/chrome.rs
@@ -40,7 +40,6 @@ impl std::string::ToString for Ident {
 
 /// Get cookies from chrome storage
 pub fn cookies() -> Result<Ident, crate::Error> {
-    trace!("Derive cookies from google chrome...");
     let ccfg = crate::cfg::locate()?.cookies;
     if !ccfg.csrf.is_empty() && !ccfg.session.is_empty() {
         return Ok(Ident {
@@ -51,6 +50,8 @@ pub fn cookies() -> Result<Ident, crate::Error> {
 
     // If doesn't config SESSION and csrftoken
     use self::schema::cookies::dsl::*;
+    trace!("Derive cookies from google chrome...");
+
     let home = dirs::home_dir()?;
     let p = match std::env::consts::OS {
         "macos" => home.join("Library/Application Support/Google/Chrome/Default/Cookies"),
diff --git a/src/plugins/leetcode.rs b/src/plugins/leetcode.rs
@@ -38,7 +38,6 @@ impl LeetCode {
 
     /// New LeetCode client
     pub fn new() -> Result<LeetCode, crate::Error> {
-        trace!("Building reqwest client...");
         let conf = cfg::locate()?;
         let cookies = chrome::cookies()?;
         let default_headers = LeetCode::headers(
diff --git a/src/pym.rs b/src/pym.rs
@@ -0,0 +1,23 @@
+use crate::cache::Cache;
+use crate::helper::load_script;
+use pyo3::prelude::*;
+
+/// Exec python scripts as filter
+pub fn exec(module: &str) -> Result<Vec<String>, crate::Error> {
+    let script = load_script(&module)?;
+    let cache = Cache::new()?;
+
+    // pygil
+    let gil = Python::acquire_gil();
+    let py = gil.python();
+    let pym = PyModule::from_code(py, &script, "plan.py", "plan")?;
+
+    // args
+    let sps = serde_json::to_string(&cache.get_problems()?)?;
+    let stags = serde_json::to_string(&cache.get_tags()?)?;
+
+    // ret
+    let res: Vec<String> = pym.call1("plan", (sps, stags))?.extract()?;
+
+    Ok(res)
+}
