Minor polish in path/url

diff --git a/helpers/path.go b/helpers/path.go
index 309257668444f975ba5fc059a35e2d550601892c..165ce2314afc2f2cc466367b6dfb893e6db90745 100644 (file)
--- a/helpers/path.go
+++ b/helpers/path.go
@@ -48,11 +48,6 @@ func MakeTitle(inpath string) string {
        return strings.Replace(strings.TrimSpace(inpath), "-", " ", -1)
 }
 
-// unused
-//func Sanitize(s string) string {
-//     return sanitizeRegexp.ReplaceAllString(s, "")
-//}
-
 func UnicodeSanitize(s string) string {
        source := []rune(s)
        target := make([]rune, 0, len(source))
@@ -183,10 +178,10 @@ func FileAndExt(in string) (name string, ext string) {
        ext = filepath.Ext(in)
        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:
        // 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
 }
 
-// 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
 // or before the first slash.
 func GuessSection(in string) string {

diff --git a/helpers/url.go b/helpers/url.go
index ec5e8122978a38456441afdfd5a01b6f1a6724da..46bc951f456b9cebab7ef28ecfcf19e1a996eb29 100644 (file)
--- a/helpers/url.go
+++ b/helpers/url.go
@@ -168,5 +168,5 @@ func ResourceAndExt(in string) (name string, ext string) {
        ext = path.Ext(in)
        base := path.Base(in)
 
-       return FileAndExtSep(in, ext, base, "/"), ext
+       return extractFilename(in, ext, base, "/"), ext
 }