feat: code cleanup + resume bug fix

Signed-off-by: abzcoding <[email protected]>

Author: abzcoding

Makefile

@@ -1,26 +1,30 @@
-COMMIT = $$(git describe --always)
+COMMIT := $(shell git describe --always)
+BINARY := hget
+BINDIR := bin
+INSTALL_PATH := /usr/local/bin
+
+.PHONY: all clean build install test deps
+
+all: build
 
 deps:
-	@echo "====> Install dependencies..."
-	go get github.com/fatih/color
-	go get github.com/mattn/go-colorable
-	go get github.com/mattn/go-isatty
-	go get github.com/fatih/color
-	go get gopkg.in/cheggaaa/pb.v1
-	go get github.com/mattn/go-isatty
-	go get github.com/imkira/go-task
-	go get github.com/fujiwara/shapeio
-	go get github.com/alecthomas/units
+	@echo "====> Updating dependencies..."
+	go mod tidy
 
 clean:
-	@echo "====> Remove installed binary"
-	rm -f bin/hget
+	@echo "====> Removing installed binary"
+	rm -f $(BINDIR)/$(BINARY)
+
+test:
+	@echo "====> Running tests..."
+	go test -v ./...
 
 build: deps
-	@echo "====> Build hget in ./bin "
-	go build -ldflags "-X main.GitCommit=\"$(COMMIT)\"" -o bin/hget
+	@echo "====> Building $(BINARY) in ./$(BINDIR)"
+	mkdir -p $(BINDIR)
+	go build -ldflags "-X main.GitCommit=\"$(COMMIT)\"" -o $(BINDIR)/$(BINARY)
 
 install: build
-	@echo "====> Installing hget in /usr/local/bin/hget"
-	chmod +x ./bin/hget
-	sudo mv ./bin/hget /usr/local/bin/hget
+	@echo "====> Installing $(BINARY) in $(INSTALL_PATH)/$(BINARY)"
+	chmod +x ./$(BINDIR)/$(BINARY)
+	sudo mv ./$(BINDIR)/$(BINARY) $(INSTALL_PATH)/$(BINARY)

http.go

@@ -21,13 +21,6 @@ import (
 	pb "gopkg.in/cheggaaa/pb.v1"
 )
 
