Improve the error handling

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

diff --git a/src/archiver/gopher.rs b/src/archiver/gopher.rs
index 820e4d18e6fc974a0f890695d3a716de9f1ffbe5..28f4f46f5e6a48f513f1a9deabb033e99edd1709 100644 (file)
--- a/src/archiver/gopher.rs
+++ b/src/archiver/gopher.rs
@@ -1,5 +1,5 @@
 use std::fs::write;
 use std::fs::write;

-use std::io::Result;
+use std::io::{Error, ErrorKind::Other, Result};

 use std::path::PathBuf;
 use crate::template::{find, parse, TemplateContext};
 
 use std::path::PathBuf;
 use crate::template::{find, parse, TemplateContext};
 


@@ -8,8 +8,9 @@ const FILENAME: &str = "index.gph";
 pub fn archive(_: &PathBuf, template_directory: &PathBuf, target: &PathBuf, context: &TemplateContext) -> Result<()> {
     match find(template_directory, FILENAME) {
         Some(template) => {
 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 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)?;
         },
             let location = target.join(FILENAME);
             write(location, rendered_template)?;
         },