fix(handlers): root path "/" without filename in serve

viz-rs · Dec 3, 2023 · df8deec · df8deec
1 parent c90addf
commit df8deec
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/examples/README.md b/examples/README.md
@@ -32,7 +32,7 @@ Here you can find a lot of small crabs 🦀.
 
 ## Usage
 
-### Run it
+### Run it in `viz` directory
 
 ```console
 $ cargo run --bin hello-world -- --nocapture

diff --git a/examples/static-files/serve/src/main.rs b/examples/static-files/serve/src/main.rs
@@ -15,12 +15,16 @@ async fn main() -> Result<()> {
     let listener = TcpListener::bind(addr).await?;
     println!("listening on http://{addr}");
 
+    // in `viz` directory
     let dir = env::current_dir().unwrap();
 
     let app = Router::new()
         .get("/", index)
         .get("/cargo.toml", serve::File::new(dir.join("Cargo.toml")))
-        .get("/examples/*", serve::Dir::new(dir).listing())
+        .get(
+            "/examples/*",
+            serve::Dir::new(dir.join("examples")).listing(),
+        )
         .any("/*", |_| async { Ok(Response::text("Welcome!")) });
     let tree = Arc::new(Tree::from(app));
 

diff --git a/viz-handlers/src/serve/directory.rs b/viz-handlers/src/serve/directory.rs
@@ -6,7 +6,7 @@ use std::{
     ffi::OsStr,
     fmt::{Display, Formatter, Result},
     fs::read_dir,
-    path::PathBuf,
+    path::{Path, PathBuf},
     str::FromStr,
     string::ToString,
 };
@@ -24,7 +24,7 @@ impl Directory {
     pub(crate) fn new(
         base: &str,
         prev: bool,
-        root: &std::path::Path,
+        root: &Path,
         unlisted: &Option<Vec<&'static str>>,
     ) -> Option<Directory> {
         let mut entries = read_dir(root).ok()?;
@@ -66,7 +66,11 @@ impl Directory {
                 0,
                 (
                     parent.join("").to_str()?.strip_prefix('/')?.to_string(),
-                    parent.file_name().and_then(OsStr::to_str)?.to_string(),
+                    parent
+                        .file_name()
+                        .and_then(OsStr::to_str)
+                        .unwrap_or("")
+                        .to_string(),
                     false,
                     None,
                     "..".to_string(),