actions
/
mdBook
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1033 from TjeuKayim/log-deserialization-error-html-config 

Log deserialization errors for [html.config]
This commit is contained in:
Eric Huss 2019-09-26 10:28:18 -07:00 committed by GitHub
parent 996ac382c1 213171591a
commit 98ecd1178b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/config.rs
View File

@ -62,6 +62,7 @@ use toml_query::insert::TomlValueInsertExt;
use toml_query::read::TomlValueReadExt; use toml_query::read::TomlValueReadExt;
use crate::errors::*; use crate::errors::*;
use crate::utils;
/// The overall configuration object for MDBook, essentially an in-memory /// The overall configuration object for MDBook, essentially an in-memory
/// representation of `book.toml`. /// representation of `book.toml`.
@ -168,7 +169,13 @@ impl Config {
/// HTML renderer is refactored to be less coupled to `mdbook` internals. /// HTML renderer is refactored to be less coupled to `mdbook` internals.
#[doc(hidden)] #[doc(hidden)]
pub fn html_config(&self) -> Option<HtmlConfig> { pub fn html_config(&self) -> Option<HtmlConfig> {
self.get_deserialized("output.html").ok() match self.get_deserialized("output.html") {
Ok(config) => Some(config),
Err(e) => {
utils::log_backtrace(&e.chain_err(|| "Parsing configuration [output.html]"));
None
}
}
} }
/// Convenience function to fetch a value from the config and deserialize it /// Convenience function to fetch a value from the config and deserialize it

15
src/renderer/html_handlebars/hbs_renderer.rs
View File

@ -381,7 +381,6 @@ fn make_data(
html_config: &HtmlConfig, html_config: &HtmlConfig,
) -> Result<serde_json::Map<String, serde_json::Value>> { ) -> Result<serde_json::Map<String, serde_json::Value>> {
trace!("make_data"); trace!("make_data");
let html = config.html_config().unwrap_or_default();
let mut data = serde_json::Map::new(); let mut data = serde_json::Map::new();
data.insert( data.insert(
@ -408,18 +407,18 @@ fn make_data(
data.insert("default_theme".to_owned(), json!(default_theme)); data.insert("default_theme".to_owned(), json!(default_theme));
// Add google analytics tag // Add google analytics tag
if let Some(ref ga) = config.html_config().and_then(|html| html.google_analytics) { if let Some(ref ga) = html_config.google_analytics {
data.insert("google_analytics".to_owned(), json!(ga)); data.insert("google_analytics".to_owned(), json!(ga));
} }
if html.mathjax_support { if html_config.mathjax_support {
data.insert("mathjax_support".to_owned(), json!(true)); data.insert("mathjax_support".to_owned(), json!(true));
} }
// Add check to see if there is an additional style // Add check to see if there is an additional style
if !html.additional_css.is_empty() { if !html_config.additional_css.is_empty() {
let mut css = Vec::new(); let mut css = Vec::new();
for style in &html.additional_css { for style in &html_config.additional_css {
match style.strip_prefix(root) { match style.strip_prefix(root) {
Ok(p) => css.push(p.to_str().expect("Could not convert to str")), Ok(p) => css.push(p.to_str().expect("Could not convert to str")),
Err(_) => css.push(style.to_str().expect("Could not convert to str")), Err(_) => css.push(style.to_str().expect("Could not convert to str")),
@ -429,9 +428,9 @@ fn make_data(
} }
// Add check to see if there is an additional script // Add check to see if there is an additional script
if !html.additional_js.is_empty() { if !html_config.additional_js.is_empty() {
let mut js = Vec::new(); let mut js = Vec::new();
for script in &html.additional_js { for script in &html_config.additional_js {
match script.strip_prefix(root) { match script.strip_prefix(root) {
Ok(p) => js.push(p.to_str().expect("Could not convert to str")), Ok(p) => js.push(p.to_str().expect("Could not convert to str")),
Err(_) => js.push(script.to_str().expect("Could not convert to str")), Err(_) => js.push(script.to_str().expect("Could not convert to str")),
@ -440,7 +439,7 @@ fn make_data(
data.insert("additional_js".to_owned(), json!(js)); data.insert("additional_js".to_owned(), json!(js));
} }
if html.playpen.editable && html.playpen.copy_js { if html_config.playpen.editable && html_config.playpen.copy_js {
data.insert("playpen_js".to_owned(), json!(true)); data.insert("playpen_js".to_owned(), json!(true));
} }