Merge branch 'main' into release

crates/spyglass/src/filesystem/mod.rs

@@ -366,19 +366,30 @@ impl SpyglassFileWatcher {
         }
 
         // well does this work
-        for map_ref in &self.ignore_files {
-            let root = map_ref.key();
-            let patterns = map_ref.value();
-            if let Some(parent) = root.parent() {
-                if path.starts_with(parent) {
-                    return patterns
-                        .matched_path_or_any_parents(path, path.is_dir())
-                        .is_ignore();
+        let gitignore_checks = self
+            .ignore_files
+            .iter()
+            .filter_map(|map_ref| {
+                let root = map_ref.key();
+                let patterns = map_ref.value();
+                if let Some(parent) = root.parent() {
+                    if path.starts_with(parent) {
+                        return Some(
+                            patterns
+                                .matched_path_or_any_parents(path, path.is_dir())
+                                .is_ignore(),
+                        );
+                    }
                 }
-            }
-        }
+                None
+            })
+            .collect::<Vec<bool>>();
 
-        false
+        if gitignore_checks.is_empty() {
+            false
+        } else {
+            gitignore_checks.iter().any(|b| *b)
+        }
     }
 
     /// Sets up a watcher for the specified path. If two watchers are registered

crates/spyglass/src/search/mod.rs

@@ -75,20 +75,7 @@ impl Searcher {
 
     /// Deletes a single entry from the database & index
     pub async fn delete_by_id(state: &AppState, doc_id: &str) -> anyhow::Result<()> {
-        // Remove from search index, immediately.
-        if let Ok(mut writer) = state.index.writer.lock() {
-            Searcher::remove_from_index(&mut writer, doc_id)?;
-        };
-
-        // Remove from indexed_doc table
-        if let Some(model) = indexed_document::Entity::find()
-            .filter(indexed_document::Column::DocId.eq(doc_id))
-            .one(&state.db)
-            .await?
-        {
-            let _ = model.delete(&state.db).await;
-        }
-
+        Searcher::delete_many_by_id(state, &[doc_id.into()], true).await?;
         Ok(())
     }