zyl/zyllian.github.io
1
0
Fork 0
mirror of https://github.com/zyllian/zyllian.github.io.git synced 2025-05-10 02:26:45 -07:00
Code Issues Projects Releases Packages Wiki Activity

Switch to stable toolchain

Browse source
This commit is contained in:
Zoey 2021-08-19 13:59:00 -07:00
parent 471b1afc8b
commit 7bf7dc8ea2
No known key found for this signature in database
GPG key ID: 2DCAC8EA81672106
5 changed files with 31 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

61
src/serving.rs
View file

@ -231,45 +231,40 @@ impl Site {
.or(warp::any().and(warp::get()).and(
warp::path::full()
.and(with_build_path(build_path.clone()))
.and_then(
async move |path: FullPath,
build_path: PathBuf|
-> Result<Response, warp::Rejection> {
// Serve static files
let p = &path.as_str()[1..];
.and_then(move |path: FullPath, build_path: PathBuf| async move {
// Serve static files
let p = &path.as_str()[1..];
if p == "static/_dev.js" {
let res =
Response::new(include_str!("./refresh_websocket.js").into());
return Ok(res);
}
if p == "static/_dev.js" {
let res = Response::new(include_str!("./refresh_websocket.js").into());
return Ok(res);
}
let mut p = build_path.join(p);
let mut p = build_path.join(p);
if !p.exists() {
p = p.with_extension("html");
}
if p.is_dir() {
p = p.join("index.html");
}
if !p.exists() {
p = p.with_extension("html");
}
if p.is_dir() {
p = p.join("index.html");
}
if p.exists() {
let mut res = Response::new("".into());
match std::fs::read_to_string(&p) {
Ok(body) => {
*res.body_mut() = body.into();
}
Err(e) => {
eprintln!("{}", e);
*res.body_mut() = format!("Failed to load: {}", e).into();
*res.status_mut() = StatusCode::INTERNAL_SERVER_ERROR;
}
if p.exists() {
let mut res = Response::new("".into());
match std::fs::read_to_string(&p) {
Ok(body) => {
*res.body_mut() = body.into();
}
Err(e) => {
eprintln!("{}", e);
*res.body_mut() = format!("Failed to load: {}", e).into();
*res.status_mut() = StatusCode::INTERNAL_SERVER_ERROR;
}
return Ok(res);
}
Err(warp::reject())
},
),
return Ok(res);
}
Err(warp::reject())
}),
))
.or(warp::any()
.and(warp::path::full())