mirror/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2025-08-16 20:53:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix rebuild when deleting a content adapter file

Browse Source
This commit is contained in:
Bjørn Erik Pedersen
2025-08-15 13:10:27 +02:00
parent 1649f3126f
commit 87e100e61f
3 changed files with 47 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
hugolib/hugo_sites_build.go
View File

@@ -921,12 +921,14 @@ func (h *HugoSites) processPartialFileEvents(ctx context.Context, l logg.LevelLo
if err == nil {
f.Close()
}
if err != nil {
// Remove all pages and resources below.
prefix := pathInfo.Base() + "/"
prefix := paths.AddTrailingSlash(pathInfo.Base())
h.pageTrees.treePages.DeletePrefixAll(prefix)
h.pageTrees.resourceTrees.DeletePrefixAll(prefix)
changes = append(changes, identity.NewGlobIdentity(prefix+"*"))
changes = append(changes, identity.NewGlobIdentity(prefix+"**"))
}
return err != nil
})

4
hugolib/pages_capture.go
View File

@@ -192,6 +192,10 @@ func (c *pagesCollector) Collect() (collectErr error) {
return strings.HasPrefix(fim.Meta().PathInfo.Path(), paths.AddTrailingSlash(id.p.Path()))
}
if id.p.IsContentData() {
return strings.HasPrefix(fim.Meta().PathInfo.Path(), paths.AddTrailingSlash(id.p.Dir()))
}
return id.p.Dir() == fim.Meta().PathInfo.Dir()
}

39
hugolib/pagesfromdata/pagesfromgotmpl_integration_test.go
View File

@@ -308,6 +308,45 @@ func TestPagesFromGoTmplRemoveGoTmpl(t *testing.T) {
b.AssertFileContent("public/docs/index.html", "RegularPagesRecursive: pfile:/docs/pfile|$")
}
func TestPagesFromGoTmplEditOverlappingContentFile(t *testing.T) {
t.Parallel()
files := `
-- hugo.toml --
disableLiveReload = true
disableKinds = ["taxonomy", "term", "rss", "sitemap"]
-- layouts/all.html --
All: {{ .Content }}|{{ .Title }}|
-- layouts/section.html --
Title: {{ .Title}}|
RegularPages: {{ range .RegularPages }}{{ .Title }}:{{ .Path }}|{{ end }}|
-- content/mysection/_index.md --
---
title: "My Section"
---
-- content/mysection/p1.md --
---
title: "p1 content file"
---
Content of p1
-- content/_content.gotmpl --
{{ $.AddPage (dict "kind" "page" "path" "mysection/p2" "title" "p2 content adapter") }}
`
b := hugolib.TestRunning(t, files)
b.AssertFileContent("public/mysection/index.html", "Title: My Section|", "RegularPages: p1 content file:/mysection/p1|p2 content adapter:/mysection/p2|")
b.EditFileReplaceAll("content/mysection/p1.md", `"p1 content file"`, `"p1 content file edited"`).Build()
b.AssertFileContent("public/mysection/index.html", "RegularPages: p1 content file edited:/mysection/p1|p2 content adapter:/mysection/p2|")
b.EditFileReplaceAll("content/mysection/_index.md", "My Section", "My Section edited").Build()
b.AssertFileContent("public/mysection/index.html", "Title: My Section edited|", "RegularPages: p1 content file edited:/mysection/p1|p2 content adapter:/mysection/p2|")
b.RemoveFiles("content/mysection/p1.md").Build()
b.AssertFileContent("public/mysection/index.html", "Title: My Section edited|\nRegularPages: p2 content adapter:/mysection/p2|")
b.RemoveFiles("content/_content.gotmpl", "public/mysection/index.html").Build()
b.AssertFileContent("public/mysection/index.html", "Title: My Section edited|\nRegularPages: |")
}
// Issue #13443.
func TestPagesFromGoRelatedKeywords(t *testing.T) {
t.Parallel()