-var (
-	tr = &http.Transport{
-		TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
-	}
-	client = &http.Client{Transport: tr}
-)
-
 var (
 	acceptRangeHeader   = "Accept-Ranges"
 	contentLengthHeader = "Content-Length"
@@ -50,7 +43,7 @@ type HTTPDownloader struct {
 // NewHTTPDownloader returns a ProxyAwareHttpClient with given configurations.
 func NewHTTPDownloader(url string, par int, skipTLS bool, proxyServer string, bwLimit string) *HTTPDownloader {
 	var resumable = true
-	client := ProxyAwareHTTPClient(proxyServer)
+	client := ProxyAwareHTTPClient(proxyServer, skipTLS)
 
 	parsed, err := stdurl.Parse(url)
 	FatalCheck(err)
@@ -146,8 +139,10 @@ func partCalculate(par int64, len int64, url string) []Part {
 }
 
 // ProxyAwareHTTPClient returns an HTTP client that may use an HTTP or SOCKS5 proxy.
-func ProxyAwareHTTPClient(proxyServer string) *http.Client {
-	httpTransport := &http.Transport{}
+func ProxyAwareHTTPClient(proxyServer string, skipTLS bool) *http.Client {
+	httpTransport := &http.Transport{
+		TLSClientConfig: &tls.Config{InsecureSkipVerify: skipTLS},
+	}
 	httpClient := &http.Client{Transport: httpTransport}
 	var dialer proxy.Dialer = proxy.Direct
 
@@ -234,7 +229,7 @@ func (d *HTTPDownloader) downloadPart(part Part, bar *pb.ProgressBar, wg *sync.W
 		return
 	}
 
-	client := ProxyAwareHTTPClient(d.proxy)
+	client := ProxyAwareHTTPClient(d.proxy, d.skipTLS)
 	resp, err := client.Do(req)
 	if err != nil {
 		errorChan <- err

main.go

@@ -19,7 +19,7 @@ func main() {
 	var proxy, filePath, bwLimit, resumeTask string
 
 	conn := flag.Int("n", runtime.NumCPU(), "number of connections")
-	skiptls := flag.Bool("skip-tls", true, "skip certificate verification for https")
+	skiptls := flag.Bool("skip-tls", false, "skip certificate verification for https")
 	flag.StringVar(&proxy, "proxy", "", "proxy for downloading, e.g. -proxy '127.0.0.1:12345' for socks5 or -proxy 'http://proxy.com:8080' for http proxy")
 	flag.StringVar(&filePath, "file", "", "path to a file that contains one URL per line")
 	flag.StringVar(&bwLimit, "rate", "", "bandwidth limit during download, e.g. -rate 10kB or -rate 10MiB")
@@ -161,7 +161,7 @@ hget [options] --resume=TaskName
 
 Options:
   -n int          number of connections (default number of CPUs)
-  -skip-tls bool  skip certificate verification for https (default true)
+  -skip-tls bool  skip certificate verification for https (default false)
   -proxy string   proxy address (e.g., '127.0.0.1:12345' for socks5 or 'http://proxy.com:8080')
   -file string    file path containing URLs (one per line)
   -rate string    bandwidth limit during download (e.g., 10kB, 10MiB)

resume.go

@@ -4,13 +4,18 @@ import (
 	"fmt"
 	"io/ioutil"
 	"os"
+	"os/user"
 	"path/filepath"
 	"strings"
 )
 
 // TaskPrint reads and prints data about current download jobs.
 func TaskPrint() error {
-	downloadingPath := filepath.Join(os.Getenv("HOME"), dataFolder)
+	usr, err := user.Current()
+	FatalCheck(err)
+	homeDir := usr.HomeDir
+
+	downloadingPath := filepath.Join(homeDir, dataFolder)
 	downloading, err := ioutil.ReadDir(downloadingPath)
 	if err != nil {
 		return err

state.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"io/ioutil"
 	"os"
+	"os/user"
 	"path/filepath"
 )
 
@@ -37,7 +38,10 @@ func (s *State) Save() error {
 
 	//move current downloading file to data folder
 	for _, part := range s.Parts {
-		os.Rename(part.Path, filepath.Join(folder, filepath.Base(part.Path)))
+		err := os.Rename(part.Path, filepath.Join(folder, filepath.Base(part.Path)))
+		if err != nil {
+			return err
+		}
 	}
 
 	//save state file
@@ -50,7 +54,14 @@ func (s *State) Save() error {
 
 // Read loads data about the state of downloaded files
 func Read(task string) (*State, error) {
-	file := filepath.Join(os.Getenv("HOME"), dataFolder, task, stateFileName)
+	usr, err := user.Current()
+	FatalCheck(err)
+	homeDir := usr.HomeDir
+
+	// extract filename from task
+	taskName := TaskFromURL(task)
+
+	file := filepath.Join(homeDir, dataFolder, taskName, stateFileName)
 	Printf("Getting data from %s\n", file)
 	bytes, err := ioutil.ReadFile(file)
 	if err != nil {

util.go

@@ -5,6 +5,7 @@ import (
 	"net"
 	"net/url"
 	"os"
+	"os/user"
 	"path/filepath"
 	"strings"
 
@@ -53,13 +54,16 @@ func DisplayProgressBar() bool {
 
 // FolderOf makes sure you won't get LFI
 func FolderOf(urlStr string) string {
-	safePath := filepath.Join(os.Getenv("HOME"), dataFolder)
+	usr, err := user.Current()
+	FatalCheck(err)
+	homeDir := usr.HomeDir
+	safePath := filepath.Join(homeDir, dataFolder)
 
 	// Extract the last path from the URL, excluding parameters.
 	// eg: URL_ADDRESS.com/path/to/file?param=value -> file
 	cleanPath := TaskFromURL(urlStr)
 
-	fullQualifyPath, err := filepath.Abs(filepath.Join(os.Getenv("HOME"), dataFolder, cleanPath))
+	fullQualifyPath, err := filepath.Abs(filepath.Join(homeDir, dataFolder, cleanPath))
 	FatalCheck(err)
 
 	//must ensure full qualify path is CHILD of safe path