Merge pull request #12 from nozwock/string

Split long query strings

Author: dvishal485

src/file_parser/codefile.rs

@@ -79,11 +79,11 @@ impl CodeFile {
     fn parse_code(code: &str, language: Language) -> Result<(String, String)> {
         let start = code
             .find("#LCSTART")
-            .map(|idx| idx + code[idx..].find('\n').unwrap_or(0))
+            .map(|idx| idx + code[idx..].find('\n').unwrap_or_default())
             // This returning None means the user
             // wants to submit a practically empty file,
             // but hey we don't judge!
-            .unwrap_or(0);
+            .unwrap_or_default();
 
         let end = code.find("#LCEND").unwrap_or(code.len());
         let question_title = code[code.find("leetcode.com/problems/").ok_or_else(|| {

src/handlers/helpers.rs

@@ -1,4 +1,5 @@
 use colored::Colorize;
+use eyre::Result;
 use serde::{Deserialize, Serialize};
 
 #[derive(Debug, Serialize)]
@@ -72,39 +73,29 @@ pub(crate) struct BoilerPlateCode {
 
 use super::super::file_parser::language::Language;
 impl BoilerPlateCode {
-    pub(crate) fn save_code(&self, filename: &str, title_slug: &str) {
-        let language = Language::from_slug(&self.langSlug).unwrap_or_else(|| {
-            eprintln!("Error: Unable to identify language of code file!");
-            std::process::exit(1);
-        });
-        let Ok(mut file) = std::fs::File::create(filename) else{
-                eprintln!("Error: Unable to create file");
-                std::process::exit(1);
-            };
+    pub(crate) fn save_code(&self, filename: &str, title_slug: &str) -> Result<()> {
+        let language = Language::from_slug(&self.langSlug)
+            .ok_or_else(|| eyre::eyre!("Unable to identify language of code file!"))?;
+        let mut file = std::fs::File::create(filename)?;
         let comment = format!(
             " {} #LCEND https://leetcode.com/problems/{}/",
             language.inline_comment_start(),
             title_slug.to_lowercase().trim().replace(" ", "-")
         );
+
         // write code into file along with the comment
-        if let Err(_) = std::io::Write::write_all(&mut file, self.code.as_bytes()) {
-            eprintln!("Error: Unable to write code into file");
-            std::process::exit(1);
-        }
-        if let Err(_) = std::io::Write::write_all(&mut file, comment.as_bytes()) {
-            eprintln!("Error: Unable to write code into file");
-            std::process::exit(1);
-        }
+        std::io::Write::write_all(&mut file, self.code.as_bytes())?;
+        std::io::Write::write_all(&mut file, comment.as_bytes())?;
+
+        Ok(())
     }
     pub(crate) fn is_supported(&self) -> bool {
         Language::from_slug(&self.langSlug).is_some()
     }
-    pub(crate) fn extension(&self) -> String {
-        let language = Language::from_slug(&self.langSlug).unwrap_or_else(|| {
-            eprintln!("Error: Unable to identify language of code file!");
-            std::process::exit(1);
-        });
-        language.extension().to_owned()
+    pub(crate) fn extension(&self) -> Result<String> {
+        let language = Language::from_slug(&self.langSlug)
+            .ok_or_else(|| eyre::eyre!("Unable to identify language of code file!"))?;
+        Ok(language.extension().to_owned())
     }
 }
 

src/handlers/leetcode/api/question.rs

@@ -7,7 +7,34 @@ impl LeetCode<Authorized> {
         let url = "https://leetcode.com/graphql";
         let client = &self.client;
         let query = GraphqlRequest {
-            query: "\n query questionOfToday {\n  activeDailyCodingChallengeQuestion {\n date\n userStatus\n link\n question {\n   acRate\n   difficulty\n   freqBar\n   frontendQuestionId: questionFrontendId\n   isFavor\n   paidOnly: isPaidOnly\n   status\n   title\n   titleSlug\n   hasVideoSolution\n   hasSolution\n   topicTags {\n  name\n  id\n  slug\n   }\n }\n  }\n}\n ".to_string(),
+            query: r#"
+            query questionOfToday {
+                activeDailyCodingChallengeQuestion {
+                    date
+                    userStatus
+                    link
+                    question {
+                        acRate
+                        difficulty
+                        freqBar
+                        frontendQuestionId: questionFrontendId
+                        isFavor
+                        paidOnly: isPaidOnly
+                        status
+                        title
+                        titleSlug
+                        hasVideoSolution
+                        hasSolution
+                        topicTags {
+                            name
+                            id
+                            slug
+                        }
+                    }
+                }
+            }
+            "#
+            .to_string(),
             variables: "{}".to_string(),
         };
 
@@ -52,8 +79,17 @@ impl LeetCode<Authorized> {
         let client = &self.client;
         let url = "https://leetcode.com/graphql";
         let query = GraphqlRequest {
-            query:  "query questionContent($titleSlug: String!) { question(titleSlug: $titleSlug) { content mysqlSchemas }}".to_string(),
-            variables: serde_json::to_string(&Variables { titleSlug: title_slug.to_string() }).unwrap(),
+            query: r#"
+            query questionContent($titleSlug: String!) {
+                question(titleSlug: $titleSlug) {
+                    content mysqlSchemas
+                }
+            }
+            "#
+            .to_string(),
+            variables: serde_json::to_string(&Variables {
+                titleSlug: title_slug.to_string(),
+            })?,
         };
 
         let data = client.post(url).json(&query).send()?;
@@ -67,7 +103,21 @@ impl LeetCode<Authorized> {
             data: QuestionWrapper,
         }
 
-        let query = "\n query questionEditorData($titleSlug: String!) {\n  question(titleSlug: $titleSlug) {\n questionId\n questionFrontendId\n codeSnippets {\n   lang\n   langSlug\n   code\n }\n envInfo\n enableRunCode\n  }\n}\n ";
+        let query = r#"
+        query questionEditorData($titleSlug: String!) {
+            question(titleSlug: $titleSlug) {
+                questionId
+                questionFrontendId
+                codeSnippets {
+                    lang
+                    langSlug
+                    code
+                }
+                envInfo
+                enableRunCode
+            }
+        }
+        "#;
         let varibales = serde_json::to_string(&Variables {
             titleSlug: title_slug.to_string(),
         })?;
@@ -121,15 +171,15 @@ impl LeetCode<Authorized> {
         };
 
         let mut input = String::new();
-        println!("Filename (main.{}) : ", &(boiler_code.extension()));
+        println!("Filename (main.{}) : ", &(boiler_code.extension()?));
         std::io::stdin().read_line(&mut input)?;
         let input = input.trim();
         let filename = if input.is_empty() {
-            format!("main.{}", boiler_code.extension())
+            format!("main.{}", boiler_code.extension()?)
         } else {
             input.to_string()
         };
-        boiler_code.save_code(&filename, &title_slug);
+        boiler_code.save_code(&filename, &title_slug)?;
 
         Ok(data.json::<Data>().map(|op| op.data.question)?)
     }
@@ -139,8 +189,25 @@ impl LeetCode<Authorized> {
         let url = "https://leetcode.com/graphql";
 
         let query = GraphqlRequest {
-            query: "\n query consolePanelConfig($titleSlug: String!) {\n question(titleSlug: $titleSlug) {\n questionId\n questionFrontendId\n questionTitle\n enableDebugger\n enableRunCode\n enableSubmit\n enableTestMode\n exampleTestcaseList\n metaData\n }\n}\n".to_string(),
-            variables: serde_json::to_string(&Variables { titleSlug: title_slug.to_string() }).unwrap(),
+            query: r#"
+            query consolePanelConfig($titleSlug: String!) {
+                question(titleSlug: $titleSlug) {
+                    questionId
+                    questionFrontendId
+                    questionTitle
+                    enableDebugger
+                    enableRunCode
+                    enableSubmit
+                    enableTestMode
+                    exampleTestcaseList
+                    metaData
+                }
+            }
+            "#
+            .to_string(),
+            variables: serde_json::to_string(&Variables {
+                titleSlug: title_slug.to_string(),
+            })?,
         };
         let data = client
             .post(url)

src/handlers/leetcode/api/submit.rs

@@ -34,7 +34,9 @@ impl LeetCode<Authorized> {
             question_id,
             typed_code,
         };
-        let data = client.post(&url).json(&submission).send()?.json::<SubmissionID>().wrap_err("Failed to fetch submission id from LeetCode, Check your submissions manually on leetcode")?;
+        let data = client.post(&url).json(&submission).send()?.json::<SubmissionID>().wrap_err(
+            "Failed to fetch submission id from LeetCode, Check your submissions manually on leetcode"
+        )?;
 
         println!("Evaluating solution...");
         let submission_id = data.submission_id;

src/main.rs

@@ -44,9 +44,15 @@ fn main() -> Result<()> {
         }
         Some(Commands::Question { question_name }) => {
             let question_name = if let Some(idx) = question_name.find("leetcode.com/problems/") {
-                let problem = (&question_name[idx..]).split_whitespace().next().unwrap();
-                let problem = problem.split('/').skip(2).next().unwrap();
-                problem
+                let question_title = question_name[idx..]
+                    .split_whitespace()
+                    .next()
+                    .expect("Should be Some since the find method succeed")
+                    .split('/')
+                    .skip(2)
+                    .next()
+                    .ok_or_else(|| eyre::eyre!("Invalid link, expected question identifier"))?;
+                question_title
             } else {
                 &question_name
             };