From 957c89ed0d11344aa25fe9f231257861ad11365b Mon Sep 17 00:00:00 2001 From: Justine Date: Tue, 10 Jan 2023 09:47:07 +0100 Subject: [PATCH] Index working from subfolder --- src/lib.rs | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index 4818d8d9..d07a1418 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -205,10 +205,16 @@ pub mod websrv { } fn search_page(page: &String, root_folder: &str) -> Option> { - //regular page + let possible_pagenames = vec![ + format!("{page}.html"), + format!("{page}.htm"), + format!("{page}/index.html"), + format!("{page}/index.html") + ]; + + //Index at root if !page.contains('.') { - let possible_pagenames = vec![format!("{page}.html"), format!("{page}.htm")]; - for p in possible_pagenames { + for p in &possible_pagenames { match fs::read(format!("{root_folder}/{p}")) { Ok(c) => return Some(c), Err(_) => (),