pagr

A 'static site generator', built using dati.
Log | Files | Refs | Atom

commit 9a49380fe4b9788550ae1f0f86346b5b240ea97e
parent dfc8433ca41bef9f0cf0d29a0a996b762fb250d8
Author: gearsix <gearsix@tuta.io>
Date:   Wed, 30 Mar 2022 17:31:21 +0100

changed expected filenames; renamed DefaultTemplateName (again)

Meta files are now treated as Asset files if not named "defaults" or
"meta". This is to enforce a better standard file naming scheme
throughout projects and make them less confusing to parse and to make
it easier to document how to build a project.

I decided "default" was a better default DefaultTemplateName than
"_root".

Diffstat:
Mconfig.go | 2+-
Mcontent.go | 22+++++++++++-----------
2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/config.go b/config.go @@ -39,7 +39,7 @@ func NewConfig() Config { Templates: "./templates", Assets: []string{"./assets"}, Output: "./out", - DefaultTemplate: "_root", + DefaultTemplate: "default", } } diff --git a/content.go b/content.go @@ -40,7 +40,7 @@ func isContentExt(ext string) int { return -1 } -// FIX this seems to kill performance +// FIX kills performance on windows func gitModTime(fpath string) (mod time.Time, err error) { if gitBin == "" { err = fmt.Errorf("git binary not found") @@ -147,26 +147,26 @@ func LoadContentDir(dir string) (p []Page, e error) { return } -func loadContentFile(p Page, d map[string]Meta, fpath string, ppath string) ( -Page, map[string]Meta, error) { +func loadContentFile(p Page, defs map[string]Meta, fpath string, ppath string) (Page, map[string]Meta, error) { var err error - if suti.IsSupportedDataLang(filepath.Ext(fpath)) > -1 { - fname := strings.TrimSuffix(filepath.Base(fpath), filepath.Ext(fpath)) - + fname := strings.TrimSuffix(filepath.Base(fpath), filepath.Ext(fpath)) + + if suti.IsSupportedDataLang(filepath.Ext(fpath)) != -1 && + (fname == "defaults" || fname == "meta") { var m Meta if err = suti.LoadDataFilepath(fpath, &m); err == nil { - if fname == "defaults" { + if fname == "defaults" || fname == "default" { if meta, ok := d[ppath]; ok { m.MergeMeta(meta, false) + defs[ppath] = m } - d[ppath] = m - } else { + } else if fname == "meta" { p.Meta.MergeMeta(m, true) } } - } else if isContentExt(filepath.Ext(fpath)) > -1 { + } else if isContentExt(filepath.Ext(fpath)) != -1 { err = p.NewContentFromFile(fpath) - } else if suti.IsSupportedDataLang(filepath.Ext(fpath)) == -1 { + } else { a := filepath.Join(ppath, filepath.Base(fpath)) p.Assets = append(p.Assets, a) }