Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Log deserialization errors for [html.config] #1033

Merged
merged 2 commits into from
Sep 26, 2019
Merged

Log deserialization errors for [html.config] #1033

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
db13d8e
Log HtmlConfig deserialization errors
TjeuKayim Sep 22, 2019
2131715
De-duplicate calling Config::html_config()
TjeuKayim Sep 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion src/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ use toml_query::insert::TomlValueInsertExt;
use toml_query::read::TomlValueReadExt;

use crate::errors::*;
use crate::utils;

/// The overall configuration object for MDBook, essentially an in-memory
/// representation of `book.toml`.
Expand Down Expand Up @@ -168,7 +169,13 @@ impl Config {
/// HTML renderer is refactored to be less coupled to `mdbook` internals.
#[doc(hidden)]
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
Expand Down
15 changes: 7 additions & 8 deletions src/renderer/html_handlebars/hbs_renderer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,6 @@ fn make_data(
html_config: &HtmlConfig,
) -> Result<serde_json::Map<String, serde_json::Value>> {
trace!("make_data");
let html = config.html_config().unwrap_or_default();

let mut data = serde_json::Map::new();
data.insert(
Expand All @@ -408,18 +407,18 @@ fn make_data(
data.insert("default_theme".to_owned(), json!(default_theme));

// 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));
}

if html.mathjax_support {
if html_config.mathjax_support {
data.insert("mathjax_support".to_owned(), json!(true));
}

// 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();
for style in &html.additional_css {
for style in &html_config.additional_css {
match style.strip_prefix(root) {
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")),
Expand All @@ -429,9 +428,9 @@ fn make_data(
}

// 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();
for script in &html.additional_js {
for script in &html_config.additional_js {
match script.strip_prefix(root) {
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")),
Expand All @@ -440,7 +439,7 @@ fn make_data(
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));
}

Expand Down