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

fix(driver): implement canceling and updating progress for putting for some drivers (#7847)

Browse Source 
* fix(driver): additionally implement canceling and updating progress for putting for some drivers

* refactor: add driver archive api into template

* fix(123): use built-in MD5 to avoid caching full

* .

* fix build failed
This commit is contained in:
KirCute_ECT
2025-02-01 17:29:55 +08:00
committed by GitHub
parent b9f397d29f
commit 779c293f04
35 changed files with 457 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
drivers/netease_music/util.go
View File

@@ -1,7 +1,9 @@
package netease_music
import (
"io"
"context"
"github.com/alist-org/alist/v3/internal/driver"
"github.com/alist-org/alist/v3/internal/stream"
"net/http"
"path"
"regexp"
@@ -58,20 +60,38 @@ func (d *NeteaseMusic) request(url, method string, opt ReqOption) ([]byte, error
url = "https://music.163.com/api/linux/forward"
}
if opt.ctx != nil {
req.SetContext(opt.ctx)
}
if method == http.MethodPost {
if opt.stream != nil {
if opt.up == nil {
opt.up = func(_ float64) {}
}
req.SetContentLength(true)
req.SetBody(io.ReadCloser(opt.stream))
req.SetBody(&InlineReadCloser{
Reader: &stream.ReaderUpdatingProgress{
Reader: opt.stream,
UpdateProgress: opt.up,
},
Closer: opt.stream,
})
} else {
req.SetFormData(data)
}
res, err := req.Post(url)
return res.Body(), err
if err != nil {
return nil, err
}
return res.Body(), nil
}
if method == http.MethodGet {
res, err := req.Get(url)
return res.Body(), err
if err != nil {
return nil, err
}
return res.Body(), nil
}
return nil, errs.NotImplement
@@ -206,7 +226,7 @@ func (d *NeteaseMusic) removeSongObj(file model.Obj) error {
return err
}
func (d *NeteaseMusic) putSongStream(stream model.FileStreamer) error {
func (d *NeteaseMusic) putSongStream(ctx context.Context, stream model.FileStreamer, up driver.UpdateProgress) error {
tmp, err := stream.CacheFullInTempFile()
if err != nil {
return err
@@ -231,7 +251,7 @@ func (d *NeteaseMusic) putSongStream(stream model.FileStreamer) error {
}
if u.meta.needUpload {
err = u.upload(stream)
err = u.upload(ctx, stream, up)
if err != nil {
return err
}