Do not panic

MIERUNE · Feb 26, 2024 · 158e282 · 158e282
1 parent dd0aa7c
commit 158e282
Showing 1 changed file with 14 additions and 10 deletions.
diff --git a/app/src-tauri/src/main.rs b/app/src-tauri/src/main.rs
@@ -94,16 +94,20 @@ fn run(input_paths: Vec<String>, output_path: String, filetype: String, rules_pa
         let requirements = if rules_path.is_empty() {
             sink.make_transform_requirements()
         } else {
-            let mapping_rules = {
-                let file_contents =
-                    std::fs::read_to_string(rules_path).expect("Error reading rules file");
-                let mapping_rules: MappingRules =
-                    serde_json::from_str(&file_contents).expect("Error parsing rules file");
-                mapping_rules
-            };
-            Requirements {
-                mapping_rules: Some(mapping_rules),
-                ..sink.make_transform_requirements()
+            let file_contents = std::fs::read_to_string(&rules_path);
+            if let Ok(contents) = file_contents {
+                if let Ok(mapping_rules) = serde_json::from_str::<MappingRules>(&contents) {
+                    Requirements {
+                        mapping_rules: Some(mapping_rules),
+                        ..sink.make_transform_requirements()
+                    }
+                } else {
+                    log::error!("Error parsing rules file");
+                    return;
+                }
+            } else {
+                log::error!("Error reading rules file");
+                return;
             }
         };