fix the plugin loading issues (#3)

* Use http-downloader instead of duplicated code lines

Author: LinuxSuRen

go.mod

@@ -5,12 +5,12 @@ go 1.15
 require (
 	github.com/gosuri/uilive v0.0.3 // indirect
 	github.com/gosuri/uiprogress v0.0.1
-	github.com/linuxsuren/cobra-extension v0.0.1
+	github.com/linuxsuren/cobra-extension v0.0.10
+	github.com/linuxsuren/http-downloader v0.0.10
 	github.com/mattn/go-isatty v0.0.12 // indirect
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/pkg/errors v0.9.1
 	github.com/spf13/cobra v1.1.1
-	github.com/stretchr/testify v1.6.1 // indirect
 	golang.org/x/crypto v0.0.0-20201124201722-c8d3bf9c5392
 	golang.org/x/text v0.3.4 // indirect
 	gopkg.in/src-d/go-git.v4 v4.13.1

go.sum

@@ -7,9 +7,9 @@ import (
 )
 
 // ValidPluginNames returns the valid plugin name list
-func ValidPluginNames(cmd *cobra.Command, args []string, prefix string) (pluginNames []string, directive cobra.ShellCompDirective) {
+func ValidPluginNames(cmd *cobra.Command, args []string, prefix, pluginOrg, pluginRepo string) (pluginNames []string, directive cobra.ShellCompDirective) {
 	directive = cobra.ShellCompDirectiveNoFileComp
-	if plugins, err := pkg.FindPlugins(); err == nil {
+	if plugins, err := pkg.FindPlugins(pluginOrg, pluginRepo); err == nil {
 		pluginNames = make([]string, 0)
 		for i := range plugins {
 			plugin := plugins[i]

pkg/cmd/completion.go

@@ -56,7 +56,7 @@ func (c *jcliPluginFetchCmd) Run(cmd *cobra.Command, args []string) (err error)
 		return
 	}
 
-	pluginRepoCache := fmt.Sprintf("%s/.jenkins-cli/plugins-repo", userHome)
+	pluginRepoCache := fmt.Sprintf("%s/.%s/plugins-repo", userHome, c.PluginRepoName)
 	c.output = cmd.OutOrStdout()
 
 	cmd.Printf("start to fetch metadata from '%s', cache to '%s'\n", c.PluginRepo, pluginRepoCache)

pkg/cmd/fetch.go

@@ -5,6 +5,7 @@ import (
 	"compress/gzip"
 	"fmt"
 	"github.com/linuxsuren/go-cli-plugin/pkg"
+	hd "github.com/linuxsuren/http-downloader/pkg"
 	"github.com/mitchellh/go-homedir"
 	"github.com/spf13/cobra"
 	"gopkg.in/yaml.v2"
@@ -18,23 +19,27 @@ import (
 // NewConfigPluginInstallCmd create a command for fetching plugin metadata
 func NewConfigPluginInstallCmd(pluginOrg, pluginRepo string) (cmd *cobra.Command) {
 	pluginInstallCmd := jcliPluginInstallCmd{
-		PluginOrg: pluginOrg,
-		PluginRepo: pluginRepo,
+		PluginOrg:      pluginOrg,
+		PluginRepo:     pluginRepo,
+		PluginRepoName: pluginRepo,
 	}
 
 	cmd = &cobra.Command{
-		Use:               "install",
-		Short:             "install a jcli plugin",
-		Long:              "install a jcli plugin",
-		Args:              cobra.MinimumNArgs(1),
-		ValidArgsFunction: ValidPluginNames,
-		RunE:              pluginInstallCmd.Run,
+		Use:   "install",
+		Short: "install a jcli plugin",
+		Long:  "install a jcli plugin",
+		Args:  cobra.MinimumNArgs(1),
+		ValidArgsFunction: func(cmd *cobra.Command, args []string, toComplete string) (strings []string, directive cobra.ShellCompDirective) {
+			return ValidPluginNames(cmd, args, toComplete, pluginOrg, pluginRepo)
+		},
+		RunE: pluginInstallCmd.Run,
 	}
 
 	// add flags
 	flags := cmd.Flags()
 	flags.BoolVarP(&pluginInstallCmd.ShowProgress, "show-progress", "", true,
 		"If you want to show the progress of download")
+	flags.IntVarP(&pluginInstallCmd.Thread, "thread", "t", 4, "Using multi-thread to download plugin")
 	return
 }
 
@@ -47,7 +52,7 @@ func (c *jcliPluginInstallCmd) Run(cmd *cobra.Command, args []string) (err error
 	}
 
 	var data []byte
-	pluginsMetadataFile := fmt.Sprintf("%s/.%s/plugins-repo/%s.yaml", userHome, c.PluginRepo, name)
+	pluginsMetadataFile := fmt.Sprintf("%s/.%s/plugins-repo/%s.yaml", userHome, c.PluginRepoName, name)
 	if data, err = ioutil.ReadFile(pluginsMetadataFile); err == nil {
 		plugin := pkg.Plugin{}
 		if err = yaml.Unmarshal(data, &plugin); err == nil {
@@ -56,7 +61,7 @@ func (c *jcliPluginInstallCmd) Run(cmd *cobra.Command, args []string) (err error
 	}
 
 	if err == nil {
-		cachedMetadataFile := pkg.GetJCLIPluginPath(userHome, name, true)
+		cachedMetadataFile := pkg.GetJCLIPluginPath(userHome, c.PluginRepoName, name, true)
 		err = ioutil.WriteFile(cachedMetadataFile, data, 0664)
 	}
 	return
@@ -69,15 +74,22 @@ func (c *jcliPluginInstallCmd) download(plu pkg.Plugin) (err error) {
 	}
 
 	link := c.getDownloadLink(plu)
-	output := fmt.Sprintf("%s/.%s/plugins/%s.tar.gz", userHome, c.PluginOrg,plu.Main)
+	output := fmt.Sprintf("%s/.%s/plugins-repo/%s.tar.gz", userHome, c.PluginRepoName, plu.Main)
 
-	downloader := pkg.HTTPDownloader{
-		RoundTripper:   c.RoundTripper,
-		TargetFilePath: output,
-		URL:            link,
-		ShowProgress:   c.ShowProgress,
+	fmt.Printf("start to download from '%s' to '%s'\n", link, output)
+	if c.Thread > 1 {
+		err = hd.DownloadFileWithMultipleThread(link, output, c.Thread, c.ShowProgress)
+	} else {
+		downloader := hd.HTTPDownloader{
+			RoundTripper:   c.RoundTripper,
+			TargetFilePath: output,
+			URL:            link,
+			ShowProgress:   c.ShowProgress,
+		}
+		err = downloader.DownloadFile()
 	}
-	if err = downloader.DownloadFile(); err == nil {
+
+	if err == nil {
 		err = c.extractFiles(plu, output)
 	}
 	return

pkg/cmd/install.go

@@ -6,8 +6,12 @@ import (
 )
 
 // NewConfigPluginListCmd create a command for list all jcli plugins
-func NewConfigPluginListCmd() (cmd *cobra.Command) {
-	configPluginListCmd := &configPluginListCmd{}
+func NewConfigPluginListCmd(pluginOrg, pluginRepo string) (cmd *cobra.Command) {
+	configPluginListCmd := &configPluginListCmd{
+		PluginOrg:      pluginOrg,
+		PluginRepo:     pluginRepo,
+		PluginRepoName: pluginRepo,
+	}
 
 	cmd = &cobra.Command{
 		Use:               "list",
@@ -25,7 +29,7 @@ func NewConfigPluginListCmd() (cmd *cobra.Command) {
 func (c *configPluginListCmd) RunE(cmd *cobra.Command, args []string) (err error) {
 	c.Writer = cmd.OutOrStdout()
 	var plugins []pkg.Plugin
-	if plugins, err = pkg.FindPlugins(); err == nil {
+	if plugins, err = pkg.FindPlugins(c.PluginOrg, c.PluginRepoName); err == nil {
 		err = c.OutputV2(plugins)
 	}
 	return

pkg/cmd/list.go

@@ -6,8 +6,8 @@ import (
 
 // AppendPluginCmd create a command as root of config plugin
 func AppendPluginCmd(root *cobra.Command, pluginOrg, pluginRepo string) {
-	root.AddCommand(NewConfigPluginListCmd(),
+	root.AddCommand(NewConfigPluginListCmd(pluginOrg, pluginRepo),
 		NewConfigPluginFetchCmd(pluginOrg, pluginRepo),
 		NewConfigPluginInstallCmd(pluginOrg, pluginRepo),
-		NewConfigPluginUninstallCmd())
+		NewConfigPluginUninstallCmd(pluginOrg, pluginRepo))
 }

pkg/cmd/root.go

@@ -9,6 +9,9 @@ import (
 type (
 	configPluginListCmd struct {
 		cobra_ext.OutputOption
+		PluginOrg      string
+		PluginRepo     string
+		PluginRepoName string
 	}
 
 	jcliPluginFetchCmd struct {
@@ -27,15 +30,31 @@ type (
 	jcliPluginInstallCmd struct {
 		RoundTripper http.RoundTripper
 		ShowProgress bool
+		Thread       int
 
-		output     io.Writer
-		PluginOrg  string
-		PluginRepo string
+		output         io.Writer
+		PluginOrg      string
+		PluginRepo     string
+		PluginRepoName string
 	}
 
 	jcliPluginUninstallCmd struct {
+		RoundTripper http.RoundTripper
+		ShowProgress bool
+
+		output         io.Writer
+		PluginOrg      string
+		PluginRepo     string
+		PluginRepoName string
 	}
 
 	jcliPluginUpdateCmd struct {
+		RoundTripper http.RoundTripper
+		ShowProgress bool
+
+		output         io.Writer
+		PluginOrg      string
+		PluginRepo     string
+		PluginRepoName string
 	}
 )

pkg/cmd/type.go

@@ -10,16 +10,22 @@ import (
 )
 
 // NewConfigPluginUninstallCmd create a command to uninstall a plugin
-func NewConfigPluginUninstallCmd() (cmd *cobra.Command) {
-	jcliPluginUninstallCmd := jcliPluginUninstallCmd{}
+func NewConfigPluginUninstallCmd(pluginOrg, pluginRepo string) (cmd *cobra.Command) {
+	jcliPluginUninstallCmd := jcliPluginUninstallCmd{
+		PluginOrg:      pluginOrg,
+		PluginRepo:     pluginRepo,
+		PluginRepoName: pluginRepo,
+	}
 
 	cmd = &cobra.Command{
 		Use:               "uninstall",
 		Short:             "Remove a plugin",
 		Long:              "Remove a plugin",
 		Args:              cobra.MinimumNArgs(1),
 		RunE:              jcliPluginUninstallCmd.RunE,
-		ValidArgsFunction: ValidPluginNames,
+		ValidArgsFunction: func(cmd *cobra.Command, args []string, toComplete string) (strings []string, directive cobra.ShellCompDirective) {
+			return ValidPluginNames(cmd, args, toComplete, pluginOrg, pluginRepo)
+		},
 	}
 	return
 }
@@ -32,13 +38,13 @@ func (c *jcliPluginUninstallCmd) RunE(cmd *cobra.Command, args []string) (err er
 	}
 
 	name := args[0]
-	cachedMetadataFile := pkg.GetJCLIPluginPath(userHome, name, false)
+	cachedMetadataFile := pkg.GetJCLIPluginPath(userHome, c.PluginRepoName, name, false)
 
 	var data []byte
 	if data, err = ioutil.ReadFile(cachedMetadataFile); err == nil {
 		plugin := &pkg.Plugin{}
 		if err = yaml.Unmarshal(data, plugin); err == nil {
-			mainFile := pkg.GetJCLIPluginPath(userHome, plugin.Main, true)
+			mainFile := pkg.GetJCLIPluginPath(userHome, c.PluginRepoName, plugin.Main, true)
 
 			os.Remove(cachedMetadataFile)
 			os.Remove(mainFile)

pkg/cmd/uninstall.go

@@ -29,14 +29,14 @@ type PluginError struct {
 	code int
 }
 
-func FindPlugins() (plugins []Plugin, err error) {
+func FindPlugins(pluginOrg, pluginRepo string) (plugins []Plugin, err error) {
 	var userHome string
 	if userHome, err = homedir.Dir(); err != nil {
 		return
 	}
 
 	plugins = make([]Plugin, 0)
-	pluginsDir := fmt.Sprintf("%s/.jenkins-cli/plugins-repo/*.yaml", userHome)
+	pluginsDir := fmt.Sprintf("%s/.%s/plugins-repo/*.yaml", userHome, pluginRepo)
 	//fmt.Println("start to parse plugin file from dir", pluginsDir)
 	var files []string
 	if files, err = filepath.Glob(pluginsDir); err == nil {
@@ -51,7 +51,7 @@ func FindPlugins() (plugins []Plugin, err error) {
 						plugin.Main = fmt.Sprintf("jcli-%s-Plugin", plugin.Use)
 					}
 
-					if _, fileErr := os.Stat(GetJCLIPluginPath(userHome, plugin.Main, true)); !os.IsNotExist(fileErr) {
+					if _, fileErr := os.Stat(GetJCLIPluginPath(userHome, pluginRepo, plugin.Main, true)); !os.IsNotExist(fileErr) {
 						plugin.Installed = true
 					}
 					plugins = append(plugins, plugin)
@@ -65,10 +65,10 @@ func FindPlugins() (plugins []Plugin, err error) {
 }
 
 // LoadPlugins loads the plugins
-func LoadPlugins(cmd *cobra.Command) {
+func LoadPlugins(cmd *cobra.Command, pluginOrg, pluginRepo string) {
 	var plugins []Plugin
 	var err error
-	if plugins, err = FindPlugins(); err != nil {
+	if plugins, err = FindPlugins(pluginOrg, pluginRepo); err != nil {
 		cmd.PrintErrln("Cannot load plugins successfully")
 		return
 	}
@@ -118,7 +118,7 @@ func LoadPlugins(cmd *cobra.Command) {
 					return
 				}
 
-				pluginExec := GetJCLIPluginPath(userHome, cmd.Annotations["main"], true)
+				pluginExec := GetJCLIPluginPath(userHome, pluginRepo, cmd.Annotations["main"], true)
 				err = callPluginExecutable(cmd, pluginExec, args, cmd.OutOrStdout())
 				return
 			},
@@ -127,11 +127,11 @@ func LoadPlugins(cmd *cobra.Command) {
 	}
 }
 
-//GetJCLIPluginPath returns the path of a jcli plugin
-func GetJCLIPluginPath(userHome, name string, binary bool) string {
+// GetJCLIPluginPath returns the path of a jcli plugin
+func GetJCLIPluginPath(userHome, pluginRepoName, name string, binary bool) string {
 	suffix := ".yaml"
 	if binary {
 		suffix = ""
 	}
-	return fmt.Sprintf("%s/.jenkins-cli/plugins/%s%s", userHome, name, suffix)
+	return fmt.Sprintf("%s/.%s/plugins-repo/%s%s", userHome, pluginRepoName, name, suffix)
 }