Add --drafts flag + rustfmt

Author: Keats

CHANGELOG.md

@@ -4,7 +4,7 @@
 
 ### Breaking
 
-- Pages with draft=true are now only loaded/rendered in `zola serve`
+- Add `--drafts` flag to `build`, `serve` and `check` to load drafts. Drafts are never loaded by default anymore
 
 ### Other
 - Add `--open` flag to open server URL in default browser
@@ -17,7 +17,7 @@
 - Taxonomies can now have the same name in multiple languages
 - `zola init` can now be create sites inside the current directory
 - Fix table of contents generation for deep heading levels
-- Add `lang` in all templates context except sitemap, robots etc
+- Add `lang` in all templates context except sitemap, robots
 - Add `lang` parameter to `get_taxonomy` and `get_taxonomy_url`
 - Rebuild whole site on changes in `themes` changes
 - Add one-dark syntax highlighting theme

Cargo.lock

@@ -13,7 +13,7 @@ use theme::Theme;
 use utils::fs::read_file_with_error;
 
 // We want a default base url for tests
-static DEFAULT_BASE_URL: &'static str = "http://a-website.com";
+static DEFAULT_BASE_URL: &str = "http://a-website.com";
 
 #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub enum Mode {

components/config/src/config.rs

@@ -24,7 +24,7 @@ pub struct PageFrontMatter {
     /// The converted date into a (year, month, day) tuple
     #[serde(default, skip_deserializing)]
     pub datetime_tuple: Option<(i32, u32, u32)>,
-    /// Whether this page is a draft and should be ignored for pagination etc
+    /// Whether this page is a draft
     pub draft: bool,
     /// The page slug. Will be used instead of the filename if present
     /// Can't be an empty string if present

components/front_matter/src/page.rs

@@ -7,7 +7,7 @@ use errors::Result;
 
 use super::{InsertAnchor, SortBy};
 
-static DEFAULT_PAGINATE_PATH: &'static str = "page";
+static DEFAULT_PAGINATE_PATH: &str = "page";
 
 /// The front matter of every section
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]

components/front_matter/src/section.rs

@@ -23,7 +23,7 @@ use regex::Regex;
 use errors::{Error, Result};
 use utils::fs as ufs;
 
