Add search and fetch command (#25)

Author: LinuxSuRen

README.md

@@ -5,7 +5,6 @@
 ![GitHub All Releases](https://img.shields.io/github/downloads/linuxsuren/http-downloader/total)
 
 # Get started
-
 `hd` is a HTTP download tool.
 
 Install it via: `brew install linuxsuren/linuxsuren/hd`
@@ -18,24 +17,33 @@ mv hd /usr/local/bin
 
 # Usage
 
+## Download
 ```
 hd get https://github.com/jenkins-zh/jenkins-cli/releases/latest/download/jcli-linux-amd64.tar.gz --thread 6
 ```
 
-Or use a simple way:
+Or use a simple way instead of typing the whole URL:
 
 ```
 hd get jenkins-zh/jenkins-cli/jcli -t 6
 ```
 
-Or you can also install a package from GitHub:
+## Install
+You can also install a package from GitHub:
 
 ```
 hd install jenkins-zh/jenkins-cli/jcli -t 6
 ```
 
-# Features
+## Search
+hd can download or install via the format of `$org/$repo`. If you find that it's not working. It might because of there's 
+no record in [hd-home](https://github.com/LinuxSuRen/hd-home). You're welcome to help us to maintain it.
+
+When you first run it, please init via: `hd fetch`
 
+then you can search it by a keyword: `hd search jenkins`
+
+# Features
 * go library for HTTP
 * multi-thread
 * continuously (TODO)

cmd/fetch.go

@@ -0,0 +1,46 @@
+package cmd
+
+import (
+	"github.com/mitchellh/go-homedir"
+	"github.com/spf13/cobra"
+	"os"
+	"path"
+)
+
+func newFetchCmd() (cmd *cobra.Command) {
+	cmd = &cobra.Command{
+		Use:   "fetch",
+		Short: "Fetch the latest hd config",
+		RunE: func(_ *cobra.Command, _ []string) (err error) {
+			return fetchHomeConfig()
+		},
+	}
+	return
+}
+
+func getConfigDir() (configDir string, err error) {
+	var userHome string
+	if userHome, err = homedir.Dir(); err == nil {
+		configDir = path.Join(userHome, "/.config/hd-home")
+	}
+	return
+}
+
+func fetchHomeConfig() (err error) {
+	var configDir string
+	if configDir, err = getConfigDir(); err != nil {
+		return
+	}
+
+	if ok, _ := pathExists(configDir); ok {
+		err = execCommandInDir("git", configDir, "reset", "--hard", "origin/master")
+		if err == nil {
+			err = execCommandInDir("git", configDir, "pull")
+		}
+	} else {
+		if err = os.MkdirAll(configDir, 0644); err == nil {
+			err = execCommand("git", "clone", "https://github.com/LinuxSuRen/hd-home", configDir)
+		}
+	}
+	return
+}

cmd/get.go

@@ -9,7 +9,6 @@ import (
 	"github.com/spf13/cobra"
 	"io/ioutil"
 	"net/url"
-	"os"
 	"path"
 	"runtime"
 	"strings"
@@ -30,6 +29,8 @@ func NewGetCmd() (cmd *cobra.Command) {
 	// set flags
 	flags := cmd.Flags()
 	flags.StringVarP(&opt.Output, "output", "o", "", "Write output to <file> instead of stdout.")
+	flags.BoolVarP(&opt.Fetch, "fetch", "", true,
+		"If fetch the latest config from https://github.com/LinuxSuRen/hd-home")
 	flags.BoolVarP(&opt.ShowProgress, "show-progress", "", true, "If show the progress of download")
 	flags.Int64VarP(&opt.ContinueAt, "continue-at", "", -1, "ContinueAt")
 	flags.IntVarP(&opt.Thread, "thread", "t", 0,
@@ -199,6 +200,14 @@ func (o *downloadOption) preRunE(cmd *cobra.Command, args []string) (err error)
 		return fmt.Errorf("no URL provided")
 	}
 
+	if o.Fetch {
+		cmd.Println("start to fetch the config")
+		if err = fetchHomeConfig(); err != nil {
+			err = fmt.Errorf("failed with fetching home config: %v", err)
+			return
+		}
+	}
+
 	targetURL := args[0]
 	if !strings.HasPrefix(targetURL, "http://") && !strings.HasPrefix(targetURL, "https://") {
 		if targetURL, err = o.providerURLParse(targetURL); err != nil {
@@ -232,30 +241,3 @@ func (o *downloadOption) runE(cmd *cobra.Command, args []string) (err error) {
 	}
 	return
 }
-
-func (o *downloadOption) fetchHomeConfig() (err error) {
-	userHome, _ := homedir.Dir()
-	configDir := userHome + "/.config/hd-home"
-	if ok, _ := pathExists(configDir); ok {
-		err = execCommandInDir("git", configDir, "reset", "--hard", "origin/master")
-		if err == nil {
-			err = execCommandInDir("git", configDir, "pull")
-		}
-	} else {
-		if err = os.MkdirAll(configDir, 0644); err == nil {
-			err = execCommand("git", "clone", "https://github.com/LinuxSuRen/hd-home", configDir)
-		}
-	}
-	return
-}
-
-func pathExists(path string) (bool, error) {
-	_, err := os.Stat(path)
-	if err == nil {
-		return true, nil
-	}
-	if os.IsNotExist(err) {
-		return false, nil
-	}
-	return false, err
-}

cmd/install.go

@@ -11,7 +11,6 @@ import (
 	"path/filepath"
 	"runtime"
 	"strings"
-	"sync"
 	"syscall"
 )
 
@@ -46,12 +45,6 @@ type installOption struct {
 }
 
 func (o *installOption) preRunE(cmd *cobra.Command, args []string) (err error) {
-	if o.Fetch {
-		if err = o.fetchHomeConfig(); err != nil {
-			err = fmt.Errorf("failed with fetching home config: %v", err)
-			return
-		}
-	}
 	err = o.downloadOption.preRunE(cmd, args)
 	return
 }
@@ -156,63 +149,3 @@ func (o *installOption) extractFiles(tarFile, targetName string) (err error) {
 	}
 	return
 }
-
-func execCommandInDir(name, dir string, arg ...string) (err error) {
-	command := exec.Command(name, arg...)
-	if dir != "" {
-		command.Dir = dir
-	}
-
-	//var stdout []byte
-	//var errStdout error
-	stdoutIn, _ := command.StdoutPipe()
-	stderrIn, _ := command.StderrPipe()
-	err = command.Start()
-	if err != nil {
-		return err
-	}
-
-	// cmd.Wait() should be called only after we finish reading
-	// from stdoutIn and stderrIn.
-	// wg ensures that we finish
-	var wg sync.WaitGroup
-	wg.Add(1)
-	go func() {
-		_, _ = copyAndCapture(os.Stdout, stdoutIn)
-		wg.Done()
-	}()
-
-	_, _ = copyAndCapture(os.Stderr, stderrIn)
-
-	wg.Wait()
-
-	err = command.Wait()
-	return
-}
-
-func execCommand(name string, arg ...string) (err error) {
-	return execCommandInDir(name, "", arg...)
-}
-
-func copyAndCapture(w io.Writer, r io.Reader) ([]byte, error) {
-	var out []byte
-	buf := make([]byte, 1024, 1024)
-	for {
-		n, err := r.Read(buf[:])
-		if n > 0 {
-			d := buf[:n]
-			out = append(out, d...)
-			_, err := w.Write(d)
-			if err != nil {
-				return out, err
-			}
-		}
-		if err != nil {
-			// Read returns io.EOF at the end of file, which is not an error for us
-			if err == io.EOF {
-				err = nil
-			}
-			return out, err
-		}
-	}
-}

cmd/root.go

@@ -13,7 +13,7 @@ func NewRoot() (cmd *cobra.Command) {
 	}
 
 	cmd.AddCommand(
-		NewGetCmd(), NewInstallCmd(),
+		NewGetCmd(), NewInstallCmd(), newFetchCmd(), newSearchCmd(),
 		extver.NewVersionCmd("linuxsuren", "http-downloader", "hd", nil))
 	return
 }

cmd/search.go

@@ -0,0 +1,47 @@
+package cmd
+
+import (
+	"fmt"
+	"github.com/spf13/cobra"
+	"path"
+	"path/filepath"
+	"strings"
+)
+
+func newSearchCmd() (cmd *cobra.Command) {
+	cmd = &cobra.Command{
+		Use:   "search",
+		Short: "Search packages from the hd config repo",
+		Args:  cobra.MinimumNArgs(1),
+		RunE: func(_ *cobra.Command, args []string) (err error) {
+			err = search(args[0])
+			return
+		},
+	}
+	return
+}
+
+func search(keyword string) (err error) {
+	var configDir string
+	if configDir, err = getConfigDir(); err != nil {
+		// TODO consider how to deal with the situation when config repo is not exists
+		return
+	}
+
+	var files []string
+	if files, err = filepath.Glob(path.Join(configDir, "config/**/*.yml")); err == nil {
+		for _, metaFile := range files {
+			ext := path.Ext(metaFile)
+			fileName := path.Base(metaFile)
+			org := path.Base(path.Dir(metaFile))
+			repo := strings.TrimSuffix(fileName, ext)
+
+			if !strings.Contains(repo, keyword) {
+				continue
+			}
+
+			fmt.Println(path.Join(org, repo))
+		}
+	}
+	return
+}

cmd/util.go

@@ -1,5 +1,12 @@
 package cmd
 
+import (
+	"io"
+	"os"
+	"os/exec"
+	"sync"
+)
+
 func getOrDefault(key, def string, data map[string]string) (result string) {
 	var ok bool
 	if result, ok = data[key]; !ok {
@@ -11,3 +18,74 @@ func getOrDefault(key, def string, data map[string]string) (result string) {
 func getReplacement(key string, data map[string]string) (result string) {
 	return getOrDefault(key, key, data)
 }
+
+func pathExists(path string) (bool, error) {
+	_, err := os.Stat(path)
+	if err == nil {
+		return true, nil
+	}
+	if os.IsNotExist(err) {
+		return false, nil
+	}
+	return false, err
+}
+
+func execCommandInDir(name, dir string, arg ...string) (err error) {
+	command := exec.Command(name, arg...)
+	if dir != "" {
+		command.Dir = dir
+	}
+
+	//var stdout []byte
+	//var errStdout error
+	stdoutIn, _ := command.StdoutPipe()
+	stderrIn, _ := command.StderrPipe()
+	err = command.Start()
+	if err != nil {
+		return err
+	}
+
+	// cmd.Wait() should be called only after we finish reading
+	// from stdoutIn and stderrIn.
+	// wg ensures that we finish
+	var wg sync.WaitGroup
+	wg.Add(1)
+	go func() {
+		_, _ = copyAndCapture(os.Stdout, stdoutIn)
+		wg.Done()
+	}()
+
+	_, _ = copyAndCapture(os.Stderr, stderrIn)
+
+	wg.Wait()
+
+	err = command.Wait()
+	return
+}
+
+func execCommand(name string, arg ...string) (err error) {
+	return execCommandInDir(name, "", arg...)
+}
+
+func copyAndCapture(w io.Writer, r io.Reader) ([]byte, error) {
+	var out []byte
+	buf := make([]byte, 1024, 1024)
+	for {
+		n, err := r.Read(buf[:])
+		if n > 0 {
+			d := buf[:n]
+			out = append(out, d...)
+			_, err := w.Write(d)
+			if err != nil {
+				return out, err
+			}
+		}
+		if err != nil {
+			// Read returns io.EOF at the end of file, which is not an error for us
+			if err == io.EOF {
+				err = nil
+			}
+			return out, err
+		}
+	}
+}