fix(strm): non-specified type generates strm (#1585)

* fix(strm): non-specified type generates strm

* fix(strm): only insert to strmTrie if SaveStrmToLocal is enabled

* fix(strm): update suffix handling in convert2strmObjs function

* fix(strm): refactor generateStrm to use range reader

---------

Co-authored-by: j2rong4cn <j2rong@qq.com>

Author: Seven66677731

drivers/strm/driver.go

@@ -52,10 +52,12 @@ func (d *Strm) Init(ctx context.Context) error {
 		}
 		k, v := getPair(path)
 		d.pathMap[k] = append(d.pathMap[k], v)
-		err := InsertStrm(utils.FixAndCleanPath(strings.TrimSpace(path)), d)
-		if err != nil {
-			log.Errorf("insert strmTrie error: %v", err)
-			continue
+		if d.SaveStrmToLocal {
+			err := InsertStrm(utils.FixAndCleanPath(strings.TrimSpace(path)), d)
+			if err != nil {
+				log.Errorf("insert strmTrie error: %v", err)
+				continue
+			}
 		}
 	}
 	if len(d.pathMap) == 1 {

drivers/strm/hook.go

@@ -3,14 +3,14 @@ package strm
 import (
 	"context"
 	"errors"
-	"io"
 	"os"
 	stdpath "path"
 	"strings"
 
 	"github.com/OpenListTeam/OpenList/v4/internal/model"
 	"github.com/OpenListTeam/OpenList/v4/internal/op"
 	"github.com/OpenListTeam/OpenList/v4/internal/stream"
+	"github.com/OpenListTeam/OpenList/v4/pkg/http_range"
 	"github.com/OpenListTeam/OpenList/v4/pkg/utils"
 	log "github.com/sirupsen/logrus"
 	"github.com/tchap/go-patricia/v2/patricia"
@@ -38,10 +38,7 @@ func UpdateLocalStrm(ctx context.Context, path string, objs []model.Obj) {
 			return nil
 		}
 		for _, strmDriver := range strmDrivers {
-			strmObjs, _ := utils.SliceConvert(objs, func(obj model.Obj) (model.Obj, error) {
-				ret := strmDriver.convert2strmObj(ctx, path, obj)
-				return &ret, nil
-			})
+			strmObjs := strmDriver.convert2strmObjs(ctx, path, objs)
 			updateLocal(strmDriver, stdpath.Join(stdpath.Base(needPath), restPath), strmObjs)
 		}
 		return nil
@@ -92,29 +89,43 @@ func RemoveStrm(dstPath string, d *Strm) {
 }
 
 func generateStrm(ctx context.Context, driver *Strm, obj model.Obj, localPath string) {
-	link, err := driver.Link(ctx, obj, model.LinkArgs{})
-	if err != nil {
-		log.Warnf("failed to generate strm of obj %s: failed to link: %v", localPath, err)
-		return
-	}
-	seekableStream, err := stream.NewSeekableStream(&stream.FileStream{
-		Obj: obj,
-		Ctx: ctx,
-	}, link)
-	if err != nil {
-		_ = link.Close()
-		log.Warnf("failed to generate strm of obj %s: failed to get seekable stream: %v", localPath, err)
-		return
-	}
-	defer seekableStream.Close()
-	file, err := utils.CreateNestedFile(localPath)
-	if err != nil {
-		log.Warnf("failed to generate strm of obj %s: failed to create local file: %v", localPath, err)
-		return
-	}
-	defer file.Close()
-	if _, err := io.Copy(file, seekableStream); err != nil {
-		log.Warnf("failed to generate strm of obj %s: copy failed: %v", localPath, err)
+	if obj.IsDir() {
+		err := utils.CreateNestedDirectory(localPath)
+		if err != nil {
+			log.Warnf("failed to generate strm dir %s: failed to create dir: %v", localPath, err)
+			return
+		}
+	} else {
+		link, err := driver.Link(ctx, obj, model.LinkArgs{})
+		if err != nil {
+			log.Warnf("failed to generate strm of obj %s: failed to link: %v", localPath, err)
+			return
+		}
+		defer link.Close()
+		size := link.ContentLength
+		if size <= 0 {
+			size = obj.GetSize()
+		}
+		rrf, err := stream.GetRangeReaderFromLink(size, link)
+		if err != nil {
+			log.Warnf("failed to generate strm of obj %s: failed to get range reader: %v", localPath, err)
+			return
+		}
+		rc, err := rrf.RangeRead(ctx, http_range.Range{Length: -1})
+		if err != nil {
+			log.Warnf("failed to generate strm of obj %s: failed to read range: %v", localPath, err)
+			return
+		}
+		defer rc.Close()
+		file, err := utils.CreateNestedFile(localPath)
+		if err != nil {
+			log.Warnf("failed to generate strm of obj %s: failed to create local file: %v", localPath, err)
+			return
+		}
+		defer file.Close()
+		if _, err := utils.CopyWithBuffer(file, rc); err != nil {
+			log.Warnf("failed to generate strm of obj %s: copy failed: %v", localPath, err)
+		}
 	}
 }
 

drivers/strm/util.go

@@ -58,10 +58,35 @@ func (d *Strm) list(ctx context.Context, dst, sub string, args *fs.ListArgs) ([]
 	if err != nil {
 		return nil, err
 	}
+	return d.convert2strmObjs(ctx, reqPath, objs), nil
+}
 
+func (d *Strm) convert2strmObjs(ctx context.Context, reqPath string, objs []model.Obj) []model.Obj {
 	var validObjs []model.Obj
 	for _, obj := range objs {
-		objRes := d.convert2strmObj(ctx, reqPath, obj)
+		id, name, path := "", obj.GetName(), ""
+		size := int64(0)
+		if !obj.IsDir() {
+			path = stdpath.Join(reqPath, obj.GetName())
+			ext := strings.ToLower(utils.Ext(name))
+			if _, ok := d.downloadSuffix[ext]; ok {
+				size = obj.GetSize()
+			} else if _, ok := d.supportSuffix[ext]; ok {
+				id = "strm"
+				name = strings.TrimSuffix(name, ext) + "strm"
+				size = int64(len(d.getLink(ctx, path)))
+			} else {
+				continue
+			}
+		}
+		objRes := model.Object{
+			ID:       id,
+			Path:     path,
+			Name:     name,
+			Size:     size,
+			Modified: obj.ModTime(),
+			IsFolder: obj.IsDir(),
+		}
 		thumb, ok := model.GetThumb(obj)
 		if !ok {
 			validObjs = append(validObjs, &objRes)
@@ -74,33 +99,7 @@ func (d *Strm) list(ctx context.Context, dst, sub string, args *fs.ListArgs) ([]
 			},
 		})
 	}
-	return validObjs, nil
-}
-
-func (d *Strm) convert2strmObj(ctx context.Context, reqPath string, obj model.Obj) model.Object {
-	id, name, path := "", obj.GetName(), ""
-	size := int64(0)
-	if !obj.IsDir() {
-		path = stdpath.Join(reqPath, obj.GetName())
-		ext := strings.ToLower(utils.Ext(name))
-		if _, ok := d.supportSuffix[ext]; ok {
-			id = "strm"
-			name = strings.TrimSuffix(name, ext) + "strm"
-			size = int64(len(d.getLink(ctx, path)))
-		} else if _, ok := d.downloadSuffix[ext]; ok {
-			size = obj.GetSize()
-		} else {
-
-		}
-	}
-	return model.Object{
-		ID:       id,
-		Path:     path,
-		Name:     name,
-		Size:     size,
-		Modified: obj.ModTime(),
-		IsFolder: obj.IsDir(),
-	}
+	return validObjs
 }
 
 func (d *Strm) getLink(ctx context.Context, path string) string {