eta357/LibreTunes-Nix-Test
1
0
Fork 0
Code Pull Requests Actions Activity

Add file and error handler

Browse Source
This commit is contained in:
Ethan Girouard 2024-03-01 14:50:42 -05:00
parent 939b14403f
commit 57fd838e10
Signed by: eta357
GPG Key ID: 7BCDC36DFD11C146
3 changed files with 43 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/fileserv.rs Normal file
View File

@ -0,0 +1,40 @@
use cfg_if::cfg_if;
cfg_if! { if #[cfg(feature = "ssr")] {
use axum::{
body::{boxed, Body, BoxBody},
extract::State,
response::IntoResponse,
http::{Request, Response, StatusCode, Uri},
};
use axum::response::Response as AxumResponse;
use tower::ServiceExt;
use tower_http::services::ServeDir;
use leptos::*;
use crate::app::App;
pub async fn file_and_error_handler(uri: Uri, State(options): State<LeptosOptions>, req: Request<Body>) -> AxumResponse {
let root = options.site_root.clone();
let res = get_static_file(uri.clone(), &root).await.unwrap();
if res.status() == StatusCode::OK {
res.into_response()
} else {
let handler = leptos_axum::render_app_to_stream(options.to_owned(), move || view!{<App/>});
handler(req).await.into_response()
}
}
async fn get_static_file(uri: Uri, root: &str) -> Result<Response<BoxBody>, (StatusCode, String)> {
let req = Request::builder().uri(uri.clone()).body(Body::empty()).unwrap();
// `ServeDir` implements `tower::Service` so we can call it with `tower::ServiceExt::oneshot`
// This path is relative to the cargo root
match ServeDir::new(root).oneshot(req).await {
Ok(res) => Ok(res.map(boxed)),
Err(err) => Err((
StatusCode::INTERNAL_SERVER_ERROR,
format!("Something went wrong: {err}"),
)),
}
}
}}

1
src/lib.rs
View File

@ -10,6 +10,7 @@ pub mod models;
pub mod pages; pub mod pages;
pub mod users; pub mod users;
pub mod search; pub mod search;
pub mod fileserv;
use cfg_if::cfg_if; use cfg_if::cfg_if;
cfg_if! { cfg_if! {

2
src/main.rs
View File

@ -18,6 +18,7 @@ async fn main() {
use leptos::*; use leptos::*;
use leptos_axum::{generate_route_list, LeptosRoutes}; use leptos_axum::{generate_route_list, LeptosRoutes};
use libretunes::app::*; use libretunes::app::*;
use libretunes::fileserv::file_and_error_handler;
use dotenv::dotenv; use dotenv::dotenv;
dotenv().ok(); dotenv().ok();
@ -35,6 +36,7 @@ async fn main() {
let app = Router::new() let app = Router::new()
.leptos_routes(&leptos_options, routes, App) .leptos_routes(&leptos_options, routes, App)
.fallback(file_and_error_handler)
.with_state(leptos_options); .with_state(leptos_options);
println!("listening on http://{}", &addr); println!("listening on http://{}", &addr);