github/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2025-03-19 14:12:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Unexport FileAndExt

Browse source 
If needed outside helpers, create an exported file path (FilePathAndExt?)  and/or a url version.
This commit is contained in:
Bjørn Erik Pedersen 2015-08-26 21:29:32 +02:00
parent fd2fc1d3ce
commit 5b90b388cb
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
helpers/path.go
View file

@ -119,7 +119,7 @@ func isMn(r rune) bool {
// ReplaceExtension takes a path and an extension, strips the old extension // ReplaceExtension takes a path and an extension, strips the old extension
// and returns the path with the new extension. // and returns the path with the new extension.
func ReplaceExtension(path string, newExt string) string { func ReplaceExtension(path string, newExt string) string {
f, _ := FileAndExt(path, fpb) f, _ := fileAndExt(path, fpb)
return f + "." + newExt return f + "." + newExt
} }
@ -298,7 +298,7 @@ func GetDottedRelativePath(inPath string) string {
// Filename takes a path, strips out the extension, // Filename takes a path, strips out the extension,
// and returns the name of the file. // and returns the name of the file.
func Filename(in string) (name string) { func Filename(in string) (name string) {
name, _ = FileAndExt(in, fpb) name, _ = fileAndExt(in, fpb)
return return
} }
@ -318,7 +318,7 @@ func Filename(in string) (name string) {
// If the path, in, represents a filename with an extension, // If the path, in, represents a filename with an extension,
// then name will be the filename minus any extension - including the dot // then name will be the filename minus any extension - including the dot
// and ext will contain the extension - minus the dot. // and ext will contain the extension - minus the dot.
func FileAndExt(in string, b filepathPathBridge) (name string, ext string) { func fileAndExt(in string, b filepathPathBridge) (name string, ext string) {
ext = b.Ext(in) ext = b.Ext(in)
base := b.Base(in) base := b.Base(in)
@ -439,7 +439,7 @@ func PrettiyPath(in string, b filepathPathBridge) string {
} }
return b.Join(b.Clean(in), "index.html") return b.Join(b.Clean(in), "index.html")
} }
name, ext := FileAndExt(in, b) name, ext := fileAndExt(in, b)
if name == "index" { if name == "index" {
// /section/name/index.html -> /section/name/index.html // /section/name/index.html -> /section/name/index.html
return b.Clean(in) return b.Clean(in)

2
helpers/path_test.go
View file

@ -540,7 +540,7 @@ func TestFileAndExt(t *testing.T) {
} }
for i, d := range data { for i, d := range data {
file, ext := FileAndExt(filepath.FromSlash(d.input), fpb) file, ext := fileAndExt(filepath.FromSlash(d.input), fpb)
if d.expectedFile != file { if d.expectedFile != file {
t.Errorf("Test %d failed. Expected filename %q got %q.", i, d.expectedFile, file) t.Errorf("Test %d failed. Expected filename %q got %q.", i, d.expectedFile, file)
} }

2
helpers/url.go
View file

@ -260,7 +260,7 @@ func Uglify(in string) string {
return path.Clean(in) + ".html" return path.Clean(in) + ".html"
} }
name, ext := FileAndExt(in, pb) name, ext := fileAndExt(in, pb)
if name == "index" { if name == "index" {
// /section/name/index.html -> /section/name.html // /section/name/index.html -> /section/name.html
d := path.Dir(in) d := path.Dir(in)