mirror of
https://github.com/go-gitea/gitea
synced 2024-12-27 20:44:38 +01:00
74bd9691c6
Replace all calls to os.Remove/os.RemoveAll by retrying util.Remove/util.RemoveAll and remove circular dependencies from util. Fix #12339 Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: silverwind <me@silverwind.io>
42 lines
1 KiB
Go
42 lines
1 KiB
Go
// Copyright 2019 The Gitea Authors. All rights reserved.
|
|
// Use of this source code is governed by a MIT-style
|
|
// license that can be found in the LICENSE file.
|
|
|
|
package util
|
|
|
|
import (
|
|
"net/url"
|
|
"path"
|
|
"strings"
|
|
)
|
|
|
|
// PathEscapeSegments escapes segments of a path while not escaping forward slash
|
|
func PathEscapeSegments(path string) string {
|
|
slice := strings.Split(path, "/")
|
|
for index := range slice {
|
|
slice[index] = url.PathEscape(slice[index])
|
|
}
|
|
escapedPath := strings.Join(slice, "/")
|
|
return escapedPath
|
|
}
|
|
|
|
// URLJoin joins url components, like path.Join, but preserving contents
|
|
func URLJoin(base string, elems ...string) string {
|
|
if !strings.HasSuffix(base, "/") {
|
|
base += "/"
|
|
}
|
|
baseURL, err := url.Parse(base)
|
|
if err != nil {
|
|
return ""
|
|
}
|
|
joinedPath := path.Join(elems...)
|
|
argURL, err := url.Parse(joinedPath)
|
|
if err != nil {
|
|
return ""
|
|
}
|
|
joinedURL := baseURL.ResolveReference(argURL).String()
|
|
if !baseURL.IsAbs() && !strings.HasPrefix(base, "/") {
|
|
return joinedURL[1:] // Removing leading '/' if needed
|
|
}
|
|
return joinedURL
|
|
}
|