mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2025-02-13 19:43:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

internal/shaderlister: bug fix: test failures on Windows

Browse Source 
The directory check must be skipped when the pattern includes a meta
character.

Updates #3157
This commit is contained in:
Hajime Hoshi 2025-02-09 00:59:47 +09:00
parent 5e2f2d37aa
commit 0182f7044d
1 changed files with 31 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
internal/shaderlister/main.go
View File

@ -205,6 +205,12 @@ func isAsciiSpace(r rune) bool {
return r == ' ' || r == '\t' || r == '\v' || r == '\n' || r == '\r' return r == ' ' || r == '\t' || r == '\v' || r == '\n' || r == '\r'
} }
func includesGlobMetaChar(str string) bool {
// '-' and '^' are meta characters only when these are in brackets.
// So, these don't need to be checked.
return strings.ContainsAny(str, "*?[]")
}
func appendShaderSources(shaders []Shader, pkg *packages.Package) ([]Shader, error) { func appendShaderSources(shaders []Shader, pkg *packages.Package) ([]Shader, error) {
// Resolve ebitengine:shaderfile directives. // Resolve ebitengine:shaderfile directives.
visitedPatterns := map[string]struct{}{} visitedPatterns := map[string]struct{}{}
@ -223,33 +229,35 @@ func appendShaderSources(shaders []Shader, pkg *packages.Package) ([]Shader, err
continue continue
} }
visitedPatterns[pattern] = struct{}{} visitedPatterns[pattern] = struct{}{}
stat, err := os.Stat(pattern) if !includesGlobMetaChar(pattern) {
if err == nil && stat.IsDir() { stat, err := os.Stat(pattern)
// If the pattern is a directory, read all files in the directory recursively. if err == nil && stat.IsDir() {
if err := filepath.WalkDir(pattern, func(path string, d os.DirEntry, err error) error { // If the pattern is a directory, read all files in the directory recursively.
if err != nil { if err := filepath.WalkDir(pattern, func(path string, d os.DirEntry, err error) error {
return err if err != nil {
} return err
if d.IsDir() { }
if d.IsDir() {
return nil
}
if _, ok := visitedPaths[path]; ok {
return nil
}
visitedPaths[path] = struct{}{}
goFile := pkg.Fset.Position(c.Pos()).Filename
shaders, err = appendShaderFromFile(shaders, pkg.PkgPath, goFile, path)
if err != nil {
return err
}
return nil return nil
}); err != nil {
return nil, err
} }
if _, ok := visitedPaths[path]; ok { continue
return nil }
} if err != nil && !errors.Is(err, os.ErrNotExist) {
visitedPaths[path] = struct{}{}
goFile := pkg.Fset.Position(c.Pos()).Filename
shaders, err = appendShaderFromFile(shaders, pkg.PkgPath, goFile, path)
if err != nil {
return err
}
return nil
}); err != nil {
return nil, err return nil, err
} }
continue
}
if err != nil && !errors.Is(err, os.ErrNotExist) {
return nil, err
} }
paths, err := filepath.Glob(pattern) paths, err := filepath.Glob(pattern)
if err != nil { if err != nil {