Add gitee as a provider (#125)

Author: LinuxSuRen

cmd/fetch.go

@@ -19,11 +19,13 @@ func newFetchCmd(context.Context) (cmd *cobra.Command) {
 
 	flags := cmd.Flags()
 	flags.StringVarP(&opt.provider, "provider", "p", "github",
-		"The provider of hd-home repository. You can pass it a name (github, gitee) or a public git repository URI. Please use option --reset=true if you want to change the provider.")
+		"The provider of hd-home repository")
 	flags.StringVarP(&opt.branch, "branch", "b", installer.ConfigBranch,
 		"The branch of git repository (not support currently)")
 	flags.BoolVarP(&opt.reset, "reset", "", false,
 		"If you want to reset the hd-config which means delete and clone it again")
+
+	_ = cmd.RegisterFlagCompletionFunc("provider", ArrayCompletion(ProviderGitHub, "gitee"))
 	return
 }
 

cmd/get.go

@@ -57,7 +57,9 @@ Thanks to https://github.com/hunshcn/gh-proxy`)
 	flags.BoolVarP(&opt.PrintSchema, "print-schema", "", false,
 		"Print the schema of HDConfig if the flag is true without other function")
 
-	_ = cmd.RegisterFlagCompletionFunc("proxy-github", ArrayCompletion("gh.api.99988866.xyz"))
+	_ = cmd.RegisterFlagCompletionFunc("proxy-github", ArrayCompletion("gh.api.99988866.xyz",
+		"ghproxy.com", "mirror.ghproxy.com"))
+	_ = cmd.RegisterFlagCompletionFunc("provider", ArrayCompletion(ProviderGitHub, "gitee"))
 	return
 }
 

cmd/install.go

@@ -60,6 +60,8 @@ Thanks to https://github.com/hunshcn/gh-proxy`)
 	flags.StringVarP(&opt.Provider, "provider", "", ProviderGitHub, "The file provider")
 	flags.StringVarP(&opt.OS, "os", "", runtime.GOOS, "The OS of target binary file")
 	flags.StringVarP(&opt.Arch, "arch", "", runtime.GOARCH, "The arch of target binary file")
+
+	_ = cmd.RegisterFlagCompletionFunc("provider", ArrayCompletion(ProviderGitHub, "gitee"))
 	return
 }
 

cmd/search.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"github.com/linuxsuren/http-downloader/pkg/installer"
 	"github.com/spf13/cobra"
+	sysos "os"
 	"path"
 	"path/filepath"
 	"strings"
