update err print, add dashed line to make html pretty

Author: clearloop

README.md

@@ -18,17 +18,15 @@ the DEADLINE is `Sub Jan 5 23:59:59 CST 2020`.
 
 Please make sure you have logined in `leetcode.com` with `chrome`.
 
-## Features
-
-What's the difference between `lc-rs` and skygragon's [leetcode-cli][sky]?
 
-**Here are three features in `lc-rs`**:
+## Features
 
-1. the edit flow —— solution file will generate automatically!
+1. the edit flow —— solution files will generate automatically!
 2. doc support, `lc-rs` can compile the annotation of your solutions to markdown!
  1. btw, generate a site is easy for `lc-rs`!
 3. support local signal to keep coding as longer as you want.
 
+
 ## Example
 
 For example, if your config is:
@@ -42,15 +40,15 @@ lang = "rust"
 editor = "emacs"
 ```
 
-### 1. <kbd>pick</kbd> a question:
+#### 1. <kbd>pick</kbd> a question:
 
 ```
 leetcode pick 1
 ```
 
 `lc-rs` will generate `1.two-sum.alogrithms` at `~/.leetcode/code/1.two-sum.algorithms.rs`
 
-### 2. <kbd>edit</kbd> it
+#### 2. <kbd>edit</kbd> it
 
 ```
 leetcode edit 1
