fix the incorrect dir reading (#370)

Co-authored-by: rick <LinuxSuRen@users.noreply.github.com>

Author: LinuxSuRen

.github/workflows/pull-request.yaml

@@ -25,8 +25,17 @@ jobs:
  args: release --skip-publish --rm-dist --snapshot
  - name: Test against the cmd
  run: |
- sudo ./release/http-downloader_linux_amd64_v1/hd install jenkins-zh/jenkins-cli/jcli
+ sudo cp ./release/http-downloader_linux_amd64_v1/hd /usr/local/bin
+
+ # test with fullpath
+ sudo hd install jenkins-zh/jenkins-cli/jcli
  jcli version
+
+ # test with simple path
+ sudo hd i mde
+
+ # test with specific version
+ sudo hd i mde@v0.0.4 -f
  - name: Run Trivy vulnerability scanner
  uses: aquasecurity/trivy-action@0.2.1
  if: github.event_name == 'pull_request'

cmd/fetch.go

@@ -14,7 +14,7 @@ import (
 "github.com/spf13/cobra"
 )
 
-func newFetchCmd(context.Context) (cmd *cobra.Command) {
+func newFetchCmd(ctx context.Context) (cmd *cobra.Command) {
 opt := &fetchOption{
 fetcher: &installer.DefaultFetcher{},
 }
@@ -33,7 +33,7 @@ func newFetchCmd(context.Context) (cmd *cobra.Command) {
 flags.BoolVarP(&opt.reset, "reset", "", false,
 "If you want to reset the hd-config which means delete and clone it again")
 flags.IntVarP(&opt.retry, "retry", "", 6, "Retry times due to timeout error")
-flags.DurationVarP(&opt.timeout, "timeout", "", time.Second*10, "Timeout of fetching")
+flags.DurationVarP(&opt.timeout, "timeout", "", time.Second*60, "Timeout of fetching")
 return
 }
 
@@ -70,7 +70,7 @@ func (o *fetchOption) runE(c *cobra.Command, _ []string) (err error) {
 break
 }
 o.setTimeout(c)
-logger.Print(".")
+c.Print(".")
 }
 if i >= 1 {
 logger.Println()

cmd/root.go

@@ -4,9 +4,11 @@ import (
 "context"
 "fmt"
 "os"
+"path/filepath"
 "runtime"
 
 "github.com/linuxsuren/http-downloader/pkg/log"
+"github.com/mitchellh/go-homedir"
 
 "github.com/AlecAivazis/survey/v2/terminal"
 extver "github.com/linuxsuren/cobra-extension/version"
@@ -30,11 +32,11 @@ func NewRoot(cxt context.Context) (cmd *cobra.Command) {
 }
 cmd.AddGroup(coreGroup, configGroup)
 
-if err := loadConfig(); err != nil {
+v := viper.GetViper()
+if err := loadConfig(v); err != nil {
 panic(err)
 }
 
-v := viper.GetViper()
 stdio := terminal.Stdio{
 Out: os.Stdout,
 In: os.Stdin,
@@ -65,27 +67,33 @@ func registerFlagCompletionFunc(cmd *cobra.Command, flag string, completionFunc
 }
 }
 
-func loadConfig() (err error) {
-viper.SetConfigName("hd")
-viper.SetConfigType("yaml")
-viper.AddConfigPath("$HOME/.config")
-if err = viper.ReadInConfig(); err != nil {
+func loadConfig(v *viper.Viper) (err error) {
+var userHome string
+if userHome, err = homedir.Dir(); err != nil {
+return
+}
+
+configDir := filepath.Join(userHome, ".config")
+v.SetConfigName("hd")
+v.SetConfigType("yaml")
+v.AddConfigPath(configDir)
+if err = v.ReadInConfig(); err != nil {
 if _, ok := err.(viper.ConfigFileNotFoundError); ok {
 // Config file not found; ignore error if desired
 err = nil
 } else {
 err = fmt.Errorf("failed to load config: %s, error: %v", os.ExpandEnv("$HOME/.config/hd.yaml"), err)
 }
 }
-viper.SetDefault("provider", ProviderGitHub)
-viper.SetDefault("fetch", false)
-viper.SetDefault("goget", false)
-viper.SetDefault("no-proxy", false)
+v.SetDefault("provider", ProviderGitHub)
+v.SetDefault("fetch", false)
+v.SetDefault("goget", false)
+v.SetDefault("no-proxy", false)
 
 thread := runtime.NumCPU()
 if thread > 4 {
 thread = thread / 2
 }
-viper.SetDefault("thread", thread)
+v.SetDefault("thread", thread)
 return
 }

cmd/setup.go

@@ -3,11 +3,12 @@ package cmd
 import (
 "fmt"
 "os"
-"path"
+"path/filepath"
 
 "github.com/AlecAivazis/survey/v2"
 "github.com/AlecAivazis/survey/v2/terminal"
 "github.com/linuxsuren/http-downloader/pkg/installer"
+"github.com/linuxsuren/http-downloader/pkg/log"
 "github.com/spf13/cobra"
 "github.com/spf13/viper"
 )
@@ -37,10 +38,10 @@ func (o *setupOption) runE(cmd *cobra.Command, args []string) (err error) {
 provider string
 )
 
+logger := log.GetLoggerFromContextOrDefault(cmd)
 if proxyGitHub, err = selectFromList([]string{"", "ghproxy.com", "gh.api.99988866.xyz", "mirror.ghproxy.com"},
 o.v.GetString("proxy-github"),
 "Select proxy-github", o.stdio); err == nil {
-fmt.Println(proxyGitHub)
 o.v.Set("proxy-github", proxyGitHub)
 } else {
 return
@@ -55,16 +56,17 @@ func (o *setupOption) runE(cmd *cobra.Command, args []string) (err error) {
 
 var configDir string
 fetcher := &installer.DefaultFetcher{}
-if configDir, err = fetcher.GetConfigDir(); err != nil {
+if configDir, err = fetcher.GetHomeDir(); err != nil {
 return
 }
 if err = os.MkdirAll(configDir, 0750); err != nil {
 err = fmt.Errorf("failed to create directory: %s, error: %v", configDir, err)
 return
 }
 
-fmt.Println(o.v.GetString("proxy-github"))
-err = o.v.WriteConfigAs(path.Join(configDir, "hd.yaml"))
+configPath := filepath.Join(configDir, ".config", "hd.yaml")
+logger.Info("write config into:", configPath)
+err = o.v.WriteConfigAs(configPath)
 return
 }
 

pkg/installer/fetch.go

@@ -5,7 +5,7 @@ import (
 "fmt"
 "io"
 "os"
-"path"
+"path/filepath"
 "strings"
 
 "github.com/go-git/go-git/v5/plumbing/object"
@@ -32,6 +32,7 @@ var configRepos = map[string]string{
 // Fetcher is the interface of a fetcher which responses to fetch config files
 type Fetcher interface {
 GetConfigDir() (configDir string, err error)
+GetHomeDir() (homeDir string, err error)
 FetchLatestRepo(provider string, branch string,
 progress io.Writer) (err error)
 SetContext(ctx context.Context)
@@ -45,12 +46,18 @@ type DefaultFetcher struct {
 // GetConfigDir returns the directory of the config
 func (f *DefaultFetcher) GetConfigDir() (configDir string, err error) {
 var userHome string
-if userHome, err = homedir.Dir(); err == nil {
-configDir = path.Join(userHome, fmt.Sprintf(".config%shd-home", string(os.PathSeparator)))
+if userHome, err = f.GetHomeDir(); err == nil {
+configDir = filepath.Join(userHome, fmt.Sprintf(".config%shd-home", string(os.PathSeparator)))
 }
 return
 }
 
+// GetHomeDir returns the user home directory
+func (f *DefaultFetcher) GetHomeDir() (homeDir string, err error) {
+homeDir, err = homedir.Dir()
+return
+}
+
 // SetContext sets the context of the fetch
 func (f *DefaultFetcher) SetContext(ctx context.Context) {
 f.ctx = ctx
@@ -125,6 +132,7 @@ func (f *DefaultFetcher) FetchLatestRepo(provider string, branch string,
 RemoteName: remoteName,
 Progress: progress,
 Force: true,
+Depth: 1,
 }); err != nil && err != git.NoErrAlreadyUpToDate {
 err = fmt.Errorf("failed to fetch '%s', error: %v", remoteName, err)
 return
@@ -184,9 +192,10 @@ func (f *DefaultFetcher) FetchLatestRepo(provider string, branch string,
 _, _ = fmt.Fprintf(progress, "no local config exist, try to clone it\n")
 
 if _, err = git.PlainCloneContext(f.ctx, configDir, false, &git.CloneOptions{
-RemoteName: remoteName,
-URL: repoAddr,
-Progress: progress,
+RemoteName: remoteName,
+URL: repoAddr,
+Progress: progress,
+SingleBranch: true,
 }); err != nil {
 err = fmt.Errorf("failed to clone git repository '%s' into '%s', error: %v", repoAddr, configDir, err)
 }
@@ -213,6 +222,7 @@ func makeSureRemote(name, repoAddr string, repo *git.Repository) (err error) {
 // FakeFetcher is a fake fetch. We expect to use it for unit test cases.
 type FakeFetcher struct {
 ConfigDir string
+HomeDir string
 GetConfigDirErr error
 FetchLatestRepoErr error
 }
@@ -224,6 +234,13 @@ func (f *FakeFetcher) GetConfigDir() (configDir string, err error) {
 return
 }
 
+// GetHomeDir is a fake method
+func (f *FakeFetcher) GetHomeDir() (HomeDir string, err error) {
+HomeDir = f.HomeDir
+err = f.GetConfigDirErr
+return
+}
+
 // FetchLatestRepo is a fake method
 func (f *FakeFetcher) FetchLatestRepo(provider string, branch string,
 progress io.Writer) (err error) {

pkg/installer/fetch_test.go

@@ -3,9 +3,10 @@ package installer
 import (
 "context"
 "fmt"
-"github.com/stretchr/testify/assert"
 "os/user"
 "testing"
+
+"github.com/stretchr/testify/assert"
 )
 
 func TestGetConfigDir(t *testing.T) {
@@ -27,4 +28,8 @@ func TestGetConfigDir(t *testing.T) {
 err = fetcher.FetchLatestRepo("", "", nil)
 assert.Nil(t, err)
 fetcher.SetContext(context.TODO())
+
+dir, err = fetcher.GetHomeDir()
+assert.Equal(t, "", dir)
+assert.Nil(t, err)
 }

pkg/log/level.go

@@ -2,6 +2,7 @@ package log
 
 import (
 "context"
+"fmt"
 syslog "log"
 )
 
@@ -14,13 +15,14 @@ type LevelLog struct {
 // Info prints the info level message.
 // Info level means the level >= 3
 func (l *LevelLog) Info(v ...any) {
+fmt.Println(l.level)
 if l.level >= 3 {
 l.Println(v...)
 }
 }
 
 // Debug prints the debug level message.
-// Debug level means the level >= 3
+// Debug level means the level >= 7
 func (l *LevelLog) Debug(v ...any) {
 if l.level >= 7 {
 l.Println(v...)

pkg/os/installer.go

@@ -2,7 +2,6 @@ package os
 
 import (
 "fmt"
-"path"
 "path/filepath"
 "strings"
 
@@ -35,7 +34,7 @@ func init() {
 var userHome string
 var err error
 if userHome, err = homedir.Dir(); err == nil {
-configDir := path.Join(userHome, "/.config/hd-home")
+configDir := filepath.Join(userHome, "/.config/hd-home")
 if err = GenericInstallerRegistry(filepath.Join(configDir, "config/generic.yaml"), defaultInstallerRegistry); err != nil {
 fmt.Println(err)
 }