feat: support to set the file mod (#347)

Usage: hd get https://xxx --mod 0755

Author: LinuxSuRen

cmd/fetch.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"github.com/linuxsuren/http-downloader/pkg"
+	"github.com/linuxsuren/http-downloader/pkg/log"
 	"os"
 	"strings"
 	"time"
@@ -59,6 +60,8 @@ func (o *fetchOption) preRunE(c *cobra.Command, _ []string) (err error) {
 }
 
 func (o *fetchOption) runE(c *cobra.Command, _ []string) (err error) {
+	logger := log.GetLoggerFromContextOrDefault(c)
+
 	var i int
 	for i = 0; i < o.retry; i++ {
 		err = o.fetcher.FetchLatestRepo(o.Provider, o.branch, c.OutOrStdout())
@@ -67,10 +70,10 @@ func (o *fetchOption) runE(c *cobra.Command, _ []string) (err error) {
 			break
 		}
 		o.setTimeout(c)
-		c.Print(".")
+		logger.Print(".")
 	}
 	if i >= 1 {
-		c.Println()
+		logger.Println()
 	}
 	return
 }

cmd/get.go

@@ -4,7 +4,10 @@ import (
 	"bytes"
 	"context"
 	"fmt"
+	"github.com/linuxsuren/http-downloader/pkg/common"
+	"github.com/linuxsuren/http-downloader/pkg/log"
 	"io"
+	"io/fs"
 	"net/http"
 	"net/url"
 	sysos "os"
@@ -45,6 +48,8 @@ func newGetCmd(ctx context.Context) (cmd *cobra.Command) {
 		"If you accept preRelease as the binary asset from GitHub")
 	flags.BoolVarP(&opt.AcceptPreRelease, "pre", "", false,
 		"Same with option --accept-preRelease")
+	flags.BoolVarP(&opt.Force, "force", "f", false, "Overwrite the exist file if this is true")
+	flags.IntVarP(&opt.Mod, "mod", "", -1, "The file permission, -1 means using the system default")
 
 	flags.IntVarP(&opt.Timeout, "time", "", 10,
 		`The default timeout in seconds with the HTTP request`)
@@ -99,6 +104,8 @@ type downloadOption struct {
 	AcceptPreRelease bool
 	RoundTripper     http.RoundTripper
 	Magnet           bool
+	Force            bool
+	Mod              int
 
 	ContinueAt int64
 
@@ -233,6 +240,7 @@ func findAnchor(n *html.Node) (items []string) {
 }
 
 func (o *downloadOption) runE(cmd *cobra.Command, args []string) (err error) {
+	logger := log.GetLoggerFromContextOrDefault(cmd)
 	defer func() {
 		if o.cancel != nil {
 			o.cancel()
@@ -271,6 +279,13 @@ func (o *downloadOption) runE(cmd *cobra.Command, args []string) (err error) {
 		return
 	}
 
+	// check if want to overwrite the exist file
+	logger.Println("output file is", o.Output)
+	if common.Exist(o.Output) && !o.Force {
+		logger.Printf("The output file: '%s' was exist, please use flag --force if you want to overwrite it.\n", o.Output)
+		return
+	}
+
 	if o.Magnet || strings.HasPrefix(o.URL, "magnet:?") {
 		err = downloadMagnetFile(o.ProxyGitHub, o.URL, o.execer)
 		return
@@ -279,8 +294,9 @@ func (o *downloadOption) runE(cmd *cobra.Command, args []string) (err error) {
 	targetURL := o.URL
 	if o.ProxyGitHub != "" {
 		targetURL = strings.Replace(targetURL, "github.com", fmt.Sprintf("%s/github.com", o.ProxyGitHub), 1)
+		targetURL = strings.Replace(targetURL, "raw.githubusercontent.com", fmt.Sprintf("%s/https://raw.githubusercontent.com", o.ProxyGitHub), 1)
 	}
-	cmd.Printf("start to download from %s\n", targetURL)
+	logger.Printf("start to download from %s\n", targetURL)
 	if o.Thread <= 1 {
 		downloader := &net.ContinueDownloader{}
 		downloader.WithoutProxy(o.NoProxy).
@@ -294,6 +310,11 @@ func (o *downloadOption) runE(cmd *cobra.Command, args []string) (err error) {
 			WithRoundTripper(o.RoundTripper)
 		err = downloader.Download(targetURL, o.Output, o.Thread)
 	}
+
+	// set file permission
+	if o.Mod != -1 {
+		err = sysos.Chmod(o.Output, fs.FileMode(o.Mod))
+	}
 	return
 }
 

cmd/install.go

@@ -11,6 +11,7 @@ import (
 	"github.com/linuxsuren/http-downloader/pkg/version"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
+	"log"
 	sysos "os"
 	"path"
 	"runtime"
@@ -89,7 +90,13 @@ func (o *installOption) shouldInstall() (should, exist bool) {
 	var greater bool
 	if name, lookErr := o.execer.LookPath(o.tool); lookErr == nil {
 		exist = true
-		if data, err := o.execer.Command(name, "version"); err == nil &&
+		versionCmd := "version"
+		if o.downloadOption != nil && o.downloadOption.Package != nil && o.downloadOption.Package.VersionCmd != "" {
+			versionCmd = o.downloadOption.Package.VersionCmd
+		}
+
+		log.Println("check target version via", name, versionCmd)
+		if data, err := o.execer.Command(name, versionCmd); err == nil &&
 			(o.downloadOption.Package != nil && o.downloadOption.Package.Version != "") {
 			greater = version.GreatThan(o.downloadOption.Package.Version, string(data))
 		}
@@ -160,6 +167,7 @@ func (o *installOption) install(cmd *cobra.Command, args []string) (err error) {
 
 	// install a package from hd-home
 	if o.Download {
+		log.Println("check if it should be installed")
 		if should, exist := o.shouldInstall(); !should {
 			if exist {
 				cmd.Printf("%s is already exist, please use the flag --force if you install it again\n", o.tool)
@@ -175,7 +183,7 @@ func (o *installOption) install(cmd *cobra.Command, args []string) (err error) {
 	if o.Package == nil {
 		o.Package = &installer.HDConfig{}
 	}
-	if o.target != "" {
+	if o.target != "" && o.Package.TargetDirectory == "" {
 		o.Package.TargetDirectory = o.target
 	}
 	if o.Package.TargetDirectory == "" {
@@ -185,6 +193,7 @@ func (o *installOption) install(cmd *cobra.Command, args []string) (err error) {
 		return
 	}
 
+	log.Println("target directory", o.Package.TargetDirectory)
 	process := &installer.Installer{
 		Source:           o.downloadOption.Output,
 		Name:             o.name,

cmd/root.go

@@ -3,6 +3,7 @@ package cmd
 import (
 	"context"
 	"fmt"
+	"github.com/linuxsuren/http-downloader/pkg/log"
 	"os"
 	"runtime"
 
@@ -31,6 +32,7 @@ func NewRoot(cxt context.Context) (cmd *cobra.Command) {
 		Err: os.Stderr,
 	}
 
+	cxt = context.WithValue(cxt, log.LoggerContextKey, log.GetLogger())
 	cmd.AddCommand(
 		newGetCmd(cxt), newInstallCmd(cxt), newFetchCmd(cxt), newSearchCmd(cxt), newSetupCommand(v, stdio),
 		extver.NewVersionCmd("linuxsuren", "http-downloader", "hd", nil),

cmd/setup.go

@@ -35,9 +35,10 @@ func (o *setupOption) runE(cmd *cobra.Command, args []string) (err error) {
 		provider    string
 	)
 
-	if proxyGitHub, err = selectFromList([]string{"ghproxy.com", "gh.api.99988866.xyz", "mirror.ghproxy.com", ""},
+	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
@@ -56,6 +57,7 @@ func (o *setupOption) runE(cmd *cobra.Command, args []string) (err error) {
 		return
 	}
 
+	fmt.Println(o.v.GetString("proxy-github"))
 	err = o.v.WriteConfigAs(path.Join(configDir, "hd.yaml"))
 	return
 }

go.mod

@@ -27,6 +27,8 @@ require (
 	github.com/creack/pty v1.1.17
 )
 
+require github.com/prometheus/client_golang v1.11.1 // indirect
+
 require (
 	github.com/Microsoft/go-winio v0.4.16 // indirect
 	github.com/Netflix/go-expect v0.0.0-20220104043353-73e0943537d2