chore: Merge pull request #1110 from foxxorcat/dev

增加123流式上传选择

drivers/123/driver.go

@@ -1,7 +1,9 @@
 package _23
 
 import (
+	"bytes"
 	"crypto/md5"
+	"encoding/binary"
 	"encoding/hex"
 	"fmt"
 	"io"
@@ -68,6 +70,12 @@ func (driver Pan123) Items() []base.Item {
 			Required: true,
 			Default:  "asc",
 		},
+		{
+			Name:        "bool_1",
+			Label:       "stream upload",
+			Type:        base.TypeBool,
+			Description: "io stream upload (test)",
+		},
 	}
 }
 
@@ -302,23 +310,44 @@ func (driver Pan123) Upload(file *model.FileStream, account *model.Account) erro
 		return base.ErrNotFolder
 	}
 
-	tempFile, err := ioutil.TempFile(conf.Conf.TempDir, "file-*")
+	const DEFAULT int64 = 10485760
-	if err != nil {
+	var uploadFile io.Reader
-		return err
-	}
-	defer tempFile.Close()
-	defer os.Remove(tempFile.Name())
 	h := md5.New()
-	if _, err = io.Copy(io.MultiWriter(tempFile, h), file); err != nil {
+	if account.Bool1 && file.GetSize() > uint64(DEFAULT) {
-		return err
+		// 只计算前10MIB
+		buf := bytes.NewBuffer(make([]byte, 0, DEFAULT))
+		if n, err := io.CopyN(io.MultiWriter(buf, h), file, DEFAULT); err != io.EOF && n == 0 {
+			return err
+		}
+		// 增加额外参数防止MD5碰撞
+		h.Write([]byte(file.Name))
+		num := make([]byte, 8)
+		binary.BigEndian.PutUint64(num, file.Size)
+		h.Write(num)
+		// 拼装
+		uploadFile = io.MultiReader(buf, file)
+	} else {
+		// 计算完整文件MD5
+		tempFile, err := ioutil.TempFile(conf.Conf.TempDir, "file-*")
+		if err != nil {
+			return err
+		}
+		defer func() {
+			_ = tempFile.Close()
+			_ = os.Remove(tempFile.Name())
+		}()
+
+		if _, err = io.Copy(io.MultiWriter(tempFile, h), file); err != nil {
+			return err
+		}
+
+		_, err = tempFile.Seek(0, io.SeekStart)
+		if err != nil {
+			return err
+		}
+		uploadFile = tempFile
 	}
 	etag := hex.EncodeToString(h.Sum(nil))
-
-	_, err = tempFile.Seek(0, io.SeekStart)
-	if err != nil {
-		return err
-	}
-
 	data := base.Json{
 		"driveId":      0,
 		"duplicate":    2, // 2->覆盖 1->重命名 0->默认
@@ -352,7 +381,7 @@ func (driver Pan123) Upload(file *model.FileStream, account *model.Account) erro
 	input := &s3manager.UploadInput{
 		Bucket: &resp.Data.Bucket,
 		Key:    &resp.Data.Key,
-		Body:   tempFile,
+		Body:   uploadFile,
 	}
 	_, err = uploader.Upload(input)
 	if err != nil {

drivers/189pc/driver.go

@@ -607,7 +607,7 @@ func (driver Cloud189) CommonUpload(file *model.FileStream, parentFile *model.Fi
 
 		uploadData := uploadUrl.UploadUrls[fmt.Sprint("partNumber_", i)]
 		req, _ := http.NewRequest(http.MethodPut, uploadData.RequestURL, byteData)
-		req.Header.Del("User-Agent")
+		req.Header.Set("User-Agent", "")
 		for k, v := range ParseHttpHeader(uploadData.RequestHeader) {
 			req.Header.Set(k, v)
 		}
@@ -650,9 +650,10 @@ func (driver Cloud189) FastUpload(file *model.FileStream, parentFile *model.File
 	if err != nil {
 		return err
 	}
-	defer tempFile.Close()
+	defer func() {
-	defer os.Remove(tempFile.Name())
+		_ = tempFile.Close()
-
+		_ = os.Remove(tempFile.Name())
+	}()
 	// 初始化上传
 	state := GetState(account)
 
@@ -718,7 +719,7 @@ func (driver Cloud189) FastUpload(file *model.FileStream, parentFile *model.File
 		for i := 1; i <= count; i++ {
 			uploadData := uploadUrls.UploadUrls[fmt.Sprint("partNumber_", i)]
 			req, _ := http.NewRequest(http.MethodPut, uploadData.RequestURL, io.NewSectionReader(tempFile, int64(i-1)*DEFAULT, DEFAULT))
-			req.Header.Del("User-Agent")
+			req.Header.Set("User-Agent", "")
 			for k, v := range ParseHttpHeader(uploadData.RequestHeader) {
 				req.Header.Set(k, v)
 			}
@@ -756,8 +757,10 @@ func (driver Cloud189) uploadFamily(file *model.FileStream, parentFile *model.Fi
 		return err
 	}
 
-	defer tempFile.Close()
+	defer func() {
-	defer os.Remove(tempFile.Name())
+			_ = tempFile.Close()
+			_ = os.Remove(tempFile.Name())
+	}()
 
 	fileMd5 := md5.New()
 	if _, err = io.Copy(io.MultiWriter(fileMd5, tempFile), file); err != nil {
@@ -805,8 +808,10 @@ func (driver Cloud189) uploadPerson(file *model.FileStream, parentFile *model.Fi
 		return err
 	}
 
-	defer tempFile.Close()
+	defer func() {
-	defer os.Remove(tempFile.Name())
+			_ = tempFile.Close()
+			_ = os.Remove(tempFile.Name())
+	}()
 
 	fileMd5 := md5.New()
 	if _, err = io.Copy(io.MultiWriter(fileMd5, tempFile), file); err != nil {

drivers/alidrive/driver.go

@@ -467,8 +467,10 @@ func (driver AliDrive) Upload(file *model.FileStream, account *model.Account) er
 			return err
 		}
 
-		defer tempFile.Close()
+		defer func() {
-		defer os.Remove(tempFile.Name())
+			_ = tempFile.Close()
+			_ = os.Remove(tempFile.Name())
+		}()
 
 		delete(reqBody, "pre_hash")
 		h := sha1.New()

drivers/xunlei/driver.go

@@ -363,8 +363,10 @@ func (driver XunLeiCloud) Upload(file *model.FileStream, account *model.Account)
 			return err
 		}
 
-		defer tempFile.Close()
+		defer func() {
-		defer os.Remove(tempFile.Name())
+			_ = tempFile.Close()
+			_ = os.Remove(tempFile.Name())
+		}()
 
 		gcid, err := getGcid(io.TeeReader(file, tempFile), int64(file.Size))
 		if err != nil {