ProjectHentai/alist
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(traffic): duplicate semaphore release when uploading (#8211 close #8180)

Browse Source
This commit is contained in:
KirCute 2025-03-27 23:15:47 +08:00 committed by GitHub
parent 10a76c701d
commit 4fcc3a187e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/189pc/utils.go
View File

@ -520,9 +520,6 @@ func (y *Cloud189PC) StreamUpload(ctx context.Context, dstDir model.Obj, file mo
if utils.IsCanceled(upCtx) { if utils.IsCanceled(upCtx) {
break break
} }
if err = sem.Acquire(ctx, 1); err != nil {
break
}
byteData := make([]byte, sliceSize) byteData := make([]byte, sliceSize)
if i == count { if i == count {
byteData = byteData[:lastPartSize] byteData = byteData[:lastPartSize]
@ -541,6 +538,9 @@ func (y *Cloud189PC) StreamUpload(ctx context.Context, dstDir model.Obj, file mo
partInfo := fmt.Sprintf("%d-%s", i, base64.StdEncoding.EncodeToString(md5Bytes)) partInfo := fmt.Sprintf("%d-%s", i, base64.StdEncoding.EncodeToString(md5Bytes))
threadG.Go(func(ctx context.Context) error { threadG.Go(func(ctx context.Context) error {
if err = sem.Acquire(ctx, 1); err != nil {
return err
}
defer sem.Release(1) defer sem.Release(1)
uploadUrls, err := y.GetMultiUploadUrls(ctx, isFamily, initMultiUpload.Data.UploadFileID, partInfo) uploadUrls, err := y.GetMultiUploadUrls(ctx, isFamily, initMultiUpload.Data.UploadFileID, partInfo)
if err != nil { if err != nil {

6
drivers/baidu_netdisk/driver.go
View File

@ -266,15 +266,15 @@ func (d *BaiduNetdisk) Put(ctx context.Context, dstDir model.Obj, stream model.F
if utils.IsCanceled(upCtx) { if utils.IsCanceled(upCtx) {
break break
} }
if err = sem.Acquire(ctx, 1); err != nil {
break
}
i, partseq, offset, byteSize := i, partseq, int64(partseq)*sliceSize, sliceSize i, partseq, offset, byteSize := i, partseq, int64(partseq)*sliceSize, sliceSize
if partseq+1 == count { if partseq+1 == count {
byteSize = lastBlockSize byteSize = lastBlockSize
} }
threadG.Go(func(ctx context.Context) error { threadG.Go(func(ctx context.Context) error {
if err = sem.Acquire(ctx, 1); err != nil {
return err
}
defer sem.Release(1) defer sem.Release(1)
params := map[string]string{ params := map[string]string{
"method": "upload", "method": "upload",

6
drivers/baidu_photo/driver.go
View File

@ -321,9 +321,6 @@ func (d *BaiduPhoto) Put(ctx context.Context, dstDir model.Obj, stream model.Fil
if utils.IsCanceled(upCtx) { if utils.IsCanceled(upCtx) {
break break
} }
if err = sem.Acquire(ctx, 1); err != nil {
break
}
i, partseq, offset, byteSize := i, partseq, int64(partseq)*DEFAULT, DEFAULT i, partseq, offset, byteSize := i, partseq, int64(partseq)*DEFAULT, DEFAULT
if partseq+1 == count { if partseq+1 == count {
@ -331,6 +328,9 @@ func (d *BaiduPhoto) Put(ctx context.Context, dstDir model.Obj, stream model.Fil
} }
threadG.Go(func(ctx context.Context) error { threadG.Go(func(ctx context.Context) error {
if err = sem.Acquire(ctx, 1); err != nil {
return err
}
defer sem.Release(1) defer sem.Release(1)
uploadParams := map[string]string{ uploadParams := map[string]string{
"method": "upload", "method": "upload",

6
drivers/mopan/driver.go
View File

@ -315,9 +315,6 @@ func (d *MoPan) Put(ctx context.Context, dstDir model.Obj, stream model.FileStre
if utils.IsCanceled(upCtx) { if utils.IsCanceled(upCtx) {
break break
} }
if err = sem.Acquire(ctx, 1); err != nil {
break
}
i, part, byteSize := i, part, initUpdload.PartSize i, part, byteSize := i, part, initUpdload.PartSize
if part.PartNumber == uploadPartData.PartTotal { if part.PartNumber == uploadPartData.PartTotal {
byteSize = initUpdload.LastPartSize byteSize = initUpdload.LastPartSize
@ -325,6 +322,9 @@ func (d *MoPan) Put(ctx context.Context, dstDir model.Obj, stream model.FileStre
// step.4 // step.4
threadG.Go(func(ctx context.Context) error { threadG.Go(func(ctx context.Context) error {
if err = sem.Acquire(ctx, 1); err != nil {
return err
}
defer sem.Release(1) defer sem.Release(1)
reader := io.NewSectionReader(file, int64(part.PartNumber-1)*initUpdload.PartSize, byteSize) reader := io.NewSectionReader(file, int64(part.PartNumber-1)*initUpdload.PartSize, byteSize)
req, err := part.NewRequest(ctx, driver.NewLimitedUploadStream(ctx, reader)) req, err := part.NewRequest(ctx, driver.NewLimitedUploadStream(ctx, reader))