mirrors/git-get
6
0
Fork 0
mirror of https://github.com/grdl/git-get.git synced 2026-02-09 09:09:18 +00:00
Code Activity

Refactor URL parsing so it's not being called twice

Browse Source
This commit is contained in:
Grzegorz Dlugoszewski
2020-05-22 15:53:44 +02:00
parent 2b622b99fe
commit a530b1506c
5 changed files with 52 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
pkg/url.go
View File

@@ -13,12 +13,35 @@ import (
// See: https://golang.org/src/cmd/go/internal/get/vcs.go
var scpSyntax = regexp.MustCompile(`^([a-zA-Z0-9_]+)@([a-zA-Z0-9._-]+):(.*)$`)
func URLToPath(rawurl string) (repoPath string, err error) {
url, err := parseURL(rawurl)
if err != nil {
return "", err
func ParseURL(rawURL string) (url *urlpkg.URL, err error) {
// If rawURL matches SCP-like syntax, convert it into a URL.
// eg, "git@github.com:user/repo" becomes "ssh://git@github.com/user/repo".
if m := scpSyntax.FindStringSubmatch(rawURL); m != nil {
url = &urlpkg.URL{
Scheme: "ssh",
User: urlpkg.User(m[1]),
Host: m[2],
Path: m[3],
}
} else {
url, err = urlpkg.Parse(rawURL)
if err != nil {
return nil, errors.Wrap(err, "Failed parsing URL")
}
}
if url.Host == "" && url.Path == "" {
return nil, errors.New("Parsed URL is empty")
}
if url.Scheme == "" || url.Scheme == "git+ssh" {
url.Scheme = "ssh"
}
return url, nil
}
func URLToPath(url *urlpkg.URL) (repoPath string) {
// remove port numbers from host
repoHost := strings.Split(url.Host, ":")[0]
@@ -29,29 +52,5 @@ func URLToPath(rawurl string) (repoPath string, err error) {
// remove tilde (~) char from username
repoPath = strings.ReplaceAll(repoPath, "~", "")
return repoPath, nil
}
func parseURL(rawurl string) (url *urlpkg.URL, err error) {
// If rawurl matches SCP-like syntax, convert it into a URL.
// eg, "git@github.com:user/repo" becomes "ssh://git@github.com/user/repo".
if m := scpSyntax.FindStringSubmatch(rawurl); m != nil {
url = &urlpkg.URL{
Scheme: "ssh",
User: urlpkg.User(m[1]),
Host: m[2],
Path: m[3],
}
} else {
url, err = urlpkg.Parse(rawurl)
if err != nil {
return nil, errors.Wrap(err, "Failed parsing URL")
}
}
if url.Host == "" && url.Path == "" {
return nil, errors.New("Parsed URL is empty")
}
return url, nil
return repoPath
}