minhttpd/server
1
0
Fork 0
Code Issues Pull requests Wiki Activity

replace the unwrap with a error return

Browse source 
don't panic on std::fs::read_dir error (although permission errors are
returned as 404 responses)
This commit is contained in:
Damjan Georgievski 2018-07-22 07:41:05 +02:00
parent 9058452d93
commit 625bbcc0b9
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/web.rs
View file

@ -28,9 +28,9 @@ fn handle_directory<'a, 'b>(
req: &'b HttpRequest<PathBuf>,
) -> std::io::Result<HttpResponse> {
let mut paths: Vec<_> = std::fs::read_dir(&dir.path).unwrap()
.filter_map(|entry| if dir.is_visible(&entry) { entry.ok() } else {None})
.collect();
let rd = std::fs::read_dir(&dir.path)?;
let mut paths : Vec<_> = rd.filter_map(|entry| if dir.is_visible(&entry) { entry.ok() } else {None}).collect();
paths.sort_by_key(|r| (!r.metadata().unwrap().file_type().is_dir(), r.file_name()));