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

hugolib: Revise paginator alias path handling

Browse source
This commit is contained in:
Bjørn Erik Pedersen 2017-03-25 19:21:19 +01:00
parent b7ed67d425
commit 24c1770288
2 changed files with 8 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
helpers/path.go
View file

@ -358,23 +358,6 @@ func GetRelativePath(path, base string) (final string, err error) {
return name, nil
}
// PaginateAliasPath creates a path used to access the aliases in the paginator.
func (p *PathSpec) PaginateAliasPath(base string, page int) string {
paginatePath := p.paginatePath
uglify := p.uglyURLs
var pth string
if base != "" {
pth = filepath.FromSlash(fmt.Sprintf("/%s/%s/%d", base, paginatePath, page))
} else {
pth = filepath.FromSlash(fmt.Sprintf("/%s/%d", paginatePath, page))
}
if uglify {
pth += ".html"
}
return pth
}
// GuessSection returns the section given a source path.
// A section is the part between the root slash and the second slash
// or before the first slash.

13
hugolib/site_render.go
View file

@ -122,12 +122,15 @@ func (s *Site) renderPaginator(p *PageOutput) error {
paginatePath := s.Cfg.GetString("paginatePath")
// write alias for page 1
// TODO(bep) ml all of these n.addLang ... fix.
//TODO(bep) output fix
addend := fmt.Sprintf("/%s/%d", paginatePath, 1)
target, err := p.createTargetPath(p.outputFormat, addend)
if err != nil {
return err
}
aliasPath := p.addLangPathPrefix(s.PathSpec.PaginateAliasPath(path.Join(p.sections...), 1))
link := p.Permalink()
s.writeDestAlias(aliasPath, link, nil)
// TODO(bep) output do better
link := newOutputFormat(p.Page, p.outputFormat).Permalink()
s.writeDestAlias(target, link, nil)
pagers := p.paginator.Pagers()