converted helpers usage of path 2 filepath

diff --git a/helpers/path.go b/helpers/path.go
index e70304c5e59eaca4e9b7ed21463b997bd05819b0..e5f07450d957a35d12775726a383baa267e91054 100644 (file)
--- a/helpers/path.go
+++ b/helpers/path.go
@@ -18,7 +18,6 @@ import (
        "fmt"
        "io"
        "os"
-       "path"
        "path/filepath"
        "regexp"
        "strings"
@@ -171,8 +170,8 @@ func Filename(in string) (name string) {
 // then name will be the filename minus any extension - including the dot
 // and ext will contain the extension - minus the dot.
 func FileAndExt(in string) (name string, ext string) {
-       ext = path.Ext(in)
-       base := path.Base(in) // path.Base strips any trailing slash!
+       ext = filepath.Ext(in)
+       base := filepath.Base(in) // path.Base strips any trailing slash!
 
        // No file name cases. These are defined as:
        // 1. any "in" path that ends in a os.PathSeparator i.e. "/" on linux
@@ -254,20 +253,20 @@ func PathPrep(ugly bool, in string) string {
 // /section/name/  -> /section/name/index.html
 // /section/name/index.html -> /section/name/index.html
 func PrettifyPath(in string) string {
-       if path.Ext(in) == "" {
+       if filepath.Ext(in) == "" {
                // /section/name/  -> /section/name/index.html
                if len(in) < 2 {
                        return "/"
                }
-               return path.Join(path.Clean(in), "index.html")
+               return filepath.Join(filepath.Clean(in), "index.html")
        } else {
                name, ext := FileAndExt(in)
                if name == "index" {
                        // /section/name/index.html -> /section/name/index.html
-                       return path.Clean(in)
+                       return filepath.Clean(in)
                } else {
                        // /section/name.html -> /section/name/index.html
-                       return path.Join(path.Dir(in), name, "index"+ext)
+                       return filepath.Join(filepath.Dir(in), name, "index"+ext)
                }
        }
 }

diff --git a/helpers/url.go b/helpers/url.go
index 6b234b44e29dc56b5c12b69bf335821b82c35088..dd8d7508b68b59f52ef437ad2024d675b76997ba 100644 (file)
--- a/helpers/url.go
+++ b/helpers/url.go
@@ -16,7 +16,7 @@ package helpers
 import (
        "fmt"
        "net/url"
-       "path"
+       "path/filepath"
        "strings"
 
        "github.com/PuerkitoBio/purell"
@@ -68,7 +68,7 @@ func MakePermalink(host, plink string) *url.URL {
                panic(fmt.Errorf("Can't make permalink from absolute link %q", plink))
        }
 
-       base.Path = path.Join(base.Path, p.Path)
+       base.Path = filepath.Join(base.Path, p.Path)
 
        // path.Join will strip off the last /, so put it back if it was there.
        if strings.HasSuffix(p.Path, "/") && !strings.HasSuffix(base.Path, "/") {
@@ -84,7 +84,7 @@ func UrlPrep(ugly bool, in string) string {
                return x
        } else {
                x := PrettifyUrl(SanitizeUrl(in))
-               if path.Ext(x) == ".xml" {
+               if filepath.Ext(x) == ".xml" {
                        return x
                }
                url, err := purell.NormalizeURLString(x, purell.FlagAddTrailingSlash)
@@ -100,8 +100,8 @@ func UrlPrep(ugly bool, in string) string {
 func PrettifyUrl(in string) string {
        x := PrettifyPath(in)
 
-       if path.Base(x) == "index.html" {
-               return path.Dir(x)
+       if filepath.Base(x) == "index.html" {
+               return filepath.Dir(x)
        }
 
        if in == "" {
@@ -115,17 +115,17 @@ func PrettifyUrl(in string) string {
 // /section/name/  -> /section/name.html
 // /section/name.html -> /section/name.html
 func Uglify(in string) string {
-       if path.Ext(in) == "" {
+       if filepath.Ext(in) == "" {
                if len(in) < 2 {
                        return "/"
                }
                // /section/name/  -> /section/name.html
-               return path.Clean(in) + ".html"
+               return filepath.Clean(in) + ".html"
        } else {
                name, ext := FileAndExt(in)
                if name == "index" {
                        // /section/name/index.html -> /section/name.html
-                       d := path.Dir(in)
+                       d := filepath.Dir(in)
                        if len(d) > 1 {
                                return d + ext
                        } else {
@@ -133,7 +133,7 @@ func Uglify(in string) string {
                        }
                } else {
                        // /section/name.html -> /section/name.html
-                       return path.Clean(in)
+                       return filepath.Clean(in)
                }
        }
 }