Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion drivers/cloudreve_v4/driver.go
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,9 @@ func (d *CloudreveV4) Put(ctx context.Context, dstDir model.Obj, file model.File
case "onedrive":
err = d.upOneDrive(ctx, file, u, up)
case "s3":
err = d.upS3(ctx, file, u, up)
err = d.upS3(ctx, file, u, up, "s3")
case "ks3":
err = d.upS3(ctx, file, u, up, "ks3")
default:
return errs.NotImplement
}
Expand Down
15 changes: 10 additions & 5 deletions drivers/cloudreve_v4/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,7 @@ func (d *CloudreveV4) upOneDrive(ctx context.Context, file model.FileStreamer, u
}, nil)
}

func (d *CloudreveV4) upS3(ctx context.Context, file model.FileStreamer, u FileUploadResp, up driver.UpdateProgress) error {
func (d *CloudreveV4) upS3(ctx context.Context, file model.FileStreamer, u FileUploadResp, up driver.UpdateProgress, s3Type string) error {
DEFAULT := int64(u.ChunkSize)
ss, err := stream.NewStreamSectionReader(file, int(DEFAULT), &up)
if err != nil {
Expand Down Expand Up @@ -560,6 +560,9 @@ func (d *CloudreveV4) upS3(ctx context.Context, file model.FileStreamer, u FileU
}
req.ContentLength = byteSize
req.Header.Set("User-Agent", d.getUA())
if s3Type == "ks3" {
req.Header.Set("Content-Type", "application/octet-stream")
}
res, err := base.HttpClient.Do(req)
if err != nil {
return err
Expand Down Expand Up @@ -609,7 +612,11 @@ func (d *CloudreveV4) upS3(ctx context.Context, file model.FileStreamer, u FileU
if err != nil {
return err
}
req.Header.Set("Content-Type", "application/xml")
if s3Type == "ks3" {
req.Header.Set("Content-Type", "application/octet-stream")
} else {
req.Header.Set("Content-Type", "application/xml")
}
req.Header.Set("User-Agent", d.getUA())
res, err := base.HttpClient.Do(req)
if err != nil {
Expand All @@ -622,7 +629,5 @@ func (d *CloudreveV4) upS3(ctx context.Context, file model.FileStreamer, u FileU
}

// 上传成功发送回调请求
return d.request(http.MethodGet, "/callback/s3/"+u.SessionID+"/"+u.CallbackSecret, func(req *resty.Request) {
req.SetBody("{}")
}, nil)
return d.request(http.MethodGet, "/callback/"+s3Type+"/"+u.SessionID+"/"+u.CallbackSecret, nil, nil)
}