mirrors/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2025-04-28 06:30:33 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

hugolib: Fix output formats override when no outputs definition given

Browse source 
A common use case for this is to redefine the built-in output format `RSS` to give it a different URL.

Before this commit, that was not possible without also providing an `outputs` definition.

Fixes #3447
This commit is contained in:
Bjørn Erik Pedersen 2017-05-17 18:04:07 +03:00
parent 94b5be67fc
commit 6e2f2dd8d3
2 changed files with 64 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
hugolib/site_output.go
View file

@ -26,7 +26,7 @@ import (
func createSiteOutputFormats(allFormats output.Formats, cfg config.Provider) (map[string]output.Formats, error) {
if !cfg.IsSet("outputs") {
return createDefaultOutputFormats(cfg)
return createDefaultOutputFormats(allFormats, cfg)
}
outFormats := make(map[string]output.Formats)
@ -64,20 +64,22 @@ func createSiteOutputFormats(allFormats output.Formats, cfg config.Provider) (ma
}
func createDefaultOutputFormats(cfg config.Provider) (map[string]output.Formats, error) {
func createDefaultOutputFormats(allFormats output.Formats, cfg config.Provider) (map[string]output.Formats, error) {
outFormats := make(map[string]output.Formats)
rssOut, _ := allFormats.GetByName(output.RSSFormat.Name)
htmlOut, _ := allFormats.GetByName(output.HTMLFormat.Name)
for _, kind := range allKinds {
var formats output.Formats
// All have HTML
formats = append(formats, output.HTMLFormat)
formats = append(formats, htmlOut)
// All but page have RSS
if kind != KindPage {
rssType := output.RSSFormat
rssBase := cfg.GetString("rssURI")
if rssBase == "" || rssBase == "index.xml" {
rssBase = rssType.BaseName
rssBase = rssOut.BaseName
} else {
// Remove in Hugo 0.22.
helpers.Deprecated("Site config", "rssURI", "Set baseName in outputFormats.RSS", false)
@ -85,8 +87,8 @@ func createDefaultOutputFormats(cfg config.Provider) (map[string]output.Formats,
rssBase = strings.TrimSuffix(rssBase, path.Ext(rssBase))
}
rssType.BaseName = rssBase
formats = append(formats, rssType)
rssOut.BaseName = rssBase
formats = append(formats, rssOut)
}