Merge pull request #29 from zhifengle/new

Remove useless code from Download func

main.go

@@ -127,6 +127,9 @@ func commands() []cli.Command {
 			ShortName: "i",
 			Usage:     "Install available remote jdk",
 			Action: func(c *cli.Context) error {
+				if config.Proxy != "" {
+					web.SetProxy(config.Proxy)
+				}
 				v := c.Args().Get(0)
 				if v == "" {
 					return errors.New("invalid version., Type \"jvms rls\" to see what is available for install")
@@ -357,6 +360,9 @@ func startup(c *cli.Context) error {
 	if config.Originalpath == "" {
 		config.Originalpath = defaultOriginalpath
 	}
+	if config.Proxy != "" {
+		web.SetProxy(config.Proxy)
+	}
 	return nil
 }
 

utils/web/web.go

@@ -3,15 +3,15 @@ package web
 import (
 	"errors"
 	"fmt"
-	pb "gopkg.in/cheggaaa/pb.v1"
 	"io"
 	"io/ioutil"
 	"net/http"
 	"net/url"
 	"os"
 	"path/filepath"
-	"strconv"
 	"time"
+
+	pb "gopkg.in/cheggaaa/pb.v1"
 )
 
 var client = &http.Client{}
@@ -26,25 +26,26 @@ func SetProxy(p string) {
 }
 
 func Download(url string, target string) bool {
-	output, err := os.Create(target)
+	response, err := client.Get(url)
 	if err != nil {
-		fmt.Println("Error while creating", target, "-", err)
+		fmt.Println("Error while downloading", url, "-", err)
 		return false
 	}
-	defer output.Close()
+	if response.StatusCode != 200 {
+		fmt.Println("Error status while downloading", url, "-", response.StatusCode)
+		return false
+	}
+	defer response.Body.Close()
 
-	response, err := client.Get(url)
+	output, err := os.Create(target)
 	if err != nil {
-		fmt.Println("Error while downloading", url, "-", err)
+		fmt.Println("Error while creating", target, "-", err)
 		return false
 	}
-	defer response.Body.Close()
+	defer output.Close()
 
-	// 获取下载文件的大小
-	i, _ := strconv.Atoi(response.Header.Get("Content-Length"))
-	sourceSiz := int64(i)
 	// 创建一个进度条
-	bar := pb.New(int(sourceSiz)).SetUnits(pb.U_BYTES_DEC).SetRefreshRate(time.Millisecond * 10)
+	bar := pb.New(int(response.ContentLength)).SetUnits(pb.U_BYTES_DEC).SetRefreshRate(time.Millisecond * 10)
 	// 显示下载速度
 	bar.ShowSpeed = true
 
@@ -64,14 +65,6 @@ func Download(url string, target string) bool {
 		return false
 	}
 	bar.Finish()
-	if response.Status[0:3] != "200" {
-		fmt.Println("Download failed. Rolling Back.")
-		err := os.Remove(target)
-		if err != nil {
-			fmt.Println("Rollback failed.", err)
-		}
-		return false
-	}
 
 	return true
 }