mirror/gickup
1
1
Fork 0
mirror of https://github.com/cooperspencer/gickup synced 2024-10-18 07:38:08 +02:00
Code Issues

fix gitlab and better debug outputs

Browse Source
This commit is contained in:
Andreas Wachter 2024-08-28 19:41:55 +02:00
parent 4bf2ceae6f
commit 345a5f0a30
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gitea/gitea.go
View File

@ -284,6 +284,7 @@ func Get(conf *types.Conf) ([]types.Repo, bool) {
languages := types.GetMap(repo.Filter.Languages) languages := types.GetMap(repo.Filter.Languages)
for _, r := range gitearepos { for _, r := range gitearepos {
sub.Debug().Str("repo-type", "user").Msg(r.HTMLURL)
if repo.Filter.ExcludeForks { if repo.Filter.ExcludeForks {
if r.Fork { if r.Fork {
continue continue
@ -296,7 +297,6 @@ func Get(conf *types.Conf) ([]types.Repo, bool) {
} }
if len(repo.Filter.Languages) > 0 { if len(repo.Filter.Languages) > 0 {
sub.Debug().Msg(r.HTMLURL)
langs, _, err := client.GetRepoLanguages(r.Owner.UserName, r.Name) langs, _, err := client.GetRepoLanguages(r.Owner.UserName, r.Name)
if err != nil { if err != nil {
sub.Error(). sub.Error().
@ -430,6 +430,7 @@ func Get(conf *types.Conf) ([]types.Repo, bool) {
} }
} }
for _, r := range orgrepos { for _, r := range orgrepos {
sub.Debug().Str("repo-type", "org").Msg(r.HTMLURL)
if repo.Filter.ExcludeForks { if repo.Filter.ExcludeForks {
if r.Fork { if r.Fork {
continue continue

10
gitlab/gitlab.go
View File

@ -122,6 +122,8 @@ func Get(conf *types.Conf) ([]types.Repo, bool) {
continue continue
} }
userNotInConfig := false
if repo.User == "" { if repo.User == "" {
user, _, err := client.Users.CurrentUser() user, _, err := client.Users.CurrentUser()
if err != nil { if err != nil {
@ -130,6 +132,7 @@ func Get(conf *types.Conf) ([]types.Repo, bool) {
continue continue
} }
repo.User = user.Username repo.User = user.Username
userNotInConfig = true
} }
sub.Info(). sub.Info().
@ -151,7 +154,12 @@ func Get(conf *types.Conf) ([]types.Repo, bool) {
i := 1 i := 1
for { for {
opt.Page = i opt.Page = i
projects, _, err := client.Projects.ListProjects(opt) projects := []*gitlab.Project{}
if userNotInConfig {
projects, _, err = client.Projects.ListProjects(opt)
} else {
projects, _, err = client.Projects.ListUserProjects(user.ID, opt)
}
if err != nil { if err != nil {
sub.Error(). sub.Error().
Msg(err.Error()) Msg(err.Error())