pagr

commit 524aef616fbb6e0f89a0a4269b83ae9987b8abb8
parent 16f40ab49236651b9710e34814cd4492f74988bf
Author: gearsix <gearsix@tuta.io>
Date:   Tue,  7 Dec 2021 16:24:47 +0000

fixed default meta overwriting regular meta

default metafiles can also be named "default.*" (not just "defaults.*"

Diffstat:
M
page.go
 | 
7
+++----

1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/page.go b/page.go
@@ -162,7 +162,8 @@ func LoadPagesDir(dir string) (p []Page, e error) {
 			if suti.IsSupportedDataLang(filepath.Ext(fpath)) > -1 {
 				var m Meta
 				if err = suti.LoadDataFilepath(fpath, &m); err == nil {
-					if strings.Contains(filepath.Base(fpath), "defaults.") {
+					if strings.Contains(filepath.Base(fpath), "defaults.") ||
+						strings.Contains(filepath.Base(fpath), "default.") {
 						if meta, ok := dmetas[path]; ok {
 							m.MergeMeta(meta, false)
 						}
@@ -325,7 +326,6 @@ 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
@@ -335,10 +335,9 @@ func (page *Page) applyDefaults(defaultMetas map[string]Meta) {
 			path = "/"
 		}
 		if meta, ok := defaultMetas[path]; ok {
-			page.Meta.MergeMeta(meta, true)
+			page.Meta.MergeMeta(meta, false)
 		}
 	}
-	page.Meta.MergeMeta(initMeta, true)
 }
 
 func (p *Page) CopyAssets(srcDir, outDir string) (err error) {