Fix resource name in resources.ByType

Fixes #12190
gohugoio · Mar 7, 2024 · a4b1747 · a4b1747
1 parent 4d5e173
commit a4b1747
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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
 }