fix(deps): update module gorm.io/gorm to v1.25.12

.github/workflows/beta_release.yml

@@ -8,9 +8,6 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
-permissions:
-  contents: write
-
 jobs:
   changelog:
     strategy:
@@ -32,17 +29,12 @@ jobs:
           ref: tags/beta
           sha: ${{ github.sha }}
 
-      - name: Delete beta tag
-        run: git tag -d beta
-        continue-on-error: true
-
       - name: changelog # or changelogithub@0.12 if ensure the stable result
         id: changelog
         run: |
           git tag -l
           npx changelogithub --output CHANGELOG.md
 #          npx changelogen@latest --output CHANGELOG.md
-
       - name: Upload assets
         uses: softprops/action-gh-release@v2
         with:
@@ -57,7 +49,7 @@ jobs:
     strategy:
       matrix:
         include:
-          - target: '!(*musl*|*windows-arm64*|*android*|*freebsd*)' # xgo
+          - target: '!(*musl*|*windows-arm64*|*android*)' # xgo
             hash: "md5"
           - target: 'linux-!(arm*)-musl*' #musl-not-arm
             hash: "md5-linux-musl"
@@ -67,9 +59,6 @@ jobs:
             hash: "md5-windows-arm64"
           - target: 'android-*' #android
             hash: "md5-android"
-          - target: 'freebsd-*' #freebsd
-            hash: "md5-freebsd"
-
     name: Beta Release
     runs-on: ubuntu-latest
     steps:
@@ -116,7 +105,7 @@ jobs:
           issue-number: 69
           body: |
             /release-beta
-            - triggered by @${{ github.actor }}
+            - triggered by ${{ github.actor }}
             - commit sha: ${{ github.sha }}
             - view files: https://github.com/alist-org/alist/tree/${{ github.sha }}
           reactions: 'rocket'

.github/workflows/build_docker.yml

@@ -53,7 +53,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: build/musl-libs
-          key: docker-musl-libs-v2
+          key: docker-musl-libs
 
       - name: Download Musl Library
         if: steps.cache-musl.outputs.cache-hit != 'true'
@@ -84,7 +84,7 @@ jobs:
           push: ${{ github.event_name == 'push' }}
           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,linux/ppc64le,linux/riscv64
+          platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/386,linux/arm/v6,linux/s390x
 
       - name: Build and push with ffmpeg
         id: docker_build_ffmpeg
@@ -96,7 +96,7 @@ jobs:
           tags: ${{ steps.meta-ffmpeg.outputs.tags }}
           labels: ${{ steps.meta-ffmpeg.outputs.labels }}
           build-args: INSTALL_FFMPEG=true
-          platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/386,linux/arm/v6,linux/s390x,linux/ppc64le,linux/riscv64
+          platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/386,linux/arm/v6,linux/s390x
 
   build_docker_with_aria2:
     needs: build_docker

.github/workflows/changelog.yml

@@ -15,10 +15,6 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Delete beta tag
-        run: git tag -d beta
-        continue-on-error: true
-
       - run: npx changelogithub # or changelogithub@0.12 if ensure the stable result
         env:
           GITHUB_TOKEN: ${{secrets.MY_TOKEN}}

.github/workflows/release_docker.yml

@@ -22,7 +22,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: build/musl-libs
-          key: docker-musl-libs-v2
+          key: docker-musl-libs
 
       - name: Download Musl Library
         if: steps.cache-musl.outputs.cache-hit != 'true'
@@ -58,7 +58,7 @@ 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,linux/ppc64le,linux/riscv64
+          platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/386,linux/arm/v6,linux/s390x
 
       - name: Docker meta with ffmpeg
         id: meta-ffmpeg
@@ -79,7 +79,7 @@ jobs:
           tags: ${{ steps.meta-ffmpeg.outputs.tags }}
           labels: ${{ steps.meta-ffmpeg.outputs.labels }}
           build-args: INSTALL_FFMPEG=true
-          platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/386,linux/arm/v6,linux/s390x,linux/ppc64le,linux/riscv64
+          platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/386,linux/arm/v6,linux/s390x
 
   release_docker_with_aria2:
     needs: release_docker

.github/workflows/release_freebsd.yml

