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

Handle input path with regards to custom css #598

Merged
merged 2 commits into from
Jan 30, 2018
Merged

Handle input path with regards to custom css #598

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
071182b
Handle input path with regards to custom css
steveklabnik Jan 28, 2018
36d4277
don't use file-name
steveklabnik Jan 29, 2018
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
19 changes: 10 additions & 9 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 @@ -238,27 +238,28 @@ impl HtmlHandlebars {

/// Copy across any additional CSS and JavaScript files which the book
/// has been configured to use.
fn copy_additional_css_and_js(&self, html: &HtmlConfig, destination: &Path) -> Result<()> {
fn copy_additional_css_and_js(&self, html: &HtmlConfig, root: &Path, destination: &Path) -> Result<()> {
let custom_files = html.additional_css.iter().chain(html.additional_js.iter());

debug!("Copying additional CSS and JS");

for custom_file in custom_files {
let input_location = root.join(custom_file);
let output_location = destination.join(custom_file);
if let Some(parent) = output_location.parent() {
fs::create_dir_all(parent)
.chain_err(|| format!("Unable to create {}", parent.display()))?;
}
debug!(
"Copying {} -> {}",
custom_file.display(),
input_location.display(),
output_location.display()
);

fs::copy(custom_file, &output_location).chain_err(|| {
fs::copy(&input_location, &output_location).chain_err(|| {
format!(
"Unable to copy {} to {}",
custom_file.display(),
input_location.display(),
output_location.display()
)
})?;
Expand Down Expand Up @@ -338,7 +339,7 @@ impl Renderer for HtmlHandlebars {
debug!("Copy static files");
self.copy_static_files(&destination, &theme, &html_config)
.chain_err(|| "Unable to copy across static files")?;
self.copy_additional_css_and_js(&html_config, &destination)
self.copy_additional_css_and_js(&html_config, &ctx.root, &destination)
.chain_err(|| "Unable to copy across additional CSS and JS")?;

// Copy all remaining files
Expand Down Expand Up @@ -375,11 +376,11 @@ fn make_data(root: &Path, book: &Book, config: &Config, html_config: &HtmlConfig
let mut css = Vec::new();
for style in &html.additional_css {
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.file_name()
.expect("File has a file name")
.to_str()
css.push(style.to_str()
.expect("Could not convert to str"))
}
}
Expand Down