ci: auto build docker with aria2

* Update driver.go

* fix(Lanzou):files cannot be uploaded to the specified directory

Solve the problem that files cannot be uploaded to the specified directory

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -43,8 +43,8 @@ body:
     attributes:
       label: Reproduction / 复现链接
       description: |
-        Please provide a link to a repo that can reproduce the problem you ran into.
+        Please provide a link to a repo that can reproduce the problem you ran into. Please be aware that your issue may be closed directly if you don't provide it.
-        请提供能复现此问题的链接
+        请提供能复现此问题的链接，请知悉如果不提供它你的issue可能会被直接关闭。
     validations:
       required: true
   - type: textarea
@@ -54,4 +54,3 @@ body:
       description: |
         Please copy and paste any relevant log output.
         请复制粘贴错误日志，或者截图
-      render: shell

.github/workflows/auto_lang.yml

@@ -7,6 +7,8 @@ on:
     paths:
       - 'drivers/**'
       - 'internal/bootstrap/data/setting.go'
+      - 'internal/conf/const.go'
+      - 'cmd/lang.go'
   workflow_dispatch:
 
 jobs:
@@ -42,6 +44,7 @@ jobs:
           cd alist
           go run ./main.go lang
           cd ..
+
       - name: Copy lang file
         run: |
           cp -f ./alist/lang/*.json ./alist-web/src/lang/en/ 2>/dev/null || :
@@ -61,4 +64,4 @@ jobs:
           github_token: ${{ secrets.MY_TOKEN }}
           branch: main
           directory: alist-web
-          repository: alist-org/alist-web
+          repository: alist-org/alist-web

.github/workflows/build.yml

@@ -2,9 +2,9 @@ name: build
 
 on:
   push:
-    branches: [ '**' ]
+    branches: [ 'main' ]
   pull_request:
-    branches: [ '**' ]
+    branches: [ 'main' ]
 
 jobs:
   build:

.github/workflows/build_docker.yml

@@ -6,7 +6,7 @@ on:
 
 jobs:
   build_docker:
-    name: Docker
+    name: Build docker
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -36,4 +36,30 @@ jobs:
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64,linux/arm64
+
+  build_docker_with_aria2:
+    needs: build_docker
+    name: Build docker with aria2
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v3
+        with:
+          repository: alist-org/with_aria2
+          ref: main
+          persist-credentials: false
+          fetch-depth: 0
+
+      - name: Commit
+        run: |
+          git config --local user.email "i@nn.ci"
+          git config --local user.name "Noah Hsu"
+          git commit --allow-empty -m "Trigger build for ${{ github.sha }}"
+
+      - name: Push commit
+        uses: ad-m/github-push-action@master
+        with:
+          github_token: ${{ secrets.MY_TOKEN }}
+          branch: main
+          repository: alist-org/with_aria2

.github/workflows/release_docker.yml

@@ -7,7 +7,7 @@ on:
 
 jobs:
   release_docker:
-    name: Docker
+    name: Release Docker
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -39,4 +39,30 @@ jobs:
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/386,linux/arm/v6,linux/s390x
+          platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/386,linux/arm/v6,linux/s390x
+
+  release_docker_with_aria2:
+    needs: release_docker
+    name: Release docker with aria2
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v3
+        with:
+          repository: alist-org/with_aria2
+          ref: main
+          persist-credentials: false
+          fetch-depth: 0
+
+      - name: Add tag
+        run: |
+          git config --local user.email "i@nn.ci"
+          git config --local user.name "Noah Hsu"
+          git tag -a ${{ github.ref_name }} -m "release ${{ github.ref_name }}"
+
+      - name: Push tags
+        uses: ad-m/github-push-action@master
+        with:
+          github_token: ${{ secrets.MY_TOKEN }}
+          branch: main
+          repository: alist-org/with_aria2

.gitignore

@@ -20,11 +20,12 @@ output/
 
 # Dependency directories (remove the comment below to include it)
 # vendor/
-bin/*
+/bin/*
 *.json
-data/
+/build
-log/
+/data/
-lang/
+/log/
-daemon/
+/lang/
-public/dist/*
+/daemon/
-!public/dist/README.md
+/public/dist/*
+/!public/dist/README.md

Dockerfile

@@ -2,7 +2,7 @@ FROM alpine:edge as builder
 LABEL stage=go-builder
 WORKDIR /app/
 COPY ./ ./
-RUN apk add --no-cache bash git go gcc musl-dev curl; \
+RUN apk add --no-cache bash curl gcc git go musl-dev; \
     bash build.sh release docker
 
 FROM alpine:edge
@@ -10,6 +10,9 @@ LABEL MAINTAINER="i@nn.ci"
 VOLUME /opt/alist/data/
 WORKDIR /opt/alist/
 COPY --from=builder /app/bin/alist ./
-RUN apk add ca-certificates
+COPY entrypoint.sh /entrypoint.sh
+RUN apk add --no-cache bash ca-certificates su-exec tzdata; \
+    chmod +x /entrypoint.sh
+ENV PUID=0 PGID=0 UMASK=022
 EXPOSE 5244
-CMD [ "./alist", "server", "--no-prefix" ]
+ENTRYPOINT [ "/entrypoint.sh" ]

README.md

@@ -9,7 +9,7 @@
     <img src="https://img.shields.io/github/license/Xhofe/alist" alt="License" />
   </a>
   <a href="https://github.com/Xhofe/alist/actions?query=workflow%3ABuild">
-    <img src="https://img.shields.io/github/workflow/status/Xhofe/alist/build" alt="Build status" />
+    <img src="https://img.shields.io/github/actions/workflow/status/Xhofe/alist/build.yml?branch=main" alt="Build status" />
   </a>
   <a href="https://github.com/Xhofe/alist/releases">
     <img src="https://img.shields.io/github/release/Xhofe/alist" alt="latest version" />
@@ -53,6 +53,7 @@ English | [中文](./README_cn.md) | [Contributing](./CONTRIBUTING.md) | [CODE_O
     - [x] FTP / SFTP
     - [x] [PikPak](https://www.mypikpak.com/)
     - [x] [S3](https://aws.amazon.com/s3/)
+    - [x] [Seafile](https://seafile.com/)
     - [x] [UPYUN Storage Service](https://www.upyun.com/products/file-storage)
     - [x] WebDav(Support OneDrive/SharePoint without API)
     - [x] Teambition([China](https://www.teambition.com/ ),[International](https://us.teambition.com/ ))
@@ -60,6 +61,7 @@ English | [中文](./README_cn.md) | [Contributing](./CONTRIBUTING.md) | [CODE_O
     - [x] [139yun](https://yun.139.com/) (Personal, Family)
     - [x] [YandexDisk](https://disk.yandex.com/)
     - [x] [BaiduNetdisk](http://pan.baidu.com/)
+    - [x] [Terabox](https://www.terabox.com/main)
     - [x] [Quark](https://pan.quark.cn)
     - [x] [Thunder](https://pan.xunlei.com)
     - [x] [Lanzou](https://www.lanzou.com/)
@@ -69,6 +71,7 @@ English | [中文](./README_cn.md) | [Contributing](./CONTRIBUTING.md) | [CODE_O
     - [x] [Baidu photo](https://photo.baidu.com/)
     - [x] SMB
     - [x] [115](https://115.com/)
+    - [X] Cloudreve
 - [x] Easy to deploy and out-of-the-box
 - [x] File preview (PDF, markdown, code, plain text, ...)
 - [x] Image preview in gallery mode

README_cn.md

@@ -9,7 +9,7 @@
     <img src="https://img.shields.io/github/license/Xhofe/alist" alt="License" />
   </a>
   <a href="https://github.com/Xhofe/alist/actions?query=workflow%3ABuild">
-    <img src="https://img.shields.io/github/workflow/status/Xhofe/alist/build" alt="Build status" />
+    <img src="https://img.shields.io/github/actions/workflow/status/Xhofe/alist/build.yml?branch=main" alt="Build status" />
   </a>
   <a href="https://github.com/Xhofe/alist/releases">
     <img src="https://img.shields.io/github/release/Xhofe/alist" alt="latest version" />
@@ -53,6 +53,7 @@
     - [x] FTP / SFTP
     - [x] [PikPak](https://www.mypikpak.com/)
     - [x] [S3](https://aws.amazon.com/cn/s3/)
+    - [x] [Seafile](https://seafile.com/)
     - [x] [又拍云对象存储](https://www.upyun.com/products/file-storage)
     - [x] WebDav(支持无API的OneDrive/SharePoint)
     - [x] Teambition（[中国](https://www.teambition.com/ )，[国际](https://us.teambition.com/ )）
@@ -69,6 +70,7 @@
     - [x] [一刻相册](https://photo.baidu.com/)
     - [x] SMB
     - [x] [115](https://115.com/)
+    - [X] Cloudreve
 - [x] 部署方便，开箱即用
 - [x] 文件预览（PDF、markdown、代码、纯文本……）
 - [x] 画廊模式下的图像预览

cmd/admin.go

@@ -4,19 +4,19 @@ Copyright © 2022 NAME HERE <EMAIL ADDRESS>
 package cmd
 
 import (
-	"github.com/alist-org/alist/v3/internal/db"
+	"github.com/alist-org/alist/v3/internal/op"
 	"github.com/alist-org/alist/v3/pkg/utils"
 	"github.com/spf13/cobra"
 )
 
-// passwordCmd represents the password command
+// PasswordCmd represents the password command
-var passwordCmd = &cobra.Command{
+var PasswordCmd = &cobra.Command{
 	Use:     "admin",
 	Aliases: []string{"password"},
 	Short:   "Show admin user's info",
 	Run: func(cmd *cobra.Command, args []string) {
 		Init()
-		admin, err := db.GetAdmin()
+		admin, err := op.GetAdmin()
 		if err != nil {
 			utils.Log.Errorf("failed get admin user: %+v", err)
 		} else {
@@ -26,7 +26,7 @@ var passwordCmd = &cobra.Command{
 }
 
 func init() {
-	rootCmd.AddCommand(passwordCmd)
+	RootCmd.AddCommand(PasswordCmd)
 
 	// Here you will define your flags and configuration settings.
 

cmd/cancel2FA.go

@@ -4,22 +4,22 @@ Copyright © 2022 NAME HERE <EMAIL ADDRESS>
 package cmd
 
 import (
-	"github.com/alist-org/alist/v3/internal/db"
+	"github.com/alist-org/alist/v3/internal/op"
 	"github.com/alist-org/alist/v3/pkg/utils"
 	"github.com/spf13/cobra"
 )
 
-// cancel2FACmd represents the delete2fa command
+// Cancel2FACmd represents the delete2fa command
-var cancel2FACmd = &cobra.Command{
+var Cancel2FACmd = &cobra.Command{
 	Use:   "cancel2fa",
 	Short: "Delete 2FA of admin user",
 	Run: func(cmd *cobra.Command, args []string) {
 		Init()
-		admin, err := db.GetAdmin()
+		admin, err := op.GetAdmin()
 		if err != nil {
 			utils.Log.Errorf("failed to get admin user: %+v", err)
 		} else {
-			err := db.Cancel2FAByUser(admin)
+			err := op.Cancel2FAByUser(admin)
 			if err != nil {
 				utils.Log.Errorf("failed to cancel 2FA: %+v", err)
 			}
@@ -28,7 +28,7 @@ var cancel2FACmd = &cobra.Command{
 }
 
 func init() {
-	rootCmd.AddCommand(cancel2FACmd)
+	RootCmd.AddCommand(Cancel2FACmd)
 
 	// Here you will define your flags and configuration settings.
 

cmd/common.go

@@ -16,6 +16,7 @@ func Init() {
 	bootstrap.Log()
 	bootstrap.InitDB()
 	data.InitData()
+	bootstrap.InitIndex()
 }
 
 var pid = -1

cmd/lang.go

@@ -71,7 +71,7 @@ func writeFile(name string, data interface{}) {
 	} else {
 		log.Infof("%s.json changed, update file", name)
 		//log.Infof("old: %+v\nnew:%+v", oldData, data)
-		utils.WriteJsonToFile(fmt.Sprintf("lang/%s.json", name), data)
+		utils.WriteJsonToFile(fmt.Sprintf("lang/%s.json", name), newData, true)
 	}
 }
 
@@ -123,8 +123,8 @@ func generateSettingsJson() {
 	//utils.WriteJsonToFile("lang/settings.json", settingsLang)
 }
 
-// langCmd represents the lang command
+// LangCmd represents the lang command
-var langCmd = &cobra.Command{
+var LangCmd = &cobra.Command{
 	Use:   "lang",
 	Short: "Generate language json file",
 	Run: func(cmd *cobra.Command, args []string) {
@@ -138,7 +138,7 @@ var langCmd = &cobra.Command{
 }
 
 func init() {
-	rootCmd.AddCommand(langCmd)
+	RootCmd.AddCommand(LangCmd)
 
 	// Here you will define your flags and configuration settings.
 

cmd/restart.go

@@ -7,8 +7,8 @@ import (
 	"github.com/spf13/cobra"
 )
 
-// restartCmd represents the restart command
+// RestartCmd represents the restart command
-var restartCmd = &cobra.Command{
+var RestartCmd = &cobra.Command{
 	Use:   "restart",
 	Short: "Restart alist server by daemon/pid file",
 	Run: func(cmd *cobra.Command, args []string) {
@@ -18,7 +18,7 @@ var restartCmd = &cobra.Command{
 }
 
 func init() {
-	rootCmd.AddCommand(restartCmd)
+	RootCmd.AddCommand(RestartCmd)
 
 	// Here you will define your flags and configuration settings.
 

cmd/root.go

@@ -8,7 +8,7 @@ import (
 	"github.com/spf13/cobra"
 )
 
-var rootCmd = &cobra.Command{
+var RootCmd = &cobra.Command{
 	Use:   "alist",
 	Short: "A file list program that supports multiple storage.",
 	Long: `A file list program that supports multiple storage,
@@ -17,16 +17,16 @@ Complete documentation is available at https://alist.nn.ci/`,
 }
 
 func Execute() {
-	if err := rootCmd.Execute(); err != nil {
+	if err := RootCmd.Execute(); err != nil {
 		fmt.Fprintln(os.Stderr, err)
 		os.Exit(1)
 	}
 }
 
 func init() {
-	rootCmd.PersistentFlags().StringVar(&flags.DataDir, "data", "data", "config file")
+	RootCmd.PersistentFlags().StringVar(&flags.DataDir, "data", "data", "config file")
-	rootCmd.PersistentFlags().BoolVar(&flags.Debug, "debug", false, "start with debug mode")
+	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.NoPrefix, "no-prefix", false, "disable env prefix")
-	rootCmd.PersistentFlags().BoolVar(&flags.Dev, "dev", false, "start with dev mode")
+	RootCmd.PersistentFlags().BoolVar(&flags.Dev, "dev", false, "start with dev mode")
-	rootCmd.PersistentFlags().BoolVar(&flags.ForceBinDir, "force-bin-dir", false, "Force to use the directory where the binary file is located as data directory")
+	RootCmd.PersistentFlags().BoolVar(&flags.ForceBinDir, "force-bin-dir", false, "Force to use the directory where the binary file is located as data directory")
 }

cmd/server.go

@@ -20,8 +20,8 @@ import (
 	"github.com/spf13/cobra"
 )
 
-// serverCmd represents the server command
+// ServerCmd represents the server command
-var serverCmd = &cobra.Command{
+var ServerCmd = &cobra.Command{
 	Use:   "server",
 	Short: "Start the server at the specified address",
 	Long: `Start the server at the specified address
@@ -76,7 +76,7 @@ the address is defined in config file`,
 }
 
 func init() {
-	rootCmd.AddCommand(serverCmd)
+	RootCmd.AddCommand(ServerCmd)
 
 	// Here you will define your flags and configuration settings.
 
@@ -95,5 +95,5 @@ func OutAlistInit() {
 		cmd  *cobra.Command
 		args []string
 	)
-	serverCmd.Run(cmd, args)
+	ServerCmd.Run(cmd, args)
 }

cmd/start.go

@@ -13,8 +13,8 @@ import (
 	"github.com/spf13/cobra"
 )
 
-// startCmd represents the start command
+// StartCmd represents the start command
-var startCmd = &cobra.Command{
+var StartCmd = &cobra.Command{
 	Use:   "start",
 	Short: "Silent start alist server with `--force-bin-dir`",
 	Run: func(cmd *cobra.Command, args []string) {
@@ -57,7 +57,7 @@ func start() {
 }
 
 func init() {
-	rootCmd.AddCommand(startCmd)
+	RootCmd.AddCommand(StartCmd)
 
 	// Here you will define your flags and configuration settings.
 

cmd/stop.go

@@ -10,8 +10,8 @@ import (
 	"github.com/spf13/cobra"
 )
 
-// stopCmd represents the stop command
+// StopCmd represents the stop command
-var stopCmd = &cobra.Command{
+var StopCmd = &cobra.Command{
 	Use:   "stop",
 	Short: "Stop alist server by daemon/pid file",
 	Run: func(cmd *cobra.Command, args []string) {
@@ -44,7 +44,7 @@ func stop() {
 }
 
 func init() {
-	rootCmd.AddCommand(stopCmd)
+	RootCmd.AddCommand(StopCmd)
 
 	// Here you will define your flags and configuration settings.
 

cmd/version.go

@@ -1,6 +1,5 @@
 /*
 Copyright © 2022 NAME HERE <EMAIL ADDRESS>
-
 */
 package cmd
 
@@ -12,8 +11,8 @@ import (
 	"github.com/spf13/cobra"
 )
 
