Task attempt 5d105b9b-dfe8-422b-b529-530cbf7e2dfe - Final changes

backend/Cargo.toml

@@ -32,6 +32,7 @@ rust-embed = "8.2"
 mime_guess = "2.0"
 directories = "6.0.0"
 open = "5.3.2"
+ignore = "0.4"
 
 [build-dependencies]
 ts-rs = { version = "9.0", features = ["uuid-impl", "chrono-impl"] }

backend/src/routes/projects.rs

@@ -286,6 +286,7 @@ async fn search_files_in_repo(
     repo_path: &str,
     query: &str,
 ) -> Result<Vec<SearchResult>, Box<dyn std::error::Error + Send + Sync>> {
+    use ignore::WalkBuilder;
     use std::path::Path;
 
     let repo_path = Path::new(repo_path);
@@ -297,71 +298,65 @@ async fn search_files_in_repo(
     let mut results = Vec::new();
     let query_lower = query.to_lowercase();
 
-    // Recursively search through the repository
+    // Use ignore::WalkBuilder to respect gitignore files
-    fn walk_dir(
+    let walker = WalkBuilder::new(repo_path)
-        dir: &Path,
+        .git_ignore(true)
-        repo_root: &Path,
+        .git_global(true)
-        query: &str,
+        .git_exclude(true)
-        results: &mut Vec<SearchResult>,
+        .hidden(false)
-    ) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
+        .build();
-        if dir.file_name().map_or(false, |name| name == ".git") {
+
-            return Ok(());
+    for result in walker {
+        let entry = result?;
+        let path = entry.path();
+        
+        // Skip the root directory itself
+        if path == repo_path {
+            continue;
         }
 
-        for entry in std::fs::read_dir(dir)? {
+        let relative_path = path.strip_prefix(repo_path)?;
-            let entry = entry?;
+        
-            let path = entry.path();
+        // Skip .git directory and its contents
+        if relative_path.components().any(|component| component.as_os_str() == ".git") {
+            continue;
+        }
+        let relative_path_str = relative_path.to_string_lossy().to_lowercase();
 
-            // Skip .git directories
+        let file_name = path
-            if path.is_dir() && path.file_name().map_or(false, |name| name == ".git") {
+            .file_name()
-                continue;
+            .map(|name| name.to_string_lossy().to_lowercase())
-            }
+            .unwrap_or_default();
 
-            let relative_path = path.strip_prefix(repo_root)?;
+        // Check for matches
-            let relative_path_str = relative_path.to_string_lossy().to_lowercase();
+        if file_name.contains(&query_lower) {
-
+            results.push(SearchResult {
-            let file_name = path
+                path: relative_path.to_string_lossy().to_string(),
-                .file_name()
+                is_file: path.is_file(),
+                match_type: SearchMatchType::FileName,
+            });
+        } else if relative_path_str.contains(&query_lower) {
+            // Check if it's a directory name match or full path match
+            let match_type = if path
+                .parent()
+                .and_then(|p| p.file_name())
                 .map(|name| name.to_string_lossy().to_lowercase())
-                .unwrap_or_default();
+                .unwrap_or_default()
+                .contains(&query_lower)
+            {
+                SearchMatchType::DirectoryName
+            } else {
+                SearchMatchType::FullPath
+            };
 
-            // Check for matches
+            results.push(SearchResult {
-            if file_name.contains(query) {
+                path: relative_path.to_string_lossy().to_string(),
-                results.push(SearchResult {
+                is_file: path.is_file(),
-                    path: relative_path.to_string_lossy().to_string(),
+                match_type,
-                    is_file: path.is_file(),
+            });
-                    match_type: SearchMatchType::FileName,
-                });
-            } else if relative_path_str.contains(query) {
-                // Check if it's a directory name match or full path match
-                let match_type = if path
-                    .parent()
-                    .and_then(|p| p.file_name())
-                    .map(|name| name.to_string_lossy().to_lowercase())
-                    .unwrap_or_default()
-                    .contains(query)
-                {
-                    SearchMatchType::DirectoryName
-                } else {
-                    SearchMatchType::FullPath
-                };
-
-                results.push(SearchResult {
-                    path: relative_path.to_string_lossy().to_string(),
-                    is_file: path.is_file(),
-                    match_type,
-                });
-            }
-
-            if path.is_dir() {
-                walk_dir(&path, repo_root, query, results)?;
-            }
         }
-        Ok(())
     }
 
-    walk_dir(repo_path, repo_path, &query_lower, &mut results)?;
-
     // Sort results by priority: FileName > DirectoryName > FullPath
     results.sort_by(|a, b| {
         use SearchMatchType::*;