feat(page_template): add raw annotations

out-of-cheese-error · Mar 29, 2021 · c595083 · c595083
1 parent de6f88a
commit c595083
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/README.md b/README.md
@@ -255,6 +255,8 @@ The following keys can be used inside the template:
 * `{{ relative_path }}` - path relative to KB directory
 * `{{ absolute_path }}` - full path on filesystem
 * `annotations` - a list of *rendered* annotations (according to the annotation template)
+* `raw_annotations` - a list of annotations (in case you need info for the page about the annotations -
+  e.g. `{{raw_annotations.0.title}}`)
 
 The default template is:
 

diff --git a/src/configuration.rs b/src/configuration.rs
@@ -633,10 +633,14 @@ file_extension = '{}'
                     relative_path: "relative/path/to/page.md".to_string(),
                     absolute_path: "absolute/path/to/page.md".to_string(),
                 },
-                annotations: vec![test_annotation_1, test_annotation_2]
+                annotations: vec![test_annotation_1.clone(), test_annotation_2.clone()]
                     .into_iter()
                     .map(|a| hbs.render("annotation", &AnnotationTemplate::from_annotation(a)))
                     .collect::<Result<Vec<String>, _>>()?,
+                raw_annotations: vec![
+                    AnnotationTemplate::from_annotation(test_annotation_1),
+                    AnnotationTemplate::from_annotation(test_annotation_2),
+                ],
             };
 
             self.page_template = loop {

diff --git a/src/gooseberry/knowledge_base.rs b/src/gooseberry/knowledge_base.rs
@@ -154,6 +154,7 @@ pub struct PageTemplate {
     #[serde(flatten)]
     pub link_data: LinkTemplate,
     pub annotations: Vec<String>,
+    pub raw_annotations: Vec<AnnotationTemplate>,
 }
 
 /// ## Markdown generation
@@ -360,9 +361,10 @@ impl Gooseberry {
                         let page_data = PageTemplate {
                             link_data,
                             annotations: inner_annotations
-                                .into_iter()
+                                .iter()
                                 .map(|a| hbs.render("annotation", &a))
                                 .collect::<Result<Vec<String>, _>>()?,
+                            raw_annotations: inner_annotations,
                         };
                         fs::File::create(&path)?
                             .write_all(hbs.render("page", &page_data)?.as_bytes())?;