github/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-11-29 00:32:07 -05:00
Code Issues Projects Releases Packages Wiki Activity

hugolib: Simplify some code

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

4
hugolib/page.go
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) {

2
hugolib/page_test.go
View file

@ -580,11 +580,9 @@ 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"

2
hugolib/pagemeta/page_frontmatter.go
View file

@ -199,7 +199,6 @@ 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 {
@ -214,7 +213,6 @@ func newFrontmatterConfig(cfg config.Provider) (frontmatterConfig, error) {
} }
} }
} }
}
expander := func(c, d []string) []string { expander := func(c, d []string) []string {
out := expandDefaultValues(c, d) out := expandDefaultValues(c, d)

2
hugolib/site_output.go
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
} }