From 93aad3c543828efca2adeb7f96cf50ae29878593 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?= Date: Fri, 18 Jun 2021 10:27:27 +0200 Subject: Split out the puthe path/filepath functions into common/paths So they can be used from the config package without cyclic troubles. Updates #8654 --- hugolib/config.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'hugolib/config.go') diff --git a/hugolib/config.go b/hugolib/config.go index deba8abe6..091827660 100644 --- a/hugolib/config.go +++ b/hugolib/config.go @@ -21,6 +21,7 @@ import ( "github.com/gohugoio/hugo/common/types" "github.com/gohugoio/hugo/common/maps" + cpaths "github.com/gohugoio/hugo/common/paths" "github.com/gobwas/glob" hglob "github.com/gohugoio/hugo/hugofs/glob" @@ -436,7 +437,7 @@ func (l configLoader) loadConfig(configName string) (string, error) { } var filename string - if helpers.ExtNoDelimiter(configName) != "" { + if cpaths.ExtNoDelimiter(configName) != "" { exists, _ := helpers.Exists(baseFilename, l.Fs) if exists { filename = baseFilename @@ -509,7 +510,7 @@ func (l configLoader) loadConfigFromConfigDir() ([]string, error) { return nil } - name := helpers.Filename(filepath.Base(path)) + name := cpaths.Filename(filepath.Base(path)) item, err := metadecoders.Default.UnmarshalFileToMap(sourceFs, path) if err != nil { @@ -520,7 +521,7 @@ func (l configLoader) loadConfigFromConfigDir() ([]string, error) { if name != "config" { // Can be params.jp, menus.en etc. - name, lang := helpers.FileAndExtNoDelimiter(name) + name, lang := cpaths.FileAndExtNoDelimiter(name) keyPath = []string{name} -- cgit v1.2.3