Re-organise content and remove slotmap indirection level (#1827)

CHANGELOG.md

@@ -6,6 +6,7 @@
 
 - Switch to pulldown-cmark anchor rather than ours, some (very niche) edge cases are not supported anymore, you can
 also specify classes on headers now
+- Now outputs empty taxonomies instead of ignoring them
 
 ### Other
 - Fix markup for fenced code with linenos

Cargo.toml

@@ -39,7 +39,7 @@ mime_guess = "2.0"
 
 site = { path = "components/site" }
 errors = { path = "components/errors" }
-front_matter = { path = "components/front_matter" }
+content = { path = "components/content" }
 utils = { path = "components/utils" }
 search = { path = "components/search" }
 libs = { path = "components/libs" }

components/config/src/config/languages.rs

@@ -19,7 +19,7 @@ pub struct LanguageOptions {
     /// The filename to use for feeds. Used to find the template, too.
     /// Defaults to "atom.xml", with "rss.xml" also having a template provided out of the box.
     pub feed_filename: String,
-    pub taxonomies: Vec<taxonomies::Taxonomy>,
+    pub taxonomies: Vec<taxonomies::TaxonomyConfig>,
     /// Whether to generate search index for that language, defaults to `false`
     pub build_search_index: bool,
     /// The search config, telling what to include in the search index for that language

components/config/src/config/mod.rs

@@ -56,7 +56,7 @@ pub struct Config {
     /// If set, files from static/ will be hardlinked instead of copied to the output dir.
     pub hard_link_static: bool,
 
-    pub taxonomies: Vec<taxonomies::Taxonomy>,
+    pub taxonomies: Vec<taxonomies::TaxonomyConfig>,
 
     /// Whether to compile the `sass` directory and output the css files into the static folder
     pub compile_sass: bool,
@@ -99,7 +99,7 @@ pub struct SerializedConfig<'a> {
     default_language: &'a str,
     generate_feed: bool,
     feed_filename: &'a str,
-    taxonomies: &'a [taxonomies::Taxonomy],
+    taxonomies: &'a [taxonomies::TaxonomyConfig],
     build_search_index: bool,
     extra: &'a HashMap<String, Toml>,
 }
@@ -246,6 +246,10 @@ impl Config {
         others
     }
 
+    pub fn other_languages_codes(&self) -> Vec<&str> {
+        self.languages.keys().filter(|k| *k != &self.default_language).map(|k| k.as_str()).collect()
+    }
+
     /// Is this site using i18n?
     pub fn is_multilingual(&self) -> bool {
         !self.other_languages().is_empty()

components/config/src/config/taxonomies.rs

@@ -2,7 +2,7 @@ use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
 #[serde(default)]
-pub struct Taxonomy {
+pub struct TaxonomyConfig {
     /// The name used in the URL, usually the plural
     pub name: String,
     /// If this is set, the list of individual taxonomy term page will be paginated
@@ -13,7 +13,7 @@ pub struct Taxonomy {
     pub feed: bool,
 }
 
-impl Taxonomy {
+impl TaxonomyConfig {
     pub fn is_paginated(&self) -> bool {
         if let Some(paginate_by) = self.paginate_by {
             paginate_by > 0

components/config/src/lib.rs

@@ -6,7 +6,7 @@ use std::path::Path;
 
 pub use crate::config::{
     languages::LanguageOptions, link_checker::LinkChecker, search::Search, slugify::Slugify,
-    taxonomies::Taxonomy, Config,
+    taxonomies::TaxonomyConfig, Config,
 };
 use errors::Result;
 

components/front_matter/Cargo.toml → components/content/Cargo.toml

@@ -1,14 +1,20 @@
 [package]
-name = "front_matter"
+name = "content"
 version = "0.1.0"
 edition = "2021"
 
 [dependencies]
 serde = {version = "1.0", features = ["derive"] }
 time = { version = "0.3", features = ["macros"] }
+
 errors = { path = "../errors" }
 utils = { path = "../utils" }
 libs = { path = "../libs" }
+config = { path = "../config" }
+
+# TODO: remove it?
+markdown = { path = "../markdown" }
 
 [dev-dependencies]
 test-case = "2"  # TODO: can we solve that usecase in src/page.rs in a simpler way? A custom macro_rules! maybe
+tempfile = "3.3.0"