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

.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

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
@@ -11,7 +11,7 @@ VOLUME /opt/alist/data/
 WORKDIR /opt/alist/
 COPY --from=builder /app/bin/alist ./
 COPY entrypoint.sh /entrypoint.sh
-RUN apk add ca-certificates bash su-exec; \
+RUN apk add --no-cache bash ca-certificates su-exec tzdata; \
     chmod +x /entrypoint.sh
 ENV PUID=0 PGID=0 UMASK=022
 EXPOSE 5244

README.md

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

@@ -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] 画廊模式下的图像预览

docker-compose.yml

@@ -10,5 +10,6 @@ services:
       - PUID=0
       - PGID=0
       - UMASK=022
+      - TZ=UTC
     container_name: alist
     image: 'xhofe/alist:latest'

drivers/139/driver.go

@@ -1,11 +1,9 @@
 package _139
 
 import (
-	"bytes"
 	"context"
 	"fmt"
 	"io"
-	"math"
 	"net/http"
 	"strconv"
 
@@ -229,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(),
@@ -250,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"
 			}},
 		})
@@ -265,51 +263,47 @@ func (d *Yun139) Put(ctx context.Context, dstDir model.Obj, stream model.FileStr
 	if err != nil {
 		return err
 	}
+
+	// Progress
+	p := driver.NewProgress(stream.GetSize(), up)
+
 	var Default int64 = 104857600
-	part := int(math.Ceil(float64(stream.GetSize()) / float64(Default)))
-	var start int64 = 0
-	for i := 0; i < part; i++ {
+	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)
-		if err != nil {
-			return err
-		}
-		req, err := http.NewRequest("POST", resp.Data.UploadResult.RedirectionURL, bytes.NewBuffer(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 = req.WithContext(ctx)
-		headers := map[string]string{
-			"Accept":         "*/*",
-			"Content-Type":   "text/plain;name=" + unicode(stream.GetName()),
-			"contentSize":    strconv.FormatInt(stream.GetSize(), 10),
-			"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)
-		}
+		req.Header.Set("Content-Type", "text/plain;name="+unicode(stream.GetName()))
+		req.Header.Set("contentSize", strconv.FormatInt(stream.GetSize(), 10))
+		req.Header.Set("range", fmt.Sprintf("bytes=%d-%d", start, start+byteSize-1))
+		req.Header.Set("uploadtaskID", resp.Data.UploadResult.UploadTaskID)
+		req.Header.Set("rangeType", "0")
+		req.ContentLength = byteSize
+
 		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/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/alist_v3/driver.go

@@ -108,7 +108,7 @@ func (d *AListV3) Move(ctx context.Context, srcObj, dstDir model.Obj) error {
 		SetResult(&resp).
 		SetHeader("Authorization", d.AccessToken).
 		SetBody(MoveCopyReq{
-			SrcDir: srcObj.GetPath(),
+			SrcDir: path.Dir(srcObj.GetPath()),
 			DstDir: dstDir.GetPath(),
 			Names:  []string{srcObj.GetName()},
 		}).Post(url)
@@ -135,7 +135,7 @@ func (d *AListV3) Copy(ctx context.Context, srcObj, dstDir model.Obj) error {
 		SetResult(&resp).
 		SetHeader("Authorization", d.AccessToken).
 		SetBody(MoveCopyReq{
-			SrcDir: srcObj.GetPath(),
+			SrcDir: path.Dir(srcObj.GetPath()),
 			DstDir: dstDir.GetPath(),
 			Names:  []string{srcObj.GetName()},
 		}).Post(url)
@@ -149,7 +149,7 @@ func (d *AListV3) Remove(ctx context.Context, obj model.Obj) error {
 		SetResult(&resp).
 		SetHeader("Authorization", d.AccessToken).
 		SetBody(RemoveReq{
-			Dir:   obj.GetPath(),
+			Dir:   path.Dir(obj.GetPath()),
 			Names: []string{obj.GetName()},
 		}).Post(url)
 	return checkResp(resp, err)

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

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"
@@ -24,6 +25,7 @@ import (
 	_ "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"

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 {
@@ -33,146 +37,178 @@ func (d *BaiduPhoto) GetAddition() driver.Additional {
 }
 
 func (d *BaiduPhoto) Init(ctx context.Context) error {
-	return d.refreshToken()
+	if err := d.refreshToken(); err != nil {
+		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
+	}
+	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
-		if d.ShowType != "root_only_album" {
-			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) {
+	/* album */
+	if album, ok := dir.(*Album); ok {
 		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++ {
-			objs = append(objs, &files[i])
+
+		return utils.MustSliceConvert(files, func(file AlbumFile) model.Obj {
+			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) {
-		return d.linkAlbum(ctx, file, args)
-	} else if IsFile(file) {
+	switch file := file.(type) {
+	case *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 {
-	if IsRoot(parentDir) {
-		code := regexp.MustCompile(`(?i)join:([\S]*)`).FindStringSubmatch(dirName)
+var joinReg = regexp.MustCompile(`(?i)join:([\S]*)`)
+
+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 {
-	if IsFile(srcObj) {
-		if IsAlbum(dstDir) {
+func (d *BaiduPhoto) Copy(ctx context.Context, srcObj, dstDir model.Obj) (model.Obj, error) {
+	switch file := srcObj.(type) {
+	case *File:
+		if album, ok := dstDir.(*Album); ok {
 			//rootfile ->  album
-			e := splitID(dstDir.GetID())
-			return d.AddAlbumFile(ctx, e[0], e[1], srcObj.GetID())
+			return d.AddAlbumFile(ctx, album, file)
 		}
-	} else if IsAlbumFile(srcObj) {
-		if IsRoot(dstDir) {
+	case *AlbumFile:
+		switch album := dstDir.(type) {
+		case *Root:
 			//albumfile -> root
-			e := splitID(srcObj.GetID())
-			_, err := d.CopyAlbumFile(ctx, e[1], e[2], e[3], srcObj.GetID())
-			return err
-		} else if IsAlbum(dstDir) {
+			return d.CopyAlbumFile(ctx, file)
+		case *Album:
 			// albumfile -> root -> album
-			e := splitID(srcObj.GetID())
-			file, err := d.CopyAlbumFile(ctx, e[1], e[2], e[3], srcObj.GetID())
+			rootfile, err := d.CopyAlbumFile(ctx, file)
 			if err != nil {
-				return err
+				return nil, err
 			}
-			e = splitID(dstDir.GetID())
-			return d.AddAlbumFile(ctx, e[0], e[1], fmt.Sprint(file.Fsid))
+			return d.AddAlbumFile(ctx, album, rootfile)
 		}
 	}
-	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) {
-		err := d.Copy(ctx, srcObj, dstDir)
-		if err != nil {
-			return err
+	if file, ok := srcObj.(*AlbumFile); ok {
+		if _, ok := dstDir.(*Album); ok {
+			newObj, err := d.Copy(ctx, srcObj, dstDir)
+			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) {
-		e := splitID(srcObj.GetID())
-		return d.SetAlbumName(ctx, e[0], e[1], newName)
+	if album, ok := srcObj.(*Album); ok {
+		return d.SetAlbumName(ctx, album, newName)
 	}
-	return errs.NotSupport
+	return nil, errs.NotSupport
 }
 
 func (d *BaiduPhoto) Remove(ctx context.Context, obj model.Obj) error {
-	e := splitID(obj.GetID())
-	if IsFile(obj) {
-		return d.DeleteFile(ctx, e[0])
-	} else if IsAlbum(obj) {
-		return d.DeleteAlbum(ctx, e[0], e[1])
-	} else if IsAlbumFile(obj) {
-		return d.DeleteAlbumFile(ctx, e[1], e[2], obj.GetID())
+	switch obj := obj.(type) {
+	case *File:
+		return d.DeleteFile(ctx, obj)
+	case *AlbumFile:
+		return d.DeleteAlbumFile(ctx, obj)
+	case *Album:
+		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()
@@ -190,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 {
-		case <-ctx.Done():
-			return ctx.Err()
-		default:
+		if utils.IsCanceled(ctx) {
+			return nil, ctx.Err()
 		}
+
 		_, 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))
@@ -228,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 {
@@ -241,7 +276,7 @@ func (d *BaiduPhoto) Put(ctx context.Context, dstDir model.Obj, stream model.Fil
 
 		for i := 0; i < count; i++ {
 			if utils.IsCanceled(ctx) {
-				return ctx.Err()
+				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) {
@@ -250,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)
 		}
@@ -262,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) {
-			e := splitID(dstDir.GetID())
-			err = d.AddAlbumFile(ctx, e[0], e[1], fmt.Sprint(precreateResp.Data.FsID))
-			if err != nil {
-				return err
-			}
+		rootfile := precreateResp.Data.toFile()
+		if album, ok := dstDir.(*Album); ok {
+			return d.AddAlbumFile(ctx, album, rootfile)
 		}
+		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 {
-	var buf []string
-	for _, id := range ids {
-		e := splitID(id)
-		buf = append(buf, fmt.Sprintf(`{"fsid":%s,"uk":%s}`, e[0], e[3]))
-	}
+func fsidsFormatNotUk(ids ...int64) string {
+	buf := utils.MustSliceConvert(ids, func(id int64) string {
+		return fmt.Sprintf(`{"fsid":%d}`, id)
+	})
 	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,10 +14,6 @@ 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,

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) GetPath() string { return "file" }
+func (c *File) GetID() string   { return "" }
+func (c *File) GetPath() string { return "" }
 func (c *File) Thumb() string {
 	if len(c.Thumburl) > 0 {
 		return c.Thumburl[0]
@@ -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) GetPath() string { return "album" }
-
-func (af *AlbumFile) GetID() string  { return joinID(af.Fsid, af.AlbumID, af.Tid, af.Uk) }
-func (c *AlbumFile) GetPath() string { return "albumfile" }
+func (a *Album) GetID() string   { return "" }
+func (a *Album) GetPath() string { return "" }
 
 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"`
-		Mtime          int    `json:"mtime"`
+		Ctime          int64  `json:"ctime"`
+		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,
-		"client_id":     p.ClientID,
-		"client_secret": p.ClientSecret,
+		"refresh_token": d.RefreshToken,
+		"client_id":     d.ClientID,
+		"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
-	op.MustSaveDriverStorage(p)
+	d.AccessToken, d.RefreshToken = resp.AccessToken, resp.RefreshToken
+	op.MustSaveDriverStorage(d)
 	return nil
 }
 
-func (p *BaiduPhoto) Get(furl string, callback base.ReqCallback, resp interface{}) ([]byte, error) {
-	return p.Request(furl, http.MethodGet, callback, resp)
+func (d *BaiduPhoto) Get(furl string, callback base.ReqCallback, resp interface{}) ([]byte, error) {
+	return d.Request(furl, http.MethodGet, callback, resp)
 }
 
-func (p *BaiduPhoto) Post(furl string, callback base.ReqCallback, resp interface{}) ([]byte, error) {
-	return p.Request(furl, http.MethodPost, callback, resp)
+func (d *BaiduPhoto) Post(furl string, callback base.ReqCallback, resp interface{}) ([]byte, error) {
+	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 {
-	_, err := p.Get(FILE_API_URL_V1+"/delete", func(req *resty.Request) {
+func (d *BaiduPhoto) DeleteFile(ctx context.Context, file *File) error {
+	_, 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) {
-		r.SetContext(ctx)
+	var resp JoinOrCreateAlbumResp
+	_, 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,
-			"tid":      tID,
+			"album_id": album.AlbumID,
+			"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 {
-	_, err := p.Post(ALBUM_API_URL+"/delete", func(r *resty.Request) {
+func (d *BaiduPhoto) DeleteAlbum(ctx context.Context, album *Album) error {
+	_, err := d.Post(ALBUM_API_URL+"/delete", func(r *resty.Request) {
 		r.SetContext(ctx)
 		r.SetFormData(map[string]string{
-			"album_id":            albumID,
-			"tid":                 tID,
+			"album_id":            album.AlbumID,
+			"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 {
-	_, err := p.Post(ALBUM_API_URL+"/delfile", func(r *resty.Request) {
+func (d *BaiduPhoto) DeleteAlbumFile(ctx context.Context, file *AlbumFile) error {
+	_, err := d.Post(ALBUM_API_URL+"/delfile", func(r *resty.Request) {
 		r.SetContext(ctx)
 		r.SetFormData(map[string]string{
-			"album_id":   albumID,
-			"tid":        tID,
-			"list":       fsidsFormat(fileIDs...),
+			"album_id":   fmt.Sprint(file.AlbumID),
+			"tid":        fmt.Sprint(file.Tid),
+			"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 {
-	_, err := p.Get(ALBUM_API_URL+"/addfile", func(r *resty.Request) {
+func (d *BaiduPhoto) AddAlbumFile(ctx context.Context, album *Album, file *File) (*AlbumFile, error) {
+	_, err := d.Get(ALBUM_API_URL+"/addfile", func(r *resty.Request) {
 		r.SetContext(ctx)
 		r.SetQueryParams(map[string]string{
-			"album_id": albumID,
-			"tid":      tID,
-			"list":     fsidsFormatNotUk(fileIDs...),
+			"album_id": fmt.Sprint(album.AlbumID),
+			"tid":      fmt.Sprint(album.Tid),
+			"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,
-			"tid":      tID,
-			"uk":       uk,
-			"list":     fsidsFormatNotUk(fileID...),
+			"album_id": file.AlbumID,
+			"tid":      fmt.Sprint(file.Tid),
+			"uk":       fmt.Sprint(file.Uk),
+			"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)
-	return err
+	}, &resp2)
+	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],
-			"album_id":     e[1],
-			"tid":          e[2],
-			"uk":           e[3],
+			"fsid":         fmt.Sprint(file.Fsid),
+			"album_id":     file.AlbumID,
+			"tid":          fmt.Sprint(file.Tid),
+			"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/lanzou/driver.go

@@ -2,13 +2,16 @@ package lanzou
 
 import (
 	"context"
+	"fmt"
 	"net/http"
+	"regexp"
 	"time"
 
 	"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/go-resty/resty/v2"
 )
 
@@ -17,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 {
@@ -32,50 +36,92 @@ func (d *LanZou) Init(ctx context.Context) error {
 		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()
-	pwd := d.SharePassword
-	if d.IsCookie() {
-		share, err := d.getFileShareUrlByID(ctx, file.GetID())
+	var (
+		err   error
+		dfile *FileOrFolderByShareUrl
+	)
+	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)
-	if err != nil {
-		return nil, err
-	}
-
+	exp := GetExpirationTime(dfile.Url)
 	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",
@@ -84,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",
@@ -100,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",
@@ -118,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
-}
-
-func (d *LanZou) Copy(ctx context.Context, srcObj, dstDir model.Obj) error {
-	return errs.NotImplement
+	return nil, 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{
@@ -149,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).SetContext(ctx)
-		}, nil, true)
-		return err
+		}, &resp, true)
+		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 {
-	return regexp.MustCompile(`<!--.*?-->|//.*|/\*.*?\*/`).ReplaceAll(html, []byte{})
+func RemoveNotes(html string) string {
+	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"`
-	BaseUrl       string `json:"baseUrl" required:"true" default:"https://pc.woozooo.com"`
-	ShareUrl      string `json:"shareUrl" required:"true" default:"https://pan.lanzouo.com"`
+	SharePassword  string `json:"share_password"`
+	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" 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 {

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 {
-	Text []FileOrFolder `json:"text"`
+var ErrFileShareCancel = errors.New("file sharing cancellation")
+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 {
-	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)
+func (f *FileOrFolder) GetID() string {
+	if f.IsDir() {
+		return f.FolID
 	}
-	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 {
-	Info FileShare `json:"info"`
+func (f *FileOrFolder) SetShareInfo(fs *FileShare) {
+	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 {
-	return &model.Object{
-		ID:       f.ID,
-		Name:     f.NameAll,
-		Size:     SizeStrToInt64(f.Size),
-		Modified: MustParseTime(f.Time),
-		IsFolder: f.IsFloder,
+func (f *FileOrFolderByShareUrl) GetID() string   { return f.ID }
+func (f *FileOrFolderByShareUrl) GetName() string { return f.NameAll }
+func (f *FileOrFolderByShareUrl) GetPath() string { return "" }
+func (f *FileOrFolderByShareUrl) GetSize() int64 {
+	if f.size == nil {
+		size := SizeStrToInt64(f.Size)
+		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) {
-	folders, err := d.getFolders(ctx, folderID)
+func (d *LanZou) GetAllFiles(folderID string) ([]model.Obj, error) {
+	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))
-	for _, folder := range folders {
-		objs = append(objs, folder.ToObj())
-	}
-
-	for _, file := range files {
-		objs = append(objs, file.ToObj())
-	}
-	return objs, nil
+	return append(
+		utils.MustSliceConvert(folders, func(folder FileOrFolder) model.Obj {
+			return &folder
+		}), utils.MustSliceConvert(files, func(file FileOrFolder) model.Obj {
+			return &file
+		})...,
+	), nil
 }
 
 // 通过ID获取文件夹
-func (d *LanZou) getFolders(ctx context.Context, folderID string) ([]FileOrFolder, error) {
-	var resp FilesOrFoldersResp
-	_, err := d.post(d.BaseUrl+"/doupload.php", func(req *resty.Request) {
-		req.SetContext(ctx)
+func (d *LanZou) GetFolders(folderID string) ([]FileOrFolder, error) {
+	var resp RespText[[]FileOrFolder]
+	_, err := d.doupload(func(req *resty.Request) {
 		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
-		_, err := d.post(d.BaseUrl+"/doupload.php", func(req *resty.Request) {
-			req.SetContext(ctx)
+		var resp RespText[[]FileOrFolder]
+		_, err := d.doupload(func(req *resty.Request) {
 			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) {
-	var resp FileShareResp
-	_, err = d.post(d.BaseUrl+"/doupload.php", func(req *resty.Request) {
-		req.SetContext(ctx)
+func (d *LanZou) getFolderShareUrlByID(fileID string) (*FileShare, error) {
+	var resp RespInfo[FileShare]
+	_, err := d.doupload(func(req *resty.Request) {
 		req.SetFormData(map[string]string{
 			"task":    "18",
 			"file_id": fileID,
 		})
 	}, &resp)
 	if err != nil {
-		return
+		return nil, err
 	}
-	share = resp.Info
-	return
+	return &resp.Info, nil
 }
 
 // 通过ID获取文件分享地址
-func (d *LanZou) getFileShareUrlByID(ctx context.Context, fileID string) (share FileShare, err error) {
-	var resp FileShareResp
-	_, err = d.post(d.BaseUrl+"/doupload.php", func(req *resty.Request) {
-		req.SetContext(ctx)
+func (d *LanZou) getFileShareUrlByID(fileID string) (*FileShare, error) {
+	var resp RespInfo[FileShare]
+	_, err := d.doupload(func(req *resty.Request) {
 		req.SetFormData(map[string]string{
 			"task":    "22",
 			"file_id": fileID,
 		})
 	}, &resp)
 	if err != nil {
-		return
+		return nil, err
 	}
-	share = resp.Info
-	return
+	return &resp.Info, nil
 }
 
 /*
@@ -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) {
-	pageData, err := d.get(fmt.Sprint(d.ShareUrl, "/", downID), func(req *resty.Request) { req.SetContext(ctx) }, nil)
+// 获取分享链接主界面
+func (d *LanZou) getShareUrlHtml(shareID string) (string, error) {
+	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.Match(pageData) {
-		files, err := d.getFolderByShareUrl(ctx, downID, pwd, pageData)
+	if !isFileReg.MatchString(pageData) {
+		files, err := d.getFolderByShareUrl(pwd, pageData)
 		if err != nil {
 			return nil, err
 		}
-		objs = make([]model.Obj, 0, len(files))
-		for _, file := range files {
-			objs = append(objs, file.ToObj())
-		}
+		return utils.MustSliceConvert(files, func(file FileOrFolderByShareUrl) model.Obj {
+			return &file
+		}), 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) {
-	if firstPageData == nil {
-		firstPageData, err = d.get(fmt.Sprint(d.ShareUrl, "/", downID), func(req *resty.Request) { req.SetContext(ctx) }, nil)
-		if err != nil {
-			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)
+func (d *LanZou) GetFilesByShareUrl(shareID, pwd string) (file *FileOrFolderByShareUrl, err error) {
+	pageData, err := d.getShareUrlHtml(shareID)
+	if err != nil {
+		return nil, err
 	}
+	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") {
-		param, err = htmlFormToMap(firstPageDataStr)
+	if strings.Contains(sharePageData, "pwdload") || strings.Contains(sharePageData, "passwddiv") {
+		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")
-			return
+			log.Errorf("lanzou: err => not find file page param ,data => %s\n", sharePageData)
+			return nil, fmt.Errorf("not find file page param")
 		}
-		var nextPageData []byte
-		nextPageData, err = d.get(fmt.Sprint(d.ShareUrl, urlpaths[1]), func(req *resty.Request) { req.SetContext(ctx) }, nil)
+		data, err := d.get(fmt.Sprint(d.ShareUrl, urlpaths[1]), nil, nil)
 		if err != nil {
-			return
+			return nil, err
 		}
-		nextPageData = RemoveNotes(nextPageData)
-		nextPageDataStr := string(nextPageData)
+		nextPageData := RemoveNotes(string(data))
 
-		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.Time = timeFindReg.FindString(firstPageDataStr)
+	file.ID = shareID
+	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()
-	if res.StatusCode() != 302 && strings.Contains(rPageDataStr, "网络异常") {
-		param, err = htmlJsonToMap(rPageDataStr)
+	rPageData := res.String()
+	if res.StatusCode() != 302 {
+		param, err = htmlJsonToMap(rPageData)
 		if err != nil {
-			return
+			return nil, err
 		}
 		param["el"] = "2"
 		time.Sleep(time.Second * 2)
 
 		// 通过验证获取直连
-		var rUrl struct {
-			Url string `json:"url"`
-		}
-		_, err = d.post(fmt.Sprint(baseUrl, "/ajax.php"), func(req *resty.Request) { req.SetContext(ctx).SetFormData(param) }, &rUrl)
+		data, err := d.post(fmt.Sprint(baseUrl, "/ajax.php"), func(req *resty.Request) { req.SetFormData(param) }, nil)
 		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) {
-	if firstPageData == nil {
-		var err error
-		firstPageData, err = d.get(fmt.Sprint(d.ShareUrl, "/", downID), func(req *resty.Request) { req.SetContext(ctx) }, nil)
-		if err != nil {
-			return nil, err
-		}
-		firstPageData = RemoveNotes(firstPageData)
-	}
-	firstPageDataStr := string(firstPageData)
-
-	//
-	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)
+func (d *LanZou) GetFolderByShareUrl(shareID, pwd string) ([]FileOrFolderByShareUrl, error) {
+	pageData, err := d.getShareUrlHtml(shareID)
+	if err != nil {
+		return nil, err
+	}
+	return d.getFolderByShareUrl(pwd, pageData)
+}
+
+func (d *LanZou) getFolderByShareUrl(pwd string, sharePageData string) ([]FileOrFolderByShareUrl, error) {
+	from, err := htmlJsonToMap(sharePageData)
 	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],
-				NameAll:  floder[4],
+				// Pwd: pwd, // 子文件夹不加密
+				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

@@ -16,6 +16,7 @@ import (
 
 	"github.com/alist-org/alist/v3/internal/conf"
 	"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"
@@ -94,6 +95,30 @@ func (d *Local) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([
 	return files, nil
 }
 
+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") {
+			return nil, errs.ObjectNotFound
+		}
+		return nil, err
+	}
+	isFolder := f.IsDir() || isSymlinkDir(f, path)
+	size := f.Size()
+	if isFolder {
+		size = 0
+	}
+	file := model.Object{
+		Path:     path,
+		Name:     f.Name(),
+		Modified: f.ModTime(),
+		Size:     size,
+		IsFolder: isFolder,
+	}
+	return &file, nil
+}
+
 func (d *Local) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
 	fullPath := file.GetPath()
 	var link model.Link

drivers/quark/driver.go

@@ -175,9 +175,9 @@ 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()
@@ -191,7 +191,7 @@ 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(ctx, pre, stream.GetMimetype(), partNumber, bytes)
 		//m, err := driver.UpPart(pre, file.GetMIMEType(), partNumber, bytes, account, md5Str, sha1Str)
@@ -203,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/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/smb/driver.go

@@ -47,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()
@@ -73,7 +73,7 @@ func (d *SMB) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*m
 	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()
@@ -89,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()
@@ -103,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)
-	dstPath := filepath.Join(d.getSMBPath(dstDir), srcObj.GetName())
+	srcPath := srcObj.GetPath()
+	dstPath := filepath.Join(dstDir.GetPath(), srcObj.GetName())
 	err := d.fs.Rename(srcPath, dstPath)
 	if err != nil {
 		d.cleanLastConnTime()
@@ -118,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 {
@@ -133,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)
-	dstPath := filepath.Join(d.getSMBPath(dstDir), srcObj.GetName())
+	srcPath := srcObj.GetPath()
+	dstPath := filepath.Join(dstDir.GetPath(), srcObj.GetName())
 	var err error
 	if srcObj.IsDir() {
 		err = d.CopyDir(srcPath, dstPath)
@@ -154,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 {
@@ -172,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/util.go

@@ -8,7 +8,6 @@ import (
 	"path/filepath"
 	"time"
 
-	"github.com/alist-org/alist/v3/internal/model"
 	"github.com/hirochachacha/go-smb2"
 )
 
@@ -53,14 +52,6 @@ func (d *SMB) checkConn() error {
 	return d.initFS()
 }
 
-func (d *SMB) getSMBPath(dir model.Obj) string {
-	fullPath := dir.GetPath()
-	if fullPath[0:1] != "." {
-		fullPath = "." + fullPath
-	}
-	return fullPath
-}
-
 // CopyFile File copies a single file from src to dst
 func (d *SMB) CopyFile(src, dst string) error {
 	var err error

drivers/terabox/driver.go

@@ -11,7 +11,6 @@ import (
 	log "github.com/sirupsen/logrus"
 	"io"
 	"math"
-	"net/http"
 	"os"
 	stdpath "path"
 	"strconv"
@@ -35,7 +34,17 @@ func (d *Terabox) GetAddition() driver.Additional {
 }
 
 func (d *Terabox) Init(ctx context.Context) error {
-	_, err := d.request("https://www.terabox.com/api/check/login", http.MethodGet, nil, nil)
+	var resp CheckLoginResp
+	_, err := d.get("/api/check/login", nil, &resp)
+	if err != nil {
+		return err
+	}
+	if resp.Errno != 0 {
+		if resp.Errno == 9000 {
+			return fmt.Errorf("terabox is not yet available in this area")
+		}
+		return fmt.Errorf("failed to check login status according to cookie")
+	}
 	return err
 }
 

drivers/terabox/types.go

@@ -38,11 +38,11 @@ type File struct {
 }
 
 type ListResp struct {
-	Errno     int    `json:"errno"`
-	GuidInfo  string `json:"guid_info"`
-	List      []File `json:"list"`
-	RequestId int64  `json:"request_id"`
-	Guid      int    `json:"guid"`
+	Errno    int    `json:"errno"`
+	GuidInfo string `json:"guid_info"`
+	List     []File `json:"list"`
+	//RequestId int64  `json:"request_id"` 接口返回有时是int有时是string
+	Guid int `json:"guid"`
 }
 
 func fileToObj(f File) *model.ObjThumb {
@@ -70,7 +70,7 @@ type DownloadResp2 struct {
 	Info  []struct {
 		Dlink string `json:"dlink"`
 	} `json:"info"`
-	RequestID int64 `json:"request_id"`
+	//RequestID int64 `json:"request_id"`
 }
 
 type HomeInfoResp struct {
@@ -88,5 +88,9 @@ type PrecreateResp struct {
 	ReturnType int    `json:"return_type"`
 	BlockList  []int  `json:"block_list"`
 	Errno      int    `json:"errno"`
-	RequestId  int64  `json:"request_id"`
+	//RequestId  int64  `json:"request_id"`
+}
+
+type CheckLoginResp struct {
+	Errno int `json:"errno"`
 }

drivers/terabox/util.go

@@ -17,10 +17,11 @@ import (
 func (d *Terabox) request(furl string, method string, callback base.ReqCallback, resp interface{}) ([]byte, error) {
 	req := base.RestyClient.R()
 	req.SetHeaders(map[string]string{
-		"Cookie":     d.Cookie,
-		"Accept":     "application/json, text/plain, */*",
-		"Referer":    "https://www.terabox.com/",
-		"User-Agent": base.UserAgent,
+		"Cookie":           d.Cookie,
+		"Accept":           "application/json, text/plain, */*",
+		"Referer":          "https://www.terabox.com/",
+		"User-Agent":       base.UserAgent,
+		"X-Requested-With": "XMLHttpRequest",
 	})
 	req.SetQueryParam("app_id", "250528")
 	req.SetQueryParam("web", "1")
@@ -41,13 +42,17 @@ func (d *Terabox) request(furl string, method string, callback base.ReqCallback,
 
 func (d *Terabox) get(pathname string, params map[string]string, resp interface{}) ([]byte, error) {
 	return d.request("https://www.terabox.com"+pathname, http.MethodGet, func(req *resty.Request) {
-		req.SetQueryParams(params)
+		if params != nil {
+			req.SetQueryParams(params)
+		}
 	}, resp)
 }
 
 func (d *Terabox) post(pathname string, params map[string]string, data interface{}, resp interface{}) ([]byte, error) {
 	return d.request("https://www.terabox.com"+pathname, http.MethodPost, func(req *resty.Request) {
-		req.SetQueryParams(params)
+		if params != nil {
+			req.SetQueryParams(params)
+		}
 		req.SetBody(data)
 	}, resp)
 }
@@ -73,6 +78,9 @@ func (d *Terabox) getFiles(dir string) ([]File, error) {
 		if err != nil {
 			return nil, err
 		}
+		if resp.Errno == 9000 {
+			return nil, fmt.Errorf("terabox is not yet available in this area")
+		}
 		if len(resp.List) == 0 {
 			break
 		}

drivers/uss/driver.go

@@ -44,17 +44,18 @@ func (d *USS) Drop(ctx context.Context) error {
 func (d *USS) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([]model.Obj, error) {
 	prefix := getKey(dir.GetPath(), true)
 	objsChan := make(chan *upyun.FileInfo, 10)
-
-	cfg := &upyun.GetObjectsConfig{
-		Path:           prefix,
-		ObjectsChan:    objsChan,
-		MaxListObjects: 0,
-		MaxListLevel:   1,
-	}
-	if err := d.client.List(cfg); err != nil {
+	var err error
+	go func() {
+		err = d.client.List(&upyun.GetObjectsConfig{
+			Path:           prefix,
+			ObjectsChan:    objsChan,
+			MaxListObjects: 0,
+			MaxListLevel:   1,
+		})
+	}()
+	if err != nil {
 		return nil, err
 	}
-
 	res := make([]model.Obj, 0)
 	for obj := range objsChan {
 		t := obj.Time
@@ -66,16 +67,13 @@ func (d *USS) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([]m
 		}
 		res = append(res, &f)
 	}
-	return res, nil
+	return res, err
 }
 
 func (d *USS) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
 	key := getKey(file.GetPath(), false)
-	host := d.CustomHost
-	if host == "" {
-		host = d.Endpoint
-	}
-	if strings.Contains(host, "://") {
+	host := d.Endpoint
+	if !strings.Contains(host, "://") { //判断是否包含协议头，否则https
 		host = "https://" + host
 	}
 	u := fmt.Sprintf("%s/%s", host, key)

drivers/uss/meta.go

@@ -11,8 +11,8 @@ type Addition struct {
 	Endpoint         string `json:"endpoint" required:"true"`
 	OperatorName     string `json:"operator_name" required:"true"`
 	OperatorPassword string `json:"operator_password" required:"true"`
-	CustomHost       string `json:"custom_host"`
-	SignURLExpire    int    `json:"sign_url_expire" type:"number" default:"4"`
+	//CustomHost       string `json:"custom_host"`	//Endpoint与CustomHost作用相同，去除
+	SignURLExpire int `json:"sign_url_expire" type:"number" default:"4"`
 }
 
 var config = driver.Config{

go.mod

@@ -5,9 +5,10 @@ go 1.19
 require (
 	github.com/SheltonZhu/115driver v1.0.13
 	github.com/Xhofe/go-cache v0.0.0-20220723083548-714439c8af9a
-	github.com/aws/aws-sdk-go v1.44.173
+	github.com/aws/aws-sdk-go v1.44.174
 	github.com/blevesearch/bleve/v2 v2.3.6
 	github.com/caarlos0/env/v6 v6.10.1
+	github.com/caarlos0/env/v7 v7.0.0
 	github.com/deckarep/golang-set/v2 v2.1.0
 	github.com/disintegration/imaging v1.6.2
 	github.com/gin-contrib/cors v1.4.0

go.sum

@@ -14,6 +14,8 @@ github.com/andreburgaud/crypt2go v1.1.0 h1:eitZxTPY1krUsxinsng3Qvt/Ud7q/aQmmYRh8
 github.com/andreburgaud/crypt2go v1.1.0/go.mod h1:4qhZPzarj1dCIRmCkpdgCklwp+hBq9yEt0zPe9Ayuhc=
 github.com/aws/aws-sdk-go v1.44.173 h1:8kXIxvQnBpGhmR3Eof6SnCKgR0q5/L/3Qbv9vAC5wic=
 github.com/aws/aws-sdk-go v1.44.173/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
+github.com/aws/aws-sdk-go v1.44.174 h1:9lR4a6MKQW/t6YCG0ZKAt1GAkjdEPP8sWch/pfcuR0c=
+github.com/aws/aws-sdk-go v1.44.174/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
 github.com/bits-and-blooms/bitset v1.2.0 h1:Kn4yilvwNtMACtf1eYDlG8H77R07mZSPbMjLyS07ChA=
 github.com/bits-and-blooms/bitset v1.2.0/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA=
 github.com/blevesearch/bleve/v2 v2.3.6 h1:NlntUHcV5CSWIhpugx4d/BRMGCiaoI8ZZXrXlahzNq4=
@@ -54,6 +56,7 @@ github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc h1:biVzkmvwrH8
 github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8=
 github.com/caarlos0/env/v6 v6.10.1 h1:t1mPSxNpei6M5yAeu1qtRdPAK29Nbcf/n3G7x+b3/II=
 github.com/caarlos0/env/v6 v6.10.1/go.mod h1:hvp/ryKXKipEkcuYjs9mI4bBCg+UI0Yhgm5Zu0ddvwc=
+github.com/caarlos0/env/v7 v7.0.0/go.mod h1:LPPWniDUq4JaO6Q41vtlyikhMknqymCLBw0eX4dcH1E=
 github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

internal/bootstrap/data/setting.go

@@ -94,7 +94,7 @@ func InitialSettings() []model.SettingItem {
 		{Key: "settings_layout", Value: "list", Type: conf.TypeSelect, Options: "list,responsive", Group: model.STYLE},
 		// preview settings
 		{Key: conf.TextTypes, Value: "txt,htm,html,xml,java,properties,sql,js,md,json,conf,ini,vue,php,py,bat,gitignore,yml,go,sh,c,cpp,h,hpp,tsx,vtt,srt,ass,rs,lrc", Type: conf.TypeText, Group: model.PREVIEW, Flag: model.PRIVATE},
-		{Key: conf.AudioTypes, Value: "mp3,flac,ogg,m4a,wav,opus", Type: conf.TypeText, Group: model.PREVIEW, Flag: model.PRIVATE},
+		{Key: conf.AudioTypes, Value: "mp3,flac,ogg,m4a,wav,opus,wma", Type: conf.TypeText, Group: model.PREVIEW, Flag: model.PRIVATE},
 		{Key: conf.VideoTypes, Value: "mp4,mkv,avi,mov,rmvb,webm,flv", Type: conf.TypeText, Group: model.PREVIEW, Flag: model.PRIVATE},
 		{Key: conf.ImageTypes, Value: "jpg,tiff,jpeg,png,gif,bmp,svg,ico,swf,webp", Type: conf.TypeText, Group: model.PREVIEW, Flag: model.PRIVATE},
 		//{Key: conf.OfficeTypes, Value: "doc,docx,xls,xlsx,ppt,pptx", Type: conf.TypeText, Group: model.PREVIEW, Flag: model.PRIVATE},
@@ -143,8 +143,10 @@ func InitialSettings() []model.SettingItem {
 
 		// single settings
 		{Key: conf.Token, Value: token, Type: conf.TypeString, Group: model.SINGLE, Flag: model.PRIVATE},
-		{Key: conf.SearchIndex, Value: "none", Type: conf.TypeSelect, Options: "database,bleve,none", Group: model.INDEX},
+		{Key: conf.SearchIndex, Value: "none", Type: conf.TypeSelect, Options: "database,database_non_full_text,bleve,none", Group: model.INDEX},
+		{Key: conf.AutoUpdateIndex, Value: "false", Type: conf.TypeBool, Group: model.INDEX},
 		{Key: conf.IgnorePaths, Value: "", Type: conf.TypeText, Group: model.INDEX, Flag: model.PRIVATE, Help: `one path per line`},
+		{Key: conf.MaxIndexDepth, Value: "20", Type: conf.TypeNumber, Group: model.INDEX, Flag: model.PRIVATE, Help: `max depth of index`},
 		{Key: conf.IndexProgress, Value: "{}", Type: conf.TypeText, Group: model.SINGLE, Flag: model.PRIVATE},
 
 		// GitHub settings

internal/bootstrap/db.go

@@ -51,7 +51,8 @@ func InitDB() {
 				if !(strings.HasSuffix(database.DBFile, ".db") && len(database.DBFile) > 3) {
 					log.Fatalf("db name error.")
 				}
-				dB, err = gorm.Open(sqlite.Open(database.DBFile), gormConfig)
+				dB, err = gorm.Open(sqlite.Open(fmt.Sprintf("%s?_journal=WAL&_vacuum=incremental",
+					database.DBFile)), gormConfig)
 			}
 		case "mysql":
 			{

internal/conf/const.go

@@ -11,8 +11,6 @@ const (
 const (
 	// site
 	VERSION      = "version"
-	ApiUrl       = "api_url"
-	BasePath     = "base_path"
 	SiteTitle    = "site_title"
 	Announcement = "announcement"
 	AllowIndexed = "allow_indexed"
@@ -42,9 +40,10 @@ const (
 	FilenameCharMapping = "filename_char_mapping"
 
 	// index
-	SearchIndex = "search_index"
-	IndexPaths  = "index_paths"
-	IgnorePaths = "ignore_paths"
+	SearchIndex     = "search_index"
+	AutoUpdateIndex = "auto_update_index"
+	IgnorePaths     = "ignore_paths"
+	MaxIndexDepth   = "max_index_depth"
 
 	// aria2
 	Aria2Uri    = "aria2_uri"

internal/db/db.go

@@ -1,8 +1,7 @@
 package db
 
 import (
-	"fmt"
-	"log"
+	log "github.com/sirupsen/logrus"
 
 	"github.com/alist-org/alist/v3/internal/conf"
 	"github.com/alist-org/alist/v3/internal/model"
@@ -14,21 +13,6 @@ var db *gorm.DB
 func Init(d *gorm.DB) {
 	db = d
 	err := AutoMigrate(new(model.Storage), new(model.User), new(model.Meta), new(model.SettingItem), new(model.SearchNode))
-	switch conf.Conf.Database.Type {
-	case "sqlite3":
-	case "mysql":
-		if err == nil {
-			tableName := fmt.Sprintf("%ssearch_nodes", conf.Conf.Database.TablePrefix)
-			db.Exec(fmt.Sprintf("CREATE FULLTEXT INDEX idx_%s_name_fulltext ON %s(name);", tableName, tableName))
-		}
-	case "postgres":
-		if err == nil {
-			db.Exec("CREATE EXTENSION pg_trgm;")
-			db.Exec("CREATE EXTENSION btree_gin;")
-			tableName := fmt.Sprintf("%ssearch_nodes", conf.Conf.Database.TablePrefix)
-			db.Exec(fmt.Sprintf("CREATE INDEX idx_%s_name ON %s USING GIN (name);", tableName, tableName))
-		}
-	}
 	if err != nil {
 		log.Fatalf("failed migrate database: %s", err.Error())
 	}
@@ -43,3 +27,7 @@ func AutoMigrate(dst ...interface{}) error {
 	}
 	return err
 }
+
+func GetDb() *gorm.DB {
+	return db;
+}

internal/db/searchnode.go

@@ -2,7 +2,7 @@ package db
 
 import (
 	"fmt"
-	"path"
+	stdpath "path"
 	"strings"
 
 	"github.com/alist-org/alist/v3/internal/conf"
@@ -29,13 +29,13 @@ func BatchCreateSearchNodes(nodes *[]model.SearchNode) error {
 	return db.CreateInBatches(nodes, 1000).Error
 }
 
-func DeleteSearchNodesByParent(prefix string) error {
-	prefix = utils.FixAndCleanPath(prefix)
-	err := db.Where(whereInParent(prefix)).Delete(&model.SearchNode{}).Error
+func DeleteSearchNodesByParent(path string) error {
+	path = utils.FixAndCleanPath(path)
+	err := db.Where(whereInParent(path)).Delete(&model.SearchNode{}).Error
 	if err != nil {
 		return err
 	}
-	dir, name := path.Split(prefix)
+	dir, name := stdpath.Split(path)
 	return db.Where(fmt.Sprintf("%s = ? AND %s = ?",
 		columnName("parent"), columnName("name")),
 		dir, name).Delete(&model.SearchNode{}).Error
@@ -54,21 +54,23 @@ func GetSearchNodesByParent(parent string) ([]model.SearchNode, error) {
 	return nodes, nil
 }
 
-func SearchNode(req model.SearchReq) ([]model.SearchNode, int64, error) {
+func SearchNode(req model.SearchReq, useFullText bool) ([]model.SearchNode, int64, error) {
 	var searchDB *gorm.DB
-	switch conf.Conf.Database.Type {
-	case "sqlite3":
+	if !useFullText || conf.Conf.Database.Type == "sqlite3" {
 		keywordsClause := db.Where("1 = 1")
 		for _, keyword := range strings.Fields(req.Keywords) {
 			keywordsClause = keywordsClause.Where("name LIKE ?", fmt.Sprintf("%%%s%%", keyword))
 		}
 		searchDB = db.Model(&model.SearchNode{}).Where(whereInParent(req.Parent)).Where(keywordsClause)
-	case "mysql":
-		searchDB = db.Model(&model.SearchNode{}).Where(whereInParent(req.Parent)).
-			Where("MATCH (name) AGAINST (? IN BOOLEAN MODE)", "'*" + req.Keywords + "*'")
-	case "postgres":
-		searchDB = db.Model(&model.SearchNode{}).Where(whereInParent(req.Parent)).
-			Where("to_tsvector(name) @@ to_tsquery(?)", strings.Join(strings.Fields(req.Keywords), " & "))
+	} else {
+		switch conf.Conf.Database.Type {
+		case "mysql":
+			searchDB = db.Model(&model.SearchNode{}).Where(whereInParent(req.Parent)).
+				Where("MATCH (name) AGAINST (? IN BOOLEAN MODE)", "'*"+req.Keywords+"*'")
+		case "postgres":
+			searchDB = db.Model(&model.SearchNode{}).Where(whereInParent(req.Parent)).
+				Where("to_tsvector(name) @@ to_tsquery(?)", strings.Join(strings.Fields(req.Keywords), " & "))
+		}
 	}
 	var count int64
 	if err := searchDB.Count(&count).Error; err != nil {

internal/driver/driver.go

@@ -38,10 +38,15 @@ type Reader interface {
 	Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error)
 }
 
-type Getter interface {
+type GetRooter interface {
 	GetRoot(ctx context.Context) (model.Obj, error)
 }
 
+type Getter interface {
+	// Get file by path, the path haven't been joined with root path
+	Get(ctx context.Context, path string) (model.Obj, error)
+}
+
 //type Writer interface {
 //	Mkdir
 //	Move
@@ -105,3 +110,23 @@ type PutResult interface {
 }
 
 type UpdateProgress func(percentage int)
+
+type Progress struct {
+	Total int64
+	Done  int64
+	up    UpdateProgress
+}
+
+func (p *Progress) Write(b []byte) (n int, err error) {
+	n = len(b)
+	p.Done += int64(n)
+	p.up(int(float64(p.Done) / float64(p.Total) * 100))
+	return
+}
+
+func NewProgress(total int64, up UpdateProgress) *Progress {
+	return &Progress{
+		Total: total,
+		up:    up,
+	}
+}

internal/fs/list.go

@@ -37,14 +37,7 @@ func list(ctx context.Context, path string, refresh ...bool) ([]model.Obj, error
 	if whetherHide(user, meta, path) {
 		om.InitHideReg(meta.Hide)
 	}
-	objs := om.Merge(virtualFiles, _objs...)
-	// sort objs
-	if storage != nil {
-		if storage.Config().LocalSort {
-			model.SortFiles(objs, storage.GetStorage().OrderBy, storage.GetStorage().OrderDirection)
-		}
-		model.ExtractFolder(objs, storage.GetStorage().ExtractFolder)
-	}
+	objs := om.Merge(_objs, virtualFiles...)
 	return objs, nil
 }
 

internal/model/obj.go

@@ -12,7 +12,7 @@ import (
 	"github.com/maruel/natural"
 )
 
-type UnwrapObj interface {
+type ObjUnwrap interface {
 	Unwrap() Obj
 }
 
@@ -99,7 +99,6 @@ func ExtractFolder(objs []Obj, extractFolder string) {
 	})
 }
 
-// Wrap
 func WrapObjName(objs Obj) Obj {
 	return &ObjWrapName{Obj: objs}
 }
@@ -110,8 +109,8 @@ func WrapObjsName(objs []Obj) {
 	}
 }
 
-func UnwrapObjs(obj Obj) Obj {
-	if unwrap, ok := obj.(UnwrapObj); ok {
+func UnwrapObj(obj Obj) Obj {
+	if unwrap, ok := obj.(ObjUnwrap); ok {
 		obj = unwrap.Unwrap()
 	}
 	return obj
@@ -121,7 +120,7 @@ func GetThumb(obj Obj) (thumb string, ok bool) {
 	if obj, ok := obj.(Thumb); ok {
 		return obj.Thumb(), true
 	}
-	if unwrap, ok := obj.(UnwrapObj); ok {
+	if unwrap, ok := obj.(ObjUnwrap); ok {
 		return GetThumb(unwrap.Unwrap())
 	}
 	return thumb, false
@@ -131,7 +130,7 @@ func GetUrl(obj Obj) (url string, ok bool) {
 	if obj, ok := obj.(URL); ok {
 		return obj.URL(), true
 	}
-	if unwrap, ok := obj.(UnwrapObj); ok {
+	if unwrap, ok := obj.(ObjUnwrap); ok {
 		return GetUrl(unwrap.Unwrap())
 	}
 	return url, false

internal/op/fs.go

@@ -10,6 +10,7 @@ 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/generic_sync"
 	"github.com/alist-org/alist/v3/pkg/singleflight"
 	"github.com/alist-org/alist/v3/pkg/utils"
 	"github.com/pkg/errors"
@@ -49,6 +50,8 @@ func delCacheObj(storage driver.Driver, path string, obj model.Obj) {
 	}
 }
 
+var addSortDebounceMap generic_sync.MapOf[string, func(func())]
+
 func addCacheObj(storage driver.Driver, path string, newObj model.Obj) {
 	key := Key(storage, path)
 	objs, ok := listCache.Get(key)
@@ -59,7 +62,24 @@ func addCacheObj(storage driver.Driver, path string, newObj model.Obj) {
 				return
 			}
 		}
-		objs = append(objs, newObj)
+
+		// Simple separation of files and folders
+		if len(objs) > 0 && objs[len(objs)-1].IsDir() == newObj.IsDir() {
+			objs = append(objs, newObj)
+		} else {
+			objs = append([]model.Obj{newObj}, objs...)
+		}
+
+		if storage.Config().LocalSort {
+			debounce, _ := addSortDebounceMap.LoadOrStore(key, utils.NewDebounce(time.Minute))
+			log.Debug("addCacheObj: wait start sort")
+			debounce(func() {
+				log.Debug("addCacheObj: start sort")
+				model.SortFiles(objs, storage.GetStorage().OrderBy, storage.GetStorage().OrderDirection)
+				addSortDebounceMap.Delete(key)
+			})
+		}
+
 		listCache.Set(key, objs, cache.WithEx[[]model.Obj](time.Minute*time.Duration(storage.GetStorage().CacheExpiration)))
 	}
 }
@@ -110,9 +130,16 @@ func List(ctx context.Context, storage driver.Driver, path string, args model.Li
 		// call hooks
 		go func(reqPath string, files []model.Obj) {
 			for _, hook := range objsUpdateHooks {
-				hook(args.ReqPath, files)
+				hook(reqPath, files)
 			}
-		}(args.ReqPath, files)
+		}(utils.GetFullPath(storage.GetStorage().MountPath, path), files)
+
+		// sort objs
+		if storage.Config().LocalSort {
+			model.SortFiles(files, storage.GetStorage().OrderBy, storage.GetStorage().OrderDirection)
+		}
+		model.ExtractFolder(files, storage.GetStorage().ExtractFolder)
+
 		if !storage.Config().NoCache {
 			if len(files) > 0 {
 				log.Debugf("set cache: %s => %+v", key, files)
@@ -132,6 +159,14 @@ func Get(ctx context.Context, storage driver.Driver, path string) (model.Obj, er
 	path = utils.FixAndCleanPath(path)
 	log.Debugf("op.Get %s", path)
 
+	// get the obj directly without list so that we can reduce the io
+	if g, ok := storage.(driver.Getter); ok {
+		obj, err := g.Get(ctx, path)
+		if err == nil {
+			return model.WrapObjName(obj), nil
+		}
+	}
+
 	// is root folder
 	if utils.PathEqual(path, "/") {
 		var rootObj model.Obj
@@ -153,7 +188,7 @@ func Get(ctx context.Context, storage driver.Driver, path string) (model.Obj, er
 				IsFolder: true,
 			}
 		default:
-			if storage, ok := storage.(driver.Getter); ok {
+			if storage, ok := storage.(driver.GetRooter); ok {
 				obj, err := storage.GetRoot(ctx)
 				if err != nil {
 					return nil, errors.WithMessage(err, "failed get root obj")
@@ -162,7 +197,7 @@ func Get(ctx context.Context, storage driver.Driver, path string) (model.Obj, er
 			}
 		}
 		if rootObj == nil {
-			return nil, errors.Errorf("please implement IRootPath or IRootId or Getter method")
+			return nil, errors.Errorf("please implement IRootPath or IRootId or GetRooter method")
 		}
 		return &model.ObjWrapName{
 			Name: RootName,
@@ -177,7 +212,6 @@ func Get(ctx context.Context, storage driver.Driver, path string) (model.Obj, er
 		return nil, errors.WithMessage(err, "failed get parent list")
 	}
 	for _, f := range files {
-		// TODO maybe copy obj here
 		if f.GetName() == name {
 			return f, nil
 		}
@@ -191,7 +225,7 @@ func GetUnwrap(ctx context.Context, storage driver.Driver, path string) (model.O
 	if err != nil {
 		return nil, err
 	}
-	return model.UnwrapObjs(obj), err
+	return model.UnwrapObj(obj), err
 }
 
 var linkCache = cache.NewMemCache(cache.WithShards[*model.Link](16))
@@ -311,7 +345,7 @@ func Move(ctx context.Context, storage driver.Driver, srcPath, dstDirPath string
 	if err != nil {
 		return errors.WithMessage(err, "failed to get src object")
 	}
-	srcObj := model.UnwrapObjs(srcRawObj)
+	srcObj := model.UnwrapObj(srcRawObj)
 	dstDir, err := GetUnwrap(ctx, storage, dstDirPath)
 	if err != nil {
 		return errors.WithMessage(err, "failed to get dst dir")
@@ -353,7 +387,7 @@ func Rename(ctx context.Context, storage driver.Driver, srcPath, dstName string,
 	if err != nil {
 		return errors.WithMessage(err, "failed to get src object")
 	}
-	srcObj := model.UnwrapObjs(srcRawObj)
+	srcObj := model.UnwrapObj(srcRawObj)
 	srcDirPath := stdpath.Dir(srcPath)
 
 	switch s := storage.(type) {
@@ -433,7 +467,7 @@ func Remove(ctx context.Context, storage driver.Driver, path string) error {
 
 	switch s := storage.(type) {
 	case driver.Remove:
-		err = s.Remove(ctx, model.UnwrapObjs(rawObj))
+		err = s.Remove(ctx, model.UnwrapObj(rawObj))
 		if err == nil {
 			delCacheObj(storage, dirPath, rawObj)
 		}

internal/search/build.go

@@ -13,6 +13,7 @@ import (
 	"github.com/alist-org/alist/v3/internal/model"
 	"github.com/alist-org/alist/v3/internal/op"
 	"github.com/alist-org/alist/v3/internal/search/searcher"
+	"github.com/alist-org/alist/v3/internal/setting"
 	"github.com/alist-org/alist/v3/pkg/mq"
 	"github.com/alist-org/alist/v3/pkg/utils"
 	mapset "github.com/deckarep/golang-set/v2"
@@ -30,6 +31,8 @@ func BuildIndex(ctx context.Context, indexPaths, ignorePaths []string, maxDepth
 		objCount uint64 = 0
 		fi       model.Obj
 	)
+	log.Infof("build index for: %+v", indexPaths)
+	log.Infof("ignore paths: %+v", ignorePaths)
 	Running.Store(true)
 	Quit = make(chan struct{}, 1)
 	indexMQ := mq.NewInMemoryMQ[ObjWithParent]()
@@ -164,7 +167,7 @@ func Config(ctx context.Context) searcher.Config {
 }
 
 func Update(parent string, objs []model.Obj) {
-	if instance == nil || !instance.Config().AutoUpdate || Running.Load() {
+	if instance == nil || !instance.Config().AutoUpdate || !setting.GetBool(conf.AutoUpdateIndex) || Running.Load() {
 		return
 	}
 	if isIgnorePath(parent) {
@@ -216,10 +219,11 @@ func Update(parent string, objs []model.Obj) {
 			}
 			// build index if it's a folder
 			if objs[i].IsDir() {
+				dir := path.Join(parent, objs[i].GetName())
 				err = BuildIndex(ctx,
-					[]string{path.Join(parent, objs[i].GetName())},
+					[]string{dir},
 					conf.SlicesMap[conf.IgnorePaths],
-					-1, false)
+					setting.GetInt(conf.MaxIndexDepth, 20)-strings.Count(dir, "/"), false)
 				if err != nil {
 					log.Errorf("update search index error while build index: %+v", err)
 					return

internal/search/db/init.go

@@ -1,6 +1,13 @@
 package db
 
 import (
+	"fmt"
+	"strings"
+
+	log "github.com/sirupsen/logrus"
+
+	"github.com/alist-org/alist/v3/internal/conf"
+	"github.com/alist-org/alist/v3/internal/db"
 	"github.com/alist-org/alist/v3/internal/search/searcher"
 )
 
@@ -11,6 +18,25 @@ var config = searcher.Config{
 
 func init() {
 	searcher.RegisterSearcher(config, func() (searcher.Searcher, error) {
+		db := db.GetDb()
+		switch conf.Conf.Database.Type {
+		case "mysql":
+			tableName := fmt.Sprintf("%ssearch_nodes", conf.Conf.Database.TablePrefix)
+			tx := db.Exec(fmt.Sprintf("CREATE FULLTEXT INDEX idx_%s_name_fulltext ON %s(name);", tableName, tableName))
+			if err := tx.Error; err != nil && !strings.Contains(err.Error(), "Error 1061 (42000)") { // duplicate error
+				log.Errorf("failed to create full text index: %v", err)
+				return nil, err
+			}
+		case "postgres":
+			db.Exec("CREATE EXTENSION pg_trgm;")
+			db.Exec("CREATE EXTENSION btree_gin;")
+			tableName := fmt.Sprintf("%ssearch_nodes", conf.Conf.Database.TablePrefix)
+			tx := db.Exec(fmt.Sprintf("CREATE INDEX idx_%s_name ON %s USING GIN (name);", tableName, tableName))
+			if err := tx.Error; err != nil && !strings.Contains(err.Error(), "SQLSTATE 42P07") {
+				log.Errorf("failed to create index using GIN: %v", err)
+				return nil, err
+			}
+		}
 		return &DB{}, nil
 	})
 }

internal/search/db/search.go

@@ -15,7 +15,7 @@ func (D DB) Config() searcher.Config {
 }
 
 func (D DB) Search(ctx context.Context, req model.SearchReq) ([]model.SearchNode, int64, error) {
-	return db.SearchNode(req)
+	return db.SearchNode(req, true)
 }
 
 func (D DB) Index(ctx context.Context, node model.SearchNode) error {
@@ -30,8 +30,8 @@ func (D DB) Get(ctx context.Context, parent string) ([]model.SearchNode, error)
 	return db.GetSearchNodesByParent(parent)
 }
 
-func (D DB) Del(ctx context.Context, prefix string) error {
-	return db.DeleteSearchNodesByParent(prefix)
+func (D DB) Del(ctx context.Context, path string) error {
+	return db.DeleteSearchNodesByParent(path)
 }
 
 func (D DB) Release(ctx context.Context) error {

internal/search/db_non_full_text/init.go

@@ -0,0 +1,16 @@
+package db_non_full_text
+
+import (
+	"github.com/alist-org/alist/v3/internal/search/searcher"
+)
+
+var config = searcher.Config{
+	Name:       "database_non_full_text",
+	AutoUpdate: true,
+}
+
+func init() {
+	searcher.RegisterSearcher(config, func() (searcher.Searcher, error) {
+		return &DB{}, nil
+	})
+}

internal/search/db_non_full_text/search.go

@@ -0,0 +1,45 @@
+package db_non_full_text
+
+import (
+	"context"
+
+	"github.com/alist-org/alist/v3/internal/db"
+	"github.com/alist-org/alist/v3/internal/model"
+	"github.com/alist-org/alist/v3/internal/search/searcher"
+)
+
+type DB struct{}
+
+func (D DB) Config() searcher.Config {
+	return config
+}
+
+func (D DB) Search(ctx context.Context, req model.SearchReq) ([]model.SearchNode, int64, error) {
+	return db.SearchNode(req, false)
+}
+
+func (D DB) Index(ctx context.Context, node model.SearchNode) error {
+	return db.CreateSearchNode(&node)
+}
+
+func (D DB) BatchIndex(ctx context.Context, nodes []model.SearchNode) error {
+	return db.BatchCreateSearchNodes(&nodes)
+}
+
+func (D DB) Get(ctx context.Context, parent string) ([]model.SearchNode, error) {
+	return db.GetSearchNodesByParent(parent)
+}
+
+func (D DB) Del(ctx context.Context, path string) error {
+	return db.DeleteSearchNodesByParent(path)
+}
+
+func (D DB) Release(ctx context.Context) error {
+	return nil
+}
+
+func (D DB) Clear(ctx context.Context) error {
+	return db.ClearSearchNodes()
+}
+
+var _ searcher.Searcher = (*DB)(nil)

internal/search/import.go

@@ -3,4 +3,5 @@ package search
 import (
 	_ "github.com/alist-org/alist/v3/internal/search/bleve"
 	_ "github.com/alist-org/alist/v3/internal/search/db"
+	_ "github.com/alist-org/alist/v3/internal/search/db_non_full_text"
 )

internal/search/util.go

@@ -53,9 +53,10 @@ func updateIgnorePaths() {
 					res, err := base.RestyClient.R().Get(url)
 					if err == nil {
 						allowIndexed = utils.Json.Get(res.Body(), "data", conf.AllowIndexed).ToBool()
+						v3Visited[addition.Address] = allowIndexed
 					}
 				}
-				if allowIndexed {
+				if !allowIndexed {
 					ignorePaths = append(ignorePaths, storage.GetStorage().MountPath)
 				}
 			} else {

pkg/utils/balance.go

@@ -9,10 +9,10 @@ func IsBalance(str string) bool {
 }
 
 // GetActualMountPath remove balance suffix
-func GetActualMountPath(virtualPath string) string {
-	bIndex := strings.LastIndex(virtualPath, ".balance")
+func GetActualMountPath(mountPath string) string {
+	bIndex := strings.LastIndex(mountPath, ".balance")
 	if bIndex != -1 {
-		virtualPath = virtualPath[:bIndex]
+		mountPath = mountPath[:bIndex]
 	}
-	return virtualPath
+	return mountPath
 }

pkg/utils/path.go

@@ -75,8 +75,22 @@ func EncodePath(path string, all ...bool) string {
 }
 
 func JoinBasePath(basePath, reqPath string) (string, error) {
-	if strings.HasSuffix(reqPath, "..") || strings.Contains(reqPath, "../") {
+	/** relative path:
+	 * 1. ..
+	 * 2. ../
+	 * 3. /..
+	 * 4. /../
+	 * 5. /a/b/..
+	 */
+	if reqPath == ".." ||
+		strings.HasSuffix(reqPath, "/..") ||
+		strings.HasPrefix(reqPath, "../") ||
+		strings.Contains(reqPath, "/../") {
 		return "", errs.RelativePath
 	}
 	return stdpath.Join(FixAndCleanPath(basePath), FixAndCleanPath(reqPath)), nil
 }
+
+func GetFullPath(mountPath, path string) string {
+	return stdpath.Join(GetActualMountPath(mountPath), path)
+}

pkg/utils/slice.go

@@ -31,7 +31,7 @@ func SliceContains[T comparable](arr []T, v T) bool {
 
 // SliceConvert convert slice to another type slice
 func SliceConvert[S any, D any](srcS []S, convert func(src S) (D, error)) ([]D, error) {
-	var res []D
+	res := make([]D, 0, len(srcS))
 	for i := range srcS {
 		dst, err := convert(srcS[i])
 		if err != nil {
@@ -43,7 +43,7 @@ func SliceConvert[S any, D any](srcS []S, convert func(src S) (D, error)) ([]D,
 }
 
 func MustSliceConvert[S any, D any](srcS []S, convert func(src S) D) []D {
-	var res []D
+	res := make([]D, 0, len(srcS))
 	for i := range srcS {
 		dst := convert(srcS[i])
 		res = append(res, dst)

pkg/utils/time.go

@@ -1,8 +1,37 @@
 package utils
 
-import "time"
+import (
+	"sync"
+	"time"
+)
 
 func MustParseCNTime(str string) time.Time {
 	lastOpTime, _ := time.ParseInLocation("2006-01-02 15:04:05 -07", str+" +08", time.Local)
 	return lastOpTime
 }
+
+func NewDebounce(interval time.Duration) func(f func()) {
+	var timer *time.Timer
+	var lock sync.Mutex
+	return func(f func()) {
+		lock.Lock()
+		defer lock.Unlock()
+		if timer != nil {
+			timer.Stop()
+		}
+		timer = time.AfterFunc(interval, f)
+	}
+}
+
+func NewDebounce2(interval time.Duration, f func()) func() {
+	var timer *time.Timer
+	var lock sync.Mutex
+	return func() {
+		lock.Lock()
+		defer lock.Unlock()
+		if timer == nil {
+			timer = time.AfterFunc(interval, f)
+		}
+		(*time.Timer)(timer).Reset(interval)
+	}
+}

server/common/base.go

@@ -3,24 +3,27 @@ package common
 import (
 	"fmt"
 	"net/http"
+	stdpath "path"
 	"strings"
 
 	"github.com/alist-org/alist/v3/internal/conf"
-	"github.com/alist-org/alist/v3/internal/setting"
 )
 
 func GetApiUrl(r *http.Request) string {
 	api := conf.Conf.SiteURL
-	if api == "" {
-		api = setting.GetStr(conf.ApiUrl)
+	if strings.HasPrefix(api, "http") {
+		return api
 	}
 	if r != nil && api == "" {
 		protocol := "http"
-		if r.TLS != nil {
+		if r.TLS != nil || r.Header.Get("X-Forwarded-Proto") == "https" {
 			protocol = "https"
 		}
-		api = fmt.Sprintf("%s://%s", protocol, r.Host)
-
+		host := r.Host
+		if r.Header.Get("X-Forwarded-Host") != "" {
+			host = r.Header.Get("X-Forwarded-Host")
+		}
+		api = fmt.Sprintf("%s://%s", protocol, stdpath.Join(host, api))
 	}
 	strings.TrimSuffix(api, "/")
 	return api

server/common/check.go

@@ -17,10 +17,10 @@ func CanWrite(meta *model.Meta, path string) bool {
 
 func CanAccess(user *model.User, meta *model.Meta, reqPath string, password string) bool {
 	// if the reqPath is in hide (only can check the nearest meta) and user can't see hides, can't access
-	if meta != nil && !user.CanSeeHides() && meta.Hide != "" {
+	if meta != nil && !user.CanSeeHides() && meta.Hide != "" && !utils.PathEqual(meta.Path, reqPath) {
 		for _, hide := range strings.Split(meta.Hide, "\n") {
 			re := regexp.MustCompile(hide)
-			if re.MatchString(reqPath[len(meta.Path):]) {
+			if re.MatchString(reqPath[len(meta.Path)+1:]) {
 				return false
 			}
 		}

server/handles/index.go

@@ -6,23 +6,19 @@ import (
 	"github.com/alist-org/alist/v3/internal/conf"
 	"github.com/alist-org/alist/v3/internal/model"
 	"github.com/alist-org/alist/v3/internal/search"
+	"github.com/alist-org/alist/v3/internal/setting"
 	"github.com/alist-org/alist/v3/server/common"
 	"github.com/gin-gonic/gin"
 	log "github.com/sirupsen/logrus"
 )
 
-type BuildOrUpdateIndexReq struct {
+type UpdateIndexReq struct {
 	Paths    []string `json:"paths"`
 	MaxDepth int      `json:"max_depth"`
 	//IgnorePaths []string `json:"ignore_paths"`
 }
 
 func BuildIndex(c *gin.Context) {
-	var req BuildOrUpdateIndexReq
-	if err := c.ShouldBind(&req); err != nil {
-		common.ErrorResp(c, err, 400)
-		return
-	}
 	if search.Running.Load() {
 		common.ErrorStrResp(c, "index is running", 400)
 		return
@@ -34,8 +30,8 @@ func BuildIndex(c *gin.Context) {
 			log.Errorf("clear index error: %+v", err)
 			return
 		}
-		err = search.BuildIndex(context.Background(), req.Paths,
-			conf.SlicesMap[conf.IgnorePaths], req.MaxDepth, true)
+		err = search.BuildIndex(context.Background(), []string{"/"},
+			conf.SlicesMap[conf.IgnorePaths], setting.GetInt(conf.MaxIndexDepth, 20), true)
 		if err != nil {
 			log.Errorf("build index error: %+v", err)
 		}
@@ -44,7 +40,7 @@ func BuildIndex(c *gin.Context) {
 }
 
 func UpdateIndex(c *gin.Context) {
-	var req BuildOrUpdateIndexReq
+	var req UpdateIndexReq
 	if err := c.ShouldBind(&req); err != nil {
 		common.ErrorResp(c, err, 400)
 		return
@@ -91,7 +87,7 @@ func ClearIndex(c *gin.Context) {
 	search.Clear(c)
 	search.WriteProgress(&model.IndexProgress{
 		ObjCount:     0,
-		IsDone:       false,
+		IsDone:       true,
 		LastDoneTime: nil,
 		Error:        "",
 	})

server/static/config.go

@@ -5,7 +5,6 @@ import (
 	"strings"
 
 	"github.com/alist-org/alist/v3/internal/conf"
-	"github.com/alist-org/alist/v3/internal/setting"
 	"github.com/alist-org/alist/v3/pkg/utils"
 )
 
@@ -25,11 +24,6 @@ func getSiteConfig() SiteConfig {
 		BasePath: u.Path,
 		Cdn:      strings.ReplaceAll(strings.TrimSuffix(conf.Conf.Cdn, "/"), "$version", conf.WebVersion),
 	}
-	// try to get old config
-	if siteConfig.ApiURL == "" {
-		siteConfig.ApiURL = setting.GetStr(conf.ApiUrl)
-		siteConfig.BasePath = setting.GetStr(conf.BasePath)
-	}
 	if siteConfig.BasePath != "" {
 		siteConfig.BasePath = utils.FixAndCleanPath(siteConfig.BasePath)
 	}