-// versionCmd represents the version command
+// VersionCmd represents the version command
-var versionCmd = &cobra.Command{
+var VersionCmd = &cobra.Command{
 	Use:   "version",
 	Short: "Show current version of AList",
 	Run: func(cmd *cobra.Command, args []string) {
@@ -30,7 +29,7 @@ WebVersion: %s
 }
 
 func init() {
-	rootCmd.AddCommand(versionCmd)
+	RootCmd.AddCommand(VersionCmd)
 
 	// Here you will define your flags and configuration settings.
 

docker-compose.yml

@@ -0,0 +1,15 @@
+version: '3.3'
+services:
+  alist:
+    restart: always
+    volumes:
+      - '/etc/alist:/opt/alist/data'
+    ports:
+      - '5244:5244'
+    environment:
+      - PUID=0
+      - PGID=0
+      - UMASK=022
+      - TZ=UTC
+    container_name: alist
+    image: 'xhofe/alist:latest'

drivers/115/driver.go

@@ -22,15 +22,10 @@ func (d *Pan115) Config() driver.Config {
 }
 
 func (d *Pan115) GetAddition() driver.Additional {
-	return d.Addition
+	return &d.Addition
 }
 
-func (d *Pan115) Init(ctx context.Context, storage model.Storage) error {
+func (d *Pan115) Init(ctx context.Context) error {
-	d.Storage = storage
-	err := utils.Json.UnmarshalFromString(d.Storage.Addition, &d.Addition)
-	if err != nil {
-		return err
-	}
 	return d.login()
 }
 

drivers/115/meta.go

@@ -6,7 +6,7 @@ import (
 )
 
 type Addition struct {
-	Cookie        string `json:"cookie"`
+	Cookie      string `json:"cookie"`
 	QRCodeToken string `json:"qrcode_token"`
 	driver.RootID
 }
@@ -18,10 +18,8 @@ var config = driver.Config{
 	OnlyLocal:   true,
 }
 
-func New() driver.Driver {
-	return &Pan115{}
-}
-
 func init() {
-	op.RegisterDriver(config, New)
+	op.RegisterDriver(func() driver.Driver {
+		return &Pan115{}
+	})
 }

drivers/123/driver.go

@@ -37,15 +37,10 @@ func (d *Pan123) Config() driver.Config {
 }
 
 func (d *Pan123) GetAddition() driver.Additional {
-	return d.Addition
+	return &d.Addition
 }
 
-func (d *Pan123) Init(ctx context.Context, storage model.Storage) error {
+func (d *Pan123) Init(ctx context.Context) error {
-	d.Storage = storage
-	err := utils.Json.UnmarshalFromString(d.Storage.Addition, &d.Addition)
-	if err != nil {
-		return err
-	}
 	return d.login()
 }
 
@@ -63,11 +58,6 @@ func (d *Pan123) List(ctx context.Context, dir model.Obj, args model.ListArgs) (
 	})
 }
 
-//func (d *Pan123) Get(ctx context.Context, path string) (model.Obj, error) {
-//	// this is optional
-//	return nil, errs.NotImplement
-//}
-
 func (d *Pan123) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
 	if f, ok := file.(File); ok {
 		//var resp DownResp
@@ -231,7 +221,7 @@ func (d *Pan123) Put(ctx context.Context, dstDir model.Obj, stream model.FileStr
 	}
 	var resp UploadResp
 	_, err := d.request("https://www.123pan.com/a/api/file/upload_request", http.MethodPost, func(req *resty.Request) {
-		req.SetBody(data)
+		req.SetBody(data).SetContext(ctx)
 	}, &resp)
 	if err != nil {
 		return err
@@ -255,14 +245,14 @@ func (d *Pan123) Put(ctx context.Context, dstDir model.Obj, stream model.FileStr
 		Key:    &resp.Data.Key,
 		Body:   uploadFile,
 	}
-	_, err = uploader.Upload(input)
+	_, err = uploader.UploadWithContext(ctx, input)
 	if err != nil {
 		return err
 	}
 	_, err = d.request("https://www.123pan.com/api/file/upload_complete", http.MethodPost, func(req *resty.Request) {
 		req.SetBody(base.Json{
 			"fileId": resp.Data.FileId,
-		})
+		}).SetContext(ctx)
 	}, nil)
 	return err
 }

drivers/123/meta.go

@@ -21,10 +21,8 @@ var config = driver.Config{
 	DefaultRoot: "0",
 }
 
-func New() driver.Driver {
-	return &Pan123{}
-}
-
 func init() {
-	op.RegisterDriver(config, New)
+	op.RegisterDriver(func() driver.Driver {
+		return &Pan123{}
+	})
 }

drivers/139/driver.go

@@ -1,11 +1,9 @@
 package _139
 
 import (
-	"bytes"
 	"context"
 	"fmt"
 	"io"
-	"math"
 	"net/http"
 	"strconv"
 
@@ -27,16 +25,11 @@ func (d *Yun139) Config() driver.Config {
 }
 
 func (d *Yun139) GetAddition() driver.Additional {
-	return d.Addition
+	return &d.Addition
 }
 
-func (d *Yun139) Init(ctx context.Context, storage model.Storage) error {
+func (d *Yun139) Init(ctx context.Context) error {
-	d.Storage = storage
+	_, err := d.post("/orchestration/personalCloud/user/v1.0/qryUserExternInfo", base.Json{
-	err := utils.Json.UnmarshalFromString(d.Storage.Addition, &d.Addition)
-	if err != nil {
-		return err
-	}
-	_, err = d.post("/orchestration/personalCloud/user/v1.0/qryUserExternInfo", base.Json{
 		"qryUserExternInfoReq": base.Json{
 			"commonAccountInfo": base.Json{
 				"account":     d.Account,
@@ -59,11 +52,6 @@ func (d *Yun139) List(ctx context.Context, dir model.Obj, args model.ListArgs) (
 	}
 }
 
-//func (d *Yun139) Get(ctx context.Context, path string) (model.Obj, error) {
-//	// this is optional
-//	return nil, errs.NotImplement
-//}
-
 func (d *Yun139) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
 	u, err := d.getLink(file.GetID())
 	if err != nil {
@@ -239,10 +227,10 @@ func (d *Yun139) Put(ctx context.Context, dstDir model.Obj, stream model.FileStr
 		"manualRename": 2,
 		"operation":    0,
 		"fileCount":    1,
-		"totalSize":    stream.GetSize(),
+		"totalSize":    0, // 去除上传大小限制
 		"uploadContentList": []base.Json{{
 			"contentName": stream.GetName(),
-			"contentSize": stream.GetSize(),
+			"contentSize": 0, // 去除上传大小限制
 			// "digest": "5a3231986ce7a6b46e408612d385bafa"
 		}},
 		"parentCatalogID": dstDir.GetID(),
@@ -260,10 +248,10 @@ func (d *Yun139) Put(ctx context.Context, dstDir model.Obj, stream model.FileStr
 			"operation":    0,
 			"path":         "",
 			"seqNo":        "",
-			"totalSize":    stream.GetSize(),
+			"totalSize":    0,
 			"uploadContentList": []base.Json{{
 				"contentName": stream.GetName(),
-				"contentSize": stream.GetSize(),
+				"contentSize": 0,
 				// "digest": "5a3231986ce7a6b46e408612d385bafa"
 			}},
 		})
@@ -275,47 +263,47 @@ func (d *Yun139) Put(ctx context.Context, dstDir model.Obj, stream model.FileStr
 	if err != nil {
 		return err
 	}
-	var Default int64 = 10485760
+
-	part := int(math.Ceil(float64(stream.GetSize()) / float64(Default)))
+	// Progress
-	var start int64 = 0
+	p := driver.NewProgress(stream.GetSize(), up)
-	for i := 0; i < part; i++ {
+
+	var Default int64 = 104857600
+	part := (stream.GetSize() + Default - 1) / Default
+	for i := int64(0); i < part; i++ {
+		if utils.IsCanceled(ctx) {
+			return ctx.Err()
+		}
+
+		start := i * Default
 		byteSize := stream.GetSize() - start
 		if byteSize > Default {
 			byteSize = Default
 		}
-		byteData := make([]byte, byteSize)
+
-		_, err = io.ReadFull(stream, byteData)
+		limitReader := io.LimitReader(stream, byteSize)
+		// Update Progress
+		r := io.TeeReader(limitReader, p)
+		req, err := http.NewRequest("POST", resp.Data.UploadResult.RedirectionURL, r)
 		if err != nil {
 			return err
 		}
-		req, err := http.NewRequest("POST", resp.Data.UploadResult.RedirectionURL, bytes.NewBuffer(byteData))
+
-		if err != nil {
+		req = req.WithContext(ctx)
-			return err
+		req.Header.Set("Content-Type", "text/plain;name="+unicode(stream.GetName()))
-		}
+		req.Header.Set("contentSize", strconv.FormatInt(stream.GetSize(), 10))
-		headers := map[string]string{
+		req.Header.Set("range", fmt.Sprintf("bytes=%d-%d", start, start+byteSize-1))
-			"Accept":         "*/*",
+		req.Header.Set("uploadtaskID", resp.Data.UploadResult.UploadTaskID)
-			"Content-Type":   "text/plain;name=" + unicode(stream.GetName()),
+		req.Header.Set("rangeType", "0")
-			"contentSize":    strconv.FormatInt(stream.GetSize(), 10),
+		req.ContentLength = byteSize
-			"range":          fmt.Sprintf("bytes=%d-%d", start, start+byteSize-1),
+
-			"content-length": strconv.FormatInt(byteSize, 10),
-			"uploadtaskID":   resp.Data.UploadResult.UploadTaskID,
-			"rangeType":      "0",
-			"Referer":        "https://yun.139.com/",
-			"User-Agent":     "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/95.0.4638.69 Safari/537.36 Edg/95.0.1020.44",
-			"x-SvcType":      "1",
-		}
-		for k, v := range headers {
-			req.Header.Set(k, v)
-		}
 		res, err := base.HttpClient.Do(req)
 		if err != nil {
 			return err
 		}
 		log.Debugf("%+v", res)
 		res.Body.Close()
-		start += byteSize
-		up(i * 100 / part)
 	}
+
 	return nil
 }
 

drivers/139/meta.go

@@ -19,7 +19,7 @@ var config = driver.Config{
 }
 
 func init() {
-	op.RegisterDriver(config, func() driver.Driver {
+	op.RegisterDriver(func() driver.Driver {
 		return &Yun139{}
 	})
 }

drivers/139/util.go

@@ -28,12 +28,15 @@ func (d *Yun139) isFamily() bool {
 func encodeURIComponent(str string) string {
 	r := url.QueryEscape(str)
 	r = strings.Replace(r, "+", "%20", -1)
+	r = strings.Replace(r, "%21", "!", -1)
+	r = strings.Replace(r, "%27", "'", -1)
+	r = strings.Replace(r, "%28", "(", -1)
+	r = strings.Replace(r, "%29", ")", -1)
+	r = strings.Replace(r, "%2A", "*", -1)
 	return r
 }
 
 func calSign(body, ts, randStr string) string {
-	body = strings.ReplaceAll(body, "\n", "")
-	body = strings.ReplaceAll(body, " ", "")
 	body = encodeURIComponent(body)
 	strs := strings.Split(body, "")
 	sort.Strings(strs)

drivers/189/driver.go

@@ -26,15 +26,10 @@ func (d *Cloud189) Config() driver.Config {
 }
 
 func (d *Cloud189) GetAddition() driver.Additional {
-	return d.Addition
+	return &d.Addition
 }
 
-func (d *Cloud189) Init(ctx context.Context, storage model.Storage) error {
+func (d *Cloud189) Init(ctx context.Context) error {
-	d.Storage = storage
-	err := utils.Json.UnmarshalFromString(d.Storage.Addition, &d.Addition)
-	if err != nil {
-		return err
-	}
 	d.client = resty.New().
 		SetTimeout(base.DefaultTimeout).
 		SetRetryCount(3).
@@ -51,11 +46,6 @@ func (d *Cloud189) List(ctx context.Context, dir model.Obj, args model.ListArgs)
 	return d.getFiles(dir.GetID())
 }
 
-//func (d *Cloud189) Get(ctx context.Context, path string) (model.Obj, error) {
-//	// this is optional
-//	return nil, errs.NotImplement
-//}
-
 func (d *Cloud189) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
 	var resp DownResp
 	u := "https://cloud.189.cn/api/portal/getFileInfo.action"
@@ -204,7 +194,7 @@ func (d *Cloud189) Remove(ctx context.Context, obj model.Obj) error {
 }
 
 func (d *Cloud189) Put(ctx context.Context, dstDir model.Obj, stream model.FileStreamer, up driver.UpdateProgress) error {
-	return d.newUpload(dstDir, stream, up)
+	return d.newUpload(ctx, dstDir, stream, up)
 }
 
 var _ driver.Driver = (*Cloud189)(nil)

drivers/189/meta.go

@@ -18,7 +18,7 @@ var config = driver.Config{
 }
 
 func init() {
-	op.RegisterDriver(config, func() driver.Driver {
+	op.RegisterDriver(func() driver.Driver {
 		return &Cloud189{}
 	})
 }

drivers/189/util.go

@@ -2,6 +2,7 @@ package _189
 
 import (
 	"bytes"
+	"context"
 	"crypto/md5"
 	"encoding/base64"
 	"encoding/hex"
@@ -306,7 +307,7 @@ func (d *Cloud189) uploadRequest(uri string, form map[string]string, resp interf
 	return data, nil
 }
 
-func (d *Cloud189) newUpload(dstDir model.Obj, file model.FileStreamer, up driver.UpdateProgress) error {
+func (d *Cloud189) newUpload(ctx context.Context, dstDir model.Obj, file model.FileStreamer, up driver.UpdateProgress) error {
 	sessionKey, err := d.getSessionKey()
 	if err != nil {
 		return err
@@ -335,6 +336,9 @@ func (d *Cloud189) newUpload(dstDir model.Obj, file model.FileStreamer, up drive
 	md5s := make([]string, 0)
 	md5Sum := md5.New()
 	for i = 1; i <= count; i++ {
+		if utils.IsCanceled(ctx) {
+			return ctx.Err()
+		}
 		byteSize = file.GetSize() - finish
 		if DEFAULT < byteSize {
 			byteSize = DEFAULT
@@ -364,12 +368,15 @@ func (d *Cloud189) newUpload(dstDir model.Obj, file model.FileStreamer, up drive
 		log.Debugf("uploadData: %+v", uploadData)
 		requestURL := uploadData.RequestURL
 		uploadHeaders := strings.Split(decodeURIComponent(uploadData.RequestHeader), "&")
-		req, _ := http.NewRequest(http.MethodPut, requestURL, bytes.NewReader(byteData))
+		req, err := http.NewRequest(http.MethodPut, requestURL, bytes.NewReader(byteData))
+		if err != nil {
+			return err
+		}
+		req = req.WithContext(ctx)
 		for _, v := range uploadHeaders {
 			i := strings.Index(v, "=")
 			req.Header.Set(v[0:i], v[i+1:])
 		}
-
 		r, err := base.HttpClient.Do(req)
 		log.Debugf("%+v %+v", r, r.Request.Header)
 		r.Body.Close()

drivers/189pc/driver.go

@@ -13,7 +13,7 @@ import (
 	"github.com/go-resty/resty/v2"
 )
 
-type Yun189PC struct {
+type Cloud189PC struct {
 	model.Storage
 	Addition
 
@@ -26,20 +26,15 @@ type Yun189PC struct {
 	tokenInfo  *AppSessionResp
 }
 
-func (y *Yun189PC) Config() driver.Config {
+func (y *Cloud189PC) Config() driver.Config {
 	return config
 }
 
-func (y *Yun189PC) GetAddition() driver.Additional {
+func (y *Cloud189PC) GetAddition() driver.Additional {
-	return y.Addition
+	return &y.Addition
 }
 
-func (y *Yun189PC) Init(ctx context.Context, storage model.Storage) (err error) {
+func (y *Cloud189PC) Init(ctx context.Context) (err error) {
-	y.Storage = storage
-	if err = utils.Json.UnmarshalFromString(y.Storage.Addition, &y.Addition); err != nil {
-		return err
-	}
-
 	// 处理个人云和家庭云参数
 	if y.isFamily() && y.RootFolderID == "-11" {
 		y.RootFolderID = ""
@@ -78,15 +73,15 @@ func (y *Yun189PC) Init(ctx context.Context, storage model.Storage) (err error)
 	return
 }
 
-func (y *Yun189PC) Drop(ctx context.Context) error {
+func (y *Cloud189PC) Drop(ctx context.Context) error {
 	return nil
 }
 
-func (y *Yun189PC) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([]model.Obj, error) {
+func (y *Cloud189PC) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([]model.Obj, error) {
 	return y.getFiles(ctx, dir.GetID())
 }
 
-func (y *Yun189PC) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
+func (y *Cloud189PC) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
 	var downloadUrl struct {
 		URL string `json:"fileDownloadUrl"`
 	}
@@ -145,7 +140,7 @@ func (y *Yun189PC) Link(ctx context.Context, file model.Obj, args model.LinkArgs
 	return like, nil
 }
 
-func (y *Yun189PC) MakeDir(ctx context.Context, parentDir model.Obj, dirName string) error {
+func (y *Cloud189PC) MakeDir(ctx context.Context, parentDir model.Obj, dirName string) error {
 	fullUrl := API_URL
 	if y.isFamily() {
 		fullUrl += "/family/file"
@@ -172,7 +167,7 @@ func (y *Yun189PC) MakeDir(ctx context.Context, parentDir model.Obj, dirName str
 	return err
 }
 
-func (y *Yun189PC) Move(ctx context.Context, srcObj, dstDir model.Obj) error {
+func (y *Cloud189PC) Move(ctx context.Context, srcObj, dstDir model.Obj) error {
 	_, err := y.post(API_URL+"/batch/createBatchTask.action", func(req *resty.Request) {
 		req.SetContext(ctx)
 		req.SetFormData(map[string]string{
@@ -196,7 +191,7 @@ func (y *Yun189PC) Move(ctx context.Context, srcObj, dstDir model.Obj) error {
 	return err
 }
 
-func (y *Yun189PC) Rename(ctx context.Context, srcObj model.Obj, newName string) error {
+func (y *Cloud189PC) Rename(ctx context.Context, srcObj model.Obj, newName string) error {
 	queryParam := make(map[string]string)
 	fullUrl := API_URL
 	method := http.MethodPost
@@ -221,7 +216,7 @@ func (y *Yun189PC) Rename(ctx context.Context, srcObj model.Obj, newName string)
 	return err
 }
 
-func (y *Yun189PC) Copy(ctx context.Context, srcObj, dstDir model.Obj) error {
+func (y *Cloud189PC) Copy(ctx context.Context, srcObj, dstDir model.Obj) error {
 	_, err := y.post(API_URL+"/batch/createBatchTask.action", func(req *resty.Request) {
 		req.SetContext(ctx)
 		req.SetFormData(map[string]string{
@@ -246,7 +241,7 @@ func (y *Yun189PC) Copy(ctx context.Context, srcObj, dstDir model.Obj) error {
 	return err
 }
 
-func (y *Yun189PC) Remove(ctx context.Context, obj model.Obj) error {
+func (y *Cloud189PC) Remove(ctx context.Context, obj model.Obj) error {
 	_, err := y.post(API_URL+"/batch/createBatchTask.action", func(req *resty.Request) {
 		req.SetContext(ctx)
 		req.SetFormData(map[string]string{
@@ -270,7 +265,7 @@ func (y *Yun189PC) Remove(ctx context.Context, obj model.Obj) error {
 	return err
 }
 
-func (y *Yun189PC) Put(ctx context.Context, dstDir model.Obj, stream model.FileStreamer, up driver.UpdateProgress) error {
+func (y *Cloud189PC) Put(ctx context.Context, dstDir model.Obj, stream model.FileStreamer, up driver.UpdateProgress) error {
 	if y.RapidUpload {
 		return y.FastUpload(ctx, dstDir, stream, up)
 	}

drivers/189pc/meta.go

@@ -24,7 +24,7 @@ var config = driver.Config{
 }
 
 func init() {
-	op.RegisterDriver(config, func() driver.Driver {
+	op.RegisterDriver(func() driver.Driver {
-		return &Yun189PC{}
+		return &Cloud189PC{}
 	})
 }

drivers/189pc/utils.go

@@ -47,7 +47,7 @@ const (
 	CHANNEL_ID = "web_cloud.189.cn"
 )
 
-func (y *Yun189PC) request(url, method string, callback base.ReqCallback, params Params, resp interface{}) ([]byte, error) {
+func (y *Cloud189PC) request(url, method string, callback base.ReqCallback, params Params, resp interface{}) ([]byte, error) {
 	dateOfGmt := getHttpDateStr()
 	sessionKey := y.tokenInfo.SessionKey
 	sessionSecret := y.tokenInfo.SessionSecret
@@ -124,15 +124,15 @@ func (y *Yun189PC) request(url, method string, callback base.ReqCallback, params
 	}
 }
 
-func (y *Yun189PC) get(url string, callback base.ReqCallback, resp interface{}) ([]byte, error) {
+func (y *Cloud189PC) get(url string, callback base.ReqCallback, resp interface{}) ([]byte, error) {
 	return y.request(url, http.MethodGet, callback, nil, resp)
 }
 
-func (y *Yun189PC) post(url string, callback base.ReqCallback, resp interface{}) ([]byte, error) {
+func (y *Cloud189PC) post(url string, callback base.ReqCallback, resp interface{}) ([]byte, error) {
 	return y.request(url, http.MethodPost, callback, nil, resp)
 }
 
-func (y *Yun189PC) getFiles(ctx context.Context, fileId string) ([]model.Obj, error) {
+func (y *Cloud189PC) getFiles(ctx context.Context, fileId string) ([]model.Obj, error) {
 	fullUrl := API_URL
 	if y.isFamily() {
 		fullUrl += "/family/file"
@@ -184,7 +184,7 @@ func (y *Yun189PC) getFiles(ctx context.Context, fileId string) ([]model.Obj, er
 	return res, nil
 }
 
-func (y *Yun189PC) login() (err error) {
+func (y *Cloud189PC) login() (err error) {
 	// 初始化登陆所需参数
 	if y.loginParam == nil || !y.NoUseOcr {
 		if err = y.initLoginParam(); err != nil {
@@ -264,7 +264,7 @@ func (y *Yun189PC) login() (err error) {
 /* 初始化登陆需要的参数
 *  如果遇到验证码返回错误
  */
-func (y *Yun189PC) initLoginParam() error {
+func (y *Cloud189PC) initLoginParam() error {
 	// 清除cookie
 	jar, _ := cookiejar.New(nil)
 	y.client.SetCookieJar(jar)
@@ -335,7 +335,7 @@ func (y *Yun189PC) initLoginParam() error {
 }
 
 // 刷新会话
-func (y *Yun189PC) refreshSession() (err error) {
+func (y *Cloud189PC) refreshSession() (err error) {
 	var erron RespErr
 	var userSessionResp UserSessionResp
 	_, err = y.client.R().
@@ -381,7 +381,7 @@ func (y *Yun189PC) refreshSession() (err error) {
 }
 
 // 普通上传
-func (y *Yun189PC) CommonUpload(ctx context.Context, dstDir model.Obj, file model.FileStreamer, up driver.UpdateProgress) (err error) {
+func (y *Cloud189PC) CommonUpload(ctx context.Context, dstDir model.Obj, file model.FileStreamer, up driver.UpdateProgress) (err error) {
 	const DEFAULT int64 = 10485760
 	var count = int64(math.Ceil(float64(file.GetSize()) / float64(DEFAULT)))
 
@@ -418,10 +418,8 @@ func (y *Yun189PC) CommonUpload(ctx context.Context, dstDir model.Obj, file mode
 	silceMd5Hexs := make([]string, 0, count)
 	byteData := bytes.NewBuffer(make([]byte, DEFAULT))
 	for i := int64(1); i <= count; i++ {
-		select {
+		if utils.IsCanceled(ctx) {
-		case <-ctx.Done():
 			return ctx.Err()
-		default:
 		}
 
 		// 读取块
@@ -491,7 +489,7 @@ func (y *Yun189PC) CommonUpload(ctx context.Context, dstDir model.Obj, file mode
 }
 
 // 快传
-func (y *Yun189PC) FastUpload(ctx context.Context, dstDir model.Obj, file model.FileStreamer, up driver.UpdateProgress) (err error) {
+func (y *Cloud189PC) FastUpload(ctx context.Context, dstDir model.Obj, file model.FileStreamer, up driver.UpdateProgress) (err error) {
 	// 需要获取完整文件md5,必须支持 io.Seek
 	tempFile, err := utils.CreateTempFile(file.GetReadCloser())
 	if err != nil {
@@ -511,10 +509,8 @@ func (y *Yun189PC) FastUpload(ctx context.Context, dstDir model.Obj, file model.
 	silceMd5Hexs := make([]string, 0, count)
 	silceMd5Base64s := make([]string, 0, count)
 	for i := 1; i <= count; i++ {
-		select {
+		if utils.IsCanceled(ctx) {
-		case <-ctx.Done():
 			return ctx.Err()
-		default:
 		}
 
 		silceMd5.Reset()
@@ -616,11 +612,11 @@ func (y *Yun189PC) FastUpload(ctx context.Context, dstDir model.Obj, file model.
 	return err
 }
 
-func (y *Yun189PC) isFamily() bool {
+func (y *Cloud189PC) isFamily() bool {
 	return y.Type == "family"
 }
 
-func (y *Yun189PC) isLogin() bool {
+func (y *Cloud189PC) isLogin() bool {
 	if y.tokenInfo == nil {
 		return false
 	}
@@ -629,7 +625,7 @@ func (y *Yun189PC) isLogin() bool {
 }
 
 // 获取家庭云所有用户信息
-func (y *Yun189PC) getFamilyInfoList() ([]FamilyInfoResp, error) {
+func (y *Cloud189PC) getFamilyInfoList() ([]FamilyInfoResp, error) {
 	var resp FamilyInfoListResp
 	_, err := y.get(API_URL+"/family/manage/getFamilyList.action", nil, &resp)
 	if err != nil {
@@ -639,7 +635,7 @@ func (y *Yun189PC) getFamilyInfoList() ([]FamilyInfoResp, error) {
 }
 
 // 抽取家庭云ID
-func (y *Yun189PC) getFamilyID() (string, error) {
+func (y *Cloud189PC) getFamilyID() (string, error) {
 	infos, err := y.getFamilyInfoList()
 	if err != nil {
 		return "", err

drivers/alist_v2/driver.go

@@ -7,7 +7,6 @@ import (
 	"github.com/alist-org/alist/v3/internal/driver"
 	"github.com/alist-org/alist/v3/internal/errs"
 	"github.com/alist-org/alist/v3/internal/model"
-	"github.com/alist-org/alist/v3/pkg/utils"
 	"github.com/alist-org/alist/v3/server/common"
 )
 
@@ -21,18 +20,16 @@ func (d *AListV2) Config() driver.Config {
 }
 
 func (d *AListV2) GetAddition() driver.Additional {
-	return d.Addition
+	return &d.Addition
 }
 
-func (d *AListV2) Init(ctx context.Context, storage model.Storage) error {
+func (d *AListV2) Init(ctx context.Context) error {
-	d.Storage = storage
+	if len(d.Addition.Address) > 0 && string(d.Addition.Address[len(d.Addition.Address)-1]) == "/" {
-	err := utils.Json.UnmarshalFromString(d.Storage.Addition, &d.Addition)
+		d.Addition.Address = d.Addition.Address[0 : len(d.Addition.Address)-1]
-	if err != nil {
-		return err
 	}
 	// TODO login / refresh token
 	//op.MustSaveDriverStorage(d)
-	return err
+	return nil
 }
 
 func (d *AListV2) Drop(ctx context.Context) error {
@@ -70,11 +67,6 @@ func (d *AListV2) List(ctx context.Context, dir model.Obj, args model.ListArgs)
 	return files, nil
 }
 
-//func (d *AList) Get(ctx context.Context, path string) (model.Obj, error) {
-//	// this is optional
-//	return nil, errs.NotImplement
-//}
-
 func (d *AListV2) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
 	url := d.Address + "/api/public/path"
 	var resp common.Resp[PathResp]

drivers/alist_v2/meta.go

@@ -20,7 +20,7 @@ var config = driver.Config{
 }
 
 func init() {
-	op.RegisterDriver(config, func() driver.Driver {
+	op.RegisterDriver(func() driver.Driver {
 		return &AListV2{}
 	})
 }

drivers/alist_v3/driver.go

@@ -2,12 +2,14 @@ package alist_v3
 
 import (
 	"context"
+	"io"
+	"path"
+	"strconv"
+	"strings"
 
 	"github.com/alist-org/alist/v3/drivers/base"
 	"github.com/alist-org/alist/v3/internal/driver"
-	"github.com/alist-org/alist/v3/internal/errs"
 	"github.com/alist-org/alist/v3/internal/model"
-	"github.com/alist-org/alist/v3/pkg/utils"
 	"github.com/alist-org/alist/v3/server/common"
 )
 
@@ -21,18 +23,14 @@ func (d *AListV3) Config() driver.Config {
 }
 
 func (d *AListV3) GetAddition() driver.Additional {
-	return d.Addition
+	return &d.Addition
 }
 
-func (d *AListV3) Init(ctx context.Context, storage model.Storage) error {
+func (d *AListV3) Init(ctx context.Context) error {
-	d.Storage = storage
+	d.Addition.Address = strings.TrimSuffix(d.Addition.Address, "/")
-	err := utils.Json.UnmarshalFromString(d.Storage.Addition, &d.Addition)
-	if err != nil {
-		return err
-	}
 	// TODO login / refresh token
 	//op.MustSaveDriverStorage(d)
-	return err
+	return nil
 }
 
 func (d *AListV3) Drop(ctx context.Context) error {
@@ -46,7 +44,7 @@ func (d *AListV3) List(ctx context.Context, dir model.Obj, args model.ListArgs)
 		SetResult(&resp).
 		SetHeader("Authorization", d.AccessToken).
 		SetBody(ListReq{
-			PageReq: common.PageReq{
+			PageReq: model.PageReq{
 				Page:    1,
 				PerPage: 0,
 			},
@@ -73,11 +71,6 @@ func (d *AListV3) List(ctx context.Context, dir model.Obj, args model.ListArgs)
 	return files, nil
 }
 
-//func (d *AList) Get(ctx context.Context, path string) (model.Obj, error) {
-//	// this is optional
-//	return nil, errs.NotImplement
-//}
-
 func (d *AListV3) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
 	url := d.Address + "/api/fs/get"
 	var resp common.Resp[FsGetResp]
@@ -97,27 +90,86 @@ func (d *AListV3) Link(ctx context.Context, file model.Obj, args model.LinkArgs)
 }
 
 func (d *AListV3) MakeDir(ctx context.Context, parentDir model.Obj, dirName string) error {
-	return errs.NotImplement
+	url := d.Address + "/api/fs/mkdir"
+	var resp common.Resp[interface{}]
+	_, err := base.RestyClient.R().
+		SetResult(&resp).
+		SetHeader("Authorization", d.AccessToken).
+		SetBody(MkdirOrLinkReq{
+			Path: path.Join(parentDir.GetPath(), dirName),
+		}).Post(url)
+	return checkResp(resp, err)
 }
 
 func (d *AListV3) Move(ctx context.Context, srcObj, dstDir model.Obj) error {
-	return errs.NotImplement
+	url := d.Address + "/api/fs/move"
+	var resp common.Resp[interface{}]
+	_, err := base.RestyClient.R().
+		SetResult(&resp).
+		SetHeader("Authorization", d.AccessToken).
+		SetBody(MoveCopyReq{
+			SrcDir: path.Dir(srcObj.GetPath()),
+			DstDir: dstDir.GetPath(),
+			Names:  []string{srcObj.GetName()},
+		}).Post(url)
+	return checkResp(resp, err)
 }
 
 func (d *AListV3) Rename(ctx context.Context, srcObj model.Obj, newName string) error {
-	return errs.NotImplement
+	url := d.Address + "/api/fs/rename"
+	var resp common.Resp[interface{}]
+	_, err := base.RestyClient.R().
+		SetResult(&resp).
+		SetHeader("Authorization", d.AccessToken).
+		SetBody(RenameReq{
+			Path: srcObj.GetPath(),
+			Name: newName,
+		}).Post(url)
+	return checkResp(resp, err)
 }
 
 func (d *AListV3) Copy(ctx context.Context, srcObj, dstDir model.Obj) error {
-	return errs.NotImplement
+	url := d.Address + "/api/fs/copy"
+	var resp common.Resp[interface{}]
+	_, err := base.RestyClient.R().
+		SetResult(&resp).
+		SetHeader("Authorization", d.AccessToken).
+		SetBody(MoveCopyReq{
+			SrcDir: path.Dir(srcObj.GetPath()),
+			DstDir: dstDir.GetPath(),
+			Names:  []string{srcObj.GetName()},
+		}).Post(url)
+	return checkResp(resp, err)
 }
 
 func (d *AListV3) Remove(ctx context.Context, obj model.Obj) error {
-	return errs.NotImplement
+	url := d.Address + "/api/fs/remove"
+	var resp common.Resp[interface{}]
+	_, err := base.RestyClient.R().
+		SetResult(&resp).
+		SetHeader("Authorization", d.AccessToken).
+		SetBody(RemoveReq{
+			Dir:   path.Dir(obj.GetPath()),
+			Names: []string{obj.GetName()},
+		}).Post(url)
+	return checkResp(resp, err)
 }
 
 func (d *AListV3) Put(ctx context.Context, dstDir model.Obj, stream model.FileStreamer, up driver.UpdateProgress) error {
-	return errs.NotImplement
+	url := d.Address + "/api/fs/put"
+	var resp common.Resp[interface{}]
+	fileBytes, err := io.ReadAll(stream.GetReadCloser())
+	if err != nil {
+		return nil
+	}
+	_, err = base.RestyClient.R().SetContext(ctx).
+		SetResult(&resp).
+		SetHeader("Authorization", d.AccessToken).
+		SetHeader("File-Path", path.Join(dstDir.GetPath(), stream.GetName())).
+		SetHeader("Password", d.Password).
+		SetHeader("Content-Length", strconv.FormatInt(stream.GetSize(), 10)).
+		SetBody(fileBytes).Put(url)
+	return checkResp(resp, err)
 }
 
 //func (d *AList) Other(ctx context.Context, args model.OtherArgs) (interface{}, error) {

drivers/alist_v3/meta.go

@@ -15,12 +15,11 @@ type Addition struct {
 var config = driver.Config{
 	Name:        "AList V3",
 	LocalSort:   true,
-	NoUpload:    true,
 	DefaultRoot: "/",
 }
 
 func init() {
-	op.RegisterDriver(config, func() driver.Driver {
+	op.RegisterDriver(func() driver.Driver {
 		return &AListV3{}
 	})
 }

drivers/alist_v3/types.go

@@ -3,11 +3,11 @@ package alist_v3
 import (
 	"time"
 
-	"github.com/alist-org/alist/v3/server/common"
+	"github.com/alist-org/alist/v3/internal/model"
 )
 
 type ListReq struct {
-	common.PageReq
+	model.PageReq
 	Path     string `json:"path" form:"path"`
 	Password string `json:"password" form:"password"`
 	Refresh  bool   `json:"refresh"`
@@ -43,3 +43,23 @@ type FsGetResp struct {
 	Provider string    `json:"provider"`
 	Related  []ObjResp `json:"related"`
 }
+
+type MkdirOrLinkReq struct {
+	Path string `json:"path" form:"path"`
+}
+
+type MoveCopyReq struct {
+	SrcDir string   `json:"src_dir"`
+	DstDir string   `json:"dst_dir"`
+	Names  []string `json:"names"`
+}
+
+type RenameReq struct {
+	Path string `json:"path"`
+	Name string `json:"name"`
+}
+
+type RemoveReq struct {
+	Dir   string   `json:"dir"`
+	Names []string `json:"names"`
+}

drivers/alist_v3/util.go

@@ -1 +1,17 @@
 package alist_v3
+
+import (
+	"errors"
+
+	"github.com/alist-org/alist/v3/server/common"
+)
+
+func checkResp(resp common.Resp[interface{}], err error) error {
+	if err != nil {
+		return err
+	}
+	if resp.Message == "success" {
+		return nil
+	}
+	return errors.New(resp.Message)
+}

drivers/aliyundrive/driver.go

@@ -38,18 +38,13 @@ func (d *AliDrive) Config() driver.Config {
 }
 
 func (d *AliDrive) GetAddition() driver.Additional {
-	return d.Addition
+	return &d.Addition
 }
 
-func (d *AliDrive) Init(ctx context.Context, storage model.Storage) error {
+func (d *AliDrive) Init(ctx context.Context) error {
-	d.Storage = storage
-	err := utils.Json.UnmarshalFromString(d.Storage.Addition, &d.Addition)
-	if err != nil {
-		return err
-	}
 	// TODO login / refresh token
 	//op.MustSaveDriverStorage(d)
-	err = d.refreshToken()
+	err := d.refreshToken()
 	if err != nil {
 		return err
 	}
@@ -86,11 +81,6 @@ func (d *AliDrive) List(ctx context.Context, dir model.Obj, args model.ListArgs)
 	})
 }
 
-//func (d *AliDrive) Get(ctx context.Context, path string) (model.Obj, error) {
-//	// TODO this is optional
-//	return nil, errs.NotImplement
-//}
-
 func (d *AliDrive) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
 	data := base.Json{
 		"drive_id":   d.DriveId,
@@ -258,10 +248,14 @@ func (d *AliDrive) Put(ctx context.Context, dstDir model.Obj, stream model.FileS
 	}
 
 	for i, partInfo := range resp.PartInfoList {
+		if utils.IsCanceled(ctx) {
+			return ctx.Err()
+		}
 		req, err := http.NewRequest("PUT", partInfo.UploadUrl, io.LimitReader(file, DEFAULT))
 		if err != nil {
 			return err
 		}
+		req = req.WithContext(ctx)
 		res, err := base.HttpClient.Do(req)
 		if err != nil {
 			return err

drivers/aliyundrive/meta.go

@@ -18,10 +18,8 @@ var config = driver.Config{
 	DefaultRoot: "root",
 }
 
-func New() driver.Driver {
-	return &AliDrive{}
-}
-
 func init() {
-	op.RegisterDriver(config, New)
+	op.RegisterDriver(func() driver.Driver {
+		return &AliDrive{}
+	})
 }

drivers/aliyundrive/util.go

@@ -29,6 +29,9 @@ func (d *AliDrive) refreshToken() error {
 	if e.Code != "" {
 		return fmt.Errorf("failed to refresh token: %s", e.Message)
 	}
+	if resp.RefreshToken == "" {
+		return errors.New("failed to refresh token: refresh token is empty")
+	}
 	d.RefreshToken, d.AccessToken = resp.RefreshToken, resp.AccessToken
 	op.MustSaveDriverStorage(d)
 	return nil
@@ -62,6 +65,8 @@ func (d *AliDrive) request(url, method string, callback base.ReqCallback, resp i
 			return d.request(url, method, callback, resp)
 		}
 		return nil, errors.New(e.Message), e
+	} else if res.IsError() {
+		return nil, errors.New("bad status code " + res.Status()), e
 	}
 	return res.Body(), nil, e
 }

drivers/aliyundrive_share/driver.go

@@ -8,7 +8,6 @@ import (
 
 	"github.com/alist-org/alist/v3/drivers/base"
 	"github.com/alist-org/alist/v3/internal/driver"
-	"github.com/alist-org/alist/v3/internal/errs"
 	"github.com/alist-org/alist/v3/internal/model"
 	"github.com/alist-org/alist/v3/pkg/cron"
 	"github.com/alist-org/alist/v3/pkg/utils"
@@ -29,16 +28,11 @@ func (d *AliyundriveShare) Config() driver.Config {
 }
 
 func (d *AliyundriveShare) GetAddition() driver.Additional {
-	return d.Addition
+	return &d.Addition
 }
 
-func (d *AliyundriveShare) Init(ctx context.Context, storage model.Storage) error {
+func (d *AliyundriveShare) Init(ctx context.Context) error {
-	d.Storage = storage
+	err := d.refreshToken()
-	err := utils.Json.UnmarshalFromString(d.Storage.Addition, &d.Addition)
-	if err != nil {
-		return err
-	}
-	err = d.refreshToken()
 	if err != nil {
 		return err
 	}
@@ -73,69 +67,42 @@ func (d *AliyundriveShare) List(ctx context.Context, dir model.Obj, args model.L
 	})
 }
 
-//func (d *AliyundriveShare) Get(ctx context.Context, path string) (model.Obj, error) {
-//	// this is optional
-//	return nil, errs.NotImplement
-//}
-
 func (d *AliyundriveShare) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
 	data := base.Json{
-		"drive_id":   d.DriveId,
+		"drive_id": d.DriveId,
-		"file_id":    file.GetID(),
+		"file_id":  file.GetID(),
-		"expire_sec": 14400,
+		// // Only ten minutes lifetime
+		"expire_sec": 600,
+		"share_id":   d.ShareId,
 	}
+	var resp ShareLinkResp
 	var e ErrorResp
-	res, err := base.RestyClient.R().
+	_, err := base.RestyClient.R().
-		SetError(&e).SetBody(data).
+		SetError(&e).SetBody(data).SetResult(&resp).
 		SetHeader("content-type", "application/json").
 		SetHeader("Authorization", "Bearer\t"+d.AccessToken).
-		Post("https://api.aliyundrive.com/v2/file/get_download_url")
+		SetHeader("x-share-token", d.ShareToken).
+		Post("https://api.aliyundrive.com/v2/file/get_share_link_download_url")
 	if err != nil {
 		return nil, err
 	}
 	var u string
 	if e.Code != "" {
-		if e.Code == "AccessTokenInvalid" {
+		if e.Code == "AccessTokenInvalid" || e.Code == "ShareLinkTokenInvalid" {
-			err = d.refreshToken()
+			if e.Code == "AccessTokenInvalid" {
+				err = d.refreshToken()
+			} else {
+				err = d.getShareToken()
+			}
 			if err != nil {
 				return nil, err
 			}
 			return d.Link(ctx, file, args)
-		} else if e.Code == "ForbiddenNoPermission.File" {
-			data = utils.MergeMap(data, base.Json{
-				// Only ten minutes valid
-				"expire_sec": 600,
-				"share_id":   d.ShareId,
-			})
-			var resp ShareLinkResp
-			var e2 ErrorResp
-			_, err = base.RestyClient.R().
-				SetError(&e2).SetBody(data).SetResult(&resp).
-				SetHeader("content-type", "application/json").
-				SetHeader("Authorization", "Bearer\t"+d.AccessToken).
-				SetHeader("x-share-token", d.ShareToken).
-				Post("https://api.aliyundrive.com/v2/file/get_share_link_download_url")
-			if err != nil {
-				return nil, err
-			}
-			if e2.Code != "" {
-				if e2.Code == "AccessTokenInvalid" || e2.Code == "ShareLinkTokenInvalid" {
-					err = d.getShareToken()
-					if err != nil {
-						return nil, err
-					}
-					return d.Link(ctx, file, args)
-				} else {
-					return nil, errors.New(e2.Code + ":" + e2.Message)
-				}
-			} else {
-				u = resp.DownloadUrl
-			}
 		} else {
-			return nil, errors.New(e.Code + ":" + e.Message)
+			return nil, errors.New(e.Code + ": " + e.Message)
 		}
 	} else {
-		u = utils.Json.Get(res.Body(), "url").ToString()
+		u = resp.DownloadUrl
 	}
 	return &model.Link{
 		Header: http.Header{
@@ -145,34 +112,4 @@ func (d *AliyundriveShare) Link(ctx context.Context, file model.Obj, args model.
 	}, nil
 }
 
-func (d *AliyundriveShare) MakeDir(ctx context.Context, parentDir model.Obj, dirName string) error {
-	// TODO create folder
-	return errs.NotSupport
-}
-
-func (d *AliyundriveShare) Move(ctx context.Context, srcObj, dstDir model.Obj) error {
-	// TODO move obj
-	return errs.NotSupport
-}
-
-func (d *AliyundriveShare) Rename(ctx context.Context, srcObj model.Obj, newName string) error {
-	// TODO rename obj
-	return errs.NotSupport
-}
-
-func (d *AliyundriveShare) Copy(ctx context.Context, srcObj, dstDir model.Obj) error {
-	// TODO copy obj
-	return errs.NotSupport
-}
-
-func (d *AliyundriveShare) Remove(ctx context.Context, obj model.Obj) error {
-	// TODO remove obj
-	return errs.NotSupport
-}
-
-func (d *AliyundriveShare) Put(ctx context.Context, dstDir model.Obj, stream model.FileStreamer, up driver.UpdateProgress) error {
-	// TODO upload file
-	return errs.NotSupport
-}
-
 var _ driver.Driver = (*AliyundriveShare)(nil)

drivers/aliyundrive_share/meta.go

@@ -23,7 +23,7 @@ var config = driver.Config{
 }
 
 func init() {
-	op.RegisterDriver(config, func() driver.Driver {
+	op.RegisterDriver(func() driver.Driver {
 		return &AliyundriveShare{}
 	})
 }

drivers/all.go

@@ -12,6 +12,7 @@ import (
 	_ "github.com/alist-org/alist/v3/drivers/aliyundrive_share"
 	_ "github.com/alist-org/alist/v3/drivers/baidu_netdisk"
 	_ "github.com/alist-org/alist/v3/drivers/baidu_photo"
+	_ "github.com/alist-org/alist/v3/drivers/cloudreve"
 	_ "github.com/alist-org/alist/v3/drivers/ftp"
 	_ "github.com/alist-org/alist/v3/drivers/google_drive"
 	_ "github.com/alist-org/alist/v3/drivers/google_photo"
@@ -21,11 +22,14 @@ import (
 	_ "github.com/alist-org/alist/v3/drivers/mega"
 	_ "github.com/alist-org/alist/v3/drivers/onedrive"
 	_ "github.com/alist-org/alist/v3/drivers/pikpak"
+	_ "github.com/alist-org/alist/v3/drivers/pikpak_share"
 	_ "github.com/alist-org/alist/v3/drivers/quark"
 	_ "github.com/alist-org/alist/v3/drivers/s3"
+	_ "github.com/alist-org/alist/v3/drivers/seafile"
 	_ "github.com/alist-org/alist/v3/drivers/sftp"
 	_ "github.com/alist-org/alist/v3/drivers/smb"
 	_ "github.com/alist-org/alist/v3/drivers/teambition"
+	_ "github.com/alist-org/alist/v3/drivers/terabox"
 	_ "github.com/alist-org/alist/v3/drivers/thunder"
 	_ "github.com/alist-org/alist/v3/drivers/uss"
 	_ "github.com/alist-org/alist/v3/drivers/virtual"

drivers/baidu_netdisk/driver.go

@@ -31,15 +31,10 @@ func (d *BaiduNetdisk) Config() driver.Config {
 }
 
 func (d *BaiduNetdisk) GetAddition() driver.Additional {
-	return d.Addition
+	return &d.Addition
 }
 
-func (d *BaiduNetdisk) Init(ctx context.Context, storage model.Storage) error {
+func (d *BaiduNetdisk) Init(ctx context.Context) error {
-	d.Storage = storage
-	err := utils.Json.UnmarshalFromString(d.Storage.Addition, &d.Addition)
-	if err != nil {
-		return err
-	}
 	return d.refreshToken()
 }
 
@@ -57,11 +52,6 @@ func (d *BaiduNetdisk) List(ctx context.Context, dir model.Obj, args model.ListA
 	})
 }
 
-//func (d *BaiduNetdisk) Get(ctx context.Context, path string) (model.Obj, error) {
-//	// this is optional
-//	return nil, errs.NotImplement
-//}
-
 func (d *BaiduNetdisk) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
 	if d.DownloadAPI == "crack" {
 		return d.linkCrack(file, args)
@@ -98,12 +88,11 @@ func (d *BaiduNetdisk) Rename(ctx context.Context, srcObj model.Obj, newName str
 }
 
 func (d *BaiduNetdisk) Copy(ctx context.Context, srcObj, dstDir model.Obj) error {
-	dest, newname := stdpath.Split(dstDir.GetPath())
 	data := []base.Json{
 		{
 			"path":    srcObj.GetPath(),
-			"dest":    dest,
+			"dest":    dstDir.GetPath(),
-			"newname": newname,
+			"newname": srcObj.GetName(),
 		},
 	}
 	_, err := d.manage("copy", data)
@@ -175,7 +164,8 @@ func (d *BaiduNetdisk) Put(ctx context.Context, dstDir model.Obj, stream model.F
 			return err
 		}
 	}
-	path := encodeURIComponent(stdpath.Join(dstDir.GetPath(), stream.GetName()))
+	rawPath := stdpath.Join(dstDir.GetPath(), stream.GetName())
+	path := encodeURIComponent(rawPath)
 	block_list_str := fmt.Sprintf("[%s]", strings.Join(block_list, ","))
 	data := fmt.Sprintf("path=%s&size=%d&isdir=0&autoinit=1&block_list=%s&content-md5=%s&slice-md5=%s",
 		path, stream.GetSize(),
@@ -202,6 +192,9 @@ func (d *BaiduNetdisk) Put(ctx context.Context, dstDir model.Obj, stream model.F
 	}
 	left = stream.GetSize()
 	for i, partseq := range precreateResp.BlockList {
+		if utils.IsCanceled(ctx) {
+			return ctx.Err()
+		}
 		byteSize := Default
 		var byteData []byte
 		if left < Default {
@@ -217,7 +210,11 @@ func (d *BaiduNetdisk) Put(ctx context.Context, dstDir model.Obj, stream model.F
 		}
 		u := "https://d.pcs.baidu.com/rest/2.0/pcs/superfile2"
 		params["partseq"] = strconv.Itoa(partseq)
-		res, err := base.RestyClient.R().SetQueryParams(params).SetFileReader("file", stream.GetName(), bytes.NewReader(byteData)).Post(u)
+		res, err := base.RestyClient.R().
+			SetContext(ctx).
+			SetQueryParams(params).
+			SetFileReader("file", stream.GetName(), bytes.NewReader(byteData)).
+			Post(u)
 		if err != nil {
 			return err
 		}
@@ -226,7 +223,7 @@ func (d *BaiduNetdisk) Put(ctx context.Context, dstDir model.Obj, stream model.F
 			up(i * 100 / len(precreateResp.BlockList))
 		}
 	}
-	_, err = d.create(path, stream.GetSize(), 0, precreateResp.Uploadid, block_list_str)
+	_, err = d.create(rawPath, stream.GetSize(), 0, precreateResp.Uploadid, block_list_str)
 	return err
 }
 

drivers/baidu_netdisk/meta.go

@@ -20,10 +20,8 @@ var config = driver.Config{
 	DefaultRoot: "/",
 }
 
-func New() driver.Driver {
-	return &BaiduNetdisk{}
-}
-
 func init() {
-	op.RegisterDriver(config, New)
+	op.RegisterDriver(func() driver.Driver {
+		return &BaiduNetdisk{}
+	})
 }

drivers/baidu_netdisk/util.go

@@ -187,7 +187,7 @@ func (d *BaiduNetdisk) create(path string, size int64, isdir int, uploadid, bloc
 	params := map[string]string{
 		"method": "create",
 	}
-	data := fmt.Sprintf("path=%s&size=%d&isdir=%d", path, size, isdir)
+	data := fmt.Sprintf("path=%s&size=%d&isdir=%d", encodeURIComponent(path), size, isdir)
 	if uploadid != "" {
 		data += fmt.Sprintf("&uploadid=%s&block_list=%s", uploadid, block_list)
 	}

drivers/baidu_photo/driver.go

@@ -9,6 +9,8 @@ import (
 	"math"
 	"os"
 	"regexp"
+	"strconv"
+	"strings"
 
 	"github.com/alist-org/alist/v3/internal/driver"
 	"github.com/alist-org/alist/v3/internal/errs"
@@ -22,6 +24,8 @@ type BaiduPhoto struct {
 	Addition
 
 	AccessToken string
+	Uk          int64
+	root        model.Obj
 }
 
 func (d *BaiduPhoto) Config() driver.Config {
@@ -29,155 +33,182 @@ func (d *BaiduPhoto) Config() driver.Config {
 }
 
 func (d *BaiduPhoto) GetAddition() driver.Additional {
-	return d.Addition
+	return &d.Addition
 }
 
-func (d *BaiduPhoto) Init(ctx context.Context, storage model.Storage) error {
+func (d *BaiduPhoto) Init(ctx context.Context) error {
-	d.Storage = storage
+	if err := d.refreshToken(); err != nil {
-	err := utils.Json.UnmarshalFromString(d.Storage.Addition, &d.Addition)
+		return err
+	}
+
+	// root
+	if d.AlbumID != "" {
+		albumID := strings.Split(d.AlbumID, "|")[0]
+		album, err := d.GetAlbumDetail(ctx, albumID)
+		if err != nil {
+			return err
+		}
+		d.root = album
+	} else {
+		d.root = &Root{
+			Name:     "root",
+			Modified: d.Modified,
+			IsFolder: true,
+		}
+	}
+
+	// uk
+	info, err := d.uInfo()
 	if err != nil {
 		return err
 	}
-	return d.refreshToken()
+	d.Uk, err = strconv.ParseInt(info.YouaID, 10, 64)
+	return err
+}
+
+func (d *BaiduPhoto) GetRoot(ctx context.Context) (model.Obj, error) {
+	return d.root, nil
 }
 
 func (d *BaiduPhoto) Drop(ctx context.Context) error {
+	d.AccessToken = ""
+	d.Uk = 0
+	d.root = nil
 	return nil
 }
 
 func (d *BaiduPhoto) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([]model.Obj, error) {
-	var objs []model.Obj
 	var err error
-	if IsRoot(dir) {
-		var albums []Album
-		if d.ShowType != "root_only_file" {
-			albums, err = d.GetAllAlbum(ctx)
-			if err != nil {
-				return nil, err
-			}
-		}
 
-		var files []File
+	/* album */
-		if d.ShowType != "root_only_album" {
+	if album, ok := dir.(*Album); ok {
-			files, err = d.GetAllFile(ctx)
-			if err != nil {
-				return nil, err
-			}
-		}
-
-		alubmName := make(map[string]int)
-		objs, _ = utils.SliceConvert(albums, func(album Album) (model.Obj, error) {
-			i := alubmName[album.GetName()]
-			if i != 0 {
-				alubmName[album.GetName()]++
-				album.Title = fmt.Sprintf("%s(%d)", album.Title, i)
-			}
-			alubmName[album.GetName()]++
-			return &album, nil
-		})
-		for i := 0; i < len(files); i++ {
-			objs = append(objs, &files[i])
-		}
-	} else if IsAlbum(dir) || IsAlbumRoot(dir) {
 		var files []AlbumFile
-		files, err = d.GetAllAlbumFile(ctx, splitID(dir.GetID())[0], "")
+		files, err = d.GetAllAlbumFile(ctx, album, "")
 		if err != nil {
 			return nil, err
 		}
-		objs = make([]model.Obj, 0, len(files))
+
-		for i := 0; i < len(files); i++ {
+		return utils.MustSliceConvert(files, func(file AlbumFile) model.Obj {
-			objs = append(objs, &files[i])
+			return &file
+		}), nil
+	}
+
+	/* root */
+	var albums []Album
+	if d.ShowType != "root_only_file" {
+		albums, err = d.GetAllAlbum(ctx)
+		if err != nil {
+			return nil, err
 		}
 	}
-	return objs, nil
+
+	var files []File
+	if d.ShowType != "root_only_album" {
+		files, err = d.GetAllFile(ctx)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	return append(
+		utils.MustSliceConvert(albums, func(album Album) model.Obj {
+			return &album
+		}),
+		utils.MustSliceConvert(files, func(album File) model.Obj {
+			return &album
+		})...,
+	), nil
+
 }
 
 func (d *BaiduPhoto) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
-	if IsAlbumFile(file) {
+	switch file := file.(type) {
-		return d.linkAlbum(ctx, file, args)
+	case *File:
-	} else if IsFile(file) {
 		return d.linkFile(ctx, file, args)
+	case *AlbumFile:
+		return d.linkAlbum(ctx, file, args)
 	}
 	return nil, errs.NotFile
 }
 
-func (d *BaiduPhoto) MakeDir(ctx context.Context, parentDir model.Obj, dirName string) error {
+var joinReg = regexp.MustCompile(`(?i)join:([\S]*)`)
-	if IsRoot(parentDir) {
+
-		code := regexp.MustCompile(`(?i)join:([\S]*)`).FindStringSubmatch(dirName)
+func (d *BaiduPhoto) MakeDir(ctx context.Context, parentDir model.Obj, dirName string) (model.Obj, error) {
+	if _, ok := parentDir.(*Root); ok {
+		code := joinReg.FindStringSubmatch(dirName)
 		if len(code) > 1 {
 			return d.JoinAlbum(ctx, code[1])
 		}
 		return d.CreateAlbum(ctx, dirName)
 	}
-	return errs.NotSupport
+	return nil, errs.NotSupport
 }
 
-func (d *BaiduPhoto) Copy(ctx context.Context, srcObj, dstDir model.Obj) error {
+func (d *BaiduPhoto) Copy(ctx context.Context, srcObj, dstDir model.Obj) (model.Obj, error) {
-	if IsFile(srcObj) {
+	switch file := srcObj.(type) {
-		if IsAlbum(dstDir) {
+	case *File:
+		if album, ok := dstDir.(*Album); ok {
 			//rootfile ->  album
-			e := splitID(dstDir.GetID())
+			return d.AddAlbumFile(ctx, album, file)
-			return d.AddAlbumFile(ctx, e[0], e[1], srcObj.GetID())
 		}
-	} else if IsAlbumFile(srcObj) {
+	case *AlbumFile:
-		if IsRoot(dstDir) {
+		switch album := dstDir.(type) {
+		case *Root:
 			//albumfile -> root
-			e := splitID(srcObj.GetID())
+			return d.CopyAlbumFile(ctx, file)
-			_, err := d.CopyAlbumFile(ctx, e[1], e[2], e[3], srcObj.GetID())
+		case *Album:
-			return err
-		} else if IsAlbum(dstDir) {
 			// albumfile -> root -> album
-			e := splitID(srcObj.GetID())
+			rootfile, err := d.CopyAlbumFile(ctx, file)
-			file, err := d.CopyAlbumFile(ctx, e[1], e[2], e[3], srcObj.GetID())
 			if err != nil {
-				return err
+				return nil, err
 			}
-			e = splitID(dstDir.GetID())
+			return d.AddAlbumFile(ctx, album, rootfile)
-			return d.AddAlbumFile(ctx, e[0], e[1], fmt.Sprint(file.Fsid))
 		}
 	}
-	return errs.NotSupport
+	return nil, errs.NotSupport
 }
 
-func (d *BaiduPhoto) Move(ctx context.Context, srcObj, dstDir model.Obj) error {
+func (d *BaiduPhoto) Move(ctx context.Context, srcObj, dstDir model.Obj) (model.Obj, error) {
 	// 仅支持相册之间移动
-	if IsAlbumFile(srcObj) && IsAlbum(dstDir) {
+	if file, ok := srcObj.(*AlbumFile); ok {
-		err := d.Copy(ctx, srcObj, dstDir)
+		if _, ok := dstDir.(*Album); ok {
-		if err != nil {
+			newObj, err := d.Copy(ctx, srcObj, dstDir)
-			return err
+			if err != nil {
+				return nil, err
+			}
+			// 删除原相册文件
+			_ = d.DeleteAlbumFile(ctx, file)
+			return newObj, nil
 		}
-		e := splitID(srcObj.GetID())
-		return d.DeleteAlbumFile(ctx, e[1], e[2], srcObj.GetID())
 	}
-	return errs.NotSupport
+	return nil, errs.NotSupport
 }
 
-func (d *BaiduPhoto) Rename(ctx context.Context, srcObj model.Obj, newName string) error {
+func (d *BaiduPhoto) Rename(ctx context.Context, srcObj model.Obj, newName string) (model.Obj, error) {
 	// 仅支持相册改名
-	if IsAlbum(srcObj) {
+	if album, ok := srcObj.(*Album); ok {
-		e := splitID(srcObj.GetID())
+		return d.SetAlbumName(ctx, album, newName)
-		return d.SetAlbumName(ctx, e[0], e[1], newName)
 	}
-	return errs.NotSupport
+	return nil, errs.NotSupport
 }
 
 func (d *BaiduPhoto) Remove(ctx context.Context, obj model.Obj) error {
-	e := splitID(obj.GetID())
+	switch obj := obj.(type) {
-	if IsFile(obj) {
+	case *File:
-		return d.DeleteFile(ctx, e[0])
+		return d.DeleteFile(ctx, obj)
-	} else if IsAlbum(obj) {
+	case *AlbumFile:
-		return d.DeleteAlbum(ctx, e[0], e[1])
+		return d.DeleteAlbumFile(ctx, obj)
-	} else if IsAlbumFile(obj) {
+	case *Album:
-		return d.DeleteAlbumFile(ctx, e[1], e[2], obj.GetID())
+		return d.DeleteAlbum(ctx, obj)
 	}
 	return errs.NotSupport
 }
 
-func (d *BaiduPhoto) Put(ctx context.Context, dstDir model.Obj, stream model.FileStreamer, up driver.UpdateProgress) error {
+func (d *BaiduPhoto) Put(ctx context.Context, dstDir model.Obj, stream model.FileStreamer, up driver.UpdateProgress) (model.Obj, error) {
 	// 需要获取完整文件md5,必须支持 io.Seek
 	tempFile, err := utils.CreateTempFile(stream.GetReadCloser())
 	if err != nil {
-		return err
+		return nil, err
 	}
 	defer func() {
 		_ = tempFile.Close()
@@ -195,20 +226,19 @@ func (d *BaiduPhoto) Put(ctx context.Context, dstDir model.Obj, stream model.Fil
 	sliceMd52 := md5.New()
 	slicemd52Write := utils.LimitWriter(sliceMd52, SliceSize)
 	for i := 1; i <= count; i++ {
-		select {
+		if utils.IsCanceled(ctx) {
-		case <-ctx.Done():
+			return nil, ctx.Err()
-			return ctx.Err()
-		default:
 		}
+
 		_, err := io.CopyN(io.MultiWriter(fileMd5, sliceMd5, slicemd52Write), tempFile, DEFAULT)
 		if err != nil && err != io.EOF && err != io.ErrUnexpectedEOF {
-			return err
+			return nil, err
 		}
 		sliceMD5List = append(sliceMD5List, hex.EncodeToString(sliceMd5.Sum(nil)))
 		sliceMd5.Reset()
 	}
 	if _, err = tempFile.Seek(0, io.SeekStart); err != nil {
-		return err
+		return nil, err
 	}
 	content_md5 := hex.EncodeToString(fileMd5.Sum(nil))
 	slice_md5 := hex.EncodeToString(sliceMd52.Sum(nil))
@@ -233,7 +263,7 @@ func (d *BaiduPhoto) Put(ctx context.Context, dstDir model.Obj, stream model.Fil
 		r.SetFormData(params)
 	}, &precreateResp)
 	if err != nil {
-		return err
+		return nil, err
 	}
 
 	switch precreateResp.ReturnType {
@@ -245,6 +275,9 @@ func (d *BaiduPhoto) Put(ctx context.Context, dstDir model.Obj, stream model.Fil
 		}
 
 		for i := 0; i < count; i++ {
+			if utils.IsCanceled(ctx) {
+				return nil, ctx.Err()
+			}
 			uploadParams["partseq"] = fmt.Sprint(i)
 			_, err = d.Post("https://c3.pcs.baidu.com/rest/2.0/pcs/superfile2", func(r *resty.Request) {
 				r.SetContext(ctx)
@@ -252,7 +285,7 @@ func (d *BaiduPhoto) Put(ctx context.Context, dstDir model.Obj, stream model.Fil
 				r.SetFileReader("file", stream.GetName(), io.LimitReader(tempFile, DEFAULT))
 			}, nil)
 			if err != nil {
-				return err
+				return nil, err
 			}
 			up(i * 100 / count)
 		}
@@ -264,19 +297,24 @@ func (d *BaiduPhoto) Put(ctx context.Context, dstDir model.Obj, stream model.Fil
 			r.SetFormData(params)
 		}, &precreateResp)
 		if err != nil {
-			return err
+			return nil, err
 		}
 		fallthrough
 	case 3: // 增加到相册
-		if IsAlbum(dstDir) || IsAlbumRoot(dstDir) {
+		rootfile := precreateResp.Data.toFile()
-			e := splitID(dstDir.GetID())
+		if album, ok := dstDir.(*Album); ok {
-			err = d.AddAlbumFile(ctx, e[0], e[1], fmt.Sprint(precreateResp.Data.FsID))
+			return d.AddAlbumFile(ctx, album, rootfile)
-			if err != nil {
-				return err
-			}
 		}
+		return rootfile, nil
 	}
-	return nil
+	return nil, errs.NotSupport
 }
 
 var _ driver.Driver = (*BaiduPhoto)(nil)
+var _ driver.GetRooter = (*BaiduPhoto)(nil)
+var _ driver.MkdirResult = (*BaiduPhoto)(nil)
+var _ driver.CopyResult = (*BaiduPhoto)(nil)
+var _ driver.MoveResult = (*BaiduPhoto)(nil)
+var _ driver.Remove = (*BaiduPhoto)(nil)
+var _ driver.PutResult = (*BaiduPhoto)(nil)
+var _ driver.RenameResult = (*BaiduPhoto)(nil)

drivers/baidu_photo/help.go

@@ -8,10 +8,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/alist-org/alist/v3/internal/model"
+	"github.com/alist-org/alist/v3/pkg/utils"
 )
 
-//Tid生成
+// Tid生成
 func getTid() string {
 	return fmt.Sprintf("3%d%.0f", time.Now().Unix(), math.Floor(9000000*rand.Float64()+1000000))
 }
@@ -26,82 +26,52 @@ func toTime(t int64) *time.Time {
 	return &tm
 }
 
-func fsidsFormat(ids ...string) string {
+func fsidsFormatNotUk(ids ...int64) string {
-	var buf []string
+	buf := utils.MustSliceConvert(ids, func(id int64) string {
-	for _, id := range ids {
+		return fmt.Sprintf(`{"fsid":%d}`, id)
-		e := splitID(id)
+	})
-		buf = append(buf, fmt.Sprintf(`{"fsid":%s,"uk":%s}`, e[0], e[3]))
-	}
 	return fmt.Sprintf("[%s]", strings.Join(buf, ","))
 }
 
-func fsidsFormatNotUk(ids ...string) string {
-	var buf []string
-	for _, id := range ids {
-		buf = append(buf, fmt.Sprintf(`{"fsid":%s}`, splitID(id)[0]))
-	}
-	return fmt.Sprintf("[%s]", strings.Join(buf, ","))
-}
-
-/*
-结构
-
-{fsid} 文件
-
-{album_id}|{tid} 相册
-
-{fsid}|{album_id}|{tid}|{uk} 相册文件
-*/
-func splitID(id string) []string {
-	return strings.SplitN(id, "|", 4)[:4]
-}
-
-/*
-结构
-
-{fsid} 文件
-
-{album_id}|{tid} 相册
-
-{fsid}|{album_id}|{tid}|{uk} 相册文件
-*/
-func joinID(ids ...interface{}) string {
-	idsStr := make([]string, 0, len(ids))
-	for _, id := range ids {
-		idsStr = append(idsStr, fmt.Sprint(id))
-	}
-	return strings.Join(idsStr, "|")
-}
-
 func getFileName(path string) string {
 	return path[strings.LastIndex(path, "/")+1:]
 }
 
-// 相册
-func IsAlbum(obj model.Obj) bool {
-	return obj.IsDir() && obj.GetPath() == "album"
-}
-
-// 根目录
-func IsRoot(obj model.Obj) bool {
-	return obj.IsDir() && obj.GetPath() == "" && obj.GetID() == ""
-}
-
-// 以相册为根目录
-func IsAlbumRoot(obj model.Obj) bool {
-	return obj.IsDir() && obj.GetPath() == "" && obj.GetID() != ""
-}
-
-// 根文件
-func IsFile(obj model.Obj) bool {
-	return !obj.IsDir() && obj.GetPath() == "file"
-}
-
-// 相册文件
-func IsAlbumFile(obj model.Obj) bool {
-	return !obj.IsDir() && obj.GetPath() == "albumfile"
-}
-
 func MustString(str string, err error) string {
 	return str
 }
+
+/*
+*	处理文件变化
+*	最大程度利用重复数据
+**/
+func copyFile(file *AlbumFile, cf *CopyFile) *File {
+	return &File{
+		Fsid:     cf.Fsid,
+		Path:     cf.Path,
+		Ctime:    cf.Ctime,
+		Mtime:    cf.Ctime,
+		Size:     file.Size,
+		Thumburl: file.Thumburl,
+	}
+}
+
+func moveFileToAlbumFile(file *File, album *Album, uk int64) *AlbumFile {
+	return &AlbumFile{
+		File:    *file,
+		AlbumID: album.AlbumID,
+		Tid:     album.Tid,
+		Uk:      uk,
+	}
+}
+
+func renameAlbum(album *Album, newName string) *Album {
+	return &Album{
+		AlbumID:    album.AlbumID,
+		Tid:        album.Tid,
+		JoinTime:   album.JoinTime,
+		CreateTime: album.CreateTime,
+		Title:      newName,
+		Mtime:      time.Now().Unix(),
+	}
+}

drivers/baidu_photo/meta.go

@@ -14,17 +14,13 @@ type Addition struct {
 	ClientSecret string `json:"client_secret" required:"true" default:"jXiFMOPVPCWlO2M5CwWQzffpNPaGTRBG"`
 }
 
-func (a Addition) GetRootId() string {
-	return a.AlbumID
-}
-
 var config = driver.Config{
 	Name:      "BaiduPhoto",
 	LocalSort: true,
 }
 
 func init() {
-	op.RegisterDriver(config, func() driver.Driver {
+	op.RegisterDriver(func() driver.Driver {
 		return &BaiduPhoto{}
 	})
 }

drivers/baidu_photo/types.go

@@ -3,6 +3,8 @@ package baiduphoto
 import (
 	"fmt"
 	"time"
+
+	"github.com/alist-org/alist/v3/internal/model"
 )
 
 type TokenErrResp struct {
@@ -19,6 +21,12 @@ type Erron struct {
 	RequestID int `json:"request_id"`
 }
 
+// 用户信息
+type UInfo struct {
+	// uk
+	YouaID string `json:"youa_id"`
+}
+
 type Page struct {
 	HasMore int    `json:"has_more"`
 	Cursor  string `json:"cursor"`
@@ -28,6 +36,8 @@ func (p Page) HasNextPage() bool {
 	return p.HasMore == 1
 }
 
+type Root = model.Object
+
 type (
 	FileListResp struct {
 		Page
@@ -55,8 +65,8 @@ func (c *File) ModTime() time.Time {
 	return *c.parseTime
 }
 func (c *File) IsDir() bool     { return false }
-func (c *File) GetID() string   { return joinID(c.Fsid) }
+func (c *File) GetID() string   { return "" }
-func (c *File) GetPath() string { return "file" }
+func (c *File) GetPath() string { return "" }
 func (c *File) Thumb() string {
 	if len(c.Thumburl) > 0 {
 		return c.Thumburl[0]
@@ -100,7 +110,7 @@ type (
 )
 
 func (a *Album) GetSize() int64  { return 0 }
-func (a *Album) GetName() string { return fmt.Sprint(a.Title) }
+func (a *Album) GetName() string { return a.Title }
 func (a *Album) ModTime() time.Time {
 	if a.parseTime == nil {
 		a.parseTime = toTime(a.Mtime)
@@ -108,11 +118,8 @@ func (a *Album) ModTime() time.Time {
 	return *a.parseTime
 }
 func (a *Album) IsDir() bool     { return true }
-func (a *Album) GetID() string   { return joinID(a.AlbumID, a.Tid) }
+func (a *Album) GetID() string   { return "" }
-func (a *Album) GetPath() string { return "album" }
+func (a *Album) GetPath() string { return "" }
-
-func (af *AlbumFile) GetID() string  { return joinID(af.Fsid, af.AlbumID, af.Tid, af.Uk) }
-func (c *AlbumFile) GetPath() string { return "albumfile" }
 
 type (
 	CopyFileResp struct {
@@ -120,7 +127,8 @@ type (
 	}
 	CopyFile struct {
 		FromFsid  int64  `json:"from_fsid"` // 源ID
-		Fsid      int64  `json:"fsid"`      // 目标ID
+		Ctime     int64  `json:"ctime"`
+		Fsid      int64  `json:"fsid"` // 目标ID
 		Path      string `json:"path"`
 		ShootTime int    `json:"shoot_time"`
 	}
@@ -134,8 +142,8 @@ type (
 		Md5            string `json:"md5"`
 		ServerFilename string `json:"server_filename"`
 		Path           string `json:"path"`
-		Ctime          int    `json:"ctime"`
+		Ctime          int64  `json:"ctime"`
-		Mtime          int    `json:"mtime"`
+		Mtime          int64  `json:"mtime"`
 		Isdir          int    `json:"isdir"`
 		Category       int    `json:"category"`
 		ServerMd5      string `json:"server_md5"`
@@ -158,6 +166,18 @@ type (
 	}
 )
 
+func (f *UploadFile) toFile() *File {
+	return &File{
+		Fsid:     f.FsID,
+		Path:     f.Path,
+		Size:     f.Size,
+		Ctime:    f.Ctime,
+		Mtime:    f.Mtime,
+		Thumburl: nil,
+	}
+}
+
+/* 共享相册部分 */
 type InviteResp struct {
 	Pdata struct {
 		// 邀请码
@@ -167,3 +187,9 @@ type InviteResp struct {
 		ShareID    string `json:"share_id"`
 	} `json:"pdata"`
 }
+
+/* 加入相册部分 */
+type JoinOrCreateAlbumResp struct {
+	AlbumID       string `json:"album_id"`
+	AlreadyExists int    `json:"already_exists"`
+}

drivers/baidu_photo/utils.go

@@ -5,7 +5,6 @@ import (
 	"errors"
 	"fmt"
 	"net/http"
-	"strings"
 
 	"github.com/alist-org/alist/v3/drivers/base"
 	"github.com/alist-org/alist/v3/internal/errs"
@@ -17,6 +16,7 @@ import (
 
 const (
 	API_URL         = "https://photo.baidu.com/youai"
+	USER_API_URL    = API_URL + "/user/v1"
 	ALBUM_API_URL   = API_URL + "/album/v1"
 	FILE_API_URL_V1 = API_URL + "/file/v1"
 	FILE_API_URL_V2 = API_URL + "/file/v2"
@@ -26,9 +26,9 @@ var (
 	ErrNotSupportName = errors.New("only chinese and english, numbers and underscores are supported, and the length is no more than 20")
 )
 
-func (p *BaiduPhoto) Request(furl string, method string, callback base.ReqCallback, resp interface{}) ([]byte, error) {
+func (d *BaiduPhoto) Request(furl string, method string, callback base.ReqCallback, resp interface{}) ([]byte, error) {
 	req := base.RestyClient.R().
-		SetQueryParam("access_token", p.AccessToken)
+		SetQueryParam("access_token", d.AccessToken)
 	if callback != nil {
 		callback(req)
 	}
@@ -49,7 +49,7 @@ func (p *BaiduPhoto) Request(furl string, method string, callback base.ReqCallba
 	case 50820:
 		return nil, fmt.Errorf("no shared albums found")
 	case -6:
-		if err = p.refreshToken(); err != nil {
+		if err = d.refreshToken(); err != nil {
 			return nil, err
 		}
 	default:
@@ -58,15 +58,15 @@ func (p *BaiduPhoto) Request(furl string, method string, callback base.ReqCallba
 	return res.Body(), nil
 }
 
-func (p *BaiduPhoto) refreshToken() error {
+func (d *BaiduPhoto) refreshToken() error {
 	u := "https://openapi.baidu.com/oauth/2.0/token"
 	var resp base.TokenResp
 	var e TokenErrResp
 	_, err := base.RestyClient.R().SetResult(&resp).SetError(&e).SetQueryParams(map[string]string{
 		"grant_type":    "refresh_token",
-		"refresh_token": p.RefreshToken,
+		"refresh_token": d.RefreshToken,
-		"client_id":     p.ClientID,
+		"client_id":     d.ClientID,
-		"client_secret": p.ClientSecret,
+		"client_secret": d.ClientSecret,
 	}).Get(u)
 	if err != nil {
 		return err
@@ -77,25 +77,25 @@ func (p *BaiduPhoto) refreshToken() error {
 	if resp.RefreshToken == "" {
 		return errs.EmptyToken
 	}
-	p.AccessToken, p.RefreshToken = resp.AccessToken, resp.RefreshToken
+	d.AccessToken, d.RefreshToken = resp.AccessToken, resp.RefreshToken
-	op.MustSaveDriverStorage(p)
+	op.MustSaveDriverStorage(d)
 	return nil
 }
 
-func (p *BaiduPhoto) Get(furl string, callback base.ReqCallback, resp interface{}) ([]byte, error) {
+func (d *BaiduPhoto) Get(furl string, callback base.ReqCallback, resp interface{}) ([]byte, error) {
-	return p.Request(furl, http.MethodGet, callback, resp)
+	return d.Request(furl, http.MethodGet, callback, resp)
 }
 
-func (p *BaiduPhoto) Post(furl string, callback base.ReqCallback, resp interface{}) ([]byte, error) {
+func (d *BaiduPhoto) Post(furl string, callback base.ReqCallback, resp interface{}) ([]byte, error) {
-	return p.Request(furl, http.MethodPost, callback, resp)
+	return d.Request(furl, http.MethodPost, callback, resp)
 }
 
 // 获取所有文件
-func (p *BaiduPhoto) GetAllFile(ctx context.Context) (files []File, err error) {
+func (d *BaiduPhoto) GetAllFile(ctx context.Context) (files []File, err error) {
 	var cursor string
 	for {
 		var resp FileListResp
-		_, err = p.Get(FILE_API_URL_V1+"/list", func(r *resty.Request) {
+		_, err = d.Get(FILE_API_URL_V1+"/list", func(r *resty.Request) {
 			r.SetContext(ctx)
 			r.SetQueryParams(map[string]string{
 				"need_thumbnail":     "1",
@@ -116,22 +116,22 @@ func (p *BaiduPhoto) GetAllFile(ctx context.Context) (files []File, err error) {
 }
 
 // 删除根文件
-func (p *BaiduPhoto) DeleteFile(ctx context.Context, fileIDs ...string) error {
+func (d *BaiduPhoto) DeleteFile(ctx context.Context, file *File) error {
-	_, err := p.Get(FILE_API_URL_V1+"/delete", func(req *resty.Request) {
+	_, err := d.Get(FILE_API_URL_V1+"/delete", func(req *resty.Request) {
 		req.SetContext(ctx)
 		req.SetQueryParams(map[string]string{
-			"fsid_list": fmt.Sprintf("[%s]", strings.Join(fileIDs, ",")),
+			"fsid_list": fmt.Sprintf("[%d]", file.Fsid),
 		})
 	}, nil)
 	return err
 }
 
 // 获取所有相册
-func (p *BaiduPhoto) GetAllAlbum(ctx context.Context) (albums []Album, err error) {
+func (d *BaiduPhoto) GetAllAlbum(ctx context.Context) (albums []Album, err error) {
 	var cursor string
 	for {
 		var resp AlbumListResp
-		_, err = p.Get(ALBUM_API_URL+"/list", func(r *resty.Request) {
+		_, err = d.Get(ALBUM_API_URL+"/list", func(r *resty.Request) {
 			r.SetContext(ctx)
 			r.SetQueryParams(map[string]string{
 				"need_amount": "1",
@@ -156,14 +156,14 @@ func (p *BaiduPhoto) GetAllAlbum(ctx context.Context) (albums []Album, err error
 }
 
 // 获取相册中所有文件
-func (p *BaiduPhoto) GetAllAlbumFile(ctx context.Context, albumID, passwd string) (files []AlbumFile, err error) {
+func (d *BaiduPhoto) GetAllAlbumFile(ctx context.Context, album *Album, passwd string) (files []AlbumFile, err error) {
 	var cursor string
 	for {
 		var resp AlbumFileListResp
-		_, err = p.Get(ALBUM_API_URL+"/listfile", func(r *resty.Request) {
+		_, err = d.Get(ALBUM_API_URL+"/listfile", func(r *resty.Request) {
 			r.SetContext(ctx)
 			r.SetQueryParams(map[string]string{
-				"album_id":    albumID,
+				"album_id":    album.AlbumID,
 				"need_amount": "1",
 				"limit":       "1000",
 				"passwd":      passwd,
@@ -187,45 +187,52 @@ func (p *BaiduPhoto) GetAllAlbumFile(ctx context.Context, albumID, passwd string
 }
 
 // 创建相册
-func (p *BaiduPhoto) CreateAlbum(ctx context.Context, name string) error {
+func (d *BaiduPhoto) CreateAlbum(ctx context.Context, name string) (*Album, error) {
 	if !checkName(name) {
-		return ErrNotSupportName
+		return nil, ErrNotSupportName
 	}
-	_, err := p.Post(ALBUM_API_URL+"/create", func(r *resty.Request) {
+	var resp JoinOrCreateAlbumResp
-		r.SetContext(ctx)
+	_, err := d.Post(ALBUM_API_URL+"/create", func(r *resty.Request) {
+		r.SetContext(ctx).SetResult(&resp)
 		r.SetQueryParams(map[string]string{
 			"title":  name,
 			"tid":    getTid(),
 			"source": "0",
 		})
 	}, nil)
-	return err
+	if err != nil {
+		return nil, err
+	}
+	return d.GetAlbumDetail(ctx, resp.AlbumID)
 }
 
 // 相册改名
-func (p *BaiduPhoto) SetAlbumName(ctx context.Context, albumID, tID, name string) error {
+func (d *BaiduPhoto) SetAlbumName(ctx context.Context, album *Album, name string) (*Album, error) {
 	if !checkName(name) {
-		return ErrNotSupportName
+		return nil, ErrNotSupportName
 	}
 
-	_, err := p.Post(ALBUM_API_URL+"/settitle", func(r *resty.Request) {
+	_, err := d.Post(ALBUM_API_URL+"/settitle", func(r *resty.Request) {
 		r.SetContext(ctx)
 		r.SetFormData(map[string]string{
 			"title":    name,
-			"album_id": albumID,
+			"album_id": album.AlbumID,
-			"tid":      tID,
+			"tid":      fmt.Sprint(album.Tid),
 		})
 	}, nil)
-	return err
+	if err != nil {
+		return nil, err
+	}
+	return renameAlbum(album, name), nil
 }
 
 // 删除相册
-func (p *BaiduPhoto) DeleteAlbum(ctx context.Context, albumID, tID string) error {
+func (d *BaiduPhoto) DeleteAlbum(ctx context.Context, album *Album) error {
-	_, err := p.Post(ALBUM_API_URL+"/delete", func(r *resty.Request) {
+	_, err := d.Post(ALBUM_API_URL+"/delete", func(r *resty.Request) {
 		r.SetContext(ctx)
 		r.SetFormData(map[string]string{
-			"album_id":            albumID,
+			"album_id":            album.AlbumID,
-			"tid":                 tID,
+			"tid":                 fmt.Sprint(album.Tid),
 			"delete_origin_image": "0", // 是否删除原图 0 不删除 1 删除
 		})
 	}, nil)
@@ -233,13 +240,13 @@ func (p *BaiduPhoto) DeleteAlbum(ctx context.Context, albumID, tID string) error
 }
 
 // 删除相册文件
-func (p *BaiduPhoto) DeleteAlbumFile(ctx context.Context, albumID, tID string, fileIDs ...string) error {
+func (d *BaiduPhoto) DeleteAlbumFile(ctx context.Context, file *AlbumFile) error {
-	_, err := p.Post(ALBUM_API_URL+"/delfile", func(r *resty.Request) {
+	_, err := d.Post(ALBUM_API_URL+"/delfile", func(r *resty.Request) {
 		r.SetContext(ctx)
 		r.SetFormData(map[string]string{
-			"album_id":   albumID,
+			"album_id":   fmt.Sprint(file.AlbumID),
-			"tid":        tID,
+			"tid":        fmt.Sprint(file.Tid),
-			"list":       fsidsFormat(fileIDs...),
+			"list":       fmt.Sprintf(`[{"fsid":%d,"uk":%d}]`, file.Fsid, file.Uk),
 			"del_origin": "0", // 是否删除原图 0 不删除 1 删除
 		})
 	}, nil)
@@ -247,41 +254,44 @@ func (p *BaiduPhoto) DeleteAlbumFile(ctx context.Context, albumID, tID string, f
 }
 
 // 增加相册文件
-func (p *BaiduPhoto) AddAlbumFile(ctx context.Context, albumID, tID string, fileIDs ...string) error {
+func (d *BaiduPhoto) AddAlbumFile(ctx context.Context, album *Album, file *File) (*AlbumFile, error) {
-	_, err := p.Get(ALBUM_API_URL+"/addfile", func(r *resty.Request) {
+	_, err := d.Get(ALBUM_API_URL+"/addfile", func(r *resty.Request) {
 		r.SetContext(ctx)
 		r.SetQueryParams(map[string]string{
-			"album_id": albumID,
+			"album_id": fmt.Sprint(album.AlbumID),
-			"tid":      tID,
+			"tid":      fmt.Sprint(album.Tid),
-			"list":     fsidsFormatNotUk(fileIDs...),
+			"list":     fsidsFormatNotUk(file.Fsid),
 		})
 	}, nil)
-	return err
+	if err != nil {
+		return nil, err
+	}
+	return moveFileToAlbumFile(file, album, d.Uk), nil
 }
 
 // 保存相册文件为根文件
-func (p *BaiduPhoto) CopyAlbumFile(ctx context.Context, albumID, tID, uk string, fileID ...string) (*CopyFile, error) {
+func (d *BaiduPhoto) CopyAlbumFile(ctx context.Context, file *AlbumFile) (*File, error) {
 	var resp CopyFileResp
-	_, err := p.Post(ALBUM_API_URL+"/copyfile", func(r *resty.Request) {
+	_, err := d.Post(ALBUM_API_URL+"/copyfile", func(r *resty.Request) {
 		r.SetContext(ctx)
 		r.SetFormData(map[string]string{
-			"album_id": albumID,
+			"album_id": file.AlbumID,
-			"tid":      tID,
+			"tid":      fmt.Sprint(file.Tid),
-			"uk":       uk,
+			"uk":       fmt.Sprint(file.Uk),
-			"list":     fsidsFormatNotUk(fileID...),
+			"list":     fsidsFormatNotUk(file.Fsid),
 		})
 		r.SetResult(&resp)
 	}, nil)
 	if err != nil {
 		return nil, err
 	}
-	return &resp.List[0], nil
+	return copyFile(file, &resp.List[0]), nil
 }
 
 // 加入相册
-func (p *BaiduPhoto) JoinAlbum(ctx context.Context, code string) error {
+func (d *BaiduPhoto) JoinAlbum(ctx context.Context, code string) (*Album, error) {
 	var resp InviteResp
-	_, err := p.Get(ALBUM_API_URL+"/querypcode", func(req *resty.Request) {
+	_, err := d.Get(ALBUM_API_URL+"/querypcode", func(req *resty.Request) {
 		req.SetContext(ctx)
 		req.SetQueryParams(map[string]string{
 			"pcode": code,
@@ -289,18 +299,37 @@ func (p *BaiduPhoto) JoinAlbum(ctx context.Context, code string) error {
 		})
 	}, &resp)
 	if err != nil {
-		return err
+		return nil, err
 	}
-	_, err = p.Get(ALBUM_API_URL+"/join", func(req *resty.Request) {
+	var resp2 JoinOrCreateAlbumResp
+	_, err = d.Get(ALBUM_API_URL+"/join", func(req *resty.Request) {
 		req.SetContext(ctx)
 		req.SetQueryParams(map[string]string{
 			"invite_code": resp.Pdata.InviteCode,
 		})
-	}, nil)
+	}, &resp2)
-	return err
+	if err != nil {
+		return nil, err
+	}
+	return d.GetAlbumDetail(ctx, resp2.AlbumID)
 }
 
-func (d *BaiduPhoto) linkAlbum(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
+// 获取相册详细信息
+func (d *BaiduPhoto) GetAlbumDetail(ctx context.Context, albumID string) (*Album, error) {
+	var album Album
+	_, err := d.Get(ALBUM_API_URL+"/detail", func(req *resty.Request) {
+		req.SetContext(ctx).SetResult(&album)
+		req.SetQueryParams(map[string]string{
+			"album_id": albumID,
+		})
+	}, &album)
+	if err != nil {
+		return nil, err
+	}
+	return &album, nil
+}
+
+func (d *BaiduPhoto) linkAlbum(ctx context.Context, file *AlbumFile, args model.LinkArgs) (*model.Link, error) {
 	headers := map[string]string{
 		"User-Agent": base.UserAgent,
 	}
@@ -311,16 +340,15 @@ func (d *BaiduPhoto) linkAlbum(ctx context.Context, file model.Obj, args model.L
 		headers["X-Forwarded-For"] = args.IP
 	}
 
-	e := splitID(file.GetID())
 	res, err := base.NoRedirectClient.R().
 		SetContext(ctx).
 		SetHeaders(headers).
 		SetQueryParams(map[string]string{
 			"access_token": d.AccessToken,
-			"fsid":         e[0],
+			"fsid":         fmt.Sprint(file.Fsid),
-			"album_id":     e[1],
+			"album_id":     file.AlbumID,
-			"tid":          e[2],
+			"tid":          fmt.Sprint(file.Tid),
-			"uk":           e[3],
+			"uk":           fmt.Sprint(file.Uk),
 		}).
 		Head(ALBUM_API_URL + "/download")
 
@@ -328,19 +356,17 @@ func (d *BaiduPhoto) linkAlbum(ctx context.Context, file model.Obj, args model.L
 		return nil, err
 	}
 
-	//exp := 8 * time.Hour
 	link := &model.Link{
 		URL: res.Header().Get("location"),
 		Header: http.Header{
 			"User-Agent": []string{headers["User-Agent"]},
 			"Referer":    []string{"https://photo.baidu.com/"},
 		},
-		//Expiration: &exp,
 	}
 	return link, nil
 }
 
-func (d *BaiduPhoto) linkFile(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
+func (d *BaiduPhoto) linkFile(ctx context.Context, file *File, args model.LinkArgs) (*model.Link, error) {
 	headers := map[string]string{
 		"User-Agent": base.UserAgent,
 	}
@@ -358,21 +384,31 @@ func (d *BaiduPhoto) linkFile(ctx context.Context, file model.Obj, args model.Li
 		r.SetContext(ctx)
 		r.SetHeaders(headers)
 		r.SetQueryParams(map[string]string{
-			"fsid": splitID(file.GetID())[0],
+			"fsid": fmt.Sprint(file.Fsid),
 		})
 	}, &downloadUrl)
 	if err != nil {
 		return nil, err
 	}
 
-	//exp := 8 * time.Hour
 	link := &model.Link{
 		URL: downloadUrl.Dlink,
 		Header: http.Header{
 			"User-Agent": []string{headers["User-Agent"]},
 			"Referer":    []string{"https://photo.baidu.com/"},
 		},
-		//Expiration: &exp,
 	}
 	return link, nil
 }
+
+// 获取uk
+func (d *BaiduPhoto) uInfo() (*UInfo, error) {
+	var info UInfo
+	_, err := d.Get(USER_API_URL+"/getuinfo", func(req *resty.Request) {
+
+	}, &info)
+	if err != nil {
+		return nil, err
+	}
+	return &info, nil
+}

drivers/cloudreve/driver.go

@@ -0,0 +1,184 @@
+package cloudreve
+
+import (
+	"context"
+	"github.com/alist-org/alist/v3/drivers/base"
+	"github.com/alist-org/alist/v3/pkg/utils"
+	"github.com/go-resty/resty/v2"
+	"io"
+	"net/http"
+	"strconv"
+
+	"github.com/alist-org/alist/v3/internal/driver"
+	"github.com/alist-org/alist/v3/internal/model"
+)
+
+type Cloudreve struct {
+	model.Storage
+	Addition
+	Cookie string
+}
+
+func (d *Cloudreve) Config() driver.Config {
+	return config
+}
+
+func (d *Cloudreve) GetAddition() driver.Additional {
+	return &d.Addition
+}
+
+func (d *Cloudreve) Init(ctx context.Context) error {
+	return d.login()
+}
+
+func (d *Cloudreve) Drop(ctx context.Context) error {
+	d.Cookie = ""
+	return nil
+}
+
+func (d *Cloudreve) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([]model.Obj, error) {
+	var r DirectoryResp
+	err := d.request(http.MethodGet, "/directory"+dir.GetPath(), nil, &r)
+	if err != nil {
+		return nil, err
+	}
+
+	return utils.SliceConvert(r.Objects, func(src Object) (model.Obj, error) {
+		return objectToObj(src), nil
+	})
+}
+
+func (d *Cloudreve) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
+	var dUrl string
+	err := d.request(http.MethodPut, "/file/download/"+file.GetID(), nil, &dUrl)
+	if err != nil {
+		return nil, err
+	}
+	return &model.Link{
+		URL: dUrl,
+	}, nil
+}
+
+func (d *Cloudreve) MakeDir(ctx context.Context, parentDir model.Obj, dirName string) error {
+	return d.request(http.MethodPut, "/directory", func(req *resty.Request) {
+		req.SetBody(base.Json{
+			"path": parentDir.GetPath() + "/" + dirName,
+		})
+	}, nil)
+}
+
+func (d *Cloudreve) Move(ctx context.Context, srcObj, dstDir model.Obj) error {
+	body := base.Json{
+		"action":  "move",
+		"src_dir": srcObj.GetPath(),
+		"dst":     dstDir.GetPath(),
+		"src":     convertSrc(srcObj),
+	}
+	return d.request(http.MethodPatch, "/object", func(req *resty.Request) {
+		req.SetBody(body)
+	}, nil)
+}
+
+func (d *Cloudreve) Rename(ctx context.Context, srcObj model.Obj, newName string) error {
+	body := base.Json{
+		"action":   "rename",
+		"new_name": newName,
+		"src":      convertSrc(srcObj),
+	}
+	return d.request(http.MethodPatch, "/object/rename", func(req *resty.Request) {
+		req.SetBody(body)
+	}, nil)
+}
+
+func (d *Cloudreve) Copy(ctx context.Context, srcObj, dstDir model.Obj) error {
+	body := base.Json{
+		"src_dir": srcObj.GetPath(),
+		"dst":     dstDir.GetPath(),
+		"src":     convertSrc(srcObj),
+	}
+	return d.request(http.MethodPost, "/object/copy", func(req *resty.Request) {
+		req.SetBody(body)
+	}, nil)
+}
+
+func (d *Cloudreve) Remove(ctx context.Context, obj model.Obj) error {
+	body := convertSrc(obj)
+	err := d.request(http.MethodDelete, "/object", func(req *resty.Request) {
+		req.SetBody(body)
+	}, nil)
+	return err
+}
+
+func (d *Cloudreve) Put(ctx context.Context, dstDir model.Obj, stream model.FileStreamer, up driver.UpdateProgress) error {
+	if stream.GetReadCloser() == http.NoBody {
+		return d.create(ctx, dstDir, stream)
+	}
+	var r DirectoryResp
+	err := d.request(http.MethodGet, "/directory"+dstDir.GetPath(), nil, &r)
+	if err != nil {
+		return err
+	}
+	uploadBody := base.Json{
+		"path":          dstDir.GetPath(),
+		"size":          stream.GetSize(),
+		"name":          stream.GetName(),
+		"policy_id":     r.Policy.Id,
+		"last_modified": stream.ModTime().Unix(),
+	}
+	var u UploadInfo
+	err = d.request(http.MethodPut, "/file/upload", func(req *resty.Request) {
+		req.SetBody(uploadBody)
+	}, &u)
+	if err != nil {
+		return err
+	}
+	var chunkSize = u.ChunkSize
+	var buf []byte
+	var chunk int
+	for {
+		var n int
+		buf = make([]byte, chunkSize)
+		n, err = io.ReadAtLeast(stream, buf, chunkSize)
+		if err != nil && err != io.ErrUnexpectedEOF {
+			if err == io.EOF {
+				return nil
+			}
+			return err
+		}
+
+		if n == 0 {
+			break
+		}
+		buf = buf[:n]
+		err = d.request(http.MethodPost, "/file/upload/"+u.SessionID+"/"+strconv.Itoa(chunk), func(req *resty.Request) {
+			req.SetHeader("Content-Type", "application/octet-stream")
+			req.SetHeader("Content-Length", strconv.Itoa(n))
+			req.SetBody(buf)
+		}, nil)
+		if err != nil {
+			break
+		}
+		chunk++
+
+	}
+	return err
+}
+
+func (d *Cloudreve) create(ctx context.Context, dir model.Obj, file model.Obj) error {
+	body := base.Json{"path": dir.GetPath() + "/" + file.GetName()}
+	if file.IsDir() {
+		err := d.request(http.MethodPut, "directory", func(req *resty.Request) {
+			req.SetBody(body)
+		}, nil)
+		return err
+	}
+	return d.request(http.MethodPost, "/file/create", func(req *resty.Request) {
+		req.SetBody(body)
+	}, nil)
+}
+
+//func (d *Cloudreve) Other(ctx context.Context, args model.OtherArgs) (interface{}, error) {
+//	return nil, errs.NotSupport
+//}
+
+var _ driver.Driver = (*Cloudreve)(nil)

drivers/cloudreve/meta.go

@@ -0,0 +1,26 @@
+package cloudreve
+
+import (
+	"github.com/alist-org/alist/v3/internal/driver"
+	"github.com/alist-org/alist/v3/internal/op"
+)
+
+type Addition struct {
+	// Usually one of two
+	driver.RootPath
+	// define other
+	Address  string `json:"address" required:"true"`
+	Username string `json:"username" required:"true"`
+	Password string `json:"password" required:"true"`
+}
+
+var config = driver.Config{
+	Name:        "Cloudreve",
+	DefaultRoot: "/",
+}
+
+func init() {
+	op.RegisterDriver(func() driver.Driver {
+		return &Cloudreve{}
+	})
+}

drivers/cloudreve/types.go

@@ -0,0 +1,54 @@
+package cloudreve
+
+import (
+	"github.com/alist-org/alist/v3/internal/model"
+	"time"
+)
+
+type Resp struct {
+	Code int         `json:"code"`
+	Msg  string      `json:"msg"`
+	Data interface{} `json:"data"`
+}
+
+type Policy struct {
+	Id       string   `json:"id"`
+	Name     string   `json:"name"`
+	Type     string   `json:"type"`
+	MaxSize  int      `json:"max_size"`
+	FileType []string `json:"file_type"`
+}
+
+type UploadInfo struct {
+	SessionID string `json:"sessionID"`
+	ChunkSize int    `json:"chunkSize"`
+	Expires   int    `json:"expires"`
+}
+
+type DirectoryResp struct {
+	Parent  string   `json:"parent"`
+	Objects []Object `json:"objects"`
+	Policy  Policy   `json:"policy"`
+}
+
+type Object struct {
+	Id            string    `json:"id"`
+	Name          string    `json:"name"`
+	Path          string    `json:"path"`
+	Pic           string    `json:"pic"`
+	Size          int       `json:"size"`
+	Type          string    `json:"type"`
+	Date          time.Time `json:"date"`
+	CreateDate    time.Time `json:"create_date"`
+	SourceEnabled bool      `json:"source_enabled"`
+}
+
+func objectToObj(f Object) *model.Object {
+	return &model.Object{
+		ID:       f.Id,
+		Name:     f.Name,
+		Size:     int64(f.Size),
+		Modified: f.Date,
+		IsFolder: f.Type == "dir",
+	}
+}

drivers/cloudreve/util.go

@@ -0,0 +1,96 @@
+package cloudreve
+
+import (
+	"errors"
+	"github.com/alist-org/alist/v3/drivers/base"
+	"github.com/alist-org/alist/v3/internal/model"
+	"github.com/alist-org/alist/v3/pkg/cookie"
+	"github.com/go-resty/resty/v2"
+	json "github.com/json-iterator/go"
+	"net/http"
+)
+
+// do others that not defined in Driver interface
+
+const loginPath = "/user/session"
+
+func (d *Cloudreve) request(method string, path string, callback base.ReqCallback, out interface{}) error {
+	u := d.Address + "/api/v3" + path
+	req := base.RestyClient.R()
+	req.SetHeaders(map[string]string{
+		"Cookie":     "cloudreve-session=" + d.Cookie,
+		"Accept":     "application/json, text/plain, */*",
+		"User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36",
+	})
+
+	var r Resp
+
+	req.SetResult(&r)
+
+	if callback != nil {
+		callback(req)
+	}
+
+	resp, err := req.Execute(method, u)
+	if err != nil {
+		return err
+	}
+	if !resp.IsSuccess() {
+		return errors.New(resp.String())
+	}
+
+	if r.Code != 0 {
+
+		// 刷新 cookie
+		if r.Code == http.StatusUnauthorized && path != loginPath {
+			err = d.login()
+			if err != nil {
+				return err
+			}
+			return d.request(method, path, callback, out)
+		}
+
+		return errors.New(r.Msg)
+	}
+	sess := cookie.GetCookie(resp.Cookies(), "cloudreve-session")
+	if sess != nil {
+		d.Cookie = sess.Value
+	}
+	if out != nil && r.Data != nil {
+		var marshal []byte
+		marshal, err = json.Marshal(r.Data)
+		if err != nil {
+			return err
+		}
+		err = json.Unmarshal(marshal, out)
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+func (d *Cloudreve) login() error {
+	return d.request(http.MethodPost, loginPath, func(req *resty.Request) {
+		req.SetBody(base.Json{
+			"username":    d.Addition.Username,
+			"Password":    d.Addition.Password,
+			"captchaCode": "",
+		})
+	}, nil)
+}
+
+func convertSrc(obj model.Obj) map[string]interface{} {
+	m := make(map[string]interface{})
+	var dirs []string
+	var items []string
+	if obj.IsDir() {
+		dirs = append(dirs, obj.GetID())
+	} else {
+		items = append(items, obj.GetID())
+	}
+	m["dirs"] = dirs
+	m["items"] = items
+	return m
+}

drivers/ftp/driver.go

@@ -7,7 +7,6 @@ import (
 	"github.com/alist-org/alist/v3/internal/driver"
 	"github.com/alist-org/alist/v3/internal/errs"
 	"github.com/alist-org/alist/v3/internal/model"
-	"github.com/alist-org/alist/v3/pkg/utils"
 	"github.com/jlaffaye/ftp"
 )
 
@@ -22,15 +21,10 @@ func (d *FTP) Config() driver.Config {
 }
 
 func (d *FTP) GetAddition() driver.Additional {
-	return d.Addition
+	return &d.Addition
 }
 
-func (d *FTP) Init(ctx context.Context, storage model.Storage) error {
+func (d *FTP) Init(ctx context.Context) error {
-	d.Storage = storage
-	err := utils.Json.UnmarshalFromString(d.Storage.Addition, &d.Addition)
-	if err != nil {
-		return err
-	}
 	return d.login()
 }
 
@@ -66,11 +60,6 @@ func (d *FTP) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([]m
 	return res, nil
 }
 
-//func (d *FTP) Get(ctx context.Context, path string) (model.Obj, error) {
-//	// this is optional
-//	return nil, errs.NotImplement
-//}
-
 func (d *FTP) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
 	if err := d.login(); err != nil {
 		return nil, err
@@ -124,6 +113,7 @@ func (d *FTP) Put(ctx context.Context, dstDir model.Obj, stream model.FileStream
 	if err := d.login(); err != nil {
 		return err
 	}
+	// TODO: support cancel
 	return d.conn.Stor(stdpath.Join(dstDir.GetPath(), stream.GetName()), stream)
 }
 

drivers/ftp/meta.go

@@ -19,10 +19,8 @@ var config = driver.Config{
 	DefaultRoot: "/",
 }
 
-func New() driver.Driver {
-	return &FTP{}
-}
-
 func init() {
-	op.RegisterDriver(config, New)
+	op.RegisterDriver(func() driver.Driver {
+		return &FTP{}
+	})
 }

drivers/google_drive/driver.go

@@ -4,14 +4,12 @@ import (
 	"context"
 	"fmt"
 	"net/http"
-	stdpath "path"
 	"strconv"
 
 	"github.com/alist-org/alist/v3/drivers/base"
 	"github.com/alist-org/alist/v3/internal/driver"
 	"github.com/alist-org/alist/v3/internal/errs"
 	"github.com/alist-org/alist/v3/internal/model"
-	"github.com/alist-org/alist/v3/internal/op"
 	"github.com/alist-org/alist/v3/pkg/utils"
 	"github.com/go-resty/resty/v2"
 )
@@ -27,15 +25,10 @@ func (d *GoogleDrive) Config() driver.Config {
 }
 
 func (d *GoogleDrive) GetAddition() driver.Additional {
-	return d.Addition
+	return &d.Addition
 }
 
-func (d *GoogleDrive) Init(ctx context.Context, storage model.Storage) error {
+func (d *GoogleDrive) Init(ctx context.Context) error {
-	d.Storage = storage
-	err := utils.Json.UnmarshalFromString(d.Storage.Addition, &d.Addition)
-	if err != nil {
-		return err
-	}
 	if d.ChunkSize == 0 {
 		d.ChunkSize = 5
 	}
@@ -56,11 +49,6 @@ func (d *GoogleDrive) List(ctx context.Context, dir model.Obj, args model.ListAr
 	})
 }
 
-//func (d *GoogleDrive) Get(ctx context.Context, path string) (model.Obj, error) {
-//	// this is optional
-//	return nil, errs.NotImplement
-//}
-
 func (d *GoogleDrive) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
 	url := fmt.Sprintf("https://www.googleapis.com/drive/v3/files/%s?includeItemsFromAllDrives=true&supportsAllDrives=true", file.GetID())
 	_, err := d.request(url, http.MethodGet, nil, nil)
@@ -122,8 +110,7 @@ func (d *GoogleDrive) Remove(ctx context.Context, obj model.Obj) error {
 }
 
 func (d *GoogleDrive) Put(ctx context.Context, dstDir model.Obj, stream model.FileStreamer, up driver.UpdateProgress) error {
-	obj, _ := op.Get(ctx, d, stdpath.Join(dstDir.GetPath(), stream.GetName()))
+	obj := stream.GetOld()
-
 	var (
 		e    Error
 		url  string
@@ -147,7 +134,7 @@ func (d *GoogleDrive) Put(ctx context.Context, dstDir model.Obj, stream model.Fi
 			"X-Upload-Content-Type":   stream.GetMimetype(),
 			"X-Upload-Content-Length": strconv.FormatInt(stream.GetSize(), 10),
 		}).
-		SetError(&e).SetBody(data)
+		SetError(&e).SetBody(data).SetContext(ctx)
 	if obj != nil {
 		res, err = req.Patch(url)
 	} else {

drivers/google_drive/meta.go

@@ -21,10 +21,8 @@ var config = driver.Config{
 	DefaultRoot: "root",
 }
 
-func New() driver.Driver {
-	return &GoogleDrive{}
-}
-
 func init() {
-	op.RegisterDriver(config, New)
+	op.RegisterDriver(func() driver.Driver {
+		return &GoogleDrive{}
+	})
 }

drivers/google_drive/util.go

@@ -9,6 +9,7 @@ import (
 
 	"github.com/alist-org/alist/v3/drivers/base"
 	"github.com/alist-org/alist/v3/internal/model"
+	"github.com/alist-org/alist/v3/pkg/utils"
 	"github.com/go-resty/resty/v2"
 	log "github.com/sirupsen/logrus"
 )
@@ -104,6 +105,9 @@ func (d *GoogleDrive) chunkUpload(ctx context.Context, stream model.FileStreamer
 	var defaultChunkSize = d.ChunkSize * 1024 * 1024
 	var finish int64 = 0
 	for finish < stream.GetSize() {
+		if utils.IsCanceled(ctx) {
+			return ctx.Err()
+		}
 		chunkSize := stream.GetSize() - finish
 		if chunkSize > defaultChunkSize {
 			chunkSize = defaultChunkSize
@@ -112,7 +116,7 @@ func (d *GoogleDrive) chunkUpload(ctx context.Context, stream model.FileStreamer
 			req.SetHeaders(map[string]string{
 				"Content-Length": strconv.FormatInt(chunkSize, 10),
 				"Content-Range":  fmt.Sprintf("bytes %d-%d/%d", finish, finish+chunkSize-1, stream.GetSize()),
-			}).SetBody(io.LimitReader(stream.GetReadCloser(), chunkSize))
+			}).SetBody(io.LimitReader(stream.GetReadCloser(), chunkSize)).SetContext(ctx)
 		}, nil)
 		if err != nil {
 			return err

drivers/google_photo/driver.go

@@ -26,15 +26,10 @@ func (d *GooglePhoto) Config() driver.Config {
 }
 
 func (d *GooglePhoto) GetAddition() driver.Additional {
-	return d.Addition
+	return &d.Addition
 }
 
-func (d *GooglePhoto) Init(ctx context.Context, storage model.Storage) error {
+func (d *GooglePhoto) Init(ctx context.Context) error {
-	d.Storage = storage
-	err := utils.Json.UnmarshalFromString(d.Storage.Addition, &d.Addition)
-	if err != nil {
-		return err
-	}
 	return d.refreshToken()
 }
 
@@ -52,11 +47,6 @@ func (d *GooglePhoto) List(ctx context.Context, dir model.Obj, args model.ListAr
 	})
 }
 
-//func (d *GooglePhoto) Get(ctx context.Context, path string) (model.Obj, error) {
-//	// this is optional
-//	return nil, errs.NotImplement
-//}
-
 func (d *GooglePhoto) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
 	f, err := d.getMedia(file.GetID())
 	if err != nil {
@@ -134,7 +124,7 @@ func (d *GooglePhoto) Put(ctx context.Context, dstDir model.Obj, stream model.Fi
 	}
 
 	resp, err := d.request(postUrl, http.MethodPost, func(req *resty.Request) {
-		req.SetBody(stream.GetReadCloser())
+		req.SetBody(stream.GetReadCloser()).SetContext(ctx)
 	}, nil, postHeaders)
 
 	if err != nil {

drivers/google_photo/meta.go

@@ -21,10 +21,8 @@ var config = driver.Config{
 	LocalSort:   true,
 }
 
-func New() driver.Driver {
-	return &GooglePhoto{}
-}
-
 func init() {
-	op.RegisterDriver(config, New)
+	op.RegisterDriver(func() driver.Driver {
+		return &GooglePhoto{}
+	})
 }

drivers/lanzou/driver.go

@@ -2,7 +2,9 @@ package lanzou
 
 import (
 	"context"
+	"fmt"
 	"net/http"
+	"regexp"
 	"time"
 
 	"github.com/alist-org/alist/v3/drivers/base"
@@ -18,6 +20,7 @@ var upClient = base.NewRestyClient().SetTimeout(120 * time.Second)
 type LanZou struct {
 	Addition
 	model.Storage
+	uid string
 }
 
 func (d *LanZou) Config() driver.Config {
@@ -25,63 +28,100 @@ func (d *LanZou) Config() driver.Config {
 }
 
 func (d *LanZou) GetAddition() driver.Additional {
-	return d.Addition
+	return &d.Addition
 }
 
-func (d *LanZou) Init(ctx context.Context, storage model.Storage) error {
+func (d *LanZou) Init(ctx context.Context) error {
-	d.Storage = storage
-	err := utils.Json.UnmarshalFromString(d.Storage.Addition, &d.Addition)
-	if err != nil {
-		return err
-	}
 	if d.IsCookie() {
 		if d.RootFolderID == "" {
 			d.RootFolderID = "-1"
 		}
+		ylogin := regexp.MustCompile("ylogin=(.*?);").FindStringSubmatch(d.Cookie)
+		if len(ylogin) < 2 {
+			return fmt.Errorf("cookie does not contain ylogin")
+		}
+		d.uid = ylogin[1]
 	}
 	return nil
 }
 
 func (d *LanZou) Drop(ctx context.Context) error {
+	d.uid = ""
 	return nil
 }
 
 // 获取的大小和时间不准确
 func (d *LanZou) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([]model.Obj, error) {
 	if d.IsCookie() {
-		return d.GetFiles(ctx, dir.GetID())
+		return d.GetAllFiles(dir.GetID())
 	} else {
-		return d.GetFileOrFolderByShareUrl(ctx, dir.GetID(), d.SharePassword)
+		return d.GetFileOrFolderByShareUrl(dir.GetID(), d.SharePassword)
 	}
 }
 
 func (d *LanZou) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
-	downID := file.GetID()
+	var (
-	pwd := d.SharePassword
+		err   error
-	if d.IsCookie() {
+		dfile *FileOrFolderByShareUrl
-		share, err := d.getFileShareUrlByID(ctx, file.GetID())
+	)
+	switch file := file.(type) {
+	case *FileOrFolder:
+		// 先获取分享链接
+		sfile := file.GetShareInfo()
+		if sfile == nil {
+			sfile, err = d.getFileShareUrlByID(file.GetID())
+			if err != nil {
+				return nil, err
+			}
+			file.SetShareInfo(sfile)
+		}
+
+		// 然后获取下载链接
+		dfile, err = d.GetFilesByShareUrl(sfile.FID, sfile.Pwd)
 		if err != nil {
 			return nil, err
 		}
-		downID = share.FID
+		// 修复文件大小
-		pwd = share.Pwd
+		if d.RepairFileInfo && !file.repairFlag {
+			size, time := d.getFileRealInfo(dfile.Url)
+			if size != nil {
+				file.size = size
+				file.repairFlag = true
+			}
+			if file.time != nil {
+				file.time = time
+			}
+		}
+	case *FileOrFolderByShareUrl:
+		dfile, err = d.GetFilesByShareUrl(file.GetID(), file.Pwd)
+		if err != nil {
+			return nil, err
+		}
+		// 修复文件大小
+		if d.RepairFileInfo && !file.repairFlag {
+			size, time := d.getFileRealInfo(dfile.Url)
+			if size != nil {
+				file.size = size
+				file.repairFlag = true
+			}
+			if file.time != nil {
+				file.time = time
+			}
+		}
 	}
-	fileInfo, err := d.getFilesByShareUrl(ctx, downID, pwd, nil)
+	exp := GetExpirationTime(dfile.Url)
-	if err != nil {
-		return nil, err
-	}
-
 	return &model.Link{
-		URL: fileInfo.Url,
+		URL: dfile.Url,
 		Header: http.Header{
 			"User-Agent": []string{base.UserAgent},
 		},
+		Expiration: &exp,
 	}, nil
 }
 
-func (d *LanZou) MakeDir(ctx context.Context, parentDir model.Obj, dirName string) error {
+func (d *LanZou) MakeDir(ctx context.Context, parentDir model.Obj, dirName string) (model.Obj, error) {
 	if d.IsCookie() {
-		_, err := d.post(d.BaseUrl+"/doupload.php", func(req *resty.Request) {
+		data, err := d.doupload(func(req *resty.Request) {
 			req.SetContext(ctx)
 			req.SetFormData(map[string]string{
 				"task":               "2",
@@ -90,15 +130,21 @@ func (d *LanZou) MakeDir(ctx context.Context, parentDir model.Obj, dirName strin
 				"folder_description": "",
 			})
 		}, nil)
-		return err
+		if err != nil {
+			return nil, err
+		}
+		return &FileOrFolder{
+			Name:  dirName,
+			FolID: utils.Json.Get(data, "text").ToString(),
+		}, nil
 	}
-	return errs.NotImplement
+	return nil, errs.NotImplement
 }
 
-func (d *LanZou) Move(ctx context.Context, srcObj, dstDir model.Obj) error {
+func (d *LanZou) Move(ctx context.Context, srcObj, dstDir model.Obj) (model.Obj, error) {
 	if d.IsCookie() {
 		if !srcObj.IsDir() {
-			_, err := d.post(d.BaseUrl+"/doupload.php", func(req *resty.Request) {
+			_, err := d.doupload(func(req *resty.Request) {
 				req.SetContext(ctx)
 				req.SetFormData(map[string]string{
 					"task":      "20",
@@ -106,16 +152,19 @@ func (d *LanZou) Move(ctx context.Context, srcObj, dstDir model.Obj) error {
 					"file_id":   srcObj.GetID(),
 				})
 			}, nil)
-			return err
+			if err != nil {
+				return nil, err
+			}
+			return srcObj, nil
 		}
 	}
-	return errs.NotImplement
+	return nil, errs.NotImplement
 }
 
-func (d *LanZou) Rename(ctx context.Context, srcObj model.Obj, newName string) error {
+func (d *LanZou) Rename(ctx context.Context, srcObj model.Obj, newName string) (model.Obj, error) {
 	if d.IsCookie() {
 		if !srcObj.IsDir() {
-			_, err := d.post(d.BaseUrl+"/doupload.php", func(req *resty.Request) {
+			_, err := d.doupload(func(req *resty.Request) {
 				req.SetContext(ctx)
 				req.SetFormData(map[string]string{
 					"task":      "46",
@@ -124,19 +173,19 @@ func (d *LanZou) Rename(ctx context.Context, srcObj model.Obj, newName string) e
 					"type":      "2",
 				})
 			}, nil)
-			return err
+			if err != nil {
+				return nil, err
+			}
+			srcObj.(*FileOrFolder).NameAll = newName
+			return srcObj, nil
 		}
 	}
-	return errs.NotImplement
+	return nil, errs.NotImplement
-}
-
-func (d *LanZou) Copy(ctx context.Context, srcObj, dstDir model.Obj) error {
-	return errs.NotImplement
 }
 
 func (d *LanZou) Remove(ctx context.Context, obj model.Obj) error {
 	if d.IsCookie() {
-		_, err := d.post(d.BaseUrl+"/doupload.php", func(req *resty.Request) {
+		_, err := d.doupload(func(req *resty.Request) {
 			req.SetContext(ctx)
 			if obj.IsDir() {
 				req.SetFormData(map[string]string{
@@ -155,17 +204,23 @@ func (d *LanZou) Remove(ctx context.Context, obj model.Obj) error {
 	return errs.NotImplement
 }
 
-func (d *LanZou) Put(ctx context.Context, dstDir model.Obj, stream model.FileStreamer, up driver.UpdateProgress) error {
+func (d *LanZou) Put(ctx context.Context, dstDir model.Obj, stream model.FileStreamer, up driver.UpdateProgress) (model.Obj, error) {
 	if d.IsCookie() {
+		var resp RespText[[]FileOrFolder]
 		_, err := d._post(d.BaseUrl+"/fileup.php", func(req *resty.Request) {
 			req.SetFormData(map[string]string{
 				"task":      "1",
+				"vie":       "2",
+				"ve":        "2",
 				"id":        "WU_FILE_0",
 				"name":      stream.GetName(),
-				"folder_id": dstDir.GetID(),
+				"folder_id_bb_n": dstDir.GetID(),
-			}).SetFileReader("upload_file", stream.GetName(), stream)
+			}).SetFileReader("upload_file", stream.GetName(), stream).SetContext(ctx)
-		}, nil, true)
+		}, &resp, true)
-		return err
+		if err != nil {
+			return nil, err
+		}
+		return &resp.Text[0], nil
 	}
-	return errs.NotImplement
+	return nil, errs.NotImplement
 }

drivers/lanzou/help.go

@@ -8,12 +8,16 @@ import (
 	"strings"
 	"time"
 	"unicode"
+
+	log "github.com/sirupsen/logrus"
 )
 
 const DAY time.Duration = 84600000000000
 
+// 解析时间
 var timeSplitReg = regexp.MustCompile("([0-9.]*)\\s*([\u4e00-\u9fa5]+)")
 
+// 如果解析失败,则返回当前时间
 func MustParseTime(str string) time.Time {
 	lastOpTime, err := time.ParseInLocation("2006-01-02 -07", str+" +08", time.Local)
 	if err != nil {
@@ -41,8 +45,10 @@ func MustParseTime(str string) time.Time {
 	return lastOpTime
 }
 
+// 解析大小
 var sizeSplitReg = regexp.MustCompile(`(?i)([0-9.]+)\s*([bkm]+)`)
 
+// 解析失败返回0
 func SizeStrToInt64(size string) int64 {
 	strs := sizeSplitReg.FindStringSubmatch(size)
 	if len(strs) < 3 {
@@ -62,8 +68,13 @@ func SizeStrToInt64(size string) int64 {
 }
 
 // 移除注释
-func RemoveNotes(html []byte) []byte {
+func RemoveNotes(html string) string {
-	return regexp.MustCompile(`<!--.*?-->|//.*|/\*.*?\*/`).ReplaceAll(html, []byte{})
+	return regexp.MustCompile(`<!--.*?-->|[^:]//.*|/\*.*?\*/`).ReplaceAllStringFunc(html, func(b string) string {
+		if b[1:3] == "//" {
+			return b[:1]
+		}
+		return "\n"
+	})
 }
 
 var findAcwScV2Reg = regexp.MustCompile(`arg1='([0-9A-Z]+)'`)
@@ -71,6 +82,7 @@ var findAcwScV2Reg = regexp.MustCompile(`arg1='([0-9A-Z]+)'`)
 // 在页面被过多访问或其他情况下，有时候会先返回一个加密的页面，其执行计算出一个acw_sc__v2后放入页面后再重新访问页面才能获得正常页面
 // 若该页面进行了js加密，则进行解密，计算acw_sc__v2，并加入cookie
 func CalcAcwScV2(html string) (string, error) {
+	log.Debugln("acw_sc__v2", html)
 	acwScV2s := findAcwScV2Reg.FindStringSubmatch(html)
 	if len(acwScV2s) != 2 {
 		return "", fmt.Errorf("无法匹配acw_sc__v2")
@@ -163,3 +175,18 @@ func formToMap(from string) map[string]string {
 	}
 	return param
 }
+
+var regExpirationTime = regexp.MustCompile(`e=(\d+)`)
+
+func GetExpirationTime(url string) (etime time.Duration) {
+	exps := regExpirationTime.FindStringSubmatch(url)
+	if len(exps) < 2 {
+		return
+	}
+	timestamp, err := strconv.ParseInt(exps[1], 10, 64)
+	if err != nil {
+		return
+	}
+	etime = time.Duration(timestamp-time.Now().Unix()) * time.Second
+	return
+}

drivers/lanzou/meta.go

@@ -7,11 +7,12 @@ import (
 
 type Addition struct {
 	Type   string `json:"type" type:"select" options:"cookie,url" default:"cookie"`
-	Cookie string `json:"cookie" required:"true" help:"about 15 days valid"`
+	Cookie string `json:"cookie" required:"true" help:"about 15 days valid, ignore if shareUrl is used"`
 	driver.RootID
-	SharePassword string `json:"share_password"`
+	SharePassword  string `json:"share_password"`
-	BaseUrl       string `json:"baseUrl" required:"true" default:"https://pc.woozooo.com"`
+	BaseUrl        string `json:"baseUrl" required:"true" default:"https://pc.woozooo.com" help:"basic URL for file operation"`
-	ShareUrl      string `json:"shareUrl" required:"true" default:"https://pan.lanzouo.com"`
+	ShareUrl       string `json:"shareUrl" required:"true" default:"https://pan.lanzouo.com" help:"used to get the sharing page"`
+	RepairFileInfo bool   `json:"repair_file_info" help:"To use webdav, you need to enable it"`
 }
 
 func (a *Addition) IsCookie() bool {
@@ -25,7 +26,7 @@ var config = driver.Config{
 }
 
 func init() {
-	op.RegisterDriver(config, func() driver.Driver {
+	op.RegisterDriver(func() driver.Driver {
 		return &LanZou{}
 	})
 }

drivers/lanzou/types.go

@@ -1,14 +1,20 @@
 package lanzou
 
 import (
+	"errors"
 	"fmt"
 	"time"
-
-	"github.com/alist-org/alist/v3/internal/model"
 )
 
-type FilesOrFoldersResp struct {
+var ErrFileShareCancel = errors.New("file sharing cancellation")
-	Text []FileOrFolder `json:"text"`
+var ErrFileNotExist = errors.New("file does not exist")
+
+type RespText[T any] struct {
+	Text T `json:"text"`
+}
+
+type RespInfo[T any] struct {
+	Info T `json:"info"`
 }
 
 type FileOrFolder struct {
@@ -34,30 +40,51 @@ type FileOrFolder struct {
 	FolID string `json:"fol_id"`
 	//Folderlock string `json:"folderlock"`
 	//FolderDes  string `json:"folder_des"`
+
+	// 缓存字段
+	size       *int64     `json:"-"`
+	time       *time.Time `json:"-"`
+	repairFlag bool       `json:"-"`
+	shareInfo  *FileShare `json:"-"`
 }
 
-func (f *FileOrFolder) isFloder() bool {
+func (f *FileOrFolder) GetID() string {
-	return f.FolID != ""
+	if f.IsDir() {
-}
+		return f.FolID
-func (f *FileOrFolder) ToObj() model.Obj {
-	obj := &model.Object{}
-	if f.isFloder() {
-		obj.ID = f.FolID
-		obj.Name = f.Name
-		obj.Modified = time.Now()
-		obj.IsFolder = true
-	} else {
-		obj.ID = f.ID
-		obj.Name = f.NameAll
-		obj.Modified = MustParseTime(f.Time)
-		obj.Size = SizeStrToInt64(f.Size)
 	}
-	return obj
+	return f.ID
+}
+func (f *FileOrFolder) GetName() string {
+	if f.IsDir() {
+		return f.Name
+	}
+	return f.NameAll
+}
+func (f *FileOrFolder) GetPath() string { return "" }
+func (f *FileOrFolder) GetSize() int64 {
+	if f.size == nil {
+		size := SizeStrToInt64(f.Size)
+		f.size = &size
+	}
+	return *f.size
+}
+func (f *FileOrFolder) IsDir() bool { return f.FolID != "" }
+func (f *FileOrFolder) ModTime() time.Time {
+	if f.time == nil {
+		time := MustParseTime(f.Time)
+		f.time = &time
+	}
+	return *f.time
 }
 
-type FileShareResp struct {
+func (f *FileOrFolder) SetShareInfo(fs *FileShare) {
-	Info FileShare `json:"info"`
+	f.shareInfo = fs
 }
+func (f *FileOrFolder) GetShareInfo() *FileShare {
+	return f.shareInfo
+}
+
+/* 通过ID获取文件/文件夹分享信息 */
 type FileShare struct {
 	Pwd    string `json:"pwd"`
 	Onof   string `json:"onof"`
@@ -73,31 +100,55 @@ type FileShare struct {
 	Des    string `json:"des"`
 }
 
+/* 分享类型为文件夹 */
 type FileOrFolderByShareUrlResp struct {
 	Text []FileOrFolderByShareUrl `json:"text"`
 }
 type FileOrFolderByShareUrl struct {
 	ID      string `json:"id"`
 	NameAll string `json:"name_all"`
-	Size    string `json:"size"`
+
-	Time    string `json:"time"`
+	// 文件特有
-	Duan    string `json:"duan"`
+	Duan string `json:"duan"`
+	Size string `json:"size"`
+	Time string `json:"time"`
 	//Icon          string `json:"icon"`
 	//PIco int `json:"p_ico"`
 	//T int `json:"t"`
-	IsFloder bool
+
+	// 文件夹特有
+	IsFloder bool `json:"-"`
+
+	//
+	Url string `json:"-"`
+	Pwd string `json:"-"`
+
+	// 缓存字段
+	size       *int64     `json:"-"`
+	time       *time.Time `json:"-"`
+	repairFlag bool       `json:"-"`
 }
 
-func (f *FileOrFolderByShareUrl) ToObj() model.Obj {
+func (f *FileOrFolderByShareUrl) GetID() string   { return f.ID }
-	return &model.Object{
+func (f *FileOrFolderByShareUrl) GetName() string { return f.NameAll }
-		ID:       f.ID,
+func (f *FileOrFolderByShareUrl) GetPath() string { return "" }
-		Name:     f.NameAll,
+func (f *FileOrFolderByShareUrl) GetSize() int64 {
-		Size:     SizeStrToInt64(f.Size),
+	if f.size == nil {
-		Modified: MustParseTime(f.Time),
+		size := SizeStrToInt64(f.Size)
-		IsFolder: f.IsFloder,
+		f.size = &size
 	}
+	return *f.size
+}
+func (f *FileOrFolderByShareUrl) IsDir() bool { return f.IsFloder }
+func (f *FileOrFolderByShareUrl) ModTime() time.Time {
+	if f.time == nil {
+		time := MustParseTime(f.Time)
+		f.time = &time
+	}
+	return *f.time
 }
 
+// 获取下载链接的响应
 type FileShareInfoAndUrlResp[T string | int] struct {
 	Dom string `json:"dom"`
 	URL string `json:"url"`
@@ -111,21 +162,3 @@ func (u *FileShareInfoAndUrlResp[T]) GetBaseUrl() string {
 func (u *FileShareInfoAndUrlResp[T]) GetDownloadUrl() string {
 	return fmt.Sprint(u.GetBaseUrl(), "/", u.URL)
 }
-
-// 通过分享链接获取文件信息和下载链接
-type FileInfoAndUrlByShareUrl struct {
-	ID   string
-	Name string
-	Size string
-	Time string
-	Url  string
-}
-
-func (f *FileInfoAndUrlByShareUrl) ToObj() model.Obj {
-	return &model.Object{
-		ID:       f.ID,
-		Name:     f.Name,
-		Size:     SizeStrToInt64(f.Size),
-		Modified: MustParseTime(f.Time),
-	}
-}

drivers/lanzou/util.go

@@ -1,7 +1,7 @@
 package lanzou
 
 import (
-	"context"
+	"errors"
 	"fmt"
 	"net/http"
 	"regexp"
@@ -13,8 +13,16 @@ import (
 	"github.com/alist-org/alist/v3/internal/model"
 	"github.com/alist-org/alist/v3/pkg/utils"
 	"github.com/go-resty/resty/v2"
+	log "github.com/sirupsen/logrus"
 )
 
+func (d *LanZou) doupload(callback base.ReqCallback, resp interface{}) ([]byte, error) {
+	return d.post(d.BaseUrl+"/doupload.php", func(req *resty.Request) {
+		req.SetQueryParam("uid", d.uid)
+		callback(req)
+	}, resp)
+}
+
 func (d *LanZou) get(url string, callback base.ReqCallback, resp interface{}) ([]byte, error) {
 	return d.request(url, http.MethodGet, callback, false)
 }
@@ -24,7 +32,16 @@ func (d *LanZou) post(url string, callback base.ReqCallback, resp interface{}) (
 }
 
 func (d *LanZou) _post(url string, callback base.ReqCallback, resp interface{}, up bool) ([]byte, error) {
-	data, err := d.request(url, http.MethodPost, callback, up)
+	data, err := d.request(url, http.MethodPost, func(req *resty.Request) {
+		req.AddRetryCondition(func(r *resty.Response, err error) bool {
+			if utils.Json.Get(r.Body(), "zt").ToInt() == 4 {
+				time.Sleep(time.Second)
+				return true
+			}
+			return false
+		})
+		callback(req)
+	}, up)
 	if err != nil {
 		return nil, err
 	}
@@ -68,7 +85,7 @@ func (d *LanZou) request(url string, method string, callback base.ReqCallback, u
 	if err != nil {
 		return nil, err
 	}
-
+	log.Debugf("lanzou request: url=>%s ,stats=>%d ,body => %s\n", res.Request.URL, res.StatusCode(), res.String())
 	return res.Body(), err
 }
 
@@ -77,31 +94,28 @@ func (d *LanZou) request(url string, method string, callback base.ReqCallback, u
 */
 
 // 获取文件和文件夹,获取到的文件大小、更改时间不可信
-func (d *LanZou) GetFiles(ctx context.Context, folderID string) ([]model.Obj, error) {
+func (d *LanZou) GetAllFiles(folderID string) ([]model.Obj, error) {
-	folders, err := d.getFolders(ctx, folderID)
+	folders, err := d.GetFolders(folderID)
 	if err != nil {
 		return nil, err
 	}
-	files, err := d.getFiles(ctx, folderID)
+	files, err := d.GetFiles(folderID)
 	if err != nil {
 		return nil, err
 	}
-	objs := make([]model.Obj, 0, len(folders)+len(files))
+	return append(
-	for _, folder := range folders {
+		utils.MustSliceConvert(folders, func(folder FileOrFolder) model.Obj {
-		objs = append(objs, folder.ToObj())
+			return &folder
-	}
+		}), utils.MustSliceConvert(files, func(file FileOrFolder) model.Obj {
-
+			return &file
-	for _, file := range files {
+		})...,
-		objs = append(objs, file.ToObj())
+	), nil
-	}
-	return objs, nil
 }
 
 // 通过ID获取文件夹
-func (d *LanZou) getFolders(ctx context.Context, folderID string) ([]FileOrFolder, error) {
+func (d *LanZou) GetFolders(folderID string) ([]FileOrFolder, error) {
-	var resp FilesOrFoldersResp
+	var resp RespText[[]FileOrFolder]
-	_, err := d.post(d.BaseUrl+"/doupload.php", func(req *resty.Request) {
+	_, err := d.doupload(func(req *resty.Request) {
-		req.SetContext(ctx)
 		req.SetFormData(map[string]string{
 			"task":      "47",
 			"folder_id": folderID,
@@ -114,12 +128,11 @@ func (d *LanZou) getFolders(ctx context.Context, folderID string) ([]FileOrFolde
 }
 
 // 通过ID获取文件
-func (d *LanZou) getFiles(ctx context.Context, folderID string) ([]FileOrFolder, error) {
+func (d *LanZou) GetFiles(folderID string) ([]FileOrFolder, error) {
 	files := make([]FileOrFolder, 0)
 	for pg := 1; ; pg++ {
-		var resp FilesOrFoldersResp
+		var resp RespText[[]FileOrFolder]
-		_, err := d.post(d.BaseUrl+"/doupload.php", func(req *resty.Request) {
+		_, err := d.doupload(func(req *resty.Request) {
-			req.SetContext(ctx)
 			req.SetFormData(map[string]string{
 				"task":      "5",
 				"folder_id": folderID,
@@ -138,37 +151,33 @@ func (d *LanZou) getFiles(ctx context.Context, folderID string) ([]FileOrFolder,
 }
 
 // 通过ID获取文件夹分享地址
-func (d *LanZou) getFolderShareUrlByID(ctx context.Context, fileID string) (share FileShare, err error) {
+func (d *LanZou) getFolderShareUrlByID(fileID string) (*FileShare, error) {
-	var resp FileShareResp
+	var resp RespInfo[FileShare]
-	_, err = d.post(d.BaseUrl+"/doupload.php", func(req *resty.Request) {
+	_, err := d.doupload(func(req *resty.Request) {
-		req.SetContext(ctx)
 		req.SetFormData(map[string]string{
 			"task":    "18",
 			"file_id": fileID,
 		})
 	}, &resp)
 	if err != nil {
-		return
+		return nil, err
 	}
-	share = resp.Info
+	return &resp.Info, nil
-	return
 }
 
 // 通过ID获取文件分享地址
-func (d *LanZou) getFileShareUrlByID(ctx context.Context, fileID string) (share FileShare, err error) {
+func (d *LanZou) getFileShareUrlByID(fileID string) (*FileShare, error) {
-	var resp FileShareResp
+	var resp RespInfo[FileShare]
-	_, err = d.post(d.BaseUrl+"/doupload.php", func(req *resty.Request) {
+	_, err := d.doupload(func(req *resty.Request) {
-		req.SetContext(ctx)
 		req.SetFormData(map[string]string{
 			"task":    "22",
 			"file_id": fileID,
 		})
 	}, &resp)
 	if err != nil {
-		return
+		return nil, err
 	}
-	share = resp.Info
+	return &resp.Info, nil
-	return
 }
 
 /*
@@ -180,237 +189,252 @@ var isFileReg = regexp.MustCompile(`class="fileinfo"|id="file"|文件描述`)
 var isFolderReg = regexp.MustCompile(`id="infos"`)
 
 // 获取文件文件夹基础信息
+
+// 获取文件名称
 var nameFindReg = regexp.MustCompile(`<title>(.+?) - 蓝奏云</title>|id="filenajax">(.+?)</div>|var filename = '(.+?)';|<div style="font-size.+?>([^<>].+?)</div>|<div class="filethetext".+?>([^<>]+?)</div>`)
+
+// 获取文件大小
 var sizeFindReg = regexp.MustCompile(`(?i)大小\W*([0-9.]+\s*[bkm]+)`)
+
+// 获取文件时间
 var timeFindReg = regexp.MustCompile(`\d+\s*[秒天分小][钟时]?前|[昨前]天|\d{4}-\d{2}-\d{2}`)
 
-var findSubFolaerReg = regexp.MustCompile(`(folderlink|mbxfolder).+href="/(.+?)"(.+filename")?>(.+?)<`) // 查找分享文件夹子文件夹ID和名称
+// 查找分享文件夹子文件夹ID和名称
+var findSubFolaerReg = regexp.MustCompile(`(?i)(?:folderlink|mbxfolder).+href="/(.+?)"(?:.+filename")?>(.+?)<`)
 
-// 获取关键数据
+// 获取下载页面链接
 var findDownPageParamReg = regexp.MustCompile(`<iframe.*?src="(.+?)"`)
 
-// 通过分享链接获取文件或文件夹,如果是文件则会返回下载链接
+// 获取分享链接主界面
-func (d *LanZou) GetFileOrFolderByShareUrl(ctx context.Context, downID, pwd string) ([]model.Obj, error) {
+func (d *LanZou) getShareUrlHtml(shareID string) (string, error) {
-	pageData, err := d.get(fmt.Sprint(d.ShareUrl, "/", downID), func(req *resty.Request) { req.SetContext(ctx) }, nil)
+	var vs string
+	for i := 0; i < 3; i++ {
+		firstPageData, err := d.get(fmt.Sprint(d.ShareUrl, "/", shareID),
+			func(req *resty.Request) {
+				if vs != "" {
+					req.SetCookie(&http.Cookie{
+						Name:  "acw_sc__v2",
+						Value: vs,
+					})
+				}
+			}, nil)
+		if err != nil {
+			return "", err
+		}
+
+		firstPageDataStr := RemoveNotes(string(firstPageData))
+		if strings.Contains(firstPageDataStr, "取消分享") {
+			return "", ErrFileShareCancel
+		}
+		if strings.Contains(firstPageDataStr, "文件不存在") {
+			return "", ErrFileNotExist
+		}
+
+		// acw_sc__v2
+		if strings.Contains(firstPageDataStr, "acw_sc__v2") {
+			if vs, err = CalcAcwScV2(firstPageDataStr); err != nil {
+				log.Errorf("lanzou: err => acw_sc__v2 validation error  ,data => %s\n", firstPageDataStr)
+				return "", err
+			}
+			continue
+		}
+		return firstPageDataStr, nil
+	}
+	return "", errors.New("acw_sc__v2 validation error")
+}
+
+// 通过分享链接获取文件或文件夹
+func (d *LanZou) GetFileOrFolderByShareUrl(shareID, pwd string) ([]model.Obj, error) {
+	pageData, err := d.getShareUrlHtml(shareID)
 	if err != nil {
 		return nil, err
 	}
-	pageData = RemoveNotes(pageData)
 
-	var objs []model.Obj
+	if !isFileReg.MatchString(pageData) {
-	if !isFileReg.Match(pageData) {
+		files, err := d.getFolderByShareUrl(pwd, pageData)
-		files, err := d.getFolderByShareUrl(ctx, downID, pwd, pageData)
 		if err != nil {
 			return nil, err
 		}
-		objs = make([]model.Obj, 0, len(files))
+		return utils.MustSliceConvert(files, func(file FileOrFolderByShareUrl) model.Obj {
-		for _, file := range files {
+			return &file
-			objs = append(objs, file.ToObj())
+		}), nil
-		}
 	} else {
-		file, err := d.getFilesByShareUrl(ctx, downID, pwd, pageData)
+		file, err := d.getFilesByShareUrl(shareID, pwd, pageData)
 		if err != nil {
 			return nil, err
 		}
-		objs = []model.Obj{file.ToObj()}
+		return []model.Obj{file}, nil
 	}
-	return objs, nil
 }
 
 // 通过分享链接获取文件(下载链接也使用此方法)
+// FileOrFolderByShareUrl 包含 pwd 和 url 字段
 // 参考 https://github.com/zaxtyson/LanZouCloud-API/blob/ab2e9ec715d1919bf432210fc16b91c6775fbb99/lanzou/api/core.py#L440
-func (d *LanZou) getFilesByShareUrl(ctx context.Context, downID, pwd string, firstPageData []byte) (file FileInfoAndUrlByShareUrl, err error) {
+func (d *LanZou) GetFilesByShareUrl(shareID, pwd string) (file *FileOrFolderByShareUrl, err error) {
-	if firstPageData == nil {
+	pageData, err := d.getShareUrlHtml(shareID)
-		firstPageData, err = d.get(fmt.Sprint(d.ShareUrl, "/", downID), func(req *resty.Request) { req.SetContext(ctx) }, nil)
+	if err != nil {
-		if err != nil {
+		return nil, err
-			return
-		}
-		firstPageData = RemoveNotes(firstPageData)
-	}
-	firstPageDataStr := string(firstPageData)
-
-	if strings.Contains(firstPageDataStr, "acw_sc__v2") {
-		var vs string
-		if vs, err = CalcAcwScV2(firstPageDataStr); err != nil {
-			return
-		}
-		firstPageData, err = d.get(fmt.Sprint(d.ShareUrl, "/", downID), func(req *resty.Request) {
-			req.SetCookie(&http.Cookie{
-				Name:  "acw_sc__v2",
-				Value: vs,
-			})
-			req.SetContext(ctx)
-		}, nil)
-		if err != nil {
-			return
-		}
-		firstPageData = RemoveNotes(firstPageData)
-		firstPageDataStr = string(firstPageData)
 	}
+	return d.getFilesByShareUrl(shareID, pwd, pageData)
+}
 
+func (d *LanZou) getFilesByShareUrl(shareID, pwd string, sharePageData string) (*FileOrFolderByShareUrl, error) {
 	var (
 		param       map[string]string
 		downloadUrl string
 		baseUrl     string
+		file        FileOrFolderByShareUrl
 	)
 
 	// 需要密码
-	if strings.Contains(firstPageDataStr, "pwdload") || strings.Contains(firstPageDataStr, "passwddiv") {
+	if strings.Contains(sharePageData, "pwdload") || strings.Contains(sharePageData, "passwddiv") {
-		param, err = htmlFormToMap(firstPageDataStr)
+		param, err := htmlFormToMap(sharePageData)
 		if err != nil {
-			return
+			return nil, err
 		}
 		param["p"] = pwd
 		var resp FileShareInfoAndUrlResp[string]
-		_, err = d.post(d.ShareUrl+"/ajaxm.php", func(req *resty.Request) { req.SetFormData(param).SetContext(ctx) }, &resp)
+		_, err = d.post(d.ShareUrl+"/ajaxm.php", func(req *resty.Request) { req.SetFormData(param) }, &resp)
 		if err != nil {
-			return
+			return nil, err
 		}
-		file.Name = resp.Inf
+		file.NameAll = resp.Inf
+		file.Pwd = pwd
 		baseUrl = resp.GetBaseUrl()
 		downloadUrl = resp.GetDownloadUrl()
 	} else {
-		urlpaths := findDownPageParamReg.FindStringSubmatch(firstPageDataStr)
+		urlpaths := findDownPageParamReg.FindStringSubmatch(sharePageData)
 		if len(urlpaths) != 2 {
-			err = fmt.Errorf("not find file page param")
+			log.Errorf("lanzou: err => not find file page param ,data => %s\n", sharePageData)
-			return
+			return nil, fmt.Errorf("not find file page param")
 		}
-		var nextPageData []byte
+		data, err := d.get(fmt.Sprint(d.ShareUrl, urlpaths[1]), nil, nil)
-		nextPageData, err = d.get(fmt.Sprint(d.ShareUrl, urlpaths[1]), func(req *resty.Request) { req.SetContext(ctx) }, nil)
 		if err != nil {
-			return
+			return nil, err
 		}
-		nextPageData = RemoveNotes(nextPageData)
+		nextPageData := RemoveNotes(string(data))
-		nextPageDataStr := string(nextPageData)
 
-		param, err = htmlJsonToMap(nextPageDataStr)
+		param, err = htmlJsonToMap(nextPageData)
 		if err != nil {
-			return
+			return nil, err
 		}
 
 		var resp FileShareInfoAndUrlResp[int]
-		_, err = d.post(d.ShareUrl+"/ajaxm.php", func(req *resty.Request) { req.SetFormData(param).SetContext(ctx) }, &resp)
+		_, err = d.post(d.ShareUrl+"/ajaxm.php", func(req *resty.Request) { req.SetFormData(param) }, &resp)
 		if err != nil {
-			return
+			return nil, err
 		}
 		baseUrl = resp.GetBaseUrl()
 		downloadUrl = resp.GetDownloadUrl()
 
-		names := nameFindReg.FindStringSubmatch(firstPageDataStr)
+		names := nameFindReg.FindStringSubmatch(sharePageData)
 		if len(names) > 1 {
 			for _, name := range names[1:] {
 				if name != "" {
-					file.Name = name
+					file.NameAll = name
 					break
 				}
 			}
 		}
 	}
 
-	sizes := sizeFindReg.FindStringSubmatch(firstPageDataStr)
+	sizes := sizeFindReg.FindStringSubmatch(sharePageData)
 	if len(sizes) == 2 {
 		file.Size = sizes[1]
 	}
-	file.ID = downID
+	file.ID = shareID
-	file.Time = timeFindReg.FindString(firstPageDataStr)
+	file.Time = timeFindReg.FindString(sharePageData)
 
 	// 重定向获取真实链接
 	res, err := base.NoRedirectClient.R().SetHeaders(map[string]string{
 		"accept-language": "zh-CN,zh;q=0.9,en;q=0.8,en-GB;q=0.7,en-US;q=0.6",
-	}).SetContext(ctx).Get(downloadUrl)
+	}).Get(downloadUrl)
 	if err != nil {
-		return
+		return nil, err
 	}
 
 	file.Url = res.Header().Get("location")
 
 	// 触发验证
-	rPageDataStr := res.String()
+	rPageData := res.String()
-	if res.StatusCode() != 302 && strings.Contains(rPageDataStr, "网络异常") {
+	if res.StatusCode() != 302 {
-		param, err = htmlJsonToMap(rPageDataStr)
+		param, err = htmlJsonToMap(rPageData)
 		if err != nil {
-			return
+			return nil, err
 		}
 		param["el"] = "2"
 		time.Sleep(time.Second * 2)
 
 		// 通过验证获取直连
-		var rUrl struct {
+		data, err := d.post(fmt.Sprint(baseUrl, "/ajax.php"), func(req *resty.Request) { req.SetFormData(param) }, nil)
-			Url string `json:"url"`
-		}
-		_, err = d.post(fmt.Sprint(baseUrl, "/ajax.php"), func(req *resty.Request) { req.SetContext(ctx).SetFormData(param) }, &rUrl)
 		if err != nil {
-			return
+			return nil, err
 		}
-		file.Url = rUrl.Url
+		file.Url = utils.Json.Get(data, "url").ToString()
 	}
-	return
+	return &file, nil
 }
 
 // 通过分享链接获取文件夹
+// 似乎子目录和文件不会加密
 // 参考 https://github.com/zaxtyson/LanZouCloud-API/blob/ab2e9ec715d1919bf432210fc16b91c6775fbb99/lanzou/api/core.py#L1089
-func (d *LanZou) getFolderByShareUrl(ctx context.Context, downID, pwd string, firstPageData []byte) ([]FileOrFolderByShareUrl, error) {
+func (d *LanZou) GetFolderByShareUrl(shareID, pwd string) ([]FileOrFolderByShareUrl, error) {
-	if firstPageData == nil {
+	pageData, err := d.getShareUrlHtml(shareID)
-		var err error
+	if err != nil {
-		firstPageData, err = d.get(fmt.Sprint(d.ShareUrl, "/", downID), func(req *resty.Request) { req.SetContext(ctx) }, nil)
+		return nil, err
-		if err != nil {
+	}
-			return nil, err
+	return d.getFolderByShareUrl(pwd, pageData)
-		}
+}
-		firstPageData = RemoveNotes(firstPageData)
+
-	}
+func (d *LanZou) getFolderByShareUrl(pwd string, sharePageData string) ([]FileOrFolderByShareUrl, error) {
-	firstPageDataStr := string(firstPageData)
+	from, err := htmlJsonToMap(sharePageData)
-
-	//
-	if strings.Contains(firstPageDataStr, "acw_sc__v2") {
-		vs, err := CalcAcwScV2(firstPageDataStr)
-		if err != nil {
-			return nil, err
-		}
-		firstPageData, err = d.get(fmt.Sprint(d.ShareUrl, "/", downID), func(req *resty.Request) {
-			req.SetCookie(&http.Cookie{
-				Name:  "acw_sc__v2",
-				Value: vs,
-			})
-			req.SetContext(ctx)
-		}, nil)
-		if err != nil {
-			return nil, err
-		}
-		firstPageData = RemoveNotes(firstPageData)
-		firstPageDataStr = string(firstPageData)
-	}
-
-	from, err := htmlJsonToMap(firstPageDataStr)
 	if err != nil {
 		return nil, err
 	}
-	from["pwd"] = pwd
 
 	files := make([]FileOrFolderByShareUrl, 0)
 	// vip获取文件夹
-	floders := findSubFolaerReg.FindAllStringSubmatch(firstPageDataStr, -1)
+	floders := findSubFolaerReg.FindAllStringSubmatch(sharePageData, -1)
 	for _, floder := range floders {
-		if len(floder) == 5 {
+		if len(floder) == 3 {
 			files = append(files, FileOrFolderByShareUrl{
-				ID:       floder[2],
+				// Pwd: pwd, // 子文件夹不加密
-				NameAll:  floder[4],
+				ID:       floder[1],
+				NameAll:  floder[2],
 				IsFloder: true,
 			})
 		}
 	}
 
+	// 获取文件
+	from["pwd"] = pwd
 	for page := 1; ; page++ {
 		from["pg"] = strconv.Itoa(page)
 		var resp FileOrFolderByShareUrlResp
-		_, err := d.post(d.ShareUrl+"/filemoreajax.php", func(req *resty.Request) { req.SetFormData(from).SetContext(ctx) }, &resp)
+		_, err := d.post(d.ShareUrl+"/filemoreajax.php", func(req *resty.Request) { req.SetFormData(from) }, &resp)
 		if err != nil {
 			return nil, err
 		}
-		files = append(files, resp.Text...)
+		/*// 文件夹中的文件也不加密
+		for i := 0; i < len(resp.Text); i++ {
+			resp.Text[i].Pwd = pwd
+		}*/
 		if len(resp.Text) == 0 {
 			break
 		}
-		time.Sleep(time.Millisecond * 600)
+		files = append(files, resp.Text...)
+		time.Sleep(time.Second)
 	}
 	return files, nil
 }
+
+// 通过下载头获取真实文件信息
+func (d *LanZou) getFileRealInfo(downURL string) (*int64, *time.Time) {
+	res, _ := base.RestyClient.R().Head(downURL)
+	if res == nil {
+		return nil, nil
+	}
+	time, _ := http.ParseTime(res.Header().Get("Last-Modified"))
+	size, _ := strconv.ParseInt(res.Header().Get("Content-Length"), 10, 64)
+	return &size, &time
+}

drivers/local/driver.go

@@ -18,9 +18,11 @@ import (
 	"github.com/alist-org/alist/v3/internal/driver"
 	"github.com/alist-org/alist/v3/internal/errs"
 	"github.com/alist-org/alist/v3/internal/model"
+	"github.com/alist-org/alist/v3/internal/sign"
 	"github.com/alist-org/alist/v3/pkg/utils"
 	"github.com/alist-org/alist/v3/server/common"
 	"github.com/disintegration/imaging"
+	_ "golang.org/x/image/webp"
 )
 
 type Local struct {
@@ -32,24 +34,18 @@ func (d *Local) Config() driver.Config {
 	return config
 }
 
-func (d *Local) Init(ctx context.Context, storage model.Storage) error {
+func (d *Local) Init(ctx context.Context) error {
-	d.Storage = storage
-	err := utils.Json.UnmarshalFromString(d.Storage.Addition, &d.Addition)
-	if err != nil {
-		return err
-	}
 	if !utils.Exists(d.GetRootPath()) {
-		err = fmt.Errorf("root folder %s not exists", d.GetRootPath())
+		return fmt.Errorf("root folder %s not exists", d.GetRootPath())
-	} else {
-		if !filepath.IsAbs(d.GetRootPath()) {
-			abs, err := filepath.Abs(d.GetRootPath())
-			if err != nil {
-				return err
-			}
-			d.SetRootPath(abs)
-		}
 	}
-	return err
+	if !filepath.IsAbs(d.GetRootPath()) {
+		abs, err := filepath.Abs(d.GetRootPath())
+		if err != nil {
+			return err
+		}
+		d.Addition.RootFolderPath = abs
+	}
+	return nil
 }
 
 func (d *Local) Drop(ctx context.Context) error {
@@ -57,7 +53,7 @@ func (d *Local) Drop(ctx context.Context) error {
 }
 
 func (d *Local) GetAddition() driver.Additional {
-	return d.Addition
+	return &d.Addition
 }
 
 func (d *Local) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([]model.Obj, error) {
@@ -75,15 +71,16 @@ func (d *Local) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([
 		if d.Thumbnail && utils.GetFileType(f.Name()) == conf.IMAGE {
 			thumb = common.GetApiUrl(nil) + stdpath.Join("/d", args.ReqPath, f.Name())
 			thumb = utils.EncodePath(thumb, true)
-			thumb += "?type=thumb"
+			thumb += "?type=thumb&sign=" + sign.Sign(stdpath.Join(args.ReqPath, f.Name()))
 		}
 		isFolder := f.IsDir() || isSymlinkDir(f, fullPath)
-		size := f.Size()
+		var size int64
-		if isFolder {
+		if !isFolder {
-			size = 0
+			size = f.Size()
 		}
 		file := model.ObjThumb{
 			Object: model.Object{
+				Path:     filepath.Join(dir.GetPath(), f.Name()),
 				Name:     f.Name(),
 				Modified: f.ModTime(),
 				Size:     size,
@@ -99,6 +96,7 @@ func (d *Local) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([
 }
 
 func (d *Local) Get(ctx context.Context, path string) (model.Obj, error) {
+	path = filepath.Join(d.GetRootPath(), path)
 	f, err := os.Stat(path)
 	if err != nil {
 		if strings.Contains(err.Error(), "cannot find the file") {
@@ -163,6 +161,9 @@ func (d *Local) MakeDir(ctx context.Context, parentDir model.Obj, dirName string
 func (d *Local) Move(ctx context.Context, srcObj, dstDir model.Obj) error {
 	srcPath := srcObj.GetPath()
 	dstPath := filepath.Join(dstDir.GetPath(), srcObj.GetName())
+	if utils.IsSubPath(srcPath, dstPath) {
+		return fmt.Errorf("the destination folder is a subfolder of the source folder")
+	}
 	err := os.Rename(srcPath, dstPath)
 	if err != nil {
 		return err
@@ -183,6 +184,9 @@ func (d *Local) Rename(ctx context.Context, srcObj model.Obj, newName string) er
 func (d *Local) Copy(ctx context.Context, srcObj, dstDir model.Obj) error {
 	srcPath := srcObj.GetPath()
 	dstPath := filepath.Join(dstDir.GetPath(), srcObj.GetName())
+	if utils.IsSubPath(srcPath, dstPath) {
+		return fmt.Errorf("the destination folder is a subfolder of the source folder")
+	}
 	var err error
 	if srcObj.IsDir() {
 		err = utils.CopyDir(srcPath, dstPath)

drivers/local/meta.go

@@ -19,10 +19,8 @@ var config = driver.Config{
 	DefaultRoot: "/",
 }
 
-func New() driver.Driver {
-	return &Local{}
-}
-
 func init() {
-	op.RegisterDriver(config, New)
+	op.RegisterDriver(func() driver.Driver {
+		return &Local{}
+	})
 }

drivers/mediatrack/driver.go

@@ -8,14 +8,12 @@ import (
 	"io"
 	"net/http"
 	"os"
-	"path"
 	"strconv"
 	"time"
 
 	"github.com/alist-org/alist/v3/drivers/base"
 	"github.com/alist-org/alist/v3/internal/driver"
 	"github.com/alist-org/alist/v3/internal/model"
-	"github.com/alist-org/alist/v3/internal/op"
 	"github.com/alist-org/alist/v3/pkg/utils"
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/credentials"
@@ -36,16 +34,11 @@ func (d *MediaTrack) Config() driver.Config {
 }
 
 func (d *MediaTrack) GetAddition() driver.Additional {
-	return d.Addition
+	return &d.Addition
 }
 
-func (d *MediaTrack) Init(ctx context.Context, storage model.Storage) error {
+func (d *MediaTrack) Init(ctx context.Context) error {
-	d.Storage = storage
+	_, err := d.request("https://kayle.api.mediatrack.cn/users", http.MethodGet, nil, nil)
-	err := utils.Json.UnmarshalFromString(d.Storage.Addition, &d.Addition)
-	if err != nil {
-		return err
-	}
-	_, err = d.request("https://kayle.api.mediatrack.cn/users", http.MethodGet, nil, nil)
 	return err
 }
 
@@ -64,7 +57,7 @@ func (d *MediaTrack) List(ctx context.Context, dir model.Obj, args model.ListArg
 		if f.File != nil && f.File.Cover != "" {
 			thumb = "https://nano.mtres.cn/" + f.File.Cover
 		}
-		return &model.ObjThumb{
+		return &Object{
 			Object: model.Object{
 				ID:       f.ID,
 				Name:     f.Title,
@@ -73,15 +66,11 @@ func (d *MediaTrack) List(ctx context.Context, dir model.Obj, args model.ListArg
 				Size:     size,
 			},
 			Thumbnail: model.Thumbnail{Thumbnail: thumb},
+			ParentID:  dir.GetID(),
 		}, nil
 	})
 }
 
-//func (d *MediaTrack) Get(ctx context.Context, path string) (model.Obj, error) {
-//	// this is optional
-//	return nil, errs.NotImplement
-//}
-
 func (d *MediaTrack) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
 	url := fmt.Sprintf("https://kayn.api.mediatrack.cn/v1/download_token/asset?asset_id=%s&source_type=project&password=&source_id=%s",
 		file.GetID(), d.ProjectID)
@@ -156,16 +145,18 @@ func (d *MediaTrack) Copy(ctx context.Context, srcObj, dstDir model.Obj) error {
 }
 
 func (d *MediaTrack) Remove(ctx context.Context, obj model.Obj) error {
-	dir, err := op.Get(ctx, d, path.Dir(obj.GetPath()))
+	var parentID string
-	if err != nil {
+	if o, ok := obj.(*Object); ok {
-		return err
+		parentID = o.ParentID
+	} else {
+		return fmt.Errorf("obj is not local Object")
 	}
 	data := base.Json{
-		"origin_id": dir.GetID(),
+		"origin_id": parentID,
 		"ids":       []string{obj.GetID()},
 	}
 	url := "https://jayce.api.mediatrack.cn/v4/assets/batch/delete"
-	_, err = d.request(url, http.MethodDelete, func(req *resty.Request) {
+	_, err := d.request(url, http.MethodDelete, func(req *resty.Request) {
 		req.SetBody(data)
 	}, nil)
 	return err
@@ -204,7 +195,7 @@ func (d *MediaTrack) Put(ctx context.Context, dstDir model.Obj, stream model.Fil
 		Key:    &resp.Data.Object,
 		Body:   tempFile,
 	}
-	_, err = uploader.Upload(input)
+	_, err = uploader.UploadWithContext(ctx, input)
 	if err != nil {
 		return err
 	}

drivers/mediatrack/meta.go

@@ -18,7 +18,7 @@ var config = driver.Config{
 }
 
 func init() {
-	op.RegisterDriver(config, func() driver.Driver {
+	op.RegisterDriver(func() driver.Driver {
 		return &MediaTrack{}
 	})
 }

drivers/mediatrack/types.go

@@ -1,6 +1,10 @@
 package mediatrack
 
-import "time"
+import (
+	"time"
+
+	"github.com/alist-org/alist/v3/internal/model"
+)
 
 type BaseResp struct {
 	Status  string `json:"status"`
@@ -60,3 +64,9 @@ type UploadResp struct {
 	TraceID   string `json:"trace_id"`
 	RequestID string `json:"requestId"`
 }
+
+type Object struct {
+	model.Object
+	model.Thumbnail
+	ParentID string
+}

drivers/mega/driver.go

@@ -9,7 +9,6 @@ import (
 	"github.com/alist-org/alist/v3/internal/driver"
 	"github.com/alist-org/alist/v3/internal/errs"
 	"github.com/alist-org/alist/v3/internal/model"
-	"github.com/alist-org/alist/v3/pkg/chanio"
 	"github.com/alist-org/alist/v3/pkg/utils"
 	log "github.com/sirupsen/logrus"
 	"github.com/t3rm1n4l/go-mega"
@@ -26,15 +25,10 @@ func (d *Mega) Config() driver.Config {
 }
 
 func (d *Mega) GetAddition() driver.Additional {
-	return d.Addition
+	return &d.Addition
 }
 
-func (d *Mega) Init(ctx context.Context, storage model.Storage) error {
+func (d *Mega) Init(ctx context.Context) error {
-	d.Storage = storage
-	err := utils.Json.UnmarshalFromString(d.Storage.Addition, &d.Addition)
-	if err != nil {
-		return err
-	}
 	d.c = mega.New()
 	return d.c.Login(d.Email, d.Password)
 }
@@ -62,13 +56,10 @@ func (d *Mega) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([]
 	return nil, fmt.Errorf("unable to convert dir to mega node")
 }
 
-func (d *Mega) Get(ctx context.Context, path string) (model.Obj, error) {
+func (d *Mega) GetRoot(ctx context.Context) (model.Obj, error) {
-	if path == "/" {
+	n := d.c.FS.GetRoot()
-		n := d.c.FS.GetRoot()
+	log.Debugf("mega root: %+v", *n)
-		log.Debugf("mega root: %+v", *n)
+	return &MegaNode{n}, nil
-		return &MegaNode{n}, nil
-	}
-	return nil, errs.NotSupport
 }
 
 func (d *Mega) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
@@ -85,17 +76,21 @@ func (d *Mega) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*
 		//u := down.GetResourceUrl()
 		//u = strings.Replace(u, "http", "https", 1)
 		//return &model.Link{URL: u}, nil
-		c := chanio.New()
+		r, w := io.Pipe()
 		go func() {
 			defer func() {
 				_ = recover()
 			}()
 			log.Debugf("chunk size: %d", down.Chunks())
+			var (
+				chunk []byte
+				err   error
+			)
 			for id := 0; id < down.Chunks(); id++ {
-				chunk, err := down.DownloadChunk(id)
+				chunk, err = down.DownloadChunk(id)
 				if err != nil {
 					log.Errorf("mega down: %+v", err)
-					return
+					break
 				}
 				log.Debugf("id: %d,len: %d", id, len(chunk))
 				//_, _, err = down.ChunkLocation(id)
@@ -104,14 +99,16 @@ func (d *Mega) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*
 				//	return
 				//}
 				//_, err = c.Write(chunk)
-				_, err = c.Write(chunk)
+				if _, err = w.Write(chunk); err != nil {
+					break
+				}
 			}
-			err := c.Close()
+			err = w.CloseWithError(err)
 			if err != nil {
 				log.Errorf("mega down: %+v", err)
 			}
 		}()
-		return &model.Link{Data: c}, nil
+		return &model.Link{Data: r}, nil
 	}
 	return nil, fmt.Errorf("unable to convert dir to mega node")
 }
@@ -159,6 +156,9 @@ func (d *Mega) Put(ctx context.Context, dstDir model.Obj, stream model.FileStrea
 		}
 
 		for id := 0; id < u.Chunks(); id++ {
+			if utils.IsCanceled(ctx) {
+				return ctx.Err()
+			}
 			_, chkSize, err := u.ChunkLocation(id)
 			if err != nil {
 				return err

drivers/mega/meta.go

@@ -20,7 +20,7 @@ var config = driver.Config{
 }
 
 func init() {
-	op.RegisterDriver(config, func() driver.Driver {
+	op.RegisterDriver(func() driver.Driver {
 		return &Mega{}
 	})
 }

drivers/onedrive/driver.go

@@ -2,14 +2,13 @@ package onedrive
 
 import (
 	"context"
+	"fmt"
 	"net/http"
-	stdpath "path"
 
 	"github.com/alist-org/alist/v3/drivers/base"
 	"github.com/alist-org/alist/v3/internal/driver"
 	"github.com/alist-org/alist/v3/internal/errs"
 	"github.com/alist-org/alist/v3/internal/model"
-	"github.com/alist-org/alist/v3/internal/op"
 	"github.com/alist-org/alist/v3/pkg/utils"
 	"github.com/go-resty/resty/v2"
 )
@@ -25,15 +24,10 @@ func (d *Onedrive) Config() driver.Config {
 }
 
 func (d *Onedrive) GetAddition() driver.Additional {
-	return d.Addition
+	return &d.Addition
 }
 
-func (d *Onedrive) Init(ctx context.Context, storage model.Storage) error {
+func (d *Onedrive) Init(ctx context.Context) error {
-	d.Storage = storage
-	err := utils.Json.UnmarshalFromString(d.Storage.Addition, &d.Addition)
-	if err != nil {
-		return err
-	}
 	if d.ChunkSize < 1 {
 		d.ChunkSize = 5
 	}
@@ -50,7 +44,7 @@ func (d *Onedrive) List(ctx context.Context, dir model.Obj, args model.ListArgs)
 		return nil, err
 	}
 	return utils.SliceConvert(files, func(src File) (model.Obj, error) {
-		return fileToObj(src), nil
+		return fileToObj(src, dir.GetID()), nil
 	})
 }
 
@@ -95,18 +89,21 @@ func (d *Onedrive) Move(ctx context.Context, srcObj, dstDir model.Obj) error {
 }
 
 func (d *Onedrive) Rename(ctx context.Context, srcObj model.Obj, newName string) error {
-	dstDir, err := op.Get(ctx, d, stdpath.Dir(srcObj.GetPath()))
+	//dstDir, err := op.GetUnwrap(ctx, d, stdpath.Dir(srcObj.GetPath()))
-	if err != nil {
+	var parentID string
-		return err
+	if o, ok := srcObj.(*Object); ok {
+		parentID = o.ParentID
+	} else {
+		return fmt.Errorf("srcObj is not Object")
 	}
 	data := base.Json{
 		"parentReference": base.Json{
-			"id": dstDir.GetID(),
+			"id": parentID,
 		},
 		"name": newName,
 	}
 	url := d.GetMetaUrl(false, srcObj.GetPath())
-	_, err = d.Request(url, http.MethodPatch, func(req *resty.Request) {
+	_, err := d.Request(url, http.MethodPatch, func(req *resty.Request) {
 		req.SetBody(data)
 	}, nil)
 	return err
@@ -140,7 +137,7 @@ func (d *Onedrive) Remove(ctx context.Context, obj model.Obj) error {
 func (d *Onedrive) Put(ctx context.Context, dstDir model.Obj, stream model.FileStreamer, up driver.UpdateProgress) error {
 	var err error
 	if stream.GetSize() <= 4*1024*1024 {
-		err = d.upSmall(dstDir, stream)
+		err = d.upSmall(ctx, dstDir, stream)
 	} else {
 		err = d.upBig(ctx, dstDir, stream, up)
 	}

drivers/onedrive/meta.go

@@ -23,10 +23,8 @@ var config = driver.Config{
 	DefaultRoot: "/",
 }
 
-func New() driver.Driver {
-	return &Onedrive{}
-}
-
 func init() {
-	op.RegisterDriver(config, New)
+	op.RegisterDriver(func() driver.Driver {
+		return &Onedrive{}
+	})
 }

drivers/onedrive/types.go

@@ -42,21 +42,29 @@ type File struct {
 	} `json:"parentReference"`
 }
 
-func fileToObj(f File) *model.ObjThumbURL {
+type Object struct {
+	model.ObjThumbURL
+	ParentID string
+}
+
+func fileToObj(f File, parentID string) *Object {
 	thumb := ""
 	if len(f.Thumbnails) > 0 {
 		thumb = f.Thumbnails[0].Medium.Url
 	}
-	return &model.ObjThumbURL{
+	return &Object{
-		Object: model.Object{
+		ObjThumbURL: model.ObjThumbURL{
-			ID:       f.Id,
+			Object: model.Object{
-			Name:     f.Name,
+				ID:       f.Id,
-			Size:     f.Size,
+				Name:     f.Name,
-			Modified: f.LastModifiedDateTime,
+				Size:     f.Size,
-			IsFolder: f.File == nil,
+				Modified: f.LastModifiedDateTime,
+				IsFolder: f.File == nil,
+			},
+			Thumbnail: model.Thumbnail{Thumbnail: thumb},
+			Url:       model.Url{Url: f.Url},
 		},
-		Thumbnail: model.Thumbnail{Thumbnail: thumb},
+		ParentID: parentID,
-		Url:       model.Url{Url: f.Url},
 	}
 }
 

drivers/onedrive/util.go

@@ -147,14 +147,14 @@ func (d *Onedrive) GetFile(path string) (*File, error) {
 	return &file, err
 }
 
-func (d *Onedrive) upSmall(dstDir model.Obj, stream model.FileStreamer) error {
+func (d *Onedrive) upSmall(ctx context.Context, dstDir model.Obj, stream model.FileStreamer) error {
 	url := d.GetMetaUrl(false, stdpath.Join(dstDir.GetPath(), stream.GetName())) + "/content"
 	data, err := io.ReadAll(stream)
 	if err != nil {
 		return err
 	}
 	_, err = d.Request(url, http.MethodPut, func(req *resty.Request) {
-		req.SetBody(data)
+		req.SetBody(data).SetContext(ctx)
 	}, nil)
 	return err
 }
@@ -185,6 +185,10 @@ func (d *Onedrive) upBig(ctx context.Context, dstDir model.Obj, stream model.Fil
 			return err
 		}
 		req, err := http.NewRequest("PUT", uploadUrl, bytes.NewBuffer(byteData))
+		if err != nil {
+			return err
+		}
+		req = req.WithContext(ctx)
 		req.Header.Set("Content-Length", strconv.Itoa(int(byteSize)))
 		req.Header.Set("Content-Range", fmt.Sprintf("bytes %d-%d/%d", finish, finish+byteSize-1, stream.GetSize()))
 		finish += byteSize

drivers/pikpak/driver.go

@@ -35,15 +35,10 @@ func (d *PikPak) Config() driver.Config {
 }
 
 func (d *PikPak) GetAddition() driver.Additional {
-	return d.Addition
+	return &d.Addition
 }
 
-func (d *PikPak) Init(ctx context.Context, storage model.Storage) error {
+func (d *PikPak) Init(ctx context.Context) error {
-	d.Storage = storage
-	err := utils.Json.UnmarshalFromString(d.Storage.Addition, &d.Addition)
-	if err != nil {
-		return err
-	}
 	return d.login()
 }
 
@@ -194,7 +189,7 @@ func (d *PikPak) Put(ctx context.Context, dstDir model.Obj, stream model.FileStr
 		Key:    &key,
 		Body:   tempFile,
 	}
-	_, err = uploader.Upload(input)
+	_, err = uploader.UploadWithContext(ctx, input)
 	return err
 }
 

drivers/pikpak/meta.go

@@ -17,10 +17,8 @@ var config = driver.Config{
 	DefaultRoot: "",
 }
 
-func New() driver.Driver {
-	return &PikPak{}
-}
-
 func init() {
-	op.RegisterDriver(config, New)
+	op.RegisterDriver(func() driver.Driver {
+		return &PikPak{}
+	})
 }

drivers/pikpak_share/driver.go

@@ -0,0 +1,81 @@
+package pikpak_share
+
+import (
+	"context"
+	"net/http"
+
+	"github.com/alist-org/alist/v3/internal/driver"
+	"github.com/alist-org/alist/v3/internal/model"
+	"github.com/alist-org/alist/v3/pkg/utils"
+	"github.com/go-resty/resty/v2"
+	log "github.com/sirupsen/logrus"
+)
+
+type PikPakShare struct {
+	model.Storage
+	Addition
+	RefreshToken  string
+	AccessToken   string
+	PassCodeToken string
+}
+
+func (d *PikPakShare) Config() driver.Config {
+	return config
+}
+
+func (d *PikPakShare) GetAddition() driver.Additional {
+	return &d.Addition
+}
+
+func (d *PikPakShare) Init(ctx context.Context) error {
+	err := d.login()
+	if err != nil {
+		return err
+	}
+	if d.SharePwd != "" {
+		err = d.getSharePassToken()
+		if err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func (d *PikPakShare) Drop(ctx context.Context) error {
+	return nil
+}
+
+func (d *PikPakShare) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([]model.Obj, error) {
+	files, err := d.getFiles(dir.GetID())
+	if err != nil {
+		return nil, err
+	}
+	return utils.SliceConvert(files, func(src File) (model.Obj, error) {
+		return fileToObj(src), nil
+	})
+}
+
+func (d *PikPakShare) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
+	var resp ShareResp
+	query := map[string]string{
+		"share_id":        d.ShareId,
+		"file_id":         file.GetID(),
+		"pass_code_token": d.PassCodeToken,
+	}
+	_, err := d.request("https://api-drive.mypikpak.com/drive/v1/share/file_info", http.MethodGet, func(req *resty.Request) {
+		req.SetQueryParams(query)
+	}, &resp)
+	if err != nil {
+		return nil, err
+	}
+	link := model.Link{
+		URL: resp.FileInfo.WebContentLink,
+	}
+	if len(resp.FileInfo.Medias) > 0 && resp.FileInfo.Medias[0].Link.Url != "" {
+		log.Debugln("use media link")
+		link.URL = resp.FileInfo.Medias[0].Link.Url
+	}
+	return &link, nil
+}
+
+var _ driver.Driver = (*PikPakShare)(nil)

drivers/pikpak_share/meta.go

@@ -0,0 +1,27 @@
+package pikpak_share
+
+import (
+	"github.com/alist-org/alist/v3/internal/driver"
+	"github.com/alist-org/alist/v3/internal/op"
+)
+
+type Addition struct {
+	driver.RootID
+	Username string `json:"username" required:"true"`
+	Password string `json:"password" required:"true"`
+	ShareId  string `json:"share_id" required:"true"`
+	SharePwd string `json:"share_pwd"`
+}
+
+var config = driver.Config{
+	Name:        "PikPakShare",
+	LocalSort:   true,
+	NoUpload:    true,
+	DefaultRoot: "",
+}
+
+func init() {
+	op.RegisterDriver(func() driver.Driver {
+		return &PikPakShare{}
+	})
+}

drivers/pikpak_share/types.go

@@ -0,0 +1,80 @@
+package pikpak_share
+
+import (
+	"strconv"
+	"time"
+
+	"github.com/alist-org/alist/v3/internal/model"
+)
+
+type RespErr struct {
+	ErrorCode int    `json:"error_code"`
+	Error     string `json:"error"`
+}
+
+type ShareResp struct {
+	ShareStatus		string `json:"share_status"`
+	ShareStatusText	string `json:"share_status_text"`
+	FileInfo        File   `json:"file_info"`
+	Files           []File `json:"files"`
+	NextPageToken   string `json:"next_page_token"`
+	PassCodeToken   string `json:"pass_code_token"`
+}
+
+type File struct {
+	Id             string    `json:"id"`
+	ShareId        string    `json:"share_id"`
+	Kind           string    `json:"kind"`
+	Name           string    `json:"name"`
+	ModifiedTime   time.Time `json:"modified_time"`
+	Size           string    `json:"size"`
+	ThumbnailLink  string    `json:"thumbnail_link"`
+	WebContentLink string    `json:"web_content_link"`
+	Medias         []Media   `json:"medias"`
+}
+
+func fileToObj(f File) *model.ObjThumb {
+	size, _ := strconv.ParseInt(f.Size, 10, 64)
+	return &model.ObjThumb{
+		Object: model.Object{
+			ID:       f.Id,
+			Name:     f.Name,
+			Size:     size,
+			Modified: f.ModifiedTime,
+			IsFolder: f.Kind == "drive#folder",
+		},
+		Thumbnail: model.Thumbnail{
+			Thumbnail: f.ThumbnailLink,
+		},
+	}
+}
+
+type Media struct {
+	MediaId   string `json:"media_id"`
+	MediaName string `json:"media_name"`
+	Video     struct {
+		Height     int    `json:"height"`
+		Width      int    `json:"width"`
+		Duration   int    `json:"duration"`
+		BitRate    int    `json:"bit_rate"`
+		FrameRate  int    `json:"frame_rate"`
+		VideoCodec string `json:"video_codec"`
+		AudioCodec string `json:"audio_codec"`
+		VideoType  string `json:"video_type"`
+	} `json:"video"`
+	Link struct {
+		Url    string    `json:"url"`
+		Token  string    `json:"token"`
+		Expire time.Time `json:"expire"`
+	} `json:"link"`
+	NeedMoreQuota  bool          `json:"need_more_quota"`
+	VipTypes       []interface{} `json:"vip_types"`
+	RedirectLink   string        `json:"redirect_link"`
+	IconLink       string        `json:"icon_link"`
+	IsDefault      bool          `json:"is_default"`
+	Priority       int           `json:"priority"`
+	IsOrigin       bool          `json:"is_origin"`
+	ResolutionName string        `json:"resolution_name"`
+	IsVisible      bool          `json:"is_visible"`
+	Category       string        `json:"category"`
+}

drivers/pikpak_share/util.go

@@ -0,0 +1,154 @@
+package pikpak_share
+
+import (
+	"errors"
+	"net/http"
+
+	"github.com/alist-org/alist/v3/drivers/base"
+	"github.com/alist-org/alist/v3/internal/op"
+	"github.com/go-resty/resty/v2"
+	jsoniter "github.com/json-iterator/go"
+)
+
+// do others that not defined in Driver interface
+
+func (d *PikPakShare) login() error {
+	url := "https://user.mypikpak.com/v1/auth/signin"
+	var e RespErr
+	res, err := base.RestyClient.R().SetError(&e).SetBody(base.Json{
+		"captcha_token": "",
+		"client_id":     "YNxT9w7GMdWvEOKa",
+		"client_secret": "dbw2OtmVEeuUvIptb1Coyg",
+		"username":      d.Username,
+		"password":      d.Password,
+	}).Post(url)
+	if err != nil {
+		return err
+	}
+	if e.ErrorCode != 0 {
+		return errors.New(e.Error)
+	}
+	data := res.Body()
+	d.RefreshToken = jsoniter.Get(data, "refresh_token").ToString()
+	d.AccessToken = jsoniter.Get(data, "access_token").ToString()
+	return nil
+}
+
+func (d *PikPakShare) refreshToken() error {
+	url := "https://user.mypikpak.com/v1/auth/token"
+	var e RespErr
+	res, err := base.RestyClient.R().SetError(&e).
+		SetHeader("user-agent", "").SetBody(base.Json{
+		"client_id":     "YNxT9w7GMdWvEOKa",
+		"client_secret": "dbw2OtmVEeuUvIptb1Coyg",
+		"grant_type":    "refresh_token",
+		"refresh_token": d.RefreshToken,
+	}).Post(url)
+	if err != nil {
+		d.Status = err.Error()
+		op.MustSaveDriverStorage(d)
+		return err
+	}
+	if e.ErrorCode != 0 {
+		if e.ErrorCode == 4126 {
+			// refresh_token invalid, re-login
+			return d.login()
+		}
+		d.Status = e.Error
+		op.MustSaveDriverStorage(d)
+		return errors.New(e.Error)
+	}
+	data := res.Body()
+	d.Status = "work"
+	d.RefreshToken = jsoniter.Get(data, "refresh_token").ToString()
+	d.AccessToken = jsoniter.Get(data, "access_token").ToString()
+	op.MustSaveDriverStorage(d)
+	return nil
+}
+
+func (d *PikPakShare) 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 {
+		callback(req)
+	}
+	if resp != nil {
+		req.SetResult(resp)
+	}
+	var e RespErr
+	req.SetError(&e)
+	res, err := req.Execute(method, url)
+	if err != nil {
+		return nil, err
+	}
+	if e.ErrorCode != 0 {
+		if e.ErrorCode == 16 {
+			// login / refresh token
+			err = d.refreshToken()
+			if err != nil {
+				return nil, err
+			}
+			return d.request(url, method, callback, resp)
+		}
+		return nil, errors.New(e.Error)
+	}
+	return res.Body(), nil
+}
+
+func (d *PikPakShare) getSharePassToken() error {
+	query := map[string]string{
+		"share_id":       d.ShareId,
+		"pass_code":      d.SharePwd,
+		"thumbnail_size": "SIZE_LARGE",
+		"limit":          "100",
+	}
+	var resp ShareResp
+	_, err := d.request("https://api-drive.mypikpak.com/drive/v1/share", http.MethodGet, func(req *resty.Request) {
+		req.SetQueryParams(query)
+	}, &resp)
+	if err != nil {
+		return err
+	}
+	d.PassCodeToken = resp.PassCodeToken
+	return nil
+}
+
+func (d *PikPakShare) getFiles(id string) ([]File, error) {
+	res := make([]File, 0)
+	pageToken := "first"
+	for pageToken != "" {
+		if pageToken == "first" {
+			pageToken = ""
+		}
+		query := map[string]string{
+			"parent_id":       id,
+			"share_id":        d.ShareId,
+			"thumbnail_size":  "SIZE_LARGE",
+			"with_audit":      "true",
+			"limit":           "100",
+			"filters":         `{"phase":{"eq":"PHASE_TYPE_COMPLETE"},"trashed":{"eq":false}}`,
+			"page_token":      pageToken,
+			"pass_code_token": d.PassCodeToken,
+		}
+		var resp ShareResp
+		_, err := d.request("https://api-drive.mypikpak.com/drive/v1/share/detail", http.MethodGet, func(req *resty.Request) {
+			req.SetQueryParams(query)
+		}, &resp)
+		if err != nil {
+			return nil, err
+		}
+		if resp.ShareStatus != "OK" {
+			if resp.ShareStatus == "PASS_CODE_EMPTY" || resp.ShareStatus == "PASS_CODE_ERROR" {
+				err = d.getSharePassToken()
+				if err != nil {
+					return nil, err
+				}
+				return d.getFiles(id)
+			}
+			return nil, errors.New(resp.ShareStatusText)
+		}
+		pageToken = resp.NextPageToken
+		res = append(res, resp.Files...)
+	}
+	return res, nil
+}

drivers/quark/driver.go

@@ -29,16 +29,11 @@ func (d *Quark) Config() driver.Config {
 }
 
 func (d *Quark) GetAddition() driver.Additional {
-	return d.Addition
+	return &d.Addition
 }
 
-func (d *Quark) Init(ctx context.Context, storage model.Storage) error {
+func (d *Quark) Init(ctx context.Context) error {
-	d.Storage = storage
+	_, err := d.request("/config", http.MethodGet, nil, nil)
-	err := utils.Json.UnmarshalFromString(d.Storage.Addition, &d.Addition)
-	if err != nil {
-		return err
-	}
-	_, err = d.request("/config", http.MethodGet, nil, nil)
 	return err
 }
 
@@ -56,11 +51,6 @@ func (d *Quark) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([
 	})
 }
 
-//func (d *Quark) Get(ctx context.Context, path string) (model.Obj, error) {
-//	// TODO this is optional
-//	return nil, errs.NotImplement
-//}
-
 func (d *Quark) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
 	data := base.Json{
 		"fids": []string{file.GetID()},
@@ -185,10 +175,13 @@ func (d *Quark) Put(ctx context.Context, dstDir model.Obj, stream model.FileStre
 	var bytes []byte
 	md5s := make([]string, 0)
 	defaultBytes := make([]byte, partSize)
-	left := stream.GetSize()
+	total := stream.GetSize()
+	left := total
 	partNumber := 1
-	sizeDivide100 := stream.GetSize() / 100
 	for left > 0 {
+		if utils.IsCanceled(ctx) {
+			return ctx.Err()
+		}
 		if left > int64(partSize) {
 			bytes = defaultBytes
 		} else {
@@ -198,9 +191,9 @@ func (d *Quark) Put(ctx context.Context, dstDir model.Obj, stream model.FileStre
 		if err != nil {
 			return err
 		}
-		left -= int64(partSize)
+		left -= int64(len(bytes))
 		log.Debugf("left: %d", left)
-		m, err := d.upPart(pre, stream.GetMimetype(), partNumber, bytes)
+		m, err := d.upPart(ctx, pre, stream.GetMimetype(), partNumber, bytes)
 		//m, err := driver.UpPart(pre, file.GetMIMEType(), partNumber, bytes, account, md5Str, sha1Str)
 		if err != nil {
 			return err
@@ -210,7 +203,7 @@ func (d *Quark) Put(ctx context.Context, dstDir model.Obj, stream model.FileStre
 		}
 		md5s = append(md5s, m)
 		partNumber++
-		up(100 - int(left/sizeDivide100))
+		up(int(100 * (total - left) / total))
 	}
 	err = d.upCommit(pre, md5s)
 	if err != nil {

drivers/quark/meta.go

@@ -18,10 +18,8 @@ var config = driver.Config{
 	DefaultRoot: "0",
 }
 
-func New() driver.Driver {
-	return &Quark{}
-}
-
 func init() {
-	op.RegisterDriver(config, New)
+	op.RegisterDriver(func() driver.Driver {
+		return &Quark{}
+	})
 }

drivers/quark/util.go

@@ -1,6 +1,7 @@
 package quark
 
 import (
+	"context"
 	"crypto/md5"
 	"encoding/base64"
 	"errors"
@@ -118,7 +119,7 @@ func (d *Quark) upHash(md5, sha1, taskId string) (bool, error) {
 	return resp.Data.Finish, err
 }
 
-func (d *Quark) upPart(pre UpPreResp, mineType string, partNumber int, bytes []byte) (string, error) {
+func (d *Quark) upPart(ctx context.Context, pre UpPreResp, mineType string, partNumber int, bytes []byte) (string, error) {
 	//func (driver Quark) UpPart(pre UpPreResp, mineType string, partNumber int, bytes []byte, account *model.Account, md5Str, sha1Str string) (string, error) {
 	timeStr := time.Now().UTC().Format(http.TimeFormat)
 	data := base.Json{
@@ -135,7 +136,7 @@ x-oss-user-agent:aliyun-sdk-js/6.6.1 Chrome 98.0.4758.80 on Windows 10 64-bit
 	}
 	var resp UpAuthResp
 	_, err := d.request("/file/upload/auth", http.MethodPost, func(req *resty.Request) {
-		req.SetBody(data)
+		req.SetBody(data).SetContext(ctx)
 	}, &resp)
 	if err != nil {
 		return "", err
@@ -150,7 +151,7 @@ x-oss-user-agent:aliyun-sdk-js/6.6.1 Chrome 98.0.4758.80 on Windows 10 64-bit
 	//	}
 	//}
 	u := fmt.Sprintf("https://%s.%s/%s", pre.Data.Bucket, pre.Data.UploadUrl[7:], pre.Data.ObjKey)
-	res, err := base.RestyClient.R().
+	res, err := base.RestyClient.R().SetContext(ctx).
 		SetHeaders(map[string]string{
 			"Authorization":    resp.Data.AuthKey,
 			"Content-Type":     mineType,

drivers/s3/driver.go

@@ -11,7 +11,6 @@ import (
 
 	"github.com/alist-org/alist/v3/internal/driver"
 	"github.com/alist-org/alist/v3/internal/model"
-	"github.com/alist-org/alist/v3/pkg/utils"
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/s3"
 	"github.com/aws/aws-sdk-go/service/s3/s3manager"
@@ -31,19 +30,14 @@ func (d *S3) Config() driver.Config {
 }
 
 func (d *S3) GetAddition() driver.Additional {
-	return d.Addition
+	return &d.Addition
 }
 
-func (d *S3) Init(ctx context.Context, storage model.Storage) error {
+func (d *S3) Init(ctx context.Context) error {
-	d.Storage = storage
-	err := utils.Json.UnmarshalFromString(d.Storage.Addition, &d.Addition)
-	if err != nil {
-		return err
-	}
 	if d.Region == "" {
 		d.Region = "alist"
 	}
-	err = d.initSession()
+	err := d.initSession()
 	if err != nil {
 		return err
 	}
@@ -63,11 +57,6 @@ func (d *S3) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([]mo
 	return d.listV1(dir.GetPath())
 }
 
-//func (d *S3) Get(ctx context.Context, path string) (model.Obj, error) {
-//	// this is optional
-//	return nil, errs.NotImplement
-//}
-
 func (d *S3) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
 	path := getKey(file.GetPath(), false)
 	disposition := fmt.Sprintf(`attachment;filename="%s"`, url.QueryEscape(stdpath.Base(path)))
@@ -145,7 +134,7 @@ func (d *S3) Put(ctx context.Context, dstDir model.Obj, stream model.FileStreame
 		Key:    &key,
 		Body:   stream,
 	}
-	_, err := uploader.Upload(input)
+	_, err := uploader.UploadWithContext(ctx, input)
 	return err
 }
 

drivers/s3/meta.go

@@ -21,14 +21,13 @@ type Addition struct {
 
 var config = driver.Config{
 	Name:        "S3",
+	DefaultRoot: "/",
 	LocalSort:   true,
 	CheckStatus: true,
 }
 
-func New() driver.Driver {
-	return &S3{}
-}
-
 func init() {
-	op.RegisterDriver(config, New)
+	op.RegisterDriver(func() driver.Driver {
+		return &S3{}
+	})
 }

drivers/s3/util.go

@@ -9,6 +9,7 @@ import (
 
 	"github.com/alist-org/alist/v3/internal/model"
 	"github.com/alist-org/alist/v3/internal/op"
+	"github.com/alist-org/alist/v3/pkg/utils"
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/credentials"
 	"github.com/aws/aws-sdk-go/aws/request"
@@ -38,7 +39,14 @@ func (d *S3) getClient(link bool) *s3.S3 {
 			if r.HTTPRequest.Method != http.MethodGet {
 				return
 			}
-			r.HTTPRequest.URL.Host = d.CustomHost
+			//判断CustomHost是否以http://或https://开头
+			split := strings.SplitN(d.CustomHost, "://", 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.CustomHost
+			}
 		})
 	}
 	return client
@@ -140,6 +148,9 @@ func (d *S3) listV2(prefix string) ([]model.Obj, error) {
 			files = append(files, &file)
 		}
 		for _, object := range listObjectsResult.Contents {
+			if strings.HasSuffix(*object.Key, "/") {
+				continue
+			}
 			name := path.Base(*object.Key)
 			if name == getPlaceholderName(d.Placeholder) || name == d.Placeholder {
 				continue

drivers/seafile/driver.go

@@ -0,0 +1,160 @@
+package seafile
+
+import (
+	"context"
+	"fmt"
+	"net/http"
+	"path/filepath"
+	"strings"
+	"time"
+
+	"github.com/alist-org/alist/v3/internal/driver"
+	"github.com/alist-org/alist/v3/internal/model"
+	"github.com/alist-org/alist/v3/pkg/utils"
+	"github.com/go-resty/resty/v2"
+)
+
+type Seafile struct {
+	model.Storage
+	Addition
+
+	authorization string
+}
+
+func (d *Seafile) Config() driver.Config {
+	return config
+}
+
+func (d *Seafile) GetAddition() driver.Additional {
+	return &d.Addition
+}
+
+func (d *Seafile) Init(ctx context.Context) error {
+	d.Address = strings.TrimSuffix(d.Address, "/")
+	return d.getToken()
+}
+
+func (d *Seafile) Drop(ctx context.Context) error {
+	return nil
+}
+
+func (d *Seafile) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([]model.Obj, error) {
+	path := dir.GetPath()
+	var resp []RepoDirItemResp
+	_, err := d.request(http.MethodGet, fmt.Sprintf("/api2/repos/%s/dir/", d.Addition.RepoId), func(req *resty.Request) {
+		req.SetResult(&resp).SetQueryParams(map[string]string{
+			"p": path,
+		})
+	})
+	if err != nil {
+		return nil, err
+	}
+	return utils.SliceConvert(resp, func(f RepoDirItemResp) (model.Obj, error) {
+		return &model.ObjThumb{
+			Object: model.Object{
+				Name:     f.Name,
+				Modified: time.Unix(f.Modified, 0),
+				Size:     f.Size,
+				IsFolder: f.Type == "dir",
+			},
+			// Thumbnail: model.Thumbnail{Thumbnail: f.Thumb},
+		}, nil
+	})
+}
+
+func (d *Seafile) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
+	res, err := d.request(http.MethodGet, fmt.Sprintf("/api2/repos/%s/file/", d.Addition.RepoId), func(req *resty.Request) {
+		req.SetQueryParams(map[string]string{
+			"p":     file.GetPath(),
+			"reuse": "1",
+		})
+	})
+	if err != nil {
+		return nil, err
+	}
+	u := string(res)
+	u = u[1 : len(u)-1] // remove quotes
+	return &model.Link{URL: u}, nil
+}
+
+func (d *Seafile) MakeDir(ctx context.Context, parentDir model.Obj, dirName string) error {
+	_, err := d.request(http.MethodPost, fmt.Sprintf("/api2/repos/%s/dir/", d.Addition.RepoId), func(req *resty.Request) {
+		req.SetQueryParams(map[string]string{
+			"p": filepath.Join(parentDir.GetPath(), dirName),
+		}).SetFormData(map[string]string{
+			"operation": "mkdir",
+		})
+	})
+	return err
+}
+
+func (d *Seafile) Move(ctx context.Context, srcObj, dstDir model.Obj) error {
+	_, err := d.request(http.MethodPost, fmt.Sprintf("/api2/repos/%s/file/", d.Addition.RepoId), func(req *resty.Request) {
+		req.SetQueryParams(map[string]string{
+			"p": srcObj.GetPath(),
+		}).SetFormData(map[string]string{
+			"operation": "move",
+			"dst_repo":  d.Addition.RepoId,
+			"dst_dir":   dstDir.GetPath(),
+		})
+	}, true)
+	return err
+}
+
+func (d *Seafile) Rename(ctx context.Context, srcObj model.Obj, newName string) error {
+	_, err := d.request(http.MethodPost, fmt.Sprintf("/api2/repos/%s/file/", d.Addition.RepoId), func(req *resty.Request) {
+		req.SetQueryParams(map[string]string{
+			"p": srcObj.GetPath(),
+		}).SetFormData(map[string]string{
+			"operation": "rename",
+			"newname":   newName,
+		})
+	}, true)
+	return err
+}
+
+func (d *Seafile) Copy(ctx context.Context, srcObj, dstDir model.Obj) error {
+	_, err := d.request(http.MethodPost, fmt.Sprintf("/api2/repos/%s/file/", d.Addition.RepoId), func(req *resty.Request) {
+		req.SetQueryParams(map[string]string{
+			"p": srcObj.GetPath(),
+		}).SetFormData(map[string]string{
+			"operation": "copy",
+			"dst_repo":  d.Addition.RepoId,
+			"dst_dir":   dstDir.GetPath(),
+		})
+	})
+	return err
+}
+
+func (d *Seafile) Remove(ctx context.Context, obj model.Obj) error {
+	_, err := d.request(http.MethodDelete, fmt.Sprintf("/api2/repos/%s/file/", d.Addition.RepoId), func(req *resty.Request) {
+		req.SetQueryParams(map[string]string{
+			"p": obj.GetPath(),
+		})
+	})
+	return err
+}
+
+func (d *Seafile) Put(ctx context.Context, dstDir model.Obj, stream model.FileStreamer, up driver.UpdateProgress) error {
+	res, err := d.request(http.MethodGet, fmt.Sprintf("/api2/repos/%s/upload-link/", d.Addition.RepoId), func(req *resty.Request) {
+		req.SetQueryParams(map[string]string{
+			"p": dstDir.GetPath(),
+		})
+	})
+	if err != nil {
+		return err
+	}
+
+	u := string(res)
+	u = u[1 : len(u)-1] // remove quotes
+	_, err = d.request(http.MethodPost, u, func(req *resty.Request) {
+		req.SetFileReader("file", stream.GetName(), stream).
+			SetFormData(map[string]string{
+				"parent_dir": dstDir.GetPath(),
+				"replace":    "1",
+			})
+	})
+	return err
+}
+
+var _ driver.Driver = (*Seafile)(nil)

drivers/seafile/meta.go

@@ -0,0 +1,26 @@
+package seafile
+
+import (
+	"github.com/alist-org/alist/v3/internal/driver"
+	"github.com/alist-org/alist/v3/internal/op"
+)
+
+type Addition struct {
+	driver.RootPath
+
+	Address  string `json:"address" required:"true"`
+	UserName string `json:"username" required:"true"`
+	Password string `json:"password" required:"true"`
+	RepoId   string `json:"repoId" required:"true"`
+}
+
+var config = driver.Config{
+	Name:        "Seafile",
+	DefaultRoot: "/",
+}
+
+func init() {
+	op.RegisterDriver(func() driver.Driver {
+		return &Seafile{}
+	})
+}

drivers/seafile/types.go

@@ -0,0 +1,14 @@
+package seafile
+
+type AuthTokenResp struct {
+	Token string `json:"token"`
+}
+
+type RepoDirItemResp struct {
+	Id         string `json:"id"`
+	Type       string `json:"type"` // dir, file
+	Name       string `json:"name"`
+	Size       int64  `json:"size"`
+	Modified   int64  `json:"mtime"`
+	Permission string `json:"permission"`
+}

drivers/seafile/util.go

@@ -0,0 +1,59 @@
+package seafile
+
+import (
+	"fmt"
+	"strings"
+
+	"github.com/alist-org/alist/v3/drivers/base"
+	"github.com/go-resty/resty/v2"
+)
+
+func (d *Seafile) getToken() error {
+	var authResp AuthTokenResp
+	res, err := base.RestyClient.R().
+		SetResult(&authResp).
+		SetFormData(map[string]string{
+			"username": d.UserName,
+			"password": d.Password,
+		}).
+		Post(d.Address + "/api2/auth-token/")
+	if err != nil {
+		return err
+	}
+	if res.StatusCode() >= 400 {
+		return fmt.Errorf("get token failed: %s", res.String())
+	}
+	d.authorization = fmt.Sprintf("Token %s", authResp.Token)
+	return nil
+}
+
+func (d *Seafile) request(method string, pathname string, callback base.ReqCallback, noRedirect ...bool) ([]byte, error) {
+	full := pathname
+	if !strings.HasPrefix(pathname, "http") {
+		full = d.Address + pathname
+	}
+	req := base.RestyClient.R()
+	if len(noRedirect) > 0 && noRedirect[0] {
+		req = base.NoRedirectClient.R()
+	}
+	var res resty.Response
+	for i := 0; i < 2; i++ {
+		req.SetHeader("Authorization", d.authorization)
+		callback(req)
+		res, err := req.Execute(method, full)
+		if err != nil {
+			return nil, err
+		}
+		if res.StatusCode() != 401 { // Unauthorized
+			break
+		}
+		err = d.getToken()
+		if err != nil {
+			return nil, err
+		}
+	}
+	if res.StatusCode() >= 400 {
+		return nil, fmt.Errorf("request failed: %s", res.String())
+	}
+	return res.Body(), nil
+}

drivers/sftp/driver.go

@@ -23,15 +23,10 @@ func (d *SFTP) Config() driver.Config {
 }
 
 func (d *SFTP) GetAddition() driver.Additional {
-	return d.Addition
+	return &d.Addition
 }
 
-func (d *SFTP) Init(ctx context.Context, storage model.Storage) error {
+func (d *SFTP) Init(ctx context.Context) error {
-	d.Storage = storage
-	err := utils.Json.UnmarshalFromString(d.Storage.Addition, &d.Addition)
-	if err != nil {
-		return err
-	}
 	return d.initClient()
 }
 
@@ -52,11 +47,6 @@ func (d *SFTP) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([]
 	})
 }
 
-//func (d *SFTP) Get(ctx context.Context, path string) (model.Obj, error) {
-//	// this is optional
-//	return nil, errs.NotImplement
-//}
-
 func (d *SFTP) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
 	remoteFile, err := d.client.Open(file.GetPath())
 	if err != nil {

drivers/sftp/meta.go

@@ -21,10 +21,8 @@ var config = driver.Config{
 	CheckStatus: true,
 }
 
-func New() driver.Driver {
-	return &SFTP{}
-}
-
 func init() {
-	op.RegisterDriver(config, New)
+	op.RegisterDriver(func() driver.Driver {
+		return &SFTP{}
+	})
 }

drivers/smb/driver.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 	"path/filepath"
+	"strings"
 	"time"
 
 	"github.com/alist-org/alist/v3/internal/driver"
@@ -25,14 +26,12 @@ func (d *SMB) Config() driver.Config {
 }
 
 func (d *SMB) GetAddition() driver.Additional {
-	return d.Addition
+	return &d.Addition
 }
 
-func (d *SMB) Init(ctx context.Context, storage model.Storage) error {
+func (d *SMB) Init(ctx context.Context) error {
-	d.Storage = storage
+	if strings.Index(d.Addition.Address, ":") < 0 {
-	err := utils.Json.UnmarshalFromString(d.Storage.Addition, &d.Addition)
+		d.Addition.Address = d.Addition.Address + ":445"
-	if err != nil {
-		return err
 	}
 	return d.initFS()
 }
@@ -48,7 +47,7 @@ func (d *SMB) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([]m
 	if err := d.checkConn(); err != nil {
 		return nil, err
 	}
-	fullPath := d.getSMBPath(dir)
+	fullPath := dir.GetPath()
 	rawFiles, err := d.fs.ReadDir(fullPath)
 	if err != nil {
 		d.cleanLastConnTime()
@@ -70,16 +69,11 @@ func (d *SMB) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([]m
 	return files, nil
 }
 
-//func (d *SMB) Get(ctx context.Context, path string) (model.Obj, error) {
-//	// this is optional
-//	return nil, errs.NotImplement
-//}
-
 func (d *SMB) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
 	if err := d.checkConn(); err != nil {
 		return nil, err
 	}
-	fullPath := d.getSMBPath(file)
+	fullPath := file.GetPath()
 	remoteFile, err := d.fs.Open(fullPath)
 	if err != nil {
 		d.cleanLastConnTime()
@@ -95,7 +89,7 @@ func (d *SMB) MakeDir(ctx context.Context, parentDir model.Obj, dirName string)
 	if err := d.checkConn(); err != nil {
 		return err
 	}
-	fullPath := filepath.Join(d.getSMBPath(parentDir), dirName)
+	fullPath := filepath.Join(parentDir.GetPath(), dirName)
 	err := d.fs.MkdirAll(fullPath, 0700)
 	if err != nil {
 		d.cleanLastConnTime()
@@ -109,8 +103,8 @@ func (d *SMB) Move(ctx context.Context, srcObj, dstDir model.Obj) error {
 	if err := d.checkConn(); err != nil {
 		return err
 	}
-	srcPath := d.getSMBPath(srcObj)
+	srcPath := srcObj.GetPath()
-	dstPath := filepath.Join(d.getSMBPath(dstDir), srcObj.GetName())
+	dstPath := filepath.Join(dstDir.GetPath(), srcObj.GetName())
 	err := d.fs.Rename(srcPath, dstPath)
 	if err != nil {
 		d.cleanLastConnTime()
@@ -124,7 +118,7 @@ func (d *SMB) Rename(ctx context.Context, srcObj model.Obj, newName string) erro
 	if err := d.checkConn(); err != nil {
 		return err
 	}
-	srcPath := d.getSMBPath(srcObj)
+	srcPath := srcObj.GetPath()
 	dstPath := filepath.Join(filepath.Dir(srcPath), newName)
 	err := d.fs.Rename(srcPath, dstPath)
 	if err != nil {
@@ -139,8 +133,8 @@ func (d *SMB) Copy(ctx context.Context, srcObj, dstDir model.Obj) error {
 	if err := d.checkConn(); err != nil {
 		return err
 	}
-	srcPath := d.getSMBPath(srcObj)
+	srcPath := srcObj.GetPath()
-	dstPath := filepath.Join(d.getSMBPath(dstDir), srcObj.GetName())
+	dstPath := filepath.Join(dstDir.GetPath(), srcObj.GetName())
 	var err error
 	if srcObj.IsDir() {
 		err = d.CopyDir(srcPath, dstPath)
@@ -160,7 +154,7 @@ func (d *SMB) Remove(ctx context.Context, obj model.Obj) error {
 		return err
 	}
 	var err error
-	fullPath := d.getSMBPath(obj)
+	fullPath := obj.GetPath()
 	if obj.IsDir() {
 		err = d.fs.RemoveAll(fullPath)
 	} else {
@@ -178,7 +172,7 @@ func (d *SMB) Put(ctx context.Context, dstDir model.Obj, stream model.FileStream
 	if err := d.checkConn(); err != nil {
 		return err
 	}
-	fullPath := filepath.Join(d.getSMBPath(dstDir), stream.GetName())
+	fullPath := filepath.Join(dstDir.GetPath(), stream.GetName())
 	out, err := d.fs.Create(fullPath)
 	if err != nil {
 		d.cleanLastConnTime()

drivers/smb/meta.go

@@ -22,7 +22,7 @@ var config = driver.Config{
 }
 
 func init() {
-	op.RegisterDriver(config, func() driver.Driver {
+	op.RegisterDriver(func() driver.Driver {
 		return &SMB{}
 	})
 }