Refactor Permalink to private function

This will allow for reuse of this particular function.

diff --git a/hugolib/page.go b/hugolib/page.go
index e9a7d6daf423191ad12e5a886a20d462d92ab443..f35b1a5e06987461f429bc24f94868a3bb0253c3 100644 (file)
--- a/hugolib/page.go
+++ b/hugolib/page.go
@@ -207,7 +207,7 @@ func (p *Page) analyzePage() {
        p.FuzzyWordCount = int((p.WordCount+100)/100) * 100
 }
 
-func (p *Page) Permalink() (string, error) {
+func (p *Page) permalink() (*url.URL, error) {
        baseUrl := string(p.Site.BaseUrl)
        section := strings.TrimSpace(p.Section)
        pSlug := strings.TrimSpace(p.Slug)
@@ -223,7 +223,7 @@ func (p *Page) Permalink() (string, error) {
                permalink = pUrl
        } else {
                _, t := path.Split(p.FileName)
-               if p.Site.Config.UglyUrls {
+               if p.Site.Config != nil && p.Site.Config.UglyUrls {
                        x := replaceExtension(strings.TrimSpace(t), p.Extension)
                        permalink = section + "/" + x
                } else {
@@ -234,15 +234,23 @@ func (p *Page) Permalink() (string, error) {
 
        base, err := url.Parse(baseUrl)
        if err != nil {
-               return "", err
+               return nil, err
        }
 
        path, err := url.Parse(permalink)
        if err != nil {
-               return "", err
+               return nil, err
        }
 
-       return MakePermalink(base, path).String(), nil
+       return MakePermalink(base, path), nil
+}
+
+func (p *Page) Permalink() (string, error) {
+       link, err := p.permalink()
+       if err != nil {
+               return "", err
+       }
+       return link.String(), nil
 }
 
 func (page *Page) handleTomlMetaData(datum []byte) (interface{}, error) {

diff --git a/hugolib/site.go b/hugolib/site.go
index 85f0e9d901f4132c746a1ca6632b0bd107423d26..3f2f565a48337810b1e02314b87cc0c6483b30e4 100644 (file)
--- a/hugolib/site.go
+++ b/hugolib/site.go
@@ -551,14 +551,14 @@ func (s *Site) render(d interface{}, out string, layouts ...string) (err error)
        section := ""
        page, ok := d.(*Page)
        if ok {
-               section = page.Section
+               section, _ = page.Permalink()
        }
 
        fmt.Println("Section is:", section)
 
        transformer := transform.NewChain(
-               &transform.NavActive{Section: section},
                &transform.AbsURL{BaseURL: s.Config.BaseUrl},
+               &transform.NavActive{Section: section},
        )
 
        renderReader, renderWriter := io.Pipe()