nicoeri/filebrowser
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

take file name into account

Browse Source
This commit is contained in:
Weidi Deng 2021-01-12 19:39:27 +08:00
parent a3a9789010
commit fda881c3d8
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
search/search.go
View File

@ -29,8 +29,6 @@ func Search(fs afero.Fs, scope, query string, checker rules.Checker, found func(
originalPath = strings.TrimPrefix(originalPath, "/")
originalPath = "/" + originalPath
path := originalPath
originalPath = strings.TrimPrefix(originalPath, scope)
originalPath = strings.TrimPrefix(originalPath, "/")
if path == scope {
return nil
@ -45,21 +43,32 @@ func Search(fs afero.Fs, scope, query string, checker rules.Checker, found func(
}
if len(search.Conditions) > 0 {
match := false
for _, t := range search.Conditions {
if t(path) {
return found(originalPath, f)
match = true
break
}
}
return nil
if !match {
return nil
}
}
if len(search.Terms) > 0 {
for _, term := range search.Terms {
if strings.Contains(path, term) {
originalPath = strings.TrimPrefix(originalPath, scope)
originalPath = strings.TrimPrefix(originalPath, "/")
return found(originalPath, f)
}
}
} else {
originalPath = strings.TrimPrefix(originalPath, scope)
originalPath = strings.TrimPrefix(originalPath, "/")
return found(originalPath, f)
}
return nil