diff --git a/src/db.rs b/src/db.rs index 49a2b12..858a186 100644 --- a/src/db.rs +++ b/src/db.rs @@ -1,8 +1,8 @@ use rusqlite::{Connection, Result}; use std::sync::Mutex; - use rusqlite::types::Value; - +use rusqlite::types::Value; + pub struct Db { conn: Mutex, } @@ -27,25 +27,25 @@ impl Db { let col_count = stmt.column_count(); - let rows_iter = stmt.query_map([], move |row| { - let mut r = Vec::new(); - - for i in 0..col_count { - let val: Value = row.get(i)?; - - let s = match val { - Value::Null => "".to_string(), - Value::Integer(i) => i.to_string(), - Value::Real(f) => f.to_string(), - Value::Text(t) => t, // already String - Value::Blob(_) => "".to_string(), - }; - - r.push(s); - } - - Ok(r) - })?; + let rows_iter = stmt.query_map([], move |row| { + let mut r = Vec::new(); + + for i in 0..col_count { + let val: Value = row.get(i)?; + + let s = match val { + Value::Null => "".to_string(), + Value::Integer(i) => i.to_string(), + Value::Real(f) => f.to_string(), + Value::Text(t) => t, // already String + Value::Blob(_) => "".to_string(), + }; + + r.push(s); + } + + Ok(r) + })?; let mut rows = Vec::new(); for r in rows_iter { @@ -54,4 +54,4 @@ impl Db { Ok((columns, rows)) } -} \ No newline at end of file +} diff --git a/src/main.rs b/src/main.rs index bcd281d..97b92b8 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,4 +1,4 @@ -use axum::{routing::get, Router}; +use axum::{Router, routing::get}; use clap::Parser; use std::sync::Arc; use tokio::net::TcpListener; @@ -20,17 +20,11 @@ async fn main() { let db = Arc::new(Db::open(&args.db).expect("db open failed")); - let app = Router::new() - .route("/", get(routes::index)) - .with_state(db); + let app = Router::new().route("/", get(routes::index)).with_state(db); - let listener = TcpListener::bind("127.0.0.1:8040") - .await - .unwrap(); + let listener = TcpListener::bind("127.0.0.1:8040").await.unwrap(); println!("http://127.0.0.1:8040"); - axum::serve(listener, app) - .await - .unwrap(); -} \ No newline at end of file + axum::serve(listener, app).await.unwrap(); +} diff --git a/src/routes.rs b/src/routes.rs index 61bcfdf..d8aa5ac 100644 --- a/src/routes.rs +++ b/src/routes.rs @@ -1,9 +1,6 @@ use askama::Template; // REQUIRED -use axum::{ - extract::State, - response::Html, -}; +use axum::{extract::State, response::Html}; use std::sync::Arc; use crate::db::Db; @@ -26,4 +23,4 @@ pub async fn index(State(db): State>) -> Html { }; Html(tmpl.render().unwrap()) -} \ No newline at end of file +}