emelie/zola
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Use mod paths

Browse source
This commit is contained in:
Vincent Prouillet 2020-07-25 10:49:07 +02:00
parent d7b53687a5
commit 66aaf4e384
2 changed files with 12 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
components/site/src/lib.rs
View file

@ -13,9 +13,6 @@ use glob::glob;
use rayon::prelude::*; use rayon::prelude::*;
use tera::{Context, Tera}; use tera::{Context, Tera};
use crate::feed::render_feed;
use crate::link_checking::{check_external_links, check_internal_links_with_anchors};
use crate::tpls::{load_tera, register_early_global_fns, register_tera_global_fns};
use config::{get_config, Config}; use config::{get_config, Config};
use errors::{bail, Error, Result}; use errors::{bail, Error, Result};
use front_matter::InsertAnchor; use front_matter::InsertAnchor;
@ -62,7 +59,7 @@ impl Site {
config.merge_with_theme(&path.join("themes").join(&theme).join("theme.toml"))?; config.merge_with_theme(&path.join("themes").join(&theme).join("theme.toml"))?;
} }
let tera = load_tera(path, &config)?; let tera = tpls::load_tera(path, &config)?;
let content_path = path.join("content"); let content_path = path.join("content");
let static_path = path.join("static"); let static_path = path.join("static");
@ -212,10 +209,10 @@ impl Site {
self.register_tera_global_fns(); self.register_tera_global_fns();
// Needs to be done after rendering markdown as we only get the anchors at that point // Needs to be done after rendering markdown as we only get the anchors at that point
check_internal_links_with_anchors(&self)?; link_checking::check_internal_links_with_anchors(&self)?;
if self.config.is_in_check_mode() { if self.config.is_in_check_mode() {
check_external_links(&self)?; link_checking::check_external_links(&self)?;
} }
Ok(()) Ok(())
@ -306,12 +303,12 @@ impl Site {
// TODO: remove me in favour of the direct call to the fn once rebuild has changed // TODO: remove me in favour of the direct call to the fn once rebuild has changed
pub fn register_early_global_fns(&mut self) { pub fn register_early_global_fns(&mut self) {
register_early_global_fns(self); tpls::register_early_global_fns(self);
} }
// TODO: remove me in favour of the direct call to the fn once rebuild has changed // TODO: remove me in favour of the direct call to the fn once rebuild has changed
pub fn register_tera_global_fns(&mut self) { pub fn register_tera_global_fns(&mut self) {
register_tera_global_fns(self); tpls::register_tera_global_fns(self);
} }
/// Add a page to the site /// Add a page to the site
@ -714,12 +711,8 @@ impl Site {
ensure_directory_exists(&self.output_path)?; ensure_directory_exists(&self.output_path)?;
let library = self.library.read().unwrap(); let library = self.library.read().unwrap();
let all_sitemap_entries = { let all_sitemap_entries =
let mut all_sitemap_entries = { sitemap::find_entries(&library, &self.taxonomies[..], &self.config) };
sitemap::find_entries(&library, &self.taxonomies[..], &self.config);
all_sitemap_entries.sort();
all_sitemap_entries
};
let sitemap_limit = 30000; let sitemap_limit = 30000;
if all_sitemap_entries.len() < sitemap_limit { if all_sitemap_entries.len() < sitemap_limit {
@ -772,7 +765,8 @@ impl Site {
) -> Result<()> { ) -> Result<()> {
ensure_directory_exists(&self.output_path)?; ensure_directory_exists(&self.output_path)?;
let feed = match render_feed(self, all_pages, lang, base_path, additional_context_fn)? { let feed = match feed::render_feed(self, all_pages, lang, base_path, additional_context_fn)?
{
Some(v) => v, Some(v) => v,
None => return Ok(()), None => return Ok(()),
}; };

4
components/site/src/sitemap.rs
View file

@ -140,5 +140,7 @@ pub fn find_entries<'a>(
} }
} }
all_sitemap_entries.into_iter().collect::<Vec<_>>() let mut entries = all_sitemap_entries.into_iter().collect::<Vec<_>>();
entries.sort();
entries
} }