hugolib: Some more unexports

5 files changed, 33 insertions, 34 deletions

diff --git a/hugolib/pageGroup.go b/hugolib/pageGroup.go
index 8055d0bb5..a79aa5963 100644
--- a/hugolib/pageGroup.go
+++ b/hugolib/pageGroup.go
@@ -252,7 +252,7 @@ func (p Pages) GroupByParamDate(key string, format string, order ...string) (Pag
 		pdate := func(p1, p2 *Page) bool {
 			return p1.GetParam(key).(time.Time).Unix() < p2.GetParam(key).(time.Time).Unix()
 		}
-		PageBy(pdate).Sort(r)
+		pageBy(pdate).Sort(r)
 		return r
 	}
 	formatter := func(p *Page) string {
diff --git a/hugolib/pageSort.go b/hugolib/pageSort.go
index 423975a29..7381cf9dd 100644
--- a/hugolib/pageSort.go
+++ b/hugolib/pageSort.go
@@ -23,27 +23,27 @@ var spc = newPageCache()
  * Implementation of a custom sorter for Pages
  */
 
-// A PageSorter implements the sort interface for Pages
-type PageSorter struct {
+// A pageSorter implements the sort interface for Pages
+type pageSorter struct {
 	pages Pages
-	by    PageBy
+	by    pageBy
 }
 
-// PageBy is a closure used in the Sort.Less method.
-type PageBy func(p1, p2 *Page) bool
+// pageBy is a closure used in the Sort.Less method.
+type pageBy func(p1, p2 *Page) bool
 
 // Sort stable sorts the pages given the receiver's sort order.
-func (by PageBy) Sort(pages Pages) {
-	ps := &PageSorter{
+func (by pageBy) Sort(pages Pages) {
+	ps := &pageSorter{
 		pages: pages,
 		by:    by, // The Sort method's receiver is the function (closure) that defines the sort order.
 	}
 	sort.Stable(ps)
 }
 
-// DefaultPageSort is the default sort for pages in Hugo:
+// defaultPageSort is the default sort for pages in Hugo:
 // Order by Weight, Date, LinkTitle and then full file path.
-var DefaultPageSort = func(p1, p2 *Page) bool {
+var defaultPageSort = func(p1, p2 *Page) bool {
 	if p1.Weight == p2.Weight {
 		if p1.Date.Unix() == p2.Date.Unix() {
 			if p1.LinkTitle() == p2.LinkTitle() {
@@ -56,16 +56,16 @@ var DefaultPageSort = func(p1, p2 *Page) bool {
 	return p1.Weight < p2.Weight
 }
 
-func (ps *PageSorter) Len() int      { return len(ps.pages) }
-func (ps *PageSorter) Swap(i, j int) { ps.pages[i], ps.pages[j] = ps.pages[j], ps.pages[i] }
+func (ps *pageSorter) Len() int      { return len(ps.pages) }
+func (ps *pageSorter) Swap(i, j int) { ps.pages[i], ps.pages[j] = ps.pages[j], ps.pages[i] }
 
 // Less is part of sort.Interface. It is implemented by calling the "by" closure in the sorter.
-func (ps *PageSorter) Less(i, j int) bool { return ps.by(ps.pages[i], ps.pages[j]) }
+func (ps *pageSorter) Less(i, j int) bool { return ps.by(ps.pages[i], ps.pages[j]) }
 
 // Sort sorts the pages by the default sort order defined:
 // Order by Weight, Date, LinkTitle and then full file path.
 func (p Pages) Sort() {
-	PageBy(DefaultPageSort).Sort(p)
+	pageBy(defaultPageSort).Sort(p)
 }
 
 // Limit limits the number of pages returned to n.
@@ -83,7 +83,7 @@ func (p Pages) Limit(n int) Pages {
 // This may safely be executed  in parallel.
 func (p Pages) ByWeight() Pages {
 	key := "pageSort.ByWeight"
-	pages, _ := spc.get(key, p, PageBy(DefaultPageSort).Sort)
+	pages, _ := spc.get(key, p, pageBy(defaultPageSort).Sort)
 	return pages
 }
 
@@ -100,7 +100,7 @@ func (p Pages) ByTitle() Pages {
 		return p1.Title < p2.Title
 	}
 
-	pages, _ := spc.get(key, p, PageBy(title).Sort)
+	pages, _ := spc.get(key, p, pageBy(title).Sort)
 	return pages
 }
 
@@ -117,7 +117,7 @@ func (p Pages) ByLinkTitle() Pages {
 		return p1.linkTitle < p2.linkTitle
 	}
 
-	pages, _ := spc.get(key, p, PageBy(linkTitle).Sort)
+	pages, _ := spc.get(key, p, pageBy(linkTitle).Sort)
 
 	return pages
 }
@@ -135,7 +135,7 @@ func (p Pages) ByDate() Pages {
 		return p1.Date.Unix() < p2.Date.Unix()
 	}
 
-	pages, _ := spc.get(key, p, PageBy(date).Sort)
+	pages, _ := spc.get(key, p, pageBy(date).Sort)
 
 	return pages
 }
@@ -153,7 +153,7 @@ func (p Pages) ByPublishDate() Pages {
 		return p1.PublishDate.Unix() < p2.PublishDate.Unix()
 	}
 
-	pages, _ := spc.get(key, p, PageBy(pubDate).Sort)
+	pages, _ := spc.get(key, p, pageBy(pubDate).Sort)
 
 	return pages
 }
@@ -171,7 +171,7 @@ func (p Pages) ByLength() Pages {
 		return len(p1.Content) < len(p2.Content)
 	}
 
-	pages, _ := spc.get(key, p, PageBy(length).Sort)
+	pages, _ := spc.get(key, p, pageBy(length).Sort)
 
 	return pages
 }
diff --git a/hugolib/permalinks.go b/hugolib/permalinks.go
index 9a194bd73..497fc10b2 100644
--- a/hugolib/permalinks.go
+++ b/hugolib/permalinks.go
@@ -23,25 +23,25 @@ import (
 	"github.com/spf13/hugo/helpers"
 )
 
-// PathPattern represents a string which builds up a URL from attributes
-type PathPattern string
+// pathPattern represents a string which builds up a URL from attributes
+type pathPattern string
 
-// PageToPermaAttribute is the type of a function which, given a page and a tag
+// pageToPermaAttribute is the type of a function which, given a page and a tag
 // can return a string to go in that position in the page (or an error)
-type PageToPermaAttribute func(*Page, string) (string, error)
+type pageToPermaAttribute func(*Page, string) (string, error)
 
 // PermalinkOverrides maps a section name to a PathPattern
-type PermalinkOverrides map[string]PathPattern
+type PermalinkOverrides map[string]pathPattern
 
 // knownPermalinkAttributes maps :tags in a permalink specification to a
 // function which, given a page and the tag, returns the resulting string
 // to be used to replace that tag.
-var knownPermalinkAttributes map[string]PageToPermaAttribute
+var knownPermalinkAttributes map[string]pageToPermaAttribute
 
 var attributeRegexp *regexp.Regexp
 
 // validate determines if a PathPattern is well-formed
-func (pp PathPattern) validate() bool {
+func (pp pathPattern) validate() bool {
 	fragments := strings.Split(string(pp[1:]), "/")
 	var bail = false
 	for i := range fragments {
@@ -69,7 +69,7 @@ func (pp PathPattern) validate() bool {
 }
 
 type permalinkExpandError struct {
-	pattern PathPattern
+	pattern pathPattern
 	section string
 	err     error
 }
@@ -85,7 +85,7 @@ var (
 
 // Expand on a PathPattern takes a Page and returns the fully expanded Permalink
 // or an error explaining the failure.
-func (pp PathPattern) Expand(p *Page) (string, error) {
+func (pp pathPattern) Expand(p *Page) (string, error) {
 	if !pp.validate() {
 		return "", &permalinkExpandError{pattern: pp, section: "<all>", err: errPermalinkIllFormed}
 	}
@@ -184,7 +184,7 @@ func pageToPermalinkSection(p *Page, _ string) (string, error) {
 }
 
 func init() {
-	knownPermalinkAttributes = map[string]PageToPermaAttribute{
+	knownPermalinkAttributes = map[string]pageToPermaAttribute{
 		"year":        pageToPermalinkDate,
 		"month":       pageToPermalinkDate,
 		"monthname":   pageToPermalinkDate,
diff --git a/hugolib/permalinks_test.go b/hugolib/permalinks_test.go
index daa34e8e0..672cf2d66 100644
--- a/hugolib/permalinks_test.go
+++ b/hugolib/permalinks_test.go
@@ -53,7 +53,7 @@ var testdataPermalinks = []struct {
 
 func TestPermalinkValidation(t *testing.T) {
 	for _, item := range testdataPermalinks {
-		pp := PathPattern(item.spec)
+		pp := pathPattern(item.spec)
 		have := pp.validate()
 		if have == item.valid {
 			continue
@@ -77,7 +77,7 @@ func TestPermalinkExpansion(t *testing.T) {
 		if !item.valid {
 			continue
 		}
-		pp := PathPattern(item.spec)
+		pp := pathPattern(item.spec)
 		result, err := pp.Expand(page)
 		if err != nil {
 			t.Errorf("failed to expand page: %s", err)
diff --git a/hugolib/site.go b/hugolib/site.go
index 02e1d02ea..b1c5090f9 100644
--- a/hugolib/site.go
+++ b/hugolib/site.go
@@ -447,7 +447,6 @@ func (s *Site) ReBuild(events []fsnotify.Event) error {
 	for _, ev := range events {
 		// Need to re-read source
 		if strings.HasPrefix(ev.Name, s.absContentDir()) {
-			logger.Println("Source changed", ev.Name)
 			sourceChanged = append(sourceChanged, ev)
 		}
 		if strings.HasPrefix(ev.Name, s.absLayoutDir()) || strings.HasPrefix(ev.Name, s.absThemeDir()) {
@@ -803,7 +802,7 @@ func (s *Site) initializeSiteInfo() {
 
 	permalinks := make(PermalinkOverrides)
 	for k, v := range viper.GetStringMapString("Permalinks") {
-		permalinks[k] = PathPattern(v)
+		permalinks[k] = pathPattern(v)
 	}
 
 	s.Info = SiteInfo{