Skip to content

Commit b029d2b

Browse files
committed
chore(cmd): format code
1 parent 9c77012 commit b029d2b

11 files changed

Lines changed: 36 additions & 31 deletions

File tree

src/cache/mod.rs

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,13 @@ pub fn conn(p: String) -> SqliteConnection {
2222
}
2323

2424
/// Condition submit or test
25-
#[derive(Clone, Debug)]
26-
#[derive(Default)]
25+
#[derive(Clone, Debug, Default)]
2726
pub enum Run {
2827
Test,
2928
#[default]
3029
Submit,
3130
}
3231

33-
3432
/// Requests if data not download
3533
#[derive(Clone)]
3634
pub struct Cache(pub LeetCode);
@@ -188,7 +186,7 @@ impl Cache {
188186
Err(Error::CookieError)
189187
} else {
190188
Err(Error::PremiumError)
191-
}
189+
};
192190
}
193191
Some(true) => (),
194192
}
@@ -358,7 +356,11 @@ impl Cache {
358356
.await?;
359357

360358
let run_res: RunCode = serde_json::from_str(&text).map_err(|e| {
361-
anyhow!("JSON error: {e}, please double check your session and csrf config.")
359+
anyhow!(
360+
"Failed to decode run code result, could be caused by cookie expiration, \
361+
csrf token mismatch, or network issue:\n {e}, raw response:\n {text}\n, \
362+
please report this issue at https://github.com/clearloop/leetcode-cli/issues/new"
363+
)
362364
})?;
363365

364366
trace!("Run code result {:#?}", run_res);

src/cache/models.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
//! Leetcode data models
2-
use unicode_width::UnicodeWidthStr;
3-
use unicode_width::UnicodeWidthChar;
42
use super::schemas::{problems, tags};
53
use crate::helper::HTML;
64
use colored::Colorize;
75
use serde::{Deserialize, Serialize};
86
use serde_json::Number;
7+
use unicode_width::UnicodeWidthChar;
8+
use unicode_width::UnicodeWidthStr;
99

1010
/// Tag model
1111
#[derive(Clone, Insertable, Queryable, Serialize, Debug)]

src/cli.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
//! Clap Commanders
22
use crate::{
3-
cmd::{
4-
CompletionsArgs, DataArgs, EditArgs, ExecArgs, ListArgs, PickArgs, StatArgs, TestArgs,
5-
},
3+
cmd::{CompletionsArgs, DataArgs, EditArgs, ExecArgs, ListArgs, PickArgs, StatArgs, TestArgs},
64
err::Error,
75
};
86
use clap::{CommandFactory, Parser, Subcommand};

src/cmd/data.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//! Cache manager
2-
use crate::{cache::Cache, helper::Digit, Error};
2+
use crate::{Error, cache::Cache, helper::Digit};
33
use clap::Args;
44
use colored::Colorize;
55

src/cmd/edit.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ pub struct EditArgs {
2424
impl EditArgs {
2525
/// `edit` handler
2626
pub async fn run(&self) -> Result<()> {
27-
use crate::{cache::models::Question, Cache};
27+
use crate::{Cache, cache::models::Question};
2828
use std::fs::File;
2929
use std::io::Write;
3030
use std::path::Path;

src/cmd/stat.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ pub struct StatArgs {}
99
impl StatArgs {
1010
/// `stat` handler
1111
pub async fn run(&self) -> Result<(), crate::err::Error> {
12-
use crate::{helper::Digit, Cache};
12+
use crate::{Cache, helper::Digit};
1313

1414
let cache = Cache::new()?;
1515
let res = cache.get_problems()?;

src/cmd/test.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,7 @@ impl TestArgs {
4141

4242
let id = self.id.or(daily_id).ok_or(Error::NoneError)?;
4343

44-
let case_str: Option<String> = self
45-
.testcase
46-
.as_ref()
47-
.map(|case| case.replace("\\n", "\n"));
44+
let case_str: Option<String> = self.testcase.as_ref().map(|case| case.replace("\\n", "\n"));
4845

4946
if self.watch {
5047
let problem = cache.get_problem(id)?;

src/config/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
//! + Edit leetcode.toml at `~/.leetcode/leetcode.toml` directly
77
//! + Use `leetcode config` to update it
88
use crate::{
9-
config::{code::Code, cookies::Cookies, storage::Storage, sys::Sys},
109
Error, Result,
10+
config::{code::Code, cookies::Cookies, storage::Storage, sys::Sys},
1111
};
1212
use serde::{Deserialize, Serialize};
1313
use std::{fs, path::Path};

src/plugins/chrome.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use crate::{cache, Error, Result};
1+
use crate::{Error, Result, cache};
22
use anyhow::anyhow;
33
use diesel::prelude::*;
44
use keyring::Entry;

src/plugins/leetcode.rs

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
use self::req::{Json, Mode, Req};
22
use crate::{
3-
config::{self, Config},
43
Result,
4+
config::{self, Config},
55
};
66
use reqwest::{
7-
header::{HeaderMap, HeaderName, HeaderValue},
87
Client, ClientBuilder, Response,
8+
header::{HeaderMap, HeaderName, HeaderValue},
99
};
1010
use std::{collections::HashMap, str::FromStr, time::Duration};
1111

@@ -86,13 +86,15 @@ impl LeetCode {
8686
json.insert("variables", r#"{"slug": "$slug"}"#.replace("$slug", slug));
8787
json.insert(
8888
"query",
89-
["query getTopicTag($slug: String!) {",
89+
[
90+
"query getTopicTag($slug: String!) {",
9091
" topicTag(slug: $slug) {",
9192
" questions {",
9293
" questionId",
9394
" }",
9495
" }",
95-
"}"]
96+
"}",
97+
]
9698
.join("\n"),
9799
);
98100

@@ -149,27 +151,31 @@ impl LeetCode {
149151
json.insert("operationName", "daily".to_string());
150152
json.insert(
151153
"query",
152-
["query daily {",
154+
[
155+
"query daily {",
153156
" activeDailyCodingChallengeQuestion {",
154157
" question {",
155158
" questionFrontendId",
156159
" }",
157160
" }",
158-
"}"]
161+
"}",
162+
]
159163
.join("\n"),
160164
);
161165
}
162166
config::LeetcodeSite::LeetcodeCn => {
163167
json.insert("operationName", "questionOfToday".to_string());
164168
json.insert(
165169
"query",
166-
["query questionOfToday {",
170+
[
171+
"query questionOfToday {",
167172
" todayRecord {",
168173
" question {",
169174
" questionFrontendId",
170175
" }",
171176
" }",
172-
"}"]
177+
"}",
178+
]
173179
.join("\n"),
174180
);
175181
}
@@ -195,7 +201,8 @@ impl LeetCode {
195201
let mut json: Json = HashMap::new();
196202
json.insert(
197203
"query",
198-
["query getQuestionDetail($titleSlug: String!) {",
204+
[
205+
"query getQuestionDetail($titleSlug: String!) {",
199206
" question(titleSlug: $titleSlug) {",
200207
" content",
201208
" stats",
@@ -206,7 +213,8 @@ impl LeetCode {
206213
" metaData",
207214
" translatedContent",
208215
" }",
209-
"}"]
216+
"}",
217+
]
210218
.join("\n"),
211219
);
212220

@@ -269,7 +277,7 @@ impl LeetCode {
269277
mod req {
270278
use super::LeetCode;
271279
use crate::err::Error;
272-
use reqwest::{header::HeaderMap, Client, Response};
280+
use reqwest::{Client, Response, header::HeaderMap};
273281
use std::collections::HashMap;
274282

275283
/// Standardize json format

0 commit comments

Comments
 (0)