generate nav more precisely

1 files changed, 6 insertions, 3 deletions

diff --git a/src/main.rs b/src/main.rs
index 999cf9d..e4602a4 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -96,7 +96,9 @@ fn create_nav<'a, 'b>(v: &'a Vec<&'b Lexicon>) -> String {
                 "nav-not-intended"
             };
         
-            html.push(format!("<li><a href=\"/site/{}\" class=\"{}\">{}</a></li>", related, class, related));
+            let test = Path::new(related).file_stem().and_then(OsStr::to_str).unwrap();
+        
+            html.push(format!("<li><a href=\"/site/{}\" class=\"{}\">{}</a></li>", related, class, test));
         }
         
         
@@ -109,12 +111,13 @@ fn create_nav<'a, 'b>(v: &'a Vec<&'b Lexicon>) -> String {
 fn process(lexicon: &Vec<Lexicon>, template: &String, src: &Path) -> String {
     let dest = template.clone();
     
+    let name = src.file_name().and_then(OsStr::to_str).unwrap();
     let stem = src.file_stem().and_then(OsStr::to_str).unwrap();
     let ext = src.extension().and_then(OsStr::to_str).unwrap();
     
     let src = fs::read_to_string(src).unwrap();
     
-    let m = create_links(lexicon, stem);
+    let m = create_links(lexicon, name);
     let nav = create_nav(&m);
     
     let dest = dest.replace("{{ nav }}", &nav);
@@ -140,7 +143,7 @@ fn main() {
         let site = process(&lexicon, &template, &src);
         
         // Build dest
-        dest.push(stem);
+        dest.push(name);
         
         fs::write(&dest, &site);
     }