ti-nuage/gemserv
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Changed dir list

Browse Source
This commit is contained in:
int 80h
2020-05-03 16:36:38 -04:00
parent 82245b4778
commit c077d94835
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/main.rs
View File

@@ -77,13 +77,18 @@ fn get_content(path: PathBuf, u: url::Url) -> Result<String, io::Error> {
} }
let mut list = String::from("# Directory Listing\r\n\r\n"); let mut list = String::from("# Directory Listing\r\n\r\n");
list.push_str(format!("Path: {}\r\n\r\n", u.path()).as_str()); list.push_str(&format!("Path: {}\r\n\r\n", u.path()));
// needs work // needs work
for file in fs::read_dir(path)? { for file in fs::read_dir(&path)? {
if let Ok(file) = file { if let Ok(file) = file {
let f = file.file_name().to_str().unwrap().to_owned(); let m = file.metadata()?;
let p = u.join(&f).unwrap().as_str().to_owned(); let file = file.path();
list.push_str(format!("=> {} {}\r\n", p, f).as_str()); let p = file.strip_prefix(&path).unwrap();
if m.is_dir() {
list.push_str(&format!("=> {}/ {}/\r\n", p.display(), p.display()));
} else {
list.push_str(&format!("=> {} {}\r\n", p.display(), p.display()));
}
} }
} }
return Ok(list); return Ok(list);
@@ -123,7 +128,6 @@ async fn handle_connection(mut con: conn::Connection) -> Result<(), io::Error> {
return Ok(()); return Ok(());
} }
// add error
let meta = fs::metadata(&path).expect("Unable to read metadata"); let meta = fs::metadata(&path).expect("Unable to read metadata");
if meta.is_dir() { if meta.is_dir() {
@@ -213,6 +217,7 @@ fn main() -> io::Result<()> {
if server.cgi.is_some() { if server.cgi.is_some() {
cgi = server.cgi.as_ref().unwrap().to_string(); cgi = server.cgi.as_ref().unwrap().to_string();
} }
break;
} }
} }