@@ -1,35 +0,0 @@
-name: release_freebsd
-
-on:
-  release:
-    types: [ published ]
-
-jobs:
-  release_freebsd:
-    strategy:
-      matrix:
-        platform: [ ubuntu-latest ]
-        go-version: [ '1.21' ]
-    name: Release
-    runs-on: ${{ matrix.platform }}
-    steps:
-
-      - name: Setup Go
-        uses: actions/setup-go@v5
-        with:
-          go-version: ${{ matrix.go-version }}
-
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Build
-        run: |
-          bash build.sh release freebsd
-
-      - name: Upload assets
-        uses: softprops/action-gh-release@v2
-        with:
-          tag_name: dev
-          files: build/compress/*

build.sh

@@ -8,7 +8,6 @@ if [ "$1" = "dev" ]; then
   version="dev"
   webVersion="dev"
 else
-  git tag -d beta
   version=$(git describe --abbrev=0 --tags)
   webVersion=$(wget -qO- -t1 -T2 "https://api.github.com/repos/alist-org/alist-web/releases/latest" | grep "tag_name" | head -n 1 | awk -F ":" '{print $2}' | sed 's/\"//g;s/,//g;s/ //g')
 fi
@@ -93,7 +92,7 @@ BuildDocker() {
 PrepareBuildDockerMusl() {
   mkdir -p build/musl-libs
   BASE="https://musl.cc/"
-  FILES=(x86_64-linux-musl-cross aarch64-linux-musl-cross i486-linux-musl-cross s390x-linux-musl-cross armv6-linux-musleabihf-cross armv7l-linux-musleabihf-cross riscv64-linux-musl-cross powerpc64le-linux-musl-cross)
+  FILES=(x86_64-linux-musl-cross aarch64-linux-musl-cross i486-linux-musl-cross s390x-linux-musl-cross armv6-linux-musleabihf-cross armv7l-linux-musleabihf-cross)
   for i in "${FILES[@]}"; do
     url="${BASE}${i}.tgz"
     lib_tgz="build/${i}.tgz"
@@ -112,8 +111,8 @@ BuildDockerMultiplatform() {
   docker_lflags="--extldflags '-static -fpic' $ldflags"
   export CGO_ENABLED=1
 
-  OS_ARCHES=(linux-amd64 linux-arm64 linux-386 linux-s390x linux-riscv64 linux-ppc64le)
+  OS_ARCHES=(linux-amd64 linux-arm64 linux-386 linux-s390x)
-  CGO_ARGS=(x86_64-linux-musl-gcc aarch64-linux-musl-gcc i486-linux-musl-gcc s390x-linux-musl-gcc riscv64-linux-musl-gcc powerpc64le-linux-musl-gcc)
+  CGO_ARGS=(x86_64-linux-musl-gcc aarch64-linux-musl-gcc i486-linux-musl-gcc s390x-linux-musl-gcc)
   for i in "${!OS_ARCHES[@]}"; do
     os_arch=${OS_ARCHES[$i]}
     cgo_cc=${CGO_ARGS[$i]}
@@ -233,29 +232,6 @@ BuildReleaseAndroid() {
   done
 }
 
-BuildReleaseFreeBSD() {
-  rm -rf .git/
-  mkdir -p "build/freebsd"
-  OS_ARCHES=(amd64 arm64 i386)
-  GO_ARCHES=(amd64 arm64 386)
-  CGO_ARGS=(x86_64-unknown-freebsd14.1 aarch64-unknown-freebsd14.1 i386-unknown-freebsd14.1)
-  for i in "${!OS_ARCHES[@]}"; do
-    os_arch=${OS_ARCHES[$i]}
-    cgo_cc="clang --target=${CGO_ARGS[$i]} --sysroot=/opt/freebsd/${os_arch}"
-    echo building for freebsd-${os_arch}
-    sudo mkdir -p "/opt/freebsd/${os_arch}"
-    wget -q https://download.freebsd.org/releases/${os_arch}/14.1-RELEASE/base.txz
-    sudo tar -xf ./base.txz -C /opt/freebsd/${os_arch}
-    rm base.txz
-    export GOOS=freebsd
-    export GOARCH=${GO_ARCHES[$i]}
-    export CC=${cgo_cc}
-    export CGO_ENABLED=1
-    export CGO_LDFLAGS="-fuse-ld=lld"
-    go build -o ./build/$appName-freebsd-$os_arch -ldflags="$ldflags" -tags=jsoniter .
-  done
-}
-
 MakeRelease() {
   cd build
   mkdir compress
@@ -274,11 +250,6 @@ MakeRelease() {
     tar -czvf compress/"$i".tar.gz alist
     rm -f alist
   done
-  for i in $(find . -type f -name "$appName-freebsd-*"); do
-    cp "$i" alist
-    tar -czvf compress/"$i".tar.gz alist
-    rm -f alist
-  done
   for i in $(find . -type f -name "$appName-windows-*"); do
     cp "$i" alist.exe
     zip compress/$(echo $i | sed 's/\.[^.]*$//').zip alist.exe
@@ -316,9 +287,6 @@ elif [ "$1" = "release" ]; then
   elif [ "$2" = "android" ]; then
     BuildReleaseAndroid
     MakeRelease "md5-android.txt"
-  elif [ "$2" = "freebsd" ]; then
-    BuildReleaseFreeBSD
-    MakeRelease "md5-freebsd.txt"
   elif [ "$2" = "web" ]; then
     echo "web only"
   else

drivers/115/appver.go

@@ -1,43 +0,0 @@
-package _115
-
-import (
-	driver115 "github.com/SheltonZhu/115driver/pkg/driver"
-	"github.com/alist-org/alist/v3/drivers/base"
-	log "github.com/sirupsen/logrus"
-)
-
-var (
-	md5Salt = "Qclm8MGWUv59TnrR0XPg"
-	appVer  = "27.0.5.7"
-)
-
-func (d *Pan115) getAppVersion() ([]driver115.AppVersion, error) {
-	result := driver115.VersionResp{}
-	resp, err := base.RestyClient.R().Get(driver115.ApiGetVersion)
-
-	err = driver115.CheckErr(err, &result, resp)
-	if err != nil {
-		return nil, err
-	}
-
-	return result.Data.GetAppVersions(), nil
-}
-
-func (d *Pan115) getAppVer() string {
-	// todo add some cache？
-	vers, err := d.getAppVersion()
-	if err != nil {
-		log.Warnf("[115] get app version failed: %v", err)
-		return appVer
-	}
-	for _, ver := range vers {
-		if ver.AppName == "win" {
-			return ver.Version
-		}
-	}
-	return appVer
-}
-
-func (d *Pan115) initAppVer() {
-	appVer = d.getAppVer()
-}

drivers/115/driver.go

@@ -2,9 +2,7 @@ package _115
 
 import (
 	"context"
-	"fmt"
 	"strings"
-	"sync"
 
 	driver115 "github.com/SheltonZhu/115driver/pkg/driver"
 	"github.com/alist-org/alist/v3/internal/driver"
@@ -18,9 +16,8 @@ import (
 type Pan115 struct {
 	model.Storage
 	Addition
-	client     *driver115.Pan115Client
+	client  *driver115.Pan115Client
-	limiter    *rate.Limiter
+	limiter *rate.Limiter
-	appVerOnce sync.Once
 }
 
 func (d *Pan115) Config() driver.Config {
@@ -32,7 +29,6 @@ func (d *Pan115) GetAddition() driver.Additional {
 }
 
 func (d *Pan115) Init(ctx context.Context) error {
-	d.appVerOnce.Do(d.initAppVer)
 	if d.LimitRate > 0 {
 		d.limiter = rate.NewLimiter(rate.Limit(d.LimitRate), 1)
 	}
@@ -122,10 +118,7 @@ func (d *Pan115) Put(ctx context.Context, dstDir model.Obj, stream model.FileStr
 	if err := d.WaitLimit(ctx); err != nil {
 		return err
 	}
-	if stream.GetSize() > utils.GB*20 { // TODO 由于官方分片上传接口失效，所以使用普通上传小于20GB的文件
+
-		return fmt.Errorf("unsupported file size: 20GB limit exceeded")
-	}
-	// 分片上传
 	var (
 		fastInfo *driver115.UploadInitResp
 		dirID    = dstDir.GetID()
@@ -181,13 +174,11 @@ func (d *Pan115) Put(ctx context.Context, dstDir model.Obj, stream model.FileStr
 	}
 
 	// 闪传失败，上传
-	// if stream.GetSize() <= utils.KB{ // 文件大小小于1KB，改用普通模式上传
+	if stream.GetSize() <= utils.KB { // 文件大小小于1KB，改用普通模式上传
-	if stream.GetSize() <= utils.GB*20 { // TODO 由于官方分片上传接口失效，所以使用普通上传小于20GB的文件
 		return d.client.UploadByOSS(&fastInfo.UploadOSSParams, stream, dirID)
 	}
-	return driver115.ErrUnexpected
 	// 分片上传
-	// return d.UploadByMultipart(&fastInfo.UploadOSSParams, stream.GetSize(), stream, dirID)
+	return d.UploadByMultipart(&fastInfo.UploadOSSParams, stream.GetSize(), stream, dirID)
 }
 
 func (d *Pan115) OfflineList(ctx context.Context) ([]*driver115.OfflineTask, error) {

drivers/115/meta.go

@@ -9,7 +9,7 @@ type Addition struct {
 	Cookie       string  `json:"cookie" type:"text" help:"one of QR code token and cookie required"`
 	QRCodeToken  string  `json:"qrcode_token" type:"text" help:"one of QR code token and cookie required"`
 	QRCodeSource string  `json:"qrcode_source" type:"select" options:"web,android,ios,tv,alipaymini,wechatmini,qandroid" default:"linux" help:"select the QR code device, default linux"`
-	PageSize     int64   `json:"page_size" type:"number" default:"1000" help:"list api per page size of 115 driver"`
+	PageSize     int64   `json:"page_size" type:"number" default:"56" help:"list api per page size of 115 driver"`
 	LimitRate    float64 `json:"limit_rate" type:"number" default:"2" help:"limit all api request rate (1r/[limit_rate]s)"`
 	driver.RootID
 }

drivers/115/types.go

@@ -1,11 +1,10 @@
 package _115
 
 import (
-	"time"
-
 	"github.com/SheltonZhu/115driver/pkg/driver"
 	"github.com/alist-org/alist/v3/internal/model"
 	"github.com/alist-org/alist/v3/pkg/utils"
+	"time"
 )
 
 var _ model.Obj = (*FileObj)(nil)
@@ -21,18 +20,3 @@ func (f *FileObj) CreateTime() time.Time {
 func (f *FileObj) GetHash() utils.HashInfo {
 	return utils.NewHashInfo(utils.SHA1, f.Sha1)
 }
-
-type UploadResult struct {
-	driver.BasicResp
-	Data struct {
-		PickCode string `json:"pick_code"`
-		FileSize int    `json:"file_size"`
-		FileID   string `json:"file_id"`
-		ThumbURL string `json:"thumb_url"`
-		Sha1     string `json:"sha1"`
-		Aid      int    `json:"aid"`
-		FileName string `json:"file_name"`
-		Cid      string `json:"cid"`
-		IsVideo  int    `json:"is_video"`
-	} `json:"data"`
-}

drivers/115/util.go

@@ -2,14 +2,13 @@ package _115
 
 import (
 	"bytes"
-	"crypto/md5"
 	"crypto/tls"
-	"encoding/hex"
 	"encoding/json"
 	"fmt"
 	"io"
 	"net/http"
 	"net/url"
+	"path/filepath"
 	"strconv"
 	"strings"
 	"sync"
@@ -27,12 +26,12 @@ import (
 	"github.com/pkg/errors"
 )
 
-//var UserAgent = driver115.UA115Browser
+var UserAgent = driver115.UA115Desktop
 
 func (d *Pan115) login() error {
 	var err error
 	opts := []driver115.Option{
-		driver115.UA(d.getUA()),
+		driver115.UA(UserAgent),
 		func(c *driver115.Pan115Client) {
 			c.Client.SetTLSClientConfig(&tls.Config{InsecureSkipVerify: conf.Conf.TlsInsecureSkipVerify})
 		},
@@ -74,11 +73,11 @@ func (d *Pan115) getFiles(fileId string) ([]FileObj, error) {
 	return res, nil
 }
 
-func (d *Pan115) getUA() string {
+const (
-	return fmt.Sprintf("Mozilla/5.0 115Browser/%s", appVer)
+	appVer = "2.0.3.6"
-}
+)
 
-func (d *Pan115) DownloadWithUA(pickCode, ua string) (*driver115.DownloadInfo, error) {
+func (c *Pan115) DownloadWithUA(pickCode, ua string) (*driver115.DownloadInfo, error) {
 	key := crypto.GenerateKey()
 	result := driver115.DownloadResp{}
 	params, err := utils.Json.Marshal(map[string]string{"pickcode": pickCode})
@@ -92,10 +91,10 @@ func (d *Pan115) DownloadWithUA(pickCode, ua string) (*driver115.DownloadInfo, e
 	reqUrl := fmt.Sprintf("%s?t=%s", driver115.ApiDownloadGetUrl, driver115.Now().String())
 	req, _ := http.NewRequest(http.MethodPost, reqUrl, bodyReader)
 	req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
-	req.Header.Set("Cookie", d.Cookie)
+	req.Header.Set("Cookie", c.Cookie)
 	req.Header.Set("User-Agent", ua)
 
-	resp, err := d.client.Client.GetClient().Do(req)
+	resp, err := c.client.Client.GetClient().Do(req)
 	if err != nil {
 		return nil, err
 	}
@@ -133,13 +132,6 @@ func (d *Pan115) DownloadWithUA(pickCode, ua string) (*driver115.DownloadInfo, e
 	return nil, driver115.ErrUnexpected
 }
 
-func (c *Pan115) GenerateToken(fileID, preID, timeStamp, fileSize, signKey, signVal string) string {
-	userID := strconv.FormatInt(c.client.UserID, 10)
-	userIDMd5 := md5.Sum([]byte(userID))
-	tokenMd5 := md5.Sum([]byte(md5Salt + fileID + fileSize + signKey + signVal + userID + timeStamp + hex.EncodeToString(userIDMd5[:]) + appVer))
-	return hex.EncodeToString(tokenMd5[:])
-}
-
 func (d *Pan115) rapidUpload(fileSize int64, fileName, dirID, preID, fileID string, stream model.FileStreamer) (*driver115.UploadInitResp, error) {
 	var (
 		ecdhCipher   *cipher.EcdhCipher
@@ -169,7 +161,7 @@ func (d *Pan115) rapidUpload(fileSize int64, fileName, dirID, preID, fileID stri
 
 	signKey, signVal := "", ""
 	for retry := true; retry; {
-		t := driver115.NowMilli()
+		t := driver115.Now()
 
 		if encodedToken, err = ecdhCipher.EncodeToken(t.ToInt64()); err != nil {
 			return nil, err
@@ -180,7 +172,7 @@ func (d *Pan115) rapidUpload(fileSize int64, fileName, dirID, preID, fileID stri
 		}
 
 		form.Set("t", t.String())
-		form.Set("token", d.GenerateToken(fileID, preID, t.String(), fileSizeStr, signKey, signVal))
+		form.Set("token", d.client.GenerateToken(fileID, preID, t.String(), fileSizeStr, signKey, signVal))
 		if signKey != "" && signVal != "" {
 			form.Set("sign_key", signKey)
 			form.Set("sign_val", signVal)
@@ -233,9 +225,6 @@ func UploadDigestRange(stream model.FileStreamer, rangeSpec string) (result stri
 
 	length := end - start + 1
 	reader, err := stream.RangeRead(http_range.Range{Start: start, Length: length})
-	if err != nil {
-		return "", err
-	}
 	hashStr, err := utils.HashReader(utils.SHA1, reader)
 	if err != nil {
 		return "", err
@@ -253,7 +242,6 @@ func (d *Pan115) UploadByMultipart(params *driver115.UploadOSSParams, fileSize i
 		ossClient *oss.Client
 		bucket    *oss.Bucket
 		ossToken  *driver115.UploadOSSTokenResp
-		bodyBytes []byte
 		err       error
 	)
 
@@ -268,14 +256,12 @@ func (d *Pan115) UploadByMultipart(params *driver115.UploadOSSParams, fileSize i
 			f(options)
 		}
 	}
-	// oss 启用Sequential必须按顺序上传
-	options.ThreadsNum = 1
 
 	if ossToken, err = d.client.GetOSSToken(); err != nil {
 		return err
 	}
 
-	if ossClient, err = oss.New(driver115.OSSEndpoint, ossToken.AccessKeyID, ossToken.AccessKeySecret, oss.EnableMD5(true), oss.EnableCRC(true)); err != nil {
+	if ossClient, err = oss.New(driver115.OSSEndpoint, ossToken.AccessKeyID, ossToken.AccessKeySecret); err != nil {
 		return err
 	}
 
@@ -296,7 +282,6 @@ func (d *Pan115) UploadByMultipart(params *driver115.UploadOSSParams, fileSize i
 	if imur, err = bucket.InitiateMultipartUpload(params.Object,
 		oss.SetHeader(driver115.OssSecurityTokenHeaderName, ossToken.SecurityToken),
 		oss.UserAgentHeader(driver115.OSSUserAgent),
-		oss.EnableSha1(), oss.Sequential(),
 	); err != nil {
 		return err
 	}
@@ -340,7 +325,8 @@ func (d *Pan115) UploadByMultipart(params *driver115.UploadOSSParams, fileSize i
 						continue
 					}
 
-					if part, err = bucket.UploadPart(imur, bytes.NewBuffer(buf), chunk.Size, chunk.Number, driver115.OssOption(params, ossToken)...); err == nil {
+					b := bytes.NewBuffer(buf)
+					if part, err = bucket.UploadPart(imur, b, chunk.Size, chunk.Number, driver115.OssOption(params, ossToken)...); err == nil {
 						break
 					}
 				}
@@ -375,20 +361,14 @@ LOOP:
 		}
 	}
 
-	// 不知道啥原因，oss那边分片上传不计算sha1，导致115服务器校验错误
+	// EOF错误是xml的Unmarshal导致的，响应其实是json格式，所以实际上上传是成功的
-	// params.Callback.Callback = strings.ReplaceAll(params.Callback.Callback, "${sha1}", params.SHA1)
+	if _, err = bucket.CompleteMultipartUpload(imur, parts, driver115.OssOption(params, ossToken)...); err != nil && !errors.Is(err, io.EOF) {
-	if _, err := bucket.CompleteMultipartUpload(imur, parts, append(
+		// 当文件名含有 &< 这两个字符之一时响应的xml解析会出现错误，实际上上传是成功的
-		driver115.OssOption(params, ossToken),
+		if filename := filepath.Base(stream.GetName()); !strings.ContainsAny(filename, "&<") {
-		oss.CallbackResult(&bodyBytes),
+			return err
-	)...); err != nil {
+		}
-		return err
 	}
-
+	return d.checkUploadStatus(dirID, params.SHA1)
-	var uploadResult UploadResult
-	if err = json.Unmarshal(bodyBytes, &uploadResult); err != nil {
-		return err
-	}
-	return uploadResult.Err(string(bodyBytes))
 }
 
 func chunksProducer(ch chan oss.FileChunk, chunks []oss.FileChunk) {
@@ -397,6 +377,27 @@ func chunksProducer(ch chan oss.FileChunk, chunks []oss.FileChunk) {
 	}
 }
 
+func (d *Pan115) checkUploadStatus(dirID, sha1 string) error {
+	// 验证上传是否成功
+	req := d.client.NewRequest().ForceContentType("application/json;charset=UTF-8")
+	opts := []driver115.GetFileOptions{
+		driver115.WithOrder(driver115.FileOrderByTime),
+		driver115.WithShowDirEnable(false),
+		driver115.WithAsc(false),
+		driver115.WithLimit(500),
+	}
+	fResp, err := driver115.GetFiles(req, dirID, opts...)
+	if err != nil {
+		return err
+	}
+	for _, fileInfo := range fResp.Files {
+		if fileInfo.Sha1 == sha1 {
+			return nil
+		}
+	}
+	return driver115.ErrUploadFailed
+}
+
 func SplitFile(fileSize int64) (chunks []oss.FileChunk, err error) {
 	for i := int64(1); i < 10; i++ {
 		if fileSize < i*utils.GB { // 文件大小小于iGB时分为i*1000片

drivers/115_share/meta.go

@@ -9,7 +9,7 @@ type Addition struct {
 	Cookie       string  `json:"cookie" type:"text" help:"one of QR code token and cookie required"`
 	QRCodeToken  string  `json:"qrcode_token" type:"text" help:"one of QR code token and cookie required"`
 	QRCodeSource string  `json:"qrcode_source" type:"select" options:"web,android,ios,tv,alipaymini,wechatmini,qandroid" default:"linux" help:"select the QR code device, default linux"`
-	PageSize     int64   `json:"page_size" type:"number" default:"1000" help:"list api per page size of 115 driver"`
+	PageSize     int64   `json:"page_size" type:"number" default:"20" help:"list api per page size of 115 driver"`
 	LimitRate    float64 `json:"limit_rate" type:"number" default:"2" help:"limit all api request rate (1r/[limit_rate]s)"`
 	ShareCode    string  `json:"share_code" type:"text" required:"true" help:"share code of 115 share link"`
 	ReceiveCode  string  `json:"receive_code" type:"text" required:"true" help:"receive code of 115 share link"`

drivers/123/driver.go

@@ -82,7 +82,6 @@ func (d *Pan123) Link(ctx context.Context, file model.Obj, args model.LinkArgs)
 			"type":      f.Type,
 		}
 		resp, err := d.request(DownloadInfo, http.MethodPost, func(req *resty.Request) {
-			
 			req.SetBody(data).SetHeaders(headers)
 		}, nil)
 		if err != nil {

drivers/123/util.go

@@ -26,9 +26,8 @@ const (
 	Api              = "https://www.123pan.com/api"
 	AApi             = "https://www.123pan.com/a/api"
 	BApi             = "https://www.123pan.com/b/api"
-	LoginApi         = "https://login.123pan.com/api"
 	MainApi          = BApi
-	SignIn           = LoginApi + "/user/sign_in"
+	SignIn           = MainApi + "/user/sign_in"
 	Logout           = MainApi + "/user/logout"
 	UserInfo         = MainApi + "/user/info"
 	FileList         = MainApi + "/file/list/new"

drivers/all.go

@@ -22,7 +22,6 @@ import (
 	_ "github.com/alist-org/alist/v3/drivers/cloudreve"
 	_ "github.com/alist-org/alist/v3/drivers/crypt"
 	_ "github.com/alist-org/alist/v3/drivers/dropbox"
-	_ "github.com/alist-org/alist/v3/drivers/febbox"
 	_ "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"

drivers/cloudreve/driver.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"io"
 	"net/http"
-	"path"
 	"strconv"
 	"strings"
 
@@ -91,7 +90,7 @@ func (d *Cloudreve) MakeDir(ctx context.Context, parentDir model.Obj, dirName st
 func (d *Cloudreve) Move(ctx context.Context, srcObj, dstDir model.Obj) error {
 	body := base.Json{
 		"action":  "move",
-		"src_dir": path.Dir(srcObj.GetPath()),
+		"src_dir": srcObj.GetPath(),
 		"dst":     dstDir.GetPath(),
 		"src":     convertSrc(srcObj),
 	}
@@ -113,7 +112,7 @@ func (d *Cloudreve) Rename(ctx context.Context, srcObj model.Obj, newName string
 
 func (d *Cloudreve) Copy(ctx context.Context, srcObj, dstDir model.Obj) error {
 	body := base.Json{
-		"src_dir": path.Dir(srcObj.GetPath()),
+		"src_dir": srcObj.GetPath(),
 		"dst":     dstDir.GetPath(),
 		"src":     convertSrc(srcObj),
 	}

drivers/febbox/driver.go

@@ -1,132 +0,0 @@
-package febbox
-
-import (
-	"context"
-	"github.com/alist-org/alist/v3/internal/op"
-	"github.com/alist-org/alist/v3/pkg/utils"
-	"golang.org/x/oauth2"
-	"golang.org/x/oauth2/clientcredentials"
-
-	"github.com/alist-org/alist/v3/internal/driver"
-	"github.com/alist-org/alist/v3/internal/errs"
-	"github.com/alist-org/alist/v3/internal/model"
-)
-
-type FebBox struct {
-	model.Storage
-	Addition
-	accessToken string
-	oauth2Token oauth2.TokenSource
-}
-
-func (d *FebBox) Config() driver.Config {
-	return config
-}
-
-func (d *FebBox) GetAddition() driver.Additional {
-	return &d.Addition
-}
-
-func (d *FebBox) Init(ctx context.Context) error {
-	// 初始化 oauth2Config
-	oauth2Config := &clientcredentials.Config{
-		ClientID:     d.ClientID,
-		ClientSecret: d.ClientSecret,
-		AuthStyle:    oauth2.AuthStyleInParams,
-		TokenURL:     "https://api.febbox.com/oauth/token",
-	}
-
-	d.initializeOAuth2Token(ctx, oauth2Config, d.Addition.RefreshToken)
-
-	token, err := d.oauth2Token.Token()
-	if err != nil {
-		return err
-	}
-	d.accessToken = token.AccessToken
-	d.Addition.RefreshToken = token.RefreshToken
-	op.MustSaveDriverStorage(d)
-
-	return nil
-}
-
-func (d *FebBox) Drop(ctx context.Context) error {
-	return nil
-}
-
-func (d *FebBox) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([]model.Obj, error) {
-	files, err := d.getFilesList(dir.GetID())
-	if err != nil {
-		return nil, err
-	}
-	return utils.SliceConvert(files, func(src File) (model.Obj, error) {
-		return fileToObj(src), nil
-	})
-}
-
-func (d *FebBox) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
-	var ip string
-	if d.Addition.UserIP != "" {
-		ip = d.Addition.UserIP
-	} else {
-		ip = args.IP
-	}
-
-	url, err := d.getDownloadLink(file.GetID(), ip)
-	if err != nil {
-		return nil, err
-	}
-	return &model.Link{
-		URL: url,
-	}, nil
-}
-
-func (d *FebBox) MakeDir(ctx context.Context, parentDir model.Obj, dirName string) (model.Obj, error) {
-	err := d.makeDir(parentDir.GetID(), dirName)
-	if err != nil {
-		return nil, err
-	}
-
-	return nil, nil
-}
-
-func (d *FebBox) Move(ctx context.Context, srcObj, dstDir model.Obj) (model.Obj, error) {
-	err := d.move(srcObj.GetID(), dstDir.GetID())
-	if err != nil {
-		return nil, err
-	}
-
-	return nil, nil
-}
-
-func (d *FebBox) Rename(ctx context.Context, srcObj model.Obj, newName string) (model.Obj, error) {
-	err := d.rename(srcObj.GetID(), newName)
-	if err != nil {
-		return nil, err
-	}
-
-	return nil, nil
-}
-
-func (d *FebBox) Copy(ctx context.Context, srcObj, dstDir model.Obj) (model.Obj, error) {
-	err := d.copy(srcObj.GetID(), dstDir.GetID())
-	if err != nil {
-		return nil, err
-	}
-
-	return nil, nil
-}
-
-func (d *FebBox) Remove(ctx context.Context, obj model.Obj) error {
-	err := d.remove(obj.GetID())
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (d *FebBox) Put(ctx context.Context, dstDir model.Obj, stream model.FileStreamer, up driver.UpdateProgress) (model.Obj, error) {
-	return nil, errs.NotImplement
-}
-
-var _ driver.Driver = (*FebBox)(nil)

drivers/febbox/meta.go

@@ -1,36 +0,0 @@
-package febbox
-
-import (
-	"github.com/alist-org/alist/v3/internal/driver"
-	"github.com/alist-org/alist/v3/internal/op"
-)
-
-type Addition struct {
-	driver.RootID
-	ClientID     string `json:"client_id" required:"true" default:""`
-	ClientSecret string `json:"client_secret" required:"true" default:""`
-	RefreshToken string
-	SortRule     string `json:"sort_rule" required:"true" type:"select" options:"size_asc,size_desc,name_asc,name_desc,update_asc,update_desc,ext_asc,ext_desc" default:"name_asc"`
-	PageSize     int64  `json:"page_size" required:"true" type:"number" default:"100" help:"list api per page size of FebBox driver"`
-	UserIP       string `json:"user_ip" default:"" help:"user ip address for download link which can speed up the download"`
-}
-
-var config = driver.Config{
-	Name:              "FebBox",
-	LocalSort:         false,
-	OnlyLocal:         false,
-	OnlyProxy:         false,
-	NoCache:           false,
-	NoUpload:          true,
-	NeedMs:            false,
-	DefaultRoot:       "0",
-	CheckStatus:       false,
-	Alert:             "",
-	NoOverwriteUpload: false,
-}
-
-func init() {
-	op.RegisterDriver(func() driver.Driver {
-		return &FebBox{}
-	})
-}

drivers/febbox/oauth2.go

@@ -1,88 +0,0 @@
-package febbox
-
-import (
-	"context"
-	"encoding/json"
-	"errors"
-	"net/http"
-	"net/url"
-	"strings"
-	"time"
-
-	"golang.org/x/oauth2"
-	"golang.org/x/oauth2/clientcredentials"
-)
-
-type customTokenSource struct {
-	config       *clientcredentials.Config
-	ctx          context.Context
-	refreshToken string
-}
-
-func (c *customTokenSource) Token() (*oauth2.Token, error) {
-	v := url.Values{}
-	if c.refreshToken != "" {
-		v.Set("grant_type", "refresh_token")
-		v.Set("refresh_token", c.refreshToken)
-	} else {
-		v.Set("grant_type", "client_credentials")
-	}
-
-	v.Set("client_id", c.config.ClientID)
-	v.Set("client_secret", c.config.ClientSecret)
-
-	req, err := http.NewRequest("POST", c.config.TokenURL, strings.NewReader(v.Encode()))
-	if err != nil {
-		return nil, err
-	}
-	req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
-
-	resp, err := http.DefaultClient.Do(req.WithContext(c.ctx))
-	if err != nil {
-		return nil, err
-	}
-	defer resp.Body.Close()
-
-	if resp.StatusCode != http.StatusOK {
-		return nil, errors.New("oauth2: cannot fetch token")
-	}
-
-	var tokenResp struct {
-		Code int    `json:"code"`
-		Msg  string `json:"msg"`
-		Data struct {
-			AccessToken  string `json:"access_token"`
-			ExpiresIn    int64  `json:"expires_in"`
-			TokenType    string `json:"token_type"`
-			Scope        string `json:"scope"`
-			RefreshToken string `json:"refresh_token"`
-		} `json:"data"`
-	}
-
-	if err := json.NewDecoder(resp.Body).Decode(&tokenResp); err != nil {
-		return nil, err
-	}
-
-	if tokenResp.Code != 1 {
-		return nil, errors.New("oauth2: server response error")
-	}
-
-	c.refreshToken = tokenResp.Data.RefreshToken
-
-	token := &oauth2.Token{
-		AccessToken:  tokenResp.Data.AccessToken,
-		TokenType:    tokenResp.Data.TokenType,
-		RefreshToken: tokenResp.Data.RefreshToken,
-		Expiry:       time.Now().Add(time.Duration(tokenResp.Data.ExpiresIn) * time.Second),
-	}
-
-	return token, nil
-}
-
-func (d *FebBox) initializeOAuth2Token(ctx context.Context, oauth2Config *clientcredentials.Config, refreshToken string) {
-	d.oauth2Token = oauth2.ReuseTokenSource(nil, &customTokenSource{
-		config:       oauth2Config,
-		ctx:          ctx,
-		refreshToken: refreshToken,
-	})
-}

drivers/febbox/types.go

@@ -1,123 +0,0 @@
-package febbox
-
-import (
-	"fmt"
-	"github.com/alist-org/alist/v3/internal/model"
-	"github.com/alist-org/alist/v3/pkg/utils"
-	hash_extend "github.com/alist-org/alist/v3/pkg/utils/hash"
-	"strconv"
-	"time"
-)
-
-type ErrResp struct {
-	ErrorCode     int64   `json:"code"`
-	ErrorMsg      string  `json:"msg"`
-	ServerRunTime float64 `json:"server_runtime"`
-	ServerName    string  `json:"server_name"`
-}
-
-func (e *ErrResp) IsError() bool {
-	return e.ErrorCode != 0 || e.ErrorMsg != "" || e.ServerRunTime != 0 || e.ServerName != ""
-}
-
-func (e *ErrResp) Error() string {
-	return fmt.Sprintf("ErrorCode: %d ,Error: %s ,ServerRunTime: %f ,ServerName: %s", e.ErrorCode, e.ErrorMsg, e.ServerRunTime, e.ServerName)
-}
-
-type FileListResp struct {
-	Code int    `json:"code"`
-	Msg  string `json:"msg"`
-	Data struct {
-		FileList []File `json:"file_list"`
-		ShowType string `json:"show_type"`
-	} `json:"data"`
-}
-
-type Rules struct {
-	AllowCopy     int64 `json:"allow_copy"`
-	AllowDelete   int64 `json:"allow_delete"`
-	AllowDownload int64 `json:"allow_download"`
-	AllowComment  int64 `json:"allow_comment"`
-	HideLocation  int64 `json:"hide_location"`
-}
-
-type File struct {
-	Fid              int64  `json:"fid"`
-	UID              int64  `json:"uid"`
-	FileSize         int64  `json:"file_size"`
-	Path             string `json:"path"`
-	FileName         string `json:"file_name"`
-	Ext              string `json:"ext"`
-	AddTime          int64  `json:"add_time"`
-	FileCreateTime   int64  `json:"file_create_time"`
-	FileUpdateTime   int64  `json:"file_update_time"`
-	ParentID         int64  `json:"parent_id"`
-	UpdateTime       int64  `json:"update_time"`
-	LastOpenTime     int64  `json:"last_open_time"`
-	IsDir            int64  `json:"is_dir"`
-	Epub             int64  `json:"epub"`
-	IsMusicList      int64  `json:"is_music_list"`
-	OssFid           int64  `json:"oss_fid"`
-	Faststart        int64  `json:"faststart"`
-	HasVideoQuality  int64  `json:"has_video_quality"`
-	TotalDownload    int64  `json:"total_download"`
-	Status           int64  `json:"status"`
-	Remark           string `json:"remark"`
-	OldHash          string `json:"old_hash"`
-	Hash             string `json:"hash"`
-	HashType         string `json:"hash_type"`
-	FromUID          int64  `json:"from_uid"`
-	FidOrg           int64  `json:"fid_org"`
-	ShareID          int64  `json:"share_id"`
-	InvitePermission int64  `json:"invite_permission"`
-	ThumbSmall       string `json:"thumb_small"`
-	ThumbSmallWidth  int64  `json:"thumb_small_width"`
-	ThumbSmallHeight int64  `json:"thumb_small_height"`
-	Thumb            string `json:"thumb"`
-	ThumbWidth       int64  `json:"thumb_width"`
-	ThumbHeight      int64  `json:"thumb_height"`
-	ThumbBig         string `json:"thumb_big"`
-	ThumbBigWidth    int64  `json:"thumb_big_width"`
-	ThumbBigHeight   int64  `json:"thumb_big_height"`
-	IsCustomThumb    int64  `json:"is_custom_thumb"`
-	Photos           int64  `json:"photos"`
-	IsAlbum          int64  `json:"is_album"`
-	ReadOnly         int64  `json:"read_only"`
-	Rules            Rules  `json:"rules"`
-	IsShared         int64  `json:"is_shared"`
-}
-
-func fileToObj(f File) *model.ObjThumb {
-	return &model.ObjThumb{
-		Object: model.Object{
-			ID:       strconv.FormatInt(f.Fid, 10),
-			Name:     f.FileName,
-			Size:     f.FileSize,
-			Ctime:    time.Unix(f.FileCreateTime, 0),
-			Modified: time.Unix(f.FileUpdateTime, 0),
-			IsFolder: f.IsDir == 1,
-			HashInfo: utils.NewHashInfo(hash_extend.GCID, f.Hash),
-		},
-		Thumbnail: model.Thumbnail{
-			Thumbnail: f.Thumb,
-		},
-	}
-}
-
-type FileDownloadResp struct {
-	Code int    `json:"code"`
-	Msg  string `json:"msg"`
-	Data []struct {
-		Error       int    `json:"error"`
-		DownloadURL string `json:"download_url"`
-		Hash        string `json:"hash"`
-		HashType    string `json:"hash_type"`
-		Fid         int    `json:"fid"`
-		FileName    string `json:"file_name"`
-		ParentID    int    `json:"parent_id"`
-		FileSize    int    `json:"file_size"`
-		Ext         string `json:"ext"`
-		Thumb       string `json:"thumb"`
-		VipLink     int    `json:"vip_link"`
-	} `json:"data"`
-}

drivers/febbox/util.go

@@ -1,224 +0,0 @@
-package febbox
-
-import (
-	"encoding/json"
-	"errors"
-	"github.com/alist-org/alist/v3/drivers/base"
-	"github.com/alist-org/alist/v3/internal/op"
-	"github.com/go-resty/resty/v2"
-	"net/http"
-	"strconv"
-)
-
-func (d *FebBox) refreshTokenByOAuth2() error {
-	token, err := d.oauth2Token.Token()
-	if err != nil {
-		return err
-	}
-	d.Status = "work"
-	d.accessToken = token.AccessToken
-	d.Addition.RefreshToken = token.RefreshToken
-	op.MustSaveDriverStorage(d)
-	return nil
-}
-
-func (d *FebBox) request(url string, method string, callback base.ReqCallback, resp interface{}) ([]byte, error) {
-	req := base.RestyClient.R()
-	// 使用oauth2 获取 access_token
-	token, err := d.oauth2Token.Token()
-	if err != nil {
-		return nil, err
-	}
-	req.SetAuthScheme(token.TokenType).SetAuthToken(token.AccessToken)
-
-	if callback != nil {
-		callback(req)
-	}
-	if resp != nil {
-		req.SetResult(resp)
-	}
-	var e ErrResp
-	req.SetError(&e)
-	res, err := req.Execute(method, url)
-	if err != nil {
-		return nil, err
-	}
-
-	switch e.ErrorCode {
-	case 0:
-		return res.Body(), nil
-	case 1:
-		return res.Body(), nil
-	case -10001:
-		if e.ServerName != "" {
-			// access_token 过期
-			if err = d.refreshTokenByOAuth2(); err != nil {
-				return nil, err
-			}
-			return d.request(url, method, callback, resp)
-		} else {
-			return nil, errors.New(e.Error())
-		}
-	default:
-		return nil, errors.New(e.Error())
-	}
-}
-
-func (d *FebBox) getFilesList(id string) ([]File, error) {
-	if d.PageSize <= 0 {
-		d.PageSize = 100
-	}
-	res, err := d.listWithLimit(id, d.PageSize)
-	if err != nil {
-		return nil, err
-	}
-	return *res, nil
-}
-
-func (d *FebBox) listWithLimit(dirID string, pageLimit int64) (*[]File, error) {
-	var files []File
-	page := int64(1)
-	for {
-		result, err := d.getFiles(dirID, page, pageLimit)
-		if err != nil {
-			return nil, err
-		}
-		files = append(files, *result...)
-		if int64(len(*result)) < pageLimit {
-			break
-		} else {
-			page++
-		}
-	}
-	return &files, nil
-}
-
-func (d *FebBox) getFiles(dirID string, page, pageLimit int64) (*[]File, error) {
-	var fileList FileListResp
-	queryParams := map[string]string{
-		"module":    "file_list",
-		"parent_id": dirID,
-		"page":      strconv.FormatInt(page, 10),
-		"pagelimit": strconv.FormatInt(pageLimit, 10),
-		"order":     d.Addition.SortRule,
-	}
-
-	res, err := d.request("https://api.febbox.com/oauth", http.MethodPost, func(req *resty.Request) {
-		req.SetMultipartFormData(queryParams)
-	}, &fileList)
-	if err != nil {
-		return nil, err
-	}
-
-	if err = json.Unmarshal(res, &fileList); err != nil {
-		return nil, err
-	}
-
-	return &fileList.Data.FileList, nil
-}
-
-func (d *FebBox) getDownloadLink(id string, ip string) (string, error) {
-	var fileDownloadResp FileDownloadResp
-	queryParams := map[string]string{
-		"module": "file_get_download_url",
-		"fids[]": id,
-		"ip":     ip,
-	}
-
-	res, err := d.request("https://api.febbox.com/oauth", http.MethodPost, func(req *resty.Request) {
-		req.SetMultipartFormData(queryParams)
-	}, &fileDownloadResp)
-	if err != nil {
-		return "", err
-	}
-
-	if err = json.Unmarshal(res, &fileDownloadResp); err != nil {
-		return "", err
-	}
-
-	return fileDownloadResp.Data[0].DownloadURL, nil
-}
-
-func (d *FebBox) makeDir(id string, name string) error {
-	queryParams := map[string]string{
-		"module":    "create_dir",
-		"parent_id": id,
-		"name":      name,
-	}
-
-	_, err := d.request("https://api.febbox.com/oauth", http.MethodPost, func(req *resty.Request) {
-		req.SetMultipartFormData(queryParams)
-	}, nil)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (d *FebBox) move(id string, id2 string) error {
-	queryParams := map[string]string{
-		"module": "file_move",
-		"fids[]": id,
-		"to":     id2,
-	}
-
-	_, err := d.request("https://api.febbox.com/oauth", http.MethodPost, func(req *resty.Request) {
-		req.SetMultipartFormData(queryParams)
-	}, nil)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (d *FebBox) rename(id string, name string) error {
-	queryParams := map[string]string{
-		"module": "file_rename",
-		"fid":    id,
-		"name":   name,
-	}
-
-	_, err := d.request("https://api.febbox.com/oauth", http.MethodPost, func(req *resty.Request) {
-		req.SetMultipartFormData(queryParams)
-	}, nil)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (d *FebBox) copy(id string, id2 string) error {
-	queryParams := map[string]string{
-		"module": "file_copy",
-		"fids[]": id,
-		"to":     id2,
-	}
-
-	_, err := d.request("https://api.febbox.com/oauth", http.MethodPost, func(req *resty.Request) {
-		req.SetMultipartFormData(queryParams)
-	}, nil)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (d *FebBox) remove(id string) error {
-	queryParams := map[string]string{
-		"module": "file_delete",
-		"fids[]": id,
-	}
-
-	_, err := d.request("https://api.febbox.com/oauth", http.MethodPost, func(req *resty.Request) {
-		req.SetMultipartFormData(queryParams)
-	}, nil)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}

drivers/google_photo/driver.go

@@ -58,9 +58,33 @@ func (d *GooglePhoto) Link(ctx context.Context, file model.Obj, args model.LinkA
 			URL: f.BaseURL + "=d",
 		}, nil
 	} else if strings.Contains(f.MimeType, "video/") {
-		return &model.Link{
+		var width, height int
-			URL: f.BaseURL + "=dv",
+
-		}, nil
+		fmt.Sscanf(f.MediaMetadata.Width, "%d", &width)
+		fmt.Sscanf(f.MediaMetadata.Height, "%d", &height)
+
+		switch {
+		// 1080P
+		case width == 1920 && height == 1080:
+			return &model.Link{
+				URL: f.BaseURL + "=m37",
+			}, nil
+		// 720P
+		case width == 1280 && height == 720:
+			return &model.Link{
+				URL: f.BaseURL + "=m22",
+			}, nil
+		// 360P
+		case width == 640 && height == 360:
+			return &model.Link{
+				URL: f.BaseURL + "=m18",
+			}, nil
+		default:
+			return &model.Link{
+				URL: f.BaseURL + "=dv",
+			}, nil
+		}
+
 	}
 	return &model.Link{}, nil
 }

drivers/ilanzou/driver.go

@@ -66,13 +66,12 @@ func (d *ILanZou) Drop(ctx context.Context) error {
 }
 
 func (d *ILanZou) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([]model.Obj, error) {
-	offset := 1
 	var res []ListItem
 	for {
 		var resp ListResp
 		_, err := d.proved("/record/file/list", http.MethodGet, func(req *resty.Request) {
 			params := []string{
-				"offset=" + strconv.Itoa(offset),
+				"offset=1",
 				"limit=60",
 				"folderId=" + dir.GetID(),
 				"type=0",
@@ -84,9 +83,7 @@ func (d *ILanZou) List(ctx context.Context, dir model.Obj, args model.ListArgs)
 			return nil, err
 		}
 		res = append(res, resp.List...)
-		if resp.Offset < resp.TotalPage {
+		if resp.TotalPage <= resp.Offset {
-			offset++
-		} else {
 			break
 		}
 	}
@@ -289,7 +286,7 @@ func (d *ILanZou) Put(ctx context.Context, dstDir model.Obj, stream model.FileSt
 		req.SetBody(base.Json{
 			"fileId":   "",
 			"fileName": stream.GetName(),
-			"fileSize": stream.GetSize()/1024 + 1,
+			"fileSize": stream.GetSize() / 1024,
 			"folderId": dstDir.GetID(),
 			"md5":      etag,
 			"type":     1,

drivers/local/driver.go

@@ -22,7 +22,6 @@ import (
 	"github.com/alist-org/alist/v3/pkg/utils"
 	"github.com/alist-org/alist/v3/server/common"
 	"github.com/alist-org/times"
-	cp "github.com/otiai10/copy"
 	log "github.com/sirupsen/logrus"
 	_ "golang.org/x/image/webp"
 )
@@ -77,7 +76,7 @@ func (d *Local) Init(ctx context.Context) error {
 	if d.thumbConcurrency == 0 {
 		d.thumbTokenBucket = NewNopTokenBucket()
 	} else {
-		d.thumbTokenBucket = NewStaticTokenBucketWithMigration(d.thumbTokenBucket, d.thumbConcurrency)
+		d.thumbTokenBucket = NewStaticTokenBucket(d.thumbConcurrency)
 	}
 	return nil
 }
@@ -242,22 +241,11 @@ func (d *Local) Move(ctx context.Context, srcObj, dstDir model.Obj) error {
 	if utils.IsSubPath(srcPath, dstPath) {
 		return fmt.Errorf("the destination folder is a subfolder of the source folder")
 	}
-	if err := os.Rename(srcPath, dstPath); err != nil && strings.Contains(err.Error(), "invalid cross-device link") {
+	err := os.Rename(srcPath, dstPath)
-		// Handle cross-device file move in local driver
+	if err != nil {
-		if err = d.Copy(ctx, srcObj, dstDir); err != nil {
-			return err
-		} else {
-			// Directly remove file without check recycle bin if successfully copied
-			if srcObj.IsDir() {
-				err = os.RemoveAll(srcObj.GetPath())
-			} else {
-				err = os.Remove(srcObj.GetPath())
-			}
-			return err
-		}
-	} else {
 		return err
 	}
+	return nil
 }
 
 func (d *Local) Rename(ctx context.Context, srcObj model.Obj, newName string) error {
@@ -270,18 +258,22 @@ func (d *Local) Rename(ctx context.Context, srcObj model.Obj, newName string) er
 	return nil
 }
 
-func (d *Local) Copy(_ context.Context, srcObj, dstDir model.Obj) error {
+func (d *Local) Copy(ctx context.Context, srcObj, dstDir model.Obj) error {
 	srcPath := srcObj.GetPath()
 	dstPath := filepath.Join(dstDir.GetPath(), srcObj.GetName())
 	if utils.IsSubPath(srcPath, dstPath) {
 		return fmt.Errorf("the destination folder is a subfolder of the source folder")
 	}
-	// Copy using otiai10/copy to perform more secure & efficient copy
+	var err error
-	return cp.Copy(srcPath, dstPath, cp.Options{
+	if srcObj.IsDir() {
-		Sync:          true, // Sync file to disk after copy, may have performance penalty in filesystem such as ZFS
+		err = utils.CopyDir(srcPath, dstPath)
-		PreserveTimes: true,
+	} else {
-		NumOfWorkers:  0, // Serialized copy without using goroutine
+		err = utils.CopyFile(srcPath, dstPath)
-	})
+	}
+	if err != nil {
+		return err
+	}
+	return nil
 }
 
 func (d *Local) Remove(ctx context.Context, obj model.Obj) error {

drivers/local/token_bucket.go

@@ -23,38 +23,6 @@ func NewStaticTokenBucket(size int) StaticTokenBucket {
 	return StaticTokenBucket{bucket: bucket}
 }
 
-func NewStaticTokenBucketWithMigration(oldBucket TokenBucket, size int) StaticTokenBucket {
-	if oldBucket != nil {
-		oldStaticBucket, ok := oldBucket.(StaticTokenBucket)
-		if ok {
-			oldSize := cap(oldStaticBucket.bucket)
-			migrateSize := oldSize
-			if size < migrateSize {
-				migrateSize = size
-			}
-
-			bucket := make(chan struct{}, size)
-			for range size - migrateSize {
-				bucket <- struct{}{}
-			}
-
-			if migrateSize != 0 {
-				go func() {
-					for range migrateSize {
-						<-oldStaticBucket.bucket
-						bucket <- struct{}{}
-					}
-					close(oldStaticBucket.bucket)
-				}()
-			}
-			return StaticTokenBucket{bucket: bucket}
-		}
-	}
-	return NewStaticTokenBucket(size)
-}
-
-// Take channel maybe closed when local driver is modified.
-// don't call Put method after the channel is closed.
 func (b StaticTokenBucket) Take() <-chan struct{} {
 	return b.bucket
 }
@@ -67,10 +35,8 @@ func (b StaticTokenBucket) Do(ctx context.Context, f func() error) error {
 	select {
 	case <-ctx.Done():
 		return ctx.Err()
-	case _, ok := <-b.Take():
+	case <-b.bucket:
-		if ok {
+		defer b.Put()
-			defer b.Put()
-		}
 	}
 	return f()
 }

drivers/terabox/driver.go

@@ -11,7 +11,6 @@ import (
 	stdpath "path"
 	"strconv"
 	"strings"
-	"time"
 
 	"github.com/alist-org/alist/v3/drivers/base"
 	"github.com/alist-org/alist/v3/pkg/utils"
@@ -24,9 +23,7 @@ import (
 type Terabox struct {
 	model.Storage
 	Addition
-	JsToken         string
+	JsToken string
-	url_domain_prefix string
-	base_url        string
 }
 
 func (d *Terabox) Config() driver.Config {
@@ -39,8 +36,6 @@ func (d *Terabox) GetAddition() driver.Additional {
 
 func (d *Terabox) Init(ctx context.Context) error {
 	var resp CheckLoginResp
-	d.base_url = "https://www.terabox.com"
-	d.url_domain_prefix = "jp"
 	_, err := d.get("/api/check/login", nil, &resp)
 	if err != nil {
 		return err
@@ -76,16 +71,7 @@ func (d *Terabox) Link(ctx context.Context, file model.Obj, args model.LinkArgs)
 }
 
 func (d *Terabox) MakeDir(ctx context.Context, parentDir model.Obj, dirName string) error {
-	params := map[string]string{
+	_, err := d.create(stdpath.Join(parentDir.GetPath(), dirName), 0, 1, "", "")
-		"a": "commit",
-	}
-	data := map[string]string{
-		"path":       stdpath.Join(parentDir.GetPath(), dirName),
-		"isdir":      "1",
-		"block_list": "[]",
-	}
-	res, err := d.post_form("/api/create", params, data, nil)
-	log.Debugln(string(res))
 	return err
 }
 
@@ -131,20 +117,6 @@ func (d *Terabox) Remove(ctx context.Context, obj model.Obj) error {
 }
 
 func (d *Terabox) Put(ctx context.Context, dstDir model.Obj, stream model.FileStreamer, up driver.UpdateProgress) error {
-	resp, err := base.RestyClient.R().
-		SetContext(ctx).
-		Get("https://" + d.url_domain_prefix + "-data.terabox.com/rest/2.0/pcs/file?method=locateupload")
-	if err != nil {
-		return err
-	}
-	var locateupload_resp LocateUploadResp
-	err = utils.Json.Unmarshal(resp.Body(), &locateupload_resp)
-	if err != nil {
-		log.Debugln(resp)
-		return err
-	}
-	log.Debugln(locateupload_resp)
-
 	tempFile, err := stream.CacheFullInTempFile()
 	if err != nil {
 		return err
@@ -185,28 +157,23 @@ func (d *Terabox) Put(ctx context.Context, dstDir model.Obj, stream model.FileSt
 	rawPath := stdpath.Join(dstDir.GetPath(), stream.GetName())
 	path := encodeURIComponent(rawPath)
 	block_list_str := fmt.Sprintf("[%s]", strings.Join(block_list, ","))
-	data := map[string]string{
+	data := fmt.Sprintf("path=%s&size=%d&isdir=0&autoinit=1&block_list=%s",
-		"path":        rawPath,
+		path, stream.GetSize(),
-		"autoinit":    "1",
+		block_list_str)
-		"target_path": dstDir.GetPath(),
+	params := map[string]string{}
-		"block_list":  block_list_str,
-		"local_mtime": strconv.FormatInt(time.Now().Unix(), 10),
-	}
 	var precreateResp PrecreateResp
-	log.Debugln(data)
+	_, err = d.post("/api/precreate", params, data, &precreateResp)
-	res, err := d.post_form("/api/precreate", nil, data, &precreateResp)
 	if err != nil {
 		return err
 	}
 	log.Debugf("%+v", precreateResp)
 	if precreateResp.Errno != 0 {
-		log.Debugln(string(res))
 		return fmt.Errorf("[terabox] failed to precreate file, errno: %d", precreateResp.Errno)
 	}
 	if precreateResp.ReturnType == 2 {
 		return nil
 	}
-	params := map[string]string{
+	params = map[string]string{
 		"method":     "upload",
 		"path":       path,
 		"uploadid":   precreateResp.Uploadid,
@@ -233,7 +200,7 @@ func (d *Terabox) Put(ctx context.Context, dstDir model.Obj, stream model.FileSt
 		if err != nil {
 			return err
 		}
-		u := "https://" + locateupload_resp.Host + "/rest/2.0/pcs/superfile2"
+		u := "https://c-jp.terabox.com/rest/2.0/pcs/superfile2"
 		params["partseq"] = strconv.Itoa(partseq)
 		res, err := base.RestyClient.R().
 			SetContext(ctx).
@@ -249,20 +216,7 @@ func (d *Terabox) Put(ctx context.Context, dstDir model.Obj, stream model.FileSt
 			up(float64(i) * 100 / float64(len(precreateResp.BlockList)))
 		}
 	}
-	params = map[string]string{
+	_, err = d.create(rawPath, stream.GetSize(), 0, precreateResp.Uploadid, block_list_str)
-		"isdir": "0",
-		"rtype": "1",
-	}
-	data = map[string]string{
-		"path":        rawPath,
-		"size":        strconv.FormatInt(stream.GetSize(), 10),
-		"uploadid":    precreateResp.Uploadid,
-		"target_path": dstDir.GetPath(),
-		"block_list":  block_list_str,
-		"local_mtime": strconv.FormatInt(time.Now().Unix(), 10),
-	}
-	res, err = d.post_form("/api/create", params, data, nil)
-	log.Debugln(string(res))
 	return err
 }
 

drivers/terabox/types.go

@@ -95,7 +95,3 @@ type PrecreateResp struct {
 type CheckLoginResp struct {
 	Errno int `json:"errno"`
 }
-
-type LocateUploadResp struct {
-	Host string `json:"host"`
-}

drivers/terabox/util.go

@@ -14,7 +14,6 @@ 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 getStrBetween(raw, start, end string) string {
@@ -29,11 +28,11 @@ func getStrBetween(raw, start, end string) string {
 }
 
 func (d *Terabox) resetJsToken() error {
-	u := d.base_url
+	u := "https://www.terabox.com/main"
 	res, err := base.RestyClient.R().SetHeaders(map[string]string{
 		"Cookie":           d.Cookie,
 		"Accept":           "application/json, text/plain, */*",
