* 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>
This commit is contained in:
parent
31c55a2adf
commit
af18cb138b
@ -3,6 +3,7 @@ package _139
|
|||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"encoding/base64"
|
"encoding/base64"
|
||||||
|
"encoding/xml"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
"net/http"
|
"net/http"
|
||||||
@ -740,14 +741,20 @@ func (d *Yun139) Put(ctx context.Context, dstDir model.Obj, stream model.FileStr
|
|||||||
break
|
break
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
var reportSize int64
|
||||||
|
if d.ReportRealSize {
|
||||||
|
reportSize = stream.GetSize()
|
||||||
|
} else {
|
||||||
|
reportSize = 0
|
||||||
|
}
|
||||||
data := base.Json{
|
data := base.Json{
|
||||||
"manualRename": 2,
|
"manualRename": 2,
|
||||||
"operation": 0,
|
"operation": 0,
|
||||||
"fileCount": 1,
|
"fileCount": 1,
|
||||||
"totalSize": 0, // 去除上传大小限制
|
"totalSize": reportSize,
|
||||||
"uploadContentList": []base.Json{{
|
"uploadContentList": []base.Json{{
|
||||||
"contentName": stream.GetName(),
|
"contentName": stream.GetName(),
|
||||||
"contentSize": 0, // 去除上传大小限制
|
"contentSize": reportSize,
|
||||||
// "digest": "5a3231986ce7a6b46e408612d385bafa"
|
// "digest": "5a3231986ce7a6b46e408612d385bafa"
|
||||||
}},
|
}},
|
||||||
"parentCatalogID": dstDir.GetID(),
|
"parentCatalogID": dstDir.GetID(),
|
||||||
@ -765,10 +772,10 @@ func (d *Yun139) Put(ctx context.Context, dstDir model.Obj, stream model.FileStr
|
|||||||
"operation": 0,
|
"operation": 0,
|
||||||
"path": path.Join(dstDir.GetPath(), dstDir.GetID()),
|
"path": path.Join(dstDir.GetPath(), dstDir.GetID()),
|
||||||
"seqNo": random.String(32), //序列号不能为空
|
"seqNo": random.String(32), //序列号不能为空
|
||||||
"totalSize": 0,
|
"totalSize": reportSize,
|
||||||
"uploadContentList": []base.Json{{
|
"uploadContentList": []base.Json{{
|
||||||
"contentName": stream.GetName(),
|
"contentName": stream.GetName(),
|
||||||
"contentSize": 0,
|
"contentSize": reportSize,
|
||||||
// "digest": "5a3231986ce7a6b46e408612d385bafa"
|
// "digest": "5a3231986ce7a6b46e408612d385bafa"
|
||||||
}},
|
}},
|
||||||
})
|
})
|
||||||
@ -779,6 +786,9 @@ func (d *Yun139) Put(ctx context.Context, dstDir model.Obj, stream model.FileStr
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
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
|
// Progress
|
||||||
p := driver.NewProgress(stream.GetSize(), up)
|
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 {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
_ = res.Body.Close()
|
|
||||||
log.Debugf("%+v", res)
|
|
||||||
if res.StatusCode != http.StatusOK {
|
if res.StatusCode != http.StatusOK {
|
||||||
|
res.Body.Close()
|
||||||
return fmt.Errorf("unexpected status code: %d", res.StatusCode)
|
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
|
return nil
|
||||||
default:
|
default:
|
||||||
return errs.NotImplement
|
return errs.NotImplement
|
||||||
|
@ -12,6 +12,7 @@ type Addition struct {
|
|||||||
Type string `json:"type" type:"select" options:"personal_new,family,group,personal" default:"personal_new"`
|
Type string `json:"type" type:"select" options:"personal_new,family,group,personal" default:"personal_new"`
|
||||||
CloudID string `json:"cloud_id"`
|
CloudID string `json:"cloud_id"`
|
||||||
CustomUploadPartSize int64 `json:"custom_upload_part_size" type:"number" default:"0" help:"0 for auto"`
|
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{
|
var config = driver.Config{
|
||||||
|
@ -143,6 +143,13 @@ type UploadResp struct {
|
|||||||
} `json:"data"`
|
} `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 {
|
type CloudContent struct {
|
||||||
ContentID string `json:"contentID"`
|
ContentID string `json:"contentID"`
|
||||||
//Modifier string `json:"modifier"`
|
//Modifier string `json:"modifier"`
|
||||||
|
Loading…
x
Reference in New Issue
Block a user