mirror/gohugoio-hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-05-11 05:54:58 +00:00
Code Issues Releases Activity

Big refactor of how source files are used. Also added default destination extension option.

Browse Source
This commit is contained in:
spf13
2014-10-16 20:20:09 -04:00
parent 24bbfe7d32
commit 5dfc1dedb8
24 changed files with 646 additions and 465 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
hugolib/permalinks.go
View File

@@ -3,7 +3,6 @@ package hugolib
import (
"errors"
"fmt"
"path/filepath"
"strconv"
"strings"
@@ -120,9 +119,9 @@ func pageToPermalinkTitle(p *Page, _ string) (string, error) {
// pageToPermalinkFilename returns the URL-safe form of the filename
func pageToPermalinkFilename(p *Page, _ string) (string, error) {
var extension = filepath.Ext(p.FileName)
var name = p.FileName[0 : len(p.FileName)-len(extension)]
return helpers.Urlize(name), nil
//var extension = p.Source.Ext
//var name = p.Source.Path()[0 : len(p.Source.Path())-len(extension)]
return helpers.Urlize(p.Source.BaseFileName()), nil
}
// if the page has a slug, return the slug, else return the title
@@ -143,7 +142,7 @@ func pageToPermalinkSlugElseTitle(p *Page, a string) (string, error) {
func pageToPermalinkSection(p *Page, _ string) (string, error) {
// Page contains Node contains UrlPath which has Section
return p.Section, nil
return p.Section(), nil
}
func init() {