fix private repo sync bug (#4)

* fix private repo mirror bug
* update Dockerfile
* update for IMirror interface

Author: xiexianbin

Dockerfile

@@ -11,7 +11,6 @@ LABEL "homepage"="http://github.com/x-actions/git-mirrors"
 LABEL "maintainer"="xiexianbin<[email protected]>"
 
 LABEL "Name"="git-mirrors"
-LABEL "Version"="v0.1.0"
 
 ENV LC_ALL C.UTF-8
 ENV LANG en_US.UTF-8

mirrors/base.go

@@ -17,11 +17,12 @@ package mirrors
 type IMirror interface {
 	Do() error
 	prepare() error
-	mirrorRepoInfo() error
-	mirrorGit() error
+	mirrorRepoInfo(srcRepo *Repository, dstRepoName string) (*Repository, error)
+	mirrorGit(srcRepo, dstRepo *Repository) error
 }
 
 type IGitAPI interface {
+	IsAPIAuthed() bool
 	Organizations(user string) ([]*Organization, error)
 	GetOrganization(orgName string) (*Organization, error)
 	Repositories(user string) ([]*Repository, error)

mirrors/do.go

@@ -116,7 +116,14 @@ func (m *Mirror) prepare() error {
 		switch t {
 		// init User Repos
 		case constants.AccountTypeUser:
-			repos, err := client.Repositories(orgName)
+			// client.
+			var repos []*Repository
+			var err error
+			if client.IsAPIAuthed() {
+				repos, err = client.Repositories("")
+			} else {
+				repos, err = client.Repositories(orgName)
+			}
 			if err != nil {
 				return nil, err
 			}
@@ -227,7 +234,14 @@ func (m *Mirror) mirrorRepoInfo(srcRepo *Repository, dstRepoName string) (*Repos
 				dstRepo.Description = srcRepo.Description
 				dstRepo.Topics = srcRepo.Topics
 				dstRepo.Private = srcRepo.Private
-				_, err := client.UpdateRepository(*dstRepo.Organization.Name, *dstRepo.Name, dstRepo)
+
+				var orgName string
+				if dstRepo.Organization == nil {
+					orgName = *dstRepo.Owner.Name
+				} else {
+					orgName = *dstRepo.Organization.Name
+				}
+				_, err := client.UpdateRepository(orgName, *dstRepo.Name, dstRepo)
 				if err != nil {
 					logger.Warnf("update repo %s/%s err: %s", *dstRepo.Owner.Name, *dstRepo.Name, err.Error())
 					return dstRepo, nil
@@ -258,7 +272,8 @@ func (m *Mirror) mirrorRepoInfo(srcRepo *Repository, dstRepoName string) (*Repos
 // mirrorGit clone/pull from src repo and push to dst repo
 func (m *Mirror) mirrorGit(srcRepo, dstRepo *Repository) error {
 	var err error
-	cachePath := path.Join(m.CachePath, *srcRepo.Name)
+	// cachePath format: m.CachePath + "/" + m.SrcOrg + "/" + *srcRepo.Name
+	cachePath := path.Join(m.CachePath, m.SrcOrg, *srcRepo.Name)
 	// clone or fetch from origin
 	_, err = m.srcGitClient.CloneOrFetch(GitURL(srcRepo, m.srcGitClient.GitAuthType), "origin", cachePath)
 	if err != nil {

mirrors/gitee.go

@@ -31,29 +31,33 @@ type GiteeAPI struct {
 	Client      *gitee.APIClient
 	Context     context.Context
 	accessToken string
+	IsAuthed    bool
 }
 
 // NewGiteeAPI return new Gitee API
 func NewGiteeAPI(accessToken string) (*GiteeAPI, error) {
 	ctx := context.Background()
 	// configuration
 	conf := gitee.NewConfiguration()
+	isAuthed := false
 	if accessToken != "" {
 		// oauth
 		ts := oauth2.StaticTokenSource(
 			&oauth2.Token{AccessToken: accessToken},
 		)
 		conf.HTTPClient = oauth2.NewClient(ctx, ts)
+		isAuthed = true
 	}
 
 	// git client
 	client := gitee.NewAPIClient(conf)
 
-	return &GiteeAPI{
-		Client:      client,
-		Context:     ctx,
-		accessToken: accessToken,
-	}, nil
+	return &GiteeAPI{Client: client, Context: ctx, accessToken: accessToken, IsAuthed: isAuthed}, nil
+}
+
+// IsAPIAuthed return is the API auth, true or false
+func (g *GiteeAPI) IsAPIAuthed() bool {
+	return g.IsAuthed
 }
 
 // Organizations list all Organizations

mirrors/github.go

@@ -30,21 +30,29 @@ type GithubAPI struct {
 	Client      *github.Client
 	Context     context.Context
 	accessToken string
+	IsAuthed    bool
 }
 
 // NewGithubAPI return new Github API
 func NewGithubAPI(accessToken string) (*GithubAPI, error) {
 	ctx := context.Background()
 	client := github.NewClient(nil)
+	isAuthed := false
 	if accessToken != "" {
 		ts := oauth2.StaticTokenSource(
 			&oauth2.Token{AccessToken: accessToken},
 		)
 		tc := oauth2.NewClient(ctx, ts)
 		client = github.NewClient(tc)
+		isAuthed = true
 	}
 
-	return &GithubAPI{Client: client, Context: ctx, accessToken: accessToken}, nil
+	return &GithubAPI{Client: client, Context: ctx, accessToken: accessToken, IsAuthed: isAuthed}, nil
+}
+
+// IsAPIAuthed return is the API auth, true or false
+func (g *GithubAPI) IsAPIAuthed() bool {
+	return g.IsAuthed
 }
 
 // Organizations list Organizations
@@ -81,11 +89,14 @@ func (g *GithubAPI) GetOrganization(orgName string) (*Organization, error) {
 }
 
 // Repositories list all repositories for the authenticated user, if user is empty show all repos
-// https://docs.github.com/en/rest/repos/repos#list-repositories-for-the-authenticated-user
+// support two method:
+//   https://docs.github.com/en/rest/repos/repos#list-repositories-for-the-authenticated-user if user is empty
+//   https://docs.github.com/en/rest/repos/repos#list-repositories-for-a-user if user is special
 func (g *GithubAPI) Repositories(user string) ([]*Repository, error) {
 	opt := &github.RepositoryListOptions{
-		//Type:        "all",
+		Visibility:  "all",
 		Affiliation: "owner",
+		//Type:        "all",
 		ListOptions: github.ListOptions{
 			Page:    1,
 			PerPage: 1000,