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

Render all relevant parent sections on rebuild

This commit is contained in:
Vincent Prouillet 2019-01-30 09:15:46 +01:00
parent 1c7729cac6
commit 5082e0f15a
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
components/library/src/library.rs
View File

@ -331,15 +331,19 @@ impl Library {
.collect() .collect()
} }
pub fn find_parent_section<P: AsRef<Path>>(&self, path: P) -> Option<&Section> { /// Find the parent section & all grandparents section that have transparent=true
let page_key = self.paths_to_pages[path.as_ref()]; /// Only used in rebuild.
for s in self.sections.values() { pub fn find_parent_sections<P: AsRef<Path>>(&self, path: P) -> Vec<&Section> {
if s.pages.contains(&page_key) { let mut parents = vec![];
return Some(s); let page = self.get_page(path.as_ref()).unwrap();
for ancestor in page.ancestors.iter().rev() {
let section = self.get_section_by_key(*ancestor);
if parents.is_empty() || section.meta.transparent {
parents.push(section);
} }
} }
None parents
} }
/// Only used in tests /// Only used in tests

9
components/rebuild/src/lib.rs
View File

@ -178,9 +178,9 @@ fn handle_section_editing(site: &mut Site, path: &Path) -> Result<()> {
} }
} }
macro_rules! render_parent_section { macro_rules! render_parent_sections {
($site: expr, $path: expr) => { ($site: expr, $path: expr) => {
if let Some(s) = $site.library.read().unwrap().find_parent_section($path) { for s in $site.library.read().unwrap().find_parent_sections($path) {
$site.render_section(s, false)?; $site.render_section(s, false)?;
}; };
}; };
@ -204,7 +204,7 @@ fn handle_page_editing(site: &mut Site, path: &Path) -> Result<()> {
// Other than the page itself, the summary might be seen // Other than the page itself, the summary might be seen
// on a paginated list for a blog for example // on a paginated list for a blog for example
if library.get_page(&pathbuf).unwrap().summary.is_some() { if library.get_page(&pathbuf).unwrap().summary.is_some() {
render_parent_section!(site, path); render_parent_sections!(site, path);
} }
return site.render_page(&library.get_page(&pathbuf).unwrap()); return site.render_page(&library.get_page(&pathbuf).unwrap());
} }
@ -215,6 +215,7 @@ fn handle_page_editing(site: &mut Site, path: &Path) -> Result<()> {
&site.library.read().unwrap().get_page(&pathbuf).unwrap().meta, &site.library.read().unwrap().get_page(&pathbuf).unwrap().meta,
&prev.meta, &prev.meta,
); );
for change in changes { for change in changes {
site.register_tera_global_fns(); site.register_tera_global_fns();
@ -228,7 +229,7 @@ fn handle_page_editing(site: &mut Site, path: &Path) -> Result<()> {
site.render_index()?; site.render_index()?;
} }
PageChangesNeeded::Render => { PageChangesNeeded::Render => {
render_parent_section!(site, path); render_parent_sections!(site, path);
site.render_page(&site.library.read().unwrap().get_page(&path.to_path_buf()).unwrap())?; site.render_page(&site.library.read().unwrap().get_page(&path.to_path_buf()).unwrap())?;
} }
}; };