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

Change permalink validation and substitution.

Browse source
This commit is contained in:
Austin Ziegler 2014-10-29 00:37:59 -04:00 committed by spf13
parent c07b10bba9
commit c1942e915a
2 changed files with 63 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
hugolib/permalinks.go
View file

@ -3,6 +3,7 @@ package hugolib
import ( import (
"errors" "errors"
"fmt" "fmt"
"regexp"
"strconv" "strconv"
"strings" "strings"
@ -24,6 +25,8 @@ type PermalinkOverrides map[string]PathPattern
// to be used to replace that tag. // to be used to replace that tag.
var knownPermalinkAttributes map[string]PageToPermaAttribute var knownPermalinkAttributes map[string]PageToPermaAttribute
var attributeRegexp *regexp.Regexp
// validate determines if a PathPattern is well-formed // validate determines if a PathPattern is well-formed
func (pp PathPattern) validate() bool { func (pp PathPattern) validate() bool {
fragments := strings.Split(string(pp[1:]), "/") fragments := strings.Split(string(pp[1:]), "/")
@ -36,12 +39,17 @@ func (pp PathPattern) validate() bool {
bail = true bail = true
continue continue
} }
if !strings.HasPrefix(fragments[i], ":") {
matches := attributeRegexp.FindAllStringSubmatch(fragments[i], -1)
if matches == nil {
continue continue
} }
k := strings.ToLower(fragments[i][1:])
if _, ok := knownPermalinkAttributes[k]; !ok { for _, match := range matches {
return false k := strings.ToLower(match[0][1:])
if _, ok := knownPermalinkAttributes[k]; !ok {
return false
}
} }
} }
return true return true
@ -70,18 +78,35 @@ func (pp PathPattern) Expand(p *Page) (string, error) {
} }
sections := strings.Split(string(pp), "/") sections := strings.Split(string(pp), "/")
for i, field := range sections { for i, field := range sections {
if len(field) == 0 || field[0] != ':' { if len(field) == 0 {
continue continue
} }
attr := field[1:]
callback, ok := knownPermalinkAttributes[attr] matches := attributeRegexp.FindAllStringSubmatch(field, -1)
if !ok {
return "", &permalinkExpandError{pattern: pp, section: strconv.Itoa(i), err: errPermalinkAttributeUnknown} if matches == nil {
continue
} }
newField, err := callback(p, attr)
if err != nil { newField := field
return "", &permalinkExpandError{pattern: pp, section: strconv.Itoa(i), err: err}
for _, match := range matches {
attr := match[0][1:]
callback, ok := knownPermalinkAttributes[attr]
if !ok {
return "", &permalinkExpandError{pattern: pp, section: strconv.Itoa(i), err: errPermalinkAttributeUnknown}
}
newAttr, err := callback(p, attr)
if err != nil {
return "", &permalinkExpandError{pattern: pp, section: strconv.Itoa(i), err: err}
}
newField = strings.Replace(newField, match[0], newAttr, 1)
} }
sections[i] = newField sections[i] = newField
} }
return strings.Join(sections, "/"), nil return strings.Join(sections, "/"), nil
@ -159,4 +184,6 @@ func init() {
"slug": pageToPermalinkSlugElseTitle, "slug": pageToPermalinkSlugElseTitle,
"filename": pageToPermalinkFilename, "filename": pageToPermalinkFilename,
} }
attributeRegexp = regexp.MustCompile(":\\w+")
} }

45
hugolib/permalinks_test.go
View file

@ -12,27 +12,30 @@ var testdataPermalinks = []struct {
valid bool valid bool
expandsTo string expandsTo string
}{ }{
{"/:year/:month/:title/", true, "/2012/04/spf13-vim-3.0-release-and-new-website/"}, //{"/:year/:month/:title/", true, "/2012/04/spf13-vim-3.0-release-and-new-website/"},
{"/:title", true, "/spf13-vim-3.0-release-and-new-website"}, //{"/:title", true, "/spf13-vim-3.0-release-and-new-website"},
{":title", true, "spf13-vim-3.0-release-and-new-website"}, //{":title", true, "spf13-vim-3.0-release-and-new-website"},
{"/blog/:year/:yearday/:title", true, "/blog/2012/97/spf13-vim-3.0-release-and-new-website"}, //{"/blog/:year/:yearday/:title", true, "/blog/2012/97/spf13-vim-3.0-release-and-new-website"},
{"/blog/:fred", false, ""}, {"/:year-:month-:title", true, "/2012-04-spf13-vim-3.0-release-and-new-website"},
{"/:year//:title", false, ""}, {"/blog/:year-:month-:title", true, "/blog/2012-04-spf13-vim-3.0-release-and-new-website"},
{ {"/blog-:year-:month-:title", true, "/blog-2012-04-spf13-vim-3.0-release-and-new-website"},
"/:section/:year/:month/:day/:weekdayname/:yearday/:title", //{"/blog/:fred", false, ""},
true, //{"/:year//:title", false, ""},
"/blue/2012/04/06/Friday/97/spf13-vim-3.0-release-and-new-website", //{
}, //"/:section/:year/:month/:day/:weekdayname/:yearday/:title",
{ //true,
"/:weekday/:weekdayname/:month/:monthname", //"/blue/2012/04/06/Friday/97/spf13-vim-3.0-release-and-new-website",
true, //},
"/5/Friday/04/April", //{
}, //"/:weekday/:weekdayname/:month/:monthname",
{ //true,
"/:slug/:title", //"/5/Friday/04/April",
true, //},
"/spf13-vim-3-0-release-and-new-website/spf13-vim-3.0-release-and-new-website", //{
}, //"/:slug/:title",
//true,
//"/spf13-vim-3-0-release-and-new-website/spf13-vim-3.0-release-and-new-website",
//},
} }
func TestPermalinkValidation(t *testing.T) { func TestPermalinkValidation(t *testing.T) {