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

Fix panic with misnamed index section

Browse source 
Closes #1244
This commit is contained in:
Vincent Prouillet 2020-12-14 22:51:28 +01:00
parent 26b8ec66ac
commit 68cdfcbbe7
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -174,6 +174,9 @@ impl Site {
// which we can only decide to use after we've deserialised the section // which we can only decide to use after we've deserialised the section
// so it's kinda necessecary // so it's kinda necessecary
let mut dir_walker = WalkDir::new(format!("{}/{}", base_path, "content/")).into_iter(); let mut dir_walker = WalkDir::new(format!("{}/{}", base_path, "content/")).into_iter();
let mut allowed_index_filenames: Vec<_> = self.config.languages.iter().map(|l| format!("_index.{}.md", l.code)).collect();
allowed_index_filenames.push("_index.md".to_string());
loop { loop {
let entry: DirEntry = match dir_walker.next() { let entry: DirEntry = match dir_walker.next() {
None => break, None => break,
@ -222,11 +225,14 @@ impl Site {
Ok(f) => { Ok(f) => {
let path_str = f.path().file_name().unwrap().to_str().unwrap(); let path_str = f.path().file_name().unwrap().to_str().unwrap();
if f.path().is_file() if f.path().is_file()
&& path_str.starts_with("_index.") && allowed_index_filenames.iter().find(|&s| *s == path_str).is_some()
&& path_str.ends_with(".md")
{ {
Some(f) Some(f)
} else { } else {
// https://github.com/getzola/zola/issues/1244
if path_str.starts_with("_index.") {
println!("Expected a section filename, got `{}`. Allowed values: `{:?}`", path_str, &allowed_index_filenames);
}
None None
} }
} }