wsy182/Cloudreve
1
0
Fork 0
mirror of https://github.com/halejohn/Cloudreve.git synced 2026-01-26 09:34:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Refactor: create placeholder file and record upload session id in it

Browse Source
This commit is contained in:
HFO4
2022-02-27 14:07:12 +08:00
parent 6fdf77e00e
commit 72173bf894
18 changed files with 178 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/filesystem/driver/onedrive/api.go
View File

@@ -258,14 +258,15 @@ func (client *Client) UploadChunk(ctx context.Context, uploadURL string, chunk *
// Upload 上传文件
func (client *Client) Upload(ctx context.Context, file fsctx.FileHeader) error {
fileInfo := file.Info()
// 决定是否覆盖文件
overwrite := "replace"
if file.GetMode() != fsctx.Create {
if fileInfo.Mode != fsctx.Create {
overwrite = "fail"
}
size := int(file.GetSize())
dst := file.GetSavePath()
size := int(fileInfo.Size)
dst := fileInfo.SavePath
// 小文件，使用简单上传接口上传
if size <= int(SmallFileSize) {

7
pkg/filesystem/driver/onedrive/handler.go
View File

@@ -223,9 +223,10 @@ func (handler Driver) replaceSourceHost(origin string) (string, error) {
// Token 获取上传会话URL
func (handler Driver) Token(ctx context.Context, ttl int64, uploadSession *serializer.UploadSession, file fsctx.FileHeader) (serializer.UploadCredential, error) {
fileInfo := file.Info()
// 如果小于4MB，则由服务端中转
if file.GetSize() <= SmallFileSize {
if fileInfo.Size <= SmallFileSize {
return serializer.UploadCredential{}, nil
}
@@ -234,13 +235,13 @@ func (handler Driver) Token(ctx context.Context, ttl int64, uploadSession *seria
apiBaseURI, _ := url.Parse("/api/v3/callback/onedrive/finish/" + uploadSession.Key)
apiURL := siteURL.ResolveReference(apiBaseURI)
uploadURL, err := handler.Client.CreateUploadSession(ctx, file.GetSavePath(), WithConflictBehavior("fail"))
uploadURL, err := handler.Client.CreateUploadSession(ctx, fileInfo.SavePath, WithConflictBehavior("fail"))
if err != nil {
return serializer.UploadCredential{}, err
}
// 监控回调及上传
go handler.Client.MonitorUpload(uploadURL, uploadSession.Key, file.GetSavePath(), file.GetSize(), ttl)
go handler.Client.MonitorUpload(uploadURL, uploadSession.Key, fileInfo.SavePath, fileInfo.Size, ttl)
return serializer.UploadCredential{
Policy: uploadURL,