-		"Referer":          d.base_url,
+		"Referer":          "https://www.terabox.com/",
 		"User-Agent":       base.UserAgent,
 		"X-Requested-With": "XMLHttpRequest",
 	}).Get(u)
@@ -49,12 +48,12 @@ func (d *Terabox) resetJsToken() error {
 	return nil
 }
 
-func (d *Terabox) request(rurl string, method string, callback base.ReqCallback, resp interface{}, noRetry ...bool) ([]byte, error) {
+func (d *Terabox) request(furl string, method string, callback base.ReqCallback, resp interface{}, noRetry ...bool) ([]byte, error) {
 	req := base.RestyClient.R()
 	req.SetHeaders(map[string]string{
 		"Cookie":           d.Cookie,
 		"Accept":           "application/json, text/plain, */*",
-		"Referer":          d.base_url,
+		"Referer":          "https://www.terabox.com/",
 		"User-Agent":       base.UserAgent,
 		"X-Requested-With": "XMLHttpRequest",
 	})
@@ -71,7 +70,7 @@ func (d *Terabox) request(rurl string, method string, callback base.ReqCallback,
 	if resp != nil {
 		req.SetResult(resp)
 	}
-	res, err := req.Execute(method, d.base_url+rurl)
+	res, err := req.Execute(method, furl)
 	if err != nil {
 		return nil, err
 	}
@@ -83,20 +82,14 @@ func (d *Terabox) request(rurl string, method string, callback base.ReqCallback,
 			return nil, err
 		}
 		if !utils.IsBool(noRetry...) {
-			return d.request(rurl, method, callback, resp, true)
+			return d.request(furl, method, callback, resp, true)
 		}
-	} else if errno == -6 {
-		log.Debugln(res.Header())
-		d.url_domain_prefix = res.Header()["Url-Domain-Prefix"][0]
-		d.base_url = "https://" + d.url_domain_prefix + ".terabox.com"
-		log.Debugln("Redirect base_url to", d.base_url)
-		return d.request(rurl, method, callback, resp, noRetry...)
 	}
 	return res.Body(), nil
 }
 
 func (d *Terabox) get(pathname string, params map[string]string, resp interface{}) ([]byte, error) {
-	return d.request(pathname, http.MethodGet, func(req *resty.Request) {
+	return d.request("https://www.terabox.com"+pathname, http.MethodGet, func(req *resty.Request) {
 		if params != nil {
 			req.SetQueryParams(params)
 		}
@@ -104,7 +97,7 @@ func (d *Terabox) get(pathname string, params map[string]string, resp interface{
 }
 
 func (d *Terabox) post(pathname string, params map[string]string, data interface{}, resp interface{}) ([]byte, error) {
-	return d.request(pathname, http.MethodPost, func(req *resty.Request) {
+	return d.request("https://www.terabox.com"+pathname, http.MethodPost, func(req *resty.Request) {
 		if params != nil {
 			req.SetQueryParams(params)
 		}
@@ -112,15 +105,6 @@ func (d *Terabox) post(pathname string, params map[string]string, data interface
 	}, resp)
 }
 
-func (d *Terabox) post_form(pathname string, params map[string]string, data map[string]string, resp interface{}) ([]byte, error) {
-	return d.request(pathname, http.MethodPost, func(req *resty.Request) {
-		if params != nil {
-			req.SetQueryParams(params)
-		}
-		req.SetFormData(data)
-	}, resp)
-}
-
 func (d *Terabox) getFiles(dir string) ([]File, error) {
 	page := 1
 	num := 100
@@ -253,6 +237,15 @@ func (d *Terabox) manage(opera string, filelist interface{}) ([]byte, error) {
 	return d.post("/api/filemanager", params, data, nil)
 }
 
+func (d *Terabox) create(path string, size int64, isdir int, uploadid, block_list string) ([]byte, error) {
+	params := map[string]string{}
+	data := fmt.Sprintf("path=%s&size=%d&isdir=%d", encodeURIComponent(path), size, isdir)
+	if uploadid != "" {
+		data += fmt.Sprintf("&uploadid=%s&block_list=%s", uploadid, block_list)
+	}
+	return d.post("/api/create", params, data, nil)
+}
+
 func encodeURIComponent(str string) string {
 	r := url.QueryEscape(str)
 	r = strings.ReplaceAll(r, "+", "%20")

go.mod

@@ -3,7 +3,7 @@ module github.com/alist-org/alist/v3
 go 1.22.4
 
 require (
-	github.com/SheltonZhu/115driver v1.0.29
+	github.com/SheltonZhu/115driver v1.0.27
 	github.com/Xhofe/go-cache v0.0.0-20240804043513-b1a71927bc21
 	github.com/Xhofe/rateg v0.0.0-20230728072201-251a4e1adad4
 	github.com/alist-org/gofakes3 v0.0.7
@@ -13,7 +13,7 @@ require (
 	github.com/aws/aws-sdk-go v1.55.5
 	github.com/blevesearch/bleve/v2 v2.4.2
 	github.com/caarlos0/env/v9 v9.0.0
-	github.com/charmbracelet/bubbles v0.20.0
+	github.com/charmbracelet/bubbles v0.19.0
 	github.com/charmbracelet/bubbletea v1.1.0
 	github.com/charmbracelet/lipgloss v0.13.0
 	github.com/city404/v6-public-rpc-proto/go v0.0.0-20240817070657-90f8e24b653e
@@ -33,7 +33,6 @@ require (
 	github.com/golang-jwt/jwt/v4 v4.5.0
 	github.com/google/uuid v1.6.0
 	github.com/gorilla/websocket v1.5.3
-	github.com/hekmon/transmissionrpc/v3 v3.0.0
 	github.com/hirochachacha/go-smb2 v1.1.0
 	github.com/ipfs/go-ipfs-api v0.7.0
 	github.com/jlaffaye/ftp v0.2.0
@@ -56,7 +55,7 @@ require (
 	github.com/u2takey/ffmpeg-go v0.5.0
 	github.com/upyun/go-sdk/v3 v3.0.4
 	github.com/winfsp/cgofuse v1.5.1-0.20230130140708-f87f5db493b5
-	github.com/xhofe/tache v0.1.3
+	github.com/xhofe/tache v0.1.2
 	github.com/xhofe/wopan-sdk-go v0.1.3
 	github.com/zzzhr1990/go-common-entity v0.0.0-20221216044934-fd1c571e3a22
 	golang.org/x/crypto v0.27.0
@@ -70,7 +69,7 @@ require (
 	gorm.io/driver/mysql v1.5.7
 	gorm.io/driver/postgres v1.5.9
 	gorm.io/driver/sqlite v1.5.6
-	gorm.io/gorm v1.25.11
+	gorm.io/gorm v1.25.12
 )
 
 require (
@@ -83,8 +82,6 @@ require (
 	github.com/cloudwego/base64x v0.1.4 // indirect
 	github.com/cloudwego/iasm v0.2.0 // indirect
 	github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect
-	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
-	github.com/hekmon/cunits/v2 v2.1.0 // indirect
 	github.com/ipfs/boxo v0.12.0 // indirect
 	github.com/jackc/puddle/v2 v2.2.1 // indirect
 )
@@ -189,7 +186,6 @@ require (
 	github.com/multiformats/go-multihash v0.2.3 // indirect
 	github.com/multiformats/go-multistream v0.4.1 // indirect
 	github.com/multiformats/go-varint v0.0.7 // indirect
-	github.com/otiai10/copy v1.14.0
 	github.com/pelletier/go-toml/v2 v2.2.2 // indirect
 	github.com/pierrec/lz4/v4 v4.1.18 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect

go.sum

@@ -7,8 +7,8 @@ github.com/Max-Sum/base32768 v0.0.0-20230304063302-18e6ce5945fd h1:nzE1YQBdx1bq9
 github.com/Max-Sum/base32768 v0.0.0-20230304063302-18e6ce5945fd/go.mod h1:C8yoIfvESpM3GD07OCHU7fqI7lhwyZ2Td1rbNbTAhnc=
 github.com/RoaringBitmap/roaring v1.9.3 h1:t4EbC5qQwnisr5PrP9nt0IRhRTb9gMUgQF4t4S2OByM=
 github.com/RoaringBitmap/roaring v1.9.3/go.mod h1:6AXUsoIEzDTFFQCe1RbGA6uFONMhvejWj5rqITANK90=
-github.com/SheltonZhu/115driver v1.0.29 h1:yFBqFDYJyADo3eG2RjJgSovnFd1OrpGHmsHBi6j0+r4=
+github.com/SheltonZhu/115driver v1.0.27 h1:Ya1HYHYXFmi7JnqQ/+Vy6xZvq3leto+E+PxTm6UChj8=
-github.com/SheltonZhu/115driver v1.0.29/go.mod h1:e3fPOBANbH/FsTya8FquJwOR3ErhCQgEab3q6CVY2k4=
+github.com/SheltonZhu/115driver v1.0.27/go.mod h1:e3fPOBANbH/FsTya8FquJwOR3ErhCQgEab3q6CVY2k4=
 github.com/Unknwon/goconfig v1.0.0 h1:9IAu/BYbSLQi8puFjUQApZTxIHqSwrj5d8vpP8vTq4A=
 github.com/Unknwon/goconfig v1.0.0/go.mod h1:wngxua9XCNjvHjDiTiV26DaKDT+0c63QR6H5hjVUUxw=
 github.com/Xhofe/go-cache v0.0.0-20240804043513-b1a71927bc21 h1:h6q5E9aMBhhdqouW81LozVPI1I+Pu6IxL2EKpfm5OjY=
@@ -96,8 +96,8 @@ github.com/caarlos0/env/v9 v9.0.0 h1:SI6JNsOA+y5gj9njpgybykATIylrRMklbs5ch6wO6pc
 github.com/caarlos0/env/v9 v9.0.0/go.mod h1:ye5mlCVMYh6tZ+vCgrs/B95sj88cg5Tlnc0XIzgZ020=
 github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
 github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/charmbracelet/bubbles v0.20.0 h1:jSZu6qD8cRQ6k9OMfR1WlM+ruM8fkPWkHvQWD9LIutE=
+github.com/charmbracelet/bubbles v0.19.0 h1:gKZkKXPP6GlDk6EcfujDK19PCQqRjaJZQ7QRERx1UF0=
-github.com/charmbracelet/bubbles v0.20.0/go.mod h1:39slydyswPy+uVOHZ5x/GjwVAFkCsV8IIVy+4MhzwwU=
+github.com/charmbracelet/bubbles v0.19.0/go.mod h1:WILteEqZ+krG5c3ntGEMeG99nCupcuIk7V0/zOP0tOA=
 github.com/charmbracelet/bubbletea v1.1.0 h1:FjAl9eAL3HBCHenhz/ZPjkKdScmaS5SK69JAK2YJK9c=
 github.com/charmbracelet/bubbletea v1.1.0/go.mod h1:9Ogk0HrdbHolIKHdjfFpyXJmiCzGwy+FesYkZr7hYU4=
 github.com/charmbracelet/lipgloss v0.13.0 h1:4X3PPeoWEDCMvzDvGmTajSyYPcZM4+y8sCA/SsA3cjw=
@@ -240,17 +240,11 @@ github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/ad
 github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
 github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
-github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=
-github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=
 github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
 github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
 github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek=
 github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
 github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
-github.com/hekmon/cunits/v2 v2.1.0 h1:k6wIjc4PlacNOHwKEMBgWV2/c8jyD4eRMs5mR1BBhI0=
-github.com/hekmon/cunits/v2 v2.1.0/go.mod h1:9r1TycXYXaTmEWlAIfFV8JT+Xo59U96yUJAYHxzii2M=
-github.com/hekmon/transmissionrpc/v3 v3.0.0 h1:0Fb11qE0IBh4V4GlOwHNYpqpjcYDp5GouolwrpmcUDQ=
-github.com/hekmon/transmissionrpc/v3 v3.0.0/go.mod h1:38SlNhFzinVUuY87wGj3acOmRxeYZAZfrj6Re7UgCDg=
 github.com/hirochachacha/go-smb2 v1.1.0 h1:b6hs9qKIql9eVXAiN0M2wSFY5xnhbHAQoCwRKbaRTZI=
 github.com/hirochachacha/go-smb2 v1.1.0/go.mod h1:8F1A4d5EZzrGu5R7PU163UcMRDJQl4FtcxjBfsY8TZE=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
@@ -391,8 +385,6 @@ github.com/ncw/swift/v2 v2.0.3 h1:8R9dmgFIWs+RiVlisCEfiQiik1hjuR0JnOkLxaP9ihg=
 github.com/ncw/swift/v2 v2.0.3/go.mod h1:cbAO76/ZwcFrFlHdXPjaqWZ9R7Hdar7HpjRXBfbjigk=
 github.com/orzogc/fake115uploader v0.3.3-0.20230715111618-58f9eb76f831 h1:K3T3eu4h5aYIOzUtLjN08L4Qt4WGaJONMgcaD0ayBJQ=
 github.com/orzogc/fake115uploader v0.3.3-0.20230715111618-58f9eb76f831/go.mod h1:lSHD4lC4zlMl+zcoysdJcd5KFzsWwOD8BJbyg1Ws9Ng=
-github.com/otiai10/copy v1.14.0 h1:dCI/t1iTdYGtkvCuBG2BgR6KZa83PTclw4U5n2wAllU=
-github.com/otiai10/copy v1.14.0/go.mod h1:ECfuL02W+/FkTWZWgQqXPWZgW9oeKCSQ5qVfSc4qc4w=
 github.com/panjf2000/ants/v2 v2.4.2/go.mod h1:f6F0NZVFsGCp5A7QW/Zj/m92atWwOkY0OIhFxRNFr4A=
 github.com/pelletier/go-toml/v2 v2.0.1/go.mod h1:r9LEWfGN8R5k0VXJ+0BkIe7MYkRdwZOjgMj2KwnJFUo=
 github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM=
@@ -514,8 +506,6 @@ github.com/xhofe/gsync v0.0.0-20230917091818-2111ceb38a25 h1:eDfebW/yfq9DtG9RO3K
 github.com/xhofe/gsync v0.0.0-20230917091818-2111ceb38a25/go.mod h1:fH4oNm5F9NfI5dLi0oIMtsLNKQOirUDbEMCIBb/7SU0=
 github.com/xhofe/tache v0.1.2 h1:pHrXlrWcbTb4G7hVUDW7Rc+YTUnLJvnLBrdktVE1Fqg=
 github.com/xhofe/tache v0.1.2/go.mod h1:iKumPFvywf30FRpAHHCt64G0JHLMzT0K+wyGedHsmTQ=
-github.com/xhofe/tache v0.1.3 h1:MipxzlljYX29E1YI/SLC7hVomVF+51iP1OUzlsuq1wE=
-github.com/xhofe/tache v0.1.3/go.mod h1:iKumPFvywf30FRpAHHCt64G0JHLMzT0K+wyGedHsmTQ=
 github.com/xhofe/wopan-sdk-go v0.1.3 h1:J58X6v+n25ewBZjb05pKOr7AWGohb+Rdll4CThGh6+A=
 github.com/xhofe/wopan-sdk-go v0.1.3/go.mod h1:dcY9yA28fnaoZPnXZiVTFSkcd7GnIPTpTIIlfSI5z5Q=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
@@ -556,6 +546,8 @@ golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliY
 golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
 golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
 golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M=
+golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw=
+golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54=
 golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A=
 golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70=
 golang.org/x/exp v0.0.0-20240904232852-e7e105dedf7e h1:I88y4caeGeuDQxgdoFPUq097j7kNfw6uvuiNxUBfcBk=
@@ -632,6 +624,8 @@ golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg=
+golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
 golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE=
@@ -644,6 +638,8 @@ golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
 golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
 golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
 golang.org/x/term v0.22.0/go.mod h1:F3qCibpT5AMpCRfhfT53vVJwhLtIVHhB9XDjfFvnMI4=
+golang.org/x/term v0.23.0 h1:F6D4vR+EHoL9/sWAWgAR1H2DcHr4PareCbAaCo1RpuU=
+golang.org/x/term v0.23.0/go.mod h1:DgV24QBUrK6jhZXl+20l6UWznPlwAHm1Q1mGHtydmSk=
 golang.org/x/term v0.24.0 h1:Mh5cbb+Zk2hqqXNO7S1iTjEphVL+jb8ZWaqh/g+JWkM=
 golang.org/x/term v0.24.0/go.mod h1:lOBK/LVxemqiMij05LGJ0tzNr8xlmwBRJ81PX6wVLH8=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -659,6 +655,8 @@ golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
+golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc=
+golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
 golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224=
 golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -725,6 +723,8 @@ gorm.io/driver/sqlite v1.5.6/go.mod h1:U+J8craQU6Fzkcvu8oLeAQmi50TkwPEhHDEjQZXDa
 gorm.io/gorm v1.25.7/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8=
 gorm.io/gorm v1.25.11 h1:/Wfyg1B/je1hnDx3sMkX+gAlxrlZpn6X0BXRlwXlvHg=
 gorm.io/gorm v1.25.11/go.mod h1:xh7N7RHfYlNc5EmcI/El95gXusucDrQnHXe0+CgWcLQ=
+gorm.io/gorm v1.25.12 h1:I0u8i2hWQItBq1WfE0o2+WuL9+8L21K9e2HHSTE/0f8=
+gorm.io/gorm v1.25.12/go.mod h1:xh7N7RHfYlNc5EmcI/El95gXusucDrQnHXe0+CgWcLQ=
 lukechampine.com/blake3 v1.1.7 h1:GgRMhmdsuK8+ii6UZFDL8Nb+VyMwadAgcJyfYHxG6n0=
 lukechampine.com/blake3 v1.1.7/go.mod h1:tkKEOtDkNtklkXtLNEOGNq5tcV90tJiA1vAA12R78LA=
 nullprogram.com/x/optparse v1.0.0/go.mod h1:KdyPE+Igbe0jQUrVfMqDMeJQIJZEuyV7pjYmp6pbG50=

internal/conf/const.go

@@ -54,15 +54,11 @@ const (
 	Aria2Uri    = "aria2_uri"
 	Aria2Secret = "aria2_secret"
 
-	// transmission
-	TransmissionUri      = "transmission_uri"
-	TransmissionSeedtime = "transmission_seedtime"
-
 	// single
 	Token         = "token"
 	IndexProgress = "index_progress"
 
-	// SSO
+	//SSO
 	SSOClientId          = "sso_client_id"
 	SSOClientSecret      = "sso_client_secret"
 	SSOLoginEnabled      = "sso_login_enabled"
@@ -77,7 +73,7 @@ const (
 	SSODefaultPermission = "sso_default_permission"
 	SSOCompatibilityMode = "sso_compatibility_mode"
 
-	// ldap
+	//ldap
 	LdapLoginEnabled      = "ldap_login_enabled"
 	LdapServer            = "ldap_server"
 	LdapManagerDN         = "ldap_manager_dn"
@@ -88,7 +84,7 @@ const (
 	LdapDefaultDir        = "ldap_default_dir"
 	LdapLoginTips         = "ldap_login_tips"
 
-	// s3
+	//s3
 	S3Buckets         = "s3_buckets"
 	S3AccessKeyId     = "s3_access_key_id"
 	S3SecretAccessKey = "s3_secret_access_key"
@@ -101,7 +97,7 @@ const (
 const (
 	UNKNOWN = iota
 	FOLDER
-	// OFFICE
+	//OFFICE
 	VIDEO
 	AUDIO
 	TEXT

internal/fs/copy.go

@@ -11,14 +11,13 @@ import (
 	"github.com/alist-org/alist/v3/internal/model"
 	"github.com/alist-org/alist/v3/internal/op"
 	"github.com/alist-org/alist/v3/internal/stream"
-	"github.com/alist-org/alist/v3/internal/task"
 	"github.com/alist-org/alist/v3/pkg/utils"
 	"github.com/pkg/errors"
 	"github.com/xhofe/tache"
 )
 
 type CopyTask struct {
-	task.TaskWithCreator
+	tache.Base
 	Status       string        `json:"-"` //don't save status to save space
 	SrcObjPath   string        `json:"src_path"`
 	DstDirPath   string        `json:"dst_path"`
@@ -54,7 +53,7 @@ var CopyTaskManager *tache.Manager[*CopyTask]
 
 // Copy if in the same storage, call move method
 // if not, add copy task
-func _copy(ctx context.Context, srcObjPath, dstDirPath string, lazyCache ...bool) (task.TaskInfoWithCreator, error) {
+func _copy(ctx context.Context, srcObjPath, dstDirPath string, lazyCache ...bool) (tache.TaskWithInfo, error) {
 	srcStorage, srcObjActualPath, err := op.GetStorageAndActualPath(srcObjPath)
 	if err != nil {
 		return nil, errors.WithMessage(err, "failed get src storage")
@@ -93,11 +92,7 @@ func _copy(ctx context.Context, srcObjPath, dstDirPath string, lazyCache ...bool
 		}
 	}
 	// not in the same storage
-	taskCreator, _ := ctx.Value("user").(*model.User) // taskCreator is nil when convert failed
 	t := &CopyTask{
-		TaskWithCreator: task.TaskWithCreator{
-			Creator: taskCreator,
-		},
 		srcStorage:   srcStorage,
 		dstStorage:   dstStorage,
 		SrcObjPath:   srcObjActualPath,
@@ -128,9 +123,6 @@ func copyBetween2Storages(t *CopyTask, srcStorage, dstStorage driver.Driver, src
 			srcObjPath := stdpath.Join(srcObjPath, obj.GetName())
 			dstObjPath := stdpath.Join(dstDirPath, srcObj.GetName())
 			CopyTaskManager.Add(&CopyTask{
-				TaskWithCreator: task.TaskWithCreator{
-					Creator: t.Creator,
-				},
 				srcStorage:   srcStorage,
 				dstStorage:   dstStorage,
 				SrcObjPath:   srcObjPath,

internal/fs/fs.go

@@ -5,8 +5,8 @@ import (
 	"github.com/alist-org/alist/v3/internal/driver"
 	"github.com/alist-org/alist/v3/internal/model"
 	"github.com/alist-org/alist/v3/internal/op"
-	"github.com/alist-org/alist/v3/internal/task"
 	log "github.com/sirupsen/logrus"
+	"github.com/xhofe/tache"
 )
 
 // the param named path of functions in this package is a mount path
@@ -69,7 +69,7 @@ func Move(ctx context.Context, srcPath, dstDirPath string, lazyCache ...bool) er
 	return err
 }
 
-func Copy(ctx context.Context, srcObjPath, dstDirPath string, lazyCache ...bool) (task.TaskInfoWithCreator, error) {
+func Copy(ctx context.Context, srcObjPath, dstDirPath string, lazyCache ...bool) (tache.TaskWithInfo, error) {
 	res, err := _copy(ctx, srcObjPath, dstDirPath, lazyCache...)
 	if err != nil {
 		log.Errorf("failed copy %s to %s: %+v", srcObjPath, dstDirPath, err)
@@ -101,8 +101,8 @@ func PutDirectly(ctx context.Context, dstDirPath string, file model.FileStreamer
 	return err
 }
 
-func PutAsTask(ctx context.Context, dstDirPath string, file model.FileStreamer) (task.TaskInfoWithCreator, error) {
+func PutAsTask(dstDirPath string, file model.FileStreamer) (tache.TaskWithInfo, error) {
-	t, err := putAsTask(ctx, dstDirPath, file)
+	t, err := putAsTask(dstDirPath, file)
 	if err != nil {
 		log.Errorf("failed put %s: %+v", dstDirPath, err)
 	}

internal/fs/put.go

@@ -7,13 +7,12 @@ import (
 	"github.com/alist-org/alist/v3/internal/errs"
 	"github.com/alist-org/alist/v3/internal/model"
 	"github.com/alist-org/alist/v3/internal/op"
-	"github.com/alist-org/alist/v3/internal/task"
 	"github.com/pkg/errors"
 	"github.com/xhofe/tache"
 )
 
 type UploadTask struct {
-	task.TaskWithCreator
+	tache.Base
 	storage          driver.Driver
 	dstDirActualPath string
 	file             model.FileStreamer
@@ -34,7 +33,7 @@ func (t *UploadTask) Run() error {
 var UploadTaskManager *tache.Manager[*UploadTask]
 
 // putAsTask add as a put task and return immediately
-func putAsTask(ctx context.Context, dstDirPath string, file model.FileStreamer) (task.TaskInfoWithCreator, error) {
+func putAsTask(dstDirPath string, file model.FileStreamer) (tache.TaskWithInfo, error) {
 	storage, dstDirActualPath, err := op.GetStorageAndActualPath(dstDirPath)
 	if err != nil {
 		return nil, errors.WithMessage(err, "failed get storage")
@@ -50,11 +49,7 @@ func putAsTask(ctx context.Context, dstDirPath string, file model.FileStreamer)
 		//file.SetReader(tempFile)
 		//file.SetTmpFile(tempFile)
 	}
-	taskCreator, _ := ctx.Value("user").(*model.User) // taskCreator is nil when convert failed
 	t := &UploadTask{
-		TaskWithCreator: task.TaskWithCreator{
-			Creator: taskCreator,
-		},
 		storage:          storage,
 		dstDirActualPath: dstDirActualPath,
 		file:             file,

internal/offline_download/all.go

@@ -6,5 +6,4 @@ import (
 	_ "github.com/alist-org/alist/v3/internal/offline_download/http"
 	_ "github.com/alist-org/alist/v3/internal/offline_download/pikpak"
 	_ "github.com/alist-org/alist/v3/internal/offline_download/qbit"
-	_ "github.com/alist-org/alist/v3/internal/offline_download/transmission"
 )

internal/offline_download/tool/add.go

@@ -2,8 +2,6 @@ package tool
 
 import (
 	"context"
-	"github.com/alist-org/alist/v3/internal/model"
-	"github.com/alist-org/alist/v3/internal/task"
 	"path/filepath"
 
 	"github.com/alist-org/alist/v3/internal/conf"
@@ -11,6 +9,7 @@ import (
 	"github.com/alist-org/alist/v3/internal/op"
 	"github.com/google/uuid"
 	"github.com/pkg/errors"
+	"github.com/xhofe/tache"
 )
 
 type DeletePolicy string
@@ -29,7 +28,7 @@ type AddURLArgs struct {
 	DeletePolicy DeletePolicy
 }
 
-func AddURL(ctx context.Context, args *AddURLArgs) (task.TaskInfoWithCreator, error) {
+func AddURL(ctx context.Context, args *AddURLArgs) (tache.TaskWithInfo, error) {
 	// get tool
 	tool, err := Tools.Get(args.Tool)
 	if err != nil {
@@ -78,12 +77,8 @@ func AddURL(ctx context.Context, args *AddURLArgs) (task.TaskInfoWithCreator, er
 		// 防止将下载好的文件删除
 		deletePolicy = DeleteNever
 	}
-
+	
-	taskCreator, _ := ctx.Value("user").(*model.User) // taskCreator is nil when convert failed
 	t := &DownloadTask{
-		TaskWithCreator: task.TaskWithCreator{
-			Creator: taskCreator,
-		},
 		Url:          args.URL,
 		DstDirPath:   args.DstDirPath,
 		TempDir:      tempDir,

internal/offline_download/tool/download.go

@@ -7,14 +7,13 @@ import (
 	"github.com/alist-org/alist/v3/internal/conf"
 	"github.com/alist-org/alist/v3/internal/errs"
 	"github.com/alist-org/alist/v3/internal/setting"
-	"github.com/alist-org/alist/v3/internal/task"
 	"github.com/pkg/errors"
 	log "github.com/sirupsen/logrus"
 	"github.com/xhofe/tache"
 )
 
 type DownloadTask struct {
-	task.TaskWithCreator
+	tache.Base
 	Url               string       `json:"url"`
 	DstDirPath        string       `json:"dst_dir_path"`
 	TempDir           string       `json:"temp_dir"`
@@ -102,19 +101,6 @@ outer:
 			}
 		}
 	}
-
-	if t.tool.Name() == "transmission" {
-		// hack for transmission
-		seedTime := setting.GetInt(conf.TransmissionSeedtime, 0)
-		if seedTime >= 0 {
-			t.Status = "offline download completed, waiting for seeding"
-			<-time.After(time.Minute * time.Duration(seedTime))
-			err := t.tool.Remove(t)
-			if err != nil {
-				log.Errorln(err.Error())
-			}
-		}
-	}
 	return nil
 }
 
@@ -172,9 +158,6 @@ func (t *DownloadTask) Complete() error {
 	for i := range files {
 		file := files[i]
 		TransferTaskManager.Add(&TransferTask{
-			TaskWithCreator: task.TaskWithCreator{
-				Creator: t.Creator,
-			},
 			file:         file,
 			DstDirPath:   t.DstDirPath,
 			TempDir:      t.TempDir,

internal/offline_download/tool/transfer.go

@@ -8,7 +8,6 @@ import (
 	"github.com/alist-org/alist/v3/internal/model"
 	"github.com/alist-org/alist/v3/internal/op"
 	"github.com/alist-org/alist/v3/internal/stream"
-	"github.com/alist-org/alist/v3/internal/task"
 	"github.com/alist-org/alist/v3/pkg/utils"
 	"github.com/pkg/errors"
 	log "github.com/sirupsen/logrus"
@@ -16,7 +15,7 @@ import (
 )
 
 type TransferTask struct {
-	task.TaskWithCreator
+	tache.Base
 	FileDir      string       `json:"file_dir"`
 	DstDirPath   string       `json:"dst_dir_path"`
 	TempDir      string       `json:"temp_dir"`

internal/offline_download/transmission/client.go

@@ -1,176 +0,0 @@
-package transmission
-
-import (
-	"bytes"
-	"context"
-	"encoding/base64"
-	"fmt"
-	"io"
-	"net/http"
-	"net/url"
-	"strconv"
-
-	"github.com/alist-org/alist/v3/internal/conf"
-	"github.com/alist-org/alist/v3/internal/errs"
-	"github.com/alist-org/alist/v3/internal/model"
-	"github.com/alist-org/alist/v3/internal/offline_download/tool"
-	"github.com/alist-org/alist/v3/internal/setting"
-	"github.com/hekmon/transmissionrpc/v3"
-	"github.com/pkg/errors"
-	log "github.com/sirupsen/logrus"
-)
-
-type Transmission struct {
-	client *transmissionrpc.Client
-}
-
-func (t *Transmission) Run(task *tool.DownloadTask) error {
-	return errs.NotSupport
-}
-
-func (t *Transmission) Name() string {
-	return "transmission"
-}
-
-func (t *Transmission) Items() []model.SettingItem {
-	// transmission settings
-	return []model.SettingItem{
-		{Key: conf.TransmissionUri, Value: "http://localhost:9091/transmission/rpc", Type: conf.TypeString, Group: model.OFFLINE_DOWNLOAD, Flag: model.PRIVATE},
-		{Key: conf.TransmissionSeedtime, Value: "0", Type: conf.TypeNumber, Group: model.OFFLINE_DOWNLOAD, Flag: model.PRIVATE},
-	}
-}
-
-func (t *Transmission) Init() (string, error) {
-	t.client = nil
-	uri := setting.GetStr(conf.TransmissionUri)
-	endpoint, err := url.Parse(uri)
-	if err != nil {
-		return "", errors.Wrap(err, "failed to init transmission client")
-	}
-	c, err := transmissionrpc.New(endpoint, nil)
-	if err != nil {
-		return "", errors.Wrap(err, "failed to init transmission client")
-	}
-
-	ok, serverVersion, serverMinimumVersion, err := c.RPCVersion(context.Background())
-	if err != nil {
-		return "", errors.Wrapf(err, "failed get transmission version")
-	}
-
-	if !ok {
-		return "", fmt.Errorf("remote transmission RPC version (v%d) is incompatible with the transmission library (v%d): remote needs at least v%d",
-			serverVersion, transmissionrpc.RPCVersion, serverMinimumVersion)
-	}
-
-	t.client = c
-	log.Infof("remote transmission RPC version (v%d) is compatible with our transmissionrpc library (v%d)\n",
-		serverVersion, transmissionrpc.RPCVersion)
-	log.Infof("using transmission version: %d", serverVersion)
-	return fmt.Sprintf("transmission version: %d", serverVersion), nil
-}
-
-func (t *Transmission) IsReady() bool {
-	return t.client != nil
-}
-
-func (t *Transmission) AddURL(args *tool.AddUrlArgs) (string, error) {
-	endpoint, err := url.Parse(args.Url)
-	if err != nil {
-		return "", errors.Wrap(err, "failed to parse transmission uri")
-	}
-
-	rpcPayload := transmissionrpc.TorrentAddPayload{
-		DownloadDir: &args.TempDir,
-	}
-	// http url for .torrent file
-	if endpoint.Scheme == "http" || endpoint.Scheme == "https" {
-		resp, err := http.Get(args.Url)
-		if err != nil {
-			return "", errors.Wrap(err, "failed to get .torrent file")
-		}
-		defer resp.Body.Close()
-		buffer := new(bytes.Buffer)
-		encoder := base64.NewEncoder(base64.StdEncoding, buffer)
-		// Stream file to the encoder
-		if _, err = io.Copy(encoder, resp.Body); err != nil {
-			return "", errors.Wrap(err, "can't copy file content into the base64 encoder")
-		}
-		// Flush last bytes
-		if err = encoder.Close(); err != nil {
-			return "", errors.Wrap(err, "can't flush last bytes of the base64 encoder")
-		}
-		// Get the string form
-		b64 := buffer.String()
-		rpcPayload.MetaInfo = &b64
-	} else { // magnet uri
-		rpcPayload.Filename = &args.Url
-	}
-
-	torrent, err := t.client.TorrentAdd(context.TODO(), rpcPayload)
-	if err != nil {
-		return "", err
-	}
-
-	if torrent.ID == nil {
-		return "", fmt.Errorf("failed get torrent ID")
-	}
-	gid := strconv.FormatInt(*torrent.ID, 10)
-	return gid, nil
-}
-
-func (t *Transmission) Remove(task *tool.DownloadTask) error {
-	gid, err := strconv.ParseInt(task.GID, 10, 64)
-	if err != nil {
-		return err
-	}
-	err = t.client.TorrentRemove(context.TODO(), transmissionrpc.TorrentRemovePayload{
-		IDs:             []int64{gid},
-		DeleteLocalData: false,
-	})
-	return err
-}
-
-func (t *Transmission) Status(task *tool.DownloadTask) (*tool.Status, error) {
-	gid, err := strconv.ParseInt(task.GID, 10, 64)
-	if err != nil {
-		return nil, err
-	}
-	infos, err := t.client.TorrentGetAllFor(context.TODO(), []int64{gid})
-	if err != nil {
-		return nil, err
-	}
-
-	if len(infos) < 1 {
-		return nil, fmt.Errorf("failed get status, wrong gid: %s", task.GID)
-	}
-	info := infos[0]
-
-	s := &tool.Status{
-		Completed: *info.IsFinished,
-		Err:       err,
-	}
-	s.Progress = *info.PercentDone * 100
-
-	switch *info.Status {
-	case transmissionrpc.TorrentStatusCheckWait,
-		transmissionrpc.TorrentStatusDownloadWait,
-		transmissionrpc.TorrentStatusCheck,
-		transmissionrpc.TorrentStatusDownload,
-		transmissionrpc.TorrentStatusIsolated:
-		s.Status = "[transmission] " + info.Status.String()
-	case transmissionrpc.TorrentStatusSeedWait,
-		transmissionrpc.TorrentStatusSeed:
-		s.Completed = true
-	case transmissionrpc.TorrentStatusStopped:
-		s.Err = errors.Errorf("[transmission] failed to download %s, status: %s, error: %s", task.GID, info.Status.String(), *info.ErrorString)
-	default:
-		s.Err = errors.Errorf("[transmission] unknown status occurred downloading %s, err: %s", task.GID, *info.ErrorString)
-	}
-	return s, nil
-}
-
-var _ tool.Tool = (*Transmission)(nil)
-
-func init() {
-	tool.Tools.Add(&Transmission{})
-}

internal/op/storage.go

@@ -2,8 +2,6 @@ package op
 
 import (
 	"context"
-	"fmt"
-	"runtime"
 	"sort"
 	"strings"
 	"time"
@@ -85,25 +83,11 @@ func LoadStorage(ctx context.Context, storage model.Storage) error {
 	return err
 }
 
-func getCurrentGoroutineStack() string {
-	buf := make([]byte, 1<<16)
-	n := runtime.Stack(buf, false)
-	return string(buf[:n])
-}
-
 // initStorage initialize the driver and store to storagesMap
 func initStorage(ctx context.Context, storage model.Storage, storageDriver driver.Driver) (err error) {
 	storageDriver.SetStorage(storage)
 	driverStorage := storageDriver.GetStorage()
-	defer func() {
+
-		if err := recover(); err != nil {
-			errInfo := fmt.Sprintf("[panic] err: %v\nstack: %s\n", err, getCurrentGoroutineStack())
-			log.Errorf("panic init storage: %s", errInfo)
-			driverStorage.SetStatus(errInfo)
-			MustSaveDriverStorage(storageDriver)
-			storagesMap.Delete(driverStorage.MountPath)
-		}
-	}()
 	// Unmarshal Addition
 	err = utils.Json.UnmarshalFromString(driverStorage.Addition, storageDriver.GetAddition())
 	if err == nil {

internal/task/base.go

@@ -1,26 +0,0 @@
-package task
-
-import (
-	"github.com/alist-org/alist/v3/internal/model"
-	"github.com/xhofe/tache"
-)
-
-type TaskWithCreator struct {
-	tache.Base
-	Creator *model.User
-}
-
-func (t *TaskWithCreator) SetCreator(creator *model.User) {
-	t.Creator = creator
-	t.Persist()
-}
-
-func (t *TaskWithCreator) GetCreator() *model.User {
-	return t.Creator
-}
-
-type TaskInfoWithCreator interface {
-	tache.TaskWithInfo
-	SetCreator(creator *model.User)
-	GetCreator() *model.User
-}

server/handles/fsmanage.go

@@ -2,7 +2,7 @@ package handles
 
 import (
 	"fmt"
-	"github.com/alist-org/alist/v3/internal/task"
+	"github.com/xhofe/tache"
 	"io"
 	stdpath "path"
 
@@ -121,7 +121,7 @@ func FsCopy(c *gin.Context) {
 		common.ErrorResp(c, err, 403)
 		return
 	}
-	var addedTasks []task.TaskInfoWithCreator
+	var addedTasks []tache.TaskWithInfo
 	for i, name := range req.Names {
 		t, err := fs.Copy(c, stdpath.Join(srcDir, name), dstDir, len(req.Names) > i+1)
 		if t != nil {

server/handles/fsup.go

@@ -1,16 +1,17 @@
 package handles
 
 import (
-	"github.com/alist-org/alist/v3/internal/task"
+	"github.com/xhofe/tache"
 	"io"
 	"net/url"
 	stdpath "path"
 	"strconv"
 	"time"
 
+	"github.com/alist-org/alist/v3/internal/stream"
+
 	"github.com/alist-org/alist/v3/internal/fs"
 	"github.com/alist-org/alist/v3/internal/model"
-	"github.com/alist-org/alist/v3/internal/stream"
 	"github.com/alist-org/alist/v3/server/common"
 	"github.com/gin-gonic/gin"
 )
@@ -57,9 +58,9 @@ func FsStream(c *gin.Context) {
 		Mimetype:     c.GetHeader("Content-Type"),
 		WebPutAsTask: asTask,
 	}
-	var t task.TaskInfoWithCreator
+	var t tache.TaskWithInfo
 	if asTask {
-		t, err = fs.PutAsTask(c, dir, s)
+		t, err = fs.PutAsTask(dir, s)
 	} else {
 		err = fs.PutDirectly(c, dir, s, true)
 	}
@@ -122,12 +123,12 @@ func FsForm(c *gin.Context) {
 		Mimetype:     file.Header.Get("Content-Type"),
 		WebPutAsTask: asTask,
 	}
-	var t task.TaskInfoWithCreator
+	var t tache.TaskWithInfo
 	if asTask {
 		s.Reader = struct {
 			io.Reader
 		}{f}
-		t, err = fs.PutAsTask(c, dir, &s)
+		t, err = fs.PutAsTask(dir, &s)
 	} else {
 		ss, err := stream.NewSeekableStream(s, nil)
 		if err != nil {

server/handles/offline_download.go

@@ -5,9 +5,9 @@ import (
 	"github.com/alist-org/alist/v3/internal/model"
 	"github.com/alist-org/alist/v3/internal/offline_download/tool"
 	"github.com/alist-org/alist/v3/internal/op"
-	"github.com/alist-org/alist/v3/internal/task"
 	"github.com/alist-org/alist/v3/server/common"
 	"github.com/gin-gonic/gin"
+	"github.com/xhofe/tache"
 )
 
 type SetAria2Req struct {
@@ -30,10 +30,6 @@ func SetAria2(c *gin.Context) {
 		return
 	}
 	_tool, err := tool.Tools.Get("aria2")
-	if err != nil {
-		common.ErrorResp(c, err, 500)
-		return
-	}
 	version, err := _tool.Init()
 	if err != nil {
 		common.ErrorResp(c, err, 500)
@@ -78,37 +74,6 @@ func OfflineDownloadTools(c *gin.Context) {
 	common.SuccessResp(c, tools)
 }
 
-type SetTransmissionReq struct {
-	Uri      string `json:"uri" form:"uri"`
-	Seedtime string `json:"seedtime" form:"seedtime"`
-}
-
-func SetTransmission(c *gin.Context) {
-	var req SetTransmissionReq
-	if err := c.ShouldBind(&req); err != nil {
-		common.ErrorResp(c, err, 400)
-		return
-	}
-	items := []model.SettingItem{
-		{Key: conf.TransmissionUri, Value: req.Uri, Type: conf.TypeString, Group: model.OFFLINE_DOWNLOAD, Flag: model.PRIVATE},
-		{Key: conf.TransmissionSeedtime, Value: req.Seedtime, Type: conf.TypeNumber, Group: model.OFFLINE_DOWNLOAD, Flag: model.PRIVATE},
-	}
-	if err := op.SaveSettingItems(items); err != nil {
-		common.ErrorResp(c, err, 500)
-		return
-	}
-	_tool, err := tool.Tools.Get("transmission")
-	if err != nil {
-		common.ErrorResp(c, err, 500)
-		return
-	}
-	if _, err := _tool.Init(); err != nil {
-		common.ErrorResp(c, err, 500)
-		return
-	}
-	common.SuccessResp(c, "ok")
-}
-
 type AddOfflineDownloadReq struct {
 	Urls         []string `json:"urls"`
 	Path         string   `json:"path"`
@@ -133,7 +98,7 @@ func AddOfflineDownload(c *gin.Context) {
 		common.ErrorResp(c, err, 403)
 		return
 	}
-	var tasks []task.TaskInfoWithCreator
+	var tasks []tache.TaskWithInfo
 	for _, url := range req.Urls {
 		t, err := tool.AddURL(c, &tool.AddURLArgs{
 			URL:          url,

server/handles/task.go

@@ -1,8 +1,6 @@
 package handles
 
 import (
-	"github.com/alist-org/alist/v3/internal/model"
-	"github.com/alist-org/alist/v3/internal/task"
 	"math"
 
 	"github.com/alist-org/alist/v3/internal/fs"
@@ -14,17 +12,15 @@ import (
 )
 
 type TaskInfo struct {
-	ID          string      `json:"id"`
+	ID       string      `json:"id"`
-	Name        string      `json:"name"`
+	Name     string      `json:"name"`
-	Creator     string      `json:"creator"`
+	State    tache.State `json:"state"`
-	CreatorRole int         `json:"creator_role"`
+	Status   string      `json:"status"`
-	State       tache.State `json:"state"`
+	Progress float64     `json:"progress"`
-	Status      string      `json:"status"`
+	Error    string      `json:"error"`
-	Progress    float64     `json:"progress"`
-	Error       string      `json:"error"`
 }
 
-func getTaskInfo[T task.TaskInfoWithCreator](task T) TaskInfo {
+func getTaskInfo[T tache.TaskWithInfo](task T) TaskInfo {
 	errMsg := ""
 	if task.GetErr() != nil {
 		errMsg = task.GetErr().Error()
@@ -34,142 +30,62 @@ func getTaskInfo[T task.TaskInfoWithCreator](task T) TaskInfo {
 	if math.IsNaN(progress) {
 		progress = 100
 	}
-	creatorName := ""
-	creatorRole := -1
-	if task.GetCreator() != nil {
-		creatorName = task.GetCreator().Username
-		creatorRole = task.GetCreator().Role
-	}
 	return TaskInfo{
-		ID:          task.GetID(),
+		ID:       task.GetID(),
-		Name:        task.GetName(),
+		Name:     task.GetName(),
-		Creator:     creatorName,
+		State:    task.GetState(),
-		CreatorRole: creatorRole,
+		Status:   task.GetStatus(),
-		State:       task.GetState(),
+		Progress: progress,
-		Status:      task.GetStatus(),
+		Error:    errMsg,
-		Progress:    progress,
-		Error:       errMsg,
 	}
 }
 
-func getTaskInfos[T task.TaskInfoWithCreator](tasks []T) []TaskInfo {
+func getTaskInfos[T tache.TaskWithInfo](tasks []T) []TaskInfo {
 	return utils.MustSliceConvert(tasks, getTaskInfo[T])
 }
 
-func argsContains[T comparable](v T, slice ...T) bool {
+func taskRoute[T tache.TaskWithInfo](g *gin.RouterGroup, manager *tache.Manager[T]) {
-	return utils.SliceContains(slice, v)
-}
-
-func getUserInfo(c *gin.Context) (bool, uint, bool) {
-	if user, ok := c.Value("user").(*model.User); ok {
-		return user.IsAdmin(), user.ID, true
-	} else {
-		return false, 0, false
-	}
-}
-
-func getTargetedHandler[T task.TaskInfoWithCreator](manager *tache.Manager[T], callback func(c *gin.Context, task T)) gin.HandlerFunc {
-	return func(c *gin.Context) {
-		isAdmin, uid, ok := getUserInfo(c)
-		if !ok {
-			// if there is no bug, here is unreachable
-			common.ErrorStrResp(c, "user invalid", 401)
-			return
-		}
-		t, ok := manager.GetByID(c.Query("tid"))
-		if !ok {
-			common.ErrorStrResp(c, "task not found", 404)
-			return
-		}
-		if !isAdmin && uid != t.GetCreator().ID {
-			// to avoid an attacker using error messages to guess valid TID, return a 404 rather than a 403
-			common.ErrorStrResp(c, "task not found", 404)
-			return
-		}
-		callback(c, t)
-	}
-}
-
-func taskRoute[T task.TaskInfoWithCreator](g *gin.RouterGroup, manager *tache.Manager[T]) {
 	g.GET("/undone", func(c *gin.Context) {
-		isAdmin, uid, ok := getUserInfo(c)
+		common.SuccessResp(c, getTaskInfos(manager.GetByState(tache.StatePending, tache.StateRunning,
-		if !ok {
+			tache.StateCanceling, tache.StateErrored, tache.StateFailing, tache.StateWaitingRetry, tache.StateBeforeRetry)))
-			// if there is no bug, here is unreachable
-			common.ErrorStrResp(c, "user invalid", 401)
-			return
-		}
-		common.SuccessResp(c, getTaskInfos(manager.GetByCondition(func(task T) bool {
-			// avoid directly passing the user object into the function to reduce closure size
-			return (isAdmin || uid == task.GetCreator().ID) &&
-				argsContains(task.GetState(), tache.StatePending, tache.StateRunning, tache.StateCanceling,
-					tache.StateErrored, tache.StateFailing, tache.StateWaitingRetry, tache.StateBeforeRetry)
-		})))
 	})
 	g.GET("/done", func(c *gin.Context) {
-		isAdmin, uid, ok := getUserInfo(c)
+		common.SuccessResp(c, getTaskInfos(manager.GetByState(tache.StateCanceled, tache.StateFailed, tache.StateSucceeded)))
-		if !ok {
-			// if there is no bug, here is unreachable
-			common.ErrorStrResp(c, "user invalid", 401)
-			return
-		}
-		common.SuccessResp(c, getTaskInfos(manager.GetByCondition(func(task T) bool {
-			return (isAdmin || uid == task.GetCreator().ID) &&
-				argsContains(task.GetState(), tache.StateCanceled, tache.StateFailed, tache.StateSucceeded)
-		})))
 	})
-	g.POST("/info", getTargetedHandler(manager, func(c *gin.Context, task T) {
+	g.POST("/info", func(c *gin.Context) {
-		common.SuccessResp(c, getTaskInfo(task))
+		tid := c.Query("tid")
-	}))
+		task, ok := manager.GetByID(tid)
-	g.POST("/cancel", getTargetedHandler(manager, func(c *gin.Context, task T) {
-		manager.Cancel(task.GetID())
-		common.SuccessResp(c)
-	}))
-	g.POST("/delete", getTargetedHandler(manager, func(c *gin.Context, task T) {
-		manager.Remove(task.GetID())
-		common.SuccessResp(c)
-	}))
-	g.POST("/retry", getTargetedHandler(manager, func(c *gin.Context, task T) {
-		manager.Retry(task.GetID())
-		common.SuccessResp(c)
-	}))
-	g.POST("/clear_done", func(c *gin.Context) {
-		isAdmin, uid, ok := getUserInfo(c)
 		if !ok {
-			// if there is no bug, here is unreachable
+			common.ErrorStrResp(c, "task not found", 404)
-			common.ErrorStrResp(c, "user invalid", 401)
 			return
 		}
-		manager.RemoveByCondition(func(task T) bool {
+		common.SuccessResp(c, getTaskInfo(task))
-			return (isAdmin || uid == task.GetCreator().ID) &&
+	})
-				argsContains(task.GetState(), tache.StateCanceled, tache.StateFailed, tache.StateSucceeded)
+	g.POST("/cancel", func(c *gin.Context) {
-		})
+		tid := c.Query("tid")
+		manager.Cancel(tid)
+		common.SuccessResp(c)
+	})
+	g.POST("/delete", func(c *gin.Context) {
+		tid := c.Query("tid")
+		manager.Remove(tid)
+		common.SuccessResp(c)
+	})
+	g.POST("/retry", func(c *gin.Context) {
+		tid := c.Query("tid")
+		manager.Retry(tid)
+		common.SuccessResp(c)
+	})
+	g.POST("/clear_done", func(c *gin.Context) {
+		manager.RemoveByState(tache.StateCanceled, tache.StateFailed, tache.StateSucceeded)
 		common.SuccessResp(c)
 	})
 	g.POST("/clear_succeeded", func(c *gin.Context) {
-		isAdmin, uid, ok := getUserInfo(c)
+		manager.RemoveByState(tache.StateSucceeded)
-		if !ok {
-			// if there is no bug, here is unreachable
-			common.ErrorStrResp(c, "user invalid", 401)
-			return
-		}
-		manager.RemoveByCondition(func(task T) bool {
-			return (isAdmin || uid == task.GetCreator().ID) && task.GetState() == tache.StateSucceeded
-		})
 		common.SuccessResp(c)
 	})
 	g.POST("/retry_failed", func(c *gin.Context) {
-		isAdmin, uid, ok := getUserInfo(c)
+		manager.RetryAllFailed()
-		if !ok {
-			// if there is no bug, here is unreachable
-			common.ErrorStrResp(c, "user invalid", 401)
-			return
-		}
-		tasks := manager.GetByCondition(func(task T) bool {
-			return (isAdmin || uid == task.GetCreator().ID) && task.GetState() == tache.StateFailed
-		})
-		for _, t := range tasks {
-			manager.Retry(t.GetID())
-		}
 		common.SuccessResp(c)
 	})
 }

server/middlewares/auth.go

@@ -127,16 +127,6 @@ func Authn(c *gin.Context) {
 	c.Next()
 }
 
-func AuthNotGuest(c *gin.Context) {
-	user := c.MustGet("user").(*model.User)
-	if user.IsGuest() {
-		common.ErrorStrResp(c, "You are a guest", 403)
-		c.Abort()
-	} else {
-		c.Next()
-	}
-}
-
 func AuthAdmin(c *gin.Context) {
 	user := c.MustGet("user").(*model.User)
 	if !user.IsAdmin() {

server/router.go

@@ -62,7 +62,7 @@ func Init(e *gin.Engine) {
 	api.GET("/auth/get_sso_id", handles.SSOLoginCallback)
 	api.GET("/auth/sso_get_token", handles.SSOLoginCallback)
 
-	// webauthn
+	//webauthn
 	webauthn.GET("/webauthn_begin_registration", handles.BeginAuthnRegistration)
 	webauthn.POST("/webauthn_finish_registration", handles.FinishAuthnRegistration)
 	webauthn.GET("/webauthn_begin_login", handles.BeginAuthnLogin)
@@ -76,7 +76,6 @@ func Init(e *gin.Engine) {
 	public.Any("/offline_download_tools", handles.OfflineDownloadTools)
 
 	_fs(auth.Group("/fs"))
-	_task(auth.Group("/task", middlewares.AuthNotGuest))
 	admin(auth.Group("/admin", middlewares.AuthAdmin))
 	if flags.Debug || flags.Dev {
 		debug(g.Group("/debug"))
@@ -126,10 +125,9 @@ func admin(g *gin.RouterGroup) {
 	setting.POST("/reset_token", handles.ResetToken)
 	setting.POST("/set_aria2", handles.SetAria2)
 	setting.POST("/set_qbit", handles.SetQbittorrent)
-	setting.POST("/set_transmission", handles.SetTransmission)
 
-	// retain /admin/task API to ensure compatibility with legacy automation scripts
+	task := g.Group("/task")
-	_task(g.Group("/task"))
+	handles.SetupTaskRoute(task)
 
 	ms := g.Group("/message")
 	ms.POST("/get", message.HttpInstance.GetHandle)
@@ -161,19 +159,14 @@ func _fs(g *gin.RouterGroup) {
 	g.PUT("/put", middlewares.FsUp, handles.FsStream)
 	g.PUT("/form", middlewares.FsUp, handles.FsForm)
 	g.POST("/link", middlewares.AuthAdmin, handles.Link)
-	// g.POST("/add_aria2", handles.AddOfflineDownload)
+	//g.POST("/add_aria2", handles.AddOfflineDownload)
-	// g.POST("/add_qbit", handles.AddQbittorrent)
+	//g.POST("/add_qbit", handles.AddQbittorrent)
-	// g.POST("/add_transmission", handles.SetTransmission)
 	g.POST("/add_offline_download", handles.AddOfflineDownload)
 }
 
-func _task(g *gin.RouterGroup) {
-	handles.SetupTaskRoute(g)
-}
-
 func Cors(r *gin.Engine) {
 	config := cors.DefaultConfig()
-	// config.AllowAllOrigins = true
+	//config.AllowAllOrigins = true
 	config.AllowOrigins = conf.Conf.Cors.AllowOrigins
 	config.AllowHeaders = conf.Conf.Cors.AllowHeaders
 	config.AllowMethods = conf.Conf.Cors.AllowMethods