summaryrefslogtreecommitdiff
path: root/src/page.rs
diff options
context:
space:
mode:
Diffstat (limited to 'src/page.rs')
-rw-r--r--src/page.rs25
1 files changed, 17 insertions, 8 deletions
diff --git a/src/page.rs b/src/page.rs
index d0ba861..d2f144a 100644
--- a/src/page.rs
+++ b/src/page.rs
@@ -97,23 +97,23 @@ impl MarkdownPage {
&self.meta
}
- pub fn body_to_html(&self) -> HtmlPage {
+ pub fn body_to_html(&self) -> Result<HtmlPage, SiteError> {
let head = Element::new(ElementTag::Head);
- let body = parse(self.markdown());
- HtmlPage::new(head, body)
+ let body = parse(self.markdown())?;
+ Ok(HtmlPage::new(head, body))
}
- pub fn to_html(&self) -> HtmlPage {
+ pub fn to_html(&self) -> Result<HtmlPage, SiteError> {
let mut title = Element::new(ElementTag::Title);
title.push_child(Content::Text(self.meta.title().into()));
let mut head = Element::new(ElementTag::Head);
head.push_child(Content::Elt(title));
- let body = parse(self.markdown());
+ let body = parse(self.markdown())?;
trace!("MarkdownPage::to_html: head={:?}", head);
- HtmlPage::new(head, body)
+ Ok(HtmlPage::new(head, body))
}
}
@@ -126,7 +126,12 @@ pub struct PageMeta {
impl PageMeta {
fn new(name: String, title: Option<String>, path: PathBuf) -> Self {
- trace!("PageMeta: name={:?} title={:?} path={:?}", name, title, path);
+ trace!(
+ "PageMeta: name={:?} title={:?} path={:?}",
+ name,
+ title,
+ path
+ );
Self { name, title, path }
}
@@ -165,7 +170,11 @@ pub struct MetaBuilder {
impl MetaBuilder {
pub fn build(self) -> PageMeta {
- PageMeta::new(self.name, self.title, self.path.expect("path set on MetaBuilder"))
+ PageMeta::new(
+ self.name,
+ self.title,
+ self.path.expect("path set on MetaBuilder"),
+ )
}
pub fn name(mut self, name: String) -> Self {