last path issues please

Zheoni · Jan 13, 2024 · 76f77d3 · 76f77d3
1 parent 0f57173
commit 76f77d3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/serve/handlers/mod.rs b/src/serve/handlers/mod.rs
@@ -125,10 +125,10 @@ fn recipe_entry_context(
             .images()
             .iter()
             .find(|i| i.indexes.is_none())
-            .map(|i| format!("/src/{}", i.path));
+            .map(|i| format!("/src/{}", clean_path(&i.path, &state.base_path)));
     }
 
-    let path = r.path().with_extension("");
+    let path = clean_path(r.path(), &state.base_path).with_extension("");
 
     Some(context! {
         fallback_name => r.name(),

diff --git a/src/serve/mod.rs b/src/serve/mod.rs
@@ -90,7 +90,7 @@ fn make_router(state: Arc<AppState>) -> Router {
             ServiceBuilder::new()
                 .layer(middleware::from_fn(filter_files))
                 .layer(middleware::from_fn(cook_mime_type))
-                .service(tower_http::services::ServeDir::new(".")),
+                .service(tower_http::services::ServeDir::new(&state.base_path)),
         )
         .fallback(handlers::static_file)
         .with_state(state)