X-Git-Url: https://git.r.bdr.sh/rbdr/page/blobdiff_plain/4fd89b808cabc8afb0d75b9700be1da96989c4b7..160a27bd2aa334a881f7c54847ef406925f87633:/src/file_handler/mod.rs

diff --git a/src/file_handler/mod.rs b/src/file_handler/mod.rs
index 53aaba9..4932ef1 100644
--- a/src/file_handler/mod.rs
+++ b/src/file_handler/mod.rs
@@ -35,18 +35,18 @@ impl FileHandler {
         FileType::Unknown
     }
 
-    pub fn get_layout_or_panic(&mut self, files: &Vec<File>) {
+    pub fn get_layout_or_panic(&mut self, files: &Vec<File>) -> 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<File>) {
@@ -58,7 +58,8 @@ impl FileHandler {
     pub fn handle(&self, source: &PathBuf, 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();
+                return strategy.handle(source, destination, file, layout);
             }
         }
     }
@@ -68,7 +69,7 @@ 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(&self, source: &PathBuf, destination: &PathBuf, file: &File, layout: &String);
 }
 
 pub enum FileType {