增加任务取回功能

pkg/saashttp/cfg.go

@@ -1,16 +1,17 @@
 package saashttp
 
 type ApiUrls struct {
-	BaseUrl         string
-	WritePath       string
-	ReadPath        string
-	ColumnWritePath string
-	TaskCreatePath  string
-	TaskListPath    string
-	TaskInfoPath    string
-	TaskDeletePath  string
-	TaskRunPath     string
-	TaskUploadPath  string
+	BaseUrl          string
+	WritePath        string
+	ReadPath         string
+	ColumnWritePath  string
+	TaskCreatePath   string
+	TaskListPath     string
+	TaskInfoPath     string
+	TaskDeletePath   string
+	TaskRunPath      string
+	TaskUploadPath   string
+	TaskDownloadPath string
 }
 
 type Auth struct {

pkg/saashttp/httpcli.go

@@ -12,6 +12,7 @@ import (
 	"net/url"
 	"os"
 	"strconv"
+	"strings"
 	"time"
 
 	"e.coding.net/rta/public/saasapi"
@@ -77,6 +78,11 @@ func (c *SaasClient) TaskUpload(sha256 string, file *os.File, offset int64, size
 	return c.upload(postUrl, file, offset, size)
 }
 
+func (c *SaasClient) TaskDownload(sha256 string, file *os.File, offset int64, size int) (saasRes *saasapi.SaasRes, err error) {
+	postUrl := c.makeUrl(c.ApiUrls.BaseUrl, c.ApiUrls.TaskDownloadPath, "sha256", sha256)
+	return c.download(postUrl, file, offset, size)
+}
+
 func (c *SaasClient) makeUrl(baseUrl, path string, params ...string) string {
 	url, err := url.Parse(baseUrl)
 	if err != nil {
@@ -232,3 +238,86 @@ func (c *SaasClient) upload(url string, file *os.File, offset int64, size int) (
 
 	return saasRes, nil
 }
+
+func (c *SaasClient) download(url string, file *os.File, offset int64, size int) (saasRes *saasapi.SaasRes, err error) {
+	if file == nil {
+		return nil, fmt.Errorf("file is nil")
+	}
+
+	if size <= 0 {
+		return nil, fmt.Errorf("size is invalid")
+	}
+
+	req, err := http.NewRequest("GET", url, bytes.NewBuffer([]byte{}))
+	if err != nil {
+		fmt.Println("http new request error", err)
+		return nil, err
+	}
+
+	timeStamp := strconv.FormatInt(time.Now().Unix(), 10)
+	md5byte := md5.Sum([]byte(c.Auth.Account + c.Auth.Token + timeStamp))
+	authorization := hex.EncodeToString(md5byte[:])
+
+	req.Header.Add("Account", c.Auth.Account)
+	req.Header.Add("Time", timeStamp)
+	req.Header.Add("Authorization", authorization)
+	req.Header.Add("Accept-Encoding", "gzip")
+
+	res, err := c.Client.Do(req)
+	if err != nil {
+		fmt.Println("http send error", err)
+		return nil, err
+	}
+
+	defer res.Body.Close()
+
+	if res.StatusCode != 200 {
+		err = fmt.Errorf("NOT 200. %v", res.StatusCode)
+		fmt.Println("http state error", err)
+		return nil, err
+	}
+
+	bodyReader := res.Body
+	if strings.Contains(res.Header.Get("Content-Encoding"), "gzip") {
+		gz, err := gzip.NewReader(res.Body)
+		if err != nil {
+			fmt.Println("gzip newreader error", err)
+			return nil, err
+		}
+		defer gz.Close()
+		bodyReader = gz
+	}
+
+	resBody, err := io.ReadAll(bodyReader)
+	if err != nil {
+		fmt.Println("read body error", err)
+		return nil, err
+	}
+	saasRes = &saasapi.SaasRes{}
+
+	if strings.Contains(res.Header.Get("Content-Type"), "application/octet-stream") {
+		if len(resBody) == size {
+			file.WriteAt(resBody, offset)
+		} else {
+			err = fmt.Errorf("body size error. body:%v, want:%v", len(resBody), size)
+			fmt.Println("http read body error", err)
+			return nil, err
+		}
+	} else {
+		if c.ResponseEncoder == RESPONSE_ENCODER_PROTOBUF {
+			err = proto.Unmarshal(resBody, saasRes)
+			if err != nil {
+				fmt.Println("unmarshal response body to protobuf error", err)
+				return nil, err
+			}
+		} else {
+			err = json.Unmarshal(resBody, saasRes)
+			if err != nil {
+				fmt.Println("unmarshal response body to json error", err)
+				return nil, err
+			}
+		}
+	}
+
+	return saasRes, nil
+}