mirror of
https://github.com/stashapp/stash.git
synced 2025-12-18 21:04:37 +03:00
Changes to Default Performer Images (for Accessibility) (#1489)
* Changes to support custom URL paths * Refactor image resolver code * Initialise box files at startup * Update packr Co-authored-by: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
This commit is contained in:
5
vendor/github.com/gobuffalo/packr/v2/pointer.go
generated
vendored
5
vendor/github.com/gobuffalo/packr/v2/pointer.go
generated
vendored
@@ -4,7 +4,6 @@ import (
|
||||
"github.com/gobuffalo/packr/v2/file"
|
||||
"github.com/gobuffalo/packr/v2/file/resolver"
|
||||
"github.com/gobuffalo/packr/v2/plog"
|
||||
"github.com/pkg/errors"
|
||||
)
|
||||
|
||||
// Pointer is a resolvr which resolves
|
||||
@@ -22,11 +21,11 @@ func (p Pointer) Resolve(box string, path string) (file.File, error) {
|
||||
plog.Debug(p, "Resolve", "box", box, "path", path, "forward-box", p.ForwardBox, "forward-path", p.ForwardPath)
|
||||
b, err := findBox(p.ForwardBox)
|
||||
if err != nil {
|
||||
return nil, errors.WithStack(err)
|
||||
return nil, err
|
||||
}
|
||||
f, err := b.Resolve(p.ForwardPath)
|
||||
if err != nil {
|
||||
return f, errors.WithStack(errors.Wrap(err, path))
|
||||
return f, err
|
||||
}
|
||||
plog.Debug(p, "Resolve", "box", box, "path", path, "file", f)
|
||||
return file.NewFileR(path, f)
|
||||
|
||||
Reference in New Issue
Block a user