diff --git a/gitlab/gitlab.go b/gitlab/gitlab.go index 05fbbd5..fd026e2 100644 --- a/gitlab/gitlab.go +++ b/gitlab/gitlab.go @@ -112,10 +112,6 @@ func Get(conf *types.Conf) ([]types.Repo, bool) { } ran = true - sub.Info(). - Msgf("grabbing repositories from %s", repo.User) - gitlabrepos := []*gitlab.Project{} - gitlabgrouprepos := map[string][]*gitlab.Project{} token := repo.GetToken() client, err := gitlab.NewClient(token, gitlab.WithBaseURL(repo.URL)) if err != nil { @@ -124,6 +120,21 @@ func Get(conf *types.Conf) ([]types.Repo, bool) { continue } + if repo.User == "" { + user, _, err := client.Users.CurrentUser() + if err != nil { + sub.Error(). + Msg(err.Error()) + continue + } + repo.User = user.Username + } + + sub.Info(). + Msgf("grabbing repositories from %s", repo.User) + gitlabrepos := []*gitlab.Project{} + gitlabgrouprepos := map[string][]*gitlab.Project{} + opt := &gitlab.ListProjectsOptions{} users, _, err := client.Users.ListUsers(&gitlab.ListUsersOptions{Username: &repo.User}) if err != nil { diff --git a/main.go b/main.go index ee15b29..225d3d5 100644 --- a/main.go +++ b/main.go @@ -246,7 +246,7 @@ func backup(repos []types.Repo, conf *types.Conf) { if err != nil { if err == git.NoErrAlreadyUpToDate { log.Info(). - Str("stage", "onedev"). + Str("stage", "github"). Str("url", r.URL). Msg(err.Error()) } else { @@ -401,7 +401,7 @@ func backup(repos []types.Repo, conf *types.Conf) { if err != nil { if err == git.NoErrAlreadyUpToDate { log.Info(). - Str("stage", "onedev"). + Str("stage", "sourcehut"). Str("url", r.URL). Msg(err.Error()) } else { @@ -428,7 +428,7 @@ func backup(repos []types.Repo, conf *types.Conf) { if err != nil { if err == git.NoErrAlreadyUpToDate { log.Info(). - Str("stage", "onedev"). + Str("stage", "sourcehut"). Str("url", r.URL). Msg(err.Error()) } else {