@@ -24,7 +25,7 @@ func newSearchCmd(context.Context) (cmd *cobra.Command) {
 }
 
 func search(keyword string) (err error) {
-	if err = installer.FetchConfig(); err != nil {
+	if err = installer.FetchLatestRepo("", "", sysos.Stdout); err != nil {
 		return
 	}
 

pkg/installer/check.go

@@ -13,6 +13,7 @@ import (
 	"gopkg.in/yaml.v2"
 	"io/ioutil"
 	"net/url"
+	sysos "os"
 	"path"
 	"path/filepath"
 	"runtime"
@@ -74,8 +75,13 @@ func (o *Installer) CheckDepAndInstall(tools map[string]string) (err error) {
 // ProviderURLParse parse the URL
 func (o *Installer) ProviderURLParse(path string, acceptPreRelease bool) (url string, err error) {
 	url = path
-	if o.Provider != ProviderGitHub {
-		return
+	if o.Fetch {
+		// fetch the latest config
+		fmt.Println("start to fetch the config")
+		if err = FetchLatestRepo(o.Provider, ConfigBranch, sysos.Stdout); err != nil {
+			err = fmt.Errorf("unable to fetch the latest config, error: %v", err)
+			return
+		}
 	}
 
 	var (
@@ -134,15 +140,6 @@ func (o *Installer) ProviderURLParse(path string, acceptPreRelease bool) (url st
 	}
 	o.Name = name
 
-	if o.Fetch {
-		// fetch the latest config
-		fmt.Println("start to fetch the config")
-		if err = FetchConfig(); err != nil {
-			err = fmt.Errorf("unable to fetch the latest config, error: %v", err)
-			return
-		}
-	}
-
 	// try to parse from config
 	userHome, _ := homedir.Dir()
 	configDir := userHome + "/.config/hd-home"

pkg/installer/fetch.go

@@ -3,6 +3,7 @@ package installer
 import (
 	"fmt"
 	"github.com/go-git/go-git/v5"
+	"github.com/go-git/go-git/v5/config"
 	"github.com/linuxsuren/http-downloader/pkg/common"
 	"github.com/mitchellh/go-homedir"
 	"io"
@@ -18,9 +19,9 @@ const (
 	ConfigBranch = "master"
 )
 
-// FetchConfig fetches the hd-home as the config
-func FetchConfig() (err error) {
-	return FetchLatestRepo(ConfigGitHub, ConfigBranch, os.Stdout)
+var configRepos = map[string]string{
+	"github": ConfigGitHub,
+	"gitee":  "https://gitee.com/LinuxSuRen/hd-home",
 }
 
 // GetConfigDir returns the directory of the config
@@ -33,7 +34,21 @@ func GetConfigDir() (configDir string, err error) {
 }
 
 // FetchLatestRepo fetches the hd-home as the config
-func FetchLatestRepo(repoAddr string, branch string, progress io.Writer) (err error) {
+func FetchLatestRepo(provider string, branch string, progress io.Writer) (err error) {
+	repoAddr, ok := configRepos[provider]
+	if !ok {
+		repoAddr = ConfigGitHub
+	}
+
+	if branch == "" {
+		branch = ConfigBranch
+	}
+
+	remoteName := "origin"
+	if repoAddr != ConfigGitHub {
+		remoteName = provider
+	}
+
 	var configDir string
 	if configDir, err = GetConfigDir(); err != nil {
 		return
@@ -45,9 +60,15 @@ func FetchLatestRepo(repoAddr string, branch string, progress io.Writer) (err er
 			var wd *git.Worktree
 
 			if wd, err = repo.Worktree(); err == nil {
+				if err = makeSureRemove(remoteName, repoAddr, repo); err != nil {
+					err = fmt.Errorf("cannot add remote: %s, address: %s, error: %v", remoteName, repoAddr, err)
+					return
+				}
+
 				if err = wd.Pull(&git.PullOptions{
-					Progress: progress,
-					Force:    true,
+					RemoteName: remoteName,
+					Progress:   progress,
+					Force:      true,
 				}); err != nil && err != git.NoErrAlreadyUpToDate {
 					err = fmt.Errorf("failed to pull git repository '%s', error: %v", repo, err)
 					return
@@ -59,8 +80,9 @@ func FetchLatestRepo(repoAddr string, branch string, progress io.Writer) (err er
 		}
 	} else {
 		if _, err = git.PlainClone(configDir, false, &git.CloneOptions{
-			URL:      repoAddr,
-			Progress: progress,
+			RemoteName: remoteName,
+			URL:        repoAddr,
+			Progress:   progress,
 		}); err != nil {
 			err = fmt.Errorf("failed to clone git repository '%s' into '%s', error: %v", repoAddr, configDir, err)
 		}
@@ -73,3 +95,13 @@ func FetchLatestRepo(repoAddr string, branch string, progress io.Writer) (err er
 	}
 	return
 }
+
+func makeSureRemove(name, repoAddr string, repo *git.Repository) (err error) {
+	if _, err = repo.Remote(name); err != nil {
+		_, err = repo.CreateRemote(&config.RemoteConfig{
+			Name: name,
+			URLs: []string{repoAddr},
+		})
+	}
+	return
+}