From 8388e67c4bf7632f93688585bfa006adc97d02f9 Mon Sep 17 00:00:00 2001 From: Michael Eischer Date: Wed, 7 Oct 2020 21:14:07 +0200 Subject: [PATCH] filter: cleanup path separator conversion --- internal/filter/filter.go | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/internal/filter/filter.go b/internal/filter/filter.go index f1aa20e94..1589819da 100644 --- a/internal/filter/filter.go +++ b/internal/filter/filter.go @@ -24,21 +24,13 @@ func prepareStr(str string) ([]string, error) { return nil, ErrBadString } - // convert file path separator to '/' - if filepath.Separator != '/' { - str = strings.Replace(str, string(filepath.Separator), "/", -1) - } - + str = filepath.ToSlash(str) return strings.Split(str, "/"), nil } func preparePattern(pattern string) Pattern { pattern = filepath.Clean(pattern) - - // convert file path separator to '/' - if filepath.Separator != '/' { - pattern = strings.Replace(pattern, string(filepath.Separator), "/", -1) - } + pattern = filepath.ToSlash(pattern) parts := strings.Split(pattern, "/") patterns := make([]patternPart, len(parts))