* Recover from IO errors

* Replace and operator to or operator

Author: CodeDead

src/filereader.rs

@@ -23,9 +23,9 @@ impl FileReader {
     }
 
     /// Read the lines of a file
-    /// 
+    ///
     /// # Arguments
-    /// 
+    ///
     /// * `path` - The path of the file that should be read
     ///
     /// # Example
@@ -36,17 +36,25 @@ impl FileReader {
     ///
     /// # Returns
     ///
-    /// A `Vec` that contains all the lines in the specified file
-    pub fn read_lines(&self, path: &str) -> Vec<String> {
-        let file = File::open(path).unwrap();
+    /// The `Vec` that contains all the lines in the specified file or an `Error`
+    pub fn read_lines(&self, path: &str) -> Result<Vec<String>, std::io::Error> {
+        let file = File::open(path);
+        let file = match file {
+            Ok(d) => d,
+            Err(e) => return Err(e),
+        };
+
         let reader = BufReader::new(file);
 
         let mut lines = vec![];
         for (_index, line) in reader.lines().enumerate() {
-            let line = line.unwrap();
+            let line = match line {
+                Ok(d) => d,
+                Err(e) => return Err(e),
+            };
             lines.push(line);
         }
 
-        lines
+        Ok(lines)
     }
 }

src/view.rs

@@ -72,7 +72,7 @@ impl Sandbox for ApplicationContext {
                 self.second_file = path.into_os_string().into_string().unwrap();
             }
             Message::ComparePressed => {
-                if self.first_file.is_empty() && self.second_file.is_empty() {
+                if self.first_file.is_empty() || self.second_file.is_empty() {
                     MessageDialog::new()
                         .set_type(MessageType::Warning)
                         .set_title("text-diff")
@@ -87,6 +87,32 @@ impl Sandbox for ApplicationContext {
                 let lines_first_file = file_reader.read_lines(&self.first_file);
                 let lines_second_file = file_reader.read_lines(&self.second_file);
 
+                let lines_first_file = match lines_first_file {
+                    Ok(d) => d,
+                    Err(e) => {
+                        MessageDialog::new()
+                            .set_type(MessageType::Error)
+                            .set_title("text-diff")
+                            .set_text(&format!("Error while reading file!\n{}", e))
+                            .show_alert()
+                            .unwrap();
+                        return;
+                    }
+                };
+
+                let lines_second_file = match lines_second_file {
+                    Ok(d) => d,
+                    Err(e) => {
+                        MessageDialog::new()
+                            .set_type(MessageType::Error)
+                            .set_title("text-diff")
+                            .set_text(&format!("Error while reading file!\n{}", e))
+                            .show_alert()
+                            .unwrap();
+                        return;
+                    }
+                };
+
                 let mut diff = vec![];
                 for f in &lines_first_file {
                     let mut included = false;