Add tests for archiver module

[rbdr/blog] / src / archiver / gopher.rs

diff --git a/src/archiver/gopher.rs b/src/archiver/gopher.rs
index 820e4d18e6fc974a0f890695d3a716de9f1ffbe5..454e8c4ba8b6feeda7ea9b831999a798400a7314 100644 (file)
--- a/src/archiver/gopher.rs
+++ b/src/archiver/gopher.rs
@@ -1,19 +1,22 @@
+use crate::template::{find, parse, Context};

 use std::fs::write;
 use std::fs::write;

-use std::io::Result;
-use std::path::PathBuf;
-use crate::template::{find, parse, TemplateContext};
+use std::io::{Error, ErrorKind::Other, Result};
+use std::path::Path;

 
 const FILENAME: &str = "index.gph";
 
 
 const FILENAME: &str = "index.gph";
 

-pub fn archive(_: &PathBuf, template_directory: &PathBuf, target: &PathBuf, context: &TemplateContext) -> Result<()> {
-    match find(template_directory, FILENAME) {
-        Some(template) => {
-            let parsed_template = parse(&template);
-            let rendered_template = parsed_template.render(context);
-            let location = target.join(FILENAME);
-            write(location, rendered_template)?;
-        },
-        None => {}
+pub fn archive(
+    _: &Path,
+    template_directory: &Path,
+    target: &Path,
+    context: &Context,
+) -> Result<()> {
+    if let Some(template) = find(template_directory, FILENAME) {
+        let parsed_template = parse(&template)
+            .ok_or_else(|| Error::new(Other, "Unable to parse Gopher Archive template"))?;
+        let rendered_template = parsed_template.render(context)?;
+        let location = target.join(FILENAME);
+        write(location, rendered_template)?;

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