zhushenwudi/ew_author
1
0
Fork 0
mirror of https://git.ethanthesleepy.one/ethanaobrien/ew synced 2026-01-12 00:02:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Move sql get_live_data function to clear_rate.rs

Browse Source
This commit is contained in:
Ethan O'Brien
2025-11-30 10:59:07 -06:00
parent fd47262f52
commit 74a00769aa
2 changed files with 27 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/router/clear_rate.rs
View File

@@ -8,6 +8,29 @@ use crate::encryption;
use crate::sql::SQLite; use crate::sql::SQLite;
use crate::router::{global, databases}; use crate::router::{global, databases};
trait SqlClearRate {
fn get_live_data(&self, id: i64) -> Result<Live, rusqlite::Error>;
}
impl SqlClearRate for SQLite {
fn get_live_data(&self, id: i64) -> Result<Live, rusqlite::Error> {
let conn = rusqlite::Connection::open(self.get_path()).unwrap();
let mut stmt = conn.prepare("SELECT * FROM lives WHERE live_id=?1")?;
stmt.query_row(params!(id), |row| {
Ok(Live {
live_id: row.get(0)?,
normal_failed: row.get(1)?,
normal_pass: row.get(2)?,
hard_failed: row.get(3)?,
hard_pass: row.get(4)?,
expert_failed: row.get(5)?,
expert_pass: row.get(6)?,
master_failed: row.get(7)?,
master_pass: row.get(8)?,
})
})
}
}
lazy_static! { lazy_static! {
static ref DATABASE: SQLite = SQLite::new("live_statistics.db", setup_tables); static ref DATABASE: SQLite = SQLite::new("live_statistics.db", setup_tables);
static ref CACHED_DATA: Mutex<Option<JsonValue>> = Mutex::new(None); static ref CACHED_DATA: Mutex<Option<JsonValue>> = Mutex::new(None);

24
src/sql.rs
View File

@@ -1,8 +1,6 @@
use rusqlite::{Connection, params, ToSql}; use rusqlite::{Connection, ToSql};
use json::{JsonValue, array}; use json::{JsonValue, array};
use crate::router::clear_rate::Live;
pub struct SQLite { pub struct SQLite {
path: String path: String
} }
@@ -18,6 +16,9 @@ impl SQLite {
setup(&conn); setup(&conn);
instance instance
} }
pub fn get_path(&self) -> &str {
&self.path
}
pub fn lock_and_exec(&self, command: &str, args: &[&dyn ToSql]) { pub fn lock_and_exec(&self, command: &str, args: &[&dyn ToSql]) {
let conn = Connection::open(&self.path).unwrap(); let conn = Connection::open(&self.path).unwrap();
conn.execute(command, args).unwrap(); conn.execute(command, args).unwrap();
@@ -51,21 +52,4 @@ impl SQLite {
} }
Ok(rv) Ok(rv)
} }
pub fn get_live_data(&self, id: i64) -> Result<Live, rusqlite::Error> {
let conn = Connection::open(&self.path).unwrap();
let mut stmt = conn.prepare("SELECT * FROM lives WHERE live_id=?1")?;
stmt.query_row(params!(id), |row| {
Ok(Live {
live_id: row.get(0)?,
normal_failed: row.get(1)?,
normal_pass: row.get(2)?,
hard_failed: row.get(3)?,
hard_pass: row.get(4)?,
expert_failed: row.get(5)?,
expert_pass: row.get(6)?,
master_failed: row.get(7)?,
master_pass: row.get(8)?,
})
})
}
} }