Mirrors/cobalt.rs
2
0
Fork 0
mirror of https://github.com/cobalt-org/cobalt.rs synced 2024-11-15 00:17:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

feat(error): Identify layout errors

Browse source
This commit is contained in:
Ed Page 2017-11-30 15:18:10 -07:00
parent e382156821
commit 0ec3a3d0fb
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/document.rs
View file

@ -2,7 +2,6 @@ use std::collections::HashMap;
use std::collections::hash_map::Entry; use std::collections::hash_map::Entry;
use std::path::{Path, PathBuf}; use std::path::{Path, PathBuf};
use std::default::Default; use std::default::Default;
use error::Result;
use chrono::{Datelike, Timelike}; use chrono::{Datelike, Timelike};
use regex::Regex; use regex::Regex;
use rss; use rss;
@ -15,6 +14,7 @@ use syntax_highlight::decorate_markdown;
use liquid::{Renderable, Context, Value}; use liquid::{Renderable, Context, Value};
use config; use config;
use error::*;
use files; use files;
use frontmatter; use frontmatter;
use pulldown_cmark as cmark; use pulldown_cmark as cmark;
@ -381,9 +381,10 @@ impl Document {
let content_html = self.render_html(&self.content, context, parser, syntax_theme)?; let content_html = self.render_html(&self.content, context, parser, syntax_theme)?;
self.attributes self.attributes
.insert("content".to_owned(), Value::Str(content_html.clone())); .insert("content".to_owned(), Value::Str(content_html.clone()));
context.set_val("content", Value::Str(content_html.clone()));
if let Some(ref layout) = self.front.layout { if let Some(ref layout) = self.front.layout {
context.set_val("content", Value::Str(content_html.clone()));
let layout_data_ref = match layouts_cache.entry(layout.to_owned()) { let layout_data_ref = match layouts_cache.entry(layout.to_owned()) {
Entry::Vacant(vacant) => { Entry::Vacant(vacant) => {
let layout_data = files::read_file(layouts_dir.join(layout)) let layout_data = files::read_file(layouts_dir.join(layout))
@ -398,8 +399,14 @@ impl Document {
Entry::Occupied(occupied) => occupied.into_mut(), Entry::Occupied(occupied) => occupied.into_mut(),
}; };
let template = parser.parse(layout_data_ref)?; let template = parser
Ok(template.render(context)?.unwrap_or_default()) .parse(layout_data_ref)
.chain_err(|| format!("Failed to parse layout {:?}", layout))?;
let content_html = template
.render(context)
.chain_err(|| format!("Failed to render layout {:?}", layout))?
.unwrap_or_default();
Ok(content_html)
} else { } else {
Ok(content_html) Ok(content_html)
} }