diff options
author | Bjørn Erik Pedersen <[email protected]> | 2024-03-07 09:00:44 +0100 |
---|---|---|
committer | Bjørn Erik Pedersen <[email protected]> | 2024-03-07 09:50:50 +0100 |
commit | a4b17470a81e3c0ac71fd43aef2110336bfe6848 (patch) | |
tree | 73fbb6de84b237d72d6485e717457afe319a5552 | |
parent | 4d5e173cf82b74c53e3279d75b0243e86ee8bcfc (diff) | |
download | hugo-a4b17470a81e3c0ac71fd43aef2110336bfe6848.tar.gz hugo-a4b17470a81e3c0ac71fd43aef2110336bfe6848.zip |
Fix resource name in resources.ByType
Fixes #12190
-rw-r--r-- | hugolib/mount_filters_test.go | 2 | ||||
-rw-r--r-- | resources/resource_factories/create/create.go | 7 | ||||
-rw-r--r-- | tpl/resources/resources_integration_test.go | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/hugolib/mount_filters_test.go b/hugolib/mount_filters_test.go index 16b062ec6..eec2e713d 100644 --- a/hugolib/mount_filters_test.go +++ b/hugolib/mount_filters_test.go @@ -112,6 +112,6 @@ Template: false Resource1: /js/include.js:END Resource2: :END Resource3: :END -Resources: [/js/include.js] +Resources: [include.js] `) } diff --git a/resources/resource_factories/create/create.go b/resources/resource_factories/create/create.go index ac1a2af07..1ecc4652d 100644 --- a/resources/resource_factories/create/create.go +++ b/resources/resource_factories/create/create.go @@ -128,13 +128,16 @@ func (c *Client) match(name, pattern string, matchFunc func(r resource.Resource) handle := func(info hugofs.FileMetaInfo) (bool, error) { meta := info.Meta() + r, err := c.rs.NewResource(resources.ResourceSourceDescriptor{ LazyPublish: true, OpenReadSeekCloser: func() (hugio.ReadSeekCloser, error) { return meta.Open() }, - GroupIdentity: meta.PathInfo, - TargetPath: meta.PathInfo.Unnormalized().Path(), + NameNormalized: meta.PathInfo.Name(), + NameOriginal: meta.PathInfo.Unnormalized().Name(), + GroupIdentity: meta.PathInfo, + TargetPath: meta.PathInfo.Unnormalized().Path(), }) if err != nil { return true, err diff --git a/tpl/resources/resources_integration_test.go b/tpl/resources/resources_integration_test.go index 38ff79055..b4630b6a2 100644 --- a/tpl/resources/resources_integration_test.go +++ b/tpl/resources/resources_integration_test.go @@ -155,6 +155,7 @@ I am a.txt -- assets/b.txt -- I am b.txt -- layouts/index.html -- +Home. {{ with resources.ByType "text" }} {{ with .Get "a.txt" }} {{ .Publish }} @@ -167,7 +168,6 @@ I am b.txt b := hugolib.Test(t, files) - b.AssertFileExists("public/index.html", true) b.AssertFileExists("public/a.txt", true) // failing test b.AssertFileExists("public/b.txt", true) // failing test } |