From 76527801ce295953c781b0e95165b66f1935f9fa Mon Sep 17 00:00:00 2001 From: Vincent Prouillet Date: Sat, 13 May 2017 13:05:38 +0900 Subject: [PATCH] Move render_alias to templates mod --- src/site.rs | 13 ++----------- src/templates/mod.rs | 15 ++++++++++++++- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/src/site.rs b/src/site.rs index d394a8f2..d0d0e7c8 100644 --- a/src/site.rs +++ b/src/site.rs @@ -15,18 +15,9 @@ use pagination::Paginator; use utils::{create_file, create_directory}; use section::{Section}; use front_matter::{SortBy}; -use templates::{GUTENBERG_TERA, global_fns}; +use templates::{GUTENBERG_TERA, global_fns, render_redirect_template}; -/// Renders the `internal/alias.html` template that will redirect -/// via refresh to the url given -fn render_alias(url: &str, tera: &Tera) -> Result { - let mut context = Context::new(); - context.add("url", &url); - - tera.render("internal/alias.html", &context) - .chain_err(|| format!("Failed to render alias for '{}'", url)) -} #[derive(Debug, PartialEq)] @@ -670,7 +661,7 @@ impl Site { create_file(page_path.join("index.html"), &self.inject_livereload(output))?; } else { create_file(output_path.join("index.html"), &self.inject_livereload(output))?; - create_file(page_path.join("index.html"), &render_alias(§ion.permalink, &self.tera)?)?; + create_file(page_path.join("index.html"), &render_redirect_template(§ion.permalink, &self.tera)?)?; } } diff --git a/src/templates/mod.rs b/src/templates/mod.rs index 7982fb4f..ac8d2728 100644 --- a/src/templates/mod.rs +++ b/src/templates/mod.rs @@ -1,4 +1,6 @@ -use tera::Tera; +use tera::{Tera, Context}; + +use errors::{Result, ResultExt}; pub mod filters; pub mod global_fns; @@ -24,3 +26,14 @@ lazy_static! { tera }; } + + +/// Renders the `internal/alias.html` template that will redirect +/// via refresh to the url given +pub fn render_redirect_template(url: &str, tera: &Tera) -> Result { + let mut context = Context::new(); + context.add("url", &url); + + tera.render("internal/alias.html", &context) + .chain_err(|| format!("Failed to render alias for '{}'", url)) +}