Fix resource name in resources.ByType

Fixes #12190

diff --git a/hugolib/mount_filters_test.go b/hugolib/mount_filters_test.go
index 16b062ec6cc233123367b9ac67fd8ea7d0be5ef5..eec2e713d2deac963db94fd7660d181cf7f32bf0 100644 (file)
--- 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 ac1a2af0777a93758a336bacb477a3f63c8f5364..1ecc4652d0349e7600d8e3db62853cc1fc0b0106 100644 (file)
--- 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 38ff790558b0c59e5972314b54ba2888a13c67bd..b4630b6a237859538f8c742a758f846ecc35d70d 100644 (file)
--- 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
 }