reivilibre/mirror-zola
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix index errors (#2129)

Browse Source 
* consider sections by path instead of by component

* add tests

* update more tests
This commit is contained in:
François 2023-03-08 22:31:48 +01:00 committed by Vincent Prouillet
parent 961397325e
commit dd65e99300
4 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
components/site/src/lib.rs
View File

@ -183,7 +183,7 @@ impl Site {
// at the end to detect pages that are actually errors: // at the end to detect pages that are actually errors:
// when there is both a _index.md and index.md in the same folder // when there is both a _index.md and index.md in the same folder
let mut pages = Vec::new(); let mut pages = Vec::new();
let mut components = HashSet::new(); let mut sections = HashSet::new();
loop { loop {
let entry: DirEntry = match dir_walker.next() { let entry: DirEntry = match dir_walker.next() {
@ -248,7 +248,7 @@ impl Site {
for index_file in index_files { for index_file in index_files {
let section = let section =
Section::from_file(index_file.path(), &self.config, &self.base_path)?; Section::from_file(index_file.path(), &self.config, &self.base_path)?;
components.extend(section.file.components.clone()); sections.insert(section.components.join("/"));
// if the section is drafted we can skip the entire dir // if the section is drafted we can skip the entire dir
if section.meta.draft && !self.include_drafts { if section.meta.draft && !self.include_drafts {
@ -275,7 +275,7 @@ impl Site {
// all the components there. // all the components there.
if page.file.filename == "index.md" { if page.file.filename == "index.md" {
let is_invalid = match page.components.last() { let is_invalid = match page.components.last() {
Some(last) => components.contains(last), Some(_) => sections.contains(&page.components.join("/")),
// content/index.md is always invalid, but content/colocated/index.md is ok // content/index.md is always invalid, but content/colocated/index.md is ok
None => page.file.colocated_path.is_none(), None => page.file.colocated_path.is_none(),
}; };

12
components/site/tests/site.rs
View File

@ -21,7 +21,7 @@ fn can_parse_site() {
let library = site.library.read().unwrap(); let library = site.library.read().unwrap();
// Correct number of pages (sections do not count as pages, draft are ignored) // Correct number of pages (sections do not count as pages, draft are ignored)
assert_eq!(library.pages.len(), 34); assert_eq!(library.pages.len(), 35);
let posts_path = path.join("content").join("posts"); let posts_path = path.join("content").join("posts");
// Make sure the page with a url doesn't have any sections // Make sure the page with a url doesn't have any sections
@ -34,12 +34,12 @@ fn can_parse_site() {
assert_eq!(asset_folder_post.file.components, vec!["posts".to_string()]); assert_eq!(asset_folder_post.file.components, vec!["posts".to_string()]);
// That we have the right number of sections // That we have the right number of sections
assert_eq!(library.sections.len(), 12); assert_eq!(library.sections.len(), 13);
// And that the sections are correct // And that the sections are correct
let index_section = library.sections.get(&path.join("content").join("_index.md")).unwrap(); let index_section = library.sections.get(&path.join("content").join("_index.md")).unwrap();
assert_eq!(index_section.subsections.len(), 5); assert_eq!(index_section.subsections.len(), 5);
assert_eq!(index_section.pages.len(), 4); assert_eq!(index_section.pages.len(), 5);
assert!(index_section.ancestors.is_empty()); assert!(index_section.ancestors.is_empty());
let posts_section = library.sections.get(&posts_path.join("_index.md")).unwrap(); let posts_section = library.sections.get(&posts_path.join("_index.md")).unwrap();
@ -279,7 +279,7 @@ fn can_build_site_with_live_reload_and_drafts() {
// drafted sections are included // drafted sections are included
let library = site.library.read().unwrap(); let library = site.library.read().unwrap();
assert_eq!(library.sections.len(), 14); assert_eq!(library.sections.len(), 15);
assert!(file_exists!(public, "secret_section/index.html")); assert!(file_exists!(public, "secret_section/index.html"));
assert!(file_exists!(public, "secret_section/draft-page/index.html")); assert!(file_exists!(public, "secret_section/draft-page/index.html"));
@ -545,13 +545,13 @@ fn can_build_site_with_pagination_for_index() {
"page/1/index.html", "page/1/index.html",
"<a href=\"https://replace-this-with-your-url.com/\">Click here</a>" "<a href=\"https://replace-this-with-your-url.com/\">Click here</a>"
)); ));
assert!(file_contains!(public, "index.html", "Num pages: 2")); assert!(file_contains!(public, "index.html", "Num pages: 3"));
assert!(file_contains!(public, "index.html", "Current index: 1")); assert!(file_contains!(public, "index.html", "Current index: 1"));
assert!(file_contains!(public, "index.html", "First: https://replace-this-with-your-url.com/")); assert!(file_contains!(public, "index.html", "First: https://replace-this-with-your-url.com/"));
assert!(file_contains!( assert!(file_contains!(
public, public,
"index.html", "index.html",
"Last: https://replace-this-with-your-url.com/page/2/" "Last: https://replace-this-with-your-url.com/page/3/"
)); ));
assert!(!file_contains!(public, "index.html", "has_prev")); assert!(!file_contains!(public, "index.html", "has_prev"));
assert!(file_contains!(public, "index.html", "has_next")); assert!(file_contains!(public, "index.html", "has_next"));

3
test_site/content/2018/index.md Normal file
View File

@ -0,0 +1,3 @@
+++
title = "index page in a direction with the same name as a section"
+++

3
test_site/content/colocated-assets/with_subfolder/_index.md Normal file
View File

@ -0,0 +1,3 @@
+++
title = "Assets in root content directory"
+++