-static RESIZED_SUBDIR: &'static str = "processed_images";
+static RESIZED_SUBDIR: &str = "processed_images";
 
 lazy_static! {
     pub static ref RESIZED_FILENAME: Regex =

components/imageproc/src/lib.rs

@@ -117,9 +117,6 @@ impl<'a> Paginator<'a> {
 
         for key in self.all_pages {
             let page = library.get_page_by_key(*key);
-            if page.is_draft() {
-                continue;
-            }
             current_page.push(page.to_serialized_basic(library));
 
             if current_page.len() == self.paginate_by {
@@ -283,7 +280,7 @@ mod tests {
         assert_eq!(paginator.pagers[0].path, "posts/");
 
         assert_eq!(paginator.pagers[1].index, 2);
-        assert_eq!(paginator.pagers[1].pages.len(), 1);
+        assert_eq!(paginator.pagers[1].pages.len(), 2);
         assert_eq!(paginator.pagers[1].permalink, "https://vincent.is/posts/page/2/");
         assert_eq!(paginator.pagers[1].path, "posts/page/2/");
     }
@@ -300,7 +297,7 @@ mod tests {
         assert_eq!(paginator.pagers[0].path, "");
 
         assert_eq!(paginator.pagers[1].index, 2);
-        assert_eq!(paginator.pagers[1].pages.len(), 1);
+        assert_eq!(paginator.pagers[1].pages.len(), 2);
         assert_eq!(paginator.pagers[1].permalink, "https://vincent.is/page/2/");
         assert_eq!(paginator.pagers[1].path, "page/2/");
     }
@@ -352,7 +349,7 @@ mod tests {
         assert_eq!(paginator.pagers[0].path, "tags/something");
 
         assert_eq!(paginator.pagers[1].index, 2);
-        assert_eq!(paginator.pagers[1].pages.len(), 1);
+        assert_eq!(paginator.pagers[1].pages.len(), 2);
         assert_eq!(paginator.pagers[1].permalink, "https://vincent.is/tags/something/page/2/");
         assert_eq!(paginator.pagers[1].path, "tags/something/page/2/");
     }

components/library/src/pagination/mod.rs

@@ -317,7 +317,7 @@ pub fn markdown_to_html(content: &str, context: &RenderContext) -> Result<Render
     }
 
     if let Some(e) = error {
-        return Err(e);
+        Err(e)
     } else {
         Ok(Rendered {
             summary_len: if has_summary { html.find(CONTINUE_READING) } else { None },

components/rendering/src/markdown.rs

@@ -33,14 +33,14 @@ fn insert_into_parent(potential_parent: Option<&mut Header>, header: &Header) ->
     match potential_parent {
         None => {
             // No potential parent to insert into so it needs to be insert higher
-            return false;
-        },
+            false
+        }
         Some(parent) => {
             let diff = header.level - parent.level;
             if diff <= 0 {
                 // Heading is same level or higher so we don't insert here
                 return false;
-            } 
+            }
             if diff == 1 {
                 // We have a direct child of the parent
                 parent.children.push(header.clone());
@@ -51,7 +51,7 @@ fn insert_into_parent(potential_parent: Option<&mut Header>, header: &Header) ->
                 // No, we need to insert it here
                 parent.children.push(header.clone());
             }
-            return true;
+            true
         }
     }
 }
@@ -61,23 +61,9 @@ fn insert_into_parent(potential_parent: Option<&mut Header>, header: &Header) ->
 pub fn make_table_of_contents(headers: Vec<Header>) -> Vec<Header> {
     let mut toc = vec![];
     for header in headers {
-        if toc.is_empty() {
-            // First header, nothing to compare it with
+        // First header or we try to insert the current header in a previous one
+        if toc.is_empty() || !insert_into_parent(toc.iter_mut().last(), &header) {
             toc.push(header);
-            continue;
-        }
-
-        // We try to insert the current header in a previous one
-        match insert_into_parent(toc.iter_mut().last(), &header) {
-            true => {
-                // Header was successfully inserted as a child of a previous element
-                continue;
-            },
-            false => {
-                // Couldn't insert in a previous header, so it's a top-level header
-                toc.push(header);
-                continue;
-            }
         }
     }
 

components/rendering/src/table_of_contents.rs

@@ -63,6 +63,8 @@ pub struct Site {
     pub permalinks: HashMap<String, String>,
     /// Contains all pages and sections of the site
     pub library: Arc<RwLock<Library>>,
+    /// Whether to load draft pages
+    include_drafts: bool,
 }
 
 impl Site {
@@ -131,13 +133,20 @@ impl Site {
             static_path,
             taxonomies: Vec::new(),
             permalinks: HashMap::new(),
+            include_drafts: false,
             // We will allocate it properly later on
             library: Arc::new(RwLock::new(Library::new(0, 0, false))),
         };
 
         Ok(site)
     }
 
+    /// Set the site to load the drafts.
+    /// Needs to be called before loading it
+    pub fn include_drafts(&mut self) {
+        self.include_drafts = true;
+    }
+
     /// The index sections are ALWAYS at those paths
     /// There are one index section for the basic language + 1 per language
     fn index_section_paths(&self) -> Vec<(PathBuf, Option<String>)> {
@@ -233,8 +242,8 @@ impl Site {
         let mut pages_insert_anchors = HashMap::new();
         for page in pages {
             let p = page?;
-            // Draft pages are not rendered in zola build so we just discard them
-            if p.meta.draft && !self.config.is_in_serve_mode() {
+            // Should draft pages be ignored?
+            if p.meta.draft && !self.include_drafts {
                 continue;
             }
             pages_insert_anchors.insert(
@@ -525,7 +534,7 @@ impl Site {
         self.tera.register_function("trans", global_fns::Trans::new(self.config.clone()));
         self.tera.register_function(
             "get_taxonomy_url",
-            global_fns::GetTaxonomyUrl::new(&self.config.default_language,&self.taxonomies),
+            global_fns::GetTaxonomyUrl::new(&self.config.default_language, &self.taxonomies),
         );
     }
 
@@ -540,7 +549,11 @@ impl Site {
         );
         self.tera.register_function(
             "get_taxonomy",
-            global_fns::GetTaxonomy::new(&self.config.default_language, self.taxonomies.clone(), self.library.clone()),
+            global_fns::GetTaxonomy::new(
+                &self.config.default_language,
+                self.taxonomies.clone(),
+                self.library.clone(),
+            ),
         );
     }