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

ignore root path, no need strip traling slash

Browse source
This commit is contained in:
fundon 2015-01-28 15:18:09 +08:00 committed by bep
parent 2d8e15a565
commit ee1045ad42
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
helpers/url.go
View file

@ -15,11 +15,12 @@ package helpers
import ( import (
"fmt" "fmt"
"github.com/PuerkitoBio/purell"
"github.com/spf13/viper"
"net/url" "net/url"
"path" "path"
"strings" "strings"
"github.com/PuerkitoBio/purell"
"github.com/spf13/viper"
) )
type PathBridge struct { type PathBridge struct {
@ -120,8 +121,8 @@ func AddContextRoot(baseUrl, relativePath string) string {
newPath := path.Join(url.Path, relativePath) newPath := path.Join(url.Path, relativePath)
// path strips traling slash // path strips traling slash, ignore root path.
if strings.HasSuffix(relativePath, "/") { if newPath != "/" && strings.HasSuffix(relativePath, "/") {
newPath += "/" newPath += "/"
} }
return newPath return newPath

2
helpers/url_test.go
View file

@ -81,6 +81,8 @@ func TestAddContextRoot(t *testing.T) {
// cannot guess that the context root is already added int the example below // cannot guess that the context root is already added int the example below
{"http://example.com/sub/", "/sub/foo", "/sub/sub/foo"}, {"http://example.com/sub/", "/sub/foo", "/sub/sub/foo"},
{"http://example.com/тря", "/трям/", "/тря/трям/"}, {"http://example.com/тря", "/трям/", "/тря/трям/"},
{"http://example.com", "/", "/"},
{"http://example.com/bar", "//", "/bar/"},
} }
for _, test := range tests { for _, test := range tests {