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

Make sitemap entries in a set

Browse source 
Close #633
This commit is contained in:
Vincent Prouillet 2019-03-14 21:53:07 +01:00
parent 9beaa26023
commit 8a802b1828
1 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -19,7 +19,7 @@ extern crate utils;
#[cfg(test)] #[cfg(test)]
extern crate tempfile; extern crate tempfile;
use std::collections::HashMap; use std::collections::{HashMap, HashSet};
use std::fs::{copy, create_dir_all, remove_dir_all}; use std::fs::{copy, create_dir_all, remove_dir_all};
use std::path::{Path, PathBuf}; use std::path::{Path, PathBuf};
use std::sync::{Arc, Mutex, RwLock}; use std::sync::{Arc, Mutex, RwLock};
@ -42,7 +42,7 @@ use utils::templates::{render_template, rewrite_theme_paths};
/// The sitemap only needs links and potentially date so we trim down /// The sitemap only needs links and potentially date so we trim down
/// all pages to only that /// all pages to only that
#[derive(Debug, Serialize)] #[derive(Debug, Serialize, Eq, PartialEq, Hash)]
struct SitemapEntry { struct SitemapEntry {
permalink: String, permalink: String,
date: Option<String>, date: Option<String>,
@ -788,7 +788,7 @@ impl Site {
pub fn render_sitemap(&self) -> Result<()> { pub fn render_sitemap(&self) -> Result<()> {
ensure_directory_exists(&self.output_path)?; ensure_directory_exists(&self.output_path)?;
let mut pages = self let pages = self
.library .library
.read() .read()
.unwrap() .unwrap()
@ -803,7 +803,6 @@ impl Site {
SitemapEntry::new(p.permalink.clone(), date) SitemapEntry::new(p.permalink.clone(), date)
}) })
.collect::<Vec<_>>(); .collect::<Vec<_>>();
pages.sort_by(|a, b| a.permalink.cmp(&b.permalink));
let mut sections = self let mut sections = self
.library .library
@ -831,7 +830,6 @@ impl Site {
sections.push(SitemapEntry::new(permalink, None)) sections.push(SitemapEntry::new(permalink, None))
} }
} }
sections.sort_by(|a, b| a.permalink.cmp(&b.permalink));
let mut taxonomies = vec![]; let mut taxonomies = vec![];
for taxonomy in &self.taxonomies { for taxonomy in &self.taxonomies {
@ -861,17 +859,21 @@ impl Site {
} }
} }
terms.sort_by(|a, b| a.permalink.cmp(&b.permalink));
taxonomies.push(terms); taxonomies.push(terms);
} }
// Group all sitemap entries in one vector
let mut all_sitemap_entries = Vec::new(); let mut all_sitemap_entries = HashSet::new();
all_sitemap_entries.append(&mut pages); for p in pages {
all_sitemap_entries.append(&mut sections); all_sitemap_entries.insert(p);
}
for s in sections {
all_sitemap_entries.insert(s);
}
for terms in taxonomies { for terms in taxonomies {
let mut terms = terms; for term in terms {
all_sitemap_entries.append(&mut terms); all_sitemap_entries.insert(term);
}
} }
// Count total number of sitemap entries to include in sitemap // Count total number of sitemap entries to include in sitemap
@ -889,7 +891,7 @@ impl Site {
// Create multiple sitemaps (max 30000 urls each) // Create multiple sitemaps (max 30000 urls each)
let mut sitemap_index = Vec::new(); let mut sitemap_index = Vec::new();
for (i, chunk) in all_sitemap_entries.chunks(sitemap_limit).enumerate() { for (i, chunk) in all_sitemap_entries.iter().collect::<Vec<_>>().chunks(sitemap_limit).enumerate() {
let mut context = Context::new(); let mut context = Context::new();
context.insert("entries", &chunk); context.insert("entries", &chunk);
let sitemap = &render_template("sitemap.xml", &self.tera, context, &self.config.theme)?; let sitemap = &render_template("sitemap.xml", &self.tera, context, &self.config.theme)?;