Commit de33c69

author

curtain

committed

feat: refactor config

1 parent 930064f commit de33c69Copy full SHA for de33c69

File tree

8 files changed

+213

-244

lines changed

Cargo.toml
src
- cache
  - mod.rs
- cfg.rs
- cmds
  - data.rs
- err.rs
- helper.rs
- plugins
  - chrome.rs
  - leetcode.rs

8 files changed

+213

-244

lines changed

`‎Cargo.toml`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,6 @@ async-trait = "0.1.56"`
`20`	`20`	`tokio = { version = "1.19.2", features = ["full"] }`
`21`	`21`	`clap = { version = "4", features = ["cargo"] }`
`22`	`22`	`colored = "2.0.0"`
`23`		`-dirs = "4.0.0"`
`24`	`23`	`env_logger = "0.9.0"`
`25`	`24`	`keyring = "1.2.0"`
`26`	`25`	`log = "0.4.17"`
`@@ -32,6 +31,7 @@ serde_json = "1.0.82"`
`32`	`31`	`toml = "0.5.9"`
`33`	`32`	`regex = "1.6.0"`
`34`	`33`	`scraper = "0.13.0"`
	`34`	`+etcetera = "0.4.0"`
`35`	`35`
`36`	`36`	`[dependencies.diesel]`
`37`	`37`	`version = "1.4.8"`

`‎src/cache/mod.rs`

Lines changed: 9 additions & 25 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,8 @@ use self::models::*;`
`7`	`7`	`use self::schemas::{problems::dsl::, tags::dsl::};`
`8`	`8`	`use self::sql::*;`
`9`	`9`	`use crate::helper::test_cases_path;`
`10`		`-use crate::{cfg, err::Error, plugins::LeetCode};`
	`10`	`+use crate::Config;`
	`11`	`+use crate::{err::Error, plugins::LeetCode};`
`11`	`12`	`use colored::Colorize;`
`12`	`13`	`use diesel::prelude::*;`
`13`	`14`	`use reqwest::Response;`
`@@ -40,12 +41,12 @@ pub struct Cache(pub LeetCode);`
`40`	`41`	`impl Cache {`
`41`	`42`	`/// Ref to sqlite connection`
`42`	`43`	`fn conn(&self) -> Result<SqliteConnection, Error> {`
`43`		`- Ok(conn(self.0.conf.storage.cache()?))`
	`44`	`+ Ok(conn(Config::problems_filepath()?))`
`44`	`45`	`}`
`45`	`46`
`46`	`47`	`/// Clean cache`
`47`	`48`	`pub fn clean(&self) -> Result<(), Error> {`
`48`		`- Ok(std::fs::remove_file(&self.0.conf.storage.cache()?)?)`
	`49`	`+ Ok(std::fs::remove_file(Config::problems_filepath()?)?)`
`49`	`50`	`}`
`50`	`51`
`51`	`52`	`/// ref to download probems`
`@@ -55,7 +56,7 @@ impl Cache {`
`55`	`56`	`}`
`56`	`57`
`57`	`58`	`pub fn update_after_ac(self, rid: i32) -> Result<(), Error> {`
`58`		`- let c = conn(self.0.conf.storage.cache()?);`
	`59`	`+ let c = conn(Config::problems_filepath()?);`
`59`	`60`	`let target = problems.filter(id.eq(rid));`
`60`	`61`	`diesel::update(target).set(status.eq("ac")).execute(&c)?;`
`61`	`62`	`Ok(())`
`@@ -307,32 +308,16 @@ impl Cache {`
`307`	`308`	`json.insert("data_input", test_case);`
`308`	`309`
`309`	`310`	`let url = match run {`
`310`		`- Run::Test => conf`
`311`		`- .sys`
`312`		`- .urls`
`313`		`- .get("test")`
`314`		`- .ok_or(Error::NoneError)?`
`315`		`- .replace("$slug", &p.slug),`
	`311`	`+ Run::Test => conf.sys.urls.test.replace("$slug", &p.slug),`
`316`	`312`	`Run::Submit => {`
`317`	`313`	`json.insert("judge_type", "large".to_string());`
`318`		`- conf.sys`
`319`		`- .urls`
`320`		`- .get("submit")`
`321`		`- .ok_or(Error::NoneError)?`
`322`		`- .replace("$slug", &p.slug)`
	`314`	`+ conf.sys.urls.submit.replace("$slug", &p.slug)`
`323`	`315`	`}`
`324`	`316`	`};`
`325`	`317`
`326`	`318`	`Ok((`
`327`	`319`	`json,`
`328`		`- [`
`329`		`- url,`
`330`		`- conf.sys`
`331`		`- .urls`
`332`		`- .get("problems")`
`333`		`- .ok_or(Error::NoneError)?`
`334`		`- .replace("$slug", &p.slug),`
`335`		`- ],`
	`320`	`+ [url, conf.sys.urls.problems.replace("$slug", &p.slug)],`
`336`	`321`	`))`
`337`	`322`	`}`
`338`	`323`
`@@ -395,8 +380,7 @@ impl Cache {`
`395`	`380`
`396`	`381`	`/// New cache`
`397`	`382`	`pub fn new() -> Result<Self, Error> {`
`398`		`- let conf = cfg::locate()?;`
`399`		`- let c = conn(conf.storage.cache()?);`
	`383`	`+ let c = conn(Config::problems_filepath()?);`
`400`	`384`	`diesel::sql_query(CREATE_PROBLEMS_IF_NOT_EXISTS).execute(&c)?;`
`401`	`385`	`diesel::sql_query(CREATE_TAGS_IF_NOT_EXISTS).execute(&c)?;`
`402`	`386`

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 de33c69

File tree

8 files changed

8 files changed

`‎Cargo.toml`

`‎src/cache/mod.rs`

0 commit comments