github/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-09-13 01:12:31 -04:00
Code Issues Projects Releases Packages Wiki Activity

Adjust tests for GO 1.20

Browse source 
Updates #10691
This commit is contained in:
Bjørn Erik Pedersen 2023-02-06 16:12:31 +01:00
parent 094135ff96
commit 6abd15e781
2 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
common/paths/path.go
View file

@ -100,25 +100,25 @@ var isFileRe = regexp.MustCompile(`.*\..{1,6}$`)
// GetDottedRelativePath expects a relative path starting after the content directory. // GetDottedRelativePath expects a relative path starting after the content directory.
// It returns a relative path with dots ("..") navigating up the path structure. // It returns a relative path with dots ("..") navigating up the path structure.
func GetDottedRelativePath(inPath string) string { func GetDottedRelativePath(inPath string) string {
inPath = filepath.Clean(filepath.FromSlash(inPath)) inPath = path.Clean(filepath.ToSlash(inPath))
if inPath == "." { if inPath == "." {
return "./" return "./"
} }
if !isFileRe.MatchString(inPath) && !strings.HasSuffix(inPath, FilePathSeparator) { if !isFileRe.MatchString(inPath) && !strings.HasSuffix(inPath, "/") {
inPath += FilePathSeparator inPath += "/"
} }
if !strings.HasPrefix(inPath, FilePathSeparator) { if !strings.HasPrefix(inPath, "/") {
inPath = FilePathSeparator + inPath inPath = "/" + inPath
} }
dir, _ := filepath.Split(inPath) dir, _ := filepath.Split(inPath)
sectionCount := strings.Count(dir, FilePathSeparator) sectionCount := strings.Count(dir, "/")
if sectionCount == 0 || dir == FilePathSeparator { if sectionCount == 0 || dir == "/" {
return "./" return "./"
} }

17
helpers/path.go
View file

@ -18,6 +18,7 @@ import (
"fmt" "fmt"
"io" "io"
"os" "os"
"path"
"path/filepath" "path/filepath"
"regexp" "regexp"
"sort" "sort"
@ -142,25 +143,25 @@ var isFileRe = regexp.MustCompile(`.*\..{1,6}$`)
// GetDottedRelativePath expects a relative path starting after the content directory. // GetDottedRelativePath expects a relative path starting after the content directory.
// It returns a relative path with dots ("..") navigating up the path structure. // It returns a relative path with dots ("..") navigating up the path structure.
func GetDottedRelativePath(inPath string) string { func GetDottedRelativePath(inPath string) string {
inPath = filepath.Clean(filepath.FromSlash(inPath)) inPath = path.Clean(filepath.ToSlash(inPath))
if inPath == "." { if inPath == "." {
return "./" return "./"
} }
if !isFileRe.MatchString(inPath) && !strings.HasSuffix(inPath, FilePathSeparator) { if !isFileRe.MatchString(inPath) && !strings.HasSuffix(inPath, "/") {
inPath += FilePathSeparator inPath += "/"
} }
if !strings.HasPrefix(inPath, FilePathSeparator) { if !strings.HasPrefix(inPath, "/") {
inPath = FilePathSeparator + inPath inPath = "/" + inPath
} }
dir, _ := filepath.Split(inPath) dir, _ := path.Split(inPath)
sectionCount := strings.Count(dir, FilePathSeparator) sectionCount := strings.Count(dir, "/")
if sectionCount == 0 || dir == FilePathSeparator { if sectionCount == 0 || dir == "/" {
return "./" return "./"
} }