Add tests for the archivers

[rbdr/blog] / src / generator / mod.rs

diff --git a/src/generator/mod.rs b/src/generator/mod.rs
index f0fef7585fd9e7162d6b5f6650d4bbcb577277b8..dbe1c2e3ef3162b871c63e72fa61fcb3ffaaeade 100644 (file)
--- a/src/generator/mod.rs
+++ b/src/generator/mod.rs
@@ -1,28 +1,40 @@
-mod static_files;

 mod html;
 mod rss;
 mod html;
 mod rss;

+mod static_files;

 mod txt;
 
 mod txt;
 

-use std::io::Result;
-use std::path::PathBuf;

 use crate::post::Post;
 use crate::post::Post;

-use crate::template::TemplateContext;
+use crate::template::Context;
+use std::io::Result;
+use std::path::Path;
+
+type Generator = fn(&Path, &Path, &Path, &Context) -> Result<()>;

 
 

-pub fn generate(static_directory: &PathBuf, template_directory: &PathBuf, output_directory: &PathBuf, posts: &Vec<Post>) -> Result<()> {
+pub fn generate(
+    static_directory: &Path,
+    template_directory: &Path,
+    output_directory: &Path,
+    posts: &[Post],
+) -> Result<()> {

     let generators = available_generators();
     let generators = available_generators();

-    let context = Post::to_template_context(&posts);
+    let context = Post::to_template_context(posts);

     for generator in generators {
     for generator in generators {

-        generator(static_directory, template_directory, output_directory, &context)?;
+        generator(
+            static_directory,
+            template_directory,
+            output_directory,
+            &context,
+        )?;

     }
     Ok(())
 }
 
     }
     Ok(())
 }
 

-
-fn available_generators() -> Vec<fn(&PathBuf, &PathBuf, &PathBuf, &TemplateContext) -> Result<()>> {
+fn available_generators() -> Vec<Generator> {

     vec![
         static_files::generate,
     vec![
         static_files::generate,

+        // These three are actually the same. Can generalize, don't know how in rust yet.

         html::generate,
         rss::generate,
         html::generate,
         rss::generate,

-        txt::generate
+        txt::generate,

     ]
 }
     ]
 }