diff options
Diffstat (limited to 'src/site.rs')
| -rw-r--r-- | src/site.rs | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/site.rs b/src/site.rs index cfd5017..64b9602 100644 --- a/src/site.rs +++ b/src/site.rs @@ -45,7 +45,7 @@ pub struct Site { shortcuts: HashMap<String, Shortcut>, name_builder: NameBuilder, pages: Vec<Page>, - markdown_pages: Vec<MarkdownPage>, + markdown_pages: HashMap<PathBuf, MarkdownPage>, pages_that_will_exist: PageSet, files: Names, } @@ -61,7 +61,7 @@ impl Site { Self { name_builder: NameBuilder::new(srcdir.as_ref(), destdir.as_ref()), pages: vec![], - markdown_pages: vec![], + markdown_pages: HashMap::new(), files: Names::default(), patterns: TokenPatterns::default(), pages_that_will_exist: PageSet::default(), @@ -127,7 +127,7 @@ impl Site { page.meta().path().display() ); let page = page.markdown(self)?; - self.markdown_pages.push(page); + self.markdown_pages.insert(page.meta().path().into(), page); Ok(true) } else { trace!("no pages to process"); @@ -135,8 +135,8 @@ impl Site { } } - pub fn markdown_pages(&self) -> &[MarkdownPage] { - &self.markdown_pages + pub fn markdown_pages(&self) -> impl Iterator<Item=&MarkdownPage> { + self.markdown_pages.iter().map(|(_, md)| md) } pub fn files_only(&self) -> impl Iterator<Item = &Name> { @@ -154,7 +154,8 @@ impl Site { pub fn page(&self, path: &Path) -> Option<&MarkdownPage> { self.markdown_pages .iter() - .find(|&page| page.meta().path() == path) + .find(|(page_path, _)| page_path.as_path() == path) + .map(|(_, md)| md) } fn all_files(&self) -> Result<Vec<Name>, SiteError> { @@ -371,7 +372,7 @@ mod test { #[test] fn has_no_pages_initially() { - assert_eq!(site().markdown_pages().to_vec(), vec![]); + assert_eq!(site().markdown_pages().count(), 0); } #[test] |