Skip to content

Commit bb76ba1

Browse files
clearloopclearloop
committed
rebuild error handlings of cmds
1 parent 0f323b0 commit bb76ba1

File tree

11 files changed

+69
-109
lines changed

11 files changed

+69
-109
lines changed

‎src/bin/lc.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use leetcode_cli::cli;
22

33
fn main() {
4-
cli::main();
4+
cli::main().expect("runtime error");
55
}

‎src/cache/mod.rs‎

Lines changed: 11 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ use self::sql::*;
99
use crate::{cfg, err::Error, plugins::LeetCode};
1010
use diesel::prelude::*;
1111
use serde_json::Value;
12-
use reqwest::Error as ReqwestError;
13-
1412

1513
/// sqlite connection
1614
pub fn conn(p: String) -> SqliteConnection {
@@ -30,32 +28,16 @@ impl Cache {
3028

3129
/// Clean cache
3230
pub fn clean(&self) -> Result<(), Error> {
33-
let res = std::fs::remove_file(&self.0.conf.storage.cache());
34-
if res.is_err() {
35-
let err = res.err().unwrap();
36-
error!("{:?}", Error::CacheError(format!("clean local cache failed -> {}", &err)));
37-
return Err(Error::CacheError(format!("clean local cache failed -> {}", &err)));
38-
}
39-
40-
Ok(())
31+
Ok(std::fs::remove_file(&self.0.conf.storage.cache())?)
4132
}
4233

4334
/// ref to download probems
4435
pub fn update(self) -> Result<(), Error> {
4536
let c = conn((&self.0.conf.storage.cache()).to_owned());
46-
let res = self.download_problems();
47-
if res.is_err() {
48-
return Err(res.err().unwrap());
49-
}
50-
51-
for i in res.unwrap().into_iter() {
37+
let ps = self.download_problems()?;
38+
for i in ps.into_iter() {
5239
let target = problems.filter(id.eq(i.id));
53-
let u_res = diesel::update(target).set(i.to_owned()).execute(&c);
54-
if u_res.is_err() {
55-
let err = u_res.err().unwrap();
56-
error!("{:?}", Error::CacheError(format!("Update cache failed -> {}", &err)));
57-
return Err(Error::CacheError(format!("Update cache failed -> {}", &err)));
58-
}
40+
diesel::update(target).set(i.to_owned()).execute(&c)?;
5941
}
6042

6143
Ok(())
@@ -67,42 +49,14 @@ impl Cache {
6749
let mut ps: Vec<Problem> = vec![];
6850

6951
for i in &self.0.conf.sys.categories.to_owned() {
70-
let res = self.0.clone().get_category_problems(&i);
71-
72-
if res.is_err() {
73-
return Err(res.err().unwrap());
74-
}
75-
76-
let json: Result<Value, ReqwestError> = res.unwrap().json();
77-
if json.is_err() {
78-
error!("{:?}", Error::DownloadError(format!("category {}", &i)));
79-
return Err(Error::DownloadError(format!("category {}", &i)));
80-
}
81-
82-
// get "stat_status_pairs" from respnonse
83-
let res = parser::parse_problem(&mut ps, json.unwrap());
84-
if res.is_err() {
85-
error!("{:?}", Error::DownloadError(format!("category {}", &i)));
86-
return Err(Error::DownloadError(format!("category {}", &i)));
87-
}
88-
}
89-
90-
// store problems into database
91-
let j = serde_json::to_string(&ps);
92-
if j.is_err() {
93-
error!("{:?}", Error::ParseError("data from cache"));
94-
return Err(Error::ParseError("data from cache"));
52+
let json = self.0.clone().get_category_problems(&i)?.json()?;
53+
parser::problem(&mut ps, json)?
9554
}
9655

97-
let count = self.get_problems().unwrap().len();
56+
let count = self.get_problems()?.len();
9857
if count == 0 {
99-
ps.sort_by(|a, b| b.id.partial_cmp(&a.id).unwrap());
100-
let res = diesel::insert_into(problems).values(&ps).execute(&self.conn());
101-
if res.is_err() {
102-
let err = res.err().unwrap();
103-
error!("{:?}", Error::CacheError(format!("Save to cache failed -> {}", &err)));
104-
return Err(Error::CacheError(format!("Save to cache failed -> {}", &err)));
105-
}
58+
ps.sort_by(|a, b| b.id.partial_cmp(&a.id).unwrap_or(std::cmp::Ordering::Equal));
59+
diesel::insert_into(problems).values(&ps).execute(&self.conn())?;
10660
}
10761

10862
Ok(ps)
@@ -128,32 +82,15 @@ impl Cache {
12882
/// Get problems from cache
12983
///
13084
/// if cache doesn't exist, request a new copy
131-
///
132-
/// [TODO]:
133-
/// 1. make downloading async
13485
pub fn get_problems(&self) -> Result<Vec<Problem>, Error> {
135-
let res = problems.load::<Problem>(&self.conn());
136-
if res.is_err() {
137-
let err = res.err().unwrap();
138-
warn!("Select problems from cache failed -> {:?} -> try downloading", &err);
139-
return Err(Error::CacheError(
140-
format!("Select problems from cache failed -> {:?} -> try downloading", &err)
141-
));
142-
}
143-
144-
Ok(res.unwrap())
86+
Ok(problems.load::<Problem>(&self.conn())?)
14587
}
14688

14789
/// New cache
14890
pub fn new() -> Result<Self, Error> {
14991
let conf = cfg::locate();
15092
let c = conn(conf.storage.cache());
151-
let r = diesel::sql_query(CREATE_PROBLEMS_IF_NOT_EXISTS).execute(&c);
152-
if r.is_err() {
153-
let err = r.err().unwrap();
154-
error!("{:?}", Error::CacheError(format!("Create local cache failed -> {}", &err)));
155-
return Err(Error::CacheError(format!("Create local cache failed -> {}", &err)));
156-
}
93+
diesel::sql_query(CREATE_PROBLEMS_IF_NOT_EXISTS).execute(&c)?;
15794

15895
Ok(Cache(LeetCode::new()))
15996
}

‎src/cache/parser.rs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use serde_json::Value;
33
use crate::err::Error;
44
use super::models::Problem;
55

6-
pub fn parse_problem(problems: &mut Vec<Problem>, v: Value) -> Result<(), Error> {
6+
pub fn problem(problems: &mut Vec<Problem>, v: Value) -> Result<(), Error> {
77
let pairs = v.get("stat_status_pairs")?.as_array()?;
88
for p in pairs {
99
let category = v.get("category_slug")?.as_str()?.to_string();
@@ -35,3 +35,5 @@ pub fn parse_problem(problems: &mut Vec<Problem>, v: Value) -> Result<(), Error>
3535

3636
return Ok(());
3737
}
38+
39+
// pub fn question()

‎src/cli.rs‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,12 @@ use crate::{
1111
flag::{
1212
Flag,
1313
Debug,
14-
}
14+
},
15+
err::Error,
1516
};
1617

1718
/// get maches
18-
pub fn main() {
19+
pub fn main() -> Result<(), Error>{
1920
let m = App::new("leetcode")
2021
.author("clearloop <udtrokia@163.com>")
2122
.version("0.1.6")
@@ -31,18 +32,18 @@ pub fn main() {
3132
.get_matches();
3233

3334
if m.is_present("debug") {
34-
Debug::handler();
35+
Debug::handler()?;
3536
} else {
3637
env_logger::from_env(env_logger::Env::new().default_filter_or("info"))
3738
.format_timestamp(None)
3839
.init();
3940
}
4041

4142
match m.subcommand() {
42-
("list", Some(sub_m)) => ListCommand::handler(sub_m),
43-
("pick", Some(sub_m)) => PickCommand::handler(sub_m),
44-
("stat", Some(sub_m)) => StatCommand::handler(sub_m),
45-
("cache", Some(sub_m)) => CacheCommand::handler(sub_m),
46-
_ => {}
43+
("list", Some(sub_m)) => Ok(ListCommand::handler(sub_m)?),
44+
("pick", Some(sub_m)) => Ok(PickCommand::handler(sub_m)?),
45+
("stat", Some(sub_m)) => Ok(StatCommand::handler(sub_m)?),
46+
("cache", Some(sub_m)) => Ok(CacheCommand::handler(sub_m)?),
47+
_ => Err(Error::MatchError)
4748
}
4849
}

‎src/cmds/cache.rs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ impl Command for CacheCommand {
3838
}
3939

4040
/// `cache` handler
41-
fn handler(m: &ArgMatches) {
41+
fn handler(m: &ArgMatches) -> Result<(), crate::err::Error>{
4242
use std::fs::File;
4343
use std::path::Path;
4444

@@ -79,5 +79,7 @@ impl Command for CacheCommand {
7979
println!("{}", title.bright_black());
8080
println!("{}\n", out);
8181
}
82+
83+
Ok(())
8284
}
8385
}

‎src/cmds/list.rs‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
//! leetcode list -q eD List questions that with easy level and not done
3535
//! ```
3636
use super::Command;
37-
use crate::{cache::Cache, helper::Digit};
37+
use crate::{cache::Cache, helper::Digit, err::Error};
3838
use clap::{SubCommand, App, Arg, ArgMatches};
3939
/// Abstract `list` command in `leetcode-cli`.
4040
///
@@ -101,14 +101,14 @@ impl Command for ListCommand {
101101
/// List commands contains "-c", "-q", "-s" flags.
102102
/// + matches with `-c` will override the default <all> keyword.
103103
/// + `-qs`
104-
fn handler(m: &ArgMatches) {
104+
fn handler(m: &ArgMatches) -> Result<(), Error> {
105105
let cache = Cache::new().unwrap();
106106
let mut problems = cache.get_problems().unwrap();
107107

108108
if problems.len() == 0 {
109109
let r = cache.download_problems();
110110
if r.is_ok() {
111-
Self::handler(m);
111+
Self::handler(m)?
112112
}
113113
}
114114

@@ -140,6 +140,7 @@ impl Command for ListCommand {
140140
}
141141
}
142142

143+
143144
// retain if keyword exists
144145
if let Some(keyword) = m.value_of("keyword") {
145146
problems.retain(|x| x.name.contains(&keyword));
@@ -187,5 +188,6 @@ impl Command for ListCommand {
187188
easy.digit(4), medium.digit(4), hard.digit(4),
188189
);
189190
}
191+
Ok(())
190192
}
191193
}

‎src/cmds/mod.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
//! list List problems
77
//! ```
88
use clap::{App, ArgMatches};
9-
9+
use crate::err::Error;
1010
/// Abstract commands' traits.
1111
pub trait Command {
1212
/// Usage of the spefic command
1313
fn usage<'a, 'c>() -> App<'a, 'c>;
1414

1515
/// The handler will deal [args, options,...] from the command-line
16-
fn handler(m: &ArgMatches);
16+
fn handler(m: &ArgMatches) -> Result<(), Error>;
1717
}
1818

1919
mod list;

‎src/cmds/pick.rs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ impl Command for PickCommand {
3434
}
3535

3636
/// `pick` handler
37-
fn handler(m: &ArgMatches) {
37+
fn handler(m: &ArgMatches) -> Result<(), crate::err::Error>{
3838
use crate::cache::Cache;
3939
use rand::Rng;
4040

@@ -43,8 +43,7 @@ impl Command for PickCommand {
4343
if problems.len() == 0 {
4444
let r = cache.clone().download_problems();
4545
if r.is_ok() {
46-
Self::handler(m);
47-
return;
46+
Self::handler(m)?
4847
}
4948
}
5049

@@ -77,5 +76,7 @@ impl Command for PickCommand {
7776

7877
let r = cache.get_desc(problem.fid);
7978
println!("{:?}", r.unwrap());
79+
80+
Ok(())
8081
}
8182
}

‎src/cmds/stat.rs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ impl Command for StatCommand {
1515
}
1616

1717
/// `stat` handler
18-
fn handler(_m: &ArgMatches) {
18+
fn handler(_m: &ArgMatches) -> Result<(), crate::err::Error> {
1919
use crate::{
2020
cache::Cache,
2121
helper::Digit,
@@ -111,5 +111,6 @@ impl Command for StatCommand {
111111
println!("{}", udone);
112112
}
113113
println!("");
114+
Ok(())
114115
}
115116
}

‎src/err.rs‎

Lines changed: 24 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,11 @@
11
//! Errors in leetcode-cli
2-
//!
3-
//! TODO:
4-
//!
5-
//! + `Tryfrom`
62
use std::fmt;
7-
// use core::convert::TryFrom;
8-
// use reqwest::Response;
9-
// use serde_json::Value;
3+
use std::error::Error as StdError;
104

115
/// Error enum
126
#[derive(Clone)]
137
pub enum Error {
8+
MatchError,
149
DownloadError(String),
1510
NetworkError(String),
1611
ParseError(&'static str),
@@ -21,6 +16,7 @@ impl std::fmt::Debug for Error {
2116
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
2217
match self {
2318
Error::CacheError(s) => {
19+
error!("{}, please try again", s);
2420
write!(f, "{}, please try again", s)
2521
},
2622
Error::DownloadError(s) => {
@@ -34,21 +30,36 @@ impl std::fmt::Debug for Error {
3430
error!("Parse {} failed, please try again", s);
3531
write!(f, "Parse {} failed, please try again", s)
3632
},
33+
Error::MatchError => {
34+
error!("Nothing matches");
35+
write!(f, "Nothing matches")
36+
}
3737
}
3838
}
3939
}
4040

41+
// network
4142
impl std::convert::From<reqwest::Error> for Error {
4243
fn from(err: reqwest::Error) -> Self {
43-
let url = err.url();
44-
if url.is_none() {
45-
return Error::NetworkError("https://leetcode.com".to_string());
46-
}
47-
48-
Error::NetworkError(url.unwrap().to_string())
44+
Error::NetworkError(err.description().to_string())
45+
}
46+
}
47+
48+
// sql
49+
impl std::convert::From<diesel::result::Error> for Error {
50+
fn from(err: diesel::result::Error) -> Self {
51+
Error::CacheError(err.description().to_string())
52+
}
53+
}
54+
55+
// io
56+
impl std::convert::From<std::io::Error> for Error {
57+
fn from(err: std::io::Error) -> Self {
58+
Error::CacheError(err.description().to_string())
4959
}
5060
}
5161

62+
// options
5263
impl std::convert::From<std::option::NoneError> for Error {
5364
fn from(_: std::option::NoneError) -> Self {
5465
Error::ParseError("json from response")

0 commit comments

Comments
 (0)