Permalink
Browse files

Store supported config formats in a variable

  • Loading branch information...
tryzniak authored and bep committed Jan 31, 2019
1 parent c52045b commit d9282cf98a346fcf98f363d9c353e4920ca85fc7
Showing with 7 additions and 4 deletions.
  1. +1 −2 commands/commands.go
  2. +4 −0 config/configLoader.go
  3. +1 −1 hugolib/config.go
  4. +1 −1 hugolib/paths/themes.go
@@ -167,8 +167,7 @@ Complete documentation is available at http://gohugo.io/.`,
cc.cmd.PersistentFlags().BoolVar(&cc.quiet, "quiet", false, "build in quiet mode")

// Set bash-completion
validConfigFilenames := []string{"json", "js", "yaml", "yml", "toml", "tml"}
_ = cc.cmd.PersistentFlags().SetAnnotation("config", cobra.BashCompFilenameExt, validConfigFilenames)
_ = cc.cmd.PersistentFlags().SetAnnotation("config", cobra.BashCompFilenameExt, config.ValidConfigFileExtensions)

cc.cmd.PersistentFlags().BoolVarP(&cc.verbose, "verbose", "v", false, "verbose output")
cc.cmd.PersistentFlags().BoolVarP(&cc.debug, "debug", "", false, "debug output")
@@ -20,6 +20,10 @@ import (
"github.com/spf13/viper"
)

var (
ValidConfigFileExtensions = []string{"toml", "yaml", "yml", "json"}
)

// FromConfigString creates a config from the given YAML, JSON or TOML config. This is useful in tests.
func FromConfigString(config, configType string) (Provider, error) {
v := newViper()
@@ -202,7 +202,7 @@ func (l configLoader) loadConfig(configName string, v *viper.Viper) (string, err
filename = baseFilename
}
} else {
for _, ext := range []string{"toml", "yaml", "yml", "json"} {
for _, ext := range config.ValidConfigFileExtensions {
filenameToCheck := baseFilename + "." + ext
exists, _ := helpers.Exists(filenameToCheck, l.Fs)
if exists {
@@ -120,7 +120,7 @@ func (c *themesCollector) getConfigFileIfProvided(theme string) string {
)

// Viper supports more, but this is the sub-set supported by Hugo.
for _, configFormats := range []string{"toml", "yaml", "yml", "json"} {
for _, configFormats := range config.ValidConfigFileExtensions {
configFilename = filepath.Join(configDir, "config."+configFormats)
exists, _ = afero.Exists(c.fs, configFilename)
if exists {

0 comments on commit d9282cf

Please sign in to comment.