fix(typo): grammar

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Signed-off-by: ShenLin <773933146@qq.com>

.github/ISSUE_TEMPLATE/00-bug_report_zh.yml

@@ -13,7 +13,7 @@ body:
     attributes:
       label: 请确认以下事项
       description: |
-        您必须确认、同意并勾选以下内容，否则您的问题一定会被直接关闭。
+        您必须勾选以下内容，否则您的问题可能会被直接关闭。
         或者您可以去[讨论区](https://github.com/OpenListTeam/OpenList/discussions)。
       options:
         - label: |
@@ -59,14 +59,6 @@ body:
       label: 问题描述（必填）
     validations:
       required: true
-  - type: textarea
-    id: logs
-    attributes:
-      label: 日志（必填）
-      description: |
-        请复制粘贴错误日志，或者截图。(可隐藏隐私字段) [查看方法](https://doc.oplist.org/faq/howto#%E5%A6%82%E4%BD%95%E5%BF%AB%E9%80%9F%E5%AE%9A%E4%BD%8Dbug)
-    validations:
-      required: true
   - type: textarea
     id: config
     attributes:
@@ -75,6 +67,12 @@ body:
         请提供您的`OpenList`应用的配置文件，并截图相关存储配置。(可隐藏隐私字段)
     validations:
       required: true
+  - type: textarea
+    id: logs
+    attributes:
+      label: 日志（可选）
+      description: |
+        请复制粘贴错误日志，或者截图。(可隐藏隐私字段) [查看方法](https://doc.oplist.org/faq/howto#%E5%A6%82%E4%BD%95%E5%BF%AB%E9%80%9F%E5%AE%9A%E4%BD%8Dbug)
   - type: textarea
     id: reproduction
     attributes:

.github/ISSUE_TEMPLATE/01-bug_report_en.yml

@@ -13,7 +13,7 @@ body:
     attributes:
       label: Please confirm the following
       description: |
-        You must confirm, agree, and check all the following, otherwise your issue will definitely be closed directly.
+        You must check all the following, otherwise your issue may be closed directly.
         Or you can go to the [discussions](https://github.com/OpenListTeam/OpenList/discussions).
       options:
         - label: |
@@ -59,14 +59,6 @@ body:
       label: Bug Description (required)
     validations:
       required: true
-  - type: textarea
-    id: logs
-    attributes:
-      label: Logs (required)
-      description: |
-        Please copy and paste any relevant log output or screenshots. (You may mask sensitive fields) [Guide](https://doc.oplist.org/faq/howto#how-to-quickly-locate-bugs)
-    validations:
-      required: true
   - type: textarea
     id: config
     attributes:
@@ -75,6 +67,12 @@ body:
         Please provide your `OpenList` application's configuration file and a screenshot of the relevant storage configuration. (You may mask sensitive fields)
     validations:
       required: true
+  - type: textarea
+    id: logs
+    attributes:
+      label: Logs (optional)
+      description: |
+        Please copy and paste any relevant log output or screenshots. (You may mask sensitive fields) [Guide](https://doc.oplist.org/faq/howto#how-to-quickly-locate-bugs)
   - type: textarea
     id: reproduction
     attributes:

README.md

@@ -64,9 +64,8 @@ Thank you for your support and understanding of the OpenList project.
   - [x] [UPYUN Storage Service](https://www.upyun.com/products/file-storage)
   - [x] [WebDAV](https://en.wikipedia.org/wiki/WebDAV)
   - [x] Teambition([China](https://www.teambition.com), [International](https://us.teambition.com))
-  - [x] [MediaFire](https://www.mediafire.com)
   - [x] [Mediatrack](https://www.mediatrack.cn)
-  - [x] [ProtonDrive](https://proton.me/drive)
+  - [x] [MediaFire](https://www.mediafire.com)
   - [x] [139yun](https://yun.139.com) (Personal, Family, Group)
   - [x] [YandexDisk](https://disk.yandex.com)
   - [x] [BaiduNetdisk](http://pan.baidu.com)

README_cn.md

@@ -64,9 +64,8 @@ OpenList 是一个由 OpenList 团队独立维护的开源项目，遵循 AGPL-3
   - [x] [又拍云对象存储](https://www.upyun.com/products/file-storage)
   - [x] [WebDAV](https://en.wikipedia.org/wiki/WebDAV)
   - [x] Teambition([中国](https://www.teambition.com), [国际](https://us.teambition.com))
-  - [x] [MediaFire](https://www.mediafire.com)
   - [x] [分秒帧](https://www.mediatrack.cn)
-  - [x] [ProtonDrive](https://proton.me/drive)
+  - [x] [MediaFire](https://www.mediafire.com)
   - [x] [和彩云](https://yun.139.com)（个人、家庭、群组）
   - [x] [YandexDisk](https://disk.yandex.com)
   - [x] [百度网盘](http://pan.baidu.com)

README_ja.md

@@ -65,7 +65,6 @@ OpenListプロジェクトへのご支援とご理解をありがとうござい
   - [x] [WebDAV](https://en.wikipedia.org/wiki/WebDAV)
   - [x] Teambition([中国](https://www.teambition.com), [国際](https://us.teambition.com))
   - [x] [Mediatrack](https://www.mediatrack.cn)
-  - [x] [ProtonDrive](https://proton.me/drive)
   - [x] [139yun](https://yun.139.com)（個人、家族、グループ）
   - [x] [YandexDisk](https://disk.yandex.com)
   - [x] [BaiduNetdisk](http://pan.baidu.com)

README_nl.md

@@ -66,7 +66,6 @@ Dank u voor uw ondersteuning en begrip
   - [x] Teambition([China](https://www.teambition.com), [Internationaal](https://us.teambition.com))
   - [x] [MediaFire](https://www.mediafire.com)
   - [x] [Mediatrack](https://www.mediatrack.cn)
-  - [x] [ProtonDrive](https://proton.me/drive)
   - [x] [139yun](https://yun.139.com) (Persoonlijk, Familie, Groep)
   - [x] [YandexDisk](https://disk.yandex.com)
   - [x] [BaiduNetdisk](http://pan.baidu.com)

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")

cmd/server.go

@@ -27,8 +27,6 @@ import (
 	"github.com/spf13/cobra"
 	"golang.org/x/net/http2"
 	"golang.org/x/net/http2/h2c"
-
-	"github.com/quic-go/quic-go/http3"
 )
 
 // ServerCmd represents the server command
@@ -65,7 +63,6 @@ the address is defined in config file`,
 			httpHandler = h2c.NewHandler(r, &http2.Server{})
 		}
 		var httpSrv, httpsSrv, unixSrv *http.Server
-		var quicSrv *http3.Server
 		if conf.Conf.Scheme.HttpPort != -1 {
 			httpBase := fmt.Sprintf("%s:%d", conf.Conf.Scheme.Address, conf.Conf.Scheme.HttpPort)
 			fmt.Printf("start HTTP server @ %s\n", httpBase)
@@ -89,24 +86,6 @@ the address is defined in config file`,
 					utils.Log.Fatalf("failed to start https: %s", err.Error())
 				}
 			}()
-			if conf.Conf.Scheme.EnableH3 {
-				fmt.Printf("start HTTP3 (quic) server @ %s\n", httpsBase)
-				utils.Log.Infof("start HTTP3 (quic) server @ %s", httpsBase)
-				r.Use(func(c *gin.Context) {
-					if c.Request.TLS != nil {
-						port := conf.Conf.Scheme.HttpsPort
-						c.Header("Alt-Svc", fmt.Sprintf("h3=\":%d\"; ma=86400", port))
-					}
-					c.Next()
-				})
-				quicSrv = &http3.Server{Addr: httpsBase, Handler: r}
-				go func() {
-					err := quicSrv.ListenAndServeTLS(conf.Conf.Scheme.CertFile, conf.Conf.Scheme.KeyFile)
-					if err != nil && !errors.Is(err, http.ErrServerClosed) {
-						utils.Log.Fatalf("failed to start http3 (quic): %s", err.Error())
-					}
-				}()
-			}
 		}
 		if conf.Conf.Scheme.UnixFile != "" {
 			fmt.Printf("start unix server @ %s\n", conf.Conf.Scheme.UnixFile)
@@ -224,15 +203,6 @@ the address is defined in config file`,
 					utils.Log.Fatal("HTTPS server shutdown err: ", err)
 				}
 			}()
-			if conf.Conf.Scheme.EnableH3 {
-				wg.Add(1)
-				go func() {
-					defer wg.Done()
-					if err := quicSrv.Shutdown(ctx); err != nil {
-						utils.Log.Fatal("HTTP3 (quic) server shutdown err: ", err)
-					}
-				}()
-			}
 		}
 		if conf.Conf.Scheme.UnixFile != "" {
 			wg.Add(1)

drivers/115/meta.go

@@ -15,9 +15,10 @@ type Addition struct {
 }
 
 var config = driver.Config{
-	Name:          "115 Cloud",
-	DefaultRoot:   "0",
-	LinkCacheMode: driver.LinkCacheUA,
+	Name:        "115 Cloud",
+	DefaultRoot: "0",
+	// OnlyProxy:   true,
+	// NoOverwriteUpload: true,
 }
 
 func init() {

drivers/115_open/driver.go

@@ -131,6 +131,23 @@ func (d *Open115) Link(ctx context.Context, file model.Obj, args model.LinkArgs)
 	}, nil
 }
 
+func (d *Open115) GetObjInfo(ctx context.Context, path string) (model.Obj, error) {
+	if err := d.WaitLimit(ctx); err != nil {
+		return nil, err
+	}
+	resp, err := d.client.GetFolderInfoByPath(ctx, path)
+	if err != nil {
+		return nil, err
+	}
+	return &Obj{
+		Fid:  resp.FileID,
+		Fn:   resp.FileName,
+		Fc:   resp.FileCategory,
+		Sha1: resp.Sha1,
+		Pc:   resp.PickCode,
+	}, nil
+}
+
 func (d *Open115) MakeDir(ctx context.Context, parentDir model.Obj, dirName string) (model.Obj, error) {
 	if err := d.WaitLimit(ctx); err != nil {
 		return nil, err

drivers/115_open/meta.go

@@ -17,9 +17,8 @@ type Addition struct {
 }
 
 var config = driver.Config{
-	Name:          "115 Open",
-	DefaultRoot:   "0",
-	LinkCacheMode: driver.LinkCacheUA,
+	Name:        "115 Open",
+	DefaultRoot: "0",
 }
 
 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{
@@ -28,7 +27,6 @@ func init() {
 		return &Pan123{
 			Addition: Addition{
 				UploadThread: 3,
-				Platform: "web",
 			},
 		}
 	})

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/189/driver.go

@@ -200,7 +200,10 @@ func (d *Cloud189) GetDetails(ctx context.Context) (*model.StorageDetails, error
 		return nil, err
 	}
 	return &model.StorageDetails{
-		DiskUsage: driver.DiskUsageFromUsedAndTotal(capacityInfo.CloudCapacityInfo.UsedSize, capacityInfo.CloudCapacityInfo.TotalSize),
+		DiskUsage: model.DiskUsage{
+			TotalSpace: capacityInfo.CloudCapacityInfo.TotalSize,
+			FreeSpace:  capacityInfo.CloudCapacityInfo.FreeSize,
+		},
 	}, nil
 }
 

drivers/189/types.go

@@ -72,13 +72,13 @@ type CapacityResp struct {
 	ResMessage        string `json:"res_message"`
 	Account           string `json:"account"`
 	CloudCapacityInfo struct {
-		FreeSize     int64  `json:"freeSize"`
+		FreeSize     uint64 `json:"freeSize"`
 		MailUsedSize uint64 `json:"mail189UsedSize"`
 		TotalSize    uint64 `json:"totalSize"`
 		UsedSize     uint64 `json:"usedSize"`
 	} `json:"cloudCapacityInfo"`
 	FamilyCapacityInfo struct {
-		FreeSize  int64  `json:"freeSize"`
+		FreeSize  uint64 `json:"freeSize"`
 		TotalSize uint64 `json:"totalSize"`
 		UsedSize  uint64 `json:"usedSize"`
 	} `json:"familyCapacityInfo"`

drivers/189_tv/driver.go

@@ -284,15 +284,18 @@ func (y *Cloud189TV) GetDetails(ctx context.Context) (*model.StorageDetails, err
 	if err != nil {
 		return nil, err
 	}
-	var total, used uint64
+	var total, free uint64
 	if y.isFamily() {
 		total = capacityInfo.FamilyCapacityInfo.TotalSize
-		used = capacityInfo.FamilyCapacityInfo.UsedSize
+		free = capacityInfo.FamilyCapacityInfo.FreeSize
 	} else {
 		total = capacityInfo.CloudCapacityInfo.TotalSize
-		used = capacityInfo.CloudCapacityInfo.UsedSize
+		free = capacityInfo.CloudCapacityInfo.FreeSize
 	}
 	return &model.StorageDetails{
-		DiskUsage: driver.DiskUsageFromUsedAndTotal(used, total),
+		DiskUsage: model.DiskUsage{
+			TotalSpace: total,
+			FreeSpace:  free,
+		},
 	}, nil
 }

drivers/189_tv/types.go

@@ -322,13 +322,13 @@ type CapacityResp struct {
 	ResMessage        string `json:"res_message"`
 	Account           string `json:"account"`
 	CloudCapacityInfo struct {
-		FreeSize     int64  `json:"freeSize"`
+		FreeSize     uint64 `json:"freeSize"`
 		MailUsedSize uint64 `json:"mail189UsedSize"`
 		TotalSize    uint64 `json:"totalSize"`
 		UsedSize     uint64 `json:"usedSize"`
 	} `json:"cloudCapacityInfo"`
 	FamilyCapacityInfo struct {
-		FreeSize  int64  `json:"freeSize"`
+		FreeSize  uint64 `json:"freeSize"`
 		TotalSize uint64 `json:"totalSize"`
 		UsedSize  uint64 `json:"usedSize"`
 	} `json:"familyCapacityInfo"`

drivers/189pc/driver.go

@@ -416,15 +416,18 @@ func (y *Cloud189PC) GetDetails(ctx context.Context) (*model.StorageDetails, err
 	if err != nil {
 		return nil, err
 	}
-	var total, used uint64
+	var total, free uint64
 	if y.isFamily() {
 		total = capacityInfo.FamilyCapacityInfo.TotalSize
-		used = capacityInfo.FamilyCapacityInfo.UsedSize
+		free = capacityInfo.FamilyCapacityInfo.FreeSize
 	} else {
 		total = capacityInfo.CloudCapacityInfo.TotalSize
-		used = capacityInfo.CloudCapacityInfo.UsedSize
+		free = capacityInfo.CloudCapacityInfo.FreeSize
 	}
 	return &model.StorageDetails{
-		DiskUsage: driver.DiskUsageFromUsedAndTotal(used, total),
+		DiskUsage: model.DiskUsage{
+			TotalSpace: total,
+			FreeSpace:  free,
+		},
 	}, nil
 }

drivers/189pc/types.go

@@ -415,13 +415,13 @@ type CapacityResp struct {
 	ResMessage        string `json:"res_message"`
 	Account           string `json:"account"`
 	CloudCapacityInfo struct {
-		FreeSize     int64  `json:"freeSize"`
+		FreeSize     uint64 `json:"freeSize"`
 		MailUsedSize uint64 `json:"mail189UsedSize"`
 		TotalSize    uint64 `json:"totalSize"`
 		UsedSize     uint64 `json:"usedSize"`
 	} `json:"cloudCapacityInfo"`
 	FamilyCapacityInfo struct {
-		FreeSize  int64  `json:"freeSize"`
+		FreeSize  uint64 `json:"freeSize"`
 		TotalSize uint64 `json:"totalSize"`
 		UsedSize  uint64 `json:"usedSize"`
 	} `json:"familyCapacityInfo"`

drivers/alias/driver.go

@@ -130,7 +130,7 @@ func (d *Alias) Get(ctx context.Context, path string) (model.Obj, error) {
 func (d *Alias) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([]model.Obj, error) {
 	path := dir.GetPath()
 	if utils.PathEqual(path, "/") && !d.autoFlatten {
-		return d.listRoot(ctx, args.WithStorageDetails && d.DetailsPassThrough, args.Refresh), nil
+		return d.listRoot(ctx, args.WithStorageDetails && d.DetailsPassThrough), nil
 	}
 	root, sub := d.getRootAndPath(path)
 	dsts, ok := d.pathMap[root]
@@ -211,6 +211,9 @@ func (d *Alias) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (
 		if resultLink.ContentLength == 0 {
 			resultLink.ContentLength = fi.GetSize()
 		}
+		if resultLink.MFile != nil {
+			return &resultLink, nil
+		}
 		if d.DownloadConcurrency > 0 {
 			resultLink.Concurrency = d.DownloadConcurrency
 		}
@@ -524,25 +527,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/alias/util.go

@@ -5,6 +5,7 @@ import (
 	"errors"
 	stdpath "path"
 	"strings"
+	"sync"
 	"time"
 
 	"github.com/OpenListTeam/OpenList/v4/internal/driver"
@@ -16,15 +17,9 @@ import (
 	log "github.com/sirupsen/logrus"
 )
 
-type detailWithIndex struct {
-	idx int
-	val *model.StorageDetails
-}
-
-func (d *Alias) listRoot(ctx context.Context, withDetails, refresh bool) []model.Obj {
+func (d *Alias) listRoot(ctx context.Context, withDetails bool) []model.Obj {
 	var objs []model.Obj
-	detailsChan := make(chan detailWithIndex, len(d.pathMap))
-	workerCount := 0
+	var wg sync.WaitGroup
 	for _, k := range d.rootOrder {
 		obj := model.Object{
 			Name:     k,
@@ -52,26 +47,22 @@ func (d *Alias) listRoot(ctx context.Context, withDetails, refresh bool) []model
 				DriverName:     remoteDriver.Config().Name,
 			},
 		}
-		workerCount++
-		go func(dri driver.Driver, i int) {
-			details, e := op.GetStorageDetails(ctx, dri, refresh)
+		wg.Add(1)
+		go func() {
+			defer wg.Done()
+			c, cancel := context.WithTimeout(ctx, time.Second)
+			defer cancel()
+			details, e := op.GetStorageDetails(c, remoteDriver)
 			if e != nil {
 				if !errors.Is(e, errs.NotImplement) && !errors.Is(e, errs.StorageNotInit) {
-					log.Errorf("failed get %s storage details: %+v", dri.GetStorage().MountPath, e)
+					log.Errorf("failed get %s storage details: %+v", remoteDriver.GetStorage().MountPath, e)
 				}
+				return
 			}
-			detailsChan <- detailWithIndex{idx: i, val: details}
-		}(remoteDriver, idx)
-	}
-	for workerCount > 0 {
-		select {
-		case r := <-detailsChan:
-			objs[r.idx].(*model.ObjStorageDetails).StorageDetails = r.val
-			workerCount--
-		case <-time.After(time.Second):
-			workerCount = 0
-		}
+			objs[idx].(*model.ObjStorageDetails).StorageDetails = details
+		}()
 	}
+	wg.Wait()
 	return objs
 }
 

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/all.go

@@ -36,7 +36,6 @@ import (
 	_ "github.com/OpenListTeam/OpenList/v4/drivers/google_drive"
 	_ "github.com/OpenListTeam/OpenList/v4/drivers/google_photo"
 	_ "github.com/OpenListTeam/OpenList/v4/drivers/halalcloud"
-	_ "github.com/OpenListTeam/OpenList/v4/drivers/halalcloud_open"
 	_ "github.com/OpenListTeam/OpenList/v4/drivers/ilanzou"
 	_ "github.com/OpenListTeam/OpenList/v4/drivers/ipfs_api"
 	_ "github.com/OpenListTeam/OpenList/v4/drivers/kodbox"
@@ -56,7 +55,6 @@ import (
 	_ "github.com/OpenListTeam/OpenList/v4/drivers/openlist_share"
 	_ "github.com/OpenListTeam/OpenList/v4/drivers/pikpak"
 	_ "github.com/OpenListTeam/OpenList/v4/drivers/pikpak_share"
-	_ "github.com/OpenListTeam/OpenList/v4/drivers/proton_drive"
 	_ "github.com/OpenListTeam/OpenList/v4/drivers/quark_open"
 	_ "github.com/OpenListTeam/OpenList/v4/drivers/quark_uc"
 	_ "github.com/OpenListTeam/OpenList/v4/drivers/quark_uc_tv"

drivers/baidu_netdisk/driver.go

@@ -5,15 +5,11 @@ import (
 	"crypto/md5"
 	"encoding/hex"
 	"errors"
-	"fmt"
 	"io"
-	"net/http"
 	"net/url"
 	"os"
 	stdpath "path"
 	"strconv"
-	"strings"
-	"sync"
 	"time"
 
 	"github.com/OpenListTeam/OpenList/v4/drivers/base"
@@ -22,10 +18,8 @@ import (
 	"github.com/OpenListTeam/OpenList/v4/internal/errs"
 	"github.com/OpenListTeam/OpenList/v4/internal/model"
 	"github.com/OpenListTeam/OpenList/v4/pkg/errgroup"
-	"github.com/OpenListTeam/OpenList/v4/pkg/singleflight"
 	"github.com/OpenListTeam/OpenList/v4/pkg/utils"
 	"github.com/avast/retry-go"
-	"github.com/go-resty/resty/v2"
 	log "github.com/sirupsen/logrus"
 )
 
@@ -35,20 +29,8 @@ type BaiduNetdisk struct {
 
 	uploadThread int
 	vipType      int // 会员类型，0普通用户(4G/4M)、1普通会员(10G/16M)、2超级会员(20G/32M)
-
-	upClient       *resty.Client // 上传文件使用的http客户端
-	uploadUrlG     singleflight.Group[string]
-	uploadUrlMu    sync.RWMutex
-	uploadUrlCache map[string]uploadURLCacheEntry
 }
 
-type uploadURLCacheEntry struct {
-	url        string
-	updateTime time.Time
-}
-
-var ErrUploadIDExpired = errors.New("uploadid expired")
-
 func (d *BaiduNetdisk) Config() driver.Config {
 	return config
 }
@@ -58,32 +40,19 @@ func (d *BaiduNetdisk) GetAddition() driver.Additional {
 }
 
 func (d *BaiduNetdisk) Init(ctx context.Context) error {
-	timeout := DEFAULT_UPLOAD_SLICE_TIMEOUT
-	if d.UploadSliceTimeout > 0 {
-		timeout = time.Second * time.Duration(d.UploadSliceTimeout)
-	}
-
-	d.upClient = base.NewRestyClient().
-		SetTimeout(timeout).
-		SetRetryCount(UPLOAD_RETRY_COUNT).
-		SetRetryWaitTime(UPLOAD_RETRY_WAIT_TIME).
-		SetRetryMaxWaitTime(UPLOAD_RETRY_MAX_WAIT_TIME)
-	d.uploadUrlCache = make(map[string]uploadURLCacheEntry)
 	d.uploadThread, _ = strconv.Atoi(d.UploadThread)
-	if d.uploadThread < 1 {
-		d.uploadThread, d.UploadThread = 1, "1"
-	} else if d.uploadThread > 32 {
-		d.uploadThread, d.UploadThread = 32, "32"
+	if d.uploadThread < 1 || d.uploadThread > 32 {
+		d.uploadThread, d.UploadThread = 3, "3"
 	}
 
 	if _, err := url.Parse(d.UploadAPI); d.UploadAPI == "" || err != nil {
-		d.UploadAPI = UPLOAD_FALLBACK_API
+		d.UploadAPI = "https://d.pcs.baidu.com"
 	}
 
 	res, err := d.get("/xpan/nas", map[string]string{
 		"method": "uinfo",
 	}, nil)
-	log.Debugf("[baidu_netdisk] get uinfo: %s", string(res))
+	log.Debugf("[baidu] get uinfo: %s", string(res))
 	if err != nil {
 		return err
 	}
@@ -210,11 +179,6 @@ func (d *BaiduNetdisk) PutRapid(ctx context.Context, dstDir model.Obj, stream mo
 // **注意**: 截至 2024/04/20 百度云盘 api 接口返回的时间永远是当前时间，而不是文件时间。
 // 而实际上云盘存储的时间是文件时间，所以此处需要覆盖时间，保证缓存与云盘的数据一致
 func (d *BaiduNetdisk) Put(ctx context.Context, dstDir model.Obj, stream model.FileStreamer, up driver.UpdateProgress) (model.Obj, error) {
-	// 百度网盘不允许上传空文件
-	if stream.GetSize() < 1 {
-		return nil, ErrBaiduEmptyFilesNotAllowed
-	}
-
 	// rapid upload
 	if newObj, err := d.PutRapid(ctx, dstDir, stream); err == nil {
 		return newObj, nil
@@ -250,6 +214,7 @@ func (d *BaiduNetdisk) Put(ctx context.Context, dstDir model.Obj, stream model.F
 
 	// cal md5 for first 256k data
 	const SliceSize int64 = 256 * utils.KB
+	// cal md5
 	blockList := make([]string, 0, count)
 	byteSize := sliceSize
 	fileMd5H := md5.New()
@@ -279,7 +244,7 @@ func (d *BaiduNetdisk) Put(ctx context.Context, dstDir model.Obj, stream model.F
 	}
 	if tmpF != nil {
 		if written != streamSize {
-			return nil, errs.NewErr(err, "CreateTempFile failed, size mismatch: %d != %d ", written, streamSize)
+			return nil, errs.NewErr(err, "CreateTempFile failed, incoming stream actual size= %d, expect = %d ", written, streamSize)
 		}
 		_, err = tmpF.Seek(0, io.SeekStart)
 		if err != nil {
@@ -293,14 +258,31 @@ func (d *BaiduNetdisk) Put(ctx context.Context, dstDir model.Obj, stream model.F
 	mtime := stream.ModTime().Unix()
 	ctime := stream.CreateTime().Unix()
 
-	// step.1 尝试读取已保存进度
+	// step.1 预上传
+	// 尝试获取之前的进度
 	precreateResp, ok := base.GetUploadProgress[*PrecreateResp](d, d.AccessToken, contentMd5)
 	if !ok {
-		// 没有进度，走预上传
-		precreateResp, err = d.precreate(ctx, path, streamSize, blockListStr, contentMd5, sliceMd5, ctime, mtime)
+		params := map[string]string{
+			"method": "precreate",
+		}
+		form := map[string]string{
+			"path":        path,
+			"size":        strconv.FormatInt(streamSize, 10),
+			"isdir":       "0",
+			"autoinit":    "1",
+			"rtype":       "3",
+			"block_list":  blockListStr,
+			"content-md5": contentMd5,
+			"slice-md5":   sliceMd5,
+		}
+		joinTime(form, ctime, mtime)
+
+		log.Debugf("[baidu_netdisk] precreate data: %s", form)
+		_, err = d.postForm("/xpan/file", params, form, &precreateResp)
 		if err != nil {
 			return nil, err
 		}
+		log.Debugf("%+v", precreateResp)
 		if precreateResp.ReturnType == 2 {
 			// rapid upload, since got md5 match from baidu server
 			// 修复时间，具体原因见 Put 方法注释的 **注意**
@@ -309,96 +291,45 @@ func (d *BaiduNetdisk) Put(ctx context.Context, dstDir model.Obj, stream model.F
 			return fileToObj(precreateResp.File), nil
 		}
 	}
-	ensureUploadURL := func() {
-		if precreateResp.UploadURL != "" {
-			return
-		}
-		precreateResp.UploadURL = d.getUploadUrl(path, precreateResp.Uploadid)
-	}
-	ensureUploadURL()
-
 	// step.2 上传分片
-uploadLoop:
-	for attempt := 0; attempt < 2; attempt++ {
-		// 获取上传域名
-		if precreateResp.UploadURL == "" {
-			ensureUploadURL()
-		}
-		uploadUrl := precreateResp.UploadURL
-		// 并发上传
-		threadG, upCtx := errgroup.NewGroupWithContext(ctx, d.uploadThread,
-			retry.Attempts(1),
-			retry.Delay(time.Second),
-			retry.DelayType(retry.BackOffDelay))
+	threadG, upCtx := errgroup.NewGroupWithContext(ctx, d.uploadThread,
+		retry.Attempts(1),
+		retry.Delay(time.Second),
+		retry.DelayType(retry.BackOffDelay))
 
-		cacheReaderAt, okReaderAt := cache.(io.ReaderAt)
-		if !okReaderAt {
-			return nil, fmt.Errorf("cache object must implement io.ReaderAt interface for upload operations")
+	for i, partseq := range precreateResp.BlockList {
+		if utils.IsCanceled(upCtx) {
+			break
 		}
 
-		totalParts := len(precreateResp.BlockList)
-
-		for i, partseq := range precreateResp.BlockList {
-			if utils.IsCanceled(upCtx) || partseq < 0 {
-				continue
+		i, partseq, offset, byteSize := i, partseq, int64(partseq)*sliceSize, sliceSize
+		if partseq+1 == count {
+			byteSize = lastBlockSize
+		}
+		threadG.Go(func(ctx context.Context) error {
+			params := map[string]string{
+				"method":       "upload",
+				"access_token": d.AccessToken,
+				"type":         "tmpfile",
+				"path":         path,
+				"uploadid":     precreateResp.Uploadid,
+				"partseq":      strconv.Itoa(partseq),
 			}
-			i, partseq := i, partseq
-			offset, size := int64(partseq)*sliceSize, sliceSize
-			if partseq+1 == count {
-				size = lastBlockSize
+			err := d.uploadSlice(ctx, params, stream.GetName(),
+				driver.NewLimitedUploadStream(ctx, io.NewSectionReader(cache, offset, byteSize)))
+			if err != nil {
+				return err
 			}
-			threadG.Go(func(ctx context.Context) error {
-				params := map[string]string{
-					"method":       "upload",
-					"access_token": d.AccessToken,
-					"type":         "tmpfile",
-					"path":         path,
-					"uploadid":     precreateResp.Uploadid,
-					"partseq":      strconv.Itoa(partseq),
-				}
-				section := io.NewSectionReader(cacheReaderAt, offset, size)
-				err := d.uploadSlice(ctx, uploadUrl, params, stream.GetName(), driver.NewLimitedUploadStream(ctx, section))
-				if err != nil {
-					return err
-				}
-				precreateResp.BlockList[i] = -1
-				// 当前goroutine还没退出，+1才是真正成功的数量
-				success := threadG.Success() + 1
-				progress := float64(success) * 100 / float64(totalParts)
-				up(progress)
-				return nil
-			})
-		}
-
-		err = threadG.Wait()
-		if err == nil {
-			break uploadLoop
-		}
-
-		// 保存进度（所有错误都会保存）
-		precreateResp.BlockList = utils.SliceFilter(precreateResp.BlockList, func(s int) bool { return s >= 0 })
-		base.SaveUploadProgress(d, precreateResp, d.AccessToken, contentMd5)
-
+			up(float64(threadG.Success()) * 100 / float64(len(precreateResp.BlockList)))
+			precreateResp.BlockList[i] = -1
+			return nil
+		})
+	}
+	if err = threadG.Wait(); err != nil {
+		// 如果属于用户主动取消，则保存上传进度
 		if errors.Is(err, context.Canceled) {
-			return nil, err
-		}
-		if errors.Is(err, ErrUploadIDExpired) {
-			log.Warn("[baidu_netdisk] uploadid expired, will restart from scratch")
-			d.clearUploadUrlCache(precreateResp.Uploadid)
-			// 重新 precreate（所有分片都要重传）
-			newPre, err2 := d.precreate(ctx, path, streamSize, blockListStr, "", "", ctime, mtime)
-			if err2 != nil {
-				return nil, err2
-			}
-			if newPre.ReturnType == 2 {
-				return fileToObj(newPre.File), nil
-			}
-			precreateResp = newPre
-			precreateResp.UploadURL = ""
-			ensureUploadURL()
-			// 覆盖掉旧的进度
+			precreateResp.BlockList = utils.SliceFilter(precreateResp.BlockList, func(s int) bool { return s >= 0 })
 			base.SaveUploadProgress(d, precreateResp, d.AccessToken, contentMd5)
-			continue uploadLoop
 		}
 		return nil, err
 	}
@@ -412,72 +343,23 @@ uploadLoop:
 	// 修复时间，具体原因见 Put 方法注释的 **注意**
 	newFile.Ctime = ctime
 	newFile.Mtime = mtime
-	// 上传成功清理进度
-	base.SaveUploadProgress(d, nil, d.AccessToken, contentMd5)
-	d.clearUploadUrlCache(precreateResp.Uploadid)
 	return fileToObj(newFile), nil
 }
 
-// precreate 执行预上传操作，支持首次上传和 uploadid 过期重试
-func (d *BaiduNetdisk) precreate(ctx context.Context, path string, streamSize int64, blockListStr, contentMd5, sliceMd5 string, ctime, mtime int64) (*PrecreateResp, error) {
-	params := map[string]string{"method": "precreate"}
-	form := map[string]string{
-		"path":       path,
-		"size":       strconv.FormatInt(streamSize, 10),
-		"isdir":      "0",
-		"autoinit":   "1",
-		"rtype":      "3",
-		"block_list": blockListStr,
-	}
-
-	// 只有在首次上传时才包含 content-md5 和 slice-md5
-	if contentMd5 != "" && sliceMd5 != "" {
-		form["content-md5"] = contentMd5
-		form["slice-md5"] = sliceMd5
-	}
-
-	joinTime(form, ctime, mtime)
-
-	var precreateResp PrecreateResp
-	_, err := d.postForm("/xpan/file", params, form, &precreateResp)
-	if err != nil {
-		return nil, err
-	}
-
-	// 修复时间，具体原因见 Put 方法注释的 **注意**
-	if precreateResp.ReturnType == 2 {
-		precreateResp.File.Ctime = ctime
-		precreateResp.File.Mtime = mtime
-	}
-
-	return &precreateResp, nil
-}
-
-func (d *BaiduNetdisk) uploadSlice(ctx context.Context, uploadUrl string, params map[string]string, fileName string, file io.Reader) error {
-	res, err := d.upClient.R().
+func (d *BaiduNetdisk) uploadSlice(ctx context.Context, params map[string]string, fileName string, file io.Reader) error {
+	res, err := base.RestyClient.R().
 		SetContext(ctx).
 		SetQueryParams(params).
 		SetFileReader("file", fileName, file).
-		Post(uploadUrl + "/rest/2.0/pcs/superfile2")
+		Post(d.UploadAPI + "/rest/2.0/pcs/superfile2")
 	if err != nil {
 		return err
 	}
 	log.Debugln(res.RawResponse.Status + res.String())
-	if res.StatusCode() != http.StatusOK {
-		return errs.NewErr(errs.StreamIncomplete, "baidu upload failed, status=%d, body=%s", res.StatusCode(), res.String())
-	}
 	errCode := utils.Json.Get(res.Body(), "error_code").ToInt()
 	errNo := utils.Json.Get(res.Body(), "errno").ToInt()
-	respStr := res.String()
-	lower := strings.ToLower(respStr)
-	// 合并 uploadid 过期检测逻辑
-	if strings.Contains(lower, "uploadid") &&
-		(strings.Contains(lower, "invalid") || strings.Contains(lower, "expired") || strings.Contains(lower, "not found")) {
-		return ErrUploadIDExpired
-	}
-
 	if errCode != 0 || errNo != 0 {
-		return errs.NewErr(errs.StreamIncomplete, "error uploading to baidu, response=%s", res.String())
+		return errs.NewErr(errs.StreamIncomplete, "error in uploading to baidu, will retry. response=%s", res.String())
 	}
 	return nil
 }

drivers/baidu_netdisk/meta.go

@@ -3,7 +3,6 @@ package baidu_netdisk
 import (
 	"github.com/OpenListTeam/OpenList/v4/internal/driver"
 	"github.com/OpenListTeam/OpenList/v4/internal/op"
-	"time"
 )
 
 type Addition struct {
@@ -19,23 +18,12 @@ type Addition struct {
 	AccessToken           string
 	RefreshToken          string `json:"refresh_token" required:"true"`
 	UploadThread          string `json:"upload_thread" default:"3" help:"1<=thread<=32"`
-	UploadSliceTimeout    int    `json:"upload_timeout" type:"number" default:"60" help:"per-slice upload timeout in seconds"`
 	UploadAPI             string `json:"upload_api" default:"https://d.pcs.baidu.com"`
-	UseDynamicUploadAPI   bool   `json:"use_dynamic_upload_api" default:"true" help:"dynamically get upload api domain, when enabled, the 'Upload API' setting will be used as a fallback if failed to get"`
 	CustomUploadPartSize  int64  `json:"custom_upload_part_size" type:"number" default:"0" help:"0 for auto"`
 	LowBandwithUploadMode bool   `json:"low_bandwith_upload_mode" default:"false"`
 	OnlyListVideoFile     bool   `json:"only_list_video_file" default:"false"`
 }
 
-const (
-	UPLOAD_FALLBACK_API          = "https://d.pcs.baidu.com" // 备用上传地址
-	UPLOAD_URL_EXPIRE_TIME       = time.Minute * 60          // 上传地址有效期(分钟)
-	DEFAULT_UPLOAD_SLICE_TIMEOUT = time.Second * 60          // 上传分片请求默认超时时间
-	UPLOAD_RETRY_COUNT           = 3
-	UPLOAD_RETRY_WAIT_TIME       = time.Second * 1
-	UPLOAD_RETRY_MAX_WAIT_TIME   = time.Second * 5
-)
-
 var config = driver.Config{
 	Name:        "BaiduNetdisk",
 	DefaultRoot: "/",

drivers/baidu_netdisk/types.go

@@ -1,7 +1,6 @@
 package baidu_netdisk
 
 import (
-	"errors"
 	"path"
 	"strconv"
 	"time"
@@ -10,10 +9,6 @@ import (
 	"github.com/OpenListTeam/OpenList/v4/pkg/utils"
 )
 
-var (
-	ErrBaiduEmptyFilesNotAllowed = errors.New("empty files are not allowed by baidu netdisk")
-)
-
 type TokenErrResp struct {
 	ErrorDescription string `json:"error_description"`
 	Error            string `json:"error"`
@@ -193,32 +188,6 @@ type PrecreateResp struct {
 
 	// return_type=2
 	File File `json:"info"`
-
-	UploadURL string `json:"-"` // 保存断点续传对应的上传域名
-}
-
-type UploadServerResp struct {
-	BakServer  []any `json:"bak_server"`
-	BakServers []struct {
-		Server string `json:"server"`
-	} `json:"bak_servers"`
-	ClientIP    string `json:"client_ip"`
-	ErrorCode   int    `json:"error_code"`
-	ErrorMsg    string `json:"error_msg"`
-	Expire      int    `json:"expire"`
-	Host        string `json:"host"`
-	Newno       string `json:"newno"`
-	QuicServer  []any  `json:"quic_server"`
-	QuicServers []struct {
-		Server string `json:"server"`
-	} `json:"quic_servers"`
-	RequestID  int64 `json:"request_id"`
-	Server     []any `json:"server"`
-	ServerTime int   `json:"server_time"`
-	Servers    []struct {
-		Server string `json:"server"`
-	} `json:"servers"`
-	Sl int `json:"sl"`
 }
 
 type QuotaResp struct {

drivers/baidu_netdisk/util.go

@@ -115,7 +115,7 @@ func (d *BaiduNetdisk) request(furl string, method string, callback base.ReqCall
 		errno := utils.Json.Get(res.Body(), "errno").ToInt()
 		if errno != 0 {
 			if utils.SliceContains([]int{111, -6}, errno) {
-				log.Info("[baidu_netdisk] refreshing baidu_netdisk token.")
+				log.Info("refreshing baidu_netdisk token.")
 				err2 := d.refreshToken()
 				if err2 != nil {
 					return retry.Unrecoverable(err2)
@@ -326,10 +326,10 @@ func (d *BaiduNetdisk) getSliceSize(filesize int64) int64 {
 	// 非会员固定为 4MB
 	if d.vipType == 0 {
 		if d.CustomUploadPartSize != 0 {
-			log.Warnf("[baidu_netdisk] CustomUploadPartSize is not supported for non-vip user, use DefaultSliceSize")
+			log.Warnf("CustomUploadPartSize is not supported for non-vip user, use DefaultSliceSize")
 		}
 		if filesize > MaxSliceNum*DefaultSliceSize {
-			log.Warnf("[baidu_netdisk] File size(%d) is too large, may cause upload failure", filesize)
+			log.Warnf("File size(%d) is too large, may cause upload failure", filesize)
 		}
 
 		return DefaultSliceSize
@@ -337,17 +337,17 @@ func (d *BaiduNetdisk) getSliceSize(filesize int64) int64 {
 
 	if d.CustomUploadPartSize != 0 {
 		if d.CustomUploadPartSize < DefaultSliceSize {
-			log.Warnf("[baidu_netdisk] CustomUploadPartSize(%d) is less than DefaultSliceSize(%d), use DefaultSliceSize", d.CustomUploadPartSize, DefaultSliceSize)
+			log.Warnf("CustomUploadPartSize(%d) is less than DefaultSliceSize(%d), use DefaultSliceSize", d.CustomUploadPartSize, DefaultSliceSize)
 			return DefaultSliceSize
 		}
 
 		if d.vipType == 1 && d.CustomUploadPartSize > VipSliceSize {
-			log.Warnf("[baidu_netdisk] CustomUploadPartSize(%d) is greater than VipSliceSize(%d), use VipSliceSize", d.CustomUploadPartSize, VipSliceSize)
+			log.Warnf("CustomUploadPartSize(%d) is greater than VipSliceSize(%d), use VipSliceSize", d.CustomUploadPartSize, VipSliceSize)
 			return VipSliceSize
 		}
 
 		if d.vipType == 2 && d.CustomUploadPartSize > SVipSliceSize {
-			log.Warnf("[baidu_netdisk] CustomUploadPartSize(%d) is greater than SVipSliceSize(%d), use SVipSliceSize", d.CustomUploadPartSize, SVipSliceSize)
+			log.Warnf("CustomUploadPartSize(%d) is greater than SVipSliceSize(%d), use SVipSliceSize", d.CustomUploadPartSize, SVipSliceSize)
 			return SVipSliceSize
 		}
 
@@ -377,7 +377,7 @@ func (d *BaiduNetdisk) getSliceSize(filesize int64) int64 {
 	}
 
 	if filesize > MaxSliceNum*maxSliceSize {
-		log.Warnf("[baidu_netdisk] File size(%d) is too large, may cause upload failure", filesize)
+		log.Warnf("File size(%d) is too large, may cause upload failure", filesize)
 	}
 
 	return maxSliceSize
@@ -394,97 +394,6 @@ func (d *BaiduNetdisk) quota(ctx context.Context) (model.DiskUsage, error) {
 	return driver.DiskUsageFromUsedAndTotal(resp.Used, resp.Total), nil
 }
 
-// getUploadUrl 从开放平台获取上传域名/地址，并发请求会被合并，结果会在 uploadid 生命周期内复用。
-// 如果获取失败，则返回 Upload API设置项。
-func (d *BaiduNetdisk) getUploadUrl(path, uploadId string) string {
-	if !d.UseDynamicUploadAPI || uploadId == "" {
-		return d.UploadAPI
-	}
-	getCachedUrlFunc := func() (string, bool) {
-		d.uploadUrlMu.RLock()
-		defer d.uploadUrlMu.RUnlock()
-		if entry, ok := d.uploadUrlCache[uploadId]; ok {
-			return entry.url, true
-		}
-		return "", false
-	}
-	// 检查地址缓存
-	if uploadUrl, ok := getCachedUrlFunc(); ok {
-		return uploadUrl
-	}
-
-	uploadUrlGetFunc := func() (string, error) {
-		// 双重检查缓存
-		if uploadUrl, ok := getCachedUrlFunc(); ok {
-			return uploadUrl, nil
-		}
-
-		uploadUrl, err := d.requestForUploadUrl(path, uploadId)
-		if err != nil {
-			return "", err
-		}
-
-		d.uploadUrlMu.Lock()
-		d.uploadUrlCache[uploadId] = uploadURLCacheEntry{
-			url:        uploadUrl,
-			updateTime: time.Now(),
-		}
-		d.uploadUrlMu.Unlock()
-		return uploadUrl, nil
-	}
-
-	uploadUrl, err, _ := d.uploadUrlG.Do(uploadId, uploadUrlGetFunc)
-	if err != nil {
-		fallback := d.UploadAPI
-		log.Warnf("[baidu_netdisk] get upload URL failed (%v), will use fallback URL: %s", err, fallback)
-		return fallback
-	}
-	return uploadUrl
-}
-
-func (d *BaiduNetdisk) clearUploadUrlCache(uploadId string) {
-	if uploadId == "" {
-		return
-	}
-	d.uploadUrlMu.Lock()
-	if _, ok := d.uploadUrlCache[uploadId]; ok {
-		delete(d.uploadUrlCache, uploadId)
-	}
-	d.uploadUrlMu.Unlock()
-}
-
-// requestForUploadUrl 请求获取上传地址。
-// 实测此接口不需要认证，传method和upload_version就行，不过还是按文档规范调用。
-// https://pan.baidu.com/union/doc/Mlvw5hfnr
-func (d *BaiduNetdisk) requestForUploadUrl(path, uploadId string) (string, error) {
-	params := map[string]string{
-		"method":         "locateupload",
-		"appid":          "250528",
-		"path":           path,
-		"uploadid":       uploadId,
-		"upload_version": "2.0",
-	}
-	apiUrl := "https://d.pcs.baidu.com/rest/2.0/pcs/file"
-	var resp UploadServerResp
-	_, err := d.request(apiUrl, http.MethodGet, func(req *resty.Request) {
-		req.SetQueryParams(params)
-	}, &resp)
-	if err != nil {
-		return "", err
-	}
-	// 应该是https开头的一个地址
-	var uploadUrl string
-	if len(resp.Servers) > 0 {
-		uploadUrl = resp.Servers[0].Server
-	} else if len(resp.BakServers) > 0 {
-		uploadUrl = resp.BakServers[0].Server
-	}
-	if uploadUrl == "" {
-		return "", errors.New("upload URL is empty")
-	}
-	return uploadUrl, nil
-}
-
 // func encodeURIComponent(str string) string {
 // 	r := url.QueryEscape(str)
 // 	r = strings.ReplaceAll(r, "+", "%20")

drivers/baidu_photo/meta.go

@@ -18,9 +18,8 @@ type Addition struct {
 }
 
 var config = driver.Config{
-	Name:          "BaiduPhoto",
-	LocalSort:     true,
-	LinkCacheMode: driver.LinkCacheUA,
+	Name:      "BaiduPhoto",
+	LocalSort: true,
 }
 
 func init() {

drivers/base/client.go

@@ -25,7 +25,6 @@ func InitClient() {
 		}),
 	).SetTLSClientConfig(&tls.Config{InsecureSkipVerify: conf.Conf.TlsInsecureSkipVerify})
 	NoRedirectClient.SetHeader("user-agent", UserAgent)
-	net.SetRestyProxyIfConfigured(NoRedirectClient)
 
 	RestyClient = NewRestyClient()
 	HttpClient = net.NewHttpClient()
@@ -38,7 +37,5 @@ func NewRestyClient() *resty.Client {
 		SetRetryResetReaders(true).
 		SetTimeout(DefaultTimeout).
 		SetTLSClientConfig(&tls.Config{InsecureSkipVerify: conf.Conf.TlsInsecureSkipVerify})
-
-	net.SetRestyProxyIfConfigured(client)
 	return client
 }

drivers/chaoxing/driver.go

@@ -10,7 +10,6 @@ import (
 	"mime/multipart"
 	"net/http"
 	"net/url"
-	"strconv"
 	"strings"
 	"time"
 
@@ -240,7 +239,7 @@ func (d *ChaoXing) Put(ctx context.Context, dstDir model.Obj, file model.FileStr
 	if err != nil {
 		return err
 	}
-	err = writer.WriteField("puid", strconv.Itoa(resp.Msg.Puid))
+	err = writer.WriteField("puid", fmt.Sprintf("%d", resp.Msg.Puid))
 	if err != nil {
 		fmt.Println("Error writing param2 to request body:", err)
 		return err
@@ -261,7 +260,7 @@ func (d *ChaoXing) Put(ctx context.Context, dstDir model.Obj, file model.FileStr
 		return err
 	}
 	req.Header.Set("Content-Type", writer.FormDataContentType())
-	req.Header.Set("Content-Length", strconv.Itoa(body.Len()))
+	req.Header.Set("Content-Length", fmt.Sprintf("%d", body.Len()))
 	resps, err := http.DefaultClient.Do(req)
 	if err != nil {
 		return err

drivers/chaoxing/types.go

@@ -258,7 +258,7 @@ type UploadDoneParam struct {
 func fileToObj(f File) *model.Object {
 	if len(f.Content.FolderName) > 0 {
 		return &model.Object{
-			ID:       strconv.Itoa(f.ID),
+			ID:       fmt.Sprintf("%d", f.ID),
 			Name:     f.Content.FolderName,
 			Size:     0,
 			Modified: time.UnixMilli(f.Inserttime),

drivers/chaoxing/util.go

@@ -9,7 +9,6 @@ import (
 	"fmt"
 	"mime/multipart"
 	"net/http"
-	"strconv"
 	"strings"
 
 	"github.com/OpenListTeam/OpenList/v4/drivers/base"
@@ -173,7 +172,7 @@ func (d *ChaoXing) Login() (string, error) {
 		return "", err
 	}
 	req.Header.Set("Content-Type", writer.FormDataContentType())
-	req.Header.Set("Content-Length", strconv.Itoa(body.Len()))
+	req.Header.Set("Content-Length", fmt.Sprintf("%d", body.Len()))
 	resp, err := http.DefaultClient.Do(req)
 	if err != nil {
 		return "", err

drivers/crypt/driver.go

@@ -317,8 +317,7 @@ func (d *Crypt) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (
 			}
 			return readSeeker, nil
 		}),
-		SyncClosers:      utils.NewSyncClosers(remoteLink),
-		RequireReference: remoteLink.RequireReference,
+		SyncClosers: utils.NewSyncClosers(remoteLink),
 	}, nil
 }
 

drivers/doubao/driver.go

@@ -15,7 +15,6 @@ import (
 	"github.com/OpenListTeam/OpenList/v4/pkg/utils"
 	"github.com/go-resty/resty/v2"
 	"github.com/google/uuid"
-	"golang.org/x/time/rate"
 )
 
 type Doubao struct {
@@ -24,7 +23,6 @@ type Doubao struct {
 	*UploadToken
 	UserId       string
 	uploadThread int
-	limiter      *rate.Limiter
 }
 
 func (d *Doubao) Config() driver.Config {
@@ -63,17 +61,6 @@ func (d *Doubao) Init(ctx context.Context) error {
 		d.UploadToken = uploadToken
 	}
 
-	if d.LimitRate > 0 {
-		d.limiter = rate.NewLimiter(rate.Limit(d.LimitRate), 1)
-	}
-
-	return nil
-}
-
-func (d *Doubao) WaitLimit(ctx context.Context) error {
-	if d.limiter != nil {
-		return d.limiter.Wait(ctx)
-	}
 	return nil
 }
 
@@ -82,10 +69,6 @@ func (d *Doubao) Drop(ctx context.Context) error {
 }
 
 func (d *Doubao) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([]model.Obj, error) {
-	if err := d.WaitLimit(ctx); err != nil {
-		return nil, err
-	}
-
 	var files []model.Obj
 	fileList, err := d.getFiles(dir.GetID(), "")
 	if err != nil {
@@ -112,10 +95,6 @@ func (d *Doubao) List(ctx context.Context, dir model.Obj, args model.ListArgs) (
 }
 
 func (d *Doubao) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
-	if err := d.WaitLimit(ctx); err != nil {
-		return nil, err
-	}
-
 	var downloadUrl string
 
 	if u, ok := file.(*Object); ok {
@@ -181,10 +160,6 @@ func (d *Doubao) Link(ctx context.Context, file model.Obj, args model.LinkArgs)
 }
 
 func (d *Doubao) MakeDir(ctx context.Context, parentDir model.Obj, dirName string) error {
-	if err := d.WaitLimit(ctx); err != nil {
-		return err
-	}
-
 	var r UploadNodeResp
 	_, err := d.request("/samantha/aispace/upload_node", http.MethodPost, func(req *resty.Request) {
 		req.SetBody(base.Json{
@@ -202,10 +177,6 @@ func (d *Doubao) MakeDir(ctx context.Context, parentDir model.Obj, dirName strin
 }
 
 func (d *Doubao) Move(ctx context.Context, srcObj, dstDir model.Obj) error {
-	if err := d.WaitLimit(ctx); err != nil {
-		return err
-	}
-
 	var r UploadNodeResp
 	_, err := d.request("/samantha/aispace/move_node", http.MethodPost, func(req *resty.Request) {
 		req.SetBody(base.Json{
@@ -220,10 +191,6 @@ func (d *Doubao) Move(ctx context.Context, srcObj, dstDir model.Obj) error {
 }
 
 func (d *Doubao) Rename(ctx context.Context, srcObj model.Obj, newName string) error {
-	if err := d.WaitLimit(ctx); err != nil {
-		return err
-	}
-
 	var r BaseResp
 	_, err := d.request("/samantha/aispace/rename_node", http.MethodPost, func(req *resty.Request) {
 		req.SetBody(base.Json{
@@ -240,10 +207,6 @@ func (d *Doubao) Copy(ctx context.Context, srcObj, dstDir model.Obj) (model.Obj,
 }
 
 func (d *Doubao) Remove(ctx context.Context, obj model.Obj) error {
-	if err := d.WaitLimit(ctx); err != nil {
-		return err
-	}
-
 	var r BaseResp
 	_, err := d.request("/samantha/aispace/delete_node", http.MethodPost, func(req *resty.Request) {
 		req.SetBody(base.Json{"node_list": []base.Json{{"id": obj.GetID()}}})
@@ -252,10 +215,6 @@ func (d *Doubao) Remove(ctx context.Context, obj model.Obj) error {
 }
 
 func (d *Doubao) Put(ctx context.Context, dstDir model.Obj, file model.FileStreamer, up driver.UpdateProgress) (model.Obj, error) {
-	if err := d.WaitLimit(ctx); err != nil {
-		return nil, err
-	}
-
 	// 根据MIME类型确定数据类型
 	mimetype := file.GetMimetype()
 	dataType := FileDataType

drivers/doubao/meta.go

@@ -10,10 +10,9 @@ type Addition struct {
 	// driver.RootPath
 	driver.RootID
 	// define other
-	Cookie       string  `json:"cookie" type:"text"`
-	UploadThread string  `json:"upload_thread" default:"3"`
-	DownloadApi  string  `json:"download_api" type:"select" options:"get_file_url,get_download_info" default:"get_file_url"`
-	LimitRate    float64 `json:"limit_rate" type:"float" default:"2" help:"limit all api request rate ([limit]r/1s)"`
+	Cookie       string `json:"cookie" type:"text"`
+	UploadThread string `json:"upload_thread" default:"3"`
+	DownloadApi  string `json:"download_api" type:"select" options:"get_file_url,get_download_info" default:"get_file_url"`
 }
 
 var config = driver.Config{
@@ -24,10 +23,6 @@ var config = driver.Config{
 
 func init() {
 	op.RegisterDriver(func() driver.Driver {
-		return &Doubao{
-			Addition: Addition{
-				LimitRate: 2,
-			},
-		}
+		return &Doubao{}
 	})
 }

drivers/doubao/util.go

@@ -486,7 +486,7 @@ func (d *Doubao) Upload(ctx context.Context, config *UploadConfig, dstDir model.
 			"Authorization":       {storeInfo.Auth},
 			"Content-Type":        {"application/octet-stream"},
 			"Content-Crc32":       {crc32Value},
-			"Content-Length":      {strconv.FormatInt(file.GetSize(), 10)},
+			"Content-Length":      {fmt.Sprintf("%d", file.GetSize())},
 			"Content-Disposition": {fmt.Sprintf("attachment; filename=%s", url.QueryEscape(storeInfo.StoreURI))},
 		}
 		res, err := base.HttpClient.Do(req)
@@ -612,7 +612,7 @@ func (d *Doubao) UploadByMultipart(ctx context.Context, config *UploadConfig, fi
 					"Authorization":       {storeInfo.Auth},
 					"Content-Type":        {"application/octet-stream"},
 					"Content-Crc32":       {crc32Value},
-					"Content-Length":      {strconv.FormatInt(size, 10)},
+					"Content-Length":      {fmt.Sprintf("%d", size)},
 					"Content-Disposition": {fmt.Sprintf("attachment; filename=%s", url.QueryEscape(storeInfo.StoreURI))},
 				}
 				res, err := base.HttpClient.Do(req)

drivers/febbox/meta.go

@@ -16,10 +16,9 @@ type Addition struct {
 }
 
 var config = driver.Config{
-	Name:          "FebBox",
-	NoUpload:      true,
-	DefaultRoot:   "0",
-	LinkCacheMode: driver.LinkCacheIP,
+	Name:        "FebBox",
+	NoUpload:    true,
+	DefaultRoot: "0",
 }
 
 func init() {

drivers/ftp/driver.go

@@ -113,7 +113,9 @@ func (d *FTP) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*m
 	}
 
 	return &model.Link{
-		RangeReader: stream.RateLimitRangeReaderFunc(resultRangeReader),
+		RangeReader: &model.FileRangeReader{
+			RangeReaderIF: stream.RateLimitRangeReaderFunc(resultRangeReader),
+		},
 		SyncClosers: utils.NewSyncClosers(utils.CloseFunc(conn.Quit)),
 	}, nil
 }

drivers/ftp/meta.go

@@ -31,11 +31,11 @@ type Addition struct {
 }
 
 var config = driver.Config{
-	Name:        "FTP",
-	LocalSort:   true,
-	OnlyProxy:   true,
-	DefaultRoot: "/",
-	NoLinkURL:   true,
+	Name:          "FTP",
+	LocalSort:     true,
+	OnlyLinkMFile: false,
+	DefaultRoot:   "/",
+	NoLinkURL:     true,
 }
 
 func init() {

drivers/github_releases/driver.go

@@ -51,9 +51,6 @@ func (d *GithubReleases) List(ctx context.Context, dir model.Obj, args model.Lis
 				if d.Addition.ShowReadme {
 					files = append(files, point.GetOtherFile(d.GetRequest, args.Refresh)...)
 				}
-				if d.Addition.ShowSourceCode{
-					files = append(files, point.GetSourceCode()...)
-				}
 			} else if strings.HasPrefix(point.Point, path) { // 仓库目录的父目录
 				nextDir := GetNextDir(point.Point, path)
 				if nextDir == "" {
@@ -120,10 +117,6 @@ func (d *GithubReleases) List(ctx context.Context, dir model.Obj, args model.Lis
 				}
 
 				files = append(files, point.GetReleaseByTagName(tagName)...)
-
-				if d.Addition.ShowSourceCode{
-					files = append(files, point.GetSourceCodeByTagName(tagName)...)
-				}
 			}
 		}
 	}

drivers/github_releases/meta.go

@@ -10,7 +10,6 @@ type Addition struct {
 	RepoStructure  string `json:"repo_structure" type:"text" required:"true" default:"OpenListTeam/OpenList" help:"structure:[path:]org/repo"`
 	ShowReadme     bool   `json:"show_readme" type:"bool" default:"true" help:"show README、LICENSE file"`
 	Token          string `json:"token" type:"string" required:"false" help:"GitHub token, if you want to access private repositories or increase the rate limit"`
-	ShowSourceCode bool   `json:"show_source_code" type:"bool" default:"false" help:"show Source code (zip/tar.gz)"`
 	ShowAllVersion bool   `json:"show_all_version" type:"bool" default:"false" help:"show all versions"`
 	GitHubProxy    string `json:"gh_proxy" type:"string" default:"" help:"GitHub proxy, e.g. https://ghproxy.net/github.com or https://gh-proxy.com/github.com "`
 }

drivers/github_releases/types.go

@@ -143,60 +143,6 @@ func (m *MountPoint) GetAllVersionSize() int64 {
 	return size
 }
 
-func (m *MountPoint) GetSourceCode() []File {
-	files := make([]File, 0)
-
-	// 无法获取文件大小，此处设为 1
-	files = append(files, File{
-		Path:     m.Point + "/" + "Source code (zip)",
-		FileName: "Source code (zip)",
-		Size:     1,
-		Type:     "file",
-		UpdateAt: m.Release.CreatedAt,
-		CreateAt: m.Release.CreatedAt,
-		Url:      m.Release.ZipballUrl,
-	})
-	files = append(files, File{
-		Path:     m.Point + "/" + "Source code (tar.gz)",
-		FileName: "Source code (tar.gz)",
-		Size:     1,
-		Type:     "file",
-		UpdateAt: m.Release.CreatedAt,
-		CreateAt: m.Release.CreatedAt,
-		Url:      m.Release.TarballUrl,
-	})
-
-	return files
-}
-
-func (m *MountPoint) GetSourceCodeByTagName(tagName string) []File {
-	for _, item := range *m.Releases {
-		if item.TagName == tagName {
-			files := make([]File, 0)
-			files = append(files, File{
-				Path:     m.Point + "/" + "Source code (zip)",
-				FileName: "Source code (zip)",
-				Size:     1,
-				Type:     "file",
-				UpdateAt: item.CreatedAt,
-				CreateAt: item.CreatedAt,
-				Url:      item.ZipballUrl,
-			})
-			files = append(files, File{
-				Path:     m.Point + "/" + "Source code (tar.gz)",
-				FileName: "Source code (tar.gz)",
-				Size:     1,
-				Type:     "file",
-				UpdateAt: item.CreatedAt,
-				CreateAt: item.CreatedAt,
-				Url:      item.TarballUrl,
-			})
-			return files
-		}
-	}
-	return nil
-}
-
 func (m *MountPoint) GetOtherFile(get func(url string) (*resty.Response, error), refresh bool) []File {
 	if m.OtherFile == nil || refresh {
 		resp, _ := get("https://api.github.com/repos/" + m.Repo + "/contents")

drivers/google_drive/util.go

@@ -27,14 +27,6 @@ import (
 
 // do others that not defined in Driver interface
 
-// Google Drive API field constants
-const (
-	// File list query fields
-	FilesListFields = "files(id,name,mimeType,size,modifiedTime,createdTime,thumbnailLink,shortcutDetails,md5Checksum,sha1Checksum,sha256Checksum),nextPageToken"
-	// Single file query fields
-	FileInfoFields = "id,name,mimeType,size,md5Checksum,sha1Checksum,sha256Checksum"
-)
-
 type googleDriveServiceAccount struct {
 	// Type                    string `json:"type"`
 	// ProjectID               string `json:"project_id"`
@@ -243,7 +235,7 @@ func (d *GoogleDrive) getFiles(id string) ([]File, error) {
 		}
 		query := map[string]string{
 			"orderBy":  orderBy,
-			"fields":   FilesListFields,
+			"fields":   "files(id,name,mimeType,size,modifiedTime,createdTime,thumbnailLink,shortcutDetails,md5Checksum,sha1Checksum,sha256Checksum),nextPageToken",
 			"pageSize": "1000",
 			"q":        fmt.Sprintf("'%s' in parents and trashed = false", id),
 			//"includeItemsFromAllDrives": "true",
@@ -257,82 +249,11 @@ func (d *GoogleDrive) getFiles(id string) ([]File, error) {
 			return nil, err
 		}
 		pageToken = resp.NextPageToken
-
-		// Batch process shortcuts, API calls only for file shortcuts
-		shortcutTargetIds := make([]string, 0)
-		shortcutIndices := make([]int, 0)
-
-		// Collect target IDs of all file shortcuts (skip folder shortcuts)
-		for i := range resp.Files {
-			if resp.Files[i].MimeType == "application/vnd.google-apps.shortcut" &&
-				resp.Files[i].ShortcutDetails.TargetId != "" &&
-				resp.Files[i].ShortcutDetails.TargetMimeType != "application/vnd.google-apps.folder" {
-				shortcutTargetIds = append(shortcutTargetIds, resp.Files[i].ShortcutDetails.TargetId)
-				shortcutIndices = append(shortcutIndices, i)
-			}
-		}
-
-		// Batch get target file info (only for file shortcuts)
-		if len(shortcutTargetIds) > 0 {
-			targetFiles := d.batchGetTargetFilesInfo(shortcutTargetIds)
-			// Update shortcut file info
-			for j, targetId := range shortcutTargetIds {
-				if targetFile, exists := targetFiles[targetId]; exists {
-					fileIndex := shortcutIndices[j]
-					if targetFile.Size != "" {
-						resp.Files[fileIndex].Size = targetFile.Size
-					}
-					if targetFile.MD5Checksum != "" {
-						resp.Files[fileIndex].MD5Checksum = targetFile.MD5Checksum
-					}
-					if targetFile.SHA1Checksum != "" {
-						resp.Files[fileIndex].SHA1Checksum = targetFile.SHA1Checksum
-					}
-					if targetFile.SHA256Checksum != "" {
-						resp.Files[fileIndex].SHA256Checksum = targetFile.SHA256Checksum
-					}
-				}
-			}
-		}
-
 		res = append(res, resp.Files...)
 	}
 	return res, nil
 }
 
-// getTargetFileInfo gets target file details for shortcuts
-func (d *GoogleDrive) getTargetFileInfo(targetId string) (File, error) {
-	var targetFile File
-	url := fmt.Sprintf("https://www.googleapis.com/drive/v3/files/%s", targetId)
-	query := map[string]string{
-		"fields": FileInfoFields,
-	}
-	_, err := d.request(url, http.MethodGet, func(req *resty.Request) {
-		req.SetQueryParams(query)
-	}, &targetFile)
-	if err != nil {
-		return File{}, err
-	}
-	return targetFile, nil
-}
-
-// batchGetTargetFilesInfo batch gets target file info, sequential processing to avoid concurrency complexity
-func (d *GoogleDrive) batchGetTargetFilesInfo(targetIds []string) map[string]File {
-	if len(targetIds) == 0 {
-		return make(map[string]File)
-	}
-
-	result := make(map[string]File)
-	// Sequential processing to avoid concurrency complexity
-	for _, targetId := range targetIds {
-		file, err := d.getTargetFileInfo(targetId)
-		if err == nil {
-			result[targetId] = file
-		}
-	}
-	return result
-}
-
 func (d *GoogleDrive) chunkUpload(ctx context.Context, file model.FileStreamer, url string, up driver.UpdateProgress) error {
 	defaultChunkSize := d.ChunkSize * 1024 * 1024
 	ss, err := stream.NewStreamSectionReader(file, int(defaultChunkSize), &up)

drivers/halalcloud_open/common.go

@@ -1,111 +0,0 @@
-package halalcloudopen
-
-import (
-	"sync"
-	"time"
-
-	sdkUser "github.com/halalcloud/golang-sdk-lite/halalcloud/services/user"
-)
-
-var (
-	slicePostErrorRetryInterval = time.Second * 120
-	retryTimes                  = 5
-)
-
-type halalCommon struct {
-	// *AuthService     // 登录信息
-	UserInfo         *sdkUser.User // 用户信息
-	refreshTokenFunc func(token string) error
-	// serv             *AuthService
-	configs sync.Map
-}
-
-func (m *halalCommon) GetAccessToken() (string, error) {
-	value, exists := m.configs.Load("access_token")
-	if !exists {
-		return "", nil // 如果不存在，返回空字符串
-	}
-	return value.(string), nil // 返回配置项的值
-}
-
-// GetRefreshToken implements ConfigStore.
-func (m *halalCommon) GetRefreshToken() (string, error) {
-	value, exists := m.configs.Load("refresh_token")
-	if !exists {
-		return "", nil // 如果不存在，返回空字符串
-	}
-	return value.(string), nil // 返回配置项的值
-}
-
-// SetAccessToken implements ConfigStore.
-func (m *halalCommon) SetAccessToken(token string) error {
-	m.configs.Store("access_token", token)
-	return nil
-}
-
-// SetRefreshToken implements ConfigStore.
-func (m *halalCommon) SetRefreshToken(token string) error {
-	m.configs.Store("refresh_token", token)
-	if m.refreshTokenFunc != nil {
-		return m.refreshTokenFunc(token)
-	}
-	return nil
-}
-
-// SetToken implements ConfigStore.
-func (m *halalCommon) SetToken(accessToken string, refreshToken string, expiresIn int64) error {
-	m.configs.Store("access_token", accessToken)
-	m.configs.Store("refresh_token", refreshToken)
-	m.configs.Store("expires_in", expiresIn)
-	if m.refreshTokenFunc != nil {
-		return m.refreshTokenFunc(refreshToken)
-	}
-	return nil
-}
-
-// ClearConfigs implements ConfigStore.
-func (m *halalCommon) ClearConfigs() error {
-	m.configs = sync.Map{} // 清空map
-	return nil
-}
-
-// DeleteConfig implements ConfigStore.
-func (m *halalCommon) DeleteConfig(key string) error {
-	_, exists := m.configs.Load(key)
-	if !exists {
-		return nil // 如果不存在，直接返回
-	}
-	m.configs.Delete(key) // 删除指定的配置项
-	return nil
-}
-
-// GetConfig implements ConfigStore.
-func (m *halalCommon) GetConfig(key string) (string, error) {
-	value, exists := m.configs.Load(key)
-	if !exists {
-		return "", nil // 如果不存在，返回空字符串
-	}
-	return value.(string), nil // 返回配置项的值
-}
-
-// ListConfigs implements ConfigStore.
-func (m *halalCommon) ListConfigs() (map[string]string, error) {
-	configs := make(map[string]string)
-	m.configs.Range(func(key, value interface{}) bool {
-		configs[key.(string)] = value.(string) // 将每个配置项添加到map中
-		return true                            // 继续遍历
-	})
-	return configs, nil // 返回所有配置项
-}
-
-// SetConfig implements ConfigStore.
-func (m *halalCommon) SetConfig(key string, value string) error {
-	m.configs.Store(key, value) // 使用Store方法设置或更新配置项
-	return nil                  // 成功设置配置项后返回nil
-}
-
-func NewHalalCommon() *halalCommon {
-	return &halalCommon{
-		configs: sync.Map{},
-	}
-}

drivers/halalcloud_open/driver.go

@@ -1,29 +0,0 @@
-package halalcloudopen
-
-import (
-	"github.com/OpenListTeam/OpenList/v4/internal/driver"
-	"github.com/OpenListTeam/OpenList/v4/internal/model"
-	sdkClient "github.com/halalcloud/golang-sdk-lite/halalcloud/apiclient"
-	sdkUser "github.com/halalcloud/golang-sdk-lite/halalcloud/services/user"
-	sdkUserFile "github.com/halalcloud/golang-sdk-lite/halalcloud/services/userfile"
-)
-
-type HalalCloudOpen struct {
-	*halalCommon
-	model.Storage
-	Addition
-	sdkClient          *sdkClient.Client
-	sdkUserFileService *sdkUserFile.UserFileService
-	sdkUserService     *sdkUser.UserService
-	uploadThread       int
-}
-
-func (d *HalalCloudOpen) Config() driver.Config {
-	return config
-}
-
-func (d *HalalCloudOpen) GetAddition() driver.Additional {
-	return &d.Addition
-}
-
-var _ driver.Driver = (*HalalCloudOpen)(nil)

drivers/halalcloud_open/driver_curd_impl.go

@@ -1,131 +0,0 @@
-package halalcloudopen
-
-import (
-	"context"
-	"strconv"
-
-	"github.com/OpenListTeam/OpenList/v4/internal/model"
-	sdkModel "github.com/halalcloud/golang-sdk-lite/halalcloud/model"
-	sdkUserFile "github.com/halalcloud/golang-sdk-lite/halalcloud/services/userfile"
-)
-
-func (d *HalalCloudOpen) getFiles(ctx context.Context, dir model.Obj) ([]model.Obj, error) {
-
-	files := make([]model.Obj, 0)
-	limit := int64(100)
-	token := ""
-
-	for {
-		result, err := d.sdkUserFileService.List(ctx, &sdkUserFile.FileListRequest{
-			Parent: &sdkUserFile.File{Path: dir.GetPath()},
-			ListInfo: &sdkModel.ScanListRequest{
-				Limit: strconv.FormatInt(limit, 10),
-				Token: token,
-			},
-		})
-		if err != nil {
-			return nil, err
-		}
-
-		for i := 0; len(result.Files) > i; i++ {
-			files = append(files, NewObjFile(result.Files[i]))
-		}
-
-		if result.ListInfo == nil || result.ListInfo.Token == "" {
-			break
-		}
-		token = result.ListInfo.Token
-
-	}
-	return files, nil
-}
-
-func (d *HalalCloudOpen) makeDir(ctx context.Context, dir model.Obj, name string) (model.Obj, error) {
-	_, err := d.sdkUserFileService.Create(ctx, &sdkUserFile.File{
-		Path: dir.GetPath(),
-		Name: name,
-	})
-	return nil, err
-}
-
-func (d *HalalCloudOpen) move(ctx context.Context, obj model.Obj, dir model.Obj) (model.Obj, error) {
-	oldDir := obj.GetPath()
-	newDir := dir.GetPath()
-	_, err := d.sdkUserFileService.Move(ctx, &sdkUserFile.BatchOperationRequest{
-		Source: []*sdkUserFile.File{
-			{
-				Path: oldDir,
-			},
-		},
-		Dest: &sdkUserFile.File{
-			Path: newDir,
-		},
-	})
-	return nil, err
-}
-
-func (d *HalalCloudOpen) rename(ctx context.Context, obj model.Obj, name string) (model.Obj, error) {
-
-	_, err := d.sdkUserFileService.Rename(ctx, &sdkUserFile.File{
-		Path: obj.GetPath(),
-		Name: name,
-	})
-	return nil, err
-}
-
-func (d *HalalCloudOpen) copy(ctx context.Context, obj model.Obj, dir model.Obj) (model.Obj, error) {
-	id := obj.GetID()
-	sourcePath := obj.GetPath()
-	if len(id) > 0 {
-		sourcePath = ""
-	}
-
-	destID := dir.GetID()
-	destPath := dir.GetPath()
-	if len(destID) > 0 {
-		destPath = ""
-	}
-	dest := &sdkUserFile.File{
-		Path:     destPath,
-		Identity: destID,
-	}
-	_, err := d.sdkUserFileService.Copy(ctx, &sdkUserFile.BatchOperationRequest{
-		Source: []*sdkUserFile.File{
-			{
-				Path:     sourcePath,
-				Identity: id,
-			},
-		},
-		Dest: dest,
-	})
-	return nil, err
-}
-
-func (d *HalalCloudOpen) remove(ctx context.Context, obj model.Obj) error {
-	id := obj.GetID()
-	_, err := d.sdkUserFileService.Delete(ctx, &sdkUserFile.BatchOperationRequest{
-		Source: []*sdkUserFile.File{
-			{
-				Identity: id,
-				Path:     obj.GetPath(),
-			},
-		},
-	})
-	return err
-}
-
-func (d *HalalCloudOpen) details(ctx context.Context) (*model.StorageDetails, error) {
-	ret, err := d.sdkUserService.GetStatisticsAndQuota(ctx)
-	if err != nil {
-		return nil, err
-	}
-	total := uint64(ret.DiskStatisticsQuota.BytesQuota)
-
-	free := uint64(ret.DiskStatisticsQuota.BytesFree)
-	return &model.StorageDetails{
-		DiskUsage: model.DiskUsage{
-			TotalSpace: total,
-			FreeSpace:  free,
-		},
-	}, nil
-}

drivers/halalcloud_open/driver_get_link.go

@@ -1,108 +0,0 @@
-package halalcloudopen
-
-import (
-	"context"
-	"crypto/sha1"
-	"io"
-	"strconv"
-	"time"
-
-	"github.com/OpenListTeam/OpenList/v4/internal/model"
-	"github.com/OpenListTeam/OpenList/v4/internal/stream"
-	"github.com/OpenListTeam/OpenList/v4/pkg/http_range"
-	sdkUserFile "github.com/halalcloud/golang-sdk-lite/halalcloud/services/userfile"
-	"github.com/rclone/rclone/lib/readers"
-)
-
-func (d *HalalCloudOpen) getLink(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
-	if args.Redirect {
-		// return nil, model.ErrUnsupported
-		fid := file.GetID()
-		fpath := file.GetPath()
-		if fid != "" {
-			fpath = ""
-		}
-		fi, err := d.sdkUserFileService.GetDirectDownloadAddress(ctx, &sdkUserFile.DirectDownloadRequest{
-			Identity: fid,
-			Path:     fpath,
-		})
-		if err != nil {
-			return nil, err
-		}
-		expireAt := fi.ExpireAt
-		duration := time.Until(time.UnixMilli(expireAt))
-		return &model.Link{
-			URL:        fi.DownloadAddress,
-			Expiration: &duration,
-		}, nil
-	}
-	result, err := d.sdkUserFileService.ParseFileSlice(ctx, &sdkUserFile.File{
-		Identity: file.GetID(),
-		Path:     file.GetPath(),
-	})
-	if err != nil {
-		return nil, err
-	}
-	fileAddrs := []*sdkUserFile.SliceDownloadInfo{}
-	var addressDuration int64
-
-	nodesNumber := len(result.RawNodes)
-	nodesIndex := nodesNumber - 1
-	startIndex, endIndex := 0, nodesIndex
-	for nodesIndex >= 0 {
-		if nodesIndex >= 200 {
-			endIndex = 200
-		} else {
-			endIndex = nodesNumber
-		}
-		for ; endIndex <= nodesNumber; endIndex += 200 {
-			if endIndex == 0 {
-				endIndex = 1
-			}
-			sliceAddress, err := d.sdkUserFileService.GetSliceDownloadAddress(ctx, &sdkUserFile.SliceDownloadAddressRequest{
-				Identity: result.RawNodes[startIndex:endIndex],
-				Version:  1,
-			})
-			if err != nil {
-				return nil, err
-			}
-			addressDuration, _ = strconv.ParseInt(sliceAddress.ExpireAt, 10, 64)
-			fileAddrs = append(fileAddrs, sliceAddress.Addresses...)
-			startIndex = endIndex
-			nodesIndex -= 200
-		}
-
-	}
-
-	size, _ := strconv.ParseInt(result.FileSize, 10, 64)
-	chunks := getChunkSizes(result.Sizes)
-	resultRangeReader := func(ctx context.Context, httpRange http_range.Range) (io.ReadCloser, error) {
-		length := httpRange.Length
-		if httpRange.Length < 0 || httpRange.Start+httpRange.Length >= size {
-			length = size - httpRange.Start
-		}
-		oo := &openObject{
-			ctx:     ctx,
-			d:       fileAddrs,
-			chunk:   []byte{},
-			chunks:  chunks,
-			skip:    httpRange.Start,
-			sha:     result.Sha1,
-			shaTemp: sha1.New(),
-		}
-
-		return readers.NewLimitedReadCloser(oo, length), nil
-	}
-
-	var duration time.Duration
-	if addressDuration != 0 {
-		duration = time.Until(time.UnixMilli(addressDuration))
-	} else {
-		duration = time.Until(time.Now().Add(time.Hour))
-	}
-
-	return &model.Link{
-		RangeReader: stream.RateLimitRangeReaderFunc(resultRangeReader),
-		Expiration:  &duration,
-	}, nil
-}

drivers/halalcloud_open/driver_init.go

@@ -1,50 +0,0 @@
-package halalcloudopen
-
-import (
-	"context"
-	"time"
-
-	"github.com/OpenListTeam/OpenList/v4/internal/op"
-	"github.com/halalcloud/golang-sdk-lite/halalcloud/apiclient"
-	sdkUser "github.com/halalcloud/golang-sdk-lite/halalcloud/services/user"
-	sdkUserFile "github.com/halalcloud/golang-sdk-lite/halalcloud/services/userfile"
-)
-
-func (d *HalalCloudOpen) Init(ctx context.Context) error {
-	if d.uploadThread < 1 || d.uploadThread > 32 {
-		d.uploadThread, d.UploadThread = 3, 3
-	}
-	if d.halalCommon == nil {
-		d.halalCommon = &halalCommon{
-			UserInfo: &sdkUser.User{},
-			refreshTokenFunc: func(token string) error {
-				d.Addition.RefreshToken = token
-				op.MustSaveDriverStorage(d)
-				return nil
-			},
-		}
-	}
-	if d.Addition.RefreshToken != "" {
-		d.halalCommon.SetRefreshToken(d.Addition.RefreshToken)
-	}
-	timeout := d.Addition.TimeOut
-	if timeout <= 0 {
-		timeout = 60
-	}
-	host := d.Addition.Host
-	if host == "" {
-		host = "openapi.2dland.cn"
-	}
-
-	client := apiclient.NewClient(nil, host, d.Addition.ClientID, d.Addition.ClientSecret, d.halalCommon, apiclient.WithTimeout(time.Second*time.Duration(timeout)))
-	d.sdkClient = client
-	d.sdkUserFileService = sdkUserFile.NewUserFileService(client)
-	d.sdkUserService = sdkUser.NewUserService(client)
-	userInfo, err := d.sdkUserService.Get(ctx, &sdkUser.User{})
-	if err != nil {
-		return err
-	}
-	d.halalCommon.UserInfo = userInfo
-	// 能够获取到用户信息，已经检查了 RefreshToken 的有效性，无需再次检查
-	return nil
-}

drivers/halalcloud_open/driver_interface.go

@@ -1,48 +0,0 @@
-package halalcloudopen
-
-import (
-	"context"
-
-	"github.com/OpenListTeam/OpenList/v4/internal/driver"
-	"github.com/OpenListTeam/OpenList/v4/internal/model"
-)
-
-func (d *HalalCloudOpen) Drop(ctx context.Context) error {
-	return nil
-}
-
-func (d *HalalCloudOpen) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([]model.Obj, error) {
-	return d.getFiles(ctx, dir)
-}
-
-func (d *HalalCloudOpen) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
-	return d.getLink(ctx, file, args)
-}
-
-func (d *HalalCloudOpen) MakeDir(ctx context.Context, parentDir model.Obj, dirName string) (model.Obj, error) {
-	return d.makeDir(ctx, parentDir, dirName)
-}
-
-func (d *HalalCloudOpen) Move(ctx context.Context, srcObj, dstDir model.Obj) (model.Obj, error) {
-	return d.move(ctx, srcObj, dstDir)
-}
-
-func (d *HalalCloudOpen) Rename(ctx context.Context, srcObj model.Obj, newName string) (model.Obj, error) {
-	return d.rename(ctx, srcObj, newName)
-}
-
-func (d *HalalCloudOpen) Copy(ctx context.Context, srcObj, dstDir model.Obj) (model.Obj, error) {
-	return d.copy(ctx, srcObj, dstDir)
-}
-
-func (d *HalalCloudOpen) Remove(ctx context.Context, obj model.Obj) error {
-	return d.remove(ctx, obj)
-}
-
-func (d *HalalCloudOpen) Put(ctx context.Context, dstDir model.Obj, stream model.FileStreamer, up driver.UpdateProgress) (model.Obj, error) {
-	return d.put(ctx, dstDir, stream, up)
-}
-
-func (d *HalalCloudOpen) GetDetails(ctx context.Context) (*model.StorageDetails, error) {
-	return d.details(ctx)
-}

drivers/halalcloud_open/halalcloud_upload.go

@@ -1,258 +0,0 @@
-package halalcloudopen
-
-import (
-	"bytes"
-	"context"
-	"encoding/json"
-	"fmt"
-	"io"
-	"net/http"
-	"net/url"
-	"path"
-	"strings"
-	"time"
-
-	"github.com/OpenListTeam/OpenList/v4/internal/driver"
-	"github.com/OpenListTeam/OpenList/v4/internal/model"
-	sdkUserFile "github.com/halalcloud/golang-sdk-lite/halalcloud/services/userfile"
-	"github.com/ipfs/go-cid"
-)
-
-func (d *HalalCloudOpen) put(ctx context.Context, dstDir model.Obj, fileStream model.FileStreamer, up driver.UpdateProgress) (model.Obj, error) {
-
-	newPath := path.Join(dstDir.GetPath(), fileStream.GetName())
-
-	uploadTask, err := d.sdkUserFileService.CreateUploadTask(ctx, &sdkUserFile.File{
-		Path: newPath,
-		Size: fileStream.GetSize(),
-	})
-	if err != nil {
-		return nil, err
-	}
-
-	if uploadTask.Created {
-		return nil, nil
-	}
-
-	slicesList := make([]string, 0)
-	codec := uint64(0x55)
-	if uploadTask.BlockCodec > 0 {
-		codec = uint64(uploadTask.BlockCodec)
-	}
-	blockHashType := uploadTask.BlockHashType
-	mhType := uint64(0x12)
-	if blockHashType > 0 {
-		mhType = uint64(blockHashType)
-	}
-	prefix := cid.Prefix{
-		Codec:    codec,
-		MhLength: -1,
-		MhType:   mhType,
-		Version:  1,
-	}
-	blockSize := uploadTask.BlockSize
-	useSingleUpload := true
-	//
-	if fileStream.GetSize() <= int64(blockSize) || d.uploadThread <= 1 {
-		useSingleUpload = true
-	}
-	// Not sure whether FileStream supports concurrent read and write operations, so currently using single-threaded upload to ensure safety.
-	// read file
-	if useSingleUpload {
-		bufferSize := int(blockSize)
-		buffer := make([]byte, bufferSize)
-		reader := driver.NewLimitedUploadStream(ctx, fileStream)
-		teeReader := io.TeeReader(reader, driver.NewProgress(fileStream.GetSize(), up))
-		// fileStream.Seek(0, os.SEEK_SET)
-		for {
-			n, err := teeReader.Read(buffer)
-			if n > 0 {
-				data := buffer[:n]
-				uploadCid, err := postFileSlice(ctx, data, uploadTask.Task, uploadTask.UploadAddress, prefix, retryTimes)
-				if err != nil {
-					return nil, err
-				}
-				slicesList = append(slicesList, uploadCid.String())
-			}
-			if err == io.EOF || n == 0 {
-				break
-			}
-		}
-	} else {
-		// TODO: implement multipart upload, currently using single-threaded upload to ensure safety.
-		bufferSize := int(blockSize)
-		buffer := make([]byte, bufferSize)
-		reader := driver.NewLimitedUploadStream(ctx, fileStream)
-		teeReader := io.TeeReader(reader, driver.NewProgress(fileStream.GetSize(), up))
-		for {
-			n, err := teeReader.Read(buffer)
-			if n > 0 {
-				data := buffer[:n]
-				uploadCid, err := postFileSlice(ctx, data, uploadTask.Task, uploadTask.UploadAddress, prefix, retryTimes)
-				if err != nil {
-					return nil, err
-				}
-				slicesList = append(slicesList, uploadCid.String())
-			}
-			if err == io.EOF || n == 0 {
-				break
-			}
-		}
-	}
-	newFile, err := makeFile(ctx, slicesList, uploadTask.Task, uploadTask.UploadAddress, retryTimes)
-	if err != nil {
-		return nil, err
-	}
-
-	return NewObjFile(newFile), nil
-
-}
-
-func makeFile(ctx context.Context, fileSlice []string, taskID string, uploadAddress string, retry int) (*sdkUserFile.File, error) {
-	var lastError error = nil
-	for range retry {
-		newFile, err := doMakeFile(fileSlice, taskID, uploadAddress)
-		if err == nil {
-			return newFile, nil
-		}
-		if ctx.Err() != nil {
-			return nil, err
-		}
-		if strings.Contains(err.Error(), "not found") {
-			return nil, err
-		}
-		lastError = err
-		time.Sleep(slicePostErrorRetryInterval)
-	}
-	return nil, fmt.Errorf("mk file slice failed after %d times, error: %s", retry, lastError.Error())
-}
-
-func doMakeFile(fileSlice []string, taskID string, uploadAddress string) (*sdkUserFile.File, error) {
-	accessUrl := uploadAddress + "/" + taskID
-	getTimeOut := time.Minute * 2
-	u, err := url.Parse(accessUrl)
-	if err != nil {
-		return nil, err
-	}
-	n, _ := json.Marshal(fileSlice)
-	httpRequest := http.Request{
-		Method: http.MethodPost,
-		URL:    u,
-		Header: map[string][]string{
-			"Accept":       {"application/json"},
-			"Content-Type": {"application/json"},
-			//"Content-Length": {strconv.Itoa(len(n))},
-		},
-		Body: io.NopCloser(bytes.NewReader(n)),
-	}
-	httpClient := http.Client{
-		Timeout: getTimeOut,
-	}
-	httpResponse, err := httpClient.Do(&httpRequest)
-	if err != nil {
-		return nil, err
-	}
-	defer httpResponse.Body.Close()
-	if httpResponse.StatusCode != http.StatusOK && httpResponse.StatusCode != http.StatusCreated {
-		b, _ := io.ReadAll(httpResponse.Body)
-		message := string(b)
-		return nil, fmt.Errorf("mk file slice failed, status code: %d, message: %s", httpResponse.StatusCode, message)
-	}
-	b, _ := io.ReadAll(httpResponse.Body)
-	var result *sdkUserFile.File
-	err = json.Unmarshal(b, &result)
-	if err != nil {
-		return nil, err
-	}
-	return result, nil
-}
-func postFileSlice(ctx context.Context, fileSlice []byte, taskID string, uploadAddress string, preix cid.Prefix, retry int) (cid.Cid, error) {
-	var lastError error = nil
-	for range retry {
-		newCid, err := doPostFileSlice(fileSlice, taskID, uploadAddress, preix)
-		if err == nil {
-			return newCid, nil
-		}
-		if ctx.Err() != nil {
-			return cid.Undef, err
-		}
-		time.Sleep(slicePostErrorRetryInterval)
-		lastError = err
-	}
-	return cid.Undef, fmt.Errorf("upload file slice failed after %d times, error: %s", retry, lastError.Error())
-}
-func doPostFileSlice(fileSlice []byte, taskID string, uploadAddress string, preix cid.Prefix) (cid.Cid, error) {
-	// 1. sum file slice
-	newCid, err := preix.Sum(fileSlice)
-	if err != nil {
-		return cid.Undef, err
-	}
-	// 2. post file slice
-	sliceCidString := newCid.String()
-	// /{taskID}/{sliceID}
-	accessUrl := uploadAddress + "/" + taskID + "/" + sliceCidString
-	getTimeOut := time.Second * 30
-	// get {accessUrl} in {getTimeOut}
-	u, err := url.Parse(accessUrl)
-	if err != nil {
-		return cid.Undef, err
-	}
-	// header: accept: application/json
-	// header: content-type: application/octet-stream
-	// header: content-length: {fileSlice.length}
-	// header: x-content-cid: {sliceCidString}
-	// header: x-task-id: {taskID}
-	httpRequest := http.Request{
-		Method: http.MethodGet,
-		URL:    u,
-		Header: map[string][]string{
-			"Accept": {"application/json"},
-		},
-	}
-	httpClient := http.Client{
-		Timeout: getTimeOut,
-	}
-	httpResponse, err := httpClient.Do(&httpRequest)
-	if err != nil {
-		return cid.Undef, err
-	}
-	if httpResponse.StatusCode != http.StatusOK {
-		return cid.Undef, fmt.Errorf("upload file slice failed, status code: %d", httpResponse.StatusCode)
-	}
-	var result bool
-	b, err := io.ReadAll(httpResponse.Body)
-	if err != nil {
-		return cid.Undef, err
-	}
-	err = json.Unmarshal(b, &result)
-	if err != nil {
-		return cid.Undef, err
-	}
-	if result {
-		return newCid, nil
-	}
-
-	httpRequest = http.Request{
-		Method: http.MethodPost,
-		URL:    u,
-		Header: map[string][]string{
-			"Accept":       {"application/json"},
-			"Content-Type": {"application/octet-stream"},
-			// "Content-Length": {strconv.Itoa(len(fileSlice))},
-		},
-		Body: io.NopCloser(bytes.NewReader(fileSlice)),
-	}
-	httpResponse, err = httpClient.Do(&httpRequest)
-	if err != nil {
-		return cid.Undef, err
-	}
-	defer httpResponse.Body.Close()
-	if httpResponse.StatusCode != http.StatusOK && httpResponse.StatusCode != http.StatusCreated {
-		b, _ := io.ReadAll(httpResponse.Body)
-		message := string(b)
-		return cid.Undef, fmt.Errorf("upload file slice failed, status code: %d, message: %s", httpResponse.StatusCode, message)
-	}
-	//
-
-	return newCid, nil
-}

drivers/halalcloud_open/meta.go

@@ -1,32 +0,0 @@
-package halalcloudopen
-
-import (
-	"github.com/OpenListTeam/OpenList/v4/internal/driver"
-	"github.com/OpenListTeam/OpenList/v4/internal/op"
-)
-
-type Addition struct {
-	// Usually one of two
-	driver.RootPath
-	// define other
-	RefreshToken string `json:"refresh_token" required:"false" help:"If using a personal API approach, the RefreshToken is not required."`
-	UploadThread int    `json:"upload_thread" type:"number" default:"3" help:"1 <= thread <= 32"`
-
-	ClientID     string `json:"client_id" required:"true" default:""`
-	ClientSecret string `json:"client_secret" required:"true" default:""`
-	Host         string `json:"host" required:"false" default:"openapi.2dland.cn"`
-	TimeOut      int    `json:"timeout" type:"number" default:"60" help:"timeout in seconds"`
-}
-
-var config = driver.Config{
-	Name:        "HalalCloudOpen",
-	OnlyProxy:   false,
-	DefaultRoot: "/",
-	NoLinkURL:   false,
-}
-
-func init() {
-	op.RegisterDriver(func() driver.Driver {
-		return &HalalCloudOpen{}
-	})
-}

drivers/halalcloud_open/obj_file.go

@@ -1,60 +0,0 @@
-package halalcloudopen
-
-import (
-	"time"
-
-	"github.com/OpenListTeam/OpenList/v4/internal/model"
-	"github.com/OpenListTeam/OpenList/v4/pkg/utils"
-	sdkUserFile "github.com/halalcloud/golang-sdk-lite/halalcloud/services/userfile"
-)
-
-type ObjFile struct {
-	sdkFile    *sdkUserFile.File
-	fileSize   int64
-	modTime    time.Time
-	createTime time.Time
-}
-
-func NewObjFile(f *sdkUserFile.File) model.Obj {
-	ofile := &ObjFile{sdkFile: f}
-	ofile.fileSize = f.Size
-	modTimeTs := f.UpdateTs
-	ofile.modTime = time.UnixMilli(modTimeTs)
-	createTimeTs := f.CreateTs
-	ofile.createTime = time.UnixMilli(createTimeTs)
-	return ofile
-}
-
-func (f *ObjFile) GetSize() int64 {
-	return f.fileSize
-}
-
-func (f *ObjFile) GetName() string {
-	return f.sdkFile.Name
-}
-
-func (f *ObjFile) ModTime() time.Time {
-	return f.modTime
-}
-
-func (f *ObjFile) IsDir() bool {
-	return f.sdkFile.Dir
-}
-
-func (f *ObjFile) GetHash() utils.HashInfo {
-	return utils.HashInfo{
-		// TODO: support more hash types
-	}
-}
-
-func (f *ObjFile) GetID() string {
-	return f.sdkFile.Identity
-}
-
-func (f *ObjFile) GetPath() string {
-	return f.sdkFile.Path
-}
-
-func (f *ObjFile) CreateTime() time.Time {
-	return f.createTime
-}

drivers/halalcloud_open/utils.go

@@ -1,185 +0,0 @@
-package halalcloudopen
-
-import (
-	"context"
-	"crypto/md5"
-	"encoding/hex"
-	"errors"
-	"fmt"
-	"hash"
-	"io"
-	"net/http"
-	"sync"
-	"time"
-
-	"github.com/OpenListTeam/OpenList/v4/pkg/utils"
-	sdkUserFile "github.com/halalcloud/golang-sdk-lite/halalcloud/services/userfile"
-	"github.com/ipfs/go-cid"
-)
-
-// get the next chunk
-func (oo *openObject) getChunk(_ context.Context) (err error) {
-	if oo.id >= len(oo.chunks) {
-		return io.EOF
-	}
-	var chunk []byte
-	err = utils.Retry(3, time.Second, func() (err error) {
-		chunk, err = getRawFiles(oo.d[oo.id])
-		return err
-	})
-	if err != nil {
-		return err
-	}
-	oo.id++
-	oo.chunk = chunk
-	return nil
-}
-
-// Read reads up to len(p) bytes into p.
-func (oo *openObject) Read(p []byte) (n int, err error) {
-	oo.mu.Lock()
-	defer oo.mu.Unlock()
-	if oo.closed {
-		return 0, fmt.Errorf("read on closed file")
-	}
-	// Skip data at the start if requested
-	for oo.skip > 0 {
-		//size := 1024 * 1024
-		_, size, err := oo.ChunkLocation(oo.id)
-		if err != nil {
-			return 0, err
-		}
-		if oo.skip < int64(size) {
-			break
-		}
-		oo.id++
-		oo.skip -= int64(size)
-	}
-	if len(oo.chunk) == 0 {
-		err = oo.getChunk(oo.ctx)
-		if err != nil {
-			return 0, err
-		}
-		if oo.skip > 0 {
-			oo.chunk = (oo.chunk)[oo.skip:]
-			oo.skip = 0
-		}
-	}
-	n = copy(p, oo.chunk)
-	oo.shaTemp.Write(p[:n])
-	oo.chunk = (oo.chunk)[n:]
-	return n, nil
-}
-
-// Close closed the file - MAC errors are reported here
-func (oo *openObject) Close() (err error) {
-	oo.mu.Lock()
-	defer oo.mu.Unlock()
-	if oo.closed {
-		return nil
-	}
-	// 校验Sha1
-	if string(oo.shaTemp.Sum(nil)) != oo.sha {
-		return fmt.Errorf("failed to finish download: SHA mismatch")
-	}
-
-	oo.closed = true
-	return nil
-}
-
-func GetMD5Hash(text string) string {
-	tHash := md5.Sum([]byte(text))
-	return hex.EncodeToString(tHash[:])
-}
-
-type chunkSize struct {
-	position int64
-	size     int
-}
-
-type openObject struct {
-	ctx     context.Context
-	mu      sync.Mutex
-	d       []*sdkUserFile.SliceDownloadInfo
-	id      int
-	skip    int64
-	chunk   []byte
-	chunks  []chunkSize
-	closed  bool
-	sha     string
-	shaTemp hash.Hash
-}
-
-func getChunkSizes(sliceSize []*sdkUserFile.SliceSize) (chunks []chunkSize) {
-	chunks = make([]chunkSize, 0)
-	for _, s := range sliceSize {
-		// 对最后一个做特殊处理
-		endIndex := s.EndIndex
-		startIndex := s.StartIndex
-		if endIndex == 0 {
-			endIndex = startIndex
-		}
-		for j := startIndex; j <= endIndex; j++ {
-			size := s.Size
-			chunks = append(chunks, chunkSize{position: j, size: int(size)})
-		}
-	}
-	return chunks
-}
-
-func (oo *openObject) ChunkLocation(id int) (position int64, size int, err error) {
-	if id < 0 || id >= len(oo.chunks) {
-		return 0, 0, errors.New("invalid arguments")
-	}
-
-	return (oo.chunks)[id].position, (oo.chunks)[id].size, nil
-}
-
-func getRawFiles(addr *sdkUserFile.SliceDownloadInfo) ([]byte, error) {
-
-	if addr == nil {
-		return nil, errors.New("addr is nil")
-	}
-
-	client := http.Client{
-		Timeout: time.Duration(60 * time.Second), // Set timeout to 60 seconds
-	}
-	resp, err := client.Get(addr.DownloadAddress)
-	if err != nil {
-
-		return nil, err
-	}
-	defer resp.Body.Close()
-	body, err := io.ReadAll(resp.Body)
-	if err != nil {
-		return nil, err
-	}
-	if resp.StatusCode != http.StatusOK {
-		return nil, fmt.Errorf("bad status: %s, body: %s", resp.Status, body)
-	}
-
-	if addr.Encrypt > 0 {
-		cd := uint8(addr.Encrypt)
-		for idx := 0; idx < len(body); idx++ {
-			body[idx] = body[idx] ^ cd
-		}
-	}
-	storeType := addr.StoreType
-	if storeType != 10 {
-
-		sourceCid, err := cid.Decode(addr.Identity)
-		if err != nil {
-			return nil, err
-		}
-		checkCid, err := sourceCid.Prefix().Sum(body)
-		if err != nil {
-			return nil, err
-		}
-		if !checkCid.Equals(sourceCid) {
-			return nil, fmt.Errorf("bad cid: %s, body: %s", checkCid.String(), body)
-		}
-	}
-
-	return body, nil
-
-}

drivers/local/copy_namedpipes.go

@@ -1,16 +0,0 @@
-//go:build !windows && !plan9 && !netbsd && !aix && !illumos && !solaris && !js
-
-package local
-
-import (
-	"os"
-	"path/filepath"
-	"syscall"
-)
-
-func copyNamedPipe(dstPath string, mode os.FileMode, dirMode os.FileMode) error {
-	if err := os.MkdirAll(filepath.Dir(dstPath), dirMode); err != nil {
-		return err
-	}
-	return syscall.Mkfifo(dstPath, uint32(mode))
-}

drivers/local/copy_namedpipes_x.go

@@ -1,9 +0,0 @@
-//go:build windows || plan9 || netbsd || aix || illumos || solaris || js
-
-package local
-
-import "os"
-
-func copyNamedPipe(_ string, _, _ os.FileMode) error {
-	return nil
-}

drivers/local/driver.go

@@ -23,6 +23,7 @@ import (
 	"github.com/OpenListTeam/OpenList/v4/pkg/utils"
 	"github.com/OpenListTeam/OpenList/v4/server/common"
 	"github.com/OpenListTeam/times"
+	cp "github.com/otiai10/copy"
 	log "github.com/sirupsen/logrus"
 	_ "golang.org/x/image/webp"
 )
@@ -234,7 +235,6 @@ func (d *Local) Get(ctx context.Context, path string) (model.Obj, error) {
 func (d *Local) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
 	fullPath := file.GetPath()
 	link := &model.Link{}
-	var MFile model.File
 	if args.Type == "thumb" && utils.Ext(file.GetName()) != "svg" {
 		var buf *bytes.Buffer
 		var thumbPath *string
@@ -261,9 +261,9 @@ func (d *Local) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (
 				return nil, err
 			}
 			link.ContentLength = int64(stat.Size())
-			MFile = open
+			link.MFile = open
 		} else {
-			MFile = bytes.NewReader(buf.Bytes())
+			link.MFile = bytes.NewReader(buf.Bytes())
 			link.ContentLength = int64(buf.Len())
 		}
 	} else {
@@ -272,11 +272,13 @@ func (d *Local) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (
 			return nil, err
 		}
 		link.ContentLength = file.GetSize()
-		MFile = open
+		link.MFile = open
+	}
+	link.AddIfCloser(link.MFile)
+	if !d.Config().OnlyLinkMFile {
+		link.RangeReader = stream.GetRangeReaderFromMFile(link.ContentLength, link.MFile)
+		link.MFile = nil
 	}
-	link.SyncClosers.AddIfCloser(MFile)
-	link.RangeReader = stream.GetRangeReaderFromMFile(link.ContentLength, MFile)
-	link.RequireReference = link.SyncClosers.Length() > 0
 	return link, nil
 }
 
@@ -296,9 +298,16 @@ func (d *Local) Move(ctx context.Context, srcObj, dstDir model.Obj) error {
 		return fmt.Errorf("the destination folder is a subfolder of the source folder")
 	}
 	err := os.Rename(srcPath, dstPath)
-	if isCrossDeviceError(err) {
-		// 跨设备移动，变更为移动任务
-		return errs.NotImplement
+	if err != nil && strings.Contains(err.Error(), "invalid cross-device link") {
+		// 跨设备移动，先复制再删除
+		if err := d.Copy(ctx, srcObj, dstDir); err != nil {
+			return err
+		}
+		// 复制成功后直接删除源文件/文件夹
+		if srcObj.IsDir() {
+			return os.RemoveAll(srcObj.GetPath())
+		}
+		return os.Remove(srcObj.GetPath())
 	}
 	if err == nil {
 		srcParent := filepath.Dir(srcPath)
@@ -339,14 +348,15 @@ func (d *Local) Copy(_ context.Context, srcObj, dstDir model.Obj) error {
 	if utils.IsSubPath(srcPath, dstPath) {
 		return fmt.Errorf("the destination folder is a subfolder of the source folder")
 	}
-	info, err := os.Lstat(srcPath)
+	// Copy using otiai10/copy to perform more secure & efficient copy
+	err := cp.Copy(srcPath, dstPath, cp.Options{
+		Sync:          true, // Sync file to disk after copy, may have performance penalty in filesystem such as ZFS
+		PreserveTimes: true,
+		PreserveOwner: true,
+	})
 	if err != nil {
 		return err
 	}
-	// 复制regular文件会返回errs.NotImplement, 转为复制任务
-	if err = d.tryCopy(srcPath, dstPath, info); err != nil {
-		return err
-	}
 
 	if d.directoryMap.Has(filepath.Dir(dstPath)) {
 		d.directoryMap.UpdateDirSize(filepath.Dir(dstPath))
@@ -365,26 +375,18 @@ func (d *Local) Remove(ctx context.Context, obj model.Obj) error {
 			err = os.Remove(obj.GetPath())
 		}
 	} else {
-		objPath := obj.GetPath()
-		objName := obj.GetName()
-		var relPath string
-		relPath, err = filepath.Rel(d.GetRootPath(), filepath.Dir(objPath))
-		if err != nil {
-			return err
-		}
-		recycleBinPath := filepath.Join(d.RecycleBinPath, relPath)
-		if !utils.Exists(recycleBinPath) {
-			err = os.MkdirAll(recycleBinPath, 0o755)
+		if !utils.Exists(d.RecycleBinPath) {
+			err = os.MkdirAll(d.RecycleBinPath, 0o755)
 			if err != nil {
 				return err
 			}
 		}
 
-		dstPath := filepath.Join(recycleBinPath, objName)
+		dstPath := filepath.Join(d.RecycleBinPath, obj.GetName())
 		if utils.Exists(dstPath) {
-			dstPath = filepath.Join(recycleBinPath, objName+"_"+time.Now().Format("20060102150405"))
+			dstPath = filepath.Join(d.RecycleBinPath, obj.GetName()+"_"+time.Now().Format("20060102150405"))
 		}
-		err = os.Rename(objPath, dstPath)
+		err = os.Rename(obj.GetPath(), dstPath)
 	}
 	if err != nil {
 		return err

drivers/local/meta.go

@@ -18,12 +18,12 @@ type Addition struct {
 }
 
 var config = driver.Config{
-	Name:        "Local",
-	LocalSort:   true,
-	OnlyProxy:   true,
-	NoCache:     true,
-	DefaultRoot: "/",
-	NoLinkURL:   true,
+	Name:          "Local",
+	OnlyLinkMFile: false,
+	LocalSort:     true,
+	NoCache:       true,
+	DefaultRoot:   "/",
+	NoLinkURL:     true,
 }
 
 func init() {

drivers/local/util.go

@@ -3,7 +3,6 @@ package local
 import (
 	"bytes"
 	"encoding/json"
-	"errors"
 	"fmt"
 	"io/fs"
 	"os"
@@ -15,9 +14,7 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/KarpelesLab/reflink"
 	"github.com/OpenListTeam/OpenList/v4/internal/conf"
-	"github.com/OpenListTeam/OpenList/v4/internal/errs"
 	"github.com/OpenListTeam/OpenList/v4/internal/model"
 	"github.com/OpenListTeam/OpenList/v4/pkg/utils"
 	"github.com/disintegration/imaging"
@@ -151,7 +148,7 @@ func (d *Local) getThumb(file model.Obj) (*bytes.Buffer, *string, error) {
 		return nil, nil, err
 	}
 	if d.ThumbCacheFolder != "" {
-		err = os.WriteFile(filepath.Join(d.ThumbCacheFolder, thumbName), buf.Bytes(), 0o666)
+		err = os.WriteFile(filepath.Join(d.ThumbCacheFolder, thumbName), buf.Bytes(), 0666)
 		if err != nil {
 			return nil, nil, err
 		}
@@ -408,79 +405,3 @@ func (m *DirectoryMap) DeleteDirNode(dirname string) error {
 
 	return nil
 }
-
-func (d *Local) tryCopy(srcPath, dstPath string, info os.FileInfo) error {
-	if info.Mode()&os.ModeDevice != 0 {
-		return errors.New("cannot copy a device")
-	} else if info.Mode()&os.ModeSymlink != 0 {
-		return d.copySymlink(srcPath, dstPath)
-	} else if info.Mode()&os.ModeNamedPipe != 0 {
-		return copyNamedPipe(dstPath, info.Mode(), os.FileMode(d.mkdirPerm))
-	} else if info.IsDir() {
-		return d.recurAndTryCopy(srcPath, dstPath)
-	} else {
-		return tryReflinkCopy(srcPath, dstPath)
-	}
-}
-
-func (d *Local) copySymlink(srcPath, dstPath string) error {
-	linkOrig, err := os.Readlink(srcPath)
-	if err != nil {
-		return err
-	}
-	dstDir := filepath.Dir(dstPath)
-	if !filepath.IsAbs(linkOrig) {
-		srcDir := filepath.Dir(srcPath)
-		rel, err := filepath.Rel(dstDir, srcDir)
-		if err != nil {
-			rel, err = filepath.Abs(srcDir)
-		}
-		if err != nil {
-			return err
-		}
-		linkOrig = filepath.Clean(filepath.Join(rel, linkOrig))
-	}
-	err = os.MkdirAll(dstDir, os.FileMode(d.mkdirPerm))
-	if err != nil {
-		return err
-	}
-	return os.Symlink(linkOrig, dstPath)
-}
-
-func (d *Local) recurAndTryCopy(srcPath, dstPath string) error {
-	err := os.MkdirAll(dstPath, os.FileMode(d.mkdirPerm))
-	if err != nil {
-		return err
-	}
-	files, err := readDir(srcPath)
-	if err != nil {
-		return err
-	}
-	for _, f := range files {
-		if !f.IsDir() {
-			sp := filepath.Join(srcPath, f.Name())
-			dp := filepath.Join(dstPath, f.Name())
-			if err = d.tryCopy(sp, dp, f); err != nil {
-				return err
-			}
-		}
-	}
-	for _, f := range files {
-		if f.IsDir() {
-			sp := filepath.Join(srcPath, f.Name())
-			dp := filepath.Join(dstPath, f.Name())
-			if err = d.recurAndTryCopy(sp, dp); err != nil {
-				return err
-			}
-		}
-	}
-	return nil
-}
-
-func tryReflinkCopy(srcPath, dstPath string) error {
-	err := reflink.Always(srcPath, dstPath)
-	if errors.Is(err, reflink.ErrReflinkUnsupported) || errors.Is(err, reflink.ErrReflinkFailed) || isCrossDeviceError(err) {
-		return errs.NotImplement
-	}
-	return err
-}

drivers/local/util_unix.go

@@ -3,13 +3,11 @@
 package local
 
 import (
-	"errors"
 	"io/fs"
 	"strings"
 	"syscall"
 
 	"github.com/OpenListTeam/OpenList/v4/internal/model"
-	"golang.org/x/sys/unix"
 )
 
 func isHidden(f fs.FileInfo, _ string) bool {
@@ -29,7 +27,3 @@ func getDiskUsage(path string) (model.DiskUsage, error) {
 		FreeSpace:  free,
 	}, nil
 }
-
-func isCrossDeviceError(err error) bool {
-	return errors.Is(err, unix.EXDEV)
-}

drivers/local/util_windows.go

@@ -49,7 +49,3 @@ func getDiskUsage(path string) (model.DiskUsage, error) {
 		FreeSpace:  freeBytes,
 	}, nil
 }
-
-func isCrossDeviceError(err error) bool {
-	return errors.Is(err, windows.ERROR_NOT_SAME_DEVICE)
-}

drivers/mediafire/meta.go

@@ -36,6 +36,7 @@ type Addition struct {
 var config = driver.Config{
 	Name:              "MediaFire",
 	LocalSort:         false,
+	OnlyLinkMFile:     false,
 	OnlyProxy:         false,
 	NoCache:           false,
 	NoUpload:          false,

drivers/misskey/util.go

@@ -57,22 +57,18 @@ func setBody(body interface{}) base.ReqCallback {
 }
 
 func handleFolderId(dir model.Obj) interface{} {
-	if isRootFolder(dir) {
-		return nil // Root folder doesn't need folderId
+	if dir.GetID() == "" {
+		return nil
 	}
 	return dir.GetID()
 }
 
-func isRootFolder(dir model.Obj) bool {
-	return dir.GetID() == ""
-}
-
 // API layer methods
 
 func (d *Misskey) getFiles(dir model.Obj) ([]model.Obj, error) {
 	var files []MFile
 	var body map[string]string
-	if !isRootFolder(dir) {
+	if dir.GetPath() != "/" {
 		body = map[string]string{"folderId": dir.GetID()}
 	} else {
 		body = map[string]string{}
@@ -89,7 +85,7 @@ func (d *Misskey) getFiles(dir model.Obj) ([]model.Obj, error) {
 func (d *Misskey) getFolders(dir model.Obj) ([]model.Obj, error) {
 	var folders []MFolder
 	var body map[string]string
-	if !isRootFolder(dir) {
+	if dir.GetPath() != "/" {
 		body = map[string]string{"folderId": dir.GetID()}
 	} else {
 		body = map[string]string{}
@@ -201,24 +197,16 @@ func (d *Misskey) put(ctx context.Context, dstDir model.Obj, stream model.FileSt
 		Reader:         stream,
 		UpdateProgress: up,
 	})
-
-	// Build form data, only add folderId if not root folder
-	formData := map[string]string{
-		"name":        stream.GetName(),
-		"comment":     "",
-		"isSensitive": "false",
-		"force":       "false",
-	}
-
-	folderId := handleFolderId(dstDir)
-	if folderId != nil {
-		formData["folderId"] = folderId.(string)
-	}
-
 	req := base.RestyClient.R().
 		SetContext(ctx).
 		SetFileReader("file", stream.GetName(), reader).
-		SetFormData(formData).
+		SetFormData(map[string]string{
+			"folderId":    handleFolderId(dstDir).(string),
+			"name":        stream.GetName(),
+			"comment":     "",
+			"isSensitive": "false",
+			"force":       "false",
+		}).
 		SetResult(&file).
 		SetAuthToken(d.AccessToken)
 

drivers/onedrive/driver.go

@@ -22,7 +22,6 @@ type Onedrive struct {
 	AccessToken string
 	root        *Object
 	mutex       sync.Mutex
-	ref         *Onedrive
 }
 
 func (d *Onedrive) Config() driver.Config {
@@ -37,22 +36,10 @@ func (d *Onedrive) Init(ctx context.Context) error {
 	if d.ChunkSize < 1 {
 		d.ChunkSize = 5
 	}
-	if d.ref != nil {
-		return nil
-	}
 	return d.refreshToken()
 }
 
-func (d *Onedrive) InitReference(refStorage driver.Driver) error {
-	if ref, ok := refStorage.(*Onedrive); ok {
-		d.ref = ref
-		return nil
-	}
-	return errs.NotSupport
-}
-
 func (d *Onedrive) Drop(ctx context.Context) error {
-	d.ref = nil
 	return nil
 }
 
@@ -236,19 +223,4 @@ func (d *Onedrive) GetDetails(ctx context.Context) (*model.StorageDetails, error
 	}, nil
 }
 
-func (d *Onedrive) GetDirectUploadTools() []string {
-	if !d.EnableDirectUpload {
-		return nil
-	}
-	return []string{"HttpDirect"}
-}
-
-// GetDirectUploadInfo returns the direct upload info for OneDrive
-func (d *Onedrive) GetDirectUploadInfo(ctx context.Context, _ string, dstDir model.Obj, fileName string, _ int64) (any, error) {
-	if !d.EnableDirectUpload {
-		return nil, errs.NotImplement
-	}
-	return d.getDirectUploadInfo(ctx, path.Join(dstDir.GetPath(), fileName))
-}
-
 var _ driver.Driver = (*Onedrive)(nil)

drivers/onedrive/meta.go

@@ -7,19 +7,18 @@ import (
 
 type Addition struct {
 	driver.RootPath
-	Region             string `json:"region" type:"select" required:"true" options:"global,cn,us,de" default:"global"`
-	IsSharepoint       bool   `json:"is_sharepoint"`
-	UseOnlineAPI       bool   `json:"use_online_api" default:"true"`
-	APIAddress         string `json:"api_url_address" default:"https://api.oplist.org/onedrive/renewapi"`
-	ClientID           string `json:"client_id"`
-	ClientSecret       string `json:"client_secret"`
-	RedirectUri        string `json:"redirect_uri" required:"true" default:"https://api.oplist.org/onedrive/callback"`
-	RefreshToken       string `json:"refresh_token" required:"true"`
-	SiteId             string `json:"site_id"`
-	ChunkSize          int64  `json:"chunk_size" type:"number" default:"5"`
-	CustomHost         string `json:"custom_host" help:"Custom host for onedrive download link"`
-	DisableDiskUsage   bool   `json:"disable_disk_usage" default:"false"`
-	EnableDirectUpload bool   `json:"enable_direct_upload" default:"false" help:"Enable direct upload from client to OneDrive"`
+	Region           string `json:"region" type:"select" required:"true" options:"global,cn,us,de" default:"global"`
+	IsSharepoint     bool   `json:"is_sharepoint"`
+	UseOnlineAPI     bool   `json:"use_online_api" default:"true"`
+	APIAddress       string `json:"api_url_address" default:"https://api.oplist.org/onedrive/renewapi"`
+	ClientID         string `json:"client_id"`
+	ClientSecret     string `json:"client_secret"`
+	RedirectUri      string `json:"redirect_uri" required:"true" default:"https://api.oplist.org/onedrive/callback"`
+	RefreshToken     string `json:"refresh_token" required:"true"`
+	SiteId           string `json:"site_id"`
+	ChunkSize        int64  `json:"chunk_size" type:"number" default:"5"`
+	CustomHost       string `json:"custom_host" help:"Custom host for onedrive download link"`
+	DisableDiskUsage bool   `json:"disable_disk_usage" default:"false"`
 }
 
 var config = driver.Config{

drivers/onedrive/util.go

@@ -133,10 +133,7 @@ func (d *Onedrive) _refreshToken() error {
 	return nil
 }
 
-func (d *Onedrive) Request(url string, method string, callback base.ReqCallback, resp interface{}, noRetry ...bool) ([]byte, error) {
-	if d.ref != nil {
-		return d.ref.Request(url, method, callback, resp)
-	}
+func (d *Onedrive) Request(url string, method string, callback base.ReqCallback, resp interface{}) ([]byte, error) {
 	req := base.RestyClient.R()
 	req.SetHeader("Authorization", "Bearer "+d.AccessToken)
 	if callback != nil {
@@ -152,7 +149,7 @@ func (d *Onedrive) Request(url string, method string, callback base.ReqCallback,
 		return nil, err
 	}
 	if e.Error.Code != "" {
-		if e.Error.Code == "InvalidAuthenticationToken" && !utils.IsBool(noRetry...) {
+		if e.Error.Code == "InvalidAuthenticationToken" {
 			err = d.refreshToken()
 			if err != nil {
 				return nil, err
@@ -310,36 +307,9 @@ func (d *Onedrive) getDrive(ctx context.Context) (*DriveResp, error) {
 	var resp DriveResp
 	_, err := d.Request(api, http.MethodGet, func(req *resty.Request) {
 		req.SetContext(ctx)
-	}, &resp, true)
+	}, &resp)
 	if err != nil {
 		return nil, err
 	}
 	return &resp, nil
 }
-
-func (d *Onedrive) getDirectUploadInfo(ctx context.Context, path string) (*model.HttpDirectUploadInfo, error) {
-	// Create upload session
-	url := d.GetMetaUrl(false, path) + "/createUploadSession"
-	metadata := map[string]any{
-		"item": map[string]any{
-			"@microsoft.graph.conflictBehavior": "rename",
-		},
-	}
-
-	res, err := d.Request(url, http.MethodPost, func(req *resty.Request) {
-		req.SetBody(metadata).SetContext(ctx)
-	}, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	uploadUrl := jsoniter.Get(res, "uploadUrl").ToString()
-	if uploadUrl == "" {
-		return nil, fmt.Errorf("failed to get upload URL from response")
-	}
-	return &model.HttpDirectUploadInfo{
-		UploadURL: uploadUrl,
-		ChunkSize: d.ChunkSize * 1024 * 1024, // Convert MB to bytes
-		Method:    "PUT",
-	}, nil
-}

drivers/onedrive_app/driver.go

@@ -222,18 +222,4 @@ func (d *OnedriveAPP) GetDetails(ctx context.Context) (*model.StorageDetails, er
 	}, nil
 }
 
-func (d *OnedriveAPP) GetDirectUploadTools() []string {
-	if !d.EnableDirectUpload {
-		return nil
-	}
-	return []string{"HttpDirect"}
-}
-
-func (d *OnedriveAPP) GetDirectUploadInfo(ctx context.Context, _ string, dstDir model.Obj, fileName string, _ int64) (any, error) {
-	if !d.EnableDirectUpload {
-		return nil, errs.NotImplement
-	}
-	return d.getDirectUploadInfo(ctx, path.Join(dstDir.GetPath(), fileName))
-}
-
 var _ driver.Driver = (*OnedriveAPP)(nil)

drivers/onedrive_app/meta.go

@@ -7,15 +7,14 @@ import (
 
 type Addition struct {
 	driver.RootPath
-	Region             string `json:"region" type:"select" required:"true" options:"global,cn,us,de" default:"global"`
-	ClientID           string `json:"client_id" required:"true"`
-	ClientSecret       string `json:"client_secret" required:"true"`
-	TenantID           string `json:"tenant_id"`
-	Email              string `json:"email"`
-	ChunkSize          int64  `json:"chunk_size" type:"number" default:"5"`
-	CustomHost         string `json:"custom_host" help:"Custom host for onedrive download link"`
-	DisableDiskUsage   bool   `json:"disable_disk_usage" default:"false"`
-	EnableDirectUpload bool   `json:"enable_direct_upload" default:"false" help:"Enable direct upload from client to OneDrive"`
+	Region           string `json:"region" type:"select" required:"true" options:"global,cn,us,de" default:"global"`
+	ClientID         string `json:"client_id" required:"true"`
+	ClientSecret     string `json:"client_secret" required:"true"`
+	TenantID         string `json:"tenant_id"`
+	Email            string `json:"email"`
+	ChunkSize        int64  `json:"chunk_size" type:"number" default:"5"`
+	CustomHost       string `json:"custom_host" help:"Custom host for onedrive download link"`
+	DisableDiskUsage bool   `json:"disable_disk_usage" default:"false"`
 }
 
 var config = driver.Config{

drivers/onedrive_app/util.go

@@ -88,7 +88,7 @@ func (d *OnedriveAPP) _accessToken() error {
 	return nil
 }
 
-func (d *OnedriveAPP) Request(url string, method string, callback base.ReqCallback, resp interface{}, noRetry ...bool) ([]byte, error) {
+func (d *OnedriveAPP) Request(url string, method string, callback base.ReqCallback, resp interface{}) ([]byte, error) {
 	req := base.RestyClient.R()
 	req.SetHeader("Authorization", "Bearer "+d.AccessToken)
 	if callback != nil {
@@ -104,7 +104,7 @@ func (d *OnedriveAPP) Request(url string, method string, callback base.ReqCallba
 		return nil, err
 	}
 	if e.Error.Code != "" {
-		if e.Error.Code == "InvalidAuthenticationToken" && !utils.IsBool(noRetry...) {
+		if e.Error.Code == "InvalidAuthenticationToken" {
 			err = d.accessToken()
 			if err != nil {
 				return nil, err
@@ -216,36 +216,9 @@ func (d *OnedriveAPP) getDrive(ctx context.Context) (*DriveResp, error) {
 	var resp DriveResp
 	_, err := d.Request(api, http.MethodGet, func(req *resty.Request) {
 		req.SetContext(ctx)
-	}, &resp, true)
+	}, &resp)
 	if err != nil {
 		return nil, err
 	}
 	return &resp, nil
 }
-
-func (d *OnedriveAPP) getDirectUploadInfo(ctx context.Context, path string) (*model.HttpDirectUploadInfo, error) {
-	// Create upload session
-	url := d.GetMetaUrl(false, path) + "/createUploadSession"
-	metadata := map[string]any{
-		"item": map[string]any{
-			"@microsoft.graph.conflictBehavior": "rename",
-		},
-	}
-
-	res, err := d.Request(url, http.MethodPost, func(req *resty.Request) {
-		req.SetBody(metadata).SetContext(ctx)
-	}, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	uploadUrl := jsoniter.Get(res, "uploadUrl").ToString()
-	if uploadUrl == "" {
-		return nil, fmt.Errorf("failed to get upload URL from response")
-	}
-	return &model.HttpDirectUploadInfo{
-		UploadURL: uploadUrl,
-		ChunkSize: d.ChunkSize * 1024 * 1024, // Convert MB to bytes
-		Method:    "PUT",
-	}, nil
-}

drivers/onedrive_sharelink/driver.go

@@ -2,33 +2,21 @@ package onedrive_sharelink
 
 import (
 	"context"
-	"fmt"
-	"io"
-	"net/http"
 	"strings"
-	"sync"
 	"time"
 
 	"github.com/OpenListTeam/OpenList/v4/internal/driver"
 	"github.com/OpenListTeam/OpenList/v4/internal/errs"
 	"github.com/OpenListTeam/OpenList/v4/internal/model"
-	"github.com/OpenListTeam/OpenList/v4/internal/net"
 	"github.com/OpenListTeam/OpenList/v4/pkg/cron"
-	"github.com/OpenListTeam/OpenList/v4/pkg/http_range"
-	"github.com/OpenListTeam/OpenList/v4/pkg/singleflight"
 	"github.com/OpenListTeam/OpenList/v4/pkg/utils"
 	log "github.com/sirupsen/logrus"
 )
 
-const headerTTL = 25 * time.Minute
-
 type OnedriveSharelink struct {
 	model.Storage
 	cron *cron.Cron
 	Addition
-
-	headerMu sync.RWMutex
-	sg       singleflight.Group[http.Header]
 }
 
 func (d *OnedriveSharelink) Config() driver.Config {
@@ -50,20 +38,17 @@ func (d *OnedriveSharelink) Init(ctx context.Context) error {
 	d.cron = cron.NewCron(time.Hour * 1)
 	d.cron.Do(func() {
 		var err error
-		h, err := d.getHeaders(ctx)
+		d.Headers, err = d.getHeaders(ctx)
 		if err != nil {
 			log.Errorf("%+v", err)
-			return
 		}
-		d.storeHeaders(h)
 	})
 
 	// Get initial headers
-	h, err := d.getHeaders(ctx)
+	d.Headers, err = d.getHeaders(ctx)
 	if err != nil {
 		return err
 	}
-	d.storeHeaders(h)
 
 	return nil
 }
@@ -91,18 +76,21 @@ func (d *OnedriveSharelink) Link(ctx context.Context, file model.Obj, args model
 	// Cut the first char and the last char
 	uniqueId = uniqueId[1 : len(uniqueId)-1]
 	url := d.downloadLinkPrefix + uniqueId
+	header := d.Headers
 
-	header, err := d.getValidHeaders(ctx)
-	if err != nil {
-		return nil, err
+	// If the headers are older than 30 minutes, get new headers
+	if d.HeaderTime < time.Now().Unix()-1800 {
+		var err error
+		log.Debug("headers are older than 30 minutes, get new headers")
+		header, err = d.getHeaders(ctx)
+		if err != nil {
+			return nil, err
+		}
 	}
 
 	return &model.Link{
 		URL:    url,
 		Header: header,
-		RangeReader: rangeReaderFunc(func(ctx context.Context, hr http_range.Range) (io.ReadCloser, error) {
-			return d.rangeReadWithRefresh(ctx, url, hr)
-		}),
 	}, nil
 }
 
@@ -141,102 +129,3 @@ func (d *OnedriveSharelink) Put(ctx context.Context, dstDir model.Obj, stream mo
 //}
 
 var _ driver.Driver = (*OnedriveSharelink)(nil)
-
-// rangeReadWithRefresh tries once with current headers, and if the response
-// looks invalid (error status or html login page), it refreshes headers and retries.
-func (d *OnedriveSharelink) rangeReadWithRefresh(ctx context.Context, url string, hr http_range.Range) (io.ReadCloser, error) {
-	tryOnce := func(header http.Header) (io.ReadCloser, error) {
-		h := cloneHeader(header)
-		if h == nil {
-			h = http.Header{}
-		}
-		h = http_range.ApplyRangeToHttpHeader(hr, h)
-		resp, err := net.RequestHttp(ctx, http.MethodGet, h, url)
-		if err != nil {
-			return nil, err
-		}
-		ct := strings.ToLower(resp.Header.Get("Content-Type"))
-		if strings.Contains(ct, "text/html") {
-			_ = resp.Body.Close()
-			return nil, fmt.Errorf("unexpected html response")
-		}
-		return resp.Body, nil
-	}
-
-	header, err := d.getValidHeaders(ctx)
-	if err != nil {
-		return nil, err
-	}
-	if body, err := tryOnce(header); err == nil {
-		return body, nil
-	}
-
-	// refresh and retry once
-	header, err = d.refreshHeaders(ctx)
-	if err != nil {
-		return nil, err
-	}
-	return tryOnce(header)
-}
-
-type rangeReaderFunc func(ctx context.Context, hr http_range.Range) (io.ReadCloser, error)
-
-func (f rangeReaderFunc) RangeRead(ctx context.Context, hr http_range.Range) (io.ReadCloser, error) {
-	return f(ctx, hr)
-}
-
-func cloneHeader(header http.Header) http.Header {
-	if header == nil {
-		return nil
-	}
-	return header.Clone()
-}
-
-func (d *OnedriveSharelink) headerSnapshot() http.Header {
-	d.headerMu.RLock()
-	defer d.headerMu.RUnlock()
-	return cloneHeader(d.Headers)
-}
-
-func (d *OnedriveSharelink) storeHeaders(header http.Header) {
-	if header == nil {
-		return
-	}
-	d.headerMu.Lock()
-	d.Headers = header
-	d.HeaderTime = time.Now().Unix()
-	d.headerMu.Unlock()
-}
-
-func (d *OnedriveSharelink) headersExpired() bool {
-	d.headerMu.RLock()
-	defer d.headerMu.RUnlock()
-	return time.Since(time.Unix(d.HeaderTime, 0)) > headerTTL
-}
-
-func (d *OnedriveSharelink) refreshHeaders(ctx context.Context) (http.Header, error) {
-	header, err, _ := d.sg.Do("refresh", func() (http.Header, error) {
-		h, e := d.getHeaders(ctx)
-		if e != nil {
-			return nil, e
-		}
-		d.storeHeaders(h)
-		return h, nil
-	})
-	return header, err
-}
-
-func (d *OnedriveSharelink) getValidHeaders(ctx context.Context) (http.Header, error) {
-	if h := d.headerSnapshot(); h != nil && !d.headersExpired() {
-		return h, nil
-	}
-	h, err := d.refreshHeaders(ctx)
-	if err != nil {
-		if h2 := d.headerSnapshot(); h2 != nil {
-			log.Warnf("onedrive_sharelink: use cached headers after refresh failure: %+v", err)
-			return h2, nil
-		}
-		return nil, err
-	}
-	return h, nil
-}

drivers/openlist/driver.go

@@ -110,29 +110,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"] = 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
@@ -360,21 +350,13 @@ func (d *OpenList) ArchiveDecompress(ctx context.Context, srcObj, dstDir model.O
 			Name:          []string{name},
 			PutIntoNewDir: args.PutIntoNewDir,
 			SrcDir:        dir,
-			Overwrite:     args.Overwrite,
 		})
 	})
 	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/openlist/types.go

@@ -167,5 +167,4 @@ type DecompressReq struct {
 	Name          []string `json:"name"`
 	PutIntoNewDir bool     `json:"put_into_new_dir"`
 	SrcDir        string   `json:"src_dir"`
-	Overwrite     bool     `json:"overwrite"`
 }

drivers/proton_drive/driver.go

@@ -1,288 +0,0 @@
-package protondrive
-
-/*
-Package protondrive
-Author: Da3zKi7<da3zki7@duck.com>
-Date: 2025-09-18
-
-Thanks to @henrybear327 for modded go-proton-api & Proton-API-Bridge
-
-The power of open-source, the force of teamwork and the magic of reverse engineering!
-
-
-D@' 3z K!7 - The King Of Cracking
-
-Да здравствует Родина))
-*/
-
-import (
-	"context"
-	"fmt"
-	"io"
-	"time"
-
-	"github.com/OpenListTeam/OpenList/v4/internal/conf"
-	"github.com/OpenListTeam/OpenList/v4/internal/driver"
-	"github.com/OpenListTeam/OpenList/v4/internal/model"
-	"github.com/OpenListTeam/OpenList/v4/internal/op"
-	"github.com/OpenListTeam/OpenList/v4/internal/setting"
-	"github.com/OpenListTeam/OpenList/v4/internal/stream"
-	"github.com/OpenListTeam/OpenList/v4/pkg/http_range"
-	"github.com/OpenListTeam/OpenList/v4/pkg/utils"
-	"github.com/ProtonMail/gopenpgp/v2/crypto"
-	proton_api_bridge "github.com/henrybear327/Proton-API-Bridge"
-	"github.com/henrybear327/Proton-API-Bridge/common"
-	"github.com/henrybear327/go-proton-api"
-)
-
-type ProtonDrive struct {
-	model.Storage
-	Addition
-
-	protonDrive *proton_api_bridge.ProtonDrive
-
-	apiBase    string
-	appVersion string
-	protonJson string
-	userAgent  string
-	sdkVersion string
-	webDriveAV string
-
-	c *proton.Client
-
-	// userKR   *crypto.KeyRing
-	addrKRs  map[string]*crypto.KeyRing
-	addrData map[string]proton.Address
-
-	MainShare *proton.Share
-
-	DefaultAddrKR *crypto.KeyRing
-	MainShareKR   *crypto.KeyRing
-}
-
-func (d *ProtonDrive) Config() driver.Config {
-	return config
-}
-
-func (d *ProtonDrive) GetAddition() driver.Additional {
-	return &d.Addition
-}
-
-func (d *ProtonDrive) Init(ctx context.Context) (err error) {
-	defer func() {
-		if r := recover(); err == nil && r != nil {
-			err = fmt.Errorf("ProtonDrive initialization panic: %v", r)
-		}
-	}()
-
-	if d.Email == "" {
-		return fmt.Errorf("email is required")
-	}
-	if d.Password == "" {
-		return fmt.Errorf("password is required")
-	}
-
-	config := &common.Config{
-		AppVersion: d.appVersion,
-		UserAgent:  d.userAgent,
-		FirstLoginCredential: &common.FirstLoginCredentialData{
-			Username: d.Email,
-			Password: d.Password,
-			TwoFA:    d.TwoFACode,
-		},
-		EnableCaching:              true,
-		ConcurrentBlockUploadCount: setting.GetInt(conf.TaskUploadThreadsNum, conf.Conf.Tasks.Upload.Workers),
-		//ConcurrentFileCryptoCount:  2,
-		UseReusableLogin:     d.UseReusableLogin && d.ReusableCredential != (common.ReusableCredentialData{}),
-		ReplaceExistingDraft: true,
-		ReusableCredential:   &d.ReusableCredential,
-	}
-
-	protonDrive, _, err := proton_api_bridge.NewProtonDrive(
-		ctx,
-		config,
-		d.authHandler,
-		func() {},
-	)
-
-	if err != nil && config.UseReusableLogin {
-		config.UseReusableLogin = false
-		protonDrive, _, err = proton_api_bridge.NewProtonDrive(ctx,
-			config,
-			d.authHandler,
-			func() {},
-		)
-		if err == nil {
-			op.MustSaveDriverStorage(d)
-		}
-	}
-
-	if err != nil {
-		return fmt.Errorf("failed to initialize ProtonDrive: %w", err)
-	}
-
-	if err := d.initClient(ctx); err != nil {
-		return err
-	}
-
-	d.protonDrive = protonDrive
-	d.MainShare = protonDrive.MainShare
-	if d.RootFolderID == "root" || d.RootFolderID == "" {
-		d.RootFolderID = protonDrive.RootLink.LinkID
-	}
-	d.MainShareKR = protonDrive.MainShareKR
-	d.DefaultAddrKR = protonDrive.DefaultAddrKR
-
-	return nil
-}
-
-func (d *ProtonDrive) Drop(ctx context.Context) error {
-	return nil
-}
-
-func (d *ProtonDrive) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([]model.Obj, error) {
-	entries, err := d.protonDrive.ListDirectory(ctx, dir.GetID())
-	if err != nil {
-		return nil, fmt.Errorf("failed to list directory: %w", err)
-	}
-
-	objects := make([]model.Obj, 0, len(entries))
-	for _, entry := range entries {
-		obj := &model.Object{
-			ID:       entry.Link.LinkID,
-			Name:     entry.Name,
-			Size:     entry.Link.Size,
-			Modified: time.Unix(entry.Link.ModifyTime, 0),
-			IsFolder: entry.IsFolder,
-		}
-		objects = append(objects, obj)
-	}
-
-	return objects, nil
-}
-
-func (d *ProtonDrive) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
-	link, err := d.getLink(ctx, file.GetID())
-	if err != nil {
-		return nil, fmt.Errorf("failed get file link: %+v", err)
-	}
-	fileSystemAttrs, err := d.protonDrive.GetActiveRevisionAttrs(ctx, link)
-	if err != nil {
-		return nil, fmt.Errorf("failed get file revision: %+v", err)
-	}
-	// 解密后的文件大小
-	size := fileSystemAttrs.Size
-
-	rangeReaderFunc := func(rangeCtx context.Context, httpRange http_range.Range) (io.ReadCloser, error) {
-		length := httpRange.Length
-		if length < 0 || httpRange.Start+length > size {
-			length = size - httpRange.Start
-		}
-		reader, _, _, err := d.protonDrive.DownloadFile(rangeCtx, link, httpRange.Start)
-		if err != nil {
-			return nil, fmt.Errorf("failed start download: %+v", err)
-		}
-		return utils.ReadCloser{
-			Reader: io.LimitReader(reader, length),
-			Closer: reader,
-		}, nil
-	}
-
-	expiration := time.Minute
-	return &model.Link{
-		RangeReader:   stream.RateLimitRangeReaderFunc(rangeReaderFunc),
-		ContentLength: size,
-		Expiration:    &expiration,
-	}, nil
-}
-
-func (d *ProtonDrive) MakeDir(ctx context.Context, parentDir model.Obj, dirName string) (model.Obj, error) {
-	id, err := d.protonDrive.CreateNewFolderByID(ctx, parentDir.GetID(), dirName)
-	if err != nil {
-		return nil, fmt.Errorf("failed to create directory: %w", err)
-	}
-
-	newDir := &model.Object{
-		ID:       id,
-		Name:     dirName,
-		IsFolder: true,
-		Modified: time.Now(),
-	}
-	return newDir, nil
-}
-
-func (d *ProtonDrive) Move(ctx context.Context, srcObj, dstDir model.Obj) (model.Obj, error) {
-	return d.DirectMove(ctx, srcObj, dstDir)
-}
-
-func (d *ProtonDrive) Rename(ctx context.Context, srcObj model.Obj, newName string) (model.Obj, error) {
-	if d.protonDrive == nil {
-		return nil, fmt.Errorf("protonDrive bridge is nil")
-	}
-
-	return d.DirectRename(ctx, srcObj, newName)
-}
-
-func (d *ProtonDrive) Copy(ctx context.Context, srcObj, dstDir model.Obj) (model.Obj, error) {
-	if srcObj.IsDir() {
-		return nil, fmt.Errorf("directory copy not supported")
-	}
-
-	srcLink, err := d.getLink(ctx, srcObj.GetID())
-	if err != nil {
-		return nil, err
-	}
-
-	reader, linkSize, fileSystemAttrs, err := d.protonDrive.DownloadFile(ctx, srcLink, 0)
-	if err != nil {
-		return nil, fmt.Errorf("failed to download source file: %w", err)
-	}
-	defer reader.Close()
-
-	actualSize := linkSize
-	if fileSystemAttrs != nil && fileSystemAttrs.Size > 0 {
-		actualSize = fileSystemAttrs.Size
-	}
-
-	file := &stream.FileStream{
-		Ctx: ctx,
-		Obj: &model.Object{
-			Name: srcObj.GetName(),
-			// Use the accurate and real size
-			Size:     actualSize,
-			Modified: srcObj.ModTime(),
-		},
-		Reader: reader,
-	}
-	defer file.Close()
-	return d.Put(ctx, dstDir, file, func(percentage float64) {})
-}
-
-func (d *ProtonDrive) Remove(ctx context.Context, obj model.Obj) error {
-	if obj.IsDir() {
-		return d.protonDrive.MoveFolderToTrashByID(ctx, obj.GetID(), false)
-	} else {
-		return d.protonDrive.MoveFileToTrashByID(ctx, obj.GetID())
-	}
-}
-
-func (d *ProtonDrive) Put(ctx context.Context, dstDir model.Obj, file model.FileStreamer, up driver.UpdateProgress) (model.Obj, error) {
-	return d.uploadFile(ctx, dstDir.GetID(), file, up)
-}
-
-func (d *ProtonDrive) GetDetails(ctx context.Context) (*model.StorageDetails, error) {
-	about, err := d.protonDrive.About(ctx)
-	if err != nil {
-		return nil, err
-	}
-	total := uint64(about.MaxSpace)
-	free := total - uint64(about.UsedSpace)
-	return &model.StorageDetails{
-		DiskUsage: model.DiskUsage{
-			TotalSpace: total,
-			FreeSpace:  free,
-		},
-	}, nil
-}
-
-var _ driver.Driver = (*ProtonDrive)(nil)

drivers/proton_drive/meta.go

@@ -1,56 +0,0 @@
-package protondrive
-
-/*
-Package protondrive
-Author: Da3zKi7<da3zki7@duck.com>
-Date: 2025-09-18
-
-Thanks to @henrybear327 for modded go-proton-api & Proton-API-Bridge
-
-The power of open-source, the force of teamwork and the magic of reverse engineering!
-
-
-D@' 3z K!7 - The King Of Cracking
-
-Да здравствует Родина))
-*/
-
-import (
-	"github.com/OpenListTeam/OpenList/v4/internal/driver"
-	"github.com/OpenListTeam/OpenList/v4/internal/op"
-	"github.com/henrybear327/Proton-API-Bridge/common"
-)
-
-type Addition struct {
-	driver.RootID
-	Email              string `json:"email" required:"true" type:"string"`
-	Password           string `json:"password" required:"true" type:"string"`
-	TwoFACode          string `json:"two_fa_code" type:"string"`
-	ChunkSize          int64  `json:"chunk_size" type:"number" default:"100"`
-	UseReusableLogin   bool   `json:"use_reusable_login" type:"bool" default:"true" help:"Use reusable login credentials instead of username/password"`
-	ReusableCredential common.ReusableCredentialData
-}
-
-var config = driver.Config{
-	Name:        "ProtonDrive",
-	LocalSort:   true,
-	OnlyProxy:   true,
-	DefaultRoot: "root",
-	NoLinkURL:   true,
-}
-
-func init() {
-	op.RegisterDriver(func() driver.Driver {
-		return &ProtonDrive{
-			Addition: Addition{
-				UseReusableLogin: true,
-			},
-			apiBase:    "https://drive.proton.me/api",
-			appVersion: "windows-drive@1.11.3+rclone+proton",
-			protonJson: "application/vnd.protonmail.v1+json",
-			sdkVersion: "js@0.3.0",
-			userAgent:  "ProtonDrive/v1.70.0 (Windows NT 10.0.22000; Win64; x64)",
-			webDriveAV: "web-drive@5.2.0+0f69f7a8",
-		}
-	})
-}

drivers/proton_drive/types.go

@@ -1,38 +0,0 @@
-package protondrive
-
-/*
-Package protondrive
-Author: Da3zKi7<da3zki7@duck.com>
-Date: 2025-09-18
-
-Thanks to @henrybear327 for modded go-proton-api & Proton-API-Bridge
-
-The power of open-source, the force of teamwork and the magic of reverse engineering!
-
-
-D@' 3z K!7 - The King Of Cracking
-
-Да здравствует Родина))
-*/
-
-type MoveRequest struct {
-	ParentLinkID            string  `json:"ParentLinkID"`
-	NodePassphrase          string  `json:"NodePassphrase"`
-	NodePassphraseSignature *string `json:"NodePassphraseSignature"`
-	Name                    string  `json:"Name"`
-	NameSignatureEmail      string  `json:"NameSignatureEmail"`
-	Hash                    string  `json:"Hash"`
-	OriginalHash            string  `json:"OriginalHash"`
-	ContentHash             *string `json:"ContentHash"` // Maybe null
-}
-
-type RenameRequest struct {
-	Name               string `json:"Name"`               // PGP encrypted name
-	NameSignatureEmail string `json:"NameSignatureEmail"` // User's signature email
-	Hash               string `json:"Hash"`               // New name hash
-	OriginalHash       string `json:"OriginalHash"`       // Current name hash
-}
-
-type RenameResponse struct {
-	Code int `json:"Code"`
-}

drivers/proton_drive/util.go

@@ -1,670 +0,0 @@
-package protondrive
-
-/*
-Package protondrive
-Author: Da3zKi7<da3zki7@duck.com>
-Date: 2025-09-18
-
-Thanks to @henrybear327 for modded go-proton-api & Proton-API-Bridge
-
-The power of open-source, the force of teamwork and the magic of reverse engineering!
-
-
-D@' 3z K!7 - The King Of Cracking
-
-Да здравствует Родина))
-*/
-
-import (
-	"bufio"
-	"bytes"
-	"context"
-	"encoding/base64"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"io"
-	"net/http"
-
-	"github.com/OpenListTeam/OpenList/v4/internal/driver"
-	"github.com/OpenListTeam/OpenList/v4/internal/model"
-	"github.com/OpenListTeam/OpenList/v4/internal/op"
-	"github.com/OpenListTeam/OpenList/v4/internal/stream"
-	"github.com/ProtonMail/gopenpgp/v2/crypto"
-	"github.com/henrybear327/go-proton-api"
-)
-
-func (d *ProtonDrive) uploadFile(ctx context.Context, parentLinkID string, file model.FileStreamer, up driver.UpdateProgress) (model.Obj, error) {
-	_, err := d.getLink(ctx, parentLinkID)
-	if err != nil {
-		return nil, fmt.Errorf("failed to get parent link: %w", err)
-	}
-
-	var reader io.Reader
-	// Use buffered reader with larger buffer for better performance
-	var bufferSize int
-
-	// File > 100MB (default)
-	if file.GetSize() > d.ChunkSize*1024*1024 {
-		// 256KB for large files
-		bufferSize = 256 * 1024
-		// File > 10MB
-	} else if file.GetSize() > 10*1024*1024 {
-		// 128KB for medium files
-		bufferSize = 128 * 1024
-	} else {
-		// 64KB for small files
-		bufferSize = 64 * 1024
-	}
-
-	// reader = bufio.NewReader(file)
-	reader = bufio.NewReaderSize(file, bufferSize)
-	reader = &driver.ReaderUpdatingProgress{
-		Reader: &stream.SimpleReaderWithSize{
-			Reader: reader,
-			Size:   file.GetSize(),
-		},
-		UpdateProgress: up,
-	}
-	reader = driver.NewLimitedUploadStream(ctx, reader)
-
-	id, _, err := d.protonDrive.UploadFileByReader(ctx, parentLinkID, file.GetName(), file.ModTime(), reader, 0)
-	if err != nil {
-		return nil, fmt.Errorf("failed to upload file: %w", err)
-	}
-
-	return &model.Object{
-		ID:       id,
-		Name:     file.GetName(),
-		Size:     file.GetSize(),
-		Modified: file.ModTime(),
-		IsFolder: false,
-	}, nil
-}
-
-func (d *ProtonDrive) encryptFileName(ctx context.Context, name string, parentLinkID string) (string, error) {
-	parentLink, err := d.getLink(ctx, parentLinkID)
-	if err != nil {
-		return "", fmt.Errorf("failed to get parent link: %w", err)
-	}
-
-	// Get parent node keyring
-	parentNodeKR, err := d.getLinkKR(ctx, parentLink)
-	if err != nil {
-		return "", fmt.Errorf("failed to get parent keyring: %w", err)
-	}
-
-	// Temporary file (request)
-	tempReq := proton.CreateFileReq{
-		SignatureAddress: d.MainShare.Creator,
-	}
-
-	// Encrypt the filename
-	err = tempReq.SetName(name, d.DefaultAddrKR, parentNodeKR)
-	if err != nil {
-		return "", fmt.Errorf("failed to encrypt filename: %w", err)
-	}
-
-	return tempReq.Name, nil
-}
-
-func (d *ProtonDrive) generateFileNameHash(ctx context.Context, name string, parentLinkID string) (string, error) {
-	parentLink, err := d.getLink(ctx, parentLinkID)
-	if err != nil {
-		return "", fmt.Errorf("failed to get parent link: %w", err)
-	}
-
-	// Get parent node keyring
-	parentNodeKR, err := d.getLinkKR(ctx, parentLink)
-	if err != nil {
-		return "", fmt.Errorf("failed to get parent keyring: %w", err)
-	}
-
-	signatureVerificationKR, err := d.getSignatureVerificationKeyring([]string{parentLink.SignatureEmail}, parentNodeKR)
-	if err != nil {
-		return "", fmt.Errorf("failed to get signature verification keyring: %w", err)
-	}
-
-	parentHashKey, err := parentLink.GetHashKey(parentNodeKR, signatureVerificationKR)
-	if err != nil {
-		return "", fmt.Errorf("failed to get parent hash key: %w", err)
-	}
-
-	nameHash, err := proton.GetNameHash(name, parentHashKey)
-	if err != nil {
-		return "", fmt.Errorf("failed to generate name hash: %w", err)
-	}
-
-	return nameHash, nil
-}
-
-func (d *ProtonDrive) getOriginalNameHash(link *proton.Link) (string, error) {
-	if link == nil {
-		return "", fmt.Errorf("link cannot be nil")
-	}
-
-	if link.Hash == "" {
-		return "", fmt.Errorf("link hash is empty")
-	}
-
-	return link.Hash, nil
-}
-
-func (d *ProtonDrive) getLink(ctx context.Context, linkID string) (*proton.Link, error) {
-	if linkID == "" {
-		return nil, fmt.Errorf("linkID cannot be empty")
-	}
-
-	link, err := d.c.GetLink(ctx, d.MainShare.ShareID, linkID)
-	if err != nil {
-		return nil, err
-	}
-
-	return &link, nil
-}
-
-func (d *ProtonDrive) getLinkKR(ctx context.Context, link *proton.Link) (*crypto.KeyRing, error) {
-	if link == nil {
-		return nil, fmt.Errorf("link cannot be nil")
-	}
-
-	// Root Link or Root Dir
-	if link.ParentLinkID == "" {
-		signatureVerificationKR, err := d.getSignatureVerificationKeyring([]string{link.SignatureEmail})
-		if err != nil {
-			return nil, err
-		}
-		return link.GetKeyRing(d.MainShareKR, signatureVerificationKR)
-	}
-
-	// Get parent keyring recursively
-	parentLink, err := d.getLink(ctx, link.ParentLinkID)
-	if err != nil {
-		return nil, err
-	}
-
-	parentNodeKR, err := d.getLinkKR(ctx, parentLink)
-	if err != nil {
-		return nil, err
-	}
-
-	signatureVerificationKR, err := d.getSignatureVerificationKeyring([]string{link.SignatureEmail})
-	if err != nil {
-		return nil, err
-	}
-
-	return link.GetKeyRing(parentNodeKR, signatureVerificationKR)
-}
-
-var (
-	ErrKeyPassOrSaltedKeyPassMustBeNotNil = errors.New("either keyPass or saltedKeyPass must be not nil")
-	ErrFailedToUnlockUserKeys             = errors.New("failed to unlock user keys")
-)
-
-func getAccountKRs(ctx context.Context, c *proton.Client, keyPass, saltedKeyPass []byte) (*crypto.KeyRing, map[string]*crypto.KeyRing, map[string]proton.Address, []byte, error) {
-	user, err := c.GetUser(ctx)
-	if err != nil {
-		return nil, nil, nil, nil, err
-	}
-	// fmt.Printf("user %#v", user)
-
-	addrsArr, err := c.GetAddresses(ctx)
-	if err != nil {
-		return nil, nil, nil, nil, err
-	}
-	// fmt.Printf("addr %#v", addr)
-
-	if saltedKeyPass == nil {
-		if keyPass == nil {
-			return nil, nil, nil, nil, ErrKeyPassOrSaltedKeyPassMustBeNotNil
-		}
-
-		// Due to limitations, salts are stored using cacheCredentialToFile
-		salts, err := c.GetSalts(ctx)
-		if err != nil {
-			return nil, nil, nil, nil, err
-		}
-		// fmt.Printf("salts %#v", salts)
-
-		saltedKeyPass, err = salts.SaltForKey(keyPass, user.Keys.Primary().ID)
-		if err != nil {
-			return nil, nil, nil, nil, err
-		}
-		// fmt.Printf("saltedKeyPass ok")
-	}
-
-	userKR, addrKRs, err := proton.Unlock(user, addrsArr, saltedKeyPass, nil)
-	if err != nil {
-		return nil, nil, nil, nil, err
-	} else if userKR.CountDecryptionEntities() == 0 {
-		return nil, nil, nil, nil, ErrFailedToUnlockUserKeys
-	}
-
-	addrs := make(map[string]proton.Address)
-	for _, addr := range addrsArr {
-		addrs[addr.Email] = addr
-	}
-
-	return userKR, addrKRs, addrs, saltedKeyPass, nil
-}
-
-func (d *ProtonDrive) getSignatureVerificationKeyring(emailAddresses []string, verificationAddrKRs ...*crypto.KeyRing) (*crypto.KeyRing, error) {
-	ret, err := crypto.NewKeyRing(nil)
-	if err != nil {
-		return nil, err
-	}
-
-	for _, emailAddress := range emailAddresses {
-		if addr, ok := d.addrData[emailAddress]; ok {
-			if addrKR, exists := d.addrKRs[addr.ID]; exists {
-				err = d.addKeysFromKR(ret, addrKR)
-				if err != nil {
-					return nil, err
-				}
-			}
-		}
-	}
-
-	for _, kr := range verificationAddrKRs {
-		err = d.addKeysFromKR(ret, kr)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	if ret.CountEntities() == 0 {
-		return nil, fmt.Errorf("no keyring for signature verification")
-	}
-
-	return ret, nil
-}
-
-func (d *ProtonDrive) addKeysFromKR(kr *crypto.KeyRing, newKRs ...*crypto.KeyRing) error {
-	for i := range newKRs {
-		for _, key := range newKRs[i].GetKeys() {
-			err := kr.AddKey(key)
-			if err != nil {
-				return err
-			}
-		}
-	}
-	return nil
-}
-
-func (d *ProtonDrive) DirectRename(ctx context.Context, srcObj model.Obj, newName string) (model.Obj, error) {
-	// fmt.Printf("DEBUG DirectRename: path=%s, newName=%s", srcObj.GetPath(), newName)
-
-	if d.MainShare == nil || d.DefaultAddrKR == nil {
-		return nil, fmt.Errorf("missing required fields: MainShare=%v, DefaultAddrKR=%v",
-			d.MainShare != nil, d.DefaultAddrKR != nil)
-	}
-
-	if d.protonDrive == nil {
-		return nil, fmt.Errorf("protonDrive bridge is nil")
-	}
-
-	srcLink, err := d.getLink(ctx, srcObj.GetID())
-	if err != nil {
-		return nil, fmt.Errorf("failed to find source: %w", err)
-	}
-
-	parentLinkID := srcLink.ParentLinkID
-	if parentLinkID == "" {
-		return nil, fmt.Errorf("cannot rename root folder")
-	}
-
-	encryptedName, err := d.encryptFileName(ctx, newName, parentLinkID)
-	if err != nil {
-		return nil, fmt.Errorf("failed to encrypt filename: %w", err)
-	}
-
-	newHash, err := d.generateFileNameHash(ctx, newName, parentLinkID)
-	if err != nil {
-		return nil, fmt.Errorf("failed to generate new hash: %w", err)
-	}
-
-	originalHash, err := d.getOriginalNameHash(srcLink)
-	if err != nil {
-		return nil, fmt.Errorf("failed to get original hash: %w", err)
-	}
-
-	renameReq := RenameRequest{
-		Name:               encryptedName,
-		NameSignatureEmail: d.MainShare.Creator,
-		Hash:               newHash,
-		OriginalHash:       originalHash,
-	}
-
-	err = d.executeRenameAPI(ctx, srcLink.LinkID, renameReq)
-	if err != nil {
-		return nil, fmt.Errorf("rename API call failed: %w", err)
-	}
-
-	return &model.Object{
-		ID:       srcLink.LinkID,
-		Name:     newName,
-		Size:     srcObj.GetSize(),
-		Modified: srcObj.ModTime(),
-		IsFolder: srcObj.IsDir(),
-	}, nil
-}
-
-func (d *ProtonDrive) executeRenameAPI(ctx context.Context, linkID string, req RenameRequest) error {
-	renameURL := fmt.Sprintf(d.apiBase+"/drive/v2/volumes/%s/links/%s/rename",
-		d.MainShare.VolumeID, linkID)
-
-	reqBody, err := json.Marshal(req)
-	if err != nil {
-		return fmt.Errorf("failed to marshal rename request: %w", err)
-	}
-
-	httpReq, err := http.NewRequestWithContext(ctx, "PUT", renameURL, bytes.NewReader(reqBody))
-	if err != nil {
-		return fmt.Errorf("failed to create HTTP request: %w", err)
-	}
-
-	httpReq.Header.Set("Content-Type", "application/json")
-	httpReq.Header.Set("Accept", d.protonJson)
-	httpReq.Header.Set("X-Pm-Appversion", d.webDriveAV)
-	httpReq.Header.Set("X-Pm-Drive-Sdk-Version", d.sdkVersion)
-	httpReq.Header.Set("X-Pm-Uid", d.ReusableCredential.UID)
-	httpReq.Header.Set("Authorization", "Bearer "+d.ReusableCredential.AccessToken)
-
-	client := &http.Client{}
-	resp, err := client.Do(httpReq)
-	if err != nil {
-		return fmt.Errorf("failed to execute rename request: %w", err)
-	}
-	defer resp.Body.Close()
-
-	if resp.StatusCode != http.StatusOK {
-		return fmt.Errorf("rename failed with status %d", resp.StatusCode)
-	}
-
-	var renameResp RenameResponse
-	if err := json.NewDecoder(resp.Body).Decode(&renameResp); err != nil {
-		return fmt.Errorf("failed to decode rename response: %w", err)
-	}
-
-	if renameResp.Code != 1000 {
-		return fmt.Errorf("rename failed with code %d", renameResp.Code)
-	}
-
-	return nil
-}
-
-func (d *ProtonDrive) executeMoveAPI(ctx context.Context, linkID string, req MoveRequest) error {
-	// fmt.Printf("DEBUG Move Request - Name: %s\n", req.Name)
-	// fmt.Printf("DEBUG Move Request - Hash: %s\n", req.Hash)
-	// fmt.Printf("DEBUG Move Request - OriginalHash: %s\n", req.OriginalHash)
-	// fmt.Printf("DEBUG Move Request - ParentLinkID: %s\n", req.ParentLinkID)
-
-	// fmt.Printf("DEBUG Move Request - Name length: %d\n", len(req.Name))
-	// fmt.Printf("DEBUG Move Request - NameSignatureEmail: %s\n", req.NameSignatureEmail)
-	// fmt.Printf("DEBUG Move Request - ContentHash: %v\n", req.ContentHash)
-	// fmt.Printf("DEBUG Move Request - NodePassphrase length: %d\n", len(req.NodePassphrase))
-	// fmt.Printf("DEBUG Move Request - NodePassphraseSignature length: %d\n", len(req.NodePassphraseSignature))
-
-	// fmt.Printf("DEBUG Move Request - SrcLinkID: %s\n", linkID)
-	// fmt.Printf("DEBUG Move Request - DstParentLinkID: %s\n", req.ParentLinkID)
-	// fmt.Printf("DEBUG Move Request - ShareID: %s\n", d.MainShare.ShareID)
-
-	srcLink, _ := d.getLink(ctx, linkID)
-	if srcLink != nil && srcLink.ParentLinkID == req.ParentLinkID {
-		return fmt.Errorf("cannot move to same parent directory")
-	}
-
-	moveURL := fmt.Sprintf(d.apiBase+"/drive/v2/volumes/%s/links/%s/move",
-		d.MainShare.VolumeID, linkID)
-
-	reqBody, err := json.Marshal(req)
-	if err != nil {
-		return fmt.Errorf("failed to marshal move request: %w", err)
-	}
-
-	httpReq, err := http.NewRequestWithContext(ctx, "PUT", moveURL, bytes.NewReader(reqBody))
-	if err != nil {
-		return fmt.Errorf("failed to create HTTP request: %w", err)
-	}
-
-	httpReq.Header.Set("Authorization", "Bearer "+d.ReusableCredential.AccessToken)
-	httpReq.Header.Set("Accept", d.protonJson)
-	httpReq.Header.Set("X-Pm-Appversion", d.webDriveAV)
-	httpReq.Header.Set("X-Pm-Drive-Sdk-Version", d.sdkVersion)
-	httpReq.Header.Set("X-Pm-Uid", d.ReusableCredential.UID)
-	httpReq.Header.Set("Content-Type", "application/json")
-
-	client := &http.Client{}
-	resp, err := client.Do(httpReq)
-	if err != nil {
-		return fmt.Errorf("failed to execute move request: %w", err)
-	}
-	defer resp.Body.Close()
-
-	var moveResp RenameResponse
-	if err := json.NewDecoder(resp.Body).Decode(&moveResp); err != nil {
-		return fmt.Errorf("failed to decode move response: %w", err)
-	}
-
-	if moveResp.Code != 1000 {
-		return fmt.Errorf("move operation failed with code: %d", moveResp.Code)
-	}
-
-	return nil
-}
-
-func (d *ProtonDrive) DirectMove(ctx context.Context, srcObj model.Obj, dstDir model.Obj) (model.Obj, error) {
-	// fmt.Printf("DEBUG DirectMove: srcPath=%s, dstPath=%s", srcObj.GetPath(), dstDir.GetPath())
-
-	srcLink, err := d.getLink(ctx, srcObj.GetID())
-	if err != nil {
-		return nil, fmt.Errorf("failed to find source: %w", err)
-	}
-
-	dstParentLinkID := dstDir.GetID()
-
-	if srcObj.IsDir() {
-		// Check if destination is a descendant of source
-		if err := d.checkCircularMove(ctx, srcLink.LinkID, dstParentLinkID); err != nil {
-			return nil, err
-		}
-	}
-
-	// Encrypt the filename for the new location
-	encryptedName, err := d.encryptFileName(ctx, srcObj.GetName(), dstParentLinkID)
-	if err != nil {
-		return nil, fmt.Errorf("failed to encrypt filename: %w", err)
-	}
-
-	newHash, err := d.generateNameHash(ctx, srcObj.GetName(), dstParentLinkID)
-	if err != nil {
-		return nil, fmt.Errorf("failed to generate new hash: %w", err)
-	}
-
-	originalHash, err := d.getOriginalNameHash(srcLink)
-	if err != nil {
-		return nil, fmt.Errorf("failed to get original hash: %w", err)
-	}
-
-	// Re-encrypt node passphrase for new parent context
-	reencryptedPassphrase, err := d.reencryptNodePassphrase(ctx, srcLink, dstParentLinkID)
-	if err != nil {
-		return nil, fmt.Errorf("failed to re-encrypt node passphrase: %w", err)
-	}
-
-	moveReq := MoveRequest{
-		ParentLinkID:       dstParentLinkID,
-		NodePassphrase:     reencryptedPassphrase,
-		Name:               encryptedName,
-		NameSignatureEmail: d.MainShare.Creator,
-		Hash:               newHash,
-		OriginalHash:       originalHash,
-		ContentHash:        nil,
-
-		// *** Causes rejection ***
-		/* NodePassphraseSignature: srcLink.NodePassphraseSignature, */
-	}
-
-	//fmt.Printf("DEBUG MoveRequest validation:\n")
-	//fmt.Printf("  Name length: %d\n", len(moveReq.Name))
-	//fmt.Printf("  Hash: %s\n", moveReq.Hash)
-	//fmt.Printf("  OriginalHash: %s\n", moveReq.OriginalHash)
-	//fmt.Printf("  NodePassphrase length: %d\n", len(moveReq.NodePassphrase))
-	/* fmt.Printf("  NodePassphraseSignature length: %d\n", len(moveReq.NodePassphraseSignature)) */
-	//fmt.Printf("  NameSignatureEmail: %s\n", moveReq.NameSignatureEmail)
-
-	err = d.executeMoveAPI(ctx, srcLink.LinkID, moveReq)
-	if err != nil {
-		return nil, fmt.Errorf("move API call failed: %w", err)
-	}
-
-	return &model.Object{
-		ID:       srcLink.LinkID,
-		Name:     srcObj.GetName(),
-		Size:     srcObj.GetSize(),
-		Modified: srcObj.ModTime(),
-		IsFolder: srcObj.IsDir(),
-	}, nil
-}
-
-func (d *ProtonDrive) reencryptNodePassphrase(ctx context.Context, srcLink *proton.Link, dstParentLinkID string) (string, error) {
-	// Get source parent link with metadata
-	srcParentLink, err := d.getLink(ctx, srcLink.ParentLinkID)
-	if err != nil {
-		return "", fmt.Errorf("failed to get source parent link: %w", err)
-	}
-
-	// Get source parent keyring using link object
-	srcParentKR, err := d.getLinkKR(ctx, srcParentLink)
-	if err != nil {
-		return "", fmt.Errorf("failed to get source parent keyring: %w", err)
-	}
-
-	// Get destination parent link with metadata
-	dstParentLink, err := d.getLink(ctx, dstParentLinkID)
-	if err != nil {
-		return "", fmt.Errorf("failed to get destination parent link: %w", err)
-	}
-
-	// Get destination parent keyring using link object
-	dstParentKR, err := d.getLinkKR(ctx, dstParentLink)
-	if err != nil {
-		return "", fmt.Errorf("failed to get destination parent keyring: %w", err)
-	}
-
-	// Re-encrypt the node passphrase from source parent context to destination parent context
-	reencryptedPassphrase, err := reencryptKeyPacket(srcParentKR, dstParentKR, d.DefaultAddrKR, srcLink.NodePassphrase)
-	if err != nil {
-		return "", fmt.Errorf("failed to re-encrypt key packet: %w", err)
-	}
-
-	return reencryptedPassphrase, nil
-}
-
-func (d *ProtonDrive) generateNameHash(ctx context.Context, name string, parentLinkID string) (string, error) {
-	parentLink, err := d.getLink(ctx, parentLinkID)
-	if err != nil {
-		return "", fmt.Errorf("failed to get parent link: %w", err)
-	}
-
-	// Get parent node keyring
-	parentNodeKR, err := d.getLinkKR(ctx, parentLink)
-	if err != nil {
-		return "", fmt.Errorf("failed to get parent keyring: %w", err)
-	}
-
-	// Get signature verification keyring
-	signatureVerificationKR, err := d.getSignatureVerificationKeyring([]string{parentLink.SignatureEmail}, parentNodeKR)
-	if err != nil {
-		return "", fmt.Errorf("failed to get signature verification keyring: %w", err)
-	}
-
-	parentHashKey, err := parentLink.GetHashKey(parentNodeKR, signatureVerificationKR)
-	if err != nil {
-		return "", fmt.Errorf("failed to get parent hash key: %w", err)
-	}
-
-	nameHash, err := proton.GetNameHash(name, parentHashKey)
-	if err != nil {
-		return "", fmt.Errorf("failed to generate name hash: %w", err)
-	}
-
-	return nameHash, nil
-}
-
-func reencryptKeyPacket(srcKR, dstKR, _ *crypto.KeyRing, passphrase string) (string, error) { // addrKR (3)
-	oldSplitMessage, err := crypto.NewPGPSplitMessageFromArmored(passphrase)
-	if err != nil {
-		return "", err
-	}
-
-	sessionKey, err := srcKR.DecryptSessionKey(oldSplitMessage.KeyPacket)
-	if err != nil {
-		return "", err
-	}
-
-	newKeyPacket, err := dstKR.EncryptSessionKey(sessionKey)
-	if err != nil {
-		return "", err
-	}
-
-	newSplitMessage := crypto.NewPGPSplitMessage(newKeyPacket, oldSplitMessage.DataPacket)
-
-	return newSplitMessage.GetArmored()
-}
-
-func (d *ProtonDrive) checkCircularMove(ctx context.Context, srcLinkID, dstParentLinkID string) error {
-	currentLinkID := dstParentLinkID
-
-	for currentLinkID != "" && currentLinkID != d.RootFolderID {
-		if currentLinkID == srcLinkID {
-			return fmt.Errorf("cannot move folder into itself or its subfolder")
-		}
-
-		currentLink, err := d.getLink(ctx, currentLinkID)
-		if err != nil {
-			return err
-		}
-		currentLinkID = currentLink.ParentLinkID
-	}
-
-	return nil
-}
-
-func (d *ProtonDrive) authHandler(auth proton.Auth) {
-	if auth.AccessToken != d.ReusableCredential.AccessToken || auth.RefreshToken != d.ReusableCredential.RefreshToken {
-		d.ReusableCredential.UID = auth.UID
-		d.ReusableCredential.AccessToken = auth.AccessToken
-		d.ReusableCredential.RefreshToken = auth.RefreshToken
-
-		if err := d.initClient(context.Background()); err != nil {
-			fmt.Printf("ProtonDrive: failed to reinitialize client after auth refresh: %v\n", err)
-		}
-
-		op.MustSaveDriverStorage(d)
-	}
-}
-
-func (d *ProtonDrive) initClient(ctx context.Context) error {
-	clientOptions := []proton.Option{
-		proton.WithAppVersion(d.appVersion),
-		proton.WithUserAgent(d.userAgent),
-	}
-	manager := proton.New(clientOptions...)
-	d.c = manager.NewClient(d.ReusableCredential.UID, d.ReusableCredential.AccessToken, d.ReusableCredential.RefreshToken)
-
-	saltedKeyPassBytes, err := base64.StdEncoding.DecodeString(d.ReusableCredential.SaltedKeyPass)
-	if err != nil {
-		return fmt.Errorf("failed to decode salted key pass: %w", err)
-	}
-
-	_, addrKRs, addrs, _, err := getAccountKRs(ctx, d.c, nil, saltedKeyPassBytes)
-	if err != nil {
-		return fmt.Errorf("failed to get account keyrings: %w", err)
-	}
-
-	d.addrKRs = addrKRs
-	d.addrData = addrs
-
-	return nil
-}

drivers/quark_uc/driver.go

@@ -217,10 +217,11 @@ func (d *QuarkOrUC) GetDetails(ctx context.Context) (*model.StorageDetails, erro
 	if err != nil {
 		return nil, err
 	}
-	used := memberInfo.Data.UseCapacity
-	total := memberInfo.Data.TotalCapacity
 	return &model.StorageDetails{
-		DiskUsage: driver.DiskUsageFromUsedAndTotal(used, total),
+		DiskUsage: model.DiskUsage{
+			TotalSpace: memberInfo.Data.TotalCapacity,
+			FreeSpace:  memberInfo.Data.TotalCapacity - memberInfo.Data.UseCapacity,
+		},
 	}, nil
 }
 

drivers/s3/driver.go

@@ -10,7 +10,6 @@ import (
 	"time"
 
 	"github.com/OpenListTeam/OpenList/v4/internal/driver"
-	"github.com/OpenListTeam/OpenList/v4/internal/errs"
 	"github.com/OpenListTeam/OpenList/v4/internal/model"
 	"github.com/OpenListTeam/OpenList/v4/internal/stream"
 	"github.com/OpenListTeam/OpenList/v4/pkg/cron"
@@ -25,10 +24,9 @@ import (
 type S3 struct {
 	model.Storage
 	Addition
-	Session            *session.Session
-	client             *s3.S3
-	linkClient         *s3.S3
-	directUploadClient *s3.S3
+	Session    *session.Session
+	client     *s3.S3
+	linkClient *s3.S3
 
 	config driver.Config
 	cron   *cron.Cron
@@ -54,18 +52,16 @@ func (d *S3) Init(ctx context.Context) error {
 			if err != nil {
 				log.Errorln("Doge init session error:", err)
 			}
-			d.client = d.getClient(ClientTypeNormal)
-			d.linkClient = d.getClient(ClientTypeLink)
-			d.directUploadClient = d.getClient(ClientTypeDirectUpload)
+			d.client = d.getClient(false)
+			d.linkClient = d.getClient(true)
 		})
 	}
 	err := d.initSession()
 	if err != nil {
 		return err
 	}
-	d.client = d.getClient(ClientTypeNormal)
-	d.linkClient = d.getClient(ClientTypeLink)
-	d.directUploadClient = d.getClient(ClientTypeDirectUpload)
+	d.client = d.getClient(false)
+	d.linkClient = d.getClient(true)
 	return nil
 }
 
@@ -214,33 +210,4 @@ func (d *S3) Put(ctx context.Context, dstDir model.Obj, s model.FileStreamer, up
 	return err
 }
 
-func (d *S3) GetDirectUploadTools() []string {
-	if !d.EnableDirectUpload {
-		return nil
-	}
-	return []string{"HttpDirect"}
-}
-
-func (d *S3) GetDirectUploadInfo(ctx context.Context, _ string, dstDir model.Obj, fileName string, _ int64) (any, error) {
-	if !d.EnableDirectUpload {
-		return nil, errs.NotImplement
-	}
-	path := getKey(stdpath.Join(dstDir.GetPath(), fileName), false)
-	req, _ := d.directUploadClient.PutObjectRequest(&s3.PutObjectInput{
-		Bucket: &d.Bucket,
-		Key:    &path,
-	})
-	if req == nil {
-		return nil, fmt.Errorf("failed to create PutObject request")
-	}
-	link, err := req.Presign(time.Hour * time.Duration(d.SignURLExpire))
-	if err != nil {
-		return nil, err
-	}
-	return &model.HttpDirectUploadInfo{
-		UploadURL: link,
-		Method:    "PUT",
-	}, nil
-}
-
 var _ driver.Driver = (*S3)(nil)

drivers/s3/meta.go

@@ -21,8 +21,6 @@ type Addition struct {
 	ListObjectVersion        string `json:"list_object_version" type:"select" options:"v1,v2" default:"v1"`
 	RemoveBucket             bool   `json:"remove_bucket" help:"Remove bucket name from path when using custom host."`
 	AddFilenameToDisposition bool   `json:"add_filename_to_disposition" help:"Add filename to Content-Disposition header."`
-	EnableDirectUpload       bool   `json:"enable_direct_upload" default:"false"`
-	DirectUploadHost         string `json:"direct_upload_host" required:"false"`
 }
 
 func init() {

drivers/s3/util.go

@@ -41,15 +41,9 @@ func (d *S3) initSession() error {
 	return err
 }
 
-const (
-	ClientTypeNormal = iota
-	ClientTypeLink
-	ClientTypeDirectUpload
-)
-
-func (d *S3) getClient(clientType int) *s3.S3 {
+func (d *S3) getClient(link bool) *s3.S3 {
 	client := s3.New(d.Session)
-	if clientType == ClientTypeLink && d.CustomHost != "" {
+	if link && d.CustomHost != "" {
 		client.Handlers.Build.PushBack(func(r *request.Request) {
 			if r.HTTPRequest.Method != http.MethodGet {
 				return
@@ -64,20 +58,6 @@ func (d *S3) getClient(clientType int) *s3.S3 {
 			}
 		})
 	}
-	if clientType == ClientTypeDirectUpload && d.DirectUploadHost != "" {
-		client.Handlers.Build.PushBack(func(r *request.Request) {
-			if r.HTTPRequest.Method != http.MethodPut {
-				return
-			}
-			split := strings.SplitN(d.DirectUploadHost, "://", 2)
-			if utils.SliceContains([]string{"http", "https"}, split[0]) {
-				r.HTTPRequest.URL.Scheme = split[0]
-				r.HTTPRequest.URL.Host = split[1]
-			} else {
-				r.HTTPRequest.URL.Host = d.DirectUploadHost
-			}
-		})
-	}
 	return client
 }
 

drivers/sftp/driver.go

@@ -69,10 +69,15 @@ func (d *SFTP) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*
 		Limiter: stream.ServerDownloadLimit,
 		Ctx:     ctx,
 	}
+	if !d.Config().OnlyLinkMFile {
+		return &model.Link{
+			RangeReader: stream.GetRangeReaderFromMFile(file.GetSize(), mFile),
+			SyncClosers: utils.NewSyncClosers(remoteFile),
+		}, nil
+	}
 	return &model.Link{
-		RangeReader:      stream.GetRangeReaderFromMFile(file.GetSize(), mFile),
-		SyncClosers:      utils.NewSyncClosers(remoteFile),
-		RequireReference: true,
+		MFile:       mFile,
+		SyncClosers: utils.NewSyncClosers(remoteFile),
 	}, nil
 }
 

drivers/sftp/meta.go

@@ -16,12 +16,12 @@ type Addition struct {
 }
 
 var config = driver.Config{
-	Name:        "SFTP",
-	LocalSort:   true,
-	OnlyProxy:   true,
-	DefaultRoot: "/",
-	CheckStatus: true,
-	NoLinkURL:   true,
+	Name:          "SFTP",
+	LocalSort:     true,
+	OnlyLinkMFile: false,
+	DefaultRoot:   "/",
+	CheckStatus:   true,
+	NoLinkURL:     true,
 }
 
 func init() {

drivers/smb/driver.go

@@ -86,10 +86,15 @@ func (d *SMB) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*m
 		Limiter: stream.ServerDownloadLimit,
 		Ctx:     ctx,
 	}
+	if !d.Config().OnlyLinkMFile {
+		return &model.Link{
+			RangeReader: stream.GetRangeReaderFromMFile(file.GetSize(), mFile),
+			SyncClosers: utils.NewSyncClosers(remoteFile),
+		}, nil
+	}
 	return &model.Link{
-		RangeReader:      stream.GetRangeReaderFromMFile(file.GetSize(), mFile),
-		SyncClosers:      utils.NewSyncClosers(remoteFile),
-		RequireReference: true,
+		MFile:       mFile,
+		SyncClosers: utils.NewSyncClosers(remoteFile),
 	}, nil
 }
 

drivers/smb/meta.go

@@ -14,12 +14,12 @@ type Addition struct {
 }
 
 var config = driver.Config{
-	Name:        "SMB",
-	LocalSort:   true,
-	OnlyProxy:   true,
-	DefaultRoot: ".",
-	NoCache:     true,
-	NoLinkURL:   true,
+	Name:          "SMB",
+	LocalSort:     true,
+	OnlyLinkMFile: false,
+	DefaultRoot:   ".",
+	NoCache:       true,
+	NoLinkURL:     true,
 }
 
 func init() {

drivers/strm/driver.go

@@ -12,10 +12,8 @@ import (
 	"github.com/OpenListTeam/OpenList/v4/internal/fs"
 	"github.com/OpenListTeam/OpenList/v4/internal/model"
 	"github.com/OpenListTeam/OpenList/v4/internal/sign"
-	"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 +39,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,13 +47,6 @@ func (d *Strm) Init(ctx context.Context) error {
 		}
 		k, v := getPair(path)
 		d.pathMap[k] = append(d.pathMap[k], v)
-		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 {
 		for k := range d.pathMap {
@@ -70,52 +58,26 @@ func (d *Strm) Init(ctx context.Context) error {
 		d.autoFlatten = false
 	}
 
-	var supportTypes []string
-	if d.FilterFileTypes == "" {
-		d.FilterFileTypes = "mp4,mkv,flv,avi,wmv,ts,rmvb,webm,mp3,flac,aac,wav,ogg,m4a,wma,alac"
-	}
-	supportTypes = strings.Split(d.FilterFileTypes, ",")
-	d.supportSuffix = map[string]struct{}{}
-	for _, ext := range supportTypes {
-		ext = strings.ToLower(strings.TrimSpace(ext))
-		if ext != "" {
-			d.supportSuffix[ext] = struct{}{}
-		}
-	}
-
-	var downloadTypes []string
-	if d.DownloadFileTypes == "" {
-		d.DownloadFileTypes = "ass,srt,vtt,sub,strm"
-	}
-	downloadTypes = strings.Split(d.DownloadFileTypes, ",")
-	d.downloadSuffix = map[string]struct{}{}
-	for _, ext := range downloadTypes {
-		ext = strings.ToLower(strings.TrimSpace(ext))
-		if ext != "" {
-			d.downloadSuffix[ext] = struct{}{}
-		}
-	}
-
-	if d.Version != 5 {
-		types := strings.Split("mp4,mkv,flv,avi,wmv,ts,rmvb,webm,mp3,flac,aac,wav,ogg,m4a,wma,alac", ",")
+	d.supportSuffix = supportSuffix()
+	if d.FilterFileTypes != "" {
+		types := strings.Split(d.FilterFileTypes, ",")
 		for _, ext := range types {
-			if _, ok := d.supportSuffix[ext]; !ok {
+			ext = strings.ToLower(strings.TrimSpace(ext))
+			if ext != "" {
 				d.supportSuffix[ext] = struct{}{}
-				supportTypes = append(supportTypes, ext)
 			}
 		}
-		d.FilterFileTypes = strings.Join(supportTypes, ",")
+	}
 
-		types = strings.Split("ass,srt,vtt,sub,strm", ",")
-		for _, ext := range types {
-			if _, ok := d.downloadSuffix[ext]; !ok {
+	d.downloadSuffix = downloadSuffix()
+	if d.DownloadFileTypes != "" {
+		downloadTypes := strings.Split(d.DownloadFileTypes, ",")
+		for _, ext := range downloadTypes {
+			ext = strings.ToLower(strings.TrimSpace(ext))
+			if ext != "" {
 				d.downloadSuffix[ext] = struct{}{}
-				downloadTypes = append(downloadTypes, ext)
 			}
 		}
-		d.DownloadFileTypes = strings.Join(downloadTypes, ",")
-		d.PathPrefix = "/d"
-		d.Version = 5
 	}
 	return nil
 }
@@ -124,9 +86,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
 }
 
@@ -197,7 +156,7 @@ func (d *Strm) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*
 	if file.GetID() == "strm" {
 		link := d.getLink(ctx, file.GetPath())
 		return &model.Link{
-			RangeReader: stream.GetRangeReaderFromMFile(int64(len(link)), strings.NewReader(link)),
+			MFile: strings.NewReader(link),
 		}, nil
 	}
 	// ftp,s3

drivers/strm/hook.go

@@ -1,189 +0,0 @@
-package strm
-
-import (
-	"context"
-	"errors"
-	"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"
-)
-
-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(driver, 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 := strmDriver.convert2strmObjs(ctx, path, objs)
-			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) {
-	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)
-		}
-	}
-}
-
-func deleteExtraFiles(driver *Strm, 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{})
-	objsBaseNameSet := make(map[string]struct{})
-	for _, obj := range objs {
-		if obj.IsDir() {
-			continue
-		}
-		objName := obj.GetName()
-		objsSet[stdpath.Join(localPath, objName)] = struct{}{}
-
-		objBaseName := strings.TrimSuffix(objName, utils.SourceExt(objName))
-		objsBaseNameSet[stdpath.Join(localPath, objBaseName[:len(objBaseName)-1])] = struct{}{}
-	}
-
-	for _, localFile := range localFiles {
-		if _, exists := objsSet[localFile]; !exists {
-			ext := utils.Ext(localFile)
-			localFileName := stdpath.Base(localFile)
-			localFileBaseName := strings.TrimSuffix(localFile, utils.SourceExt(localFileName))
-			_, nameExists := objsBaseNameSet[localFileBaseName[:len(localFileBaseName)-1]]
-			_, downloadFile := driver.downloadSuffix[ext]
-			if driver.KeepLocalDownloadFile && nameExists && downloadFile {
-				continue
-			}
-
-			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

@@ -6,27 +6,23 @@ import (
 )
 
 type Addition struct {
-	Paths                 string `json:"paths" required:"true" type:"text"`
-	SiteUrl               string `json:"siteUrl" type:"text" required:"false" help:"The prefix URL of the strm file"`
-	PathPrefix            string `json:"PathPrefix" type:"text" required:"false" default:"/d"  help:"Path prefix"`
-	DownloadFileTypes     string `json:"downloadFileTypes" type:"text" default:"ass,srt,vtt,sub,strm" required:"false" help:"Files need to download with strm (usally subtitles)"`
-	FilterFileTypes       string `json:"filterFileTypes" type:"text" default:"mp4,mkv,flv,avi,wmv,ts,rmvb,webm,mp3,flac,aac,wav,ogg,m4a,wma,alac" required:"false" help:"Supports suffix name of strm file"`
-	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"`
-	KeepLocalDownloadFile bool   `json:"KeepLocalDownloadFile" default:"false" help:"keep local download files"`
-	Version               int
+	Paths             string `json:"paths" required:"true" type:"text"`
+	SiteUrl           string `json:"siteUrl" type:"text" required:"false" help:"The prefix URL of the strm file"`
+	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"`
+	LocalModel        bool   `json:"localModel" default:"false" help:"enable local mode"`
 }
 
 var config = driver.Config{
-	Name:        "Strm",
-	LocalSort:   true,
-	OnlyProxy:   true,
-	NoCache:     true,
-	NoUpload:    true,
-	DefaultRoot: "/",
-	NoLinkURL:   true,
+	Name:          "Strm",
+	LocalSort:     true,
+	NoCache:       true,
+	NoUpload:      true,
+	DefaultRoot:   "/",
+	OnlyLinkMFile: true,
+	OnlyProxy:     true,
+	NoLinkURL:     true,
 }
 
 func init() {

drivers/strm/types.go

@@ -0,0 +1,36 @@
+package strm
+
+func supportSuffix() map[string]struct{} {
+	return map[string]struct{}{
+		// video
+		"mp4":  {},
+		"mkv":  {},
+		"flv":  {},
+		"avi":  {},
+		"wmv":  {},
+		"ts":   {},
+		"rmvb": {},
+		"webm": {},
+		// audio
+		"mp3":  {},
+		"flac": {},
+		"aac":  {},
+		"wav":  {},
+		"ogg":  {},
+		"m4a":  {},
+		"wma":  {},
+		"alac": {},
+	}
+}
+
+func downloadSuffix() map[string]struct{} {
+	return map[string]struct{}{
+		// strm
+		"strm": {},
+		// subtitles
+		"ass": {},
+		"srt": {},
+		"vtt": {},
+		"sub": {},
+	}
+}

drivers/strm/util.go

@@ -3,6 +3,7 @@ package strm
 import (
 	"context"
 	"fmt"
+
 	stdpath "path"
 	"strings"
 
@@ -57,10 +58,7 @@ 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 {
 		id, name, path := "", obj.GetName(), ""
@@ -68,13 +66,12 @@ func (d *Strm) convert2strmObjs(ctx context.Context, reqPath string, objs []mode
 		if !obj.IsDir() {
 			path = stdpath.Join(reqPath, obj.GetName())
 			ext := strings.ToLower(utils.Ext(name))
-			sourceExt := utils.SourceExt(name)
-			if _, ok := d.downloadSuffix[ext]; ok {
-				size = obj.GetSize()
-			} else if _, ok := d.supportSuffix[ext]; ok {
+			if _, ok := d.supportSuffix[ext]; ok {
 				id = "strm"
-				name = strings.TrimSuffix(name, sourceExt) + "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
 			}
@@ -87,11 +84,13 @@ func (d *Strm) convert2strmObjs(ctx context.Context, reqPath string, objs []mode
 			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{
@@ -99,7 +98,7 @@ func (d *Strm) convert2strmObjs(ctx context.Context, reqPath string, objs []mode
 			},
 		})
 	}
-	return validObjs
+	return validObjs, nil
 }
 
 func (d *Strm) getLink(ctx context.Context, path string) string {
@@ -111,14 +110,7 @@ func (d *Strm) getLink(ctx context.Context, path string) string {
 		signPath := sign.Sign(path)
 		finalPath = fmt.Sprintf("%s?sign=%s", finalPath, signPath)
 	}
-	pathPrefix := d.PathPrefix
-	if len(pathPrefix) > 0 {
-		finalPath = stdpath.Join(pathPrefix, finalPath)
-	}
-	if !strings.HasPrefix(finalPath, "/") {
-		finalPath = "/" + finalPath
-	}
-	if d.WithoutUrl {
+	if d.LocalModel {
 		return finalPath
 	}
 	apiUrl := d.SiteUrl
@@ -127,7 +119,8 @@ func (d *Strm) getLink(ctx context.Context, path string) string {
 	} else {
 		apiUrl = common.GetApiUrl(ctx)
 	}
-	return fmt.Sprintf("%s%s",
+
+	return fmt.Sprintf("%s/d%s",
 		apiUrl,
 		finalPath)
 }

drivers/teldrive/upload.go

@@ -164,7 +164,7 @@ func (d *Teldrive) doSingleUpload(ctx context.Context, dstDir model.Obj, file mo
 			if err := d.singleUploadRequest(fileId, func(req *resty.Request) {
 				uploadParams := map[string]string{
 					"partName": func() string {
-						digits := len(strconv.Itoa(totalParts))
+						digits := len(fmt.Sprintf("%d", totalParts))
 						return file.GetName() + fmt.Sprintf(".%0*d", digits, 1)
 					}(),
 					"partNo":   strconv.Itoa(1),
@@ -333,7 +333,7 @@ func (d *Teldrive) uploadSingleChunk(ctx context.Context, fileId string, task ch
 		err := d.singleUploadRequest(fileId, func(req *resty.Request) {
 			uploadParams := map[string]string{
 				"partName": func() string {
-					digits := len(strconv.Itoa(totalParts))
+					digits := len(fmt.Sprintf("%d", totalParts))
 					return task.fileName + fmt.Sprintf(".%0*d", digits, task.chunkIdx)
 				}(),
 				"partNo":   strconv.Itoa(task.chunkIdx),

drivers/template/meta.go

@@ -16,6 +16,7 @@ type Addition struct {
 var config = driver.Config{
 	Name:              "Template",
 	LocalSort:         false,
+	OnlyLinkMFile:     false,
 	OnlyProxy:         false,
 	NoCache:           false,
 	NoUpload:          false,

drivers/terabox/util.go

@@ -88,7 +88,7 @@ func (d *Terabox) request(rurl string, method string, callback base.ReqCallback,
 		return nil, err
 	}
 	errno := utils.Json.Get(res.Body(), "errno").ToInt()
-	if errno == 4000023 || errno == 450016 {
+	if errno == 4000023 || errno == 4500016 {
 		// reget jsToken
 		err = d.resetJsToken()
 		if err != nil {

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)

drivers/thunder_browser/driver.go

@@ -6,7 +6,6 @@ import (
 	"fmt"
 	"io"
 	"net/http"
-	"strconv"
 	"strings"
 	"time"
 
@@ -841,7 +840,7 @@ func (xc *XunLeiBrowserCommon) OfflineList(ctx context.Context, nextPageToken st
 func (xc *XunLeiBrowserCommon) DeleteOfflineTasks(ctx context.Context, taskIDs []string) error {
 	queryParams := map[string]string{
 		"task_ids": strings.Join(taskIDs, ","),
-		"_t":       strconv.FormatInt(time.Now().UnixMilli(), 10),
+		"_t":       fmt.Sprintf("%d", time.Now().UnixMilli()),
 	}
 	if xc.UseFluentPlay {
 		queryParams["space"] = ThunderBrowserDriveFluentPlayFolderType

drivers/url_tree/meta.go

@@ -20,7 +20,6 @@ var config = driver.Config{
 	LocalSort:   true,
 	NoCache:     true,
 	CheckStatus: true,
-	OnlyIndices: true,
 }
 
 func init() {