.

Author: j2rong4cn

drivers/139/driver.go

@@ -533,18 +533,19 @@ func (d *Yun139) Put(ctx context.Context, dstDir model.Obj, stream model.FileStr
 			}
 		}
 
-		partInfos := []PartInfo{}
-		var partSize = d.getPartSize(stream.GetSize())
-		part := (stream.GetSize() + partSize - 1) / partSize
-		if part == 0 {
-			part = 1
-		}
-		for i := int64(0); i < part; i++ {
+		size := stream.GetSize()
+		var partSize = d.getPartSize(size)
+		part := size / partSize
+		if size%partSize > 0 {
+			part++
+		}
+		partInfos := make([]PartInfo, 0, part)
+		for i := range part {
 			if utils.IsCanceled(ctx) {
 				return ctx.Err()
 			}
 			start := i * partSize
-			byteSize := stream.GetSize() - start
+			byteSize := size - start
 			if byteSize > partSize {
 				byteSize = partSize
 			}
@@ -572,7 +573,7 @@ func (d *Yun139) Put(ctx context.Context, dstDir model.Obj, stream model.FileStr
 			"contentType":          "application/octet-stream",
 			"parallelUpload":       false,
 			"partInfos":            firstPartInfos,
-			"size":                 stream.GetSize(),
+			"size":                 size,
 			"parentFileId":         dstDir.GetID(),
 			"name":                 stream.GetName(),
 			"type":                 "file",
@@ -625,7 +626,7 @@ func (d *Yun139) Put(ctx context.Context, dstDir model.Obj, stream model.FileStr
 			}
 
 			// Progress
-			p := driver.NewProgress(stream.GetSize(), up)
+			p := driver.NewProgress(size, up)
 
 			rateLimited := driver.NewLimitedUploadStream(ctx, stream)
 			// 上传所有分片
@@ -776,22 +777,22 @@ func (d *Yun139) Put(ctx context.Context, dstDir model.Obj, stream model.FileStr
 			return err
 		}
 
-		// Progress
-		p := driver.NewProgress(stream.GetSize(), up)
-
-		var partSize = d.getPartSize(stream.GetSize())
-		part := (stream.GetSize() + partSize - 1) / partSize
-		if part == 0 {
-			part = 1
+		size := stream.GetSize()
+		var partSize = d.getPartSize(size)
+		part := size / partSize
+		if size%partSize > 0 {
+			part++
 		}
+		// Progress
+		p := driver.NewProgress(size, up)
 		rateLimited := driver.NewLimitedUploadStream(ctx, stream)
-		for i := int64(0); i < part; i++ {
+		for i := range part {
 			if utils.IsCanceled(ctx) {
 				return ctx.Err()
 			}
 
 			start := i * partSize
-			byteSize := stream.GetSize() - start
+			byteSize := size - start
 			if byteSize > partSize {
 				byteSize = partSize
 			}
@@ -806,7 +807,7 @@ func (d *Yun139) Put(ctx context.Context, dstDir model.Obj, stream model.FileStr
 
 			req = req.WithContext(ctx)
 			req.Header.Set("Content-Type", "text/plain;name="+unicode(stream.GetName()))
-			req.Header.Set("contentSize", strconv.FormatInt(stream.GetSize(), 10))
+			req.Header.Set("contentSize", strconv.FormatInt(size, 10))
 			req.Header.Set("range", fmt.Sprintf("bytes=%d-%d", start, start+byteSize-1))
 			req.Header.Set("uploadtaskID", resp.Data.UploadResult.UploadTaskID)
 			req.Header.Set("rangeType", "0")

drivers/189pc/utils.go

@@ -525,7 +525,7 @@ func (y *Cloud189PC) StreamUpload(ctx context.Context, dstDir model.Obj, file mo
 			break
 		}
 		byteData := make([]byte, sliceSize)
-		if i == count {
+		if i == count && lastSliceSize > 0 {
 			byteData = byteData[:lastSliceSize]
 		}
 
@@ -647,7 +647,7 @@ func (y *Cloud189PC) FastUpload(ctx context.Context, dstDir model.Obj, file mode
 			return nil, ctx.Err()
 		}
 
-		if i == count {
+		if i == count && lastSliceSize > 0 {
 			byteSize = lastSliceSize
 		}
 

drivers/quark_uc/driver.go

@@ -178,27 +178,28 @@ func (d *QuarkOrUC) Put(ctx context.Context, dstDir model.Obj, stream model.File
 		return nil
 	}
 	// part up
-	partSize := pre.Metadata.PartSize
-	var part []byte
-	md5s := make([]string, 0)
-	defaultBytes := make([]byte, partSize)
 	total := stream.GetSize()
-	left := total
+	partSize := int64(pre.Metadata.PartSize)
+	part := make([]byte, pre.Metadata.PartSize)
+	count := int(total / partSize)
+	if total%partSize > 0 {
+		count++
+	}
+	md5s := make([]string, 0, count)
 	partNumber := 1
+	left := total
 	for left > 0 {
 		if utils.IsCanceled(ctx) {
 			return ctx.Err()
 		}
-		if left > int64(partSize) {
-			part = defaultBytes
-		} else {
-			part = make([]byte, left)
+		if left < partSize {
+			part = part[:left]
 		}
-		_, err := io.ReadFull(stream, part)
+		n, err := io.ReadFull(stream, part)
 		if err != nil {
 			return err
 		}
-		left -= int64(len(part))
+		left -= int64(n)
 		log.Debugf("left: %d", left)
 		reader := driver.NewLimitedUploadStream(ctx, bytes.NewReader(part))
 		m, err := d.upPart(ctx, pre, stream.GetMimetype(), partNumber, reader)

drivers/terabox/driver.go

@@ -6,7 +6,6 @@ import (
 	"encoding/hex"
 	"fmt"
 	"io"
-	"math"
 	stdpath "path"
 	"strconv"
 
@@ -189,25 +188,24 @@ func (d *Terabox) Put(ctx context.Context, dstDir model.Obj, stream model.FileSt
 	streamSize := stream.GetSize()
 	chunkSize := calculateChunkSize(streamSize)
 	chunkByteData := make([]byte, chunkSize)
-	count := int(math.Ceil(float64(streamSize) / float64(chunkSize)))
-	left := streamSize
+	count := int(streamSize / chunkSize)
+	if streamSize%chunkSize > 0 {
+		count++
+	}
 	uploadBlockList := make([]string, 0, count)
+	left := streamSize
 	md5 := utils.MD5.NewFunc()
 	reader := io.TeeReader(stream, md5)
-	for partseq := 0; partseq < count; partseq++ {
+	for partseq := range count {
 		if utils.IsCanceled(ctx) {
 			return ctx.Err()
 		}
 		byteSize := chunkSize
-		var byteData []byte
-		if left >= chunkSize {
-			byteData = chunkByteData
-		} else {
-			byteSize = left
-			byteData = make([]byte, byteSize)
+		if left < chunkSize {
+			chunkByteData = chunkByteData[:left]
 		}
 		left -= byteSize
-		_, err = io.ReadFull(reader, byteData)
+		_, err = io.ReadFull(reader, chunkByteData)
 		if err != nil {
 			return err
 		}
@@ -221,7 +219,7 @@ func (d *Terabox) Put(ctx context.Context, dstDir model.Obj, stream model.FileSt
 		res, err := base.RestyClient.R().
 			SetContext(ctx).
 			SetQueryParams(params).
-			SetFileReader("file", stream.GetName(), driver.NewLimitedUploadStream(ctx, bytes.NewReader(byteData))).
+			SetFileReader("file", stream.GetName(), driver.NewLimitedUploadStream(ctx, bytes.NewReader(chunkByteData))).
 			SetHeader("Cookie", d.Cookie).
 			Post(u)
 		if err != nil {

internal/net/request.go

@@ -248,8 +248,9 @@ func (d *downloader) sendChunkTask(newConcurrency bool) error {
 			size:  finalSize,
 			id:    d.nextChunk,
 			buf:   buf,
+
+			newConcurrency: newConcurrency,
 		}
-		ch.newConcurrency = newConcurrency
 		d.pos += finalSize
 		d.nextChunk++
 		d.chunkChannel <- ch