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

* 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

drivers/netease_music/driver.go

@@ -88,7 +88,7 @@ func (d *NeteaseMusic) Remove(ctx context.Context, obj model.Obj) error {
 }
 
 func (d *NeteaseMusic) Put(ctx context.Context, dstDir model.Obj, stream model.FileStreamer, up driver.UpdateProgress) error {
-	return d.putSongStream(stream)
+	return d.putSongStream(ctx, stream, up)
 }
 
 func (d *NeteaseMusic) Copy(ctx context.Context, srcObj, dstDir model.Obj) error {

drivers/netease_music/types.go

@@ -2,6 +2,7 @@ package netease_music
 
 import (
 	"context"
+	"github.com/alist-org/alist/v3/internal/driver"
 	"io"
 	"net/http"
 	"strconv"
@@ -71,6 +72,8 @@ func (lrc *LyricObj) getLyricLink() *model.Link {
 type ReqOption struct {
 	crypto  string
 	stream  model.FileStreamer
+	up      driver.UpdateProgress
+	ctx     context.Context
 	data    map[string]string
 	headers map[string]string
 	cookies []*http.Cookie
@@ -113,3 +116,16 @@ func (ch *Characteristic) merge(data map[string]string) map[string]interface{} {
 	}
 	return body
 }
+
+type InlineReadCloser struct {
+	io.Reader
+	io.Closer
+}
+
+func (rc *InlineReadCloser) Read(p []byte) (int, error) {
+	return rc.Reader.Read(p)
+}
+
+func (rc *InlineReadCloser) Close() error {
+	return rc.Closer.Close()
+}

drivers/netease_music/upload.go

@@ -1,8 +1,10 @@
 package netease_music
 
 import (
+	"context"
 	"crypto/md5"
 	"encoding/hex"
+	"github.com/alist-org/alist/v3/internal/driver"
 	"io"
 	"net/http"
 	"strconv"
@@ -47,9 +49,12 @@ func (u *uploader) init(stream model.FileStreamer) error {
 	}
 
 	h := md5.New()
-	utils.CopyWithBuffer(h, stream)
+	_, err := utils.CopyWithBuffer(h, stream)
+	if err != nil {
+		return err
+	}
 	u.md5 = hex.EncodeToString(h.Sum(nil))
-	_, err := u.file.Seek(0, io.SeekStart)
+	_, err = u.file.Seek(0, io.SeekStart)
 	if err != nil {
 		return err
 	}
@@ -167,7 +172,7 @@ func (u *uploader) publishInfo(resourceId string) error {
 	return nil
 }
 
-func (u *uploader) upload(stream model.FileStreamer) error {
+func (u *uploader) upload(ctx context.Context, stream model.FileStreamer, up driver.UpdateProgress) error {
 	bucket := "jd-musicrep-privatecloud-audio-public"
 	token, err := u.allocToken(bucket)
 	if err != nil {
@@ -192,6 +197,8 @@ func (u *uploader) upload(stream model.FileStreamer) error {
 		http.MethodPost,
 		ReqOption{
 			stream: stream,
+			up:     up,
+			ctx:    ctx,
 			headers: map[string]string{
 				"x-nos-token":    token.token,
 				"Content-Type":   "audio/mpeg",

drivers/netease_music/util.go

@@ -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
 		}