blek
/
bfile
1
0
Fork 0
Code Issues 6 Pull Requests 1 Packages Projects Releases 1 Wiki Activity

Remove warp static dir in favor of static_dir! macro #9

Merged
blek merged 1 commits from fix-assets into 0.2-dev 2023-10-29 10:03:19 +01:00
Conversation 0 Commits 1 Files Changed 1 +2 -8
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
filed/src/web/mod.rs
View File

@ -2,8 +2,6 @@
web - The part of filed that handles everything related to HTTP web - The part of filed that handles everything related to HTTP
*/ */
use std::env::current_dir;
use static_dir::static_dir; use static_dir::static_dir;
use warp::{Filter, reply::Reply, reject::Rejection}; use warp::{Filter, reply::Reply, reject::Rejection};
@ -19,15 +17,11 @@ mod uploaded;
use state::SharedState; use state::SharedState;
pub fn routes(state: SharedState) -> impl Filter<Extract = impl Reply, Error = Rejection> + Clone { pub fn routes(state: SharedState) -> impl Filter<Extract = impl Reply, Error = Rejection> + Clone {
let staticpath = current_dir().unwrap(); static_dir!("static")
let staticpath = staticpath.to_str().unwrap().to_string() + "/static"; .or(pages::get_routes(state.clone()))
pages::get_routes(state.clone())
.or(forms::get_routes(state.clone())) .or(forms::get_routes(state.clone()))
.or(api::get_routes(state.clone())) .or(api::get_routes(state.clone()))
.or(uploaded::get_uploaded(state)) .or(uploaded::get_uploaded(state))
.or(static_dir!("static"))
.or(warp::fs::dir(staticpath.to_string()))
} }
/* /*