From af18cb138bce30fb5d927b30fa80fb13f182fea1 Mon Sep 17 00:00:00 2001
From: MadDogOwner <xiaoran@xrgzs.top>
Date: Thu, 3 Apr 2025 20:41:59 +0800
Subject: [PATCH] feat(139): add option ReportRealSize (#8244 close #8141)

* feat(139): handle family upload errors

* feat(139): add option `ReportRealSize`

* Update drivers/139/driver.go

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 drivers/139/driver.go | 34 +++++++++++++++++++++++++++-------
 drivers/139/meta.go   |  1 +
 drivers/139/types.go  |  7 +++++++
 3 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/drivers/139/driver.go b/drivers/139/driver.go
index c6b30335..f367c431 100644
--- a/drivers/139/driver.go
+++ b/drivers/139/driver.go
@@ -3,6 +3,7 @@ package _139
 import (
 	"context"
 	"encoding/base64"
+	"encoding/xml"
 	"fmt"
 	"io"
 	"net/http"
@@ -740,14 +741,20 @@ func (d *Yun139) Put(ctx context.Context, dstDir model.Obj, stream model.FileStr
 				break
 			}
 		}
+		var reportSize int64
+		if d.ReportRealSize {
+			reportSize = stream.GetSize()
+		} else {
+			reportSize = 0
+		}
 		data := base.Json{
 			"manualRename": 2,
 			"operation":    0,
 			"fileCount":    1,
-			"totalSize":    0, // 去除上传大小限制
+			"totalSize":    reportSize,
 			"uploadContentList": []base.Json{{
 				"contentName": stream.GetName(),
-				"contentSize": 0, // 去除上传大小限制
+				"contentSize": reportSize,
 				// "digest": "5a3231986ce7a6b46e408612d385bafa"
 			}},
 			"parentCatalogID": dstDir.GetID(),
@@ -765,10 +772,10 @@ func (d *Yun139) Put(ctx context.Context, dstDir model.Obj, stream model.FileStr
 				"operation":    0,
 				"path":         path.Join(dstDir.GetPath(), dstDir.GetID()),
 				"seqNo":        random.String(32), //序列号不能为空
-				"totalSize":    0,
+				"totalSize":    reportSize,
 				"uploadContentList": []base.Json{{
 					"contentName": stream.GetName(),
-					"contentSize": 0,
+					"contentSize": reportSize,
 					// "digest": "5a3231986ce7a6b46e408612d385bafa"
 				}},
 			})
@@ -779,6 +786,9 @@ func (d *Yun139) Put(ctx context.Context, dstDir model.Obj, stream model.FileStr
 		if err != nil {
 			return err
 		}
+		if resp.Data.Result.ResultCode != "0" {
+			return fmt.Errorf("get file upload url failed with result code: %s, message: %s", resp.Data.Result.ResultCode, resp.Data.Result.ResultDesc)
+		}
 
 		// Progress
 		p := driver.NewProgress(stream.GetSize(), up)
@@ -820,13 +830,23 @@ func (d *Yun139) Put(ctx context.Context, dstDir model.Obj, stream model.FileStr
 			if err != nil {
 				return err
 			}
-			_ = res.Body.Close()
-			log.Debugf("%+v", res)
 			if res.StatusCode != http.StatusOK {
+				res.Body.Close()
 				return fmt.Errorf("unexpected status code: %d", res.StatusCode)
 			}
+			bodyBytes, err := io.ReadAll(res.Body)
+			if err != nil {
+				return fmt.Errorf("error reading response body: %v", err)
+			}
+			var result InterLayerUploadResult
+			err = xml.Unmarshal(bodyBytes, &result)
+			if err != nil {
+				return fmt.Errorf("error parsing XML: %v", err)
+			}
+			if result.ResultCode != 0 {
+				return fmt.Errorf("upload failed with result code: %d, message: %s", result.ResultCode, result.Msg)
+			}
 		}
-
 		return nil
 	default:
 		return errs.NotImplement
diff --git a/drivers/139/meta.go b/drivers/139/meta.go
index d80b8566..866aadb4 100644
--- a/drivers/139/meta.go
+++ b/drivers/139/meta.go
@@ -12,6 +12,7 @@ type Addition struct {
 	Type                 string `json:"type" type:"select" options:"personal_new,family,group,personal" default:"personal_new"`
 	CloudID              string `json:"cloud_id"`
 	CustomUploadPartSize int64  `json:"custom_upload_part_size" type:"number" default:"0" help:"0 for auto"`
+	ReportRealSize       bool   `json:"report_real_size" type:"bool" default:"true" help:"Enable to report the real file size during upload"`
 }
 
 var config = driver.Config{
diff --git a/drivers/139/types.go b/drivers/139/types.go
index ac7079d8..50ae1f81 100644
--- a/drivers/139/types.go
+++ b/drivers/139/types.go
@@ -143,6 +143,13 @@ type UploadResp struct {
 	} `json:"data"`
 }
 
+type InterLayerUploadResult struct {
+	XMLName    xml.Name `xml:"result"`
+	Text       string   `xml:",chardata"`
+	ResultCode int      `xml:"resultCode"`
+	Msg        string   `xml:"msg"`
+}
+
 type CloudContent struct {
 	ContentID string `json:"contentID"`
 	//Modifier         string      `json:"modifier"`