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

Allow inclusion of all items in RSS feeds.

Browse source 
Switch to an `Option<usize>` for the serialized value of `rss_items`.
This lets us just set a blank value in the configuration and thereby
include *all* items.

This is a backwards-compatible change; it does not affect the behavior
of existing configurations.

Fixes #468. Closes #471.
This commit is contained in:
Chris Krycho 2018-10-09 20:20:09 -06:00
parent 9f88b0776a
commit 56c5036abc
No known key found for this signature in database
GPG key ID: 49E71ADC19BAF961
3 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
components/config/src/config.rs
View file

@ -5,13 +5,13 @@ use std::path::{Path, PathBuf};
use chrono::Utc; use chrono::Utc;
use globset::{Glob, GlobSet, GlobSetBuilder}; use globset::{Glob, GlobSet, GlobSetBuilder};
use syntect::parsing::{SyntaxSet, SyntaxSetBuilder};
use toml; use toml;
use toml::Value as Toml; use toml::Value as Toml;
use syntect::parsing::{SyntaxSet, SyntaxSetBuilder};
use theme::Theme;
use highlighting::THEME_SET;
use errors::{Result, ResultExt}; use errors::{Result, ResultExt};
use highlighting::THEME_SET;
use theme::Theme;
// We want a default base url for tests // We want a default base url for tests
static DEFAULT_BASE_URL: &'static str = "http://a-website.com"; static DEFAULT_BASE_URL: &'static str = "http://a-website.com";
@ -76,8 +76,8 @@ pub struct Config {
/// Whether to generate RSS. Defaults to false /// Whether to generate RSS. Defaults to false
pub generate_rss: bool, pub generate_rss: bool,
/// The number of articles to include in the RSS feed. Defaults to 10_000 /// The number of articles to include in the RSS feed. Defaults to including all items.
pub rss_limit: usize, pub rss_limit: Option<usize>,
pub taxonomies: Vec<Taxonomy>, pub taxonomies: Vec<Taxonomy>,
@ -251,7 +251,7 @@ impl Default for Config {
highlight_theme: "base16-ocean-dark".to_string(), highlight_theme: "base16-ocean-dark".to_string(),
default_language: "en".to_string(), default_language: "en".to_string(),
generate_rss: false, generate_rss: false,
rss_limit: 10_000, rss_limit: None,
taxonomies: Vec::new(), taxonomies: Vec::new(),
compile_sass: false, compile_sass: false,
check_external_links: false, check_external_links: false,

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

@ -732,10 +732,11 @@ impl Site {
pages.par_sort_unstable_by(sort_actual_pages_by_date); pages.par_sort_unstable_by(sort_actual_pages_by_date);
context.insert("last_build_date", &pages[0].meta.date.clone().map(|d| d.to_string())); context.insert("last_build_date", &pages[0].meta.date.clone().map(|d| d.to_string()));
// limit to the last n elements // limit to the last n elements if the limit is set; otherwise use all.
let num_entries = self.config.rss_limit.unwrap_or(pages.len());
let p = pages let p = pages
.iter() .iter()
.take(self.config.rss_limit) .take(num_entries)
.map(|x| x.to_serialized_basic()) .map(|x| x.to_serialized_basic())
.collect::<Vec<_>>(); .collect::<Vec<_>>();

5
docs/content/documentation/getting-started/configuration.md
View file

@ -37,8 +37,9 @@ highlight_theme = "base16-ocean-dark"
# Whether to generate a RSS feed automatically # Whether to generate a RSS feed automatically
generate_rss = false generate_rss = false
# The number of articles to include in the RSS feed # The number of articles to include in the RSS feed. Will include all items if
rss_limit = 20 # not set (the default).
# rss_limit = 20
# The taxonomies to be rendered for that site and their configuration # The taxonomies to be rendered for that site and their configuration
# Example: # Example: