X-Git-Url: https://git.r.bdr.sh/rbdr/page/blobdiff_plain/4fd89b808cabc8afb0d75b9700be1da96989c4b7..fb0da1eec8c545c3010bc3e838a402ce6ebd31d5:/src/file_handler/mod.rs diff --git a/src/file_handler/mod.rs b/src/file_handler/mod.rs index 53aaba9..9a0133a 100644 --- a/src/file_handler/mod.rs +++ b/src/file_handler/mod.rs @@ -35,30 +35,33 @@ impl FileHandler { FileType::Unknown } - pub fn get_layout_or_panic(&mut self, files: &Vec) { + pub fn get_layout_or_panic(&mut self, files: &Vec) -> Result<(), &str> { for file in files { match file.file_type { FileType::Layout => { let layout_text = read_to_string(&file.path).unwrap(); self.layout = Some(layout_text); - return; + return Ok(()); }, _ => {} } } - panic!("No layout found. Please ensure there's a _layout.html file at the root"); + Err("No layout found. Please ensure there's a _layout.html file at the root") } - pub fn handle_all(&self, source: &PathBuf, destination: &PathBuf, files: &Vec) { + pub fn handle_all(&self, source: &PathBuf, html_destination: &PathBuf, gemini_destination: &PathBuf, files: &Vec) { for file in files { - self.handle(source, destination, file); + self.handle(source, html_destination, gemini_destination, file); } } - pub fn handle(&self, source: &PathBuf, destination: &PathBuf, file: &File) { + pub fn handle(&self, source: &PathBuf, html_destination: &PathBuf, gemini_destination: &PathBuf, file: &File) { for strategy in self.strategies.iter() { if strategy.can_handle(&file.file_type) { - return strategy.handle(file); + let layout = self.layout.as_ref().unwrap(); + strategy.handle_html(source, html_destination, file, layout); + strategy.handle_gemini(source, gemini_destination, file); + return; } } } @@ -68,7 +71,8 @@ pub trait FileHandlerStrategy { fn is(&self, path: &PathBuf) -> bool; fn identify(&self) -> FileType; fn can_handle(&self, file_type: &FileType) -> bool; - fn handle(&self, file: &File); + fn handle_html(&self, source: &PathBuf, destination: &PathBuf, file: &File, layout: &String); + fn handle_gemini(&self, source: &PathBuf, destination: &PathBuf, file: &File); } pub enum FileType {