hugolib: Simplify some code

This commit is contained in:
Cameron Moore 2018-08-28 15:51:44 -05:00 committed by Bjørn Erik Pedersen
parent 0665a3951b
commit e38e881248
4 changed files with 15 additions and 21 deletions

View file

@ -1440,9 +1440,7 @@ func (p *Page) update(frontmatter map[string]interface{}) error {
resources = append(resources, cast.ToStringMap(vvv)) resources = append(resources, cast.ToStringMap(vvv))
} }
case []map[string]interface{}: case []map[string]interface{}:
for _, vvv := range vv { resources = append(resources, vv...)
resources = append(resources, vvv)
}
case []interface{}: case []interface{}:
for _, vvv := range vv { for _, vvv := range vv {
switch vvvv := vvv.(type) { switch vvvv := vvv.(type) {

View file

@ -580,10 +580,8 @@ func testAllMarkdownEnginesForPages(t *testing.T,
cfg, fs := newTestCfg() cfg, fs := newTestCfg()
if settings != nil { for k, v := range settings {
for k, v := range settings { cfg.Set(k, v)
cfg.Set(k, v)
}
} }
contentDir := "content" contentDir := "content"

View file

@ -199,19 +199,17 @@ func newFrontmatterConfig(cfg config.Provider) (frontmatterConfig, error) {
if cfg.IsSet("frontmatter") { if cfg.IsSet("frontmatter") {
fm := cfg.GetStringMap("frontmatter") fm := cfg.GetStringMap("frontmatter")
if fm != nil { for k, v := range fm {
for k, v := range fm { loki := strings.ToLower(k)
loki := strings.ToLower(k) switch loki {
switch loki { case fmDate:
case fmDate: c.date = toLowerSlice(v)
c.date = toLowerSlice(v) case fmPubDate:
case fmPubDate: c.publishDate = toLowerSlice(v)
c.publishDate = toLowerSlice(v) case fmLastmod:
case fmLastmod: c.lastmod = toLowerSlice(v)
c.lastmod = toLowerSlice(v) case fmExpiryDate:
case fmExpiryDate: c.expiryDate = toLowerSlice(v)
c.expiryDate = toLowerSlice(v)
}
} }
} }
} }

View file

@ -70,7 +70,7 @@ func createSiteOutputFormats(allFormats output.Formats, cfg config.Provider) (ma
outputs := cfg.GetStringMap("outputs") outputs := cfg.GetStringMap("outputs")
if outputs == nil || len(outputs) == 0 { if len(outputs) == 0 {
return outFormats, nil return outFormats, nil
} }