@@ -74,8 +72,6 @@ leetcode test 1
 leetcode submit 1
 ```
 
-Enjoy Coding!
-
 
 ## Building
 

ROADMAP.md

@@ -1,13 +1,20 @@
-# Deadline
+# Deadline 
 Sub Jan 5 23:59:59 CST 2020
 
 # Abstract
 ## 4.Display
+1. render html to plain text in command line
+2. check every char in token stream
+3. a smarter way -> just styled `Example`、`Input`、`Output`, `Explantion`
 
 ## 3.Make Commands
 
 ## 2.Serialize leetcode data
-1. Parse json Error handling, dead-lock, no panic.
+1. parse json Error handling
+2. serialize with every `Result`
+3. implement `convert` for packages' Error to local Error and use `?`
+3. use serde features to handle `de` and `ser`
+4. roll back, handwrite parser.
 
 ## 1.Write down all leetcode api.
 

src/cache/mod.rs

@@ -69,9 +69,16 @@ impl Cache {
  .filter(fid.eq(rfid))
  .first(&self.conn())?;
 
+ let ids = match target.level {
+ 1 => target.fid.to_string().green(),
+ 2 => target.fid.to_string().yellow(),
+ 3 => target.fid.to_string().red(),
+ _ => target.fid.to_string().dimmed(),
+ };
+ 
  println!(
  "\n[{}] {} {}\n\n",
- &target.fid.to_string().green(),
+ &ids,
  &target.name.bold().underline(),
  "is on the run...".dimmed()
  );

src/cache/models.rs

@@ -1,8 +1,9 @@
 //! Leetcode data modelsA
 use colored::Colorize;
 use serde::{Serialize, Deserialize};
-pub use self::question::*;
 use super::schemas::problems;
+use crate::helper::HTML;
+pub use self::question::*;
 
 /// Problem model
 #[derive(AsChangeset, Clone, Identifiable, Insertable, Queryable, Serialize, Debug)]
@@ -104,66 +105,9 @@ pub struct Question {
  pub t_content: String,
 }
 
-/// ## Convert table
-/// "&lt" -> "<"
-/// "&gt" -> ">"
-/// "&amp" -> "&"
-/// "&quot" -> "\""
-/// "&copy" -> ©
 impl std::fmt::Display for Question {
  fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
- let mut content = (&self.content).replace(r#"\t"#, "").normal();
-
- // empty characters
- for i in vec![
- r#"\n"#, r#"\r"#,
- r#"<p>"#, r#"</p>"#,
- r#"<pre>"#, r#"</pre>"#,
- r#"<div>"#, r#"</div>"#,
- r#"</span>"#, 
- ] {
- content = content.replace(i, "").normal();
- }
-
- // delete <span...>
- {
- let mut ptr = 0;
- let mut output: Vec<&str> = vec![];
- let mut style = "";
- for (i, e) in content.chars().enumerate() {
- match e {
- '<' => {
- output.push(&content[ptr..i]);
- ptr = i;
- },
- '>' => {
- ptr = i + 1;
- },
- _ => {},
- }
- };
- output.push(&content[ptr..content.len()]);
- content = output.join("").normal();
- }
- 
- // converting symbols
- content = content.replace(r#"&lt;"#, "<").normal();
- content = content.replace(r#"&gt;"#, ">").normal();
- content = content.replace(r#"&amp;"#, "&").normal();
- content = content.replace(r#"&quot;"#, "\"").normal();
- content = content.replace(r#"&nbsp;"#, " ").normal();
-
- // decorates
- // loop {
- // let mut tmp = &mut content;
- // if let Some(start) = tmp.find("<b>") {
- // tmp.insert(start, ',');
- // tmp = &mut tmp[(start + 4)..].to_string();
- // } else {
- // break;
- // }
- // }
- write!(f, "{}", &content)
+ write!(f, "{}", &self.content.render())
  }
 }
 

src/cmds/pick.rs

@@ -75,10 +75,9 @@ impl Command for PickCommand {
  let r = cache.get_desc(problem.fid);
  if r.is_err() {
  let e = r.err()?;
- eprintln!("{:?}", &e);
- if let Error::FeatureError(_) = e {
+ if let Error::FeatureError(_) | Error::NetworkError(_) = e {
  Self::handler(m)?;
- } 
+ }
  } else {
  println!("{}", r?);
  }

src/err.rs

@@ -17,27 +17,22 @@ impl std::fmt::Debug for Error {
  fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
  match self {
  Error::CacheError(s) => {
- error!("{}, please try again", s);
- write!(f, "{}, please try again", s)
+ write!(f, "{:?}", error!("{}, please try again", s))
  },
  Error::DownloadError(s) => {
  write!(f, "Download {} failed, please try again", s)
  },
  Error::NetworkError(s) => {
- error!("Network request {}, please try again", s);
- write!(f, "Network request {}, please try again", s)
+ write!(f, "{:?}", error!("Network request {}, please try again", s))
  },
  Error::ParseError(s) => {
- error!("{}, please try again", s);
- write!(f, "{}, please try again", s)
+ write!(f, "{:?}", error!("{}, please try again", s))
  },
  Error::FeatureError(s) => {
- error!("{}", s);
- write!(f, "{}", s)
+ write!(f, "{:?}", error!("{}", s))
  }
  Error::MatchError => {
- error!("Nothing matches");
- write!(f, "Nothing matches")
+ write!(f, "{:?}", error!("Nothing matches"))
  },
  }
  }

src/helper.rs

@@ -1,5 +1,6 @@
 //! A set of helper traits
 pub use self::digit::Digit;
+pub use self::html::HTML;
 
 /// Convert i32 to specific digits string.
 mod digit {
@@ -41,22 +42,92 @@ mod digit {
 
 /// Render html to command-line
 mod html {
- use crate::Error;
- 
+ // use crate::Error;
+ use colored::Colorize;
  pub enum Token {
- Plain(&'static str),
- Tag(&'static str),
+ Plain(String),
+ Bold(String),
+ Eof(String)
  }
 
  /// html render plugin
- ///
- /// ## tag maps
- /// + <b> -> bold
- /// + <em> -> italic
- /// + <u> -> underline
- /// + <>
- pub trait HTML<T> {
- fn ser() -> Vec<Token>;
- fn render() -> Result<(), Error>;
+ pub trait HTML {
+ fn ser(&self) -> Vec<Token>;
+ fn render(&self) -> String;
+ }
+
+ impl HTML for String {
+ fn ser(&self) -> Vec<Token> {
+ // empty tags
+ let mut tks = self.to_string();
+ 
+ // converting symbols
+ tks = tks.replace(r#"&lt;"#, "<");
+ tks = tks.replace(r#"&gt;"#, ">");
+ tks = tks.replace(r#"&amp;"#, "&");
+ tks = tks.replace(r#"&quot;"#, "\"");
+ tks = tks.replace(r#"&nbsp;"#, " ");
+
+ let res: Vec<Token>;
+ // styled
+ {
+ let mut ptr = 0;
+ let mut output = vec![];
+ let mut bold = false;
+ for (i, e) in tks.chars().enumerate() {
+ match e {
+ '<' => {
+ match bold {
+ true => {
+ output.push(Token::Bold(tks[ptr..i].to_string()));
+ bold = false;
+ }
+ false => output.push(
+ Token::Plain(tks[ptr..i].to_string())
+ ),
+ }
+ ptr = i;
+ },
+ '>' => {
+ match &tks[i-1..i] {
+ "-" => continue,
+ _ => match &tks[(ptr + 1)..i] {
+ "b" | "strong" => bold = true,
+ _ => {},
+ },
+ }
+ ptr = i + 1;
+ },
+ _ => {},
+ }
+ };
+ output.push(Token::Eof(tks[ptr..tks.len()].to_string()));
+ res = output;
+ }
+ 
+ res
+ }
+
+ fn render(&self) -> String {
+ let ts = self.ser();
+ let mut tks: Vec<String> = vec![];
+ 
+ for i in ts {
+ match i {
+ Token::Plain(s) => tks.push(s.normal().to_string()),
+ Token::Bold(s) => {
+ if s.contains("Example") {
+ let mut br = "-".repeat(50).dimmed().to_string();
+ br.push_str("\n\n");
+ tks.push(br);
+ }
+ tks.push(s.bold().to_string());
+ }
+ Token::Eof(s) => tks.push(s.normal().to_string()),
+ }
+ }
+
+ tks.join("")
+ }
  }
 }