This repository was archived by the owner on Jul 7, 2024. It is now read-only.

Commit 2b373c0

authored

patches for clearloop#60 and clearloop#56 (clearloop#68)

* add graphql query for user info * add parser for graphql user info * return `CookieError` when leetcode rejects exec/test `Run` * add the `is_session_bad` method to somewhat-accurately determine when a LEETCODE_SESSION becomes invalid * When json parsing fails, if the underlying request requires user authentication, use `is_session_bad()` to check if LEETCODE_SESSION is valid. * get rid of ZWSPs in problem descriptions (see clearloop#56) * add Error::PremiumError * throw PremiumError when locked questions are queried for details

1 parent 59f075b commit 2b373c0Copy full SHA for 2b373c0

File tree

4 files changed

+33

-4

lines changed

src
- cache
  - mod.rs
  - parser.rs
- err.rs
- helper.rs

4 files changed

+33

-4

lines changed

`‎src/cache/mod.rs`

Lines changed: 10 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -177,7 +177,16 @@ impl Cache {`
`177`	`177`	`.json()`
`178`	`178`	`.await?;`
`179`	`179`	`debug!("{:#?}", &json);`
`180`		`- parser::desc(&mut rdesc, json).ok_or(Error::NoneError)?;`
	`180`	`+ match parser::desc(&mut rdesc, json) {`
	`181`	`+ None => return Err(Error::NoneError),`
	`182`	`+ Some(false) => return`
	`183`	`+ if self.is_session_bad().await {`
	`184`	`+ Err(Error::CookieError)`
	`185`	`+ } else {`
	`186`	`+ Err(Error::PremiumError)`
	`187`	`+ },`
	`188`	`+ Some(true) => ()`
	`189`	`+ }`
`181`	`190`
`182`	`191`	`// update the question`
`183`	`192`	`let sdesc = serde_json::to_string(&rdesc)?;`

`‎src/cache/parser.rs`

Lines changed: 10 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -29,14 +29,22 @@ pub fn problem(problems: &mut Vec<Problem>, v: Value) -> Option<()> {`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`/// desc parser`
`32`		`-pub fn desc(q: &mut Question, v: Value) -> Option<()> {`
	`32`	`+pub fn desc(q: &mut Question, v: Value) -> Option<bool> {`
	`33`	`+ /* None - parsing failed`
	`34`	`+ * Some(false) - content was null (premium?)`
	`35`	`+ * Some(true) - content was parsed`
	`36`	`+ */`
`33`	`37`	`let o = &v`
`34`	`38`	`.as_object()?`
`35`	`39`	`.get("data")?`
`36`	`40`	`.as_object()?`
`37`	`41`	`.get("question")?`
`38`	`42`	`.as_object()?;`
`39`	`43`
	`44`	`+ if *o.get("content")? == Value::Null {`
	`45`	`+ return Some(false);`
	`46`	`+ }`
	`47`	`+`
`40`	`48`	`*q = Question {`
`41`	`49`	`content: o.get("content")?.as_str().unwrap_or("").to_string(),`
`42`	`50`	`stats: serde_json::from_str(o.get("stats")?.as_str()?).ok()?,`
`@@ -55,7 +63,7 @@ pub fn desc(q: &mut Question, v: Value) -> Option<()> {`
`55`	`63`	`.to_string(),`
`56`	`64`	`};`
`57`	`65`
`58`		`- Some(())`
	`66`	`+ Some(true)`
`59`	`67`	`}`
`60`	`68`
`61`	`69`	`/// tag parser`

`‎src/err.rs`

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ pub enum Error {`
`14`	`14`	`FeatureError(String),`
`15`	`15`	`ScriptError(String),`
`16`	`16`	`CookieError,`
	`17`	`+ PremiumError,`
`17`	`18`	`DecryptError,`
`18`	`19`	`SilentError,`
`19`	`20`	`NoneError,`
`@@ -37,6 +38,13 @@ impl std::fmt::Debug for Error {`
`37`	`38`	`.yellow()`
`38`	`39`	`.bold(),`
`39`	`40`	`),`
	`41`	`+ Error::PremiumError => write!(`
	`42`	`+ f,`
	`43`	`+ "{} \`
	`44`	`+ Your leetcode account lacks a premium subscription, which the given problem requires.\n \`
	`45`	`+ If this looks like a mistake, please open a new issue at: {}",`
	`46`	`+ e,`
	`47`	`+ "https://github.com/clearloop/leetcode-cli/".underline()),`
`40`	`48`	`Error::DownloadError(s) => write!(f, "{} Download {} failed, please try again", e, s),`
`41`	`49`	`Error::NetworkError(s) => write!(f, "{} {}, please try again", e, s),`
`42`	`50`	`Error::ParseError(s) => write!(f, "{} {}", e, s),`

`‎src/helper.rs`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,11 @@ mod html {`
`147`	`147`	`impl HTML for String {`
`148`	`148`	`fn ser(&self) -> Vec<Token> {`
`149`	`149`	`// empty tags`
`150`		`- let tks = self.to_string();`
	`150`	`+ let tks = {`
	`151`	`+ let mut s = self.clone();`
	`152`	`+ // some problems (e.g. 1653) have ZWSPs.`
	`153`	`+ s.retain(\|x\| x != '\u{200B}');`
	`154`	`+ s };`
`151`	`155`	`let res: Vec<Token>;`
`152`	`156`	`// styled`
`153`	`157`	`{`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 2b373c0

File tree

4 files changed

4 files changed

`‎src/cache/mod.rs`

`‎src/cache/parser.rs`

`‎src/err.rs`

`‎src/helper.rs`

0 commit comments