Make site.BaseURL and $pager.URL a string - hugo - [fork] hugo port for 9front
HTML git clone git@git.drkhsh.at/hugo.git
DIR Log
DIR Files
DIR Refs
DIR Submodules
DIR README
DIR LICENSE
---
DIR commit b6a7568131422a2aee1904d48ca4a0a87d8190b8
DIR parent acf01bfb7842c52aab4af8fe599b6b3662b7b3e6
HTML Author: Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Date: Mon, 30 Oct 2023 09:07:03 +0100
Make site.BaseURL and $pager.URL a string
Was template.URL.
Diffstat:
M hugolib/site_new.go | 4 ++--
M resources/page/pagination.go | 5 ++---
M resources/page/pagination_test.go | 5 ++---
M resources/page/site.go | 8 +++++---
4 files changed, 11 insertions(+), 11 deletions(-)
---
DIR diff --git a/hugolib/site_new.go b/hugolib/site_new.go
@@ -417,8 +417,8 @@ func (s *Site) Hugo() hugo.HugoInfo {
}
// Returns the BaseURL for this Site.
-func (s *Site) BaseURL() template.URL {
- return template.URL(s.conf.C.BaseURL.WithPath)
+func (s *Site) BaseURL() string {
+ return s.conf.C.BaseURL.WithPath
}
// Returns the last modification date of the content.
DIR diff --git a/resources/page/pagination.go b/resources/page/pagination.go
@@ -16,7 +16,6 @@ package page
import (
"errors"
"fmt"
- "html/template"
"math"
"reflect"
@@ -71,8 +70,8 @@ func (p *Pager) PageNumber() int {
}
// URL returns the URL to the current page.
-func (p *Pager) URL() template.HTML {
- return template.HTML(p.paginationURLFactory(p.PageNumber()))
+func (p *Pager) URL() string {
+ return p.paginationURLFactory(p.PageNumber())
}
// Pages returns the Pages on this page.
DIR diff --git a/resources/page/pagination_test.go b/resources/page/pagination_test.go
@@ -16,7 +16,6 @@ package page
import (
"context"
"fmt"
- "html/template"
"testing"
qt "github.com/frankban/quicktest"
@@ -119,7 +118,7 @@ func doTestPages(t *testing.T, paginator *Paginator) {
c.Assert(paginator.TotalPages(), qt.Equals, 5)
first := paginatorPages[0]
- c.Assert(first.URL(), qt.Equals, template.HTML("page/1/"))
+ c.Assert(first.URL(), qt.Equals, "page/1/")
c.Assert(first.First(), qt.Equals, first)
c.Assert(first.HasNext(), qt.Equals, true)
c.Assert(first.Next(), qt.Equals, paginatorPages[1])
@@ -134,7 +133,7 @@ func doTestPages(t *testing.T, paginator *Paginator) {
c.Assert(third.Prev(), qt.Equals, paginatorPages[1])
last := paginatorPages[4]
- c.Assert(last.URL(), qt.Equals, template.HTML("page/5/"))
+ c.Assert(last.URL(), qt.Equals, "page/5/")
c.Assert(last.Last(), qt.Equals, last)
c.Assert(last.HasNext(), qt.Equals, false)
c.Assert(last.Next(), qt.IsNil)
DIR diff --git a/resources/page/site.go b/resources/page/site.go
@@ -82,7 +82,7 @@ type Site interface {
Hugo() hugo.HugoInfo
// Returns the BaseURL for this Site.
- BaseURL() template.URL
+ BaseURL() string
// Returns a taxonomy map.
Taxonomies() TaxonomyList
@@ -172,6 +172,7 @@ func (s *siteWrapper) Social() map[string]string {
func (s *siteWrapper) Author() map[string]interface{} {
return s.s.Author()
}
+
func (s *siteWrapper) Authors() AuthorList {
return AuthorList{}
}
@@ -250,7 +251,7 @@ func (s *siteWrapper) Hugo() hugo.HugoInfo {
return s.s.Hugo()
}
-func (s *siteWrapper) BaseURL() template.URL {
+func (s *siteWrapper) BaseURL() string {
return s.s.BaseURL()
}
@@ -319,6 +320,7 @@ type testSite struct {
func (s testSite) Author() map[string]interface{} {
return nil
}
+
func (s testSite) Authors() AuthorList {
return AuthorList{}
}
@@ -421,7 +423,7 @@ func (t testSite) Taxonomies() TaxonomyList {
return nil
}
-func (t testSite) BaseURL() template.URL {
+func (t testSite) BaseURL() string {
return ""
}