Merge pull request #129 from lqd/fix_clap

Make clap usable, add warnings on missing fact files
rust-lang · Oct 3, 2019 · 1f31a28 · 1f31a28
2 parents c78359a + 86c9639
commit 1f31a28
Showing 1 changed file with 29 additions and 20 deletions.
diff --git a/src/tab_delim.rs b/src/tab_delim.rs
@@ -57,31 +57,40 @@ fn load_tab_delimited_file<Row>(tables: &mut InternerTables, path: &Path) -> io:
 where
     Row: for<'input> FromTabDelimited<'input>,
 {
-    let file = File::open(path)?;
+    match File::open(path) {
+        Ok(file) => io::BufReader::new(file)
+            .lines()
+            .enumerate()
+            .map(|(index, line)| {
+                let line = line?;
+                let mut columns = line.split('\t');
+                let row = match FromTabDelimited::parse(tables, &mut columns) {
+                    None => {
+                        error!("error parsing line {} of `{}`", index + 1, path.display());
+                        process::exit(1);
+                    }
 
-    io::BufReader::new(file)
-        .lines()
-        .enumerate()
-        .map(|(index, line)| {
-            let line = line?;
-            let mut columns = line.split('\t');
-            let row = match FromTabDelimited::parse(tables, &mut columns) {
-                None => {
-                    error!("error parsing line {} of `{}`", index + 1, path.display());
+                    Some(v) => v,
+                };
+
+                if columns.next().is_some() {
+                    error!("extra data on line {} of `{}`", index + 1, path.display());
                     process::exit(1);
                 }
 
-                Some(v) => v,
-            };
-
-            if columns.next().is_some() {
-                error!("extra data on line {} of `{}`", index + 1, path.display());
-                process::exit(1);
-            }
+                Ok(row)
+            })
+            .collect(),
 
-            Ok(row)
-        })
-        .collect()
+        Err(e) => {
+            error!(
+                "Error opening file '{}': {}. Defaulting to empty relation",
+                path.display(),
+                e
+            );
+            Ok(Vec::new())
+        }
+    }
 }
 
 impl<'input, T> FromTabDelimited<'input> for T