fix(google_drive): 更新Put方法以支持可重复读取流和不可重复读取流的MD5校验

Author: cyk

.github/workflows/test_docker.yml

@@ -6,7 +6,8 @@ on:
       - main
   pull_request:
     branches:
-      - fix   # 👈 允许你的 fix 分支触发
+      - copy
+
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}

drivers/google_drive/driver.go

@@ -10,6 +10,8 @@ import (
 	"github.com/OpenListTeam/OpenList/v4/internal/driver"
 	"github.com/OpenListTeam/OpenList/v4/internal/errs"
 	"github.com/OpenListTeam/OpenList/v4/internal/model"
+	"github.com/OpenListTeam/OpenList/v4/internal/stream"
+	"github.com/OpenListTeam/OpenList/v4/pkg/http_range"
 	"github.com/OpenListTeam/OpenList/v4/pkg/utils"
 	"github.com/go-resty/resty/v2"
 )
@@ -111,8 +113,44 @@ func (d *GoogleDrive) Remove(ctx context.Context, obj model.Obj) error {
 	return err
 }
 
-func (d *GoogleDrive) Put(ctx context.Context, dstDir model.Obj, stream model.FileStreamer, up driver.UpdateProgress) error {
-	obj := stream.GetExist()
+func (d *GoogleDrive) Put(ctx context.Context, dstDir model.Obj, file model.FileStreamer, up driver.UpdateProgress) error {
+	// 1. 准备MD5（用于完整性校验）
+	md5Hash := file.GetHash().GetHash(utils.MD5)
+
+	// 检查是否是可重复读取的流
+	_, isSeekable := file.(*stream.SeekableStream)
+
+	if isSeekable {
+		// 可重复读取的流，使用 RangeRead 计算 hash，不缓存
+		if len(md5Hash) != utils.MD5.Width {
+			var err error
+			md5Hash, err = stream.StreamHashFile(file, utils.MD5, 10, &up)
+			if err != nil {
+				return err
+			}
+			_ = md5Hash // MD5用于后续完整性校验（Google Drive会自动校验）
+		}
+	} else {
+		// 不可重复读取的流（如 HTTP body）
+		if len(md5Hash) != utils.MD5.Width {
+			// 缓存整个文件并计算 MD5
+			var err error
+			_, md5Hash, err = stream.CacheFullAndHash(file, &up, utils.MD5)
+			if err != nil {
+				return err
+			}
+			_ = md5Hash // MD5用于后续完整性校验
+		} else if file.GetFile() == nil {
+			// 有 MD5 但没有缓存，需要缓存以支持后续 RangeRead
+			_, err := file.CacheFullAndWriter(&up, nil)
+			if err != nil {
+				return err
+			}
+		}
+	}
+
+	// 2. 初始化可恢复上传会话
+	obj := file.GetExist()
 	var (
 		e    Error
 		url  string
@@ -125,16 +163,16 @@ func (d *GoogleDrive) Put(ctx context.Context, dstDir model.Obj, stream model.Fi
 		data = base.Json{}
 	} else {
 		data = base.Json{
-			"name":    stream.GetName(),
+			"name":    file.GetName(),
 			"parents": []string{dstDir.GetID()},
 		}
 		url = "https://www.googleapis.com/upload/drive/v3/files?uploadType=resumable&supportsAllDrives=true"
 	}
 	req := base.NoRedirectClient.R().
 		SetHeaders(map[string]string{
 			"Authorization":           "Bearer " + d.AccessToken,
-			"X-Upload-Content-Type":   stream.GetMimetype(),
-			"X-Upload-Content-Length": strconv.FormatInt(stream.GetSize(), 10),
+			"X-Upload-Content-Type":   file.GetMimetype(),
+			"X-Upload-Content-Length": strconv.FormatInt(file.GetSize(), 10),
 		}).
 		SetError(&e).SetBody(data).SetContext(ctx)
 	if obj != nil {
@@ -151,20 +189,29 @@ func (d *GoogleDrive) Put(ctx context.Context, dstDir model.Obj, stream model.Fi
 			if err != nil {
 				return err
 			}
-			return d.Put(ctx, dstDir, stream, up)
+			return d.Put(ctx, dstDir, file, up)
 		}
 		return fmt.Errorf("%s: %v", e.Error.Message, e.Error.Errors)
 	}
+
+	// 3. 上传文件内容
 	putUrl := res.Header().Get("location")
-	if stream.GetSize() < d.ChunkSize*1024*1024 {
+	if file.GetSize() < d.ChunkSize*1024*1024 {
+		// 小文件上传：使用 RangeRead 读取整个文件（避免消费已计算hash的stream）
+		reader, err := file.RangeRead(http_range.Range{Start: 0, Length: file.GetSize()})
+		if err != nil {
+			return err
+		}
+
 		_, err = d.request(putUrl, http.MethodPut, func(req *resty.Request) {
-			req.SetHeader("Content-Length", strconv.FormatInt(stream.GetSize(), 10)).
-				SetBody(driver.NewLimitedUploadStream(ctx, stream))
+			req.SetHeader("Content-Length", strconv.FormatInt(file.GetSize(), 10)).
+				SetBody(driver.NewLimitedUploadStream(ctx, reader))
 		}, nil)
+		return err
 	} else {
-		err = d.chunkUpload(ctx, stream, putUrl, up)
+		// 大文件分片上传
+		return d.chunkUpload(ctx, file, putUrl, up)
 	}
-	return err
 }
 
 func (d *GoogleDrive) GetDetails(ctx context.Context) (*model.StorageDetails, error) {