github/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-11-21 20:46:30 -05:00
Code Issues Projects Releases Packages Wiki Activity

clean up logic

Browse source 
Signed-off-by: Noah Campbell <noahcampbell@gmail.com>
This commit is contained in:
Fabrizio (Misto) Milo 2013-08-28 09:33:10 -07:00 committed by Noah Campbell
parent 1bb00b8c19
commit 3ab5245049
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
hugolib/page.go
View file

@ -185,24 +185,30 @@ func splitPageContent(data []byte, start string, end string) ([]string, []string
} }
func (p *Page) Permalink() template.HTML { 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 { 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 { } 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 { } else if len(pUrl) > 2 {
return template.HTML(MakePermalink(string(p.Site.BaseUrl), strings.TrimSpace(p.Url))) path = pUrl
} else { } else {
_, t := filepath.Split(p.FileName) _, t := filepath.Split(p.FileName)
if p.Site.Config.UglyUrls { if p.Site.Config.UglyUrls {
x := replaceExtension(strings.TrimSpace(t), p.Extension) x := replaceExtension(strings.TrimSpace(t), p.Extension)
return template.HTML(MakePermalink(string(p.Site.BaseUrl), strings.TrimSpace(p.Section)+"/"+x)) path = section + "/" + x
} else { } else {
file, _ := fileExt(strings.TrimSpace(t)) 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) { func (page *Page) handleTomlMetaData(datum []byte) (interface{}, error) {