Skip to content

Modify redirect behaviour to respect site_url #1

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

Draft
dylanzt wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Modify redirect behaviour to respect site_url #1

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f4b722e
Modify redirect behaviour to respect site_url
dylanzt Jul 31, 2020
5271dc4
Clean up site_url redirect logic
dylanzt Jul 31, 2020
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
17 changes: 12 additions & 5 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 @@ -140,7 +140,7 @@ impl HtmlHandlebars {
} else {
debug!(
"HTML 'site-url' parameter not set, defaulting to '/'. Please configure \
this to ensure the 404 page work correctly, especially if your site is hosted in a \
this to ensure the 404 page works correctly, especially if your site is hosted in a \
subdirectory on the HTTP server."
);
"/"
Expand Down Expand Up @@ -348,6 +348,7 @@ impl HtmlHandlebars {
root: &Path,
handlebars: &Handlebars<'_>,
redirects: &HashMap<String, String>,
site_url: &Option<String>,
) -> Result<()> {
if redirects.is_empty() {
return Ok(());
Expand All @@ -357,12 +358,19 @@ impl HtmlHandlebars {

for (original, new) in redirects {
log::debug!("Redirecting \"{}\" → \"{}\"", original, new);
// Note: all paths are relative to the build directory, so the
// Note: all original paths are relative to the build directory, so the
// leading slash in an absolute path means nothing (and would mess
// up `root.join(original)`).
let original = original.trim_start_matches("/");
let filename = root.join(original);
self.emit_redirect(handlebars, &filename, new)?;
let regex = Regex::new(r##"(^/)"##).unwrap();
let destination = if site_url.is_some() && site_url.as_ref() != Some(&"/".to_string()) && regex.is_match(new) {
let site_url_value = site_url.as_ref().unwrap().to_string();
format!("{}{}", site_url_value.trim_end_matches("/"), new)
} else {
new.to_string()
};
self.emit_redirect(handlebars, &filename, &destination)?;
}

Ok(())
Expand Down Expand Up @@ -535,8 +543,7 @@ impl Renderer for HtmlHandlebars {
super::search::create_files(&search, &destination, &book)?;
}
}

self.emit_redirects(&ctx.destination, &handlebars, &html_config.redirect)
self.emit_redirects(&ctx.destination, &handlebars, &html_config.redirect, &html_config.site_url)
.context("Unable to emit redirects")?;

// Copy all remaining files, avoid a recursive copy from/to the book build dir
Expand Down