Improve the error handling

[rbdr/blog] / src / command / publish.rs

diff --git a/src/command/publish.rs b/src/command/publish.rs
index 207b45ddeda0cb56d913ffa863a0ee30ad2a12a7..34ca0d28388fec1a414a1ba79b609aa6e26ffe68 100644 (file)
--- a/src/command/publish.rs
+++ b/src/command/publish.rs
@@ -1,4 +1,4 @@
-use std::io::Result;
+use std::io::{Error, ErrorKind::Other, Result};
 use crate::configuration::Configuration;
 use std::process::{Command, Stdio};
 
@@ -19,14 +19,15 @@ impl super::Command for Publish {
 
     fn execute(&self, input: Option<&String>, configuration: &Configuration, _: &String) -> Result<()> {
 
-        let input = input.expect("You must provide a location to publish the blog");
+        let input = input
+            .ok_or_else(|| Error::new(Other, "You must provide a location to publish the blog"))?;
 
         Command::new(COMMAND)
             .arg("--version")
             .stdout(Stdio::null())
             .stderr(Stdio::null())
             .status()
-            .expect("Publishing requires rsync");
+            .map_err(|_| Error::new(Other, "Publishing requires rsync"))?;
 
 
         Command::new(COMMAND)
@@ -36,7 +37,7 @@ impl super::Command for Publish {
             .stdout(Stdio::null())
             .stderr(Stdio::null())
             .status()
-            .expect("Publishing requires rsync");
+            .map_err(|_| Error::new(Other, "Rsync failed to publish."))?;
         return Ok(())
     }