add error handling on potential error in ignore (#191)

gitui-org · Jul 10, 2020 · cbd7511 · cbd7511
1 parent fc142b4
commit cbd7511
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 9 deletions.
diff --git a/asyncgit/src/sync/ignore.rs b/asyncgit/src/sync/ignore.rs
@@ -8,7 +8,7 @@ static GITIGNORE: &str = ".gitignore";
 /// add file or path to root ignore file
 pub fn add_to_ignore(
     repo_path: &str,
-    path_to_ignore: String,
+    path_to_ignore: &str,
 ) -> Result<()> {
     scope_time!("add_to_ignore");
 

diff --git a/src/components/changes.rs b/src/components/changes.rs
@@ -172,15 +172,27 @@ impl ChangesComponent {
         false
     }
 
-    fn add_to_ignore(&mut self) -> Result<bool> {
+    fn add_to_ignore(&mut self) -> bool {
         if let Some(tree_item) = self.selection() {
-            sync::add_to_ignore(CWD, tree_item.info.full_path)?;
-            self.queue
-                .borrow_mut()
-                .push_back(InternalEvent::Update(NeedsUpdate::ALL));
-            return Ok(true);
+            if let Err(e) =
+                sync::add_to_ignore(CWD, &tree_item.info.full_path)
+            {
+                self.queue.borrow_mut().push_back(
+                    InternalEvent::ShowErrorMsg(format!(
+                        "ignore error:\n{}\nfile:\n{:?}",
+                        e, tree_item.info.full_path
+                    )),
+                );
+            } else {
+                self.queue.borrow_mut().push_back(
+                    InternalEvent::Update(NeedsUpdate::ALL),
+                );
+
+                return true;
+            }
         }
-        Ok(false)
+
+        false
     }
 }
 
@@ -306,7 +318,7 @@ impl Component for ChangesComponent {
                         if self.is_working_dir
                             && !self.is_empty() =>
                     {
-                        Ok(self.add_to_ignore()?)
+                        Ok(self.add_to_ignore())
                     }
                     _ => Ok(false),
                 };