diff options
| author | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2023-01-04 18:24:36 +0100 |
|---|---|---|
| committer | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2023-05-16 18:01:29 +0200 |
| commit | 241b21b0fd34d91fccb2ce69874110dceae6f926 (patch) | |
| tree | d4e0118eac7e9c42f065815447a70805f8d6ad3e /resources/page/page_paths.go | |
| parent | 6aededf6b42011c3039f5f66487a89a8dd65e0e7 (diff) | |
Create a struct with all of Hugo's config options
Primary motivation is documentation, but it will also hopefully simplify the code.
Also,
* Lower case the default output format names; this is in line with the custom ones (map keys) and how
it's treated all the places. This avoids doing `stringds.EqualFold` everywhere.
Closes #10896
Closes #10620
Diffstat (limited to 'resources/page/page_paths.go')
| -rw-r--r-- | resources/page/page_paths.go | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/resources/page/page_paths.go b/resources/page/page_paths.go index 8c718fd77..0ed758ca1 100644 --- a/resources/page/page_paths.go +++ b/resources/page/page_paths.go @@ -18,6 +18,7 @@ import ( "path/filepath" "strings" + "github.com/gohugoio/hugo/common/urls" "github.com/gohugoio/hugo/helpers" "github.com/gohugoio/hugo/output" ) @@ -91,18 +92,18 @@ func (p TargetPaths) RelPermalink(s *helpers.PathSpec) string { } func (p TargetPaths) PermalinkForOutputFormat(s *helpers.PathSpec, f output.Format) string { - var baseURL string + var baseURL urls.BaseURL var err error if f.Protocol != "" { - baseURL, err = s.BaseURL.WithProtocol(f.Protocol) + baseURL, err = s.Cfg.BaseURL().WithProtocol(f.Protocol) if err != nil { return "" } } else { - baseURL = s.BaseURL.String() + baseURL = s.Cfg.BaseURL() } - - return s.PermalinkForBaseURL(p.Link, baseURL) + baseURLstr := baseURL.String() + return s.PermalinkForBaseURL(p.Link, baseURLstr) } func isHtmlIndex(s string) bool { |