xfnw/clam
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

html: specify html lang

Browse Source
This commit is contained in:
xfnw 2024-06-20 15:02:57 -04:00
parent dc1814b3b1
commit 06d5d0f390
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/html.rs
View File

@ -14,8 +14,9 @@ use std::{cmp::min, collections::BTreeMap, error::Error, fs, io::Write, path::Pa
struct PageHtml<'a> {
title: String,
body: String,
lang: String,
author: String,
commit: &'a str,
author: &'a str,
modified: NaiveDateTime,
year: i32,
numdir: usize,
@ -292,17 +293,9 @@ pub fn generate_page(
let (created, author) = ctime.get(&full_path).ok_or("missing creation time")?;
let modified = mtime.get(&full_path).ok_or("missing modification time")?.0;
let author = res
.keywords()
.find(|k| k.key().eq_ignore_ascii_case("AUTHOR"))
.map(|k| k.value().trim().to_string())
.unwrap_or_else(|| author.to_string());
let year = if let Some(Ok(year)) = res
.keywords()
.find(|k| k.key().eq_ignore_ascii_case("YEAR"))
.map(|k| k.value().trim().parse())
{
let author = get_keyword(&res, "AUTHOR").unwrap_or_else(|| author.to_string());
let lang = get_keyword(&res, "LANGUAGE").unwrap_or_else(|| "en".to_string());
let year = if let Some(Ok(year)) = get_keyword(&res, "YEAR").map(|k| k.parse()) {
year
} else {
DateTime::from_timestamp(created.seconds(), 0)
@ -324,8 +317,9 @@ pub fn generate_page(
let template = PageHtml {
title: title.clone(),
body: html_export.exp.finish(),
lang,
author,
commit: short_id,
author: &author,
modified: DateTime::from_timestamp(modified.seconds(), 0)
.ok_or("broken modification date")?
.naive_utc(),
@ -351,6 +345,12 @@ pub fn generate_page(
Ok(())
}
fn get_keyword(res: &orgize::Org, keyword: &str) -> Option<String> {
res.keywords()
.find(|k| k.key().eq_ignore_ascii_case(keyword))
.map(|k| k.value().trim().to_string())
}
#[cfg(test)]
mod tests {
use crate::html::*;

2
templates/page.html
View File

@ -1,5 +1,5 @@
<!DOCTYPE html>
<html>
<html lang="{{ self.lang }}">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">