diff options
| author | Alejandro Sior <aho@sior.be> | 2022-09-11 12:32:32 +0200 |
|---|---|---|
| committer | Alejandro Sior <aho@sior.be> | 2022-09-11 12:32:32 +0200 |
| commit | 5bb3d63508cafa062d233f0550a0721d40ed76c5 (patch) | |
| tree | e315f0dbf966005472810895a2c33eb3da155a58 | |
| parent | 55bcd098059fca8d200abadc165ce04d6b54bc0a (diff) | |
generate nav more precisely
| -rw-r--r-- | index.html | 2 | ||||
| -rw-r--r-- | lexicon | 10 | ||||
| -rw-r--r-- | site/bsfs.html (renamed from site/bsfs) | 2 | ||||
| -rw-r--r-- | site/contact.html (renamed from site/contact) | 2 | ||||
| -rw-r--r-- | site/experiments.html (renamed from site/experiments) | 2 | ||||
| -rw-r--r-- | site/home.html (renamed from site/home) | 2 | ||||
| -rw-r--r-- | src/main.rs | 9 |
7 files changed, 16 insertions, 13 deletions
@@ -48,7 +48,7 @@ } </style> <body> - <header><nav><a href="/site/home"><h1 id="title">site</h1><h3 id="subtitle"></h3></a>{{ nav }}</nav></header> + <header><nav><a href="/site/home.html"><h1 id="title">site</h1><h3 id="subtitle"></h3></a>{{ nav }}</nav></header> <article class="rest"> {{ article }} </article> @@ -1,5 +1,5 @@ -| contact experiments -home | contact experiments -contact | -experiments | bsfs -bsfs |
\ No newline at end of file +| contact.html experiments.html +home.html | contact.html experiments.html +contact.html | +experiments.html | bsfs.html +bsfs.html |
\ No newline at end of file diff --git a/site/bsfs b/site/bsfs.html index 4ffd953..e3f455b 100644 --- a/site/bsfs +++ b/site/bsfs.html @@ -48,7 +48,7 @@ } </style> <body> - <header><nav><a href="/site/home"><h1 id="title">site</h1><h3 id="subtitle"></h3></a><ul><li><a href="/site/contact" class="nav-not-intended">contact</a></li><li><a href="/site/experiments" class="nav-intended">experiments</a></li></ul><ul><li><a href="/site/bsfs" class="nav-intended">bsfs</a></li></ul><ul></ul></nav></header> + <header><nav><a href="/site/home.html"><h1 id="title">site</h1><h3 id="subtitle"></h3></a><ul><li><a href="/site/contact.html" class="nav-not-intended">contact</a></li><li><a href="/site/experiments.html" class="nav-intended">experiments</a></li></ul><ul><li><a href="/site/bsfs.html" class="nav-intended">bsfs</a></li></ul><ul></ul></nav></header> <article class="rest"> <h3>bsfs is a filesystem for my systems</h3> diff --git a/site/contact b/site/contact.html index 3831dcf..252442d 100644 --- a/site/contact +++ b/site/contact.html @@ -48,7 +48,7 @@ } </style> <body> - <header><nav><a href="/site/home"><h1 id="title">site</h1><h3 id="subtitle"></h3></a><ul><li><a href="/site/contact" class="nav-intended">contact</a></li><li><a href="/site/experiments" class="nav-not-intended">experiments</a></li></ul><ul></ul></nav></header> + <header><nav><a href="/site/home.html"><h1 id="title">site</h1><h3 id="subtitle"></h3></a><ul><li><a href="/site/contact.html" class="nav-intended">contact</a></li><li><a href="/site/experiments.html" class="nav-not-intended">experiments</a></li></ul><ul></ul></nav></header> <article class="rest"> <ul> <li>Email: <code>aho arobase sior point be</code></li> diff --git a/site/experiments b/site/experiments.html index c7e70b1..0f0d80e 100644 --- a/site/experiments +++ b/site/experiments.html @@ -48,7 +48,7 @@ } </style> <body> - <header><nav><a href="/site/home"><h1 id="title">site</h1><h3 id="subtitle"></h3></a><ul><li><a href="/site/contact" class="nav-not-intended">contact</a></li><li><a href="/site/experiments" class="nav-intended">experiments</a></li></ul><ul><li><a href="/site/bsfs" class="nav-not-intended">bsfs</a></li></ul></nav></header> + <header><nav><a href="/site/home.html"><h1 id="title">site</h1><h3 id="subtitle"></h3></a><ul><li><a href="/site/contact.html" class="nav-not-intended">contact</a></li><li><a href="/site/experiments.html" class="nav-intended">experiments</a></li></ul><ul><li><a href="/site/bsfs.html" class="nav-not-intended">bsfs</a></li></ul></nav></header> <article class="rest"> <h3>My projects</h3> diff --git a/site/home b/site/home.html index adbff60..725ec2d 100644 --- a/site/home +++ b/site/home.html @@ -48,7 +48,7 @@ } </style> <body> - <header><nav><a href="/site/home"><h1 id="title">site</h1><h3 id="subtitle"></h3></a><ul><li><a href="/site/contact" class="nav-not-intended">contact</a></li><li><a href="/site/experiments" class="nav-not-intended">experiments</a></li></ul></nav></header> + <header><nav><a href="/site/home.html"><h1 id="title">site</h1><h3 id="subtitle"></h3></a><ul><li><a href="/site/contact.html" class="nav-not-intended">contact</a></li><li><a href="/site/experiments.html" class="nav-not-intended">experiments</a></li></ul></nav></header> <article class="rest"> <p>Engineering student at the University of Liège, Belgium. I am aspiring to become an aerospace engineer; though I enjoy programming and experimenting in my free time.</p> 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); } |