fix: Problems' description (pick, edit) (clearloop#163)

tripercy · web-flow · commit 9903a60c85be · 2024-08-24T21:32:09.000+08:00
* fix: daily problem parsing

Changed a key to fix parsing daily problem request.
Fixed when id for daily problem should be fetched. Before, it will
always be fetched for the `pick` option regardless of the existence of
the `-d` option

* fix: comment problem desc

Changed desc comment to render Question.content instead of
Question.t_content, which was empty.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/cache/models.rs b/src/cache/models.rs
@@ -151,7 +151,7 @@ impl Question {
     }
 
     pub fn desc_comment(&self, conf: &Config) -> String {
-        let desc = self.t_content.render();
+        let desc = self.content.render();
 
         let mut res = desc.lines().fold("\n".to_string(), |acc, e| {
             acc + "" + conf.code.comment_leading.as_str() + " " + e + "\n"
diff --git a/src/cache/parser.rs b/src/cache/parser.rs
@@ -98,7 +98,7 @@ pub fn tags(v: Value) -> Option<Vec<String>> {
 pub fn daily(v: Value) -> Option<i32> {
     trace!("Parse daily...");
     let v_obj = v.as_object()?.get("data")?.as_object()?;
-    match v_obj.get("dailyQuestionRecord") {
+    match v_obj.get("activeDailyCodingChallengeQuestion") {
         // Handle on leetcode-com
         Some(v) => v,
         // Handle on leetcode-cn
diff --git a/src/cmds/pick.rs b/src/cmds/pick.rs
@@ -130,7 +130,12 @@ impl Command for PickCommand {
             crate::helper::filter(&mut problems, query.to_string());
         }
 
-        let daily_id = if m.contains_id("daily") {
+        let daily = match m.get_one::<bool>("daily") {
+            Some(x) => x,
+            None => &false,
+        };
+
+        let daily_id = if *daily {
             Some(cache.get_daily_problem_id().await?)
         } else {
             None

Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,7 @@ impl Question {`
`151`	`151`	`}`
`152`	`152`
`153`	`153`	`pub fn desc_comment(&self, conf: &Config) -> String {`
`154`		`- let desc = self.t_content.render();`
	`154`	`+ let desc = self.content.render();`
`155`	`155`
`156`	`156`	`let mut res = desc.lines().fold("\n".to_string(), \|acc, e\| {`
`157`	`157`	`acc + "" + conf.code.comment_leading.as_str() + " " + e + "\n"`