Commit e3eb5ef

authored

Merge pull request clearloop#15 from hulufei/master

Handle new added problems properly

2 parents 70eab63 + 2dfb18c commit e3eb5efCopy full SHA for e3eb5ef

File tree

+24

-21

lines changed

+24

-21

lines changed

Lines changed: 4 additions & 14 deletions

Original file line number	Diff line number	Diff line change
`@@ -47,13 +47,7 @@ impl Cache {`
`47`	`47`
`48`	`48`	`/// ref to download probems`
`49`	`49`	`pub fn update(self) -> Result<(), Error> {`
`50`		`- let c = conn((&self.0.conf.storage.cache()?).to_owned());`
`51`		`- let ps = self.download_problems()?;`
`52`		`- for i in ps.into_iter() {`
`53`		`- let target = problems.filter(id.eq(i.id));`
`54`		`- diesel::update(target).set(i.to_owned()).execute(&c)?;`
`55`		`- }`
`56`		`-`
	`50`	`+ self.download_problems()?;`
`57`	`51`	`Ok(())`
`58`	`52`	`}`
`59`	`53`
`@@ -74,13 +68,9 @@ impl Cache {`
`74`	`68`	`parser::problem(&mut ps, json)?;`
`75`	`69`	`}`
`76`	`70`
`77`		`- let count = self.get_problems()?.len();`
`78`		`- if count == 0 {`
`79`		`- ps.sort_by(\|a, b\| b.id.partial_cmp(&a.id).unwrap_or(std::cmp::Ordering::Equal));`
`80`		`- diesel::insert_into(problems)`
`81`		`- .values(&ps)`
`82`		`- .execute(&self.conn()?)?;`
`83`		`- }`
	`71`	`+ diesel::replace_into(problems)`
	`72`	`+ .values(&ps)`
	`73`	`+ .execute(&self.conn()?)?;`
`84`	`74`
`85`	`75`	`Ok(ps)`
`86`	`76`	`}`

Lines changed: 9 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -107,13 +107,16 @@ impl Command for PickCommand {`
`107`	`107`	`crate::helper::filter(&mut problems, query.to_string());`
`108`	`108`	`}`
`109`	`109`
`110`		`- if let Some(id) = m.value_of("id") {`
`111`		`- problems.retain(\|x\| x.fid.to_string() == id);`
`112`		`- }`
`113`		`-`
`114`		`- let problem = &problems[rand::thread_rng().gen_range(0, problems.len())];`
	`110`	`+ let fid = m`
	`111`	`+ .value_of("id")`
	`112`	`+ .and_then(\|id\| id.parse::<i32>().ok())`
	`113`	`+ .unwrap_or_else(\|\| {`
	`114`	`+ // Pick random without specify id`
	`115`	`+ let problem = &problems[rand::thread_rng().gen_range(0, problems.len())];`
	`116`	`+ problem.fid`
	`117`	`+ });`
`115`	`118`
`116`		`- let r = cache.get_question(problem.fid);`
	`119`	`+ let r = cache.get_question(fid);`
`117`	`120`	`if r.is_err() {`
`118`	`121`	`let e = r.err()?;`
`119`	`122`	`eprintln!("{:?}", &e);`

Lines changed: 11 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`//! Errors in leetcode-cli`
	`2`	`+use crate::cmds::{Command, DataCommand};`
`2`	`3`	`use colored::Colorize;`
`3`	`4`	`use std::fmt;`
`4`	`5`
`@@ -14,6 +15,7 @@ pub enum Error {`
`14`	`15`	`ScriptError(String),`
`15`	`16`	`CookieError,`
`16`	`17`	`DecryptError,`
	`18`	`+ SilentError,`
`17`	`19`	`}`
`18`	`20`
`19`	`21`	`impl std::fmt::Debug for Error {`
`@@ -40,6 +42,7 @@ impl std::fmt::Debug for Error {`
`40`	`42`	`Error::MatchError => write!(f, "{} Nothing matches", e),`
`41`	`43`	`Error::DecryptError => write!(f, "{} openssl decrypt failed", e),`
`42`	`44`	`Error::ScriptError(s) => write!(f, "{} {}", e, s),`
	`45`	`+ Error::SilentError => write!(f, ""),`
`43`	`46`	`}`
`44`	`47`	`}`
`45`	`48`	`}`
`@@ -61,7 +64,14 @@ impl std::convert::From<std::num::ParseIntError> for Error {`
`61`	`64`	`// sql`
`62`	`65`	`impl std::convert::From<diesel::result::Error> for Error {`
`63`	`66`	`fn from(err: diesel::result::Error) -> Self {`
`64`		`- Error::CacheError(err.to_string())`
	`67`	`+ match err {`
	`68`	`+ diesel::result::Error::NotFound => {`
	`69`	`+ println!("NotFound, you may update cache, and try it again\r\n");`
	`70`	`+ DataCommand::usage().print_help().unwrap_or(());`
	`71`	`+ Error::SilentError`
	`72`	`+ }`
	`73`	`+ _ => Error::CacheError(err.to_string()),`
	`74`	`+ }`
`65`	`75`	`}`
`66`	`76`	`}`
`67`	`77`

Comments

(0)