Tim-Paik/srv
1
0
Fork 0
mirror of https://github.com/Tim-Paik/srv.git synced 2024-10-13 00:29:43 +00:00
Code Issues Projects Releases Wiki Activity

v1.0.0-rc.5 fixed undecode url and try to statically link msvc runtime

Browse Source
This commit is contained in:
Tim-Paik
2021-09-03 18:41:58 +08:00
parent 757a2943f4
commit 62fd879e53
5 changed files with 31 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/main.rs
View File

@ -180,9 +180,9 @@ struct File {
}
#[derive(serde::Serialize)]
struct IndexContext<'r> {
title: &'r str,
paths: Vec<&'r str>,
struct IndexContext {
title: String,
paths: Vec<String>,
dirs: Vec<Dir>,
files: Vec<File>,
}
@ -211,7 +211,7 @@ fn render_index(
}
let show_dot_files = var("DOTFILES").unwrap_or("false".to_string()) == "true";
let mut context = IndexContext {
title: "",
title: "".to_string(),
paths: vec![],
dirs: vec![],
files: vec![],
@ -220,6 +220,9 @@ fn render_index(
if path == "" {
continue;
}
let path =
urlencoding::decode(path).unwrap_or(std::borrow::Cow::Borrowed("[Parse URL Error]"));
let path = path.into_owned();
context.paths.push(path);
}
match read_dir(&dir.path) {
@ -276,7 +279,7 @@ fn render_index(
}
}
}
context.title = context.paths.last().unwrap_or(&"/");
context.title = context.paths.last().unwrap_or(&"/".to_string()).to_string();
context.dirs.sort();
context.files.sort();
let content = tera::Context::from_serialize(&context);
@ -632,7 +635,11 @@ async fn main() -> std::io::Result<()> {
} else {
process_time
});
let content = blue.value(data[4]);
let content = blue.value(
urlencoding::decode(data[4])
.unwrap_or(std::borrow::Cow::Borrowed("[Parse URL Error]"))
.into_owned(),
);
return writeln!(
buf,
"[{}] {} | {} | {} | {}",