fix tests

.github/workflows/lint.yml

@@ -13,7 +13,7 @@ jobs:
         uses: golangci/golangci-lint-action@v3
         with:
           # Optional: golangci-lint command line arguments.
-          version: v1.47.3
+          version: latest
           args:
           # Optional: working directory, useful for monorepos
           # working-directory: somedir

go.mod

@@ -1,3 +1,3 @@
 module github.com/upyun/go-sdk/v3
 
-go 1.13
+go 1.17

upyun/errors.go

@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 )
 
@@ -35,7 +35,7 @@ func checkResponse(res *http.Response) error {
 	uerr.StatusCode = res.StatusCode
 	uerr.Header = res.Header
 	defer res.Body.Close()
-	slurp, err := ioutil.ReadAll(res.Body)
+	slurp, err := io.ReadAll(res.Body)
 	if err != nil {
 		return uerr
 	}

upyun/form.go

@@ -5,7 +5,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"mime/multipart"
 	"net/http"
 	"os"
@@ -91,7 +90,7 @@ func (up *UpYun) FormUpload(config *FormUploadConfig) (*FormUploadResp, error) {
 		return nil, err
 	}
 
-	b, err := ioutil.ReadAll(resp.Body)
+	b, err := io.ReadAll(resp.Body)
 	resp.Body.Close()
 
 	if err != nil {

upyun/process.go

@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"path"
 	"strings"
@@ -131,7 +131,7 @@ func (up *UpYun) doProcessRequest(method, uri string,
 		return errorOperation("process", err)
 	}
 
-	b, err := ioutil.ReadAll(resp.Body)
+	b, err := io.ReadAll(resp.Body)
 	resp.Body.Close()
 	if err != nil {
 		return errorOperation("process read body", err)
@@ -215,7 +215,7 @@ func (up *UpYun) doSyncProcessRequest(method, uri string, payload string) (map[s
 		return nil, errorOperation("sync process", err)
 	}
 
-	b, err := ioutil.ReadAll(resp.Body)
+	b, err := io.ReadAll(resp.Body)
 	resp.Body.Close()
 	if err != nil {
 		return nil, err

upyun/process_test.go

@@ -2,7 +2,7 @@ package upyun
 
 import (
 	"encoding/json"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"path"
 	"testing"
@@ -69,7 +69,7 @@ func TestNagaResult(t *testing.T) {
 	Equal(t, len(res), 2)
 }
 
-//由于是异步操作，不能确保文件已存在
+// 由于是异步操作，不能确保文件已存在
 func TestImgaudit(t *testing.T) {
 	task := map[string]interface{}{
 		"url":     JPG_URL,
@@ -99,7 +99,7 @@ func TestImgaudit(t *testing.T) {
 
 }
 
-//由于是异步操作，不能确保文件已存在
+// 由于是异步操作，不能确保文件已存在
 func TestVideoaudit(t *testing.T) {
 	task := map[string]interface{}{
 		"url":     MP4_URL,
@@ -156,7 +156,7 @@ func TestFaceDetect(t *testing.T) {
 	resp, err := http.Get(FACE_URL + "!/face/detection")
 	Nil(t, err)
 	defer resp.Body.Close()
-	b, err := ioutil.ReadAll(resp.Body)
+	b, err := io.ReadAll(resp.Body)
 	Nil(t, err)
 	if err != nil {
 		var result map[string]interface{}

upyun/purge.go

@@ -2,7 +2,7 @@ package upyun
 
 import (
 	"encoding/json"
-	"io/ioutil"
+	"io"
 	URL "net/url"
 	"strings"
 	"time"
@@ -33,7 +33,7 @@ func (up *UpYun) Purge(urls []string) (fails []string, err error) {
 	}
 	defer resp.Body.Close()
 
-	content, err := ioutil.ReadAll(resp.Body)
+	content, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return fails, errorOperation("purge read body", err)
 	}

upyun/rest.go

@@ -7,7 +7,6 @@ import (
 	"fmt"
 	"io"
 	"io/fs"
-	"io/ioutil"
 	"net"
 	"net/http"
 	"os"
@@ -79,7 +78,7 @@ type GetRequestConfig struct {
 	Headers map[string]string
 }
 
-type ProxyReader func(size, offset int64, r io.Reader) io.Reader
+type ProxyReader func(offset int64, r io.Reader) io.Reader
 
 // PutObjectConfig provides a configuration to Put method.
 type PutObjectConfig struct {
@@ -281,17 +280,18 @@ func getPartInfo(partSize, fsize int64) (int64, int64, error) {
 	return partSize, partNum, nil
 }
 
-func (up *UpYun) getMultipartUploadProcess(config *PutObjectConfig, fsize int64) (*ResumeProcessResult, error) {
+func (up *UpYun) getMultipartUploadProcess(config *PutObjectConfig, fileinfo os.FileInfo) (*ResumeProcessResult, error) {
 	resumeProcessResult, _ := up.GetResumeProcess(config.Path)
-	if resumeProcessResult != nil {
-		if resumeProcessResult.Order {
+	if resumeProcessResult != nil && resumeProcessResult.Order {
+		if fileinfo.Size() == resumeProcessResult.Size && fileinfo.ModTime().Unix() <= resumeProcessResult.CreateTime.Unix() {
+			// fmt.Printf("continue process: %s next: %d\n", config.Path, resumeProcessResult.NextPartID)
 			return resumeProcessResult, nil
 		}
 	}
 
 	initMultipartUploadConfig := &InitMultipartUploadConfig{
 		Path:          config.Path,
-		ContentLength: fsize,
+		ContentLength: fileinfo.Size(),
 		PartSize:      config.ResumePartSize,
 		ContentType:   config.Headers["Content-Type"],
 		OrderUpload:   true,
@@ -341,7 +341,7 @@ func (up *UpYun) resumePut(config *PutObjectConfig) error {
 	maxPartID := int((fsize+config.ResumePartSize-1)/config.ResumePartSize - 1)
 
 	if breakpoint == nil || isRecordExpired(fileinfo, breakpoint) {
-		uploadProcess, err := up.getMultipartUploadProcess(config, fsize)
+		uploadProcess, err := up.getMultipartUploadProcess(config, fileinfo)
 		if err != nil {
 			return err
 		}
@@ -532,7 +532,7 @@ func (up *UpYun) ListMultipartUploads(config *ListMultipartConfig) (*ListMultipa
 		return nil, errorOperation("list multipart", err)
 	}
 
-	body, err := ioutil.ReadAll(res.Body)
+	body, err := io.ReadAll(res.Body)
 	if err != nil {
 		return nil, errorOperation("list multipart read body", err)
 	}
@@ -563,7 +563,7 @@ func (up *UpYun) ListMultipartParts(intiResult *InitMultipartUploadResult, confi
 		return nil, errorOperation("list multipart parts", err)
 	}
 
-	body, err := ioutil.ReadAll(res.Body)
+	body, err := io.ReadAll(res.Body)
 	if err != nil {
 		return nil, errorOperation("list multipart parts read body", err)
 	}
@@ -688,7 +688,7 @@ func (up *UpYun) List(config *GetObjectsConfig) error {
 			return errorOperation("list", err)
 		}
 
-		b, err := ioutil.ReadAll(resp.Body)
+		b, err := io.ReadAll(resp.Body)
 		resp.Body.Close()
 		if err != nil {
 			return errorOperation("list read body", err)
@@ -796,7 +796,7 @@ func (up *UpYun) ListObjects(config *ListObjectsConfig) (fileInfos []*FileInfo,
 	}
 
 	// 读取列表
-	b, err := ioutil.ReadAll(resp.Body)
+	b, err := io.ReadAll(resp.Body)
 	resp.Body.Close()
 	if err != nil {
 		return nil, "", errorOperation("list read body", err)
@@ -898,7 +898,7 @@ func (up *UpYun) doRESTRequest(config *restReqConfig) (*http.Response, error) {
 	}
 
 	if config.closeBody {
-		io.Copy(ioutil.Discard, resp.Body)
+		io.Copy(io.Discard, resp.Body)
 		resp.Body.Close()
 	}
 
@@ -914,16 +914,19 @@ type BreakPointConfig struct {
 	LastTime    time.Time
 }
 
-func (up *UpYun) resumeUploadPart(config *PutObjectConfig, breakpoint *BreakPointConfig, f io.Reader, fileInfo fs.FileInfo) (*BreakPointConfig, error) {
+func (up *UpYun) resumeUploadPart(config *PutObjectConfig, breakpoint *BreakPointConfig, f io.ReadSeeker, fileInfo fs.FileInfo) (*BreakPointConfig, error) {
 	fsize := fileInfo.Size()
 	partID := breakpoint.PartID
 	curSize, partSize := int64(partID)*breakpoint.PartSize, breakpoint.PartSize
 	bytesLeft := fsize - curSize
 	ch := make(chan *Chunk, 1)
 	var err error
+	if curSize > 0 {
+		f.Seek(curSize, 0)
+	}
 	var reader io.Reader
 	if config.ProxyReader != nil {
-		reader = config.ProxyReader(fsize, curSize, f)
+		reader = config.ProxyReader(curSize, f)
 	} else {
 		reader = f
 	}
@@ -974,17 +977,19 @@ type ResumeDisorderResult struct {
 }
 
 type ResumeProcessResult struct {
+	CreateTime   time.Time
 	UploadID     string
 	Path         string
 	Order        bool
+	Size         int64
 	NextPartSize int64
 	NextPartID   int64
 	Parts        []*DisorderPart
 }
 
 func (up *UpYun) GetResumeProcess(path string) (*ResumeProcessResult, error) {
-	var partID int64
-	var partSize int64
+	var partID, partSize, size int64
+	var createTime time.Time
 
 	headers := make(map[string]string)
 	headers["X-Upyun-Multi-Info"] = "true"
@@ -1002,7 +1007,9 @@ func (up *UpYun) GetResumeProcess(path string) (*ResumeProcessResult, error) {
 	partSizeStr := resp.Header.Get("X-Upyun-Next-Part-Size")
 	partIDStr := resp.Header.Get("X-Upyun-Next-Part-Id")
 	uploadID := resp.Header.Get("X-Upyun-Multi-Uuid")
+	sizeStr := resp.Header.Get("X-Upyun-Multi-Length")
 	order := resp.Header.Get("X-Upyun-Meta-Order")
+	createStr := resp.Header.Get("X-Upyun-Created-Date")
 	o := true
 	if order == "false" {
 		o = false
@@ -1020,6 +1027,20 @@ func (up *UpYun) GetResumeProcess(path string) (*ResumeProcessResult, error) {
 			return nil, errorOperation(fmt.Sprintf("GetResumeProcess parse partIDStr %s", partIDStr), err)
 		}
 	}
+
+	if sizeStr != "" {
+		size, err = strconv.ParseInt(sizeStr, 10, 64)
+		if err != nil {
+			return nil, errorOperation(fmt.Sprintf("GetResumeProcess parse size %s", sizeStr), err)
+		}
+	}
+	if createStr != "" {
+		createTime, err = time.Parse(time.RFC1123, createStr)
+		if err != nil {
+			return nil, errorOperation(fmt.Sprintf("GetResumeProcess parse time %s", createStr), err)
+		}
+	}
+
 	var disorderRes ResumeDisorderResult
 
 	b, err := io.ReadAll(resp.Body)
@@ -1038,6 +1059,8 @@ func (up *UpYun) GetResumeProcess(path string) (*ResumeProcessResult, error) {
 		NextPartID:   partID,
 		Path:         path,
 		Order:        o,
+		Size:         size,
+		CreateTime:   createTime,
 		Parts:        disorderRes.Parts,
 	}, nil
 }