mirrors/git-get
6
0
Fork 0
mirror of https://github.com/grdl/git-get.git synced 2026-02-04 11:01:46 +00:00
Code Activity

Fix cyclop issues in url.go

Browse Source
This commit is contained in:
Grzegorz Dlugoszewski
2025-08-24 14:35:26 +02:00
parent b31de718d4
commit 09da7ea05b
1 changed files with 29 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
pkg/url.go
View File

@@ -19,26 +19,41 @@ var scpSyntax = regexp.MustCompile(`^([a-zA-Z0-9_]+)@([a-zA-Z0-9._-]+):(.*)$`)
// When the parsed URL has an empty host, use the defaultHost.
// When the parsed URL has an empty scheme, use the defaultScheme.
func ParseURL(rawURL string, defaultHost string, defaultScheme string) (url *urlpkg.URL, err error) {
// If rawURL matches the SCP-like syntax, convert it into a standard ssh Path.
// eg, git@github.com:user/repo => 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: path.Join("/", m[3]),
}
} else {
url, err = urlpkg.Parse(rawURL)
if err != nil {
return nil, fmt.Errorf("failed parsing URL %s: %w", rawURL, err)
}
url, err = parseRawURL(rawURL)
if err != nil {
return nil, err
}
if url.Host == "" && url.Path == "" {
return nil, errEmptyURLPath
}
normalizeURL(url, defaultHost, defaultScheme)
return url, nil
}
// parseRawURL handles the initial parsing of the raw URL string.
func parseRawURL(rawURL string) (*urlpkg.URL, error) {
// If rawURL matches the SCP-like syntax, convert it into a standard ssh Path.
// eg, git@github.com:user/repo => ssh://git@github.com/user/repo
if m := scpSyntax.FindStringSubmatch(rawURL); m != nil {
return &urlpkg.URL{
Scheme: "ssh",
User: urlpkg.User(m[1]),
Host: m[2],
Path: path.Join("/", m[3]),
}, nil
}
url, err := urlpkg.Parse(rawURL)
if err != nil {
return nil, fmt.Errorf("failed parsing URL %s: %w", rawURL, err)
}
return url, nil
}
// normalizeURL applies all the normalization rules to the parsed URL.
func normalizeURL(url *urlpkg.URL, defaultHost string, defaultScheme string) {
if url.Scheme == "git+ssh" {
url.Scheme = "ssh"
}
@@ -65,8 +80,6 @@ func ParseURL(rawURL string, defaultHost string, defaultScheme string) (url *url
url.Path = path.Join(url.Host, url.Path)
url.Host = ""
}
return url, nil
}
// URLToPath cleans up the URL and converts it into a path string.