mirror of
https://github.com/stashapp/stash.git
synced 2025-12-15 04:44:28 +01:00
45f700d6ea
* Upgrade gqlgen to v0.17.2 This enables builds on Go 1.18. github.com/vektah/gqlparser is upgraded to the newest version too. Getting this to work is a bit of a hazzle. I had to first remove vendoring from the repository, perform the upgrade and then re-introduce the vendor directory. I think gqlgens analysis went wrong for some reason on the upgrade. It would seem a clean-room installation fixed it. * Bump project to 1.18 * Update all packages, address gqlgenc breaking changes * Let `go mod tidy` handle the go.mod file * Upgrade linter to 1.45.2 * Introduce v1.45.2 of the linter The linter now correctly warns on `strings.Title` because it isn't unicode-aware. Fix this by using the suggested fix from x/text/cases to produce unicode-aware strings. The mapping isn't entirely 1-1 as this new approach has a larger iface: it spans all of unicode rather than just ASCII. It coincides for ASCII however, so things should be largely the same. * Ready ourselves for errchkjson and contextcheck. * Revert dockerfile golang version changes for now Co-authored-by: Kermie <kermie@isinthe.house> Co-authored-by: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
65 lines
1 KiB
Go
65 lines
1 KiB
Go
//go:build go1.16 && finder
|
|
// +build go1.16,finder
|
|
|
|
package viper
|
|
|
|
import (
|
|
"errors"
|
|
"io/fs"
|
|
"path"
|
|
)
|
|
|
|
type finder struct {
|
|
paths []string
|
|
fileNames []string
|
|
extensions []string
|
|
|
|
withoutExtension bool
|
|
}
|
|
|
|
func (f finder) Find(fsys fs.FS) (string, error) {
|
|
for _, searchPath := range f.paths {
|
|
for _, fileName := range f.fileNames {
|
|
for _, extension := range f.extensions {
|
|
filePath := path.Join(searchPath, fileName+"."+extension)
|
|
|
|
ok, err := fileExists(fsys, filePath)
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
|
|
if ok {
|
|
return filePath, nil
|
|
}
|
|
}
|
|
|
|
if f.withoutExtension {
|
|
filePath := path.Join(searchPath, fileName)
|
|
|
|
ok, err := fileExists(fsys, filePath)
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
|
|
if ok {
|
|
return filePath, nil
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
return "", nil
|
|
}
|
|
|
|
func fileExists(fsys fs.FS, filePath string) (bool, error) {
|
|
fileInfo, err := fs.Stat(fsys, filePath)
|
|
if err == nil {
|
|
return !fileInfo.IsDir(), nil
|
|
}
|
|
|
|
if errors.Is(err, fs.ErrNotExist) {
|
|
return false, nil
|
|
}
|
|
|
|
return false, err
|
|
}
|