permalink now respects pretty urls - 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 92c31bbe10a68bb29c62535f5a7a6b4bfc80a21d
DIR parent d5f55430615265f18b8d50d215c536a14c21a7b4
HTML Author: spf13 <steve.francia@gmail.com>
Date: Fri, 26 Jul 2013 09:51:07 -0400
permalink now respects pretty urls
Diffstat:
M hugolib/page.go | 15 ++++++++++++---
M hugolib/site.go | 3 ++-
2 files changed, 14 insertions(+), 4 deletions(-)
---
DIR diff --git a/hugolib/page.go b/hugolib/page.go
@@ -228,13 +228,22 @@ func splitPageContent(data []byte, start string, end string) ([]string, []string
func (p *Page) Permalink() template.HTML {
if len(strings.TrimSpace(p.Slug)) > 0 {
- return template.HTML(MakePermalink(string(p.Site.BaseUrl), strings.TrimSpace(p.Section)+"/"+p.Slug))
+ if p.Site.Config.UglyUrls {
+ return template.HTML(MakePermalink(string(p.Site.BaseUrl), strings.TrimSpace(p.Section)+"/"+p.Slug+"."+p.Extension))
+ } else {
+ return template.HTML(MakePermalink(string(p.Site.BaseUrl), strings.TrimSpace(p.Section)+"/"+p.Slug))
+ }
} else if len(strings.TrimSpace(p.Url)) > 2 {
return template.HTML(MakePermalink(string(p.Site.BaseUrl), strings.TrimSpace(p.Url)))
} else {
_, t := filepath.Split(p.FileName)
- x := replaceExtension(strings.TrimSpace(t), p.Extension)
- return template.HTML(MakePermalink(string(p.Site.BaseUrl), strings.TrimSpace(p.Section)+"/"+x))
+ 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))
+ } else {
+ file, _ := fileExt(strings.TrimSpace(t))
+ return template.HTML(MakePermalink(string(p.Site.BaseUrl), strings.TrimSpace(p.Section)+"/"+file))
+ }
}
}
DIR diff --git a/hugolib/site.go b/hugolib/site.go
@@ -48,6 +48,7 @@ type SiteInfo struct {
Recent *Pages
LastChange time.Time
Title string
+ Config *Config
}
func (s *Site) getFromIndex(kind string, name string) Pages {
@@ -166,7 +167,7 @@ func (s *Site) initialize() {
filepath.Walk(s.c.GetAbsPath(s.c.SourceDir), walker)
- s.Info = SiteInfo{BaseUrl: template.URL(s.c.BaseUrl), Title: s.c.Title}
+ s.Info = SiteInfo{BaseUrl: template.URL(s.c.BaseUrl), Title: s.c.Title, Config: &s.c}
s.Shortcodes = make(map[string]ShortcodeFunc)
}