implement return values depending on query parsing result and any errors reading directories

Author: jhspetersson

src/main.rs

@@ -120,6 +120,8 @@ fn main() {
         first_arg = args[0].to_ascii_lowercase();
     }
 
+    let mut exit_value = None::<i32>;
+
     if interactive {
         let mut rl = Editor::<()>::new();
         loop {
@@ -146,13 +148,17 @@ fn main() {
         }
     } else {
         let query = args.join(" ");
-        exec_search(query, &config, no_color);
+        exit_value = Some(exec_search(query, &config, no_color));
     }
 
     config.save();
+
+    if let Some(exit_value) = exit_value {
+        std::process::exit(exit_value);
+    }
 }
 
-fn exec_search(query: String, config: &Config, no_color: bool) {
+fn exec_search(query: String, config: &Config, no_color: bool) -> i32 {
     let mut p = Parser::new();
     let query = p.parse(&query, config.debug);
 
@@ -166,9 +172,15 @@ fn exec_search(query: String, config: &Config, no_color: bool) {
             let use_colors = !no_color && is_terminal;
 
             let mut searcher = Searcher::new(query, config.clone(), use_colors);
-            searcher.list_search_results().unwrap()
+            searcher.list_search_results().unwrap();
+
+            let error_count = searcher.error_count;
+            match error_count {
+                0 => 0,
+                _ => 1
+            }
         },
-        Err(err) => error_message("query", &err)
+        Err(err) => { error_message("query", &err); 2 }
     }
 }
 

src/searcher.rs

@@ -87,6 +87,8 @@ pub struct Searcher {
 
     file_exif_metadata: Option<HashMap<String, String>>,
     file_exif_metadata_set: bool,
+
+    pub error_count: i32,
 }
 
 impl Searcher {
@@ -129,6 +131,8 @@ impl Searcher {
 
             file_exif_metadata: None,
             file_exif_metadata_set: false,
+
+            error_count: 0,
         }
     }
 
@@ -219,7 +223,10 @@ impl Searcher {
                                         }
                                     }
                                 },
-                                Err(e) => path_error_message(&path, e)
+                                Err(e) => {
+                                    self.error_count += 1;
+                                    path_error_message(&path, e)
+                                }
                             }
                         }
 
@@ -492,6 +499,7 @@ impl Searcher {
         let canonical_path = crate::util::canonical_path(&dir.to_path_buf());
 
         if canonical_path.is_err() {
+            self.error_count += 1;
             error_message(&dir.to_string_lossy(), String::from("could not canonicalize path: ").add(canonical_path.err().unwrap().as_str()).as_str());
             return Ok(());
         }
@@ -594,6 +602,7 @@ impl Searcher {
                                                         false);
 
                                                     if result.is_err() {
+                                                        self.error_count += 1;
                                                         path_error_message(&path, result.err().unwrap());
                                                     }
                                                 } else {
@@ -602,18 +611,21 @@ impl Searcher {
                                             }
                                         }
                                     } else {
+                                        self.error_count += 1;
                                         path_error_message(&path, result.err().unwrap());
                                     }
                                 }
                             }
                         },
                         Err(err) => {
+                            self.error_count += 1;
                             path_error_message(dir, err);
                         }
                     }
                 }
             },
             Err(err) => {
+                self.error_count += 1;
                 path_error_message(dir, err);
             }
         }
@@ -634,6 +646,7 @@ impl Searcher {
                     false);
 
                 if result.is_err() {
+                    self.error_count += 1;
                     path_error_message(&path, result.err().unwrap());
                 }
             }