leon/knifer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix some formatting and improve structure

Browse Source
This commit is contained in:
Lol3rrr
2024-09-16 23:20:55 +02:00
parent a1faa1a815
commit 1e6c3da58b
12 changed files with 423 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

119
backend/src/lib.rs
View File

@@ -2,7 +2,7 @@ pub mod models;
pub mod schema;
mod usersession;
pub use usersession::{UserSessionData, UserSession};
pub use usersession::{UserSession, UserSessionData};
pub mod diesel_sessionstore;
@@ -13,10 +13,15 @@ pub async fn db_connection() -> diesel_async::AsyncPgConnection {
let database_url = std::env::var("DATABASE_URL").expect("'DATABASE_URL' must be set");
diesel_async::AsyncPgConnection::establish(&database_url).await.unwrap_or_else(|e| panic!("Error connecting to {} - {:?}", database_url, e))
diesel_async::AsyncPgConnection::establish(&database_url)
.await
.unwrap_or_else(|e| panic!("Error connecting to {} - {:?}", database_url, e))
}
pub async fn get_demo_from_upload(name: &str, mut form: axum::extract::Multipart) -> Option<axum::body::Bytes> {
pub async fn get_demo_from_upload(
name: &str,
mut form: axum::extract::Multipart,
) -> Option<axum::body::Bytes> {
while let Ok(field) = form.next_field().await {
let field = match field {
Some(f) => f,
@@ -36,49 +41,23 @@ pub async fn get_demo_from_upload(name: &str, mut form: axum::extract::Multipart
}
pub mod api;
pub mod steam_api {
use serde::Deserialize;
pub struct Client {
http: reqwest::Client,
api_key: String,
}
#[derive(Debug, Deserialize)]
struct Response<T> {
response: T,
}
impl Client {
pub fn new<IS>(api_key: IS) -> Self where IS: Into<String> {
Self {
http: reqwest::Client::new(),
api_key: api_key.into(),
}
}
pub async fn get<T>(&self, path: &str, args: &[(&str, &str)]) -> Result<T, ()> where T: serde::de::DeserializeOwned {
let response = self.http.get(path).query(&[("key", &self.api_key)]).query(args).send().await.map_err(|e| ())?;
if !response.status().is_success() {
dbg!(&response);
return Err(());
}
response.json::<Response<T>>().await.map(|r| r.response).map_err(|e| ())
}
}
}
pub mod steam_api;
#[tracing::instrument(skip(upload_folder, base_analysis_tx))]
pub async fn run_api<UP>(upload_folder: UP, base_analysis_tx: tokio::sync::mpsc::UnboundedSender<analysis::AnalysisInput>) where UP: Into<std::path::PathBuf> {
pub async fn run_api<UP>(
upload_folder: UP,
base_analysis_tx: tokio::sync::mpsc::UnboundedSender<analysis::AnalysisInput>,
) where
UP: Into<std::path::PathBuf>,
{
let upload_folder: std::path::PathBuf = upload_folder.into();
let session_store = crate::diesel_sessionstore::DieselStore::new();
let session_layer = tower_sessions::SessionManagerLayer::new(session_store)
.with_secure(false)
.with_expiry(tower_sessions::Expiry::OnInactivity(
time::Duration::hours(48),
));
.with_expiry(tower_sessions::Expiry::OnInactivity(time::Duration::hours(
48,
)));
if !tokio::fs::try_exists(&upload_folder).await.unwrap_or(false) {
tokio::fs::create_dir_all(&upload_folder).await.unwrap();
@@ -87,42 +66,54 @@ pub async fn run_api<UP>(upload_folder: UP, base_analysis_tx: tokio::sync::mpsc:
let router = axum::Router::new()
.nest("/api/", crate::api::router(base_analysis_tx))
.layer(session_layer)
.nest_service("/", tower_http::services::ServeDir::new("../frontend/dist/"));
.nest_service(
"/",
tower_http::services::ServeDir::new("../frontend/dist/"),
);
let listener = tokio::net::TcpListener::bind("0.0.0.0:3000").await.unwrap();
axum::serve(listener, router).await.unwrap();
}
#[tracing::instrument]
pub async fn run_analysis(mut base_analysis_rx: tokio::sync::mpsc::UnboundedReceiver<analysis::AnalysisInput>) {
pub async fn run_analysis(
mut base_analysis_rx: tokio::sync::mpsc::UnboundedReceiver<analysis::AnalysisInput>,
) {
use diesel::prelude::*;
use diesel_async::{RunQueryDsl, AsyncConnection};
use diesel_async::{AsyncConnection, RunQueryDsl};
while let Some(input) = base_analysis_rx.recv().await {
let demo_id = input.demoid;
while let Some(input) = base_analysis_rx.recv().await {
let demo_id = input.demoid;
let result = tokio::task::spawn_blocking(move || {
crate::analysis::analyse_base(input)
}).await.unwrap();
let result = tokio::task::spawn_blocking(move || crate::analysis::analyse_base(input))
.await
.unwrap();
dbg!(&result);
dbg!(&result);
let mut db_con = crate::db_connection().await;
let store_info_query = diesel::dsl::insert_into(crate::schema::demo_info::dsl::demo_info).values(crate::models::DemoInfo {
demo_id,
map: result.map,
});
let update_process_info = diesel::dsl::update(crate::schema::processing_status::dsl::processing_status).set(crate::schema::processing_status::dsl::info.eq(1)).filter(crate::schema::processing_status::dsl::demo_id.eq(demo_id));
let mut db_con = crate::db_connection().await;
tracing::trace!(?store_info_query, "Store demo info query");
tracing::trace!(?update_process_info, "Update processing info query");
let store_info_query = diesel::dsl::insert_into(crate::schema::demo_info::dsl::demo_info)
.values(crate::models::DemoInfo {
demo_id,
map: result.map,
});
let update_process_info =
diesel::dsl::update(crate::schema::processing_status::dsl::processing_status)
.set(crate::schema::processing_status::dsl::info.eq(1))
.filter(crate::schema::processing_status::dsl::demo_id.eq(demo_id));
db_con.transaction::<'_, '_, '_, _, diesel::result::Error, _>(|conn| Box::pin(async move {
store_info_query.execute(conn).await.map(|e| ())?;
update_process_info.execute(conn).await.map(|e| ())?;
Ok(())
})).await;
}
tracing::trace!(?store_info_query, "Store demo info query");
tracing::trace!(?update_process_info, "Update processing info query");
db_con
.transaction::<'_, '_, '_, _, diesel::result::Error, _>(|conn| {
Box::pin(async move {
store_info_query.execute(conn).await.map(|e| ())?;
update_process_info.execute(conn).await.map(|e| ())?;
Ok(())
})
})
.await;
}
}