revert: "fix(115): enforce 20GB file size limit on uploadev"
This reverts commit 216e3909f3946eb9c1b786c0d82c00f278f0ea25.
This commit is contained in:
parent
e707fa38f1
commit
2671c876f1
@ -2,7 +2,6 @@ package _115
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"fmt"
|
|
||||||
"strings"
|
"strings"
|
||||||
"sync"
|
"sync"
|
||||||
|
|
||||||
@ -122,10 +121,7 @@ func (d *Pan115) Put(ctx context.Context, dstDir model.Obj, stream model.FileStr
|
|||||||
if err := d.WaitLimit(ctx); err != nil {
|
if err := d.WaitLimit(ctx); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
if stream.GetSize() > utils.GB*20 { // TODO 由于官方分片上传接口失效,所以使用普通上传小于20GB的文件
|
|
||||||
return fmt.Errorf("unsupported file size: 20GB limit exceeded")
|
|
||||||
}
|
|
||||||
// 分片上传
|
|
||||||
var (
|
var (
|
||||||
fastInfo *driver115.UploadInitResp
|
fastInfo *driver115.UploadInitResp
|
||||||
dirID = dstDir.GetID()
|
dirID = dstDir.GetID()
|
||||||
@ -181,13 +177,11 @@ func (d *Pan115) Put(ctx context.Context, dstDir model.Obj, stream model.FileStr
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 闪传失败,上传
|
// 闪传失败,上传
|
||||||
// if stream.GetSize() <= utils.KB{ // 文件大小小于1KB,改用普通模式上传
|
if stream.GetSize() <= utils.KB { // 文件大小小于1KB,改用普通模式上传
|
||||||
if stream.GetSize() <= utils.GB*20 { // TODO 由于官方分片上传接口失效,所以使用普通上传小于20GB的文件
|
|
||||||
return d.client.UploadByOSS(&fastInfo.UploadOSSParams, stream, dirID)
|
return d.client.UploadByOSS(&fastInfo.UploadOSSParams, stream, dirID)
|
||||||
}
|
}
|
||||||
return driver115.ErrUnexpected
|
|
||||||
// 分片上传
|
// 分片上传
|
||||||
// return d.UploadByMultipart(&fastInfo.UploadOSSParams, stream.GetSize(), stream, dirID)
|
return d.UploadByMultipart(&fastInfo.UploadOSSParams, stream.GetSize(), stream, dirID)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (d *Pan115) OfflineList(ctx context.Context) ([]*driver115.OfflineTask, error) {
|
func (d *Pan115) OfflineList(ctx context.Context) ([]*driver115.OfflineTask, error) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user