commit e9c807693f3fea77674bb39fc0926f918e8250dd
parent 25994042dc44058630cea598c78a9598a29a3f80
Author: gearsix <gearsix@tuta.io>
Date: Wed, 13 Oct 2021 11:23:54 +0100
applyDefaultMeta overwrites parent default meta; added log to pagr.go
Diffstat:
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/page.go b/page.go
@@ -320,6 +320,7 @@ func (p *Page) NewContentFromFile(fpath string) (err error) {
}
func (page *Page) applyDefaults(defaultMetas map[string]Meta) {
+ initMeta := page.Meta
for i, p := range page.Path {
if p != '/' {
continue
@@ -329,9 +330,10 @@ func (page *Page) applyDefaults(defaultMetas map[string]Meta) {
path = "/"
}
if meta, ok := defaultMetas[path]; ok {
- page.Meta.MergeMeta(meta, false)
+ page.Meta.MergeMeta(meta, true)
}
}
+ page.Meta.MergeMeta(initMeta, true)
}
func (p *Page) CopyAssets(srcDir, outDir string) (err error) {
diff --git a/pagr.go b/pagr.go
@@ -78,12 +78,12 @@ func main() {
}
check(p.CopyAssets(config.Pages, config.Output))
vlog("-> %s", p.Path)
- htmlc++
- assetc += len(p.Assets)
}(page)
+ htmlc++
+ assetc += len(page.Assets)
}
+ log.Printf("generated %d html files, copying %d asset files...\n", htmlc, assetc)
wg.Wait()
- log.Printf("generated %d html files, copied %d asset files\n", htmlc, assetc)
log.Println("pagr success")
return