gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2025-01-03 15:06:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

git_match_path: make it case insensitive

Browse Source
This commit is contained in:
Nikita Galaiko 2023-04-24 10:48:07 +02:00
parent 72f9c602fe
commit 6970c324c7
1 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src-tauri/src/app/project_repository.rs
View File

@ -2,7 +2,6 @@ use std::{collections::HashMap, env};
use anyhow::{Context, Result};
use serde::Serialize;
use tauri::regex::Regex;
use walkdir::WalkDir;
use crate::{git::activity, projects};
@ -211,25 +210,23 @@ impl<'repository> Repository<'repository> {
.workdir()
.with_context(|| "failed to get working directory")?;
let pattern = Regex::new(pattern).with_context(|| "regex parse error");
match pattern {
Ok(pattern) => {
let mut files = vec![];
for entry in WalkDir::new(workdir)
let pattern = pattern.to_lowercase();
let mut files = vec![];
for entry in WalkDir::new(workdir)
.into_iter()
.filter_entry(|e| {
.filter_entry(|entry| {
// need to remove workdir so we're not matching it
let match_string = e
let relative_path = entry
.path()
.strip_prefix::<&std::path::Path>(workdir.as_ref())
.strip_prefix(workdir)
.unwrap()
.to_str()
.unwrap();
// this is to make it faster, so we dont have to traverse every directory if it is ignored by git
e.path().to_str() == workdir.to_str() // but we need to traverse the first one
|| ((e.file_type().is_dir() // traverse all directories if they are not ignored by git
|| pattern.is_match(match_string)) // but only pass on files that match the regex
&& !self.git_repository.is_path_ignored(&e.path()).unwrap_or(true))
entry.path().to_str() == workdir.to_str() // but we need to traverse the first one
|| ((entry.file_type().is_dir() // traverse all directories if they are not ignored by git
|| relative_path.to_lowercase().contains(&pattern)) // but only pass on files that match the regex
&& !self.git_repository.is_path_ignored(&entry.path()).unwrap_or(true))
})
.filter_map(Result::ok)
{
@ -248,13 +245,8 @@ impl<'repository> Repository<'repository> {
files.push(path);
}
}
files.sort();
return Ok(files);
}
Err(e) => {
return Err(e);
}
}
files.sort();
return Ok(files);
}
pub fn git_branches(&self) -> Result<Vec<String>> {