add gpg tty

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

diff --git a/src/generator/mod.rs b/src/generator/mod.rs
index c4bf1e116f2bcdf9f2a2d8da0e752ebaa38eac10..e967e410f76d255b804459f8eac062ded572e7ee 100644 (file)
--- a/src/generator/mod.rs
+++ b/src/generator/mod.rs
@@ -6,19 +6,22 @@ mod txt;
 use std::io::Result;
 use std::path::PathBuf;
 use crate::post::Post;
 use std::io::Result;
 use std::path::PathBuf;
 use crate::post::Post;

+use crate::template::TemplateContext;

 
 pub fn generate(static_directory: &PathBuf, template_directory: &PathBuf, output_directory: &PathBuf, posts: &Vec<Post>) -> Result<()> {
     let generators = available_generators();
 
 pub fn generate(static_directory: &PathBuf, template_directory: &PathBuf, output_directory: &PathBuf, posts: &Vec<Post>) -> Result<()> {
     let generators = available_generators();

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

     for generator in generators {
     for generator in generators {

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

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

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

     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,
         txt::generate
         html::generate,
         rss::generate,
         txt::generate