More work

gohugoio · Apr 20, 2023 · 3e39d23 · 3e39d23
1 parent 8f55893
commit 3e39d23
Show file tree

Hide file tree

Showing 33 changed files with 143 additions and 1,452 deletions.
diff --git a/commands/commandeer.go b/commands/commandeer.go
@@ -330,7 +330,7 @@ func (c *commandeer) loadConfig() error {
 	if configPath == "" {
 		configPath = dir
 	}
-	res, err := hugolib.LoadConfigNew(
+	res, err := hugolib.LoadConfig(
 		hugolib.ConfigSourceDescriptor{
 			Flags:        c.Cfg,
 			Fs:           sourceFs,

diff --git a/common/urls/baseURL.go b/common/urls/baseURL.go
@@ -75,7 +75,7 @@ func (b BaseURL) URL() *url.URL {
 	return &c
 }
 
-func newBaseURLFromString(b string) (BaseURL, error) {
+func NewBaseURLFromString(b string) (BaseURL, error) {
 	var result BaseURL
 
 	base, err := url.Parse(b)

diff --git a/common/urls/baseURL_test.go b/common/urls/baseURL_test.go
@@ -21,7 +21,7 @@ import (
 
 func TestBaseURL(t *testing.T) {
 	c := qt.New(t)
-	b, err := newBaseURLFromString("http://example.com")
+	b, err := NewBaseURLFromString("http://example.com")
 	c.Assert(err, qt.IsNil)
 	c.Assert(b.String(), qt.Equals, "http://example.com")
 
@@ -36,7 +36,7 @@ func TestBaseURL(t *testing.T) {
 	_, err = b.WithProtocol("mailto:")
 	c.Assert(err, qt.Not(qt.IsNil))
 
-	b, err = newBaseURLFromString("mailto:hugo@rules.com")
+	b, err = NewBaseURLFromString("mailto:hugo@rules.com")
 	c.Assert(err, qt.IsNil)
 	c.Assert(b.String(), qt.Equals, "mailto:hugo@rules.com")
 
@@ -51,16 +51,16 @@ func TestBaseURL(t *testing.T) {
 
 	// Test with "non-URLs". Some people will try to use these as a way to get
 	// relative URLs working etc.
-	b, err = newBaseURLFromString("/")
+	b, err = NewBaseURLFromString("/")
 	c.Assert(err, qt.IsNil)
 	c.Assert(b.String(), qt.Equals, "/")
 
-	b, err = newBaseURLFromString("")
+	b, err = NewBaseURLFromString("")
 	c.Assert(err, qt.IsNil)
 	c.Assert(b.String(), qt.Equals, "")
 
 	// BaseURL with sub path
-	b, err = newBaseURLFromString("http://example.com/sub")
+	b, err = NewBaseURLFromString("http://example.com/sub")
 	c.Assert(err, qt.IsNil)
 	c.Assert(b.String(), qt.Equals, "http://example.com/sub")
 	c.Assert(b.HostURL(), qt.Equals, "http://example.com")

diff --git a/config/allconfig/allconfig.go b/config/allconfig/allconfig.go
@@ -24,12 +24,12 @@ import (
 	"github.com/gohugoio/hugo/cache/filecache"
 	"github.com/gohugoio/hugo/common/maps"
 	"github.com/gohugoio/hugo/common/types"
+	"github.com/gohugoio/hugo/common/urls"
 	"github.com/gohugoio/hugo/config"
 	"github.com/gohugoio/hugo/config/privacy"
 	"github.com/gohugoio/hugo/config/security"
 	"github.com/gohugoio/hugo/config/services"
 	"github.com/gohugoio/hugo/helpers"
-	"github.com/gohugoio/hugo/hugolib/paths"
 	"github.com/gohugoio/hugo/langs"
 	"github.com/gohugoio/hugo/markup/markup_config"
 	"github.com/gohugoio/hugo/media"
@@ -163,8 +163,14 @@ func (c *Config) Compile() error {
 		disabledLangs[lang] = true
 	}
 
+	baseURL, err := urls.NewBaseURLFromString(c.BaseURL)
+	if err != nil {
+		return err
+	}
+
 	c.C = ConfigCompiled{
 		Timeout:           timeout,
+		BaseURL:           baseURL,
 		DisabledKinds:     disabledKinds,
 		DisabledLanguages: disabledLangs,
 		KindOutputFormats: kindOutputFormats,
@@ -185,7 +191,7 @@ func (c Config) IsLangDisabled(lang string) bool {
 // ConfigCompiled holds values and functions that are derived from the config.
 type ConfigCompiled struct {
 	Timeout           time.Duration
-	BaseURL           paths.BaseURL
+	BaseURL           urls.BaseURL
 	KindOutputFormats map[string]output.Formats
 	DisabledKinds     map[string]bool
 	DisabledLanguages map[string]bool
@@ -333,6 +339,10 @@ type RootConfig struct {
 	// It defaults to AP Stylebook for title casing, but you can also set it to Chicago or Go (every word starts with a capital letter).
 	TitleCaseStyle string
 
+	// TODO1 doc these. Move?
+	Watch             bool
+	DisableLiveReload bool
+
 	// The odd constructs below are kept for backwards compatibility.
 	// Deprecated: Use module mount config instead.
 	// TODO1 handle strings.
@@ -580,6 +590,9 @@ func decodeConfigFromParams(fs afero.Fs, bcfg config.BaseConfig, cfg maps.Params
 		},
 		"params": func() error {
 			all.Params = cfg.GetStringMap("params")
+			if all.Params == nil {
+				all.Params = make(map[string]interface{})
+			}
 			return nil
 		},
 		"permalinks": func() error {

diff --git a/config/compositeConfig.go b/config/compositeConfig.go
diff --git a/config/compositeConfig_test.go b/config/compositeConfig_test.go
diff --git a/helpers/content_test.go b/helpers/content_test.go
@@ -19,11 +19,6 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/spf13/afero"
-
-	"github.com/gohugoio/hugo/common/loggers"
-	"github.com/gohugoio/hugo/config"
-
 	qt "github.com/frankban/quicktest"
 )
 
@@ -63,24 +58,6 @@ func TestBytesToHTML(t *testing.T) {
 	c.Assert(BytesToHTML([]byte("dobedobedo")), qt.Equals, template.HTML("dobedobedo"))
 }
 
-func TestNewContentSpec(t *testing.T) {
-	cfg := config.NewWithTestDefaults()
-	c := qt.New(t)
-
-	cfg.Set("summaryLength", 32)
-	cfg.Set("buildFuture", true)
-	cfg.Set("buildExpired", true)
-	cfg.Set("buildDrafts", true)
-
-	spec, err := NewContentSpec(cfg, loggers.NewErrorLogger(), afero.NewMemMapFs(), nil)
-
-	c.Assert(err, qt.IsNil)
-	c.Assert(spec.summaryLength, qt.Equals, 32)
-	c.Assert(spec.BuildFuture, qt.Equals, true)
-	c.Assert(spec.BuildExpired, qt.Equals, true)
-	c.Assert(spec.BuildDrafts, qt.Equals, true)
-}
-
 var benchmarkTruncateString = strings.Repeat("This is a sentence about nothing.", 20)
 
 func BenchmarkTestTruncateWordsToWholeSentence(b *testing.B) {

diff --git a/helpers/pathspec.go b/helpers/pathspec.go
@@ -69,7 +69,7 @@ func NewPathSpecWithBaseBaseFsProvided(fs *hugofs.Fs, cfg config.AllProvider, lo
 		ProcessingStats: NewProcessingStats(p.Lang()),
 	}
 
-	basePath := ps.BaseURL.Path()
+	basePath := cfg.BaseURL().Path()
 	if basePath != "" && basePath != "/" {
 		ps.BasePath = basePath
 	}