github/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-11-07 20:30:36 -05:00
Code Issues Projects Releases Packages Wiki Activity

resource: Make .Resources.GetByPrefix case insensitive

Browse source 
Fixes #4258
This commit is contained in:
Bjørn Erik Pedersen 2018-01-11 18:58:53 +01:00
parent 1046e9363f
commit db85e83403
No known key found for this signature in database
GPG key ID: 330E6E2BD4859D8F
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
resource/resource.go
View file

@ -70,8 +70,10 @@ func (r Resources) ByType(tp string) Resources {
// "logo" will match logo.png. It returns nil of none found. // "logo" will match logo.png. It returns nil of none found.
// In potential ambiguous situations, combine it with ByType. // In potential ambiguous situations, combine it with ByType.
func (r Resources) GetByPrefix(prefix string) Resource { func (r Resources) GetByPrefix(prefix string) Resource {
prefix = strings.ToLower(prefix)
for _, resource := range r { for _, resource := range r {
_, name := filepath.Split(resource.RelPermalink()) _, name := filepath.Split(resource.RelPermalink())
name = strings.ToLower(name)
if strings.HasPrefix(name, prefix) { if strings.HasPrefix(name, prefix) {
return resource return resource
} }

4
resource/resource_test.go
View file

@ -113,12 +113,14 @@ func TestResourcesGetByPrefix(t *testing.T) {
resources := Resources{ resources := Resources{
spec.newGenericResource(nil, nil, "/public", "/a/foo1.css", "foo1.css", "css"), spec.newGenericResource(nil, nil, "/public", "/a/foo1.css", "foo1.css", "css"),
spec.newGenericResource(nil, nil, "/public", "/a/logo1.png", "logo1.png", "image"), spec.newGenericResource(nil, nil, "/public", "/a/logo1.png", "logo1.png", "image"),
spec.newGenericResource(nil, nil, "/public", "/b/logo2.png", "logo2.png", "image"), spec.newGenericResource(nil, nil, "/public", "/b/Logo2.png", "Logo2.png", "image"),
spec.newGenericResource(nil, nil, "/public", "/b/foo2.css", "foo2.css", "css"), spec.newGenericResource(nil, nil, "/public", "/b/foo2.css", "foo2.css", "css"),
spec.newGenericResource(nil, nil, "/public", "/b/foo3.css", "foo3.css", "css")} spec.newGenericResource(nil, nil, "/public", "/b/foo3.css", "foo3.css", "css")}
assert.Nil(resources.GetByPrefix("asdf")) assert.Nil(resources.GetByPrefix("asdf"))
assert.Equal("/logo1.png", resources.GetByPrefix("logo").RelPermalink()) assert.Equal("/logo1.png", resources.GetByPrefix("logo").RelPermalink())
assert.Equal("/logo1.png", resources.GetByPrefix("loGo").RelPermalink())
assert.Equal("/Logo2.png", resources.GetByPrefix("logo2").RelPermalink())
assert.Equal("/foo2.css", resources.GetByPrefix("foo2").RelPermalink()) assert.Equal("/foo2.css", resources.GetByPrefix("foo2").RelPermalink())
assert.Equal("/foo1.css", resources.GetByPrefix("foo1").RelPermalink()) assert.Equal("/foo1.css", resources.GetByPrefix("foo1").RelPermalink())
assert.Equal("/foo1.css", resources.GetByPrefix("foo1").RelPermalink()) assert.Equal("/foo1.css", resources.GetByPrefix("foo1").RelPermalink())