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

Fix permalink bug in uglyurls mode (refs #187).

Browse source
This commit is contained in:
Anton Ageev 2014-02-02 04:58:14 +04:00 committed by spf13
parent 3e87d7a86e
commit 72ba6d633d
2 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
hugolib/page.go
View file

@ -277,7 +277,8 @@ func (p *Page) permalink() (*url.URL, error) {
if len(pSlug) > 0 { if len(pSlug) > 0 {
if p.Site.Config != nil && p.Site.Config.UglyUrls { if p.Site.Config != nil && p.Site.Config.UglyUrls {
permalink = path.Join(dir, p.Slug, p.Extension) filename := fmt.Sprintf("%s.%s", p.Slug, p.Extension)
permalink = path.Join(dir, filename)
} else { } else {
permalink = path.Join(dir, p.Slug) + "/" permalink = path.Join(dir, p.Slug) + "/"
} }

25
hugolib/page_permalink_test.go
View file

@ -11,23 +11,34 @@ func TestPermalink(t *testing.T) {
dir string dir string
base template.URL base template.URL
slug string slug string
uglyurls bool
expectedAbs string expectedAbs string
expectedRel string expectedRel string
}{ }{
{"x/y/z/boofar.md", "x/y/z", "", "", "/x/y/z/boofar", "/x/y/z/boofar"}, {"x/y/z/boofar.md", "x/y/z", "", "", false, "/x/y/z/boofar", "/x/y/z/boofar"},
{"x/y/z/boofar.md", "x/y/z/", "", "", "/x/y/z/boofar", "/x/y/z/boofar"}, {"x/y/z/boofar.md", "x/y/z/", "", "", false, "/x/y/z/boofar", "/x/y/z/boofar"},
{"x/y/z/boofar.md", "x/y/z/", "", "boofar", "/x/y/z/boofar/", "/x/y/z/boofar/"}, {"x/y/z/boofar.md", "x/y/z/", "", "boofar", false, "/x/y/z/boofar/", "/x/y/z/boofar/"},
{"x/y/z/boofar.md", "x/y/z", "http://barnew/", "", "http://barnew/x/y/z/boofar", "/x/y/z/boofar"}, {"x/y/z/boofar.md", "x/y/z", "http://barnew/", "", false, "http://barnew/x/y/z/boofar", "/x/y/z/boofar"},
{"x/y/z/boofar.md", "x/y/z/", "http://barnew/", "boofar", "http://barnew/x/y/z/boofar/", "/x/y/z/boofar/"}, {"x/y/z/boofar.md", "x/y/z/", "http://barnew/", "boofar", false, "http://barnew/x/y/z/boofar/", "/x/y/z/boofar/"},
{"x/y/z/boofar.md", "x/y/z", "", "", true, "/x/y/z/boofar.html", "/x/y/z/boofar.html"},
{"x/y/z/boofar.md", "x/y/z/", "", "", true, "/x/y/z/boofar.html", "/x/y/z/boofar.html"},
{"x/y/z/boofar.md", "x/y/z/", "", "boofar", true, "/x/y/z/boofar.html", "/x/y/z/boofar.html"},
{"x/y/z/boofar.md", "x/y/z", "http://barnew/", "", true, "http://barnew/x/y/z/boofar.html", "/x/y/z/boofar.html"},
{"x/y/z/boofar.md", "x/y/z/", "http://barnew/", "boofar", true, "http://barnew/x/y/z/boofar.html", "/x/y/z/boofar.html"},
} }
for _, test := range tests { for _, test := range tests {
p := &Page{ p := &Page{
Node: Node{ Node: Node{
UrlPath: UrlPath{Section: "z"}, UrlPath: UrlPath{Section: "z"},
Site: SiteInfo{BaseUrl: test.base}, Site: SiteInfo{
BaseUrl: test.base,
Config: &Config{
UglyUrls: test.uglyurls,
},
},
}, },
File: File{FileName: test.file, Dir: test.dir}, File: File{FileName: test.file, Dir: test.dir, Extension: "html"},
} }
if test.slug != "" { if test.slug != "" {