github
/
filebrowser
mirror of https://github.com/filebrowser/filebrowser
1
0
Fork 0
Code Issues Releases Wiki Activity

feat: case insensitive search by default #415

pull/468/head
Henrique Dias 2018-07-23 10:24:52 +01:00
parent 3d3191b154
commit 43d489c194
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
http/websockets.go
View File

@ -147,9 +147,9 @@ var (
type condition func(path string) bool type condition func(path string) bool
type searchOptions struct { type searchOptions struct {
CaseInsensitive bool CaseSensitive bool
Conditions []condition Conditions []condition
Terms []string Terms []string
} }
func extensionCondition(extension string) condition { func extensionCondition(extension string) condition {
@ -181,9 +181,9 @@ func videoCondition(path string) bool {
func parseSearch(value string) *searchOptions { func parseSearch(value string) *searchOptions {
opts := &searchOptions{ opts := &searchOptions{
CaseInsensitive: strings.Contains(value, "case:insensitive"), CaseSensitive: strings.Contains(value, "case:sensitive"),
Conditions: []condition{}, Conditions: []condition{},
Terms: []string{}, Terms: []string{},
} }
// removes the options from the value // removes the options from the value
@ -215,7 +215,7 @@ func parseSearch(value string) *searchOptions {
} }
// If it's canse insensitive, put everything in lowercase. // If it's canse insensitive, put everything in lowercase.
if opts.CaseInsensitive { if !opts.CaseSensitive {
value = strings.ToLower(value) value = strings.ToLower(value)
} }
@ -276,7 +276,7 @@ func search(c *fb.Context, w http.ResponseWriter, r *http.Request) (int, error)
scope = filepath.Clean(scope) scope = filepath.Clean(scope)
err = filepath.Walk(scope, func(path string, f os.FileInfo, err error) error { err = filepath.Walk(scope, func(path string, f os.FileInfo, err error) error {
if search.CaseInsensitive { if !search.CaseSensitive {
path = strings.ToLower(path) path = strings.ToLower(path)
} }