alemi/dashboard
1
0
Fork 0
mirror of https://git.alemi.dev/dashboard.git synced 2024-11-14 19:59:18 +01:00
Code Issues Projects Releases Packages Wiki Activity

build: dropped jq_rs in favor of jql

Browse source
This commit is contained in:
əlemi 2022-06-09 01:38:52 +02:00
parent f6570ca10c
commit 83a49f07c5
Signed by: alemi
GPG key ID: A4895B84D311642C
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Cargo.toml
View file

@ -15,6 +15,6 @@ chrono = { version = "0.4", features = ["wasmbind"] }
serde = { version = "1", features = ["derive"] } serde = { version = "1", features = ["derive"] }
serde_json = "1" serde_json = "1"
rusqlite = { version = "0.27" } rusqlite = { version = "0.27" }
jq-rs = { version = "0.4", features = ["bundled"] } jql = { version = "4", default-features = false }
ureq = { version = "2", features = ["json"] } ureq = { version = "2", features = ["json"] }
eframe = { version = "0.18", features = ["persistence"] } eframe = { version = "0.18", features = ["persistence"] }

14
src/app/data/mod.rs
View file

@ -14,7 +14,8 @@ use self::store::SQLiteDataStore;
pub enum FetchError { pub enum FetchError {
UreqError(ureq::Error), UreqError(ureq::Error),
IoError(std::io::Error), IoError(std::io::Error),
JqError(jq_rs::Error), // JqError(jq_rs::Error),
JQLError(String),
RusqliteError(rusqlite::Error), RusqliteError(rusqlite::Error),
ParseFloatError(ParseFloatError), ParseFloatError(ParseFloatError),
NoPanelWithThatIdError, NoPanelWithThatIdError,
@ -26,8 +27,8 @@ impl From::<ureq::Error> for FetchError {
impl From::<std::io::Error> for FetchError { impl From::<std::io::Error> for FetchError {
fn from(e: std::io::Error) -> Self { FetchError::IoError(e) } fn from(e: std::io::Error) -> Self { FetchError::IoError(e) }
} }
impl From::<jq_rs::Error> for FetchError { impl From::<String> for FetchError { // TODO wtf? why does JQL error as a String?
fn from(e: jq_rs::Error) -> Self { FetchError::JqError(e) } fn from(e: String) -> Self { FetchError::JQLError(e) }
} }
impl From::<ParseFloatError> for FetchError { impl From::<ParseFloatError> for FetchError {
fn from(e: ParseFloatError) -> Self { FetchError::ParseFloatError(e) } fn from(e: ParseFloatError) -> Self { FetchError::ParseFloatError(e) }
@ -128,14 +129,13 @@ impl Source {
} }
pub fn fetch(url:&str, query_x:&str, query_y:&str) -> Result<Value, FetchError> { pub fn fetch(url:&str, query_x:&str, query_y:&str) -> Result<Value, FetchError> {
let res = ureq::get(url).call()?; let res = ureq::get(url).call()?.into_json()?;
let body = res.into_string()?;
let x : f64; let x : f64;
if query_x.len() > 0 { if query_x.len() > 0 {
x = jq_rs::compile(query_x)?.run(&body)?.trim().parse::<f64>()?; // TODO precompile and guard with a mutex x = jql::walker(&res, query_x)?.as_f64().unwrap(); // TODO what if it's given to us as a string?
} else { } else {
x = Utc::now().timestamp() as f64; x = Utc::now().timestamp() as f64;
} }
let y = jq_rs::compile(query_y)?.run(&body)?.trim().parse::<f64>()?; let y = jql::walker(&res, query_y)?.as_f64().unwrap();
return Ok( Value { x, y } ); return Ok( Value { x, y } );
} }