From be2963d931edeb799233abc1fa105c4349013054 Mon Sep 17 00:00:00 2001 From: Maciej Jur Date: Tue, 1 Oct 2024 19:59:55 +0200 Subject: [PATCH] forward bibliography --- src/main.rs | 15 +++++++++++++-- src/model.rs | 11 ----------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/main.rs b/src/main.rs index be3b68e..bc72858 100644 --- a/src/main.rs +++ b/src/main.rs @@ -99,8 +99,9 @@ fn main() { sack.get_content_list::("posts/**/*") .into_iter() .map(|query| { + let bibliography = sack.get_library(query.area); let (parsed, outline, bib) = - html::post::parse_content(query.content, &sack, query.area, None); + html::post::parse_content(query.content, &sack, query.area, bibliography); let out_buff = html::post::as_html(query.meta, &parsed, &sack, outline, bib); (query.slug.join("index.html"), out_buff) }) @@ -124,8 +125,9 @@ fn main() { sack.get_content_list::("**/*") .into_iter() .map(|query| { + let bibliography = sack.get_library(query.area); let (parsed, outline, bib) = - html::wiki::parse_content(query.content, &sack, query.area, None); + html::wiki::parse_content(query.content, &sack, query.area, bibliography); let out_buff = html::wiki::as_html(query.meta, &parsed, &sack, query.slug, outline, bib); (query.slug.join("index.html"), out_buff) @@ -151,6 +153,15 @@ fn main() { let (parsed, _, _) = text::md::parse(&data, &sack, "".into(), None); vec![("index.html".into(), crate::html::home(&sack, &parsed))] }) + .add_task(|sack| { + let query = sack.get_content("projects/flox").unwrap(); + + let (parsed, outline, bib) = + html::post::parse_content(query.content, &sack, query.area, None); + let out_buff = html::as_html(query.meta, &parsed, &sack, outline, bib); + + vec![(query.slug.join("index.html"), out_buff)] + }) // Task: generate project index .add_task(|sack| { vec![( diff --git a/src/model.rs b/src/model.rs index 50174d5..bb6acd0 100644 --- a/src/model.rs +++ b/src/model.rs @@ -31,17 +31,6 @@ mod isodate { use chrono::{DateTime, Utc}; use serde::{self, Deserialize, Deserializer}; - // pub fn serialize( - // date: &DateTime, - // serializer: S, - // ) -> Result - // where - // S: Serializer, - // { - // let s = date.to_rfc3339(); - // serializer.serialize_str(&s) - // } - pub(crate) fn deserialize<'de, D>(deserializer: D) -> Result, D::Error> where D: Deserializer<'de>,