chore(deps): tidy go.mod

cmd/flags/config.go

@@ -2,7 +2,6 @@ package flags
 
 var (
 	DataDir     string
-	ConfigPath  string
 	Debug       bool
 	NoPrefix    bool
 	Dev         bool

cmd/root.go

@@ -27,8 +27,7 @@ func Execute() {
 }
 
 func init() {
-	RootCmd.PersistentFlags().StringVar(&flags.DataDir, "data", "data", "data directory (relative paths are resolved against the current working directory)")
-	RootCmd.PersistentFlags().StringVar(&flags.ConfigPath, "config", "", "path to config.json (relative to current working directory; defaults to [data directory]/config.json, where [data directory] is set by --data)")
+	RootCmd.PersistentFlags().StringVar(&flags.DataDir, "data", "data", "data folder")
 	RootCmd.PersistentFlags().BoolVar(&flags.Debug, "debug", false, "start with debug mode")
 	RootCmd.PersistentFlags().BoolVar(&flags.NoPrefix, "no-prefix", false, "disable env prefix")
 	RootCmd.PersistentFlags().BoolVar(&flags.Dev, "dev", false, "start with dev mode")

drivers/115/meta.go

@@ -17,7 +17,7 @@ type Addition struct {
 var config = driver.Config{
 	Name:          "115 Cloud",
 	DefaultRoot:   "0",
-	LinkCacheMode: driver.LinkCacheUA,
+	LinkCacheType: 2,
 }
 
 func init() {

drivers/115_open/meta.go

@@ -19,7 +19,7 @@ type Addition struct {
 var config = driver.Config{
 	Name:          "115 Open",
 	DefaultRoot:   "0",
-	LinkCacheMode: driver.LinkCacheUA,
+	LinkCacheType: 2,
 }
 
 func init() {

drivers/123/driver.go

@@ -41,9 +41,7 @@ func (d *Pan123) GetAddition() driver.Additional {
 }
 
 func (d *Pan123) Init(ctx context.Context) error {
-	_, err := d.Request(UserInfo, http.MethodGet, func(req *resty.Request) {
-		req.SetHeader("platform", "web")
-	}, nil)
+	_, err := d.Request(UserInfo, http.MethodGet, nil, nil)
 	return err
 }
 

drivers/123/meta.go

@@ -12,8 +12,7 @@ type Addition struct {
 	//OrderBy        string `json:"order_by" type:"select" options:"file_id,file_name,size,update_at" default:"file_name"`
 	//OrderDirection string `json:"order_direction" type:"select" options:"asc,desc" default:"asc"`
 	AccessToken  string
-	UploadThread int    `json:"UploadThread" type:"number" default:"3" help:"the threads of upload"`
-	Platform     string `json:"platform" type:"string" default:"web" help:"the platform header value, sent with API requests"`
+	UploadThread int `json:"UploadThread" type:"number" default:"3" help:"the threads of upload"`
 }
 
 var config = driver.Config{

drivers/123/util.go

@@ -203,7 +203,7 @@ do:
 		"referer":       "https://www.123pan.com/",
 		"authorization": "Bearer " + d.AccessToken,
 		"user-agent":    "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) openlist-client",
-		"platform":      d.Platform,
+		"platform":      "web",
 		"app-version":   "3",
 		//"user-agent":    base.UserAgent,
 	})

drivers/alias/driver.go

@@ -524,25 +524,4 @@ func (d *Alias) ArchiveDecompress(ctx context.Context, srcObj, dstDir model.Obj,
 	}
 }
 
-func (d *Alias) ResolveLinkCacheMode(path string) driver.LinkCacheMode {
-	root, sub := d.getRootAndPath(path)
-	dsts, ok := d.pathMap[root]
-	if !ok {
-		return 0
-	}
-	for _, dst := range dsts {
-		storage, actualPath, err := op.GetStorageAndActualPath(stdpath.Join(dst, sub))
-		if err != nil {
-			continue
-		}
-		mode := storage.Config().LinkCacheMode
-		if mode == -1 {
-			return storage.(driver.LinkCacheModeResolver).ResolveLinkCacheMode(actualPath)
-		} else {
-			return mode
-		}
-	}
-	return 0
-}
-
 var _ driver.Driver = (*Alias)(nil)

drivers/alias/meta.go

@@ -26,7 +26,6 @@ var config = driver.Config{
 	NoUpload:         false,
 	DefaultRoot:      "/",
 	ProxyRangeOption: true,
-	LinkCacheMode:    driver.LinkCacheAuto,
 }
 
 func init() {

drivers/aliyundrive_open/driver.go

@@ -299,7 +299,10 @@ func (d *AliyundriveOpen) GetDetails(ctx context.Context) (*model.StorageDetails
 	total := utils.Json.Get(res, "personal_space_info", "total_size").ToUint64()
 	used := utils.Json.Get(res, "personal_space_info", "used_size").ToUint64()
 	return &model.StorageDetails{
-		DiskUsage: driver.DiskUsageFromUsedAndTotal(used, total),
+		DiskUsage: model.DiskUsage{
+			TotalSpace: total,
+			FreeSpace:  total - used,
+		},
 	}, nil
 }
 

drivers/baidu_photo/meta.go

@@ -20,7 +20,7 @@ type Addition struct {
 var config = driver.Config{
 	Name:          "BaiduPhoto",
 	LocalSort:     true,
-	LinkCacheMode: driver.LinkCacheUA,
+	LinkCacheType: 2,
 }
 
 func init() {

drivers/febbox/meta.go

@@ -19,7 +19,7 @@ var config = driver.Config{
 	Name:          "FebBox",
 	NoUpload:      true,
 	DefaultRoot:   "0",
-	LinkCacheMode: driver.LinkCacheIP,
+	LinkCacheType: 1,
 }
 
 func init() {

drivers/openlist/driver.go

@@ -26,6 +26,11 @@ type OpenList struct {
 }
 
 func (d *OpenList) Config() driver.Config {
+	if d.PassUAToUpsteam {
+		c := config
+		c.LinkCacheType = 2 // add User-Agent to cache key
+		return c
+	}
 	return config
 }
 
@@ -110,29 +115,19 @@ func (d *OpenList) List(ctx context.Context, dir model.Obj, args model.ListArgs)
 
 func (d *OpenList) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
 	var resp common.Resp[FsGetResp]
-	headers := map[string]string{
-		"User-Agent": base.UserAgent,
-	}
 	// if PassUAToUpsteam is true, then pass the user-agent to the upstream
+	userAgent := base.UserAgent
 	if d.PassUAToUpsteam {
-		userAgent := args.Header.Get("user-agent")
-		if userAgent != "" {
-			headers["User-Agent"] = base.UserAgent
-		}
-	}
-	// if PassIPToUpsteam is true, then pass the ip address to the upstream
-	if d.PassIPToUpsteam {
-		ip := args.IP
-		if ip != "" {
-			headers["X-Forwarded-For"] = ip
-			headers["X-Real-Ip"] = ip
+		userAgent = args.Header.Get("user-agent")
+		if userAgent == "" {
+			userAgent = base.UserAgent
 		}
 	}
 	_, _, err := d.request("/fs/get", http.MethodPost, func(req *resty.Request) {
 		req.SetResult(&resp).SetBody(FsGetReq{
 			Path:     file.GetPath(),
 			Password: d.MetaPassword,
-		}).SetHeaders(headers)
+		}).SetHeader("user-agent", userAgent)
 	})
 	if err != nil {
 		return nil, err
@@ -365,15 +360,8 @@ func (d *OpenList) ArchiveDecompress(ctx context.Context, srcObj, dstDir model.O
 	return err
 }
 
-func (d *OpenList) ResolveLinkCacheMode(_ string) driver.LinkCacheMode {
-	var mode driver.LinkCacheMode
-	if d.PassIPToUpsteam {
-		mode |= driver.LinkCacheIP
-	}
-	if d.PassUAToUpsteam {
-		mode |= driver.LinkCacheUA
-	}
-	return mode
-}
+//func (d *OpenList) Other(ctx context.Context, args model.OtherArgs) (interface{}, error) {
+//	return nil, errs.NotSupport
+//}
 
 var _ driver.Driver = (*OpenList)(nil)

drivers/openlist/meta.go

@@ -12,7 +12,6 @@ type Addition struct {
 	Username          string `json:"username"`
 	Password          string `json:"password"`
 	Token             string `json:"token"`
-	PassIPToUpsteam   bool   `json:"pass_ip_to_upsteam" default:"true"`
 	PassUAToUpsteam   bool   `json:"pass_ua_to_upsteam" default:"true"`
 	ForwardArchiveReq bool   `json:"forward_archive_requests" default:"true"`
 }
@@ -23,7 +22,6 @@ var config = driver.Config{
 	DefaultRoot:      "/",
 	CheckStatus:      true,
 	ProxyRangeOption: true,
-	LinkCacheMode:    driver.LinkCacheAuto,
 }
 
 func init() {

drivers/strm/driver.go

@@ -15,7 +15,6 @@ import (
 	"github.com/OpenListTeam/OpenList/v4/internal/stream"
 	"github.com/OpenListTeam/OpenList/v4/pkg/utils"
 	"github.com/OpenListTeam/OpenList/v4/server/common"
-	log "github.com/sirupsen/logrus"
 )
 
 type Strm struct {
@@ -41,9 +40,6 @@ func (d *Strm) Init(ctx context.Context) error {
 	if d.Paths == "" {
 		return errors.New("paths is required")
 	}
-	if d.SaveStrmToLocal && len(d.SaveStrmLocalPath) <= 0 {
-		return errors.New("SaveStrmLocalPath is required")
-	}
 	d.pathMap = make(map[string][]string)
 	for _, path := range strings.Split(d.Paths, "\n") {
 		path = strings.TrimSpace(path)
@@ -52,11 +48,6 @@ 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 len(d.pathMap) == 1 {
 		for k := range d.pathMap {
@@ -96,9 +87,6 @@ func (d *Strm) Drop(ctx context.Context) error {
 	d.pathMap = nil
 	d.downloadSuffix = nil
 	d.supportSuffix = nil
-	for _, path := range strings.Split(d.Paths, "\n") {
-		RemoveStrm(utils.FixAndCleanPath(strings.TrimSpace(path)), d)
-	}
 	return nil
 }
 

drivers/strm/hook.go

@@ -1,164 +0,0 @@
-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/utils"
-	log "github.com/sirupsen/logrus"
-	"github.com/tchap/go-patricia/v2/patricia"
-)
-
-var strmTrie = patricia.NewTrie()
-
-func UpdateLocalStrm(ctx context.Context, path string, objs []model.Obj) {
-	path = utils.FixAndCleanPath(path)
-	updateLocal := func(driver *Strm, basePath string, objs []model.Obj) {
-		relParent := strings.TrimPrefix(basePath, driver.MountPath)
-		localParentPath := stdpath.Join(driver.SaveStrmLocalPath, relParent)
-		for _, obj := range objs {
-			localPath := stdpath.Join(localParentPath, obj.GetName())
-			generateStrm(ctx, driver, obj, localPath)
-		}
-		deleteExtraFiles(localParentPath, objs)
-	}
-
-	_ = strmTrie.VisitPrefixes(patricia.Prefix(path), func(needPathPrefix patricia.Prefix, item patricia.Item) error {
-		strmDrivers := item.([]*Strm)
-		needPath := string(needPathPrefix)
-		restPath := strings.TrimPrefix(path, needPath)
-		if len(restPath) > 0 && restPath[0] != '/' {
-			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
-			})
-			updateLocal(strmDriver, stdpath.Join(stdpath.Base(needPath), restPath), strmObjs)
-		}
-		return nil
-	})
-}
-
-func InsertStrm(dstPath string, d *Strm) error {
-	prefix := patricia.Prefix(strings.TrimRight(dstPath, "/"))
-	existing := strmTrie.Get(prefix)
-
-	if existing == nil {
-		if !strmTrie.Insert(prefix, []*Strm{d}) {
-			return errors.New("failed to insert strm")
-		}
-		return nil
-	}
-	if lst, ok := existing.([]*Strm); ok {
-		strmTrie.Set(prefix, append(lst, d))
-	} else {
-		return errors.New("invalid trie item type")
-	}
-
-	return nil
-}
-
-func RemoveStrm(dstPath string, d *Strm) {
-	prefix := patricia.Prefix(strings.TrimRight(dstPath, "/"))
-	existing := strmTrie.Get(prefix)
-	if existing == nil {
-		return
-	}
-	lst, ok := existing.([]*Strm)
-	if !ok {
-		return
-	}
-	if len(lst) == 1 && lst[0] == d {
-		strmTrie.Delete(prefix)
-		return
-	}
-
-	for i, di := range lst {
-		if di == d {
-			newList := append(lst[:i], lst[i+1:]...)
-			strmTrie.Set(prefix, newList)
-			return
-		}
-	}
-}
-
-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)
-	}
-}
-
-func deleteExtraFiles(localPath string, objs []model.Obj) {
-	localFiles, err := getLocalFiles(localPath)
-	if err != nil {
-		log.Errorf("Failed to read local files from %s: %v", localPath, err)
-		return
-	}
-
-	objsSet := make(map[string]struct{})
-	for _, obj := range objs {
-		if obj.IsDir() {
-			continue
-		}
-		objsSet[stdpath.Join(localPath, obj.GetName())] = struct{}{}
-	}
-
-	for _, localFile := range localFiles {
-		if _, exists := objsSet[localFile]; !exists {
-			err := os.Remove(localFile)
-			if err != nil {
-				log.Errorf("Failed to delete file: %s, error: %v\n", localFile, err)
-			} else {
-				log.Infof("Deleted file %s", localFile)
-			}
-		}
-	}
-}
-
-func getLocalFiles(localPath string) ([]string, error) {
-	var files []string
-	entries, err := os.ReadDir(localPath)
-	if err != nil {
-		return nil, err
-	}
-	for _, entry := range entries {
-		if !entry.IsDir() {
-			files = append(files, stdpath.Join(localPath, entry.Name()))
-		}
-	}
-	return files, nil
-}
-
-func init() {
-	op.RegisterObjsUpdateHook(UpdateLocalStrm)
-}

drivers/strm/meta.go

@@ -11,9 +11,7 @@ type Addition struct {
 	FilterFileTypes   string `json:"filterFileTypes" type:"text" default:"strm" required:"false" help:"Supports suffix name of strm file"`
 	DownloadFileTypes string `json:"downloadFileTypes" type:"text" default:"ass" required:"false" help:"Files need to download with strm (usally subtitles)"`
 	EncodePath        bool   `json:"encodePath" default:"true" required:"true" help:"encode the path in the strm file"`
-	WithoutUrl        bool   `json:"withoutUrl" default:"false" help:"strm file content without URL prefix"`
-	SaveStrmToLocal   bool   `json:"SaveStrmToLocal" default:"false" help:"save strm file locally"`
-	SaveStrmLocalPath string `json:"SaveStrmLocalPath" type:"text" help:"save strm file local path"`
+	LocalModel        bool   `json:"localModel" default:"false" help:"enable local mode"`
 }
 
 var config = driver.Config{

drivers/strm/util.go

@@ -61,12 +61,36 @@ func (d *Strm) list(ctx context.Context, dst, sub string, args *fs.ListArgs) ([]
 
 	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.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 {
+				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)
 			continue
 		}
+
 		validObjs = append(validObjs, &model.ObjThumb{
 			Object: objRes,
 			Thumbnail: model.Thumbnail{
@@ -77,32 +101,6 @@ 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(),
-	}
-}
-
 func (d *Strm) getLink(ctx context.Context, path string) string {
 	finalPath := path
 	if d.EncodePath {
@@ -112,7 +110,7 @@ func (d *Strm) getLink(ctx context.Context, path string) string {
 		signPath := sign.Sign(path)
 		finalPath = fmt.Sprintf("%s?sign=%s", finalPath, signPath)
 	}
-	if d.WithoutUrl {
+	if d.LocalModel {
 		return finalPath
 	}
 	apiUrl := d.SiteUrl
@@ -121,9 +119,7 @@ func (d *Strm) getLink(ctx context.Context, path string) string {
 	} else {
 		apiUrl = common.GetApiUrl(ctx)
 	}
-	if !strings.HasPrefix(finalPath, "/") {
-		finalPath = "/" + finalPath
-	}
+
 	return fmt.Sprintf("%s/d%s",
 		apiUrl,
 		finalPath)

drivers/thunder/driver.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"fmt"
 	"net/http"
-	"net/url"
 	"strconv"
 	"strings"
 
@@ -69,7 +68,6 @@ func (x *Thunder) Init(ctx context.Context) (err error) {
 				PackageName:       "com.xunlei.downloadprovider",
 				UserAgent:         "ANDROID-com.xunlei.downloadprovider/8.31.0.9726 netWorkType/5G appid/40 deviceName/Xiaomi_M2004j7ac deviceModel/M2004J7AC OSVersion/12 protocolVersion/301 platformVersion/10 sdkVersion/512000 Oauth2Client/0.9 (Linux 4_14_186-perf-gddfs8vbb238b) (JAVA 0)",
 				DownloadUserAgent: "Dalvik/2.1.0 (Linux; U; Android 12; M2004J7AC Build/SP1A.210812.016)",
-				Space:             x.Space,
 				refreshCTokenCk: func(token string) {
 					x.CaptchaToken = token
 					op.MustSaveDriverStorage(x)
@@ -169,7 +167,6 @@ func (x *ThunderExpert) Init(ctx context.Context) (err error) {
 				UserAgent:         x.UserAgent,
 				DownloadUserAgent: x.DownloadUserAgent,
 				UseVideoUrl:       x.UseVideoUrl,
-				Space:             x.Space,
 
 				refreshCTokenCk: func(token string) {
 					x.CaptchaToken = token
@@ -284,7 +281,7 @@ func (xc *XunLeiCommon) Link(ctx context.Context, file model.Obj, args model.Lin
 	_, err := xc.Request(FILE_API_URL+"/{fileID}", http.MethodGet, func(r *resty.Request) {
 		r.SetContext(ctx)
 		r.SetPathParam("fileID", file.GetID())
-		r.SetQueryParam("space", xc.Space)
+		//r.SetQueryParam("space", "")
 	}, &lFile)
 	if err != nil {
 		return nil, err
@@ -325,7 +322,6 @@ func (xc *XunLeiCommon) MakeDir(ctx context.Context, parentDir model.Obj, dirNam
 			"kind":      FOLDER,
 			"name":      dirName,
 			"parent_id": parentDir.GetID(),
-			"space":     xc.Space,
 		})
 	}, nil)
 	return err
@@ -335,9 +331,8 @@ func (xc *XunLeiCommon) Move(ctx context.Context, srcObj, dstDir model.Obj) erro
 	_, err := xc.Request(FILE_API_URL+":batchMove", http.MethodPost, func(r *resty.Request) {
 		r.SetContext(ctx)
 		r.SetBody(&base.Json{
-			"to":    base.Json{"parent_id": dstDir.GetID()},
-			"ids":   []string{srcObj.GetID()},
-			"space": xc.Space,
+			"to":  base.Json{"parent_id": dstDir.GetID()},
+			"ids": []string{srcObj.GetID()},
 		})
 	}, nil)
 	return err
@@ -347,10 +342,7 @@ func (xc *XunLeiCommon) Rename(ctx context.Context, srcObj model.Obj, newName st
 	_, err := xc.Request(FILE_API_URL+"/{fileID}", http.MethodPatch, func(r *resty.Request) {
 		r.SetContext(ctx)
 		r.SetPathParam("fileID", srcObj.GetID())
-		r.SetBody(&base.Json{
-			"name":  newName,
-			"space": xc.Space,
-		})
+		r.SetBody(&base.Json{"name": newName})
 	}, nil)
 	return err
 }
@@ -359,9 +351,8 @@ func (xc *XunLeiCommon) Copy(ctx context.Context, srcObj, dstDir model.Obj) erro
 	_, err := xc.Request(FILE_API_URL+":batchCopy", http.MethodPost, func(r *resty.Request) {
 		r.SetContext(ctx)
 		r.SetBody(&base.Json{
-			"to":    base.Json{"parent_id": dstDir.GetID()},
-			"ids":   []string{srcObj.GetID()},
-			"space": xc.Space,
+			"to":  base.Json{"parent_id": dstDir.GetID()},
+			"ids": []string{srcObj.GetID()},
 		})
 	}, nil)
 	return err
@@ -371,7 +362,6 @@ func (xc *XunLeiCommon) Remove(ctx context.Context, obj model.Obj) error {
 	_, err := xc.Request(FILE_API_URL+"/{fileID}/trash", http.MethodPatch, func(r *resty.Request) {
 		r.SetContext(ctx)
 		r.SetPathParam("fileID", obj.GetID())
-		r.SetQueryParam("space", xc.Space)
 		r.SetBody("{}")
 	}, nil)
 	return err
@@ -397,7 +387,6 @@ func (xc *XunLeiCommon) Put(ctx context.Context, dstDir model.Obj, file model.Fi
 			"size":        file.GetSize(),
 			"hash":        gcid,
 			"upload_type": UPLOAD_TYPE_RESUMABLE,
-			"space":       xc.Space,
 		})
 	}, &resp)
 	if err != nil {
@@ -441,7 +430,7 @@ func (xc *XunLeiCommon) getFiles(ctx context.Context, folderId string) ([]model.
 		_, err := xc.Request(FILE_API_URL, http.MethodGet, func(r *resty.Request) {
 			r.SetContext(ctx)
 			r.SetQueryParams(map[string]string{
-				"space":      xc.Space,
+				"space":      "",
 				"__type":     "drive",
 				"refresh":    "true",
 				"__sync":     "true",
@@ -451,17 +440,6 @@ func (xc *XunLeiCommon) getFiles(ctx context.Context, folderId string) ([]model.
 				"limit":      "100",
 				"filters":    `{"phase":{"eq":"PHASE_TYPE_COMPLETE"},"trashed":{"eq":false}}`,
 			})
-			// 获取硬盘挂载目录等
-			if xc.Space != "" {
-				r.SetQueryParamsFromValues(url.Values{
-					"with": []string{
-						"withCategoryDiskMountPath",
-						"withCategoryDriveCachePath",
-						"withCategoryHistoryDownloadPath",
-						"withReadOnlyFS",
-					},
-				})
-			}
 		}, &fileList)
 		if err != nil {
 			return nil, err
@@ -598,7 +576,6 @@ func (xc *XunLeiCommon) OfflineDownload(ctx context.Context, fileUrl string, par
 			"name":        fileName,
 			"parent_id":   parentDir.GetID(),
 			"upload_type": UPLOAD_TYPE_URL,
-			"space":       xc.Space,
 			"url": base.Json{
 				"url": fileUrl,
 			},
@@ -625,7 +602,6 @@ func (xc *XunLeiCommon) OfflineList(ctx context.Context, nextPageToken string) (
 				"type":       "offline",
 				"limit":      "10000",
 				"page_token": nextPageToken,
-				"space":      xc.Space,
 			})
 	}, &resp)
 
@@ -642,7 +618,6 @@ func (xc *XunLeiCommon) DeleteOfflineTasks(ctx context.Context, taskIDs []string
 			SetQueryParams(map[string]string{
 				"task_ids":     strings.Join(taskIDs, ","),
 				"delete_files": strconv.FormatBool(deleteFiles),
-				"space":        xc.Space,
 			})
 	}, nil)
 	if err != nil {

drivers/thunder/meta.go

@@ -46,8 +46,6 @@ type ExpertAddition struct {
 
 	//优先使用视频链接代替下载链接
 	UseVideoUrl bool `json:"use_video_url"`
-
-	Space string `json:"space" default:"" help:"device id for remote device"`
 }
 
 // 登录特征,用于判断是否重新登录
@@ -82,8 +80,6 @@ type Addition struct {
 	CreditKey string `json:"credit_key" help:"credit key,used for login"`
 	// 登录设备ID
 	DeviceID string `json:"device_id" default:""`
-
-	Space string `json:"space" default:"" help:"device id for remote device"`
 }
 
 // 登录特征,用于判断是否重新登录
@@ -94,6 +90,7 @@ func (i *Addition) GetIdentity() string {
 var config = driver.Config{
 	Name:      "Thunder",
 	LocalSort: true,
+	OnlyProxy: true,
 }
 
 var configExpert = driver.Config{

drivers/thunder/util.go

@@ -68,7 +68,6 @@ type Common struct {
 	UserAgent         string
 	DownloadUserAgent string
 	UseVideoUrl       bool
-	Space             string
 
 	// 验证码token刷新成功回调
 	refreshCTokenCk func(token string)

go.mod

@@ -11,6 +11,7 @@ require (
 	github.com/OpenListTeam/times v0.1.0
 	github.com/OpenListTeam/wopan-sdk-go v0.1.5
 	github.com/ProtonMail/go-crypto v1.3.0
+	github.com/ProtonMail/gopenpgp/v2 v2.9.0
 	github.com/SheltonZhu/115driver v1.1.1
 	github.com/aliyun/aliyun-oss-go-sdk v3.0.2+incompatible
 	github.com/avast/retry-go v3.0.0+incompatible
@@ -40,9 +41,10 @@ require (
 	github.com/gorilla/websocket v1.5.3
 	github.com/halalcloud/golang-sdk-lite v0.0.0-20251006164234-3c629727c499
 	github.com/hekmon/transmissionrpc/v3 v3.0.0
+	github.com/henrybear327/go-proton-api v1.0.0
 	github.com/ipfs/go-ipfs-api v0.7.0
 	github.com/itsHenry35/gofakes3 v0.0.8
-	github.com/jlaffaye/ftp v0.2.1-0.20240918233326-1b970516f5d3
+	github.com/jlaffaye/ftp v0.2.1-0.20250831012827-3f092e051c94
 	github.com/json-iterator/go v1.1.12
 	github.com/kdomanski/iso9660 v0.4.0
 	github.com/maruel/natural v1.1.1
@@ -60,7 +62,7 @@ require (
 	github.com/sirupsen/logrus v1.9.3
 	github.com/spf13/afero v1.14.0
 	github.com/spf13/cobra v1.9.1
-	github.com/stretchr/testify v1.10.0
+	github.com/stretchr/testify v1.11.1
 	github.com/t3rm1n4l/go-mega v0.0.0-20241213151442-a19cff0ec7b5
 	github.com/tchap/go-patricia/v2 v2.3.3
 	github.com/u2takey/ffmpeg-go v0.5.0
@@ -88,7 +90,6 @@ require (
 	github.com/ProtonMail/gluon v0.17.1-0.20230724134000-308be39be96e // indirect
 	github.com/ProtonMail/go-mime v0.0.0-20230322103455-7d82a3887f2f // indirect
 	github.com/ProtonMail/go-srp v0.0.7 // indirect
-	github.com/ProtonMail/gopenpgp/v2 v2.9.0 // indirect
 	github.com/PuerkitoBio/goquery v1.10.3 // indirect
 	github.com/RoaringBitmap/roaring/v2 v2.4.5 // indirect
 	github.com/andybalholm/cascadia v1.3.3 // indirect
@@ -101,7 +102,6 @@ require (
 	github.com/ebitengine/purego v0.8.4 // indirect
 	github.com/emersion/go-message v0.18.2 // indirect
 	github.com/emersion/go-vcard v0.0.0-20241024213814-c9703dde27ff // indirect
-	github.com/henrybear327/go-proton-api v1.0.0 // indirect
 	github.com/geoffgarside/ber v1.2.0 // indirect
 	github.com/hashicorp/go-uuid v1.0.3 // indirect
 	github.com/jcmturner/aescts/v2 v2.0.0 // indirect
@@ -116,12 +116,11 @@ require (
 	github.com/minio/xxml v0.0.3 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/otiai10/mint v1.6.3 // indirect
+	github.com/quic-go/qpack v0.5.1 // indirect
 	github.com/relvacode/iso8601 v1.6.0 // indirect
 	github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
-	golang.org/x/exp v0.0.0-20250606033433-dcc06ee1d476 // indirect
-	github.com/quic-go/qpack v0.5.1 // indirect
-	github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
 	go.uber.org/mock v0.5.0 // indirect
+	golang.org/x/exp v0.0.0-20250606033433-dcc06ee1d476 // indirect
 	golang.org/x/mod v0.27.0 // indirect
 	gopkg.in/go-jose/go-jose.v2 v2.6.3 // indirect
 )

go.sum

@@ -39,6 +39,8 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/Da3zKi7/saferith v0.33.0-fixed h1:fnIWTk7EP9mZAICf7aQjeoAwpfrlCrkOvqmi6CbWdTk=
 github.com/Da3zKi7/saferith v0.33.0-fixed/go.mod h1:QKJhjoqUtBsXCAVEjw38mFqoi7DebT7kthcD7UzbnoA=
+github.com/Masterminds/semver/v3 v3.2.0 h1:3MEsd0SM6jqZojhjLWWeBY+Kcjy9i6MQAeY7YgDP83g=
+github.com/Masterminds/semver/v3 v3.2.0/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ=
 github.com/Max-Sum/base32768 v0.0.0-20230304063302-18e6ce5945fd h1:nzE1YQBdx1bq9IlZinHa+HVffy+NmVRoKr+wHN8fpLE=
 github.com/Max-Sum/base32768 v0.0.0-20230304063302-18e6ce5945fd/go.mod h1:C8yoIfvESpM3GD07OCHU7fqI7lhwyZ2Td1rbNbTAhnc=
 github.com/OpenListTeam/115-sdk-go v0.2.2 h1:JCrGHqQjBX3laOA6Hw4CuBovSg7g+FC5s0LEAYsRciU=
@@ -390,8 +392,6 @@ github.com/gorilla/sessions v1.2.1 h1:DHd3rPN5lE3Ts3D8rKkQ8x/0kqfeNmBAaiSi+o7Fsg
 github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM=
 github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
 github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
-github.com/halalcloud/golang-sdk-lite v0.0.0-20251006100629-ba7a40dce261 h1:47L8SHM80cXszQydLrpp9MhVkFLLWCvrU9XmJ6XtRu0=
-github.com/halalcloud/golang-sdk-lite v0.0.0-20251006100629-ba7a40dce261/go.mod h1:8x1h4rm3s8xMcTyJrq848sQ6BJnKzl57mDY4CNshdPM=
 github.com/halalcloud/golang-sdk-lite v0.0.0-20251006164234-3c629727c499 h1:4ovnBdiGDFi8putQGxhipuuhXItAgh4/YnzufPYkZkQ=
 github.com/halalcloud/golang-sdk-lite v0.0.0-20251006164234-3c629727c499/go.mod h1:8x1h4rm3s8xMcTyJrq848sQ6BJnKzl57mDY4CNshdPM=
 github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
@@ -419,8 +419,6 @@ github.com/henrybear327/Proton-API-Bridge v1.0.0 h1:gjKAaWfKu++77WsZTHg6FUyPC5W0
 github.com/henrybear327/Proton-API-Bridge v1.0.0/go.mod h1:gunH16hf6U74W2b9CGDaWRadiLICsoJ6KRkSt53zLts=
 github.com/henrybear327/go-proton-api v1.0.0 h1:zYi/IbjLwFAW7ltCeqXneUGJey0TN//Xo851a/BgLXw=
 github.com/henrybear327/go-proton-api v1.0.0/go.mod h1:w63MZuzufKcIZ93pwRgiOtxMXYafI8H74D77AxytOBc=
-github.com/hirochachacha/go-smb2 v1.1.0 h1:b6hs9qKIql9eVXAiN0M2wSFY5xnhbHAQoCwRKbaRTZI=
-github.com/hirochachacha/go-smb2 v1.1.0/go.mod h1:8F1A4d5EZzrGu5R7PU163UcMRDJQl4FtcxjBfsY8TZE=
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
@@ -456,8 +454,8 @@ github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD
 github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
 github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ=
 github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
-github.com/jlaffaye/ftp v0.2.1-0.20240918233326-1b970516f5d3 h1:ZxO6Qr2GOXPdcW80Mcn3nemvilMPvpWqxrNfK2ZnNNs=
-github.com/jlaffaye/ftp v0.2.1-0.20240918233326-1b970516f5d3/go.mod h1:dvLUr/8Fs9a2OBrEnCC5duphbkz/k/mSy5OkXg3PAgI=
+github.com/jlaffaye/ftp v0.2.1-0.20250831012827-3f092e051c94 h1:sBUrMD4Gx91zDgzTqPCr3FqFs2+3wWX7lyUYIP/isuA=
+github.com/jlaffaye/ftp v0.2.1-0.20250831012827-3f092e051c94/go.mod h1:H1+whwD0Qe3YOunlXIWhh3rlvzW5cZfkMDYGQPg+KAM=
 github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
 github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
 github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
@@ -680,8 +678,8 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
-github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
+github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
 github.com/t3rm1n4l/go-mega v0.0.0-20241213151442-a19cff0ec7b5 h1:Sa+sR8aaAMFwxhXWENEnE6ZpqhZ9d7u1RT2722Rw6hc=
 github.com/t3rm1n4l/go-mega v0.0.0-20241213151442-a19cff0ec7b5/go.mod h1:UdZiFUFu6e2WjjtjxivwXWcwc1N/8zgbkBR9QNucUOY=
 github.com/taruti/bytepool v0.0.0-20160310082835-5e3a9ea56543 h1:6Y51mutOvRGRx6KqyMNo//xk8B8o6zW9/RVmy1VamOs=
@@ -744,6 +742,8 @@ go.opentelemetry.io/otel/sdk/metric v1.35.0 h1:1RriWBmCKgkeHEhM7a2uMjMUfP7MsOF5J
 go.opentelemetry.io/otel/sdk/metric v1.35.0/go.mod h1:is6XYCUMpcKi+ZsOvfluY5YstFnhW0BidkR+gL+qN+w=
 go.opentelemetry.io/otel/trace v1.36.0 h1:ahxWNuqZjpdiFAyrIoQ4GIiAIhxAunQR6MUoKrsNd4w=
 go.opentelemetry.io/otel/trace v1.36.0/go.mod h1:gQ+OnDZzrybY4k4seLzPAWNwVBBVlF2szhehOBB/tGA=
+go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A=
+go.uber.org/goleak v1.2.1/go.mod h1:qlT2yGI9QafXHhZZLxlSuNsMw3FFLxBr+tBRlmO1xH4=
 go.uber.org/mock v0.5.0 h1:KAMbZvZPyBPWgD14IrIQ38QCyjwpvVVV6K/bHl1IwQU=
 go.uber.org/mock v0.5.0/go.mod h1:ge71pBPLYDk7QIi1LupWxdAykm7KIEFchiOqd6z7qMM=
 go4.org v0.0.0-20230225012048-214862532bf5 h1:nifaUDeh+rPaBCMPMQHZmvJf+QdpLFnuQPwx+LxVmtc=
@@ -758,8 +758,8 @@ golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8U
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
 golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
+golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
 golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
 golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
 golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=

internal/bootstrap/config.go

@@ -39,21 +39,7 @@ func InitConfig() {
 	if !filepath.IsAbs(dataDir) {
 		flags.DataDir = filepath.Join(pwd, flags.DataDir)
 	}
-	// Determine config file path: use flags.ConfigPath if provided, otherwise default to <dataDir>/config.json
-	configPath := flags.ConfigPath
-	if configPath == "" {
-		configPath = filepath.Join(flags.DataDir, "config.json")
-	} else {
-		// if relative, resolve relative to working directory
-		if !filepath.IsAbs(configPath) {
-			if absPath, err := filepath.Abs(configPath); err == nil {
-				configPath = absPath
-			} else {
-				configPath = filepath.Join(pwd, configPath)
-			}
-		}
-	}
-	configPath = filepath.Clean(configPath)
+	configPath := filepath.Join(flags.DataDir, "config.json")
 	log.Infof("reading config file: %s", configPath)
 	if !utils.Exists(configPath) {
 		log.Infof("config file not exists, creating default config file")

internal/cache/typed_cache.go

@@ -43,14 +43,23 @@ func (c *TypedCache[T]) SetTypeWithExpirable(key, typeKey string, value T, exp E
 	}
 }
 
-func (c *TypedCache[T]) GetType(key, typeKey string) (T, bool) {
+// Prefer to use typeKeys for lookup; if none match, use fallbackTypeKey for lookup
+func (c *TypedCache[T]) GetType(key, fallbackTypeKey string, typeKeys ...string) (T, bool) {
 	c.mu.RLock()
 	cache, exists := c.entries[key]
 	if !exists {
 		c.mu.RUnlock()
 		return *new(T), false
 	}
-	entry, exists := cache[typeKey]
+	entry, exists := cache[fallbackTypeKey]
+	if len(typeKeys) > 0 {
+		for _, tk := range typeKeys {
+			if entry, exists = cache[tk]; exists {
+				fallbackTypeKey = tk
+				break
+			}
+		}
+	}
 	if !exists {
 		c.mu.RUnlock()
 		return *new(T), false
@@ -63,8 +72,8 @@ func (c *TypedCache[T]) GetType(key, typeKey string) (T, bool) {
 	}
 
 	c.mu.Lock()
-	if cache[typeKey] == entry {
-		delete(cache, typeKey)
+	if cache[fallbackTypeKey] == entry {
+		delete(cache, fallbackTypeKey)
 		if len(cache) == 0 {
 			delete(c.entries, key)
 		}

internal/db/sharing.go

@@ -60,7 +60,3 @@ func DeleteSharingById(id string) error {
 	s := model.SharingDB{ID: id}
 	return errors.WithStack(db.Where(s).Delete(&s).Error)
 }
-
-func DeleteSharingsByCreatorId(creatorId uint) error {
-	return errors.WithStack(db.Where("creator_id = ?", creatorId).Delete(&model.SharingDB{}).Error)
-}

internal/driver/config.go

@@ -17,23 +17,11 @@ type Config struct {
 	ProxyRangeOption  bool `json:"-"`
 	// if the driver returns Link without URL, this should be set to true
 	NoLinkURL bool `json:"-"`
-	// Link cache behaviour:
-	//  - LinkCacheAuto: let driver decide per-path (implement driver.LinkCacheModeResolver)
-	//  - LinkCacheNone: no extra info added to cache key (default)
-	//  - flags (OR-able) can add more attributes to cache key (IP, UA, ...)
-	LinkCacheMode `json:"-"`
+	// LinkCacheType=1 add IP to cache key
+	//
+	// LinkCacheType=2 add UserAgent to cache key
+	LinkCacheType uint8 `json:"-"`
 }
-type LinkCacheMode int8
-
-const (
-	LinkCacheAuto LinkCacheMode = -1 // Let the driver decide per-path (use driver.LinkCacheModeResolver)
-	LinkCacheNone LinkCacheMode = 0  // No extra info added to cache key (default)
-)
-
-const (
-	LinkCacheIP LinkCacheMode = 1 << iota // include client IP in cache key
-	LinkCacheUA                           // include User-Agent in cache key
-)
 
 func (c Config) MustProxy() bool {
 	return c.OnlyProxy || c.NoLinkURL

internal/driver/driver.go

@@ -213,8 +213,3 @@ type WithDetails interface {
 type Reference interface {
 	InitReference(storage Driver) error
 }
-
-type LinkCacheModeResolver interface {
-	// ResolveLinkCacheMode returns the LinkCacheMode for the given path.
-	ResolveLinkCacheMode(path string) LinkCacheMode
-}

internal/model/sharing.go

@@ -33,7 +33,7 @@ func (s *Sharing) Valid() bool {
 	if len(s.Files) == 0 {
 		return false
 	}
-	if s.Creator == nil || !s.Creator.CanShare() {
+	if !s.Creator.CanShare() {
 		return false
 	}
 	if s.Expires != nil && !s.Expires.IsZero() && s.Expires.Before(time.Now()) {

internal/op/fs.go

@@ -57,7 +57,7 @@ func List(ctx context.Context, storage driver.Driver, path string, args model.Li
 		model.WrapObjsName(files)
 		// call hooks
 		go func(reqPath string, files []model.Obj) {
-			HandleObjsUpdateHook(context.WithoutCancel(ctx), reqPath, files)
+			HandleObjsUpdateHook(reqPath, files)
 		}(utils.GetFullPath(storage.GetStorage().MountPath, path), files)
 
 		// sort objs
@@ -168,19 +168,23 @@ func Link(ctx context.Context, storage driver.Driver, path string, args model.Li
 		return nil, nil, errors.WithMessagef(errs.StorageNotInit, "storage status: %s", storage.GetStorage().Status)
 	}
 
-	mode := storage.Config().LinkCacheMode
-	if mode == -1 {
-		mode = storage.(driver.LinkCacheModeResolver).ResolveLinkCacheMode(path)
-	}
 	typeKey := args.Type
-	if mode&driver.LinkCacheIP == 1 {
-		typeKey += "/" + args.IP
-	}
-	if mode&driver.LinkCacheUA == 1 {
-		typeKey += "/" + args.Header.Get("User-Agent")
+	var typeKeys []string
+	switch storage.Config().LinkCacheType {
+	case 1:
+		if args.IP != "" {
+			typeKey += "/" + args.IP
+			typeKeys = []string{typeKey}
+		}
+	case 2:
+		if ua := args.Header.Get("User-Agent"); ua != "" {
+			typeKey += "/" + ua
+			typeKeys = []string{typeKey}
+		}
 	}
+
 	key := Key(storage, path)
-	if ol, exists := Cache.linkCache.GetType(key, typeKey); exists {
+	if ol, exists := Cache.linkCache.GetType(key, args.Type, typeKeys...); exists {
 		if ol.link.Expiration != nil ||
 			ol.link.SyncClosers.AcquireReference() || !ol.link.RequireReference {
 			return ol.link, ol.obj, nil

internal/op/hook.go

@@ -1,7 +1,6 @@
 package op
 
 import (
-	"context"
 	"regexp"
 	"strings"
 
@@ -14,7 +13,7 @@ import (
 )
 
 // Obj
-type ObjsUpdateHook = func(ctx context.Context, parent string, objs []model.Obj)
+type ObjsUpdateHook = func(parent string, objs []model.Obj)
 
 var (
 	objsUpdateHooks = make([]ObjsUpdateHook, 0)
@@ -24,9 +23,9 @@ func RegisterObjsUpdateHook(hook ObjsUpdateHook) {
 	objsUpdateHooks = append(objsUpdateHooks, hook)
 }
 
-func HandleObjsUpdateHook(ctx context.Context, parent string, objs []model.Obj) {
+func HandleObjsUpdateHook(parent string, objs []model.Obj) {
 	for _, hook := range objsUpdateHooks {
-		hook(ctx, parent, objs)
+		hook(parent, objs)
 	}
 }
 

internal/op/sharing.go

@@ -137,7 +137,3 @@ func DeleteSharing(sid string) error {
 	sharingCache.Del(sid)
 	return db.DeleteSharingById(sid)
 }
-
-func DeleteSharingsByCreatorId(creatorId uint) error {
-	return db.DeleteSharingsByCreatorId(creatorId)
-}

internal/op/user.go

@@ -6,7 +6,6 @@ import (
 	"github.com/OpenListTeam/OpenList/v4/internal/model"
 	"github.com/OpenListTeam/OpenList/v4/pkg/singleflight"
 	"github.com/OpenListTeam/OpenList/v4/pkg/utils"
-	"github.com/pkg/errors"
 )
 
 var userG singleflight.Group[*model.User]
@@ -79,9 +78,6 @@ func DeleteUserById(id uint) error {
 		return errs.DeleteAdminOrGuest
 	}
 	Cache.DeleteUser(old.Username)
-	if err := DeleteSharingsByCreatorId(id); err != nil {
-		return errors.WithMessage(err, "failed to delete user's sharings")
-	}
 	return db.DeleteUserById(id)
 }
 

internal/search/build.go

@@ -199,13 +199,14 @@ func Config(ctx context.Context) searcher.Config {
 	return instance.Config()
 }
 
-func Update(ctx context.Context, parent string, objs []model.Obj) {
+func Update(parent string, objs []model.Obj) {
 	if instance == nil || !instance.Config().AutoUpdate || !setting.GetBool(conf.AutoUpdateIndex) || Running() {
 		return
 	}
 	if isIgnorePath(parent) {
 		return
 	}
+	ctx := context.Background()
 	// only update when index have built
 	progress, err := Progress()
 	if err != nil {