Refactor addLoginMain() (#201)

simplify NormalizeURL

drop noisy log line

must have been introduced recently?

dont use PascalCase for default login names

...for readability.

🔥 opinionated commit

create GenerateLoginName()

fixes

fixup! Merge branch 'master' into refactor-loginMain

move GetOwnerAndRepo() to modules/utils/parse.go

Merge branch 'master' into refactor-loginMain

make linter happy

refactor addLoginMain()

Co-authored-by: Norwin Roosen <git@nroo.de>
Reviewed-on: https://gitea.com/gitea/tea/pulls/201
Reviewed-by: 6543 <6543@noreply.gitea.io>
Reviewed-by: Andrew Thornton <art27@cantab.net>
This commit is contained in:
Norwin
2020-09-30 19:44:22 +00:00
committed by 6543
parent f445ac7521
commit de5a00e807
6 changed files with 111 additions and 92 deletions

View File

@ -5,6 +5,7 @@
package utils
import (
"net/url"
"strconv"
"strings"
)
@ -16,3 +17,25 @@ func ArgToIndex(arg string) (int64, error) {
}
return strconv.ParseInt(arg, 10, 64)
}
// NormalizeURL normalizes the input with a protocol
func NormalizeURL(raw string) (*url.URL, error) {
var prefix string
if !strings.HasPrefix(raw, "http") {
prefix = "https://"
}
return url.Parse(prefix + raw)
}
// GetOwnerAndRepo return repoOwner and repoName
// based on relative path and default owner (if not in path)
func GetOwnerAndRepo(repoPath, user string) (string, string) {
if len(repoPath) == 0 {
return "", ""
}
p := strings.Split(repoPath, "/")
if len(p) >= 2 {
return p[0], p[1]
}
return user, repoPath
}