excluded dirs

This commit is contained in:
piotr
2021-09-25 04:39:05 +02:00
parent fb00364e51
commit fa3a8d9bb7
4 changed files with 33 additions and 10 deletions

View File

@@ -291,16 +291,19 @@ func walk(path string, d fs.DirEntry, e error) error {
if e != nil {
return e
}
// don't search leading part of the path, as e.g. '/home/user/Pictures'
toSearch := strings.Split(path, ignore)[1]
if strings.Contains(strings.ToLower(toSearch), strings.ToLower(phrase)) {
// mark directories
if d.IsDir() {
fileSearchResults = append(fileSearchResults, fmt.Sprintf("#is_dir#%s", path))
} else {
fileSearchResults = append(fileSearchResults, path)
if !isExcluded(path) {
// don't search leading part of the path, as e.g. '/home/user/Pictures'
toSearch := strings.Split(path, ignore)[1]
if strings.Contains(strings.ToLower(toSearch), strings.ToLower(phrase)) {
// mark directories
if d.IsDir() {
fileSearchResults = append(fileSearchResults, fmt.Sprintf("#is_dir#%s", path))
} else {
fileSearchResults = append(fileSearchResults, path)
}
}
}
return nil
}
@@ -388,6 +391,15 @@ func setUpSearchEntry() *gtk.SearchEntry {
return searchEntry
}
func isExcluded(dir string) bool {
for _, exclusion := range exclusions {
if strings.Contains(dir, exclusion) {
return true
}
}
return false
}
func searchUserDir(dir string) {
fileSearchResults = nil
ignore = userDirsMap[dir]