Fix paths on windows

This commit is contained in:
Alex Yatskov 2024-04-09 10:34:51 -07:00
parent 818855e875
commit 0e6946b010

View File

@ -1,6 +1,7 @@
package wildcard package wildcard
import ( import (
"path/filepath"
"strings" "strings"
"git.foosoft.net/alex/goldsmith" "git.foosoft.net/alex/goldsmith"
@ -26,10 +27,10 @@ func (*Wildcard) Name() string {
} }
func (self *Wildcard) Accept(file *goldsmith.File) bool { func (self *Wildcard) Accept(file *goldsmith.File) bool {
filePath := self.adjustCase(file.Path()) filePath := self.adjustPath(file.Path())
for _, wildcard := range self.wildcards { for _, wildcard := range self.wildcards {
wildcard = self.adjustCase(wildcard) wildcard = self.adjustPath(wildcard)
if matched, _ := doublestar.PathMatch(wildcard, filePath); matched { if matched, _ := doublestar.PathMatch(wildcard, filePath); matched {
return true return true
} }
@ -38,7 +39,9 @@ func (self *Wildcard) Accept(file *goldsmith.File) bool {
return false return false
} }
func (self *Wildcard) adjustCase(str string) string { func (self *Wildcard) adjustPath(str string) string {
str = filepath.FromSlash(str)
if self.caseSensitive { if self.caseSensitive {
return str return str
} }