Fix lazy publishing with publishResources=false - hugo - [fork] hugo port for 9front
HTML git clone git@git.drkhsh.at/hugo.git
DIR Log
DIR Files
DIR Refs
DIR Submodules
DIR README
DIR LICENSE
---
DIR commit 9bdedb251c7cd8f8af800c7d9914cf84292c5c50
DIR parent dce210ab56fc885818fc5d1a084a1c3ba84e7929
HTML Author: Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Date: Wed, 19 Feb 2020 17:37:20 +0100
Fix lazy publishing with publishResources=false
Fixes #6914
Diffstat:
M hugolib/content_map_page.go | 1 +
M hugolib/disableKinds_test.go | 30 ++++++++++++++++++++++++++++++
M hugolib/page.go | 4 +++-
3 files changed, 34 insertions(+), 1 deletion(-)
---
DIR diff --git a/hugolib/content_map_page.go b/hugolib/content_map_page.go
@@ -262,6 +262,7 @@ func (m *pageMap) newResource(fim hugofs.FileMetaInfo, owner *pageState) (resour
FileInfo: fim,
RelTargetFilename: target,
TargetBasePaths: targetBasePaths,
+ LazyPublish: !owner.m.buildConfig.PublishResources,
})
}
DIR diff --git a/hugolib/disableKinds_test.go b/hugolib/disableKinds_test.go
@@ -32,6 +32,7 @@ disableKinds = [%q]
`, disableKind)
b := newTestSitesBuilder(c)
+ b.WithTemplatesAdded("_default/single.html", `single`)
b.WithConfigFile("toml", config).WithContent("sect/page.md", `
---
title: Page
@@ -281,3 +282,32 @@ home = [ "HTML", "RSS" ]
b.Assert(b.CheckExists("public/index.xml"), qt.Equals, false)
}
+
+func TestBundleNoPublishResources(t *testing.T) {
+ b := newTestSitesBuilder(t)
+ b.WithTemplates("index.html", `
+{{ $bundle := site.GetPage "section/bundle-false" }}
+{{ $data1 := $bundle.Resources.GetMatch "data1*" }}
+Data1: {{ $data1.RelPermalink }}
+
+`)
+
+ b.WithContent("section/bundle-false/index.md", `---\ntitle: BundleFalse
+_build:
+ publishResources: false
+---`,
+ "section/bundle-false/data1.json", "Some data1",
+ "section/bundle-false/data2.json", "Some data2",
+ )
+
+ b.WithContent("section/bundle-true/index.md", `---\ntitle: BundleTrue
+---`,
+ "section/bundle-true/data3.json", "Some data 3",
+ )
+
+ b.Build(BuildCfg{})
+ b.AssertFileContent("public/index.html", `Data1: /section/bundle-false/data1.json`)
+ b.AssertFileContent("public/section/bundle-false/data1.json", `Some data1`)
+ b.Assert(b.CheckExists("public/section/bundle-false/data2.json"), qt.Equals, false)
+ b.AssertFileContent("public/section/bundle-true/data3.json", `Some data 3`)
+}
DIR diff --git a/hugolib/page.go b/hugolib/page.go
@@ -258,7 +258,9 @@ func (p *pageState) sortResources() {
return page.DefaultPageSort(p1, p2)
}
- return ri.RelPermalink() < rj.RelPermalink()
+ // Make sure not to use RelPermalink or any of the other methods that
+ // trigger lazy publishing.
+ return ri.Name() < rj.Name()
})
}