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

Minor polish in path/url

Browse source
This commit is contained in:
bep 2015-01-20 20:45:03 +01:00
parent 9e688507a7
commit 2ec046afb1
2 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
helpers/path.go
View file

@ -48,11 +48,6 @@ func MakeTitle(inpath string) string {
return strings.Replace(strings.TrimSpace(inpath), "-", " ", -1) return strings.Replace(strings.TrimSpace(inpath), "-", " ", -1)
} }
// unused
//func Sanitize(s string) string {
// return sanitizeRegexp.ReplaceAllString(s, "")
//}
func UnicodeSanitize(s string) string { func UnicodeSanitize(s string) string {
source := []rune(s) source := []rune(s)
target := make([]rune, 0, len(source)) target := make([]rune, 0, len(source))
@ -183,10 +178,10 @@ func FileAndExt(in string) (name string, ext string) {
ext = filepath.Ext(in) ext = filepath.Ext(in)
base := filepath.Base(in) // path.Base strips any trailing slash! base := filepath.Base(in) // path.Base strips any trailing slash!
return FileAndExtSep(in, ext, base, FilePathSeparator), ext return extractFilename(in, ext, base, FilePathSeparator), ext
} }
func FileAndExtSep(in, ext, base, pathSeparator string) (name string) { func extractFilename(in, ext, base, pathSeparator string) (name string) {
// No file name cases. These are defined as: // No file name cases. These are defined as:
// 1. any "in" path that ends in a pathSeparator // 1. any "in" path that ends in a pathSeparator
@ -223,7 +218,7 @@ func GetRelativePath(path, base string) (final string, err error) {
return name, nil return name, nil
} }
// Given a source path, determine the section. // GuessSection returns the section given a source path.
// A section is the part between the root slash and the second slash // A section is the part between the root slash and the second slash
// or before the first slash. // or before the first slash.
func GuessSection(in string) string { func GuessSection(in string) string {

2
helpers/url.go
View file

@ -168,5 +168,5 @@ func ResourceAndExt(in string) (name string, ext string) {
ext = path.Ext(in) ext = path.Ext(in)
base := path.Base(in) base := path.Base(in)
return FileAndExtSep(in, ext, base, "/"), ext return extractFilename(in, ext, base, "/"), ext
} }