phoenix/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-07-05 08:42:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix UTF8 permalink

Browse source 
Generate unencoded directory in public dir.

Fixes #988
This commit is contained in:
Takuya Wakisaka 2015-04-10 01:14:26 +09:00 committed by bep
parent 8a96234b1f
commit 2890b6db36
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
hugolib/page.go
View file

@ -347,8 +347,8 @@ func (p *Page) analyzePage() {
func (p *Page) permalink() (*url.URL, error) { func (p *Page) permalink() (*url.URL, error) {
baseURL := string(p.Site.BaseURL) baseURL := string(p.Site.BaseURL)
dir := strings.TrimSpace(filepath.ToSlash(p.Source.Dir())) dir := strings.TrimSpace(filepath.ToSlash(p.Source.Dir()))
pSlug := strings.TrimSpace(p.Slug) pSlug := strings.TrimSpace(helpers.URLize(p.Slug))
pURL := strings.TrimSpace(p.URL) pURL := strings.TrimSpace(helpers.URLize(p.URL))
var permalink string var permalink string
var err error var err error
@ -456,12 +456,12 @@ func (p *Page) update(f interface{}) error {
case "description": case "description":
p.Description = cast.ToString(v) p.Description = cast.ToString(v)
case "slug": case "slug":
p.Slug = helpers.URLize(cast.ToString(v)) p.Slug = cast.ToString(v)
case "url": case "url":
if url := cast.ToString(v); strings.HasPrefix(url, "http://") || strings.HasPrefix(url, "https://") { if url := cast.ToString(v); strings.HasPrefix(url, "http://") || strings.HasPrefix(url, "https://") {
return fmt.Errorf("Only relative URLs are supported, %v provided", url) return fmt.Errorf("Only relative URLs are supported, %v provided", url)
} }
p.URL = helpers.URLize(cast.ToString(v)) p.URL = cast.ToString(v)
case "type": case "type":
p.contentType = cast.ToString(v) p.contentType = cast.ToString(v)
case "extension", "ext": case "extension", "ext":
@ -821,6 +821,7 @@ func (p *Page) TargetPath() (outfile string) {
var err error var err error
outfile, err = override.Expand(p) outfile, err = override.Expand(p)
if err == nil { if err == nil {
outfile, _ = url.QueryUnescape(outfile)
if strings.HasSuffix(outfile, "/") { if strings.HasSuffix(outfile, "/") {
outfile += "index.html" outfile += "index.html"
} }

2
hugolib/permalinks.go
View file

@ -160,7 +160,7 @@ func pageToPermalinkSlugElseTitle(p *Page, a string) (string, error) {
if strings.HasSuffix(p.Slug, "-") { if strings.HasSuffix(p.Slug, "-") {
p.Slug = p.Slug[0 : len(p.Slug)-1] p.Slug = p.Slug[0 : len(p.Slug)-1]
} }
return p.Slug, nil return helpers.URLize(p.Slug), nil
} }
return pageToPermalinkTitle(p, a) return pageToPermalinkTitle(p, a)
} }