mirror/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2025-08-26 22:04:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Refactor layout resolve to a descriptor/adapter pattern

Browse Source
This commit is contained in:
Bjørn Erik Pedersen
2017-03-16 08:58:50 +01:00
parent 4c2abe0015
commit ad8cea87f3
5 changed files with 44 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
output/layout.go
View File

@@ -19,12 +19,13 @@ import (
"strings"
)
// LayoutIdentifier is used to pick the correct layout for a piece of content.
type LayoutIdentifier interface {
PageType() string
PageSection() string // TODO(bep) name
PageKind() string
PageLayout() string
// LayoutDescriptor describes how a layout should be chosen. This is
// typically built from a Page.
type LayoutDescriptor struct {
Type string
Section string
Kind string
Layout string
}
// Layout calculates the layout template to use to render a given output type.
@@ -60,27 +61,27 @@ indexes/indexes.NAME.SUFFIX indexes/indexes.SUFFIX
`
)
func (l *LayoutHandler) For(id LayoutIdentifier, layoutOverride string, f Format) []string {
func (l *LayoutHandler) For(d LayoutDescriptor, layoutOverride string, f Format) []string {
var layouts []string
layout := id.PageLayout()
layout := d.Layout
if layoutOverride != "" {
layout = layoutOverride
}
switch id.PageKind() {
switch d.Kind {
// TODO(bep) move the Kind constants some common place.
case "home":
layouts = resolveTemplate(layoutsHome, id, f)
layouts = resolveTemplate(layoutsHome, d, f)
case "section":
layouts = resolveTemplate(layoutsSection, id, f)
layouts = resolveTemplate(layoutsSection, d, f)
case "taxonomy":
layouts = resolveTemplate(layoutTaxonomy, id, f)
layouts = resolveTemplate(layoutTaxonomy, d, f)
case "taxonomyTerm":
layouts = resolveTemplate(layoutTaxonomyTerm, id, f)
layouts = resolveTemplate(layoutTaxonomyTerm, d, f)
case "page":
layouts = regularPageLayouts(id.PageType(), layout, f)
layouts = regularPageLayouts(d.Type, layout, f)
}
if l.hasTheme {
@@ -112,11 +113,11 @@ func (l *LayoutHandler) For(id LayoutIdentifier, layoutOverride string, f Format
return layouts
}
func resolveTemplate(templ string, id LayoutIdentifier, f Format) []string {
func resolveTemplate(templ string, d LayoutDescriptor, f Format) []string {
return strings.Fields(replaceKeyValues(templ,
"SUFFIX", f.MediaType.Suffix,
"NAME", strings.ToLower(f.Name),
"SECTION", id.PageSection()))
"SECTION", d.Section))
}
func replaceKeyValues(s string, oldNew ...string) string {