From: Fabrizio (Misto) Milo <mistobaan@gmail.com>
Date: Wed, 28 Aug 2013 16:33:10 +0000 (-0700)
Subject: clean up logic
X-Git-Tag: v0.9~136
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=3ab5245049a74b5d53d80a24e4bf9c60db7fce07;p=brevno-suite%2Fhugo

clean up logic

Signed-off-by: Noah Campbell <noahcampbell@gmail.com>
---

diff --git a/hugolib/page.go b/hugolib/page.go
index 2f0c866e..a888d0e6 100644
--- a/hugolib/page.go
+++ b/hugolib/page.go
@@ -185,24 +185,30 @@ func splitPageContent(data []byte, start string, end string) ([]string, []string
 }
 
 func (p *Page) Permalink() template.HTML {
-	if len(strings.TrimSpace(p.Slug)) > 0 {
+	baseUrl := string(p.Site.BaseUrl)
+	section := strings.TrimSpace(p.Section)
+	pSlug := strings.TrimSpace(p.Slug)
+	pUrl := strings.TrimSpace(p.Url)
+	var path string
+	if len(pSlug) > 0 {
 		if p.Site.Config.UglyUrls {
-			return template.HTML(MakePermalink(string(p.Site.BaseUrl), strings.TrimSpace(p.Section)+"/"+p.Slug+"."+p.Extension))
+			path = section + "/" + p.Slug + "." + p.Extension
 		} else {
-			return template.HTML(MakePermalink(string(p.Site.BaseUrl), strings.TrimSpace(p.Section)+"/"+p.Slug+"/"))
+			path = section + "/" + p.Slug + "/"
 		}
-	} else if len(strings.TrimSpace(p.Url)) > 2 {
-		return template.HTML(MakePermalink(string(p.Site.BaseUrl), strings.TrimSpace(p.Url)))
+	} else if len(pUrl) > 2 {
+		path = pUrl
 	} else {
 		_, t := filepath.Split(p.FileName)
 		if p.Site.Config.UglyUrls {
 			x := replaceExtension(strings.TrimSpace(t), p.Extension)
-			return template.HTML(MakePermalink(string(p.Site.BaseUrl), strings.TrimSpace(p.Section)+"/"+x))
+			path = section + "/" + x
 		} else {
 			file, _ := fileExt(strings.TrimSpace(t))
-			return template.HTML(MakePermalink(string(p.Site.BaseUrl), strings.TrimSpace(p.Section)+"/"+file))
+			path = section + "/" + file
 		}
 	}
+	return template.HTML(MakePermalink(baseUrl, path))
 }
 
 func (page *Page) handleTomlMetaData(datum []byte) (interface{}, error) {