wip: dropbox surpport

.air.toml

@@ -1,44 +0,0 @@
-root = "."
-testdata_dir = "testdata"
-tmp_dir = "tmp"
-
-[build]
-args_bin = ["server"]
-bin = "./tmp/main"
-cmd = "go build -o ./tmp/main ."
-delay = 0
-exclude_dir = ["assets", "tmp", "vendor", "testdata"]
-exclude_file = []
-exclude_regex = ["_test.go"]
-exclude_unchanged = false
-follow_symlink = false
-full_bin = ""
-include_dir = []
-include_ext = ["go", "tpl", "tmpl", "html"]
-include_file = []
-kill_delay = "0s"
-log = "build-errors.log"
-poll = false
-poll_interval = 0
-rerun = false
-rerun_delay = 500
-send_interrupt = false
-stop_on_error = false
-
-[color]
-app = ""
-build = "yellow"
-main = "magenta"
-runner = "green"
-watcher = "cyan"
-
-[log]
-main_only = false
-time = false
-
-[misc]
-clean_on_exit = false
-
-[screen]
-clear_on_rebuild = false
-keep_scroll = true

.github/FUNDING.yml

@@ -3,7 +3,7 @@
 github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
 patreon: # Replace with a single Patreon username
 open_collective: # Replace with a single Open Collective username
-ko_fi: xhofe # Replace with a single Ko-fi username
+ko_fi: # Replace with a single Ko-fi username
 tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
 community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
 liberapay: # Replace with a single Liberapay username

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -7,44 +7,28 @@ body:
       value: |
         Thanks for taking the time to fill out this bug report, please **confirm that your issue is not a duplicate issue and not because of your operation or version issues**
         感谢您花时间填写此错误报告，请**务必确认您的issue不是重复的且不是因为您的操作或版本问题**
-
   - type: checkboxes
     attributes:
       label: Please make sure of the following things
-      description: |
+      description: You may select more than one, even select all.
-        You must check all the following, otherwise your issue may be closed directly. Or you can go to the [discussions](https://github.com/alist-org/alist/discussions)
-        您必须勾选以下所有内容，否则您的issue可能会被直接关闭。或者您可以去[讨论区](https://github.com/alist-org/alist/discussions)
       options:
-        - label: |
+        - label: I have read the [documentation](https://alist.nn.ci).
-            I have read the [documentation](https://alist.nn.ci).
+        - label: I'm sure there are no duplicate issues or discussions.
-            我已经阅读了[文档](https://alist.nn.ci)。
+        - label: I'm sure it's due to `alist` and not something else(such as `Dependencies` or `Operational`).
-        - label: |
+        - label: I'm sure I'm using the latest version
-            I'm sure there are no duplicate issues or discussions.
-            我确定没有重复的issue或讨论。
-        - label: |
-            I'm sure it's due to `AList` and not something else(such as [Network](https://alist.nn.ci/faq/howto.html#tls-handshake-timeout-read-connection-reset-by-peer-dns-lookup-failed-connect-connection-refused-client-timeout-exceeded-while-awaiting-headers-no-such-host) ,`Dependencies` or `Operational`).
-            我确定是`AList`的问题，而不是其他原因（例如[网络](https://alist.nn.ci/zh/faq/howto.html#tls-handshake-timeout-read-connection-reset-by-peer-dns-lookup-failed-connect-connection-refused-client-timeout-exceeded-while-awaiting-headers-no-such-host)，`依赖`或`操作`）。
-        - label: |
-            I'm sure this issue is not fixed in the latest version.
-            我确定这个问题在最新版本中没有被修复。
-
   - type: input
     id: version
     attributes:
-      label: AList Version / AList 版本
+      label: Alist Version / Alist 版本
-      description: |
+      description: What version of our software are you running?
-        What version of our software are you running? Do not use `latest` or `master` as an answer.
+      placeholder: v2.0.0
-        您使用的是哪个版本的软件？请不要使用`latest`或`master`作为答案。
-      placeholder: v3.xx.xx
     validations:
       required: true
   - type: input
     id: driver
     attributes:
       label: Driver used / 使用的存储驱动
-      description: |
+      description: What storage driver are you using?
-        What storage driver are you using?
-        您使用的是哪个存储驱动？
       placeholder: "for example: Onedrive"
     validations:
       required: true
@@ -63,15 +47,6 @@ body:
         请提供能复现此问题的链接，请知悉如果不提供它你的issue可能会被直接关闭。
     validations:
       required: true
-  - type: textarea
-    id: config
-    attributes:
-      label: Config / 配置
-      description: |
-        Please provide the configuration file of your `AList` application and take a screenshot of the relevant storage configuration. (hide privacy field)
-        请提供您的`AList`应用的配置文件，并截图相关存储配置。(隐藏隐私字段)
-    validations:
-      required: true
   - type: textarea
     id: logs
     attributes:

.github/ISSUE_TEMPLATE/config.yml

@@ -1,5 +1,5 @@
 blank_issues_enabled: false
 contact_links:
   - name: Questions & Discussions
-    url: https://github.com/alist-org/alist/discussions
+    url: https://github.com/Xhofe/alist/discussions
     about: Use GitHub discussions for message-board style questions and discussions.

.github/stale.yml

@@ -6,8 +6,6 @@ daysUntilClose: 20
 exemptLabels:
   - accepted
   - security
-  - working
-  - pr-welcome
 # Label to use when marking an issue as stale
 staleLabel: stale
 # Comment to post when marking an issue as stale. Set to `false` to disable

.github/workflows/auto_lang.yml

@@ -11,31 +11,27 @@ on:
       - 'cmd/lang.go'
   workflow_dispatch:
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
-
 jobs:
   auto_lang:
     strategy:
       matrix:
         platform: [ ubuntu-latest ]
-        go-version: [ '1.21' ]
+        go-version: [ '1.20' ]
     name: auto generate lang.json
     runs-on: ${{ matrix.platform }}
     steps:
       - name: Setup go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v4
         with:
           go-version: ${{ matrix.go-version }}
 
       - name: Checkout alist
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           path: alist
 
       - name: Checkout alist-web
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           repository: 'alist-org/alist-web'
           ref: main
@@ -57,8 +53,8 @@ jobs:
         run: |
           cd alist-web
           git add .
-          git config --local user.email "bot@nn.ci"
+          git config --local user.email "i@nn.ci"
-          git config --local user.name "IlaBot"
+          git config --local user.name "Andy Hsu"
           git commit -m "chore: auto update i18n file" -a 2>/dev/null || :
           cd ..
 

.github/workflows/beta_release.yml

@@ -1,138 +0,0 @@
-name: beta release
-
-on:
-  push:
-    branches: [ 'main' ]
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
-
-permissions:
-  contents: write
-
-jobs:
-  changelog:
-    strategy:
-      matrix:
-        platform: [ ubuntu-latest ]
-        go-version: [ '1.21' ]
-    name: Beta Release Changelog
-    runs-on: ${{ matrix.platform }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Create or update ref
-        id: create-or-update-ref
-        uses: ovsds/create-or-update-ref-action@v1
-        with:
-          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:
-          body_path: CHANGELOG.md
-          files: CHANGELOG.md
-          prerelease: true
-          tag_name: beta
-
-  release:
-    needs:
-      - changelog
-    strategy:
-      matrix:
-        include:
-          - target: '!(*musl*|*windows-arm64*|*android*|*freebsd*)' # xgo
-            hash: "md5"
-          - target: 'linux-!(arm*)-musl*' #musl-not-arm
-            hash: "md5-linux-musl"
-          - target: 'linux-arm*-musl*' #musl-arm
-            hash: "md5-linux-musl-arm"
-          - target: 'windows-arm64' #win-arm64
-            hash: "md5-windows-arm64"
-          - target: 'android-*' #android
-            hash: "md5-android"
-          - target: 'freebsd-*' #freebsd
-            hash: "md5-freebsd"
-
-    name: Beta Release
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Setup Go
-        uses: actions/setup-go@v5
-        with:
-          go-version: '1.22'
-
-      - name: Setup web
-        run: bash build.sh dev web
-
-      - name: Build
-        uses: go-cross/cgo-actions@v1
-        with:
-          targets: ${{ matrix.target }}
-          musl-target-format: $os-$musl-$arch
-          out-dir: build
-          x-flags: |
-            github.com/alist-org/alist/v3/internal/conf.BuiltAt=$built_at
-            github.com/alist-org/alist/v3/internal/conf.GitAuthor=Xhofe
-            github.com/alist-org/alist/v3/internal/conf.GitCommit=$git_commit
-            github.com/alist-org/alist/v3/internal/conf.Version=$tag
-            github.com/alist-org/alist/v3/internal/conf.WebVersion=dev
-
-      - name: Compress
-        run: |
-          bash build.sh zip ${{ matrix.hash }}
-          
-      - name: Upload assets
-        uses: softprops/action-gh-release@v2
-        with:
-          files: build/compress/*
-          prerelease: true
-          tag_name: beta
-          
-  desktop:
-    needs:
-      - release
-    name: Beta Release Desktop
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v4
-        with:
-          repository: alist-org/desktop-release
-          ref: main
-          persist-credentials: false
-          fetch-depth: 0
-
-      - name: Commit
-        run: |
-          git config --local user.email "bot@nn.ci"
-          git config --local user.name "IlaBot"
-          git commit --allow-empty -m "Trigger build for ${{ github.sha }}"
-
-      - name: Push commit
-        uses: ad-m/github-push-action@master
-        with:
-          github_token: ${{ secrets.MY_TOKEN }}
-          branch: main
-          repository: alist-org/desktop-release

.github/workflows/build.yml

@@ -6,56 +6,36 @@ on:
   pull_request:
     branches: [ 'main' ]
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
-
 jobs:
   build:
     strategy:
       matrix:
         platform: [ubuntu-latest]
-        target: 
+        go-version: [ '1.20' ]
-          - darwin-amd64
-          - darwin-arm64
-          - windows-amd64
-          - linux-arm64-musl
-          - linux-amd64-musl
-          - windows-arm64
-          - android-arm64
     name: Build
     runs-on: ${{ matrix.platform }}
     steps:
+      - name: Setup Go
+        uses: actions/setup-go@v4
+        with:
+          go-version: ${{ matrix.go-version }}
 
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
-      - uses: benjlevesque/short-sha@v3.0
+      - name: Install dependencies
-        id: short-sha
+        run: |
-
+          sudo snap install zig --classic --beta
-      - name: Setup Go
+          docker pull crazymax/xgo:latest
-        uses: actions/setup-go@v5
+          go install github.com/crazy-max/xgo@latest
-        with:
+          sudo apt install upx
-          go-version: '1.22'
-
-      - name: Setup web
-        run: bash build.sh dev web
 
       - name: Build
-        uses: go-cross/cgo-actions@v1
+        run: |
-        with:
+          bash build.sh dev
-          targets: ${{ matrix.target }}
-          musl-target-format: $os-$musl-$arch
-          out-dir: build
-          x-flags: |
-            github.com/alist-org/alist/v3/internal/conf.BuiltAt=$built_at
-            github.com/alist-org/alist/v3/internal/conf.GitAuthor=Xhofe
-            github.com/alist-org/alist/v3/internal/conf.GitCommit=$git_commit
-            github.com/alist-org/alist/v3/internal/conf.Version=$tag
-            github.com/alist-org/alist/v3/internal/conf.WebVersion=dev
 
       - name: Upload artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
-          name: alist_${{ env.SHA }}_${{ matrix.target }}
+          name: alist
-          path: build/*
+          path: dist

.github/workflows/build_docker.yml

@@ -0,0 +1,65 @@
+name: build_docker
+
+on:
+  push:
+    branches: [ main ]
+
+jobs:
+  build_docker:
+    name: Build docker
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: xhofe/alist
+      - name: Replace release with dev
+        run: |
+          sed -i 's/release/dev/g' Dockerfile
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Login to DockerHub
+        uses: docker/login-action@v2
+        with:
+          username: xhofe
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Build and push
+        id: docker_build
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          platforms: linux/amd64,linux/arm64
+
+  build_docker_with_aria2:
+    needs: build_docker
+    name: Build docker with aria2
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v3
+        with:
+          repository: alist-org/with_aria2
+          ref: main
+          persist-credentials: false
+          fetch-depth: 0
+
+      - name: Commit
+        run: |
+          git config --local user.email "i@nn.ci"
+          git config --local user.name "Noah Hsu"
+          git commit --allow-empty -m "Trigger build for ${{ github.sha }}"
+
+      - name: Push commit
+        uses: ad-m/github-push-action@master
+        with:
+          github_token: ${{ secrets.MY_TOKEN }}
+          branch: main
+          repository: alist-org/with_aria2

.github/workflows/changelog.yml

@@ -3,7 +3,7 @@ name: auto changelog
 on:
   push:
     tags:
-      - 'v*'
+      - '*'
 
 jobs:
   changelog:
@@ -11,14 +11,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         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/issue_on_close.yml

@@ -1,17 +0,0 @@
-name: Remove working label when issue closed
-
-on:
-  issues:
-    types: [closed]
-
-jobs:
-  rm-working:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Remove working label
-        uses: actions-cool/issues-helper@v3
-        with:
-          actions: 'remove-labels'
-          token: ${{ secrets.GITHUB_TOKEN }}
-          issue-number: ${{ github.event.issue.number }}
-          labels: 'working,pr-welcome'

.github/workflows/issue_question.yml

@@ -10,7 +10,7 @@ jobs:
     if: github.event.label.name == 'question'
     steps:
       - name: Create comment
-        uses: actions-cool/issues-helper@v3.6.0
+        uses: actions-cool/issues-helper@v3.4.0
         with:
           actions: 'create-comment'
           token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release.yml

@@ -9,27 +9,10 @@ jobs:
     strategy:
       matrix:
         platform: [ ubuntu-latest ]
-        go-version: [ '1.21' ]
+        go-version: [ '1.20' ]
     name: Release
     runs-on: ${{ matrix.platform }}
     steps:
-
-      - name: Free Disk Space (Ubuntu)
-        uses: jlumbroso/free-disk-space@main
-        with:
-          # this might remove tools that are actually needed,
-          # if set to "true" but frees about 6 GB
-          tool-cache: false
-          
-          # all of these default to true, but feel free to set to
-          # "false" if necessary for your workflow
-          android: true
-          dotnet: true
-          haskell: true
-          large-packages: true
-          docker-images: true
-          swap-storage: true
-
       - name: Prerelease
         uses: irongut/EditRelease@v1.2.0
         with:
@@ -38,12 +21,12 @@ jobs:
           prerelease: true
 
       - name: Setup Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v4
         with:
           go-version: ${{ matrix.go-version }}
 
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
@@ -58,11 +41,17 @@ jobs:
         run: |
           bash build.sh release
 
+      - name: Release latest
+        uses: irongut/EditRelease@v1.2.0
+        with:
+          token: ${{ secrets.MY_TOKEN }}
+          id: ${{ github.event.release.id }}
+          prerelease: false
+
       - name: Upload assets
-        uses: softprops/action-gh-release@v2
+        uses: softprops/action-gh-release@v1
         with:
           files: build/compress/*
-          prerelease: false
 
   release_desktop:
     needs: release
@@ -70,7 +59,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           repository: alist-org/desktop-release
           ref: main
@@ -79,8 +68,8 @@ jobs:
 
       - name: Add tag
         run: |
-          git config --local user.email "bot@nn.ci"
+          git config --local user.email "i@nn.ci"
-          git config --local user.name "IlaBot"
+          git config --local user.name "Andy Hsu"
           version=$(wget -qO- -t1 -T2 "https://api.github.com/repos/alist-org/alist/releases/latest" | grep "tag_name" | head -n 1 | awk -F ":" '{print $2}' | sed 's/\"//g;s/,//g;s/ //g')
           git tag -a $version -m "release $version"
 

.github/workflows/release_android.yml

@@ -1,34 +0,0 @@
-name: release_android
-
-on:
-  release:
-    types: [ published ]
-
-jobs:
-  release_android:
-    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 android
-
-      - name: Upload assets
-        uses: softprops/action-gh-release@v2
-        with:
-          files: build/compress/*

.github/workflows/release_docker.yml

@@ -3,135 +3,66 @@ name: release_docker
 on:
   push:
     tags:
-      - 'v*'
+      - '*'
-    branches:
-      - main
-  pull_request:
-    branches:
-      - main
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
-
-env:
-  REGISTRY: 'xhofe/alist'
-  REGISTRY_USERNAME: 'xhofe'
-  REGISTRY_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}
-  ARTIFACT_NAME: 'binaries_docker_release'
-  RELEASE_PLATFORMS: 'linux/amd64,linux/arm64,linux/arm/v7,linux/386,linux/arm/v6,linux/s390x,linux/ppc64le,linux/riscv64'
-  IMAGE_PUSH: ${{ github.event_name == 'push' }}
-  IMAGE_IS_PROD: ${{ github.ref_type == 'tag' }}
-  IMAGE_TAGS_BETA: |
-    type=schedule
-    type=ref,event=branch
-    type=ref,event=tag
-    type=ref,event=pr
-    type=raw,value=beta,enable={{is_default_branch}}
 
 jobs:
-  build_binary:
-    name: Build Binaries for Docker Release
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - uses: actions/setup-go@v5
-        with:
-          go-version: 'stable'
-
-      - name: Cache Musl
-        id: cache-musl
-        uses: actions/cache@v4
-        with:
-          path: build/musl-libs
-          key: docker-musl-libs-v2
-
-      - name: Download Musl Library
-        if: steps.cache-musl.outputs.cache-hit != 'true'
-        run: bash build.sh prepare docker-multiplatform
-
-      - name: Build go binary (beta)
-        if: env.IMAGE_IS_PROD != 'true'
-        run: bash build.sh beta docker-multiplatform
-
-      - name: Build go binary (release)
-        if: env.IMAGE_IS_PROD == 'true'
-        run: bash build.sh release docker-multiplatform
-
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ env.ARTIFACT_NAME }}
-          overwrite: true
-          path: |
-            build/
-            !build/*.tgz
-            !build/musl-libs/**
-
   release_docker:
-    needs: build_binary
+    name: Release Docker
-    name: Release Docker image
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        image: ["latest", "ffmpeg", "aria2", "aio"]
-        include:
-          - image: "latest"
-            build_arg: ""
-            tag_favor: ""
-          - image: "ffmpeg"
-            build_arg: INSTALL_FFMPEG=true
-            tag_favor: "suffix=-ffmpeg,onlatest=true"
-          - image: "aria2"
-            build_arg: INSTALL_ARIA2=true
-            tag_favor: "suffix=-aria2,onlatest=true"
-          - image: "aio"
-            build_arg: |
-              INSTALL_FFMPEG=true
-              INSTALL_ARIA2=true
-            tag_favor: "suffix=-aio,onlatest=true"
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
-      - uses: actions/download-artifact@v4
-        with:
-          name: ${{ env.ARTIFACT_NAME }}
-          path: 'build/'
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Login to DockerHub
-        if: env.IMAGE_PUSH == 'true'
-        uses: docker/login-action@v3
-        with:
-          logout: true
-          username: ${{ env.REGISTRY_USERNAME }}
-          password: ${{ env.REGISTRY_PASSWORD }}
 
       - name: Docker meta
         id: meta
-        uses: docker/metadata-action@v5
+        uses: docker/metadata-action@v4
         with:
-          images: ${{ env.REGISTRY }}
+          images: xhofe/alist
-          tags: ${{ env.IMAGE_IS_PROD == 'true' && '' || env.IMAGE_TAGS_BETA }}
+
-          flavor: |
+      - name: Set up QEMU
-            ${{ env.IMAGE_IS_PROD == 'true' && 'latest=true' || '' }}
+        uses: docker/setup-qemu-action@v2
-            ${{ matrix.tag_favor }}
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v2
+        with:
+          username: xhofe
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Build and push
         id: docker_build
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v4
         with:
           context: .
-          file: Dockerfile.ci
+          push: true
-          push: ${{ env.IMAGE_PUSH == 'true' }}
-          build-args: ${{ matrix.build_arg }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          platforms: ${{ env.RELEASE_PLATFORMS }}
+          platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/386,linux/arm/v6,linux/s390x
+
+  release_docker_with_aria2:
+    needs: release_docker
+    name: Release docker with aria2
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v3
+        with:
+          repository: alist-org/with_aria2
+          ref: main
+          persist-credentials: false
+          fetch-depth: 0
+
+      - name: Add tag
+        run: |
+          git config --local user.email "i@nn.ci"
+          git config --local user.name "Andy Hsu"
+          git tag -a ${{ github.ref_name }} -m "release ${{ github.ref_name }}"
+
+      - name: Push tags
+        uses: ad-m/github-push-action@master
+        with:
+          github_token: ${{ secrets.MY_TOKEN }}
+          branch: main
+          repository: alist-org/with_aria2

.github/workflows/release_freebsd.yml

@@ -1,34 +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:
-          files: build/compress/*

.github/workflows/release_linux_musl.yml

@@ -1,34 +0,0 @@
-name: release_linux_musl
-
-on:
-  release:
-    types: [ published ]
-
-jobs:
-  release_linux_musl:
-    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 linux_musl
-
-      - name: Upload assets
-        uses: softprops/action-gh-release@v2
-        with:
-          files: build/compress/*

.github/workflows/release_linux_musl_arm.yml

@@ -1,34 +0,0 @@
-name: release_linux_musl_arm
-
-on:
-  release:
-    types: [ published ]
-
-jobs:
-  release_linux_musl_arm:
-    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 linux_musl_arm
-
-      - name: Upload assets
-        uses: softprops/action-gh-release@v2
-        with:
-          files: build/compress/*

.gitignore

@@ -24,11 +24,8 @@ output/
 *.json
 /build
 /data/
-/tmp/
 /log/
 /lang/
 /daemon/
 /public/dist/*
 /!public/dist/README.md
-
-.VSCodeCounter

CONTRIBUTING.md

@@ -7,7 +7,7 @@
 Prerequisites:
 
 - [git](https://git-scm.com)
-- [Go 1.20+](https://golang.org/doc/install)
+- [Go 1.19+](https://golang.org/doc/install)
 - [gcc](https://gcc.gnu.org/)
 - [nodejs](https://nodejs.org/)
 

Dockerfile

@@ -1,43 +1,18 @@
-FROM alpine:edge as builder
+FROM alpine:3.18 as builder
 LABEL stage=go-builder
 WORKDIR /app/
-RUN apk add --no-cache bash curl gcc git go musl-dev
-COPY go.mod go.sum ./
-RUN go mod download
 COPY ./ ./
-RUN bash build.sh release docker
+RUN apk add --no-cache bash curl gcc git go musl-dev; \
+    bash build.sh release docker
 
-FROM alpine:edge
+FROM alpine:3.18
-
-ARG INSTALL_FFMPEG=false
-ARG INSTALL_ARIA2=false
 LABEL MAINTAINER="i@nn.ci"
-
+VOLUME /opt/alist/data/
 WORKDIR /opt/alist/
-
-RUN apk update && \
-    apk upgrade --no-cache && \
-    apk add --no-cache bash ca-certificates su-exec tzdata; \
-    [ "$INSTALL_FFMPEG" = "true" ] && apk add --no-cache ffmpeg; \
-    [ "$INSTALL_ARIA2" = "true" ] && apk add --no-cache curl aria2 && \
-        mkdir -p /opt/aria2/.aria2 && \
-        wget https://github.com/P3TERX/aria2.conf/archive/refs/heads/master.tar.gz -O /tmp/aria-conf.tar.gz && \
-        tar -zxvf /tmp/aria-conf.tar.gz -C /opt/aria2/.aria2 --strip-components=1 && rm -f /tmp/aria-conf.tar.gz && \
-        sed -i 's|rpc-secret|#rpc-secret|g' /opt/aria2/.aria2/aria2.conf && \
-        sed -i 's|/root/.aria2|/opt/aria2/.aria2|g' /opt/aria2/.aria2/aria2.conf && \
-        sed -i 's|/root/.aria2|/opt/aria2/.aria2|g' /opt/aria2/.aria2/script.conf && \
-        sed -i 's|/root|/opt/aria2|g' /opt/aria2/.aria2/aria2.conf && \
-        sed -i 's|/root|/opt/aria2|g' /opt/aria2/.aria2/script.conf && \
-        touch /opt/aria2/.aria2/aria2.session && \
-        /opt/aria2/.aria2/tracker.sh ; \
-    rm -rf /var/cache/apk/*
-
 COPY --from=builder /app/bin/alist ./
 COPY entrypoint.sh /entrypoint.sh
-RUN chmod +x /opt/alist/alist && \
+RUN apk add --no-cache bash ca-certificates su-exec tzdata; \
-    chmod +x /entrypoint.sh && /entrypoint.sh version
+    chmod +x /entrypoint.sh
-
+ENV PUID=0 PGID=0 UMASK=022
-ENV PUID=0 PGID=0 UMASK=022 RUN_ARIA2=${INSTALL_ARIA2}
-VOLUME /opt/alist/data/
 EXPOSE 5244 5245
-CMD [ "/entrypoint.sh" ]
+CMD [ "/entrypoint.sh" ]

Dockerfile.ci

@@ -1,35 +0,0 @@
-FROM alpine:edge
-
-ARG TARGETPLATFORM
-ARG INSTALL_FFMPEG=false
-ARG INSTALL_ARIA2=false
-LABEL MAINTAINER="i@nn.ci"
-
-WORKDIR /opt/alist/
-
-RUN apk update && \
-    apk upgrade --no-cache && \
-    apk add --no-cache bash ca-certificates su-exec tzdata; \
-    [ "$INSTALL_FFMPEG" = "true" ] && apk add --no-cache ffmpeg; \
-    [ "$INSTALL_ARIA2" = "true" ] && apk add --no-cache curl aria2 && \
-        mkdir -p /opt/aria2/.aria2 && \
-        wget https://github.com/P3TERX/aria2.conf/archive/refs/heads/master.tar.gz -O /tmp/aria-conf.tar.gz && \
-        tar -zxvf /tmp/aria-conf.tar.gz -C /opt/aria2/.aria2 --strip-components=1 && rm -f /tmp/aria-conf.tar.gz && \
-        sed -i 's|rpc-secret|#rpc-secret|g' /opt/aria2/.aria2/aria2.conf && \
-        sed -i 's|/root/.aria2|/opt/aria2/.aria2|g' /opt/aria2/.aria2/aria2.conf && \
-        sed -i 's|/root/.aria2|/opt/aria2/.aria2|g' /opt/aria2/.aria2/script.conf && \
-        sed -i 's|/root|/opt/aria2|g' /opt/aria2/.aria2/aria2.conf && \
-        sed -i 's|/root|/opt/aria2|g' /opt/aria2/.aria2/script.conf && \
-        touch /opt/aria2/.aria2/aria2.session && \
-        /opt/aria2/.aria2/tracker.sh ; \
-    rm -rf /var/cache/apk/*
-
-COPY /build/${TARGETPLATFORM}/alist ./
-COPY entrypoint.sh /entrypoint.sh
-RUN chmod +x /opt/alist/alist && \
-    chmod +x /entrypoint.sh && /entrypoint.sh version
-
-ENV PUID=0 PGID=0 UMASK=022 RUN_ARIA2=${INSTALL_ARIA2}
-VOLUME /opt/alist/data/
-EXPOSE 5244 5245
-CMD [ "/entrypoint.sh" ]

README.md

@@ -1,17 +1,17 @@
 <div align="center">
-  <a href="https://alist.nn.ci"><img width="100px" alt="logo" src="https://cdn.jsdelivr.net/gh/alist-org/logo@main/logo.svg"/></a>
+  <a href="https://alist.nn.ci"><img height="100px" alt="logo" src="https://cdn.jsdelivr.net/gh/alist-org/logo@main/logo.svg"/></a>
   <p><em>🗂️A file list program that supports multiple storages, powered by Gin and Solidjs.</em></p>
 <div>
   <a href="https://goreportcard.com/report/github.com/alist-org/alist/v3">
     <img src="https://goreportcard.com/badge/github.com/alist-org/alist/v3" alt="latest version" />
   </a>
-  <a href="https://github.com/alist-org/alist/blob/main/LICENSE">
+  <a href="https://github.com/Xhofe/alist/blob/main/LICENSE">
     <img src="https://img.shields.io/github/license/Xhofe/alist" alt="License" />
   </a>
-  <a href="https://github.com/alist-org/alist/actions?query=workflow%3ABuild">
+  <a href="https://github.com/Xhofe/alist/actions?query=workflow%3ABuild">
     <img src="https://img.shields.io/github/actions/workflow/status/Xhofe/alist/build.yml?branch=main" alt="Build status" />
   </a>
-  <a href="https://github.com/alist-org/alist/releases">
+  <a href="https://github.com/Xhofe/alist/releases">
     <img src="https://img.shields.io/github/release/Xhofe/alist" alt="latest version" />
   </a>
   <a title="Crowdin" target="_blank" href="https://crwd.in/alist">
@@ -19,13 +19,13 @@
   </a>
 </div>
 <div>
-  <a href="https://github.com/alist-org/alist/discussions">
+  <a href="https://github.com/Xhofe/alist/discussions">
     <img src="https://img.shields.io/github/discussions/Xhofe/alist?color=%23ED8936" alt="discussions" />
   </a>
   <a href="https://discord.gg/F4ymsH4xv2">
     <img src="https://img.shields.io/discord/1018870125102895134?logo=discord" alt="discussions" />
   </a>
-  <a href="https://github.com/alist-org/alist/releases">
+  <a href="https://github.com/Xhofe/alist/releases">
     <img src="https://img.shields.io/github/downloads/Xhofe/alist/total?color=%239F7AEA&logo=github" alt="Downloads" />
   </a>
   <a href="https://hub.docker.com/r/xhofe/alist">
@@ -39,13 +39,13 @@
 
 ---
 
-English | [中文](./README_cn.md) | [日本語](./README_ja.md) | [Contributing](./CONTRIBUTING.md) | [CODE_OF_CONDUCT](./CODE_OF_CONDUCT.md)
+English | [中文](./README_cn.md) | [Contributing](./CONTRIBUTING.md) | [CODE_OF_CONDUCT](./CODE_OF_CONDUCT.md)
 
 ## Features
 
-- [x] Multiple storages
+- [x] Multiple storage
     - [x] Local storage
-    - [x] [Aliyundrive](https://www.alipan.com/)
+    - [x] [Aliyundrive](https://www.aliyundrive.com/)
     - [x] OneDrive / Sharepoint ([global](https://www.office.com/), [cn](https://portal.partner.microsoftonline.cn),de,us)
     - [x] [189cloud](https://cloud.189.cn) (Personal, Family)
     - [x] [GoogleDrive](https://drive.google.com/)
@@ -58,7 +58,7 @@ English | [中文](./README_cn.md) | [日本語](./README_ja.md) | [Contributing
     - [x] WebDav(Support OneDrive/SharePoint without API)
     - [x] Teambition([China](https://www.teambition.com/ ),[International](https://us.teambition.com/ ))
     - [x] [Mediatrack](https://www.mediatrack.cn/)
-    - [x] [139yun](https://yun.139.com/) (Personal, Family, Group)
+    - [x] [139yun](https://yun.139.com/) (Personal, Family)
     - [x] [YandexDisk](https://disk.yandex.com/)
     - [x] [BaiduNetdisk](http://pan.baidu.com/)
     - [x] [Terabox](https://www.terabox.com/main)
@@ -66,18 +66,13 @@ English | [中文](./README_cn.md) | [日本語](./README_ja.md) | [Contributing
     - [x] [Quark](https://pan.quark.cn)
     - [x] [Thunder](https://pan.xunlei.com)
     - [x] [Lanzou](https://www.lanzou.com/)
-    - [x] [ILanzou](https://www.ilanzou.com/)
+    - [x] [Aliyundrive share](https://www.aliyundrive.com/)
-    - [x] [Aliyundrive share](https://www.alipan.com/)
     - [x] [Google photo](https://photos.google.com/)
     - [x] [Mega.nz](https://mega.nz)
     - [x] [Baidu photo](https://photo.baidu.com/)
     - [x] SMB
     - [x] [115](https://115.com/)
     - [X] Cloudreve
-    - [x] [Dropbox](https://www.dropbox.com/)
-    - [x] [FeijiPan](https://www.feijipan.com/)
-    - [x] [dogecloud](https://www.dogecloud.com/product/oss)
-    - [x] [Azure Blob Storage](https://azure.microsoft.com/products/storage/blobs)
 - [x] Easy to deploy and out-of-the-box
 - [x] File preview (PDF, markdown, code, plain text, ...)
 - [x] Image preview in gallery mode
@@ -90,16 +85,15 @@ English | [中文](./README_cn.md) | [日本語](./README_ja.md) | [Contributing
 - [x] Protected routes (password protection and authentication)
 - [x] WebDav (see https://alist.nn.ci/guide/webdav.html for details)
 - [x] [Docker Deploy](https://hub.docker.com/r/xhofe/alist)
-- [x] Cloudflare Workers proxy
+- [x] Cloudflare workers proxy
 - [x] File/Folder package download
 - [x] Web upload(Can allow visitors to upload), delete, mkdir, rename, move and copy
 - [x] Offline download
 - [x] Copy files between two storage
-- [x] Multi-thread downloading acceleration for single-thread download/stream
 
 ## Document
 
-<https://alistgo.com/>
+<https://alist.nn.ci/>
 
 ## Demo
 
@@ -107,7 +101,7 @@ English | [中文](./README_cn.md) | [日本語](./README_ja.md) | [Contributing
 
 ## Discussion
 
-Please go to our [discussion forum](https://github.com/alist-org/alist/discussions) for general questions, **issues are for bug reports and feature requests only.**
+Please go to our [discussion forum](https://github.com/Xhofe/alist/discussions) for general questions, **issues are for bug reports and feature request only.**
 
 ## Sponsor
 
@@ -116,22 +110,23 @@ https://alist.nn.ci/guide/sponsor.html
 
 ### Special sponsors
 
-- [VidHub](https://apps.apple.com/app/apple-store/id1659622164?pt=118612019&ct=alist&mt=8) - An elegant cloud video player within the Apple ecosystem. Support for iPhone, iPad, Mac, and Apple TV.
+- [亚洲云 - 高防服务器|服务器租用|福州高防|广东电信|香港服务器|美国服务器|海外服务器 - 国内靠谱的企业级云计算服务提供商](https://www.asiayun.com/aff/QQCOOQKZ) (sponsored Chinese API server)
-- [亚洲云](https://www.asiayun.com/aff/QQCOOQKZ) - 高防服务器|服务器租用|福州高防|广东电信|香港服务器|美国服务器|海外服务器 - 国内靠谱的企业级云计算服务提供商 (sponsored Chinese API server)
+- [找资源 - 阿里云盘资源搜索引擎](https://zhaoziyuan.la/)
-- [找资源](http://zhaoziyuan2.cc/) - 阿里云盘资源搜索引擎
+- [KinhDown 百度云盘不限速下载！永久免费！已稳定运行3年！非常可靠！Q群 -> 786799372](https://kinhdown.com)
+- [JetBrains: Essential tools for software developers and teams](https://www.jetbrains.com/)
 
 ## Contributors
 
 Thanks goes to these wonderful people:
 
-[![Contributors](http://contrib.nn.ci/api?repo=alist-org/alist&repo=alist-org/alist-web&repo=alist-org/docs)](https://github.com/alist-org/alist/graphs/contributors)
+[![Contributors](http://contributors.nn.ci/api?repo=alist-org/alist&repo=alist-org/alist-web&repo=alist-org/docs)](https://github.com/alist-org/alist/graphs/contributors)
 
 ## License
 
 The `AList` is open-source software licensed under the AGPL-3.0 license.
 
 ## Disclaimer
-- This program is a free and open source project. It is designed to share files on the network disk, which is convenient for downloading and learning Golang. Please abide by relevant laws and regulations when using it, and do not abuse it;
+- This program is a free and open source project. It is designed to share files on the network disk, which is convenient for downloading and learning golang. Please abide by relevant laws and regulations when using it, and do not abuse it;
 - This program is implemented by calling the official sdk/interface, without destroying the official interface behavior;
 - This program only does 302 redirect/traffic forwarding, and does not intercept, store, or tamper with any user data;
 - Before using this program, you should understand and bear the corresponding risks, including but not limited to account ban, download speed limit, etc., which is none of this program's business;
@@ -139,4 +134,4 @@ The `AList` is open-source software licensed under the AGPL-3.0 license.
 
 ---
 
-> [@GitHub](https://github.com/alist-org) · [@TelegramGroup](https://t.me/alist_chat) · [@Discord](https://discord.gg/F4ymsH4xv2)
+> [@Blog](https://nn.ci/) · [@GitHub](https://github.com/Xhofe) · [@TelegramGroup](https://t.me/alist_chat) · [@Discord](https://discord.gg/F4ymsH4xv2)

README_cn.md

@@ -1,17 +1,17 @@
 <div align="center">
-  <a href="https://alist.nn.ci"><img width="100px" alt="logo" src="https://cdn.jsdelivr.net/gh/alist-org/logo@main/logo.svg"/></a>
+  <a href="https://alist.nn.ci"><img height="100px" alt="logo" src="https://cdn.jsdelivr.net/gh/alist-org/logo@main/logo.svg"/></a>
   <p><em>🗂一个支持多存储的文件列表程序，使用 Gin 和 Solidjs。</em></p>
 <div>
   <a href="https://goreportcard.com/report/github.com/alist-org/alist/v3">
     <img src="https://goreportcard.com/badge/github.com/alist-org/alist/v3" alt="latest version" />
   </a>
-  <a href="https://github.com/alist-org/alist/blob/main/LICENSE">
+  <a href="https://github.com/Xhofe/alist/blob/main/LICENSE">
     <img src="https://img.shields.io/github/license/Xhofe/alist" alt="License" />
   </a>
-  <a href="https://github.com/alist-org/alist/actions?query=workflow%3ABuild">
+  <a href="https://github.com/Xhofe/alist/actions?query=workflow%3ABuild">
     <img src="https://img.shields.io/github/actions/workflow/status/Xhofe/alist/build.yml?branch=main" alt="Build status" />
   </a>
-  <a href="https://github.com/alist-org/alist/releases">
+  <a href="https://github.com/Xhofe/alist/releases">
     <img src="https://img.shields.io/github/release/Xhofe/alist" alt="latest version" />
   </a>
   <a title="Crowdin" target="_blank" href="https://crwd.in/alist">
@@ -19,13 +19,13 @@
   </a>
 </div>
 <div>
-  <a href="https://github.com/alist-org/alist/discussions">
+  <a href="https://github.com/Xhofe/alist/discussions">
     <img src="https://img.shields.io/github/discussions/Xhofe/alist?color=%23ED8936" alt="discussions" />
   </a>
   <a href="https://discord.gg/F4ymsH4xv2">
     <img src="https://img.shields.io/discord/1018870125102895134?logo=discord" alt="discussions" />
   </a>
-  <a href="https://github.com/alist-org/alist/releases">
+  <a href="https://github.com/Xhofe/alist/releases">
     <img src="https://img.shields.io/github/downloads/Xhofe/alist/total?color=%239F7AEA&logo=github" alt="Downloads" />
   </a>
   <a href="https://hub.docker.com/r/xhofe/alist">
@@ -39,13 +39,13 @@
 
 ---
 
-[English](./README.md) | 中文 | [日本語](./README_ja.md) | [Contributing](./CONTRIBUTING.md) | [CODE_OF_CONDUCT](./CODE_OF_CONDUCT.md)
+[English](./README.md) | 中文 | [Contributing](./CONTRIBUTING.md) | [CODE_OF_CONDUCT](./CODE_OF_CONDUCT.md)
 
 ## 功能
 
 - [x] 多种存储
     - [x] 本地存储
-    - [x] [阿里云盘](https://www.alipan.com/)
+    - [x] [阿里云盘](https://www.aliyundrive.com/)
     - [x] OneDrive / Sharepoint（[国际版](https://www.office.com/), [世纪互联](https://portal.partner.microsoftonline.cn),de,us）
     - [x] [天翼云盘](https://cloud.189.cn) (个人云, 家庭云)
     - [x] [GoogleDrive](https://drive.google.com/)
@@ -58,24 +58,20 @@
     - [x] WebDav(支持无API的OneDrive/SharePoint)
     - [x] Teambition（[中国](https://www.teambition.com/ )，[国际](https://us.teambition.com/ )）
     - [x] [分秒帧](https://www.mediatrack.cn/)
-    - [x] [和彩云](https://yun.139.com/) (个人云, 家庭云，共享群组)
+    - [x] [和彩云](https://yun.139.com/) (个人云, 家庭云)
     - [x] [Yandex.Disk](https://disk.yandex.com/)
     - [x] [百度网盘](http://pan.baidu.com/)
     - [x] [UC网盘](https://drive.uc.cn)
     - [x] [夸克网盘](https://pan.quark.cn)
     - [x] [迅雷网盘](https://pan.xunlei.com)
     - [x] [蓝奏云](https://www.lanzou.com/)
-    - [x] [蓝奏云优享版](https://www.ilanzou.com/)
+    - [x] [阿里云盘分享](https://www.aliyundrive.com/)
-    - [x] [阿里云盘分享](https://www.alipan.com/)
     - [x] [谷歌相册](https://photos.google.com/)
     - [x] [Mega.nz](https://mega.nz)
     - [x] [一刻相册](https://photo.baidu.com/)
     - [x] SMB
     - [x] [115](https://115.com/)
     - [X] Cloudreve
-    - [x] [Dropbox](https://www.dropbox.com/)
-    - [x] [飞机盘](https://www.feijipan.com/)
-    - [x] [多吉云](https://www.dogecloud.com/product/oss)
 - [x] 部署方便，开箱即用
 - [x] 文件预览（PDF、markdown、代码、纯文本……）
 - [x] 画廊模式下的图像预览
@@ -93,7 +89,6 @@
 - [x] 网页上传(可以允许访客上传)，删除，新建文件夹，重命名，移动，复制
 - [x] 离线下载
 - [x] 跨存储复制文件
-- [x] 单线程下载/串流的多线程下载加速
 
 ## 文档
 
@@ -105,7 +100,7 @@
 
 ## 讨论
 
-一般问题请到[讨论论坛](https://github.com/alist-org/alist/discussions) ，**issue仅针对错误报告和功能请求。**
+一般问题请到[讨论论坛](https://github.com/Xhofe/alist/discussions) ，**issue仅针对错误报告和功能请求。**
 
 ## 赞助
 
@@ -113,15 +108,16 @@ AList 是一个开源软件，如果你碰巧喜欢这个项目，并希望我
 
 ### 特别赞助
 
-- [VidHub](https://apps.apple.com/app/apple-store/id1659622164?pt=118612019&ct=alist&mt=8) - 苹果生态下优雅的网盘视频播放器，iPhone，iPad，Mac，Apple TV全平台支持。
+- [亚洲云 - 高防服务器|服务器租用|福州高防|广东电信|香港服务器|美国服务器|海外服务器 - 国内靠谱的企业级云计算服务提供商](https://www.asiayun.com/aff/QQCOOQKZ) (国内API服务器赞助)
-- [亚洲云](https://www.asiayun.com/aff/QQCOOQKZ) - 高防服务器|服务器租用|福州高防|广东电信|香港服务器|美国服务器|海外服务器 - 国内靠谱的企业级云计算服务提供商 (国内API服务器赞助)
+- [找资源 - 阿里云盘资源搜索引擎](https://zhaoziyuan.la/)
-- [找资源](http://zhaoziyuan2.cc/) - 阿里云盘资源搜索引擎
+- [KinhDown 百度云盘不限速下载！永久免费！已稳定运行3年！非常可靠！Q群 -> 786799372](https://kinhdown.com)
+- [JetBrains: Essential tools for software developers and teams](https://www.jetbrains.com/)
 
 ## 贡献者
 
 Thanks goes to these wonderful people:
 
-[![Contributors](http://contrib.nn.ci/api?repo=alist-org/alist&repo=alist-org/alist-web&repo=alist-org/docs)](https://github.com/alist-org/alist/graphs/contributors)
+[![Contributors](http://contributors.nn.ci/api?repo=alist-org/alist&repo=alist-org/alist-web&repo=alist-org/docs)](https://github.com/alist-org/alist/graphs/contributors)
 
 ## 许可
 
@@ -136,4 +132,4 @@ Thanks goes to these wonderful people:
 
 ---
 
-> [@博客](https://nn.ci/) · [@GitHub](https://github.com/alist-org) · [@Telegram群](https://t.me/alist_chat) · [@Discord](https://discord.gg/F4ymsH4xv2)
+> [@博客](https://nn.ci/) · [@GitHub](https://github.com/Xhofe) · [@Telegram群](https://t.me/alist_chat) · [@Discord](https://discord.gg/F4ymsH4xv2)

README_ja.md

@@ -1,141 +0,0 @@
-<div align="center">
-  <a href="https://alist.nn.ci"><img width="100px" alt="logo" src="https://cdn.jsdelivr.net/gh/alist-org/logo@main/logo.svg"/></a>
-  <p><em>🗂️Gin と Solidjs による、複数のストレージをサポートするファイルリストプログラム。</em></p>
-<div>
-  <a href="https://goreportcard.com/report/github.com/alist-org/alist/v3">
-    <img src="https://goreportcard.com/badge/github.com/alist-org/alist/v3" alt="latest version" />
-  </a>
-  <a href="https://github.com/alist-org/alist/blob/main/LICENSE">
-    <img src="https://img.shields.io/github/license/Xhofe/alist" alt="License" />
-  </a>
-  <a href="https://github.com/alist-org/alist/actions?query=workflow%3ABuild">
-    <img src="https://img.shields.io/github/actions/workflow/status/Xhofe/alist/build.yml?branch=main" alt="Build status" />
-  </a>
-  <a href="https://github.com/alist-org/alist/releases">
-    <img src="https://img.shields.io/github/release/Xhofe/alist" alt="latest version" />
-  </a>
-  <a title="Crowdin" target="_blank" href="https://crwd.in/alist">
-    <img src="https://badges.crowdin.net/alist/localized.svg">
-  </a>
-</div>
-<div>
-  <a href="https://github.com/alist-org/alist/discussions">
-    <img src="https://img.shields.io/github/discussions/Xhofe/alist?color=%23ED8936" alt="discussions" />
-  </a>
-  <a href="https://discord.gg/F4ymsH4xv2">
-    <img src="https://img.shields.io/discord/1018870125102895134?logo=discord" alt="discussions" />
-  </a>
-  <a href="https://github.com/alist-org/alist/releases">
-    <img src="https://img.shields.io/github/downloads/Xhofe/alist/total?color=%239F7AEA&logo=github" alt="Downloads" />
-  </a>
-  <a href="https://hub.docker.com/r/xhofe/alist">
-    <img src="https://img.shields.io/docker/pulls/xhofe/alist?color=%2348BB78&logo=docker&label=pulls" alt="Downloads" />
-  </a>
-  <a href="https://alist.nn.ci/guide/sponsor.html">
-    <img src="https://img.shields.io/badge/%24-sponsor-F87171.svg" alt="sponsor" />
-  </a>
-</div>
-</div>
-
----
-
-[English](./README.md) | [中文](./README_cn.md) | 日本語 | [Contributing](./CONTRIBUTING.md) | [CODE_OF_CONDUCT](./CODE_OF_CONDUCT.md)
-
-## 特徴
-
-- [x] マルチストレージ
-    - [x] ローカルストレージ
-    - [x] [Aliyundrive](https://www.alipan.com/)
-    - [x] OneDrive / Sharepoint ([グローバル](https://www.office.com/), [cn](https://portal.partner.microsoftonline.cn),de,us)
-    - [x] [189cloud](https://cloud.189.cn) (Personal, Family)
-    - [x] [GoogleDrive](https://drive.google.com/)
-    - [x] [123pan](https://www.123pan.com/)
-    - [x] FTP / SFTP
-    - [x] [PikPak](https://www.mypikpak.com/)
-    - [x] [S3](https://aws.amazon.com/s3/)
-    - [x] [Seafile](https://seafile.com/)
-    - [x] [UPYUN Storage Service](https://www.upyun.com/products/file-storage)
-    - [x] WebDav(Support OneDrive/SharePoint without API)
-    - [x] Teambition([China](https://www.teambition.com/ ),[International](https://us.teambition.com/ ))
-    - [x] [Mediatrack](https://www.mediatrack.cn/)
-    - [x] [139yun](https://yun.139.com/) (Personal, Family, Group)
-    - [x] [YandexDisk](https://disk.yandex.com/)
-    - [x] [BaiduNetdisk](http://pan.baidu.com/)
-    - [x] [Terabox](https://www.terabox.com/main)
-    - [x] [UC](https://drive.uc.cn)
-    - [x] [Quark](https://pan.quark.cn)
-    - [x] [Thunder](https://pan.xunlei.com)
-    - [x] [Lanzou](https://www.lanzou.com/)
-    - [x] [ILanzou](https://www.ilanzou.com/)
-    - [x] [Aliyundrive share](https://www.alipan.com/)
-    - [x] [Google photo](https://photos.google.com/)
-    - [x] [Mega.nz](https://mega.nz)
-    - [x] [Baidu photo](https://photo.baidu.com/)
-    - [x] SMB
-    - [x] [115](https://115.com/)
-    - [X] Cloudreve
-    - [x] [Dropbox](https://www.dropbox.com/)
-    - [x] [FeijiPan](https://www.feijipan.com/)
-    - [x] [dogecloud](https://www.dogecloud.com/product/oss)
-- [x] デプロイが簡単で、すぐに使える
-- [x] ファイルプレビュー (PDF, マークダウン, コード, プレーンテキスト, ...)
-- [x] ギャラリーモードでの画像プレビュー
-- [x] ビデオとオーディオのプレビュー、歌詞と字幕のサポート
-- [x] Office ドキュメントのプレビュー (docx, pptx, xlsx, ...)
-- [x] `README.md` のプレビューレンダリング
-- [x] ファイルのパーマリンクコピーと直接ダウンロード
-- [x] ダークモード
-- [x] 国際化
-- [x] 保護されたルート (パスワード保護と認証)
-- [x] WebDav (詳細は https://alist.nn.ci/guide/webdav.html を参照)
-- [x] [Docker デプロイ](https://hub.docker.com/r/xhofe/alist)
-- [x] Cloudflare ワーカープロキシ
-- [x] ファイル/フォルダパッケージのダウンロード
-- [x] ウェブアップロード(訪問者にアップロードを許可できる), 削除, mkdir, 名前変更, 移動, コピー
-- [x] オフラインダウンロード
-- [x] 二つのストレージ間でファイルをコピー
-- [x] シングルスレッドのダウンロード/ストリーム向けのマルチスレッド ダウンロード アクセラレーション
-
-## ドキュメント
-
-<https://alist.nn.ci/>
-
-## デモ
-
-<https://al.nn.ci>
-
-## ディスカッション
-
-一般的なご質問は[ディスカッションフォーラム](https://github.com/alist-org/alist/discussions)をご利用ください。**問題はバグレポートと機能リクエストのみです。**
-
-## スポンサー
-
-AList はオープンソースのソフトウェアです。もしあなたがこのプロジェクトを気に入ってくださり、続けて欲しいと思ってくださるなら、ぜひスポンサーになってくださるか、1口でも寄付をしてくださるようご検討ください！すべての愛とサポートに感謝します:
-https://alist.nn.ci/guide/sponsor.html
-
-### スペシャルスポンサー
-
-- [VidHub](https://apps.apple.com/app/apple-store/id1659622164?pt=118612019&ct=alist&mt=8) - An elegant cloud video player within the Apple ecosystem. Support for iPhone, iPad, Mac, and Apple TV.
-- [亚洲云](https://www.asiayun.com/aff/QQCOOQKZ) - 高防服务器|服务器租用|福州高防|广东电信|香港服务器|美国服务器|海外服务器 - 国内靠谱的企业级云计算服务提供商 (sponsored Chinese API server)
-- [找资源](http://zhaoziyuan2.cc/) - 阿里云盘资源搜索引擎
-
-## コントリビューター
-
-これらの素晴らしい人々に感謝します:
-
-[![Contributors](http://contrib.nn.ci/api?repo=alist-org/alist&repo=alist-org/alist-web&repo=alist-org/docs)](https://github.com/alist-org/alist/graphs/contributors)
-
-## ライセンス
-
-`AList` は AGPL-3.0 ライセンスの下でライセンスされたオープンソースソフトウェアです。
-
-## 免責事項
-- このプログラムはフリーでオープンソースのプロジェクトです。ネットワークディスク上でファイルを共有するように設計されており、golang のダウンロードや学習に便利です。利用にあたっては関連法規を遵守し、悪用しないようお願いします;
-- このプログラムは、公式インターフェースの動作を破壊することなく、公式 sdk/インターフェースを呼び出すことで実装されています;
-- このプログラムは、302リダイレクト/トラフィック転送のみを行い、いかなるユーザーデータも傍受、保存、改ざんしません;
-- このプログラムを使用する前に、アカウントの禁止、ダウンロード速度の制限など、対応するリスクを理解し、負担する必要があります;
-- もし侵害があれば、[メール](mailto:i@nn.ci)で私に連絡してください。
-
----
-
-> [@Blog](https://nn.ci/) · [@GitHub](https://github.com/alist-org) · [@TelegramGroup](https://t.me/alist_chat) · [@Discord](https://discord.gg/F4ymsH4xv2)

build.sh

@@ -1,16 +1,13 @@
 appName="alist"
 builtAt="$(date +'%F %T %z')"
+goVersion=$(go version | sed 's/go version //')
 gitAuthor="Xhofe <i@nn.ci>"
 gitCommit=$(git log --pretty=format:"%h" -1)
 
 if [ "$1" = "dev" ]; then
   version="dev"
   webVersion="dev"
-elif [ "$1" = "beta" ]; then
-  version="beta"
-  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
@@ -21,6 +18,7 @@ echo "frontend version: $webVersion"
 ldflags="\
 -w -s \
 -X 'github.com/alist-org/alist/v3/internal/conf.BuiltAt=$builtAt' \
+-X 'github.com/alist-org/alist/v3/internal/conf.GoVersion=$goVersion' \
 -X 'github.com/alist-org/alist/v3/internal/conf.GitAuthor=$gitAuthor' \
 -X 'github.com/alist-org/alist/v3/internal/conf.GitCommit=$gitCommit' \
 -X 'github.com/alist-org/alist/v3/internal/conf.Version=$version' \
@@ -51,7 +49,6 @@ BuildWinArm64() {
   export GOARCH=arm64
   export CC=$(pwd)/wrapper/zcc-arm64
   export CXX=$(pwd)/wrapper/zcxx-arm64
-  export CGO_ENABLED=1
   go build -o "$1" -ldflags="$ldflags" -tags=jsoniter .
 }
 
@@ -78,7 +75,7 @@ BuildDev() {
     export CGO_ENABLED=1
     go build -o ./dist/$appName-$os_arch -ldflags="$muslflags" -tags=jsoniter .
   done
-  xgo -targets=windows/amd64,darwin/amd64,darwin/arm64 -out "$appName" -ldflags="$ldflags" -tags=jsoniter .
+  xgo -targets=windows/amd64,darwin/amd64 -out "$appName" -ldflags="$ldflags" -tags=jsoniter .
   mv alist-* dist
   cd dist
   cp ./alist-windows-amd64.exe ./alist-windows-amd64-upx.exe
@@ -91,83 +88,19 @@ BuildDocker() {
   go build -o ./bin/alist -ldflags="$ldflags" -tags=jsoniter .
 }
 
-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)
-  for i in "${FILES[@]}"; do
-    url="${BASE}${i}.tgz"
-    lib_tgz="build/${i}.tgz"
-    curl -L -o "${lib_tgz}" "${url}"
-    tar xf "${lib_tgz}" --strip-components 1 -C build/musl-libs
-    rm -f "${lib_tgz}"
-  done
-}
-
-BuildDockerMultiplatform() {
-  go mod download
-
-  # run PrepareBuildDockerMusl before build
-  export PATH=$PATH:$PWD/build/musl-libs/bin
-
-  docker_lflags="--extldflags '-static -fpic' $ldflags"
-  export CGO_ENABLED=1
-
-  OS_ARCHES=(linux-amd64 linux-arm64 linux-386 linux-s390x linux-riscv64 linux-ppc64le)
-  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)
-  for i in "${!OS_ARCHES[@]}"; do
-    os_arch=${OS_ARCHES[$i]}
-    cgo_cc=${CGO_ARGS[$i]}
-    os=${os_arch%%-*}
-    arch=${os_arch##*-}
-    export GOOS=$os
-    export GOARCH=$arch
-    export CC=${cgo_cc}
-    echo "building for $os_arch"
-    go build -o build/$os/$arch/alist -ldflags="$docker_lflags" -tags=jsoniter .
-  done
-
-  DOCKER_ARM_ARCHES=(linux-arm/v6 linux-arm/v7)
-  CGO_ARGS=(armv6-linux-musleabihf-gcc armv7l-linux-musleabihf-gcc)
-  GO_ARM=(6 7)
-  export GOOS=linux
-  export GOARCH=arm
-  for i in "${!DOCKER_ARM_ARCHES[@]}"; do
-    docker_arch=${DOCKER_ARM_ARCHES[$i]}
-    cgo_cc=${CGO_ARGS[$i]}
-    export GOARM=${GO_ARM[$i]}
-    export CC=${cgo_cc}
-    echo "building for $docker_arch"
-    go build -o build/${docker_arch%%-*}/${docker_arch##*-}/alist -ldflags="$docker_lflags" -tags=jsoniter .
-  done
-}
-
 BuildRelease() {
-  rm -rf .git/
-  mkdir -p "build"
-  BuildWinArm64 ./build/alist-windows-arm64.exe
-  xgo -out "$appName" -ldflags="$ldflags" -tags=jsoniter .
-  # why? Because some target platforms seem to have issues with upx compression
-  upx -9 ./alist-linux-amd64
-  cp ./alist-windows-amd64.exe ./alist-windows-amd64-upx.exe
-  upx -9 ./alist-windows-amd64-upx.exe
-  mv alist-* build
-}
-
-BuildReleaseLinuxMusl() {
   rm -rf .git/
   mkdir -p "build"
   muslflags="--extldflags '-static -fpic' $ldflags"
   BASE="https://musl.nn.ci/"
-  FILES=(x86_64-linux-musl-cross aarch64-linux-musl-cross mips-linux-musl-cross mips64-linux-musl-cross mips64el-linux-musl-cross mipsel-linux-musl-cross powerpc64le-linux-musl-cross s390x-linux-musl-cross)
+  FILES=(x86_64-linux-musl-cross aarch64-linux-musl-cross arm-linux-musleabihf-cross mips-linux-musl-cross mips64-linux-musl-cross mips64el-linux-musl-cross mipsel-linux-musl-cross powerpc64le-linux-musl-cross s390x-linux-musl-cross)
   for i in "${FILES[@]}"; do
     url="${BASE}${i}.tgz"
     curl -L -o "${i}.tgz" "${url}"
     sudo tar xf "${i}.tgz" --strip-components 1 -C /usr/local
-    rm -f "${i}.tgz"
   done
-  OS_ARCHES=(linux-musl-amd64 linux-musl-arm64 linux-musl-mips linux-musl-mips64 linux-musl-mips64le linux-musl-mipsle linux-musl-ppc64le linux-musl-s390x)
+  OS_ARCHES=(linux-musl-amd64 linux-musl-arm64 linux-musl-arm linux-musl-mips linux-musl-mips64 linux-musl-mips64le linux-musl-mipsle linux-musl-ppc64le linux-musl-s390x)
-  CGO_ARGS=(x86_64-linux-musl-gcc aarch64-linux-musl-gcc mips-linux-musl-gcc mips64-linux-musl-gcc mips64el-linux-musl-gcc mipsel-linux-musl-gcc powerpc64le-linux-musl-gcc s390x-linux-musl-gcc)
+  CGO_ARGS=(x86_64-linux-musl-gcc aarch64-linux-musl-gcc arm-linux-musleabihf-gcc mips-linux-musl-gcc mips64-linux-musl-gcc mips64el-linux-musl-gcc mipsel-linux-musl-gcc powerpc64le-linux-musl-gcc s390x-linux-musl-gcc)
   for i in "${!OS_ARCHES[@]}"; do
     os_arch=${OS_ARCHES[$i]}
     cgo_cc=${CGO_ARGS[$i]}
@@ -178,83 +111,13 @@ BuildReleaseLinuxMusl() {
     export CGO_ENABLED=1
     go build -o ./build/$appName-$os_arch -ldflags="$muslflags" -tags=jsoniter .
   done
-}
+  BuildWinArm64 ./build/alist-windows-arm64.exe
-
+  xgo -out "$appName" -ldflags="$ldflags" -tags=jsoniter .
-BuildReleaseLinuxMuslArm() {
+  # why? Because some target platforms seem to have issues with upx compression
-  rm -rf .git/
+  upx -9 ./alist-linux-amd64
-  mkdir -p "build"
+  cp ./alist-windows-amd64.exe ./alist-windows-amd64-upx.exe
-  muslflags="--extldflags '-static -fpic' $ldflags"
+  upx -9 ./alist-windows-amd64-upx.exe
-  BASE="https://musl.nn.ci/"
+  mv alist-* build
-#  FILES=(arm-linux-musleabi-cross arm-linux-musleabihf-cross armeb-linux-musleabi-cross armeb-linux-musleabihf-cross armel-linux-musleabi-cross armel-linux-musleabihf-cross armv5l-linux-musleabi-cross armv5l-linux-musleabihf-cross armv6-linux-musleabi-cross armv6-linux-musleabihf-cross armv7l-linux-musleabihf-cross armv7m-linux-musleabi-cross armv7r-linux-musleabihf-cross)
-  FILES=(arm-linux-musleabi-cross arm-linux-musleabihf-cross armel-linux-musleabi-cross armel-linux-musleabihf-cross armv5l-linux-musleabi-cross armv5l-linux-musleabihf-cross armv6-linux-musleabi-cross armv6-linux-musleabihf-cross armv7l-linux-musleabihf-cross armv7m-linux-musleabi-cross armv7r-linux-musleabihf-cross)
-  for i in "${FILES[@]}"; do
-    url="${BASE}${i}.tgz"
-    curl -L -o "${i}.tgz" "${url}"
-    sudo tar xf "${i}.tgz" --strip-components 1 -C /usr/local
-    rm -f "${i}.tgz"
-  done
-#  OS_ARCHES=(linux-musleabi-arm linux-musleabihf-arm linux-musleabi-armeb linux-musleabihf-armeb linux-musleabi-armel linux-musleabihf-armel linux-musleabi-armv5l linux-musleabihf-armv5l linux-musleabi-armv6 linux-musleabihf-armv6 linux-musleabihf-armv7l linux-musleabi-armv7m linux-musleabihf-armv7r)
-#  CGO_ARGS=(arm-linux-musleabi-gcc arm-linux-musleabihf-gcc armeb-linux-musleabi-gcc armeb-linux-musleabihf-gcc armel-linux-musleabi-gcc armel-linux-musleabihf-gcc armv5l-linux-musleabi-gcc armv5l-linux-musleabihf-gcc armv6-linux-musleabi-gcc armv6-linux-musleabihf-gcc armv7l-linux-musleabihf-gcc armv7m-linux-musleabi-gcc armv7r-linux-musleabihf-gcc)
-#  GOARMS=('' '' '' '' '' '' '5' '5' '6' '6' '7' '7' '7')
-  OS_ARCHES=(linux-musleabi-arm linux-musleabihf-arm linux-musleabi-armel linux-musleabihf-armel linux-musleabi-armv5l linux-musleabihf-armv5l linux-musleabi-armv6 linux-musleabihf-armv6 linux-musleabihf-armv7l linux-musleabi-armv7m linux-musleabihf-armv7r)
-  CGO_ARGS=(arm-linux-musleabi-gcc arm-linux-musleabihf-gcc armel-linux-musleabi-gcc armel-linux-musleabihf-gcc armv5l-linux-musleabi-gcc armv5l-linux-musleabihf-gcc armv6-linux-musleabi-gcc armv6-linux-musleabihf-gcc armv7l-linux-musleabihf-gcc armv7m-linux-musleabi-gcc armv7r-linux-musleabihf-gcc)
-  GOARMS=('' '' '' '' '5' '5' '6' '6' '7' '7' '7')
-  for i in "${!OS_ARCHES[@]}"; do
-    os_arch=${OS_ARCHES[$i]}
-    cgo_cc=${CGO_ARGS[$i]}
-    arm=${GOARMS[$i]}
-    echo building for ${os_arch}
-    export GOOS=linux
-    export GOARCH=arm
-    export CC=${cgo_cc}
-    export CGO_ENABLED=1
-    export GOARM=${arm}
-    go build -o ./build/$appName-$os_arch -ldflags="$muslflags" -tags=jsoniter .
-  done
-}
-
-BuildReleaseAndroid() {
-  rm -rf .git/
-  mkdir -p "build"
-  wget https://dl.google.com/android/repository/android-ndk-r26b-linux.zip
-  unzip android-ndk-r26b-linux.zip
-  rm android-ndk-r26b-linux.zip
-  OS_ARCHES=(amd64 arm64 386 arm)
-  CGO_ARGS=(x86_64-linux-android24-clang aarch64-linux-android24-clang i686-linux-android24-clang armv7a-linux-androideabi24-clang)
-  for i in "${!OS_ARCHES[@]}"; do
-    os_arch=${OS_ARCHES[$i]}
-    cgo_cc=$(realpath android-ndk-r26b/toolchains/llvm/prebuilt/linux-x86_64/bin/${CGO_ARGS[$i]})
-    echo building for android-${os_arch}
-    export GOOS=android
-    export GOARCH=${os_arch##*-}
-    export CC=${cgo_cc}
-    export CGO_ENABLED=1
-    go build -o ./build/$appName-android-$os_arch -ldflags="$ldflags" -tags=jsoniter .
-    android-ndk-r26b/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip ./build/$appName-android-$os_arch
-  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() {
@@ -264,30 +127,20 @@ MakeRelease() {
     cp "$i" alist
     tar -czvf compress/"$i".tar.gz alist
     rm -f alist
-  done
-    for i in $(find . -type f -name "$appName-android-*"); do
-    cp "$i" alist
-    tar -czvf compress/"$i".tar.gz alist
-    rm -f alist
   done
   for i in $(find . -type f -name "$appName-darwin-*"); do
     cp "$i" alist
     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
     rm -f alist.exe
   done
   cd compress
-  find . -type f -print0 | xargs -0 md5sum >"$1"
+  find . -type f -print0 | xargs -0 md5sum >md5.txt
-  cat "$1"
+  cat md5.txt
   cd ../..
 }
 
@@ -295,47 +148,17 @@ if [ "$1" = "dev" ]; then
   FetchWebDev
   if [ "$2" = "docker" ]; then
     BuildDocker
-  elif [ "$2" = "docker-multiplatform" ]; then
-      BuildDockerMultiplatform
-  elif [ "$2" = "web" ]; then
-    echo "web only"
   else
     BuildDev
   fi
-elif [ "$1" = "release" -o "$1" = "beta" ]; then
+elif [ "$1" = "release" ]; then
-  if [ "$1" = "beta" ]; then
+  FetchWebRelease
-    FetchWebDev
-  else
-    FetchWebRelease
-  fi
   if [ "$2" = "docker" ]; then
     BuildDocker
-  elif [ "$2" = "docker-multiplatform" ]; then
-    BuildDockerMultiplatform
-  elif [ "$2" = "linux_musl_arm" ]; then
-    BuildReleaseLinuxMuslArm
-    MakeRelease "md5-linux-musl-arm.txt"
-  elif [ "$2" = "linux_musl" ]; then
-    BuildReleaseLinuxMusl
-    MakeRelease "md5-linux-musl.txt"
-  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
     BuildRelease
-    MakeRelease "md5.txt"
+    MakeRelease
   fi
-elif [ "$1" = "prepare" ]; then
-  if [ "$2" = "docker-multiplatform" ]; then
-    PrepareBuildDockerMusl
-  fi
-elif [ "$1" = "zip" ]; then
-  MakeRelease "$2".txt
 else
   echo -e "Parameter error"
 fi

cmd/admin.go

@@ -4,90 +4,30 @@ Copyright © 2022 NAME HERE <EMAIL ADDRESS>
 package cmd
 
 import (
-	"github.com/alist-org/alist/v3/internal/conf"
 	"github.com/alist-org/alist/v3/internal/op"
-	"github.com/alist-org/alist/v3/internal/setting"
 	"github.com/alist-org/alist/v3/pkg/utils"
-	"github.com/alist-org/alist/v3/pkg/utils/random"
 	"github.com/spf13/cobra"
 )
 
-// AdminCmd represents the password command
+// PasswordCmd represents the password command
-var AdminCmd = &cobra.Command{
+var PasswordCmd = &cobra.Command{
 	Use:     "admin",
 	Aliases: []string{"password"},
-	Short:   "Show admin user's info and some operations about admin user's password",
+	Short:   "Show admin user's info",
 	Run: func(cmd *cobra.Command, args []string) {
 		Init()
-		defer Release()
 		admin, err := op.GetAdmin()
 		if err != nil {
 			utils.Log.Errorf("failed get admin user: %+v", err)
 		} else {
-			utils.Log.Infof("Admin user's username: %s", admin.Username)
+			utils.Log.Infof("admin user's info: \nusername: %s\npassword: %s", admin.Username, admin.Password)
-			utils.Log.Infof("The password can only be output at the first startup, and then stored as a hash value, which cannot be reversed")
-			utils.Log.Infof("You can reset the password with a random string by running [alist admin random]")
-			utils.Log.Infof("You can also set a new password by running [alist admin set NEW_PASSWORD]")
 		}
 	},
 }
 
-var RandomPasswordCmd = &cobra.Command{
-	Use:   "random",
-	Short: "Reset admin user's password to a random string",
-	Run: func(cmd *cobra.Command, args []string) {
-		newPwd := random.String(8)
-		setAdminPassword(newPwd)
-	},
-}
-
-var SetPasswordCmd = &cobra.Command{
-	Use:   "set",
-	Short: "Set admin user's password",
-	Run: func(cmd *cobra.Command, args []string) {
-		if len(args) == 0 {
-			utils.Log.Errorf("Please enter the new password")
-			return
-		}
-		setAdminPassword(args[0])
-	},
-}
-
-var ShowTokenCmd = &cobra.Command{
-	Use:   "token",
-	Short: "Show admin token",
-	Run: func(cmd *cobra.Command, args []string) {
-		Init()
-		defer Release()
-		token := setting.GetStr(conf.Token)
-		utils.Log.Infof("Admin token: %s", token)
-	},
-}
-
-func setAdminPassword(pwd string) {
-	Init()
-	defer Release()
-	admin, err := op.GetAdmin()
-	if err != nil {
-		utils.Log.Errorf("failed get admin user: %+v", err)
-		return
-	}
-	admin.SetPassword(pwd)
-	if err := op.UpdateUser(admin); err != nil {
-		utils.Log.Errorf("failed update admin user: %+v", err)
-		return
-	}
-	utils.Log.Infof("admin user has been updated:")
-	utils.Log.Infof("username: %s", admin.Username)
-	utils.Log.Infof("password: %s", pwd)
-	DelAdminCacheOnline()
-}
-
 func init() {
-	RootCmd.AddCommand(AdminCmd)
+	RootCmd.AddCommand(PasswordCmd)
-	AdminCmd.AddCommand(RandomPasswordCmd)
+
-	AdminCmd.AddCommand(SetPasswordCmd)
-	AdminCmd.AddCommand(ShowTokenCmd)
 	// Here you will define your flags and configuration settings.
 
 	// Cobra supports Persistent Flags which will work for this command

cmd/cancel2FA.go

@@ -15,7 +15,6 @@ var Cancel2FACmd = &cobra.Command{
 	Short: "Delete 2FA of admin user",
 	Run: func(cmd *cobra.Command, args []string) {
 		Init()
-		defer Release()
 		admin, err := op.GetAdmin()
 		if err != nil {
 			utils.Log.Errorf("failed to get admin user: %+v", err)
@@ -25,7 +24,6 @@ var Cancel2FACmd = &cobra.Command{
 				utils.Log.Errorf("failed to cancel 2FA: %+v", err)
 			} else {
 				utils.Log.Info("2FA canceled")
-				DelAdminCacheOnline()
 			}
 		}
 	},

cmd/common.go

@@ -7,7 +7,6 @@ import (
 
 	"github.com/alist-org/alist/v3/internal/bootstrap"
 	"github.com/alist-org/alist/v3/internal/bootstrap/data"
-	"github.com/alist-org/alist/v3/internal/db"
 	"github.com/alist-org/alist/v3/pkg/utils"
 	log "github.com/sirupsen/logrus"
 )
@@ -17,13 +16,7 @@ func Init() {
 	bootstrap.Log()
 	bootstrap.InitDB()
 	data.InitData()
-	bootstrap.InitStreamLimit()
 	bootstrap.InitIndex()
-	bootstrap.InitUpgradePatch()
-}
-
-func Release() {
-	db.Close()
 }
 
 var pid = -1

cmd/kill.go

@@ -1,54 +0,0 @@
-package cmd
-
-import (
-	log "github.com/sirupsen/logrus"
-	"github.com/spf13/cobra"
-	"os"
-)
-
-// KillCmd represents the kill command
-var KillCmd = &cobra.Command{
-	Use:   "kill",
-	Short: "Force kill alist server process by daemon/pid file",
-	Run: func(cmd *cobra.Command, args []string) {
-		kill()
-	},
-}
-
-func kill() {
-	initDaemon()
-	if pid == -1 {
-		log.Info("Seems not have been started. Try use `alist start` to start server.")
-		return
-	}
-	process, err := os.FindProcess(pid)
-	if err != nil {
-		log.Errorf("failed to find process by pid: %d, reason: %v", pid, process)
-		return
-	}
-	err = process.Kill()
-	if err != nil {
-		log.Errorf("failed to kill process %d: %v", pid, err)
-	} else {
-		log.Info("killed process: ", pid)
-	}
-	err = os.Remove(pidFile)
-	if err != nil {
-		log.Errorf("failed to remove pid file")
-	}
-	pid = -1
-}
-
-func init() {
-	RootCmd.AddCommand(KillCmd)
-
-	// Here you will define your flags and configuration settings.
-
-	// Cobra supports Persistent Flags which will work for this command
-	// and all subcommands, e.g.:
-	// stopCmd.PersistentFlags().String("foo", "", "A help for foo")
-
-	// Cobra supports local flags which will only run when this command
-	// is called directly, e.g.:
-	// stopCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
-}

cmd/lang.go

@@ -12,7 +12,6 @@ import (
 	"strings"
 
 	_ "github.com/alist-org/alist/v3/drivers"
-	"github.com/alist-org/alist/v3/internal/bootstrap"
 	"github.com/alist-org/alist/v3/internal/bootstrap/data"
 	"github.com/alist-org/alist/v3/internal/conf"
 	"github.com/alist-org/alist/v3/internal/op"
@@ -138,10 +137,9 @@ var LangCmd = &cobra.Command{
 	Use:   "lang",
 	Short: "Generate language json file",
 	Run: func(cmd *cobra.Command, args []string) {
-		bootstrap.InitConfig()
 		err := os.MkdirAll("lang", 0777)
 		if err != nil {
-			utils.Log.Fatalf("failed create folder: %s", err.Error())
+			utils.Log.Fatal("failed create folder: %s", err.Error())
 		}
 		generateDriversJson()
 		generateSettingsJson()

cmd/root.go

@@ -5,9 +5,6 @@ import (
 	"os"
 
 	"github.com/alist-org/alist/v3/cmd/flags"
-	_ "github.com/alist-org/alist/v3/drivers"
-	_ "github.com/alist-org/alist/v3/internal/archive"
-	_ "github.com/alist-org/alist/v3/internal/offline_download"
 	"github.com/spf13/cobra"
 )
 

cmd/server.go

@@ -2,21 +2,16 @@ package cmd
 
 import (
 	"context"
-	"errors"
 	"fmt"
-	ftpserver "github.com/KirCute/ftpserverlib-pasvportmap"
-	"github.com/KirCute/sftpd-alist"
-	"github.com/alist-org/alist/v3/internal/fs"
-	"net"
 	"net/http"
 	"os"
 	"os/signal"
-	"strconv"
 	"sync"
 	"syscall"
 	"time"
 
 	"github.com/alist-org/alist/v3/cmd/flags"
+	_ "github.com/alist-org/alist/v3/drivers"
 	"github.com/alist-org/alist/v3/internal/bootstrap"
 	"github.com/alist-org/alist/v3/internal/conf"
 	"github.com/alist-org/alist/v3/pkg/utils"
@@ -38,119 +33,38 @@ the address is defined in config file`,
 			utils.Log.Infof("delayed start for %d seconds", conf.Conf.DelayedStart)
 			time.Sleep(time.Duration(conf.Conf.DelayedStart) * time.Second)
 		}
-		bootstrap.InitOfflineDownloadTools()
+		bootstrap.InitAria2()
+		bootstrap.InitQbittorrent()
 		bootstrap.LoadStorages()
-		bootstrap.InitTaskManager()
 		if !flags.Debug && !flags.Dev {
 			gin.SetMode(gin.ReleaseMode)
 		}
 		r := gin.New()
 		r.Use(gin.LoggerWithWriter(log.StandardLogger().Out), gin.RecoveryWithWriter(log.StandardLogger().Out))
 		server.Init(r)
-		var httpSrv, httpsSrv, unixSrv *http.Server
+		var httpSrv, httpsSrv *http.Server
-		if conf.Conf.Scheme.HttpPort != -1 {
+		if !conf.Conf.Scheme.DisableHttp {
-			httpBase := fmt.Sprintf("%s:%d", conf.Conf.Scheme.Address, conf.Conf.Scheme.HttpPort)
+			httpBase := fmt.Sprintf("%s:%d", conf.Conf.Address, conf.Conf.Port)
 			utils.Log.Infof("start HTTP server @ %s", httpBase)
 			httpSrv = &http.Server{Addr: httpBase, Handler: r}
 			go func() {
 				err := httpSrv.ListenAndServe()
-				if err != nil && !errors.Is(err, http.ErrServerClosed) {
+				if err != nil && err != http.ErrServerClosed {
-					utils.Log.Fatalf("failed to start http: %s", err.Error())
+					utils.Log.Fatalf("failed to start: %s", err.Error())
 				}
 			}()
 		}
-		if conf.Conf.Scheme.HttpsPort != -1 {
+		if conf.Conf.Scheme.Https {
-			httpsBase := fmt.Sprintf("%s:%d", conf.Conf.Scheme.Address, conf.Conf.Scheme.HttpsPort)
+			httpsBase := fmt.Sprintf("%s:%d", conf.Conf.Address, conf.Conf.HttpsPort)
 			utils.Log.Infof("start HTTPS server @ %s", httpsBase)
 			httpsSrv = &http.Server{Addr: httpsBase, Handler: r}
 			go func() {
 				err := httpsSrv.ListenAndServeTLS(conf.Conf.Scheme.CertFile, conf.Conf.Scheme.KeyFile)
-				if err != nil && !errors.Is(err, http.ErrServerClosed) {
+				if err != nil && err != http.ErrServerClosed {
-					utils.Log.Fatalf("failed to start https: %s", err.Error())
+					utils.Log.Fatalf("failed to start: %s", err.Error())
 				}
 			}()
 		}
-		if conf.Conf.Scheme.UnixFile != "" {
-			utils.Log.Infof("start unix server @ %s", conf.Conf.Scheme.UnixFile)
-			unixSrv = &http.Server{Handler: r}
-			go func() {
-				listener, err := net.Listen("unix", conf.Conf.Scheme.UnixFile)
-				if err != nil {
-					utils.Log.Fatalf("failed to listen unix: %+v", err)
-				}
-				// set socket file permission
-				mode, err := strconv.ParseUint(conf.Conf.Scheme.UnixFilePerm, 8, 32)
-				if err != nil {
-					utils.Log.Errorf("failed to parse socket file permission: %+v", err)
-				} else {
-					err = os.Chmod(conf.Conf.Scheme.UnixFile, os.FileMode(mode))
-					if err != nil {
-						utils.Log.Errorf("failed to chmod socket file: %+v", err)
-					}
-				}
-				err = unixSrv.Serve(listener)
-				if err != nil && !errors.Is(err, http.ErrServerClosed) {
-					utils.Log.Fatalf("failed to start unix: %s", err.Error())
-				}
-			}()
-		}
-		if conf.Conf.S3.Port != -1 && conf.Conf.S3.Enable {
-			s3r := gin.New()
-			s3r.Use(gin.LoggerWithWriter(log.StandardLogger().Out), gin.RecoveryWithWriter(log.StandardLogger().Out))
-			server.InitS3(s3r)
-			s3Base := fmt.Sprintf("%s:%d", conf.Conf.Scheme.Address, conf.Conf.S3.Port)
-			utils.Log.Infof("start S3 server @ %s", s3Base)
-			go func() {
-				var err error
-				if conf.Conf.S3.SSL {
-					httpsSrv = &http.Server{Addr: s3Base, Handler: s3r}
-					err = httpsSrv.ListenAndServeTLS(conf.Conf.Scheme.CertFile, conf.Conf.Scheme.KeyFile)
-				}
-				if !conf.Conf.S3.SSL {
-					httpSrv = &http.Server{Addr: s3Base, Handler: s3r}
-					err = httpSrv.ListenAndServe()
-				}
-				if err != nil && !errors.Is(err, http.ErrServerClosed) {
-					utils.Log.Fatalf("failed to start s3 server: %s", err.Error())
-				}
-			}()
-		}
-		var ftpDriver *server.FtpMainDriver
-		var ftpServer *ftpserver.FtpServer
-		if conf.Conf.FTP.Listen != "" && conf.Conf.FTP.Enable {
-			var err error
-			ftpDriver, err = server.NewMainDriver()
-			if err != nil {
-				utils.Log.Fatalf("failed to start ftp driver: %s", err.Error())
-			} else {
-				utils.Log.Infof("start ftp server on %s", conf.Conf.FTP.Listen)
-				go func() {
-					ftpServer = ftpserver.NewFtpServer(ftpDriver)
-					err = ftpServer.ListenAndServe()
-					if err != nil {
-						utils.Log.Fatalf("problem ftp server listening: %s", err.Error())
-					}
-				}()
-			}
-		}
-		var sftpDriver *server.SftpDriver
-		var sftpServer *sftpd.SftpServer
-		if conf.Conf.SFTP.Listen != "" && conf.Conf.SFTP.Enable {
-			var err error
-			sftpDriver, err = server.NewSftpDriver()
-			if err != nil {
-				utils.Log.Fatalf("failed to start sftp driver: %s", err.Error())
-			} else {
-				utils.Log.Infof("start sftp server on %s", conf.Conf.SFTP.Listen)
-				go func() {
-					sftpServer = sftpd.NewSftpServer(sftpDriver)
-					err = sftpServer.RunServer()
-					if err != nil {
-						utils.Log.Fatalf("problem sftp server listening: %s", err.Error())
-					}
-				}()
-			}
-		}
 		// Wait for interrupt signal to gracefully shutdown the server with
 		// a timeout of 1 second.
 		quit := make(chan os.Signal, 1)
@@ -160,54 +74,25 @@ the address is defined in config file`,
 		signal.Notify(quit, syscall.SIGINT, syscall.SIGTERM)
 		<-quit
 		utils.Log.Println("Shutdown server...")
-		fs.ArchiveContentUploadTaskManager.RemoveAll()
+
-		Release()
 		ctx, cancel := context.WithTimeout(context.Background(), 1*time.Second)
 		defer cancel()
 		var wg sync.WaitGroup
-		if conf.Conf.Scheme.HttpPort != -1 {
+		if !conf.Conf.Scheme.DisableHttp {
 			wg.Add(1)
 			go func() {
 				defer wg.Done()
 				if err := httpSrv.Shutdown(ctx); err != nil {
-					utils.Log.Fatal("HTTP server shutdown err: ", err)
+					utils.Log.Fatal("HTTP server shutdown:", err)
 				}
 			}()
 		}
-		if conf.Conf.Scheme.HttpsPort != -1 {
+		if conf.Conf.Scheme.Https {
 			wg.Add(1)
 			go func() {
 				defer wg.Done()
 				if err := httpsSrv.Shutdown(ctx); err != nil {
-					utils.Log.Fatal("HTTPS server shutdown err: ", err)
+					utils.Log.Fatal("HTTPS server shutdown:", err)
-				}
-			}()
-		}
-		if conf.Conf.Scheme.UnixFile != "" {
-			wg.Add(1)
-			go func() {
-				defer wg.Done()
-				if err := unixSrv.Shutdown(ctx); err != nil {
-					utils.Log.Fatal("Unix server shutdown err: ", err)
-				}
-			}()
-		}
-		if conf.Conf.FTP.Listen != "" && conf.Conf.FTP.Enable && ftpServer != nil && ftpDriver != nil {
-			wg.Add(1)
-			go func() {
-				defer wg.Done()
-				ftpDriver.Stop()
-				if err := ftpServer.Stop(); err != nil {
-					utils.Log.Fatal("FTP server shutdown err: ", err)
-				}
-			}()
-		}
-		if conf.Conf.SFTP.Listen != "" && conf.Conf.SFTP.Enable && sftpServer != nil && sftpDriver != nil {
-			wg.Add(1)
-			go func() {
-				defer wg.Done()
-				if err := sftpServer.Close(); err != nil {
-					utils.Log.Fatal("SFTP server shutdown err: ", err)
 				}
 			}()
 		}

cmd/stop.go

@@ -1,10 +1,10 @@
-//go:build !windows
+/*
-
+Copyright © 2022 NAME HERE <EMAIL ADDRESS>
+*/
 package cmd
 
 import (
 	"os"
-	"syscall"
 
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
@@ -30,11 +30,11 @@ func stop() {
 		log.Errorf("failed to find process by pid: %d, reason: %v", pid, process)
 		return
 	}
-	err = process.Signal(syscall.SIGTERM)
+	err = process.Kill()
 	if err != nil {
-		log.Errorf("failed to terminate process %d: %v", pid, err)
+		log.Errorf("failed to kill process %d: %v", pid, err)
 	} else {
-		log.Info("terminated process: ", pid)
+		log.Info("killed process: ", pid)
 	}
 	err = os.Remove(pidFile)
 	if err != nil {

cmd/stop_windows.go

@@ -1,34 +0,0 @@
-//go:build windows
-
-package cmd
-
-import (
-	"github.com/spf13/cobra"
-)
-
-// StopCmd represents the stop command
-var StopCmd = &cobra.Command{
-	Use:   "stop",
-	Short: "Same as the kill command",
-	Run: func(cmd *cobra.Command, args []string) {
-		stop()
-	},
-}
-
-func stop() {
-	kill()
-}
-
-func init() {
-	RootCmd.AddCommand(StopCmd)
-
-	// Here you will define your flags and configuration settings.
-
-	// Cobra supports Persistent Flags which will work for this command
-	// and all subcommands, e.g.:
-	// stopCmd.PersistentFlags().String("foo", "", "A help for foo")
-
-	// Cobra supports local flags which will only run when this command
-	// is called directly, e.g.:
-	// stopCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
-}

cmd/storage.go

@@ -4,14 +4,8 @@ Copyright © 2023 NAME HERE <EMAIL ADDRESS>
 package cmd
 
 import (
-	"os"
-	"strconv"
-
 	"github.com/alist-org/alist/v3/internal/db"
 	"github.com/alist-org/alist/v3/pkg/utils"
-	"github.com/charmbracelet/bubbles/table"
-	tea "github.com/charmbracelet/bubbletea"
-	"github.com/charmbracelet/lipgloss"
 	"github.com/spf13/cobra"
 )
 
@@ -21,136 +15,31 @@ var storageCmd = &cobra.Command{
 	Short: "Manage storage",
 }
 
-var disableStorageCmd = &cobra.Command{
-	Use:   "disable",
-	Short: "Disable a storage",
-	Run: func(cmd *cobra.Command, args []string) {
-		if len(args) < 1 {
-			utils.Log.Errorf("mount path is required")
-			return
-		}
-		mountPath := args[0]
-		Init()
-		defer Release()
-		storage, err := db.GetStorageByMountPath(mountPath)
-		if err != nil {
-			utils.Log.Errorf("failed to query storage: %+v", err)
-		} else {
-			storage.Disabled = true
-			err = db.UpdateStorage(storage)
-			if err != nil {
-				utils.Log.Errorf("failed to update storage: %+v", err)
-			} else {
-				utils.Log.Infof("Storage with mount path [%s] have been disabled", mountPath)
-			}
-		}
-	},
-}
-
-var baseStyle = lipgloss.NewStyle().
-	BorderStyle(lipgloss.NormalBorder()).
-	BorderForeground(lipgloss.Color("240"))
-
-type model struct {
-	table table.Model
-}
-
-func (m model) Init() tea.Cmd { return nil }
-
-func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
-	var cmd tea.Cmd
-	switch msg := msg.(type) {
-	case tea.KeyMsg:
-		switch msg.String() {
-		case "esc":
-			if m.table.Focused() {
-				m.table.Blur()
-			} else {
-				m.table.Focus()
-			}
-		case "q", "ctrl+c":
-			return m, tea.Quit
-			//case "enter":
-			//	return m, tea.Batch(
-			//		tea.Printf("Let's go to %s!", m.table.SelectedRow()[1]),
-			//	)
-		}
-	}
-	m.table, cmd = m.table.Update(msg)
-	return m, cmd
-}
-
-func (m model) View() string {
-	return baseStyle.Render(m.table.View()) + "\n"
-}
-
-var storageTableHeight int
-var listStorageCmd = &cobra.Command{
-	Use:   "list",
-	Short: "List all storages",
-	Run: func(cmd *cobra.Command, args []string) {
-		Init()
-		defer Release()
-		storages, _, err := db.GetStorages(1, -1)
-		if err != nil {
-			utils.Log.Errorf("failed to query storages: %+v", err)
-		} else {
-			utils.Log.Infof("Found %d storages", len(storages))
-			columns := []table.Column{
-				{Title: "ID", Width: 4},
-				{Title: "Driver", Width: 16},
-				{Title: "Mount Path", Width: 30},
-				{Title: "Enabled", Width: 7},
-			}
-
-			var rows []table.Row
-			for i := range storages {
-				storage := storages[i]
-				enabled := "true"
-				if storage.Disabled {
-					enabled = "false"
-				}
-				rows = append(rows, table.Row{
-					strconv.Itoa(int(storage.ID)),
-					storage.Driver,
-					storage.MountPath,
-					enabled,
-				})
-			}
-			t := table.New(
-				table.WithColumns(columns),
-				table.WithRows(rows),
-				table.WithFocused(true),
-				table.WithHeight(storageTableHeight),
-			)
-
-			s := table.DefaultStyles()
-			s.Header = s.Header.
-				BorderStyle(lipgloss.NormalBorder()).
-				BorderForeground(lipgloss.Color("240")).
-				BorderBottom(true).
-				Bold(false)
-			s.Selected = s.Selected.
-				Foreground(lipgloss.Color("229")).
-				Background(lipgloss.Color("57")).
-				Bold(false)
-			t.SetStyles(s)
-
-			m := model{t}
-			if _, err := tea.NewProgram(m).Run(); err != nil {
-				utils.Log.Errorf("failed to run program: %+v", err)
-				os.Exit(1)
-			}
-		}
-	},
-}
-
 func init() {
-
+	var mountPath string
+	var disable = &cobra.Command{
+		Use:   "disable",
+		Short: "Disable a storage",
+		Run: func(cmd *cobra.Command, args []string) {
+			Init()
+			storage, err := db.GetStorageByMountPath(mountPath)
+			if err != nil {
+				utils.Log.Errorf("failed to query storage: %+v", err)
+			} else {
+				storage.Disabled = true
+				err = db.UpdateStorage(storage)
+				if err != nil {
+					utils.Log.Errorf("failed to update storage: %+v", err)
+				} else {
+					utils.Log.Infof("Storage with mount path [%s] have been disabled", mountPath)
+				}
+			}
+		},
+	}
+	disable.Flags().StringVarP(&mountPath, "mount-path", "m", "", "The mountPath of storage")
 	RootCmd.AddCommand(storageCmd)
-	storageCmd.AddCommand(disableStorageCmd)
+	storageCmd.AddCommand(disable)
-	storageCmd.AddCommand(listStorageCmd)
+
-	storageCmd.PersistentFlags().IntVarP(&storageTableHeight, "height", "H", 10, "Table height")
 	// Here you will define your flags and configuration settings.
 
 	// Cobra supports Persistent Flags which will work for this command

cmd/user.go

@@ -1,52 +0,0 @@
-package cmd
-
-import (
-	"crypto/tls"
-	"fmt"
-	"time"
-
-	"github.com/alist-org/alist/v3/internal/conf"
-	"github.com/alist-org/alist/v3/internal/op"
-	"github.com/alist-org/alist/v3/internal/setting"
-	"github.com/alist-org/alist/v3/pkg/utils"
-	"github.com/go-resty/resty/v2"
-)
-
-func DelAdminCacheOnline() {
-	admin, err := op.GetAdmin()
-	if err != nil {
-		utils.Log.Errorf("[del_admin_cache] get admin error: %+v", err)
-		return
-	}
-	DelUserCacheOnline(admin.Username)
-}
-
-func DelUserCacheOnline(username string) {
-	client := resty.New().SetTimeout(1 * time.Second).SetTLSClientConfig(&tls.Config{InsecureSkipVerify: conf.Conf.TlsInsecureSkipVerify})
-	token := setting.GetStr(conf.Token)
-	port := conf.Conf.Scheme.HttpPort
-	u := fmt.Sprintf("http://localhost:%d/api/admin/user/del_cache", port)
-	if port == -1 {
-		if conf.Conf.Scheme.HttpsPort == -1 {
-			utils.Log.Warnf("[del_user_cache] no open port")
-			return
-		}
-		u = fmt.Sprintf("https://localhost:%d/api/admin/user/del_cache", conf.Conf.Scheme.HttpsPort)
-	}
-	res, err := client.R().SetHeader("Authorization", token).SetQueryParam("username", username).Post(u)
-	if err != nil {
-		utils.Log.Warnf("[del_user_cache_online] failed: %+v", err)
-		return
-	}
-	if res.StatusCode() != 200 {
-		utils.Log.Warnf("[del_user_cache_online] failed: %+v", res.String())
-		return
-	}
-	code := utils.Json.Get(res.Body(), "code").ToInt()
-	msg := utils.Json.Get(res.Body(), "message").ToString()
-	if code != 200 {
-		utils.Log.Errorf("[del_user_cache_online] error: %s", msg)
-		return
-	}
-	utils.Log.Debugf("[del_user_cache_online] del user [%s] cache success", username)
-}

cmd/version.go

@@ -6,7 +6,6 @@ package cmd
 import (
 	"fmt"
 	"os"
-	"runtime"
 
 	"github.com/alist-org/alist/v3/internal/conf"
 	"github.com/spf13/cobra"
@@ -17,15 +16,14 @@ var VersionCmd = &cobra.Command{
 	Use:   "version",
 	Short: "Show current version of AList",
 	Run: func(cmd *cobra.Command, args []string) {
-		goVersion := fmt.Sprintf("%s %s/%s", runtime.Version(), runtime.GOOS, runtime.GOARCH)
-
 		fmt.Printf(`Built At: %s
 Go Version: %s
 Author: %s
 Commit ID: %s
 Version: %s
 WebVersion: %s
-`, conf.BuiltAt, goVersion, conf.GitAuthor, conf.GitCommit, conf.Version, conf.WebVersion)
+`,
+			conf.BuiltAt, conf.GoVersion, conf.GitAuthor, conf.GitCommit, conf.Version, conf.WebVersion)
 		os.Exit(0)
 	},
 }

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,24 +2,19 @@ package _115
 
 import (
 	"context"
-	"strings"
+	"os"
-	"sync"
 
 	driver115 "github.com/SheltonZhu/115driver/pkg/driver"
 	"github.com/alist-org/alist/v3/internal/driver"
 	"github.com/alist-org/alist/v3/internal/model"
-	"github.com/alist-org/alist/v3/pkg/http_range"
 	"github.com/alist-org/alist/v3/pkg/utils"
 	"github.com/pkg/errors"
-	"golang.org/x/time/rate"
 )
 
 type Pan115 struct {
 	model.Storage
 	Addition
-	client     *driver115.Pan115Client
+	client *driver115.Pan115Client
-	limiter    *rate.Limiter
-	appVerOnce sync.Once
 }
 
 func (d *Pan115) Config() driver.Config {
@@ -31,44 +26,29 @@ 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)
-	}
 	return d.login()
 }
 
-func (d *Pan115) WaitLimit(ctx context.Context) error {
-	if d.limiter != nil {
-		return d.limiter.Wait(ctx)
-	}
-	return nil
-}
-
 func (d *Pan115) Drop(ctx context.Context) error {
 	return nil
 }
 
 func (d *Pan115) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([]model.Obj, error) {
-	if err := d.WaitLimit(ctx); err != nil {
-		return nil, err
-	}
 	files, err := d.getFiles(dir.GetID())
 	if err != nil && !errors.Is(err, driver115.ErrNotExist) {
 		return nil, err
 	}
-	return utils.SliceConvert(files, func(src FileObj) (model.Obj, error) {
+	return utils.SliceConvert(files, func(src driver115.File) (model.Obj, error) {
-		return &src, nil
+		return src, nil
 	})
 }
 
 func (d *Pan115) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
-	if err := d.WaitLimit(ctx); err != nil {
+	downloadInfo, err := d.client.
-		return nil, err
+		SetUserAgent(driver115.UA115Browser).
-	}
+		Download(file.(driver115.File).PickCode)
-	userAgent := args.Header.Get("User-Agent")
+	// recover for upload
-	downloadInfo, err := d.
+	d.client.SetUserAgent(driver115.UA115Desktop)
-		DownloadWithUA(file.(*FileObj).PickCode, userAgent)
 	if err != nil {
 		return nil, err
 	}
@@ -79,173 +59,39 @@ func (d *Pan115) Link(ctx context.Context, file model.Obj, args model.LinkArgs)
 	return link, nil
 }
 
-func (d *Pan115) MakeDir(ctx context.Context, parentDir model.Obj, dirName string) (model.Obj, error) {
+func (d *Pan115) MakeDir(ctx context.Context, parentDir model.Obj, dirName string) error {
-	if err := d.WaitLimit(ctx); err != nil {
+	if _, err := d.client.Mkdir(parentDir.GetID(), dirName); err != nil {
-		return nil, err
+		return err
 	}
-
+	return nil
-	result := driver115.MkdirResp{}
-	form := map[string]string{
-		"pid":   parentDir.GetID(),
-		"cname": dirName,
-	}
-	req := d.client.NewRequest().
-		SetFormData(form).
-		SetResult(&result).
-		ForceContentType("application/json;charset=UTF-8")
-
-	resp, err := req.Post(driver115.ApiDirAdd)
-
-	err = driver115.CheckErr(err, &result, resp)
-	if err != nil {
-		return nil, err
-	}
-	f, err := d.getNewFile(result.FileID)
-	if err != nil {
-		return nil, nil
-	}
-	return f, nil
 }
 
-func (d *Pan115) Move(ctx context.Context, srcObj, dstDir model.Obj) (model.Obj, error) {
+func (d *Pan115) Move(ctx context.Context, srcObj, dstDir model.Obj) error {
-	if err := d.WaitLimit(ctx); err != nil {
+	return d.client.Move(dstDir.GetID(), srcObj.GetID())
-		return nil, err
-	}
-	if err := d.client.Move(dstDir.GetID(), srcObj.GetID()); err != nil {
-		return nil, err
-	}
-	f, err := d.getNewFile(srcObj.GetID())
-	if err != nil {
-		return nil, nil
-	}
-	return f, nil
 }
 
-func (d *Pan115) Rename(ctx context.Context, srcObj model.Obj, newName string) (model.Obj, error) {
+func (d *Pan115) Rename(ctx context.Context, srcObj model.Obj, newName string) error {
-	if err := d.WaitLimit(ctx); err != nil {
+	return d.client.Rename(srcObj.GetID(), newName)
-		return nil, err
-	}
-	if err := d.client.Rename(srcObj.GetID(), newName); err != nil {
-		return nil, err
-	}
-	f, err := d.getNewFile((srcObj.GetID()))
-	if err != nil {
-		return nil, nil
-	}
-	return f, nil
 }
 
 func (d *Pan115) Copy(ctx context.Context, srcObj, dstDir model.Obj) error {
-	if err := d.WaitLimit(ctx); err != nil {
-		return err
-	}
 	return d.client.Copy(dstDir.GetID(), srcObj.GetID())
 }
 
 func (d *Pan115) Remove(ctx context.Context, obj model.Obj) error {
-	if err := d.WaitLimit(ctx); err != nil {
-		return err
-	}
 	return d.client.Delete(obj.GetID())
 }
 
-func (d *Pan115) Put(ctx context.Context, dstDir model.Obj, stream model.FileStreamer, up driver.UpdateProgress) (model.Obj, error) {
+func (d *Pan115) Put(ctx context.Context, dstDir model.Obj, stream model.FileStreamer, up driver.UpdateProgress) error {
-	if err := d.WaitLimit(ctx); err != nil {
+	tempFile, err := utils.CreateTempFile(stream.GetReadCloser())
-		return nil, err
-	}
-
-	var (
-		fastInfo *driver115.UploadInitResp
-		dirID    = dstDir.GetID()
-	)
-
-	if ok, err := d.client.UploadAvailable(); err != nil || !ok {
-		return nil, err
-	}
-	if stream.GetSize() > d.client.UploadMetaInfo.SizeLimit {
-		return nil, driver115.ErrUploadTooLarge
-	}
-	//if digest, err = d.client.GetDigestResult(stream); err != nil {
-	//	return err
-	//}
-
-	const PreHashSize int64 = 128 * utils.KB
-	hashSize := PreHashSize
-	if stream.GetSize() < PreHashSize {
-		hashSize = stream.GetSize()
-	}
-	reader, err := stream.RangeRead(http_range.Range{Start: 0, Length: hashSize})
 	if err != nil {
-		return nil, err
+		return err
 	}
-	preHash, err := utils.HashReader(utils.SHA1, reader)
+	defer func() {
-	if err != nil {
+		_ = tempFile.Close()
-		return nil, err
+		_ = os.Remove(tempFile.Name())
-	}
+	}()
-	preHash = strings.ToUpper(preHash)
+	return d.client.UploadFastOrByMultipart(dstDir.GetID(), stream.GetName(), stream.GetSize(), tempFile)
-	fullHash := stream.GetHash().GetHash(utils.SHA1)
-	if len(fullHash) <= 0 {
-		tmpF, err := stream.CacheFullInTempFile()
-		if err != nil {
-			return nil, err
-		}
-		fullHash, err = utils.HashFile(utils.SHA1, tmpF)
-		if err != nil {
-			return nil, err
-		}
-	}
-	fullHash = strings.ToUpper(fullHash)
-
-	// rapid-upload
-	// note that 115 add timeout for rapid-upload,
-	// and "sig invalid" err is thrown even when the hash is correct after timeout.
-	if fastInfo, err = d.rapidUpload(stream.GetSize(), stream.GetName(), dirID, preHash, fullHash, stream); err != nil {
-		return nil, err
-	}
-	if matched, err := fastInfo.Ok(); err != nil {
-		return nil, err
-	} else if matched {
-		f, err := d.getNewFileByPickCode(fastInfo.PickCode)
-		if err != nil {
-			return nil, nil
-		}
-		return f, nil
-	}
-
-	var uploadResult *UploadResult
-	// 闪传失败，上传
-	if stream.GetSize() <= 10*utils.MB { // 文件大小小于10MB，改用普通模式上传
-		if uploadResult, err = d.UploadByOSS(ctx, &fastInfo.UploadOSSParams, stream, dirID, up); err != nil {
-			return nil, err
-		}
-	} else {
-		// 分片上传
-		if uploadResult, err = d.UploadByMultipart(ctx, &fastInfo.UploadOSSParams, stream.GetSize(), stream, dirID, up); err != nil {
-			return nil, err
-		}
-	}
-
-	file, err := d.getNewFile(uploadResult.Data.FileID)
-	if err != nil {
-		return nil, nil
-	}
-	return file, nil
-}
-
-func (d *Pan115) OfflineList(ctx context.Context) ([]*driver115.OfflineTask, error) {
-	resp, err := d.client.ListOfflineTask(0)
-	if err != nil {
-		return nil, err
-	}
-	return resp.Tasks, nil
-}
-
-func (d *Pan115) OfflineDownload(ctx context.Context, uris []string, dstDir model.Obj) ([]string, error) {
-	return d.client.AddOfflineTaskURIs(uris, dstDir.GetID(), driver115.WithAppVer(appVer))
-}
-
-func (d *Pan115) DeleteOfflineTasks(ctx context.Context, hashes []string, deleteFiles bool) error {
-	return d.client.DeleteOfflineTasks(hashes, deleteFiles)
 }
 
 var _ driver.Driver = (*Pan115)(nil)

drivers/115/meta.go

@@ -6,20 +6,18 @@ import (
 )
 
 type Addition struct {
-	Cookie       string  `json:"cookie" type:"text" help:"one of QR code token and cookie required"`
+	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"`
+	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:"56" help:"list api per page size of 115 driver"`
-	PageSize     int64   `json:"page_size" type:"number" default:"1000" help:"list api per page size of 115 driver"`
-	LimitRate    float64 `json:"limit_rate" type:"float" default:"2" help:"limit all api request rate ([limit]r/1s)"`
 	driver.RootID
 }
 
 var config = driver.Config{
-	Name:        "115 Cloud",
+	Name:              "115 Cloud",
-	DefaultRoot: "0",
+	DefaultRoot:       "0",
-	// OnlyProxy:   true,
+	OnlyProxy:         true,
-	// OnlyLocal:         true,
+	OnlyLocal:         true,
-	// NoOverwriteUpload: true,
+	NoOverwriteUpload: true,
 }
 
 func init() {

drivers/115/types.go

@@ -1,38 +1,8 @@
 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"
 )
 
-var _ model.Obj = (*FileObj)(nil)
+var _ model.Obj = (*driver.File)(nil)
-
-type FileObj struct {
-	driver.File
-}
-
-func (f *FileObj) CreateTime() time.Time {
-	return f.File.CreateTime
-}
-
-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

@@ -1,57 +1,34 @@
 package _115
 
 import (
-	"bytes"
-	"context"
-	"crypto/md5"
-	"crypto/tls"
-	"encoding/hex"
-	"encoding/json"
 	"fmt"
-	"io"
-	"net/http"
-	"net/url"
-	"strconv"
-	"strings"
-	"sync"
-	"sync/atomic"
-	"time"
 
-	"github.com/alist-org/alist/v3/internal/conf"
+	"github.com/SheltonZhu/115driver/pkg/driver"
-	"github.com/alist-org/alist/v3/internal/driver"
+	"github.com/alist-org/alist/v3/drivers/base"
-	"github.com/alist-org/alist/v3/internal/model"
-	"github.com/alist-org/alist/v3/pkg/http_range"
-	"github.com/alist-org/alist/v3/pkg/utils"
-	"github.com/aliyun/aliyun-oss-go-sdk/oss"
-
-	cipher "github.com/SheltonZhu/115driver/pkg/crypto/ec115"
-	crypto "github.com/SheltonZhu/115driver/pkg/crypto/m115"
-	driver115 "github.com/SheltonZhu/115driver/pkg/driver"
 	"github.com/pkg/errors"
 )
 
-// var UserAgent = driver115.UA115Browser
+var UserAgent = driver.UA115Desktop
+
 func (d *Pan115) login() error {
 	var err error
-	opts := []driver115.Option{
+	opts := []driver.Option{
-		driver115.UA(d.getUA()),
+		driver.UA(UserAgent),
-		func(c *driver115.Pan115Client) {
-			c.Client.SetTLSClientConfig(&tls.Config{InsecureSkipVerify: conf.Conf.TlsInsecureSkipVerify})
-		},
 	}
-	d.client = driver115.New(opts...)
+	d.client = driver.New(opts...)
-	cr := &driver115.Credential{}
+	d.client.SetHttpClient(base.HttpClient)
-	if d.QRCodeToken != "" {
+	cr := &driver.Credential{}
-		s := &driver115.QRCodeSession{
+	if d.Addition.QRCodeToken != "" {
-			UID: d.QRCodeToken,
+		s := &driver.QRCodeSession{
+			UID: d.Addition.QRCodeToken,
 		}
-		if cr, err = d.client.QRCodeLoginWithApp(s, driver115.LoginApp(d.QRCodeSource)); err != nil {
+		if cr, err = d.client.QRCodeLogin(s); err != nil {
 			return errors.Wrap(err, "failed to login by qrcode")
 		}
-		d.Cookie = fmt.Sprintf("UID=%s;CID=%s;SEID=%s;KID=%s", cr.UID, cr.CID, cr.SEID, cr.KID)
+		d.Addition.Cookie = fmt.Sprintf("UID=%s;CID=%s;SEID=%s", cr.UID, cr.CID, cr.SEID)
-		d.QRCodeToken = ""
+		d.Addition.QRCodeToken = ""
-	} else if d.Cookie != "" {
+	} else if d.Addition.Cookie != "" {
-		if err = cr.FromCookie(d.Cookie); err != nil {
+		if err = cr.FromCookie(d.Addition.Cookie); err != nil {
 			return errors.Wrap(err, "failed to login by cookies")
 		}
 		d.client.ImportCredential(cr)
@@ -61,489 +38,17 @@ func (d *Pan115) login() error {
 	return d.client.LoginCheck()
 }
 
-func (d *Pan115) getFiles(fileId string) ([]FileObj, error) {
+func (d *Pan115) getFiles(fileId string) ([]driver.File, error) {
-	res := make([]FileObj, 0)
+	res := make([]driver.File, 0)
 	if d.PageSize <= 0 {
-		d.PageSize = driver115.FileListLimit
+		d.PageSize = driver.FileListLimit
 	}
-	files, err := d.client.ListWithLimit(fileId, d.PageSize, driver115.WithMultiUrls())
+	files, err := d.client.ListWithLimit(fileId, d.PageSize)
 	if err != nil {
 		return nil, err
 	}
 	for _, file := range *files {
-		res = append(res, FileObj{file})
+		res = append(res, file)
 	}
 	return res, nil
 }
-
-func (d *Pan115) getNewFile(fileId string) (*FileObj, error) {
-	file, err := d.client.GetFile(fileId)
-	if err != nil {
-		return nil, err
-	}
-	return &FileObj{*file}, nil
-}
-
-func (d *Pan115) getNewFileByPickCode(pickCode string) (*FileObj, error) {
-	result := driver115.GetFileInfoResponse{}
-	req := d.client.NewRequest().
-		SetQueryParam("pick_code", pickCode).
-		ForceContentType("application/json;charset=UTF-8").
-		SetResult(&result)
-	resp, err := req.Get(driver115.ApiFileInfo)
-	if err := driver115.CheckErr(err, &result, resp); err != nil {
-		return nil, err
-	}
-	if len(result.Files) == 0 {
-		return nil, errors.New("not get file info")
-	}
-	fileInfo := result.Files[0]
-
-	f := &FileObj{}
-	f.From(fileInfo)
-	return f, nil
-}
-
-func (d *Pan115) getUA() string {
-	return fmt.Sprintf("Mozilla/5.0 115Browser/%s", appVer)
-}
-
-func (d *Pan115) DownloadWithUA(pickCode, ua string) (*driver115.DownloadInfo, error) {
-	key := crypto.GenerateKey()
-	result := driver115.DownloadResp{}
-	params, err := utils.Json.Marshal(map[string]string{"pick_code": pickCode})
-	if err != nil {
-		return nil, err
-	}
-
-	data := crypto.Encode(params, key)
-
-	bodyReader := strings.NewReader(url.Values{"data": []string{data}}.Encode())
-	reqUrl := fmt.Sprintf("%s?t=%s", driver115.AndroidApiDownloadGetUrl, 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("User-Agent", ua)
-
-	resp, err := d.client.Client.GetClient().Do(req)
-	if err != nil {
-		return nil, err
-	}
-	defer resp.Body.Close()
-
-	body, err := io.ReadAll(resp.Body)
-	if err != nil {
-		return nil, err
-	}
-	if err := utils.Json.Unmarshal(body, &result); err != nil {
-		return nil, err
-	}
-
-	if err = result.Err(string(body)); err != nil {
-		return nil, err
-	}
-
-	b, err := crypto.Decode(string(result.EncodedData), key)
-	if err != nil {
-		return nil, err
-	}
-
-	downloadInfo := struct {
-		Url string `json:"url"`
-	}{}
-	if err := utils.Json.Unmarshal(b, &downloadInfo); err != nil {
-		return nil, err
-	}
-
-	info := &driver115.DownloadInfo{}
-	info.PickCode = pickCode
-	info.Header = resp.Request.Header
-	info.Url.Url = downloadInfo.Url
-	return info, nil
-}
-
-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
-		encrypted    []byte
-		decrypted    []byte
-		encodedToken string
-		err          error
-		target       = "U_1_" + dirID
-		bodyBytes    []byte
-		result       = driver115.UploadInitResp{}
-		fileSizeStr  = strconv.FormatInt(fileSize, 10)
-	)
-	if ecdhCipher, err = cipher.NewEcdhCipher(); err != nil {
-		return nil, err
-	}
-
-	userID := strconv.FormatInt(d.client.UserID, 10)
-	form := url.Values{}
-	form.Set("appid", "0")
-	form.Set("appversion", appVer)
-	form.Set("userid", userID)
-	form.Set("filename", fileName)
-	form.Set("filesize", fileSizeStr)
-	form.Set("fileid", fileID)
-	form.Set("target", target)
-	form.Set("sig", d.client.GenerateSignature(fileID, target))
-
-	signKey, signVal := "", ""
-	for retry := true; retry; {
-		t := driver115.NowMilli()
-
-		if encodedToken, err = ecdhCipher.EncodeToken(t.ToInt64()); err != nil {
-			return nil, err
-		}
-
-		params := map[string]string{
-			"k_ec": encodedToken,
-		}
-
-		form.Set("t", t.String())
-		form.Set("token", d.GenerateToken(fileID, preID, t.String(), fileSizeStr, signKey, signVal))
-		if signKey != "" && signVal != "" {
-			form.Set("sign_key", signKey)
-			form.Set("sign_val", signVal)
-		}
-		if encrypted, err = ecdhCipher.Encrypt([]byte(form.Encode())); err != nil {
-			return nil, err
-		}
-
-		req := d.client.NewRequest().
-			SetQueryParams(params).
-			SetBody(encrypted).
-			SetHeaderVerbatim("Content-Type", "application/x-www-form-urlencoded").
-			SetDoNotParseResponse(true)
-		resp, err := req.Post(driver115.ApiUploadInit)
-		if err != nil {
-			return nil, err
-		}
-		data := resp.RawBody()
-		defer data.Close()
-		if bodyBytes, err = io.ReadAll(data); err != nil {
-			return nil, err
-		}
-		if decrypted, err = ecdhCipher.Decrypt(bodyBytes); err != nil {
-			return nil, err
-		}
-		if err = driver115.CheckErr(json.Unmarshal(decrypted, &result), &result, resp); err != nil {
-			return nil, err
-		}
-		if result.Status == 7 {
-			// Update signKey & signVal
-			signKey = result.SignKey
-			signVal, err = UploadDigestRange(stream, result.SignCheck)
-			if err != nil {
-				return nil, err
-			}
-		} else {
-			retry = false
-		}
-		result.SHA1 = fileID
-	}
-
-	return &result, nil
-}
-
-func UploadDigestRange(stream model.FileStreamer, rangeSpec string) (result string, err error) {
-	var start, end int64
-	if _, err = fmt.Sscanf(rangeSpec, "%d-%d", &start, &end); err != nil {
-		return
-	}
-
-	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
-	}
-	result = strings.ToUpper(hashStr)
-	return
-}
-
-// UploadByOSS use aliyun sdk to upload
-func (c *Pan115) UploadByOSS(ctx context.Context, params *driver115.UploadOSSParams, s model.FileStreamer, dirID string, up driver.UpdateProgress) (*UploadResult, error) {
-	ossToken, err := c.client.GetOSSToken()
-	if err != nil {
-		return nil, err
-	}
-	ossClient, err := oss.New(driver115.OSSEndpoint, ossToken.AccessKeyID, ossToken.AccessKeySecret)
-	if err != nil {
-		return nil, err
-	}
-	bucket, err := ossClient.Bucket(params.Bucket)
-	if err != nil {
-		return nil, err
-	}
-
-	var bodyBytes []byte
-	r := driver.NewLimitedUploadStream(ctx, &driver.ReaderUpdatingProgress{
-		Reader:         s,
-		UpdateProgress: up,
-	})
-	if err = bucket.PutObject(params.Object, r, append(
-		driver115.OssOption(params, ossToken),
-		oss.CallbackResult(&bodyBytes),
-	)...); err != nil {
-		return nil, err
-	}
-
-	var uploadResult UploadResult
-	if err = json.Unmarshal(bodyBytes, &uploadResult); err != nil {
-		return nil, err
-	}
-	return &uploadResult, uploadResult.Err(string(bodyBytes))
-}
-
-// UploadByMultipart upload by mutipart blocks
-func (d *Pan115) UploadByMultipart(ctx context.Context, params *driver115.UploadOSSParams, fileSize int64, s model.FileStreamer,
-	dirID string, up driver.UpdateProgress, opts ...driver115.UploadMultipartOption) (*UploadResult, error) {
-	var (
-		chunks    []oss.FileChunk
-		parts     []oss.UploadPart
-		imur      oss.InitiateMultipartUploadResult
-		ossClient *oss.Client
-		bucket    *oss.Bucket
-		ossToken  *driver115.UploadOSSTokenResp
-		bodyBytes []byte
-		err       error
-	)
-
-	tmpF, err := s.CacheFullInTempFile()
-	if err != nil {
-		return nil, err
-	}
-
-	options := driver115.DefalutUploadMultipartOptions()
-	if len(opts) > 0 {
-		for _, f := range opts {
-			f(options)
-		}
-	}
-	// oss 启用Sequential必须按顺序上传
-	options.ThreadsNum = 1
-
-	if ossToken, err = d.client.GetOSSToken(); err != nil {
-		return nil, err
-	}
-
-	if ossClient, err = oss.New(driver115.OSSEndpoint, ossToken.AccessKeyID, ossToken.AccessKeySecret, oss.EnableMD5(true), oss.EnableCRC(true)); err != nil {
-		return nil, err
-	}
-
-	if bucket, err = ossClient.Bucket(params.Bucket); err != nil {
-		return nil, err
-	}
-
-	// ossToken一小时后就会失效，所以每50分钟重新获取一次
-	ticker := time.NewTicker(options.TokenRefreshTime)
-	defer ticker.Stop()
-	// 设置超时
-	timeout := time.NewTimer(options.Timeout)
-
-	if chunks, err = SplitFile(fileSize); err != nil {
-		return nil, err
-	}
-
-	if imur, err = bucket.InitiateMultipartUpload(params.Object,
-		oss.SetHeader(driver115.OssSecurityTokenHeaderName, ossToken.SecurityToken),
-		oss.UserAgentHeader(driver115.OSSUserAgent),
-		oss.EnableSha1(), oss.Sequential(),
-	); err != nil {
-		return nil, err
-	}
-
-	wg := sync.WaitGroup{}
-	wg.Add(len(chunks))
-
-	chunksCh := make(chan oss.FileChunk)
-	errCh := make(chan error)
-	UploadedPartsCh := make(chan oss.UploadPart)
-	quit := make(chan struct{})
-
-	// producer
-	go chunksProducer(chunksCh, chunks)
-	go func() {
-		wg.Wait()
-		quit <- struct{}{}
-	}()
-
-	completedNum := atomic.Int32{}
-	// consumers
-	for i := 0; i < options.ThreadsNum; i++ {
-		go func(threadId int) {
-			defer func() {
-				if r := recover(); r != nil {
-					errCh <- fmt.Errorf("recovered in %v", r)
-				}
-			}()
-			for chunk := range chunksCh {
-				var part oss.UploadPart // 出现错误就继续尝试，共尝试3次
-				for retry := 0; retry < 3; retry++ {
-					select {
-					case <-ctx.Done():
-						break
-					case <-ticker.C:
-						if ossToken, err = d.client.GetOSSToken(); err != nil { // 到时重新获取ossToken
-							errCh <- errors.Wrap(err, "刷新token时出现错误")
-						}
-					default:
-					}
-					buf := make([]byte, chunk.Size)
-					if _, err = tmpF.ReadAt(buf, chunk.Offset); err != nil && !errors.Is(err, io.EOF) {
-						continue
-					}
-					if part, err = bucket.UploadPart(imur, driver.NewLimitedUploadStream(ctx, bytes.NewBuffer(buf)),
-						chunk.Size, chunk.Number, driver115.OssOption(params, ossToken)...); err == nil {
-						break
-					}
-				}
-				if err != nil {
-					errCh <- errors.Wrap(err, fmt.Sprintf("上传 %s 的第%d个分片时出现错误：%v", s.GetName(), chunk.Number, err))
-				} else {
-					num := completedNum.Add(1)
-					up(float64(num) * 100.0 / float64(len(chunks)))
-				}
-				UploadedPartsCh <- part
-			}
-		}(i)
-	}
-
-	go func() {
-		for part := range UploadedPartsCh {
-			parts = append(parts, part)
-			wg.Done()
-		}
-	}()
-LOOP:
-	for {
-		select {
-		case <-ticker.C:
-			// 到时重新获取ossToken
-			if ossToken, err = d.client.GetOSSToken(); err != nil {
-				return nil, err
-			}
-		case <-quit:
-			break LOOP
-		case <-errCh:
-			return nil, err
-		case <-timeout.C:
-			return nil, fmt.Errorf("time out")
-		}
-	}
-
-	// 不知道啥原因，oss那边分片上传不计算sha1，导致115服务器校验错误
-	// params.Callback.Callback = strings.ReplaceAll(params.Callback.Callback, "${sha1}", params.SHA1)
-	if _, err := bucket.CompleteMultipartUpload(imur, parts, append(
-		driver115.OssOption(params, ossToken),
-		oss.CallbackResult(&bodyBytes),
-	)...); err != nil {
-		return nil, err
-	}
-
-	var uploadResult UploadResult
-	if err = json.Unmarshal(bodyBytes, &uploadResult); err != nil {
-		return nil, err
-	}
-	return &uploadResult, uploadResult.Err(string(bodyBytes))
-}
-
-func chunksProducer(ch chan oss.FileChunk, chunks []oss.FileChunk) {
-	for _, chunk := range chunks {
-		ch <- chunk
-	}
-}
-
-func SplitFile(fileSize int64) (chunks []oss.FileChunk, err error) {
-	for i := int64(1); i < 10; i++ {
-		if fileSize < i*utils.GB { // 文件大小小于iGB时分为i*1000片
-			if chunks, err = SplitFileByPartNum(fileSize, int(i*1000)); err != nil {
-				return
-			}
-			break
-		}
-	}
-	if fileSize > 9*utils.GB { // 文件大小大于9GB时分为10000片
-		if chunks, err = SplitFileByPartNum(fileSize, 10000); err != nil {
-			return
-		}
-	}
-	// 单个分片大小不能小于100KB
-	if chunks[0].Size < 100*utils.KB {
-		if chunks, err = SplitFileByPartSize(fileSize, 100*utils.KB); err != nil {
-			return
-		}
-	}
-	return
-}
-
-// SplitFileByPartNum splits big file into parts by the num of parts.
-// Split the file with specified parts count, returns the split result when error is nil.
-func SplitFileByPartNum(fileSize int64, chunkNum int) ([]oss.FileChunk, error) {
-	if chunkNum <= 0 || chunkNum > 10000 {
-		return nil, errors.New("chunkNum invalid")
-	}
-
-	if int64(chunkNum) > fileSize {
-		return nil, errors.New("oss: chunkNum invalid")
-	}
-
-	var chunks []oss.FileChunk
-	chunk := oss.FileChunk{}
-	chunkN := (int64)(chunkNum)
-	for i := int64(0); i < chunkN; i++ {
-		chunk.Number = int(i + 1)
-		chunk.Offset = i * (fileSize / chunkN)
-		if i == chunkN-1 {
-			chunk.Size = fileSize/chunkN + fileSize%chunkN
-		} else {
-			chunk.Size = fileSize / chunkN
-		}
-		chunks = append(chunks, chunk)
-	}
-
-	return chunks, nil
-}
-
-// SplitFileByPartSize splits big file into parts by the size of parts.
-// Splits the file by the part size. Returns the FileChunk when error is nil.
-func SplitFileByPartSize(fileSize int64, chunkSize int64) ([]oss.FileChunk, error) {
-	if chunkSize <= 0 {
-		return nil, errors.New("chunkSize invalid")
-	}
-
-	chunkN := fileSize / chunkSize
-	if chunkN >= 10000 {
-		return nil, errors.New("Too many parts, please increase part size")
-	}
-
-	var chunks []oss.FileChunk
-	chunk := oss.FileChunk{}
-	for i := int64(0); i < chunkN; i++ {
-		chunk.Number = int(i + 1)
-		chunk.Offset = i * chunkSize
-		chunk.Size = chunkSize
-		chunks = append(chunks, chunk)
-	}
-
-	if fileSize%chunkSize > 0 {
-		chunk.Number = len(chunks) + 1
-		chunk.Offset = int64(len(chunks)) * chunkSize
-		chunk.Size = fileSize % chunkSize
-		chunks = append(chunks, chunk)
-	}
-
-	return chunks, nil
-}

drivers/115_open/driver.go

@@ -1,299 +0,0 @@
-package _115_open
-
-import (
-	"context"
-	"fmt"
-	"io"
-	"net/http"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/alist-org/alist/v3/cmd/flags"
-	"github.com/alist-org/alist/v3/drivers/base"
-	"github.com/alist-org/alist/v3/internal/driver"
-	"github.com/alist-org/alist/v3/internal/model"
-	"github.com/alist-org/alist/v3/internal/op"
-	"github.com/alist-org/alist/v3/pkg/utils"
-	sdk "github.com/xhofe/115-sdk-go"
-)
-
-type Open115 struct {
-	model.Storage
-	Addition
-	client *sdk.Client
-}
-
-func (d *Open115) Config() driver.Config {
-	return config
-}
-
-func (d *Open115) GetAddition() driver.Additional {
-	return &d.Addition
-}
-
-func (d *Open115) Init(ctx context.Context) error {
-	d.client = sdk.New(sdk.WithRefreshToken(d.Addition.RefreshToken),
-		sdk.WithAccessToken(d.Addition.AccessToken),
-		sdk.WithOnRefreshToken(func(s1, s2 string) {
-			d.Addition.AccessToken = s1
-			d.Addition.RefreshToken = s2
-			op.MustSaveDriverStorage(d)
-		}))
-	if flags.Debug || flags.Dev {
-		d.client.SetDebug(true)
-	}
-	_, err := d.client.UserInfo(ctx)
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-func (d *Open115) Drop(ctx context.Context) error {
-	return nil
-}
-
-func (d *Open115) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([]model.Obj, error) {
-	var res []model.Obj
-	pageSize := int64(200)
-	offset := int64(0)
-	for {
-		resp, err := d.client.GetFiles(ctx, &sdk.GetFilesReq{
-			CID:    dir.GetID(),
-			Limit:  pageSize,
-			Offset: offset,
-			ASC:    d.Addition.OrderDirection == "asc",
-			O:      d.Addition.OrderBy,
-			// Cur:     1,
-			ShowDir: true,
-		})
-		if err != nil {
-			return nil, err
-		}
-		res = append(res, utils.MustSliceConvert(resp.Data, func(src sdk.GetFilesResp_File) model.Obj {
-			obj := Obj(src)
-			return &obj
-		})...)
-		if len(res) >= int(resp.Count) {
-			break
-		}
-		offset += pageSize
-	}
-	return res, nil
-}
-
-func (d *Open115) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
-	var ua string
-	if args.Header != nil {
-		ua = args.Header.Get("User-Agent")
-	}
-	if ua == "" {
-		ua = base.UserAgent
-	}
-	obj, ok := file.(*Obj)
-	if !ok {
-		return nil, fmt.Errorf("can't convert obj")
-	}
-	pc := obj.Pc
-	resp, err := d.client.DownURL(ctx, pc, ua)
-	if err != nil {
-		return nil, err
-	}
-	u, ok := resp[obj.GetID()]
-	if !ok {
-		return nil, fmt.Errorf("can't get link")
-	}
-	return &model.Link{
-		URL: u.URL.URL,
-		Header: http.Header{
-			"User-Agent": []string{ua},
-		},
-	}, nil
-}
-
-func (d *Open115) MakeDir(ctx context.Context, parentDir model.Obj, dirName string) (model.Obj, error) {
-	resp, err := d.client.Mkdir(ctx, parentDir.GetID(), dirName)
-	if err != nil {
-		return nil, err
-	}
-	return &Obj{
-		Fid:  resp.FileID,
-		Pid:  parentDir.GetID(),
-		Fn:   dirName,
-		Fc:   "0",
-		Upt:  time.Now().Unix(),
-		Uet:  time.Now().Unix(),
-		UpPt: time.Now().Unix(),
-	}, nil
-}
-
-func (d *Open115) Move(ctx context.Context, srcObj, dstDir model.Obj) (model.Obj, error) {
-	_, err := d.client.Move(ctx, &sdk.MoveReq{
-		FileIDs: srcObj.GetID(),
-		ToCid:   dstDir.GetID(),
-	})
-	if err != nil {
-		return nil, err
-	}
-	return srcObj, nil
-}
-
-func (d *Open115) Rename(ctx context.Context, srcObj model.Obj, newName string) (model.Obj, error) {
-	_, err := d.client.UpdateFile(ctx, &sdk.UpdateFileReq{
-		FileID:  srcObj.GetID(),
-		FileNma: newName,
-	})
-	if err != nil {
-		return nil, err
-	}
-	obj, ok := srcObj.(*Obj)
-	if ok {
-		obj.Fn = newName
-	}
-	return srcObj, nil
-}
-
-func (d *Open115) Copy(ctx context.Context, srcObj, dstDir model.Obj) (model.Obj, error) {
-	_, err := d.client.Copy(ctx, &sdk.CopyReq{
-		PID:     dstDir.GetID(),
-		FileID:  srcObj.GetID(),
-		NoDupli: "1",
-	})
-	if err != nil {
-		return nil, err
-	}
-	return srcObj, nil
-}
-
-func (d *Open115) Remove(ctx context.Context, obj model.Obj) error {
-	_obj, ok := obj.(*Obj)
-	if !ok {
-		return fmt.Errorf("can't convert obj")
-	}
-	_, err := d.client.DelFile(ctx, &sdk.DelFileReq{
-		FileIDs:  _obj.GetID(),
-		ParentID: _obj.Pid,
-	})
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-func (d *Open115) Put(ctx context.Context, dstDir model.Obj, file model.FileStreamer, up driver.UpdateProgress) error {
-	tempF, err := file.CacheFullInTempFile()
-	if err != nil {
-		return err
-	}
-	// cal full sha1
-	sha1, err := utils.HashReader(utils.SHA1, tempF)
-	if err != nil {
-		return err
-	}
-	_, err = tempF.Seek(0, io.SeekStart)
-	if err != nil {
-		return err
-	}
-	// pre 128k sha1
-	sha1128k, err := utils.HashReader(utils.SHA1, io.LimitReader(tempF, 128*1024))
-	if err != nil {
-		return err
-	}
-	_, err = tempF.Seek(0, io.SeekStart)
-	if err != nil {
-		return err
-	}
-	// 1. Init
-	resp, err := d.client.UploadInit(ctx, &sdk.UploadInitReq{
-		FileName: file.GetName(),
-		FileSize: file.GetSize(),
-		Target:   dstDir.GetID(),
-		FileID:   strings.ToUpper(sha1),
-		PreID:    strings.ToUpper(sha1128k),
-	})
-	if err != nil {
-		return err
-	}
-	if resp.Status == 2 {
-		return nil
-	}
-	// 2. two way verify
-	if utils.SliceContains([]int{6, 7, 8}, resp.Status) {
-		signCheck := strings.Split(resp.SignCheck, "-") //"sign_check": "2392148-2392298" 取2392148-2392298之间的内容(包含2392148、2392298)的sha1
-		start, err := strconv.ParseInt(signCheck[0], 10, 64)
-		if err != nil {
-			return err
-		}
-		end, err := strconv.ParseInt(signCheck[1], 10, 64)
-		if err != nil {
-			return err
-		}
-		_, err = tempF.Seek(start, io.SeekStart)
-		if err != nil {
-			return err
-		}
-		signVal, err := utils.HashReader(utils.SHA1, io.LimitReader(tempF, end-start+1))
-		if err != nil {
-			return err
-		}
-		_, err = tempF.Seek(0, io.SeekStart)
-		if err != nil {
-			return err
-		}
-		resp, err = d.client.UploadInit(ctx, &sdk.UploadInitReq{
-			FileName: file.GetName(),
-			FileSize: file.GetSize(),
-			Target:   dstDir.GetID(),
-			FileID:   strings.ToUpper(sha1),
-			PreID:    strings.ToUpper(sha1128k),
-			SignKey:  resp.SignKey,
-			SignVal:  strings.ToUpper(signVal),
-		})
-		if err != nil {
-			return err
-		}
-		if resp.Status == 2 {
-			return nil
-		}
-	}
-	// 3. get upload token
-	tokenResp, err := d.client.UploadGetToken(ctx)
-	if err != nil {
-		return err
-	}
-	// 4. upload
-	err = d.multpartUpload(ctx, tempF, file, up, tokenResp, resp)
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-// func (d *Open115) GetArchiveMeta(ctx context.Context, obj model.Obj, args model.ArchiveArgs) (model.ArchiveMeta, error) {
-// 	// TODO get archive file meta-info, return errs.NotImplement to use an internal archive tool, optional
-// 	return nil, errs.NotImplement
-// }
-
-// func (d *Open115) ListArchive(ctx context.Context, obj model.Obj, args model.ArchiveInnerArgs) ([]model.Obj, error) {
-// 	// TODO list args.InnerPath in the archive obj, return errs.NotImplement to use an internal archive tool, optional
-// 	return nil, errs.NotImplement
-// }
-
-// func (d *Open115) Extract(ctx context.Context, obj model.Obj, args model.ArchiveInnerArgs) (*model.Link, error) {
-// 	// TODO return link of file args.InnerPath in the archive obj, return errs.NotImplement to use an internal archive tool, optional
-// 	return nil, errs.NotImplement
-// }
-
-// func (d *Open115) ArchiveDecompress(ctx context.Context, srcObj, dstDir model.Obj, args model.ArchiveDecompressArgs) ([]model.Obj, error) {
-// 	// TODO extract args.InnerPath path in the archive srcObj to the dstDir location, optional
-// 	// a folder with the same name as the archive file needs to be created to store the extracted results if args.PutIntoNewDir
-// 	// return errs.NotImplement to use an internal archive tool
-// 	return nil, errs.NotImplement
-// }
-
-//func (d *Template) Other(ctx context.Context, args model.OtherArgs) (interface{}, error) {
-//	return nil, errs.NotSupport
-//}
-
-var _ driver.Driver = (*Open115)(nil)

drivers/115_open/meta.go

@@ -1,36 +0,0 @@
-package _115_open
-
-import (
-	"github.com/alist-org/alist/v3/internal/driver"
-	"github.com/alist-org/alist/v3/internal/op"
-)
-
-type Addition struct {
-	// Usually one of two
-	driver.RootID
-	// define other
-	RefreshToken   string `json:"refresh_token" required:"true"`
-	OrderBy        string `json:"order_by" type:"select" options:"file_name,file_size,user_utime,file_type"`
-	OrderDirection string `json:"order_direction" type:"select" options:"asc,desc"`
-	AccessToken    string
-}
-
-var config = driver.Config{
-	Name:              "115 Open",
-	LocalSort:         false,
-	OnlyLocal:         false,
-	OnlyProxy:         false,
-	NoCache:           false,
-	NoUpload:          false,
-	NeedMs:            false,
-	DefaultRoot:       "0",
-	CheckStatus:       false,
-	Alert:             "",
-	NoOverwriteUpload: false,
-}
-
-func init() {
-	op.RegisterDriver(func() driver.Driver {
-		return &Open115{}
-	})
-}

drivers/115_open/types.go

@@ -1,59 +0,0 @@
-package _115_open
-
-import (
-	"time"
-
-	"github.com/alist-org/alist/v3/internal/model"
-	"github.com/alist-org/alist/v3/pkg/utils"
-	sdk "github.com/xhofe/115-sdk-go"
-)
-
-type Obj sdk.GetFilesResp_File
-
-// Thumb implements model.Thumb.
-func (o *Obj) Thumb() string {
-	return o.Thumbnail
-}
-
-// CreateTime implements model.Obj.
-func (o *Obj) CreateTime() time.Time {
-	return time.Unix(o.UpPt, 0)
-}
-
-// GetHash implements model.Obj.
-func (o *Obj) GetHash() utils.HashInfo {
-	return utils.NewHashInfo(utils.SHA1, o.Sha1)
-}
-
-// GetID implements model.Obj.
-func (o *Obj) GetID() string {
-	return o.Fid
-}
-
-// GetName implements model.Obj.
-func (o *Obj) GetName() string {
-	return o.Fn
-}
-
-// GetPath implements model.Obj.
-func (o *Obj) GetPath() string {
-	return ""
-}
-
-// GetSize implements model.Obj.
-func (o *Obj) GetSize() int64 {
-	return o.FS
-}
-
-// IsDir implements model.Obj.
-func (o *Obj) IsDir() bool {
-	return o.Fc == "0"
-}
-
-// ModTime implements model.Obj.
-func (o *Obj) ModTime() time.Time {
-	return time.Unix(o.Upt, 0)
-}
-
-var _ model.Obj = (*Obj)(nil)
-var _ model.Thumb = (*Obj)(nil)

drivers/115_open/upload.go

@@ -1,140 +0,0 @@
-package _115_open
-
-import (
-	"context"
-	"encoding/base64"
-	"io"
-	"time"
-
-	"github.com/alist-org/alist/v3/internal/driver"
-	"github.com/alist-org/alist/v3/internal/model"
-	"github.com/alist-org/alist/v3/pkg/utils"
-	"github.com/aliyun/aliyun-oss-go-sdk/oss"
-	"github.com/avast/retry-go"
-	sdk "github.com/xhofe/115-sdk-go"
-)
-
-func calPartSize(fileSize int64) int64 {
-	var partSize int64 = 20 * utils.MB
-	if fileSize > partSize {
-		if fileSize > 1*utils.TB { // file Size over 1TB
-			partSize = 5 * utils.GB // file part size 5GB
-		} else if fileSize > 768*utils.GB { // over 768GB
-			partSize = 109951163 // ≈ 104.8576MB, split 1TB into 10,000 part
-		} else if fileSize > 512*utils.GB { // over 512GB
-			partSize = 82463373 // ≈ 78.6432MB
-		} else if fileSize > 384*utils.GB { // over 384GB
-			partSize = 54975582 // ≈ 52.4288MB
-		} else if fileSize > 256*utils.GB { // over 256GB
-			partSize = 41231687 // ≈ 39.3216MB
-		} else if fileSize > 128*utils.GB { // over 128GB
-			partSize = 27487791 // ≈ 26.2144MB
-		}
-	}
-	return partSize
-}
-
-func (d *Open115) singleUpload(ctx context.Context, tempF model.File, tokenResp *sdk.UploadGetTokenResp, initResp *sdk.UploadInitResp) error {
-	ossClient, err := oss.New(tokenResp.Endpoint, tokenResp.AccessKeyId, tokenResp.AccessKeySecret, oss.SecurityToken(tokenResp.SecurityToken))
-	if err != nil {
-		return err
-	}
-	bucket, err := ossClient.Bucket(initResp.Bucket)
-	if err != nil {
-		return err
-	}
-
-	err = bucket.PutObject(initResp.Object, tempF,
-		oss.Callback(base64.StdEncoding.EncodeToString([]byte(initResp.Callback.Value.Callback))),
-		oss.CallbackVar(base64.StdEncoding.EncodeToString([]byte(initResp.Callback.Value.CallbackVar))),
-	)
-
-	return err
-}
-
-// type CallbackResult struct {
-// 	State   bool   `json:"state"`
-// 	Code    int    `json:"code"`
-// 	Message string `json:"message"`
-// 	Data    struct {
-// 		PickCode string `json:"pick_code"`
-// 		FileName string `json:"file_name"`
-// 		FileSize int64  `json:"file_size"`
-// 		FileID   string `json:"file_id"`
-// 		ThumbURL string `json:"thumb_url"`
-// 		Sha1     string `json:"sha1"`
-// 		Aid      int    `json:"aid"`
-// 		Cid      string `json:"cid"`
-// 	} `json:"data"`
-// }
-
-func (d *Open115) multpartUpload(ctx context.Context, tempF model.File, stream model.FileStreamer, up driver.UpdateProgress, tokenResp *sdk.UploadGetTokenResp, initResp *sdk.UploadInitResp) error {
-	fileSize := stream.GetSize()
-	chunkSize := calPartSize(fileSize)
-
-	ossClient, err := oss.New(tokenResp.Endpoint, tokenResp.AccessKeyId, tokenResp.AccessKeySecret, oss.SecurityToken(tokenResp.SecurityToken))
-	if err != nil {
-		return err
-	}
-	bucket, err := ossClient.Bucket(initResp.Bucket)
-	if err != nil {
-		return err
-	}
-
-	imur, err := bucket.InitiateMultipartUpload(initResp.Object, oss.Sequential())
-	if err != nil {
-		return err
-	}
-
-	partNum := (stream.GetSize() + chunkSize - 1) / chunkSize
-	parts := make([]oss.UploadPart, partNum)
-	offset := int64(0)
-	for i := int64(1); i <= partNum; i++ {
-		if utils.IsCanceled(ctx) {
-			return ctx.Err()
-		}
-
-		partSize := chunkSize
-		if i == partNum {
-			partSize = fileSize - (i-1)*chunkSize
-		}
-		rd := utils.NewMultiReadable(io.LimitReader(stream, partSize))
-		err = retry.Do(func() error {
-			_ = rd.Reset()
-			rateLimitedRd := driver.NewLimitedUploadStream(ctx, rd)
-			part, err := bucket.UploadPart(imur, rateLimitedRd, partSize, int(i))
-			if err != nil {
-				return err
-			}
-			parts[i-1] = part
-			return nil
-		},
-			retry.Attempts(3),
-			retry.DelayType(retry.BackOffDelay),
-			retry.Delay(time.Second))
-		if err != nil {
-			return err
-		}
-
-		if i == partNum {
-			offset = fileSize
-		} else {
-			offset += partSize
-		}
-		up(float64(offset) / float64(fileSize))
-	}
-
-	// callbackRespBytes := make([]byte, 1024)
-	_, err = bucket.CompleteMultipartUpload(
-		imur,
-		parts,
-		oss.Callback(base64.StdEncoding.EncodeToString([]byte(initResp.Callback.Value.Callback))),
-		oss.CallbackVar(base64.StdEncoding.EncodeToString([]byte(initResp.Callback.Value.CallbackVar))),
-		// oss.CallbackResult(&callbackRespBytes),
-	)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}

drivers/115_open/util.go

@@ -1,3 +0,0 @@
-package _115_open
-
-// do others that not defined in Driver interface

drivers/115_share/driver.go

@@ -1,112 +0,0 @@
-package _115_share
-
-import (
-	"context"
-
-	driver115 "github.com/SheltonZhu/115driver/pkg/driver"
-	"github.com/alist-org/alist/v3/internal/driver"
-	"github.com/alist-org/alist/v3/internal/errs"
-	"github.com/alist-org/alist/v3/internal/model"
-	"github.com/alist-org/alist/v3/pkg/utils"
-	"golang.org/x/time/rate"
-)
-
-type Pan115Share struct {
-	model.Storage
-	Addition
-	client  *driver115.Pan115Client
-	limiter *rate.Limiter
-}
-
-func (d *Pan115Share) Config() driver.Config {
-	return config
-}
-
-func (d *Pan115Share) GetAddition() driver.Additional {
-	return &d.Addition
-}
-
-func (d *Pan115Share) Init(ctx context.Context) error {
-	if d.LimitRate > 0 {
-		d.limiter = rate.NewLimiter(rate.Limit(d.LimitRate), 1)
-	}
-
-	return d.login()
-}
-
-func (d *Pan115Share) WaitLimit(ctx context.Context) error {
-	if d.limiter != nil {
-		return d.limiter.Wait(ctx)
-	}
-	return nil
-}
-
-func (d *Pan115Share) Drop(ctx context.Context) error {
-	return nil
-}
-
-func (d *Pan115Share) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([]model.Obj, error) {
-	if err := d.WaitLimit(ctx); err != nil {
-		return nil, err
-	}
-
-	files := make([]driver115.ShareFile, 0)
-	fileResp, err := d.client.GetShareSnap(d.ShareCode, d.ReceiveCode, dir.GetID(), driver115.QueryLimit(int(d.PageSize)))
-	if err != nil {
-		return nil, err
-	}
-	files = append(files, fileResp.Data.List...)
-	total := fileResp.Data.Count
-	count := len(fileResp.Data.List)
-	for total > count {
-		fileResp, err := d.client.GetShareSnap(
-			d.ShareCode, d.ReceiveCode, dir.GetID(),
-			driver115.QueryLimit(int(d.PageSize)), driver115.QueryOffset(count),
-		)
-		if err != nil {
-			return nil, err
-		}
-		files = append(files, fileResp.Data.List...)
-		count += len(fileResp.Data.List)
-	}
-
-	return utils.SliceConvert(files, transFunc)
-}
-
-func (d *Pan115Share) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
-	if err := d.WaitLimit(ctx); err != nil {
-		return nil, err
-	}
-	downloadInfo, err := d.client.DownloadByShareCode(d.ShareCode, d.ReceiveCode, file.GetID())
-	if err != nil {
-		return nil, err
-	}
-
-	return &model.Link{URL: downloadInfo.URL.URL}, nil
-}
-
-func (d *Pan115Share) MakeDir(ctx context.Context, parentDir model.Obj, dirName string) error {
-	return errs.NotSupport
-}
-
-func (d *Pan115Share) Move(ctx context.Context, srcObj, dstDir model.Obj) error {
-	return errs.NotSupport
-}
-
-func (d *Pan115Share) Rename(ctx context.Context, srcObj model.Obj, newName string) error {
-	return errs.NotSupport
-}
-
-func (d *Pan115Share) Copy(ctx context.Context, srcObj, dstDir model.Obj) error {
-	return errs.NotSupport
-}
-
-func (d *Pan115Share) Remove(ctx context.Context, obj model.Obj) error {
-	return errs.NotSupport
-}
-
-func (d *Pan115Share) Put(ctx context.Context, dstDir model.Obj, stream model.FileStreamer, up driver.UpdateProgress) error {
-	return errs.NotSupport
-}
-
-var _ driver.Driver = (*Pan115Share)(nil)

drivers/115_share/meta.go

@@ -1,34 +0,0 @@
-package _115_share
-
-import (
-	"github.com/alist-org/alist/v3/internal/driver"
-	"github.com/alist-org/alist/v3/internal/op"
-)
-
-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"`
-	LimitRate    float64 `json:"limit_rate" type:"float" 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"`
-	driver.RootID
-}
-
-var config = driver.Config{
-	Name:        "115 Share",
-	DefaultRoot: "0",
-	// OnlyProxy:   true,
-	// OnlyLocal:         true,
-	CheckStatus:       false,
-	Alert:             "",
-	NoOverwriteUpload: true,
-	NoUpload:          true,
-}
-
-func init() {
-	op.RegisterDriver(func() driver.Driver {
-		return &Pan115Share{}
-	})
-}

drivers/115_share/utils.go

@@ -1,111 +0,0 @@
-package _115_share
-
-import (
-	"fmt"
-	"strconv"
-	"time"
-
-	driver115 "github.com/SheltonZhu/115driver/pkg/driver"
-	"github.com/alist-org/alist/v3/internal/model"
-	"github.com/alist-org/alist/v3/pkg/utils"
-	"github.com/pkg/errors"
-)
-
-var _ model.Obj = (*FileObj)(nil)
-
-type FileObj struct {
-	Size     int64
-	Sha1     string
-	Utm      time.Time
-	FileName string
-	isDir    bool
-	FileID   string
-}
-
-func (f *FileObj) CreateTime() time.Time {
-	return f.Utm
-}
-
-func (f *FileObj) GetHash() utils.HashInfo {
-	return utils.NewHashInfo(utils.SHA1, f.Sha1)
-}
-
-func (f *FileObj) GetSize() int64 {
-	return f.Size
-}
-
-func (f *FileObj) GetName() string {
-	return f.FileName
-}
-
-func (f *FileObj) ModTime() time.Time {
-	return f.Utm
-}
-
-func (f *FileObj) IsDir() bool {
-	return f.isDir
-}
-
-func (f *FileObj) GetID() string {
-	return f.FileID
-}
-
-func (f *FileObj) GetPath() string {
-	return ""
-}
-
-func transFunc(sf driver115.ShareFile) (model.Obj, error) {
-	timeInt, err := strconv.ParseInt(sf.UpdateTime, 10, 64)
-	if err != nil {
-		return nil, err
-	}
-	var (
-		utm    = time.Unix(timeInt, 0)
-		isDir  = (sf.IsFile == 0)
-		fileID = string(sf.FileID)
-	)
-	if isDir {
-		fileID = string(sf.CategoryID)
-	}
-	return &FileObj{
-		Size:     int64(sf.Size),
-		Sha1:     sf.Sha1,
-		Utm:      utm,
-		FileName: string(sf.FileName),
-		isDir:    isDir,
-		FileID:   fileID,
-	}, nil
-}
-
-var UserAgent = driver115.UA115Browser
-
-func (d *Pan115Share) login() error {
-	var err error
-	opts := []driver115.Option{
-		driver115.UA(UserAgent),
-	}
-	d.client = driver115.New(opts...)
-	if _, err := d.client.GetShareSnap(d.ShareCode, d.ReceiveCode, ""); err != nil {
-		return errors.Wrap(err, "failed to get share snap")
-	}
-	cr := &driver115.Credential{}
-	if d.QRCodeToken != "" {
-		s := &driver115.QRCodeSession{
-			UID: d.QRCodeToken,
-		}
-		if cr, err = d.client.QRCodeLoginWithApp(s, driver115.LoginApp(d.QRCodeSource)); err != nil {
-			return errors.Wrap(err, "failed to login by qrcode")
-		}
-		d.Cookie = fmt.Sprintf("UID=%s;CID=%s;SEID=%s;KID=%s", cr.UID, cr.CID, cr.SEID, cr.KID)
-		d.QRCodeToken = ""
-	} else if d.Cookie != "" {
-		if err = cr.FromCookie(d.Cookie); err != nil {
-			return errors.Wrap(err, "failed to login by cookies")
-		}
-		d.client.ImportCredential(cr)
-	} else {
-		return errors.New("missing cookie or qrcode account")
-	}
-
-	return d.client.LoginCheck()
-}

drivers/123/driver.go

@@ -1,18 +1,17 @@
 package _123
 
 import (
+	"bytes"
 	"context"
 	"crypto/md5"
 	"encoding/base64"
+	"encoding/binary"
 	"encoding/hex"
 	"fmt"
 	"io"
 	"net/http"
 	"net/url"
-	"sync"
+	"os"
-	"time"
-
-	"golang.org/x/time/rate"
 
 	"github.com/alist-org/alist/v3/drivers/base"
 	"github.com/alist-org/alist/v3/internal/driver"
@@ -30,7 +29,6 @@ import (
 type Pan123 struct {
 	model.Storage
 	Addition
-	apiRateLimit sync.Map
 }
 
 func (d *Pan123) Config() driver.Config {
@@ -42,19 +40,16 @@ func (d *Pan123) GetAddition() driver.Additional {
 }
 
 func (d *Pan123) Init(ctx context.Context) error {
-	_, err := d.Request(UserInfo, http.MethodGet, nil, nil)
+	_, err := d.request(UserInfo, http.MethodGet, nil, nil)
 	return err
 }
 
 func (d *Pan123) Drop(ctx context.Context) error {
-	_, _ = d.Request(Logout, http.MethodPost, func(req *resty.Request) {
-		req.SetBody(base.Json{})
-	}, nil)
 	return nil
 }
 
 func (d *Pan123) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([]model.Obj, error) {
-	files, err := d.getFiles(ctx, dir.GetID(), dir.GetName())
+	files, err := d.getFiles(dir.GetID())
 	if err != nil {
 		return nil, err
 	}
@@ -82,8 +77,7 @@ func (d *Pan123) Link(ctx context.Context, file model.Obj, args model.LinkArgs)
 			"size":      f.Size,
 			"type":      f.Type,
 		}
-		resp, err := d.Request(DownloadInfo, http.MethodPost, func(req *resty.Request) {
+		resp, err := d.request(DownloadInfo, http.MethodPost, func(req *resty.Request) {
-
 			req.SetBody(data).SetHeaders(headers)
 		}, nil)
 		if err != nil {
@@ -104,7 +98,7 @@ func (d *Pan123) Link(ctx context.Context, file model.Obj, args model.LinkArgs)
 		}
 		u_ := u.String()
 		log.Debug("download url: ", u_)
-		res, err := base.NoRedirectClient.R().SetHeader("Referer", "https://www.123pan.com/").Get(u_)
+		res, err := base.NoRedirectClient.R().Get(u_)
 		if err != nil {
 			return nil, err
 		}
@@ -115,12 +109,9 @@ func (d *Pan123) Link(ctx context.Context, file model.Obj, args model.LinkArgs)
 		log.Debugln("res code: ", res.StatusCode())
 		if res.StatusCode() == 302 {
 			link.URL = res.Header().Get("location")
-		} else if res.StatusCode() < 300 {
+		} else if res.StatusCode() == 200 {
 			link.URL = utils.Json.Get(res.Body(), "data", "redirect_url").ToString()
 		}
-		link.Header = http.Header{
-			"Referer": []string{"https://www.123pan.com/"},
-		}
 		return &link, nil
 	} else {
 		return nil, fmt.Errorf("can't convert obj")
@@ -136,7 +127,7 @@ func (d *Pan123) MakeDir(ctx context.Context, parentDir model.Obj, dirName strin
 		"size":         0,
 		"type":         1,
 	}
-	_, err := d.Request(Mkdir, http.MethodPost, func(req *resty.Request) {
+	_, err := d.request(Mkdir, http.MethodPost, func(req *resty.Request) {
 		req.SetBody(data)
 	}, nil)
 	return err
@@ -147,7 +138,7 @@ func (d *Pan123) Move(ctx context.Context, srcObj, dstDir model.Obj) error {
 		"fileIdList":   []base.Json{{"FileId": srcObj.GetID()}},
 		"parentFileId": dstDir.GetID(),
 	}
-	_, err := d.Request(Move, http.MethodPost, func(req *resty.Request) {
+	_, err := d.request(Move, http.MethodPost, func(req *resty.Request) {
 		req.SetBody(data)
 	}, nil)
 	return err
@@ -159,7 +150,7 @@ func (d *Pan123) Rename(ctx context.Context, srcObj model.Obj, newName string) e
 		"fileId":   srcObj.GetID(),
 		"fileName": newName,
 	}
-	_, err := d.Request(Rename, http.MethodPost, func(req *resty.Request) {
+	_, err := d.request(Rename, http.MethodPost, func(req *resty.Request) {
 		req.SetBody(data)
 	}, nil)
 	return err
@@ -176,7 +167,7 @@ func (d *Pan123) Remove(ctx context.Context, obj model.Obj) error {
 			"operation":         true,
 			"fileTrashInfoList": []File{f},
 		}
-		_, err := d.Request(Trash, http.MethodPost, func(req *resty.Request) {
+		_, err := d.request(Trash, http.MethodPost, func(req *resty.Request) {
 			req.SetBody(data)
 		}, nil)
 		return err
@@ -185,39 +176,54 @@ func (d *Pan123) Remove(ctx context.Context, obj model.Obj) error {
 	}
 }
 
-func (d *Pan123) Put(ctx context.Context, dstDir model.Obj, file model.FileStreamer, up driver.UpdateProgress) error {
+func (d *Pan123) Put(ctx context.Context, dstDir model.Obj, stream model.FileStreamer, up driver.UpdateProgress) error {
-	etag := file.GetHash().GetHash(utils.MD5)
+	const DEFAULT int64 = 10485760
-	if len(etag) < utils.MD5.Width {
+	var uploadFile io.Reader
-		// const DEFAULT int64 = 10485760
+	h := md5.New()
-		h := md5.New()
+	if d.StreamUpload && stream.GetSize() > DEFAULT {
-		// need to calculate md5 of the full content
+		// 只计算前10MIB
-		tempFile, err := file.CacheFullInTempFile()
+		buf := bytes.NewBuffer(make([]byte, 0, DEFAULT))
+		if n, err := io.CopyN(io.MultiWriter(buf, h), stream, DEFAULT); err != io.EOF && n == 0 {
+			return err
+		}
+		// 增加额外参数防止MD5碰撞
+		h.Write([]byte(stream.GetName()))
+		num := make([]byte, 8)
+		binary.BigEndian.PutUint64(num, uint64(stream.GetSize()))
+		h.Write(num)
+		// 拼装
+		uploadFile = io.MultiReader(buf, stream)
+	} else {
+		// 计算完整文件MD5
+		tempFile, err := utils.CreateTempFile(stream.GetReadCloser())
 		if err != nil {
 			return err
 		}
 		defer func() {
 			_ = tempFile.Close()
+			_ = os.Remove(tempFile.Name())
 		}()
-		if _, err = utils.CopyWithBuffer(h, tempFile); err != nil {
+		if _, err = io.Copy(h, tempFile); err != nil {
 			return err
 		}
 		_, err = tempFile.Seek(0, io.SeekStart)
 		if err != nil {
 			return err
 		}
-		etag = hex.EncodeToString(h.Sum(nil))
+		uploadFile = tempFile
 	}
+	etag := hex.EncodeToString(h.Sum(nil))
 	data := base.Json{
 		"driveId":      0,
 		"duplicate":    2, // 2->覆盖 1->重命名 0->默认
 		"etag":         etag,
-		"fileName":     file.GetName(),
+		"fileName":     stream.GetName(),
 		"parentFileId": dstDir.GetID(),
-		"size":         file.GetSize(),
+		"size":         stream.GetSize(),
 		"type":         0,
 	}
 	var resp UploadResp
-	res, err := d.Request(UploadRequest, http.MethodPost, func(req *resty.Request) {
+	res, err := d.request(UploadRequest, http.MethodPost, func(req *resty.Request) {
 		req.SetBody(data).SetContext(ctx)
 	}, &resp)
 	if err != nil {
@@ -228,8 +234,7 @@ func (d *Pan123) Put(ctx context.Context, dstDir model.Obj, file model.FileStrea
 		return nil
 	}
 	if resp.Data.AccessKeyId == "" || resp.Data.SecretAccessKey == "" || resp.Data.SessionToken == "" {
-		err = d.newUpload(ctx, &resp, file, up)
+		err = d.newUpload(ctx, &resp, stream, uploadFile, up)
-		return err
 	} else {
 		cfg := &aws.Config{
 			Credentials:      credentials.NewStaticCredentials(resp.Data.AccessKeyId, resp.Data.SecretAccessKey, resp.Data.SessionToken),
@@ -242,23 +247,17 @@ func (d *Pan123) Put(ctx context.Context, dstDir model.Obj, file model.FileStrea
 			return err
 		}
 		uploader := s3manager.NewUploader(s)
-		if file.GetSize() > s3manager.MaxUploadParts*s3manager.DefaultUploadPartSize {
-			uploader.PartSize = file.GetSize() / (s3manager.MaxUploadParts - 1)
-		}
 		input := &s3manager.UploadInput{
 			Bucket: &resp.Data.Bucket,
 			Key:    &resp.Data.Key,
-			Body: driver.NewLimitedUploadStream(ctx, &driver.ReaderUpdatingProgress{
+			Body:   uploadFile,
-				Reader:         file,
-				UpdateProgress: up,
-			}),
 		}
 		_, err = uploader.UploadWithContext(ctx, input)
-		if err != nil {
-			return err
-		}
 	}
-	_, err = d.Request(UploadComplete, http.MethodPost, func(req *resty.Request) {
+	if err != nil {
+		return err
+	}
+	_, err = d.request(UploadComplete, http.MethodPost, func(req *resty.Request) {
 		req.SetBody(base.Json{
 			"fileId": resp.Data.FileId,
 		}).SetContext(ctx)
@@ -266,12 +265,4 @@ func (d *Pan123) Put(ctx context.Context, dstDir model.Obj, file model.FileStrea
 	return err
 }
 
-func (d *Pan123) APIRateLimit(ctx context.Context, api string) error {
-	value, _ := d.apiRateLimit.LoadOrStore(api,
-		rate.NewLimiter(rate.Every(700*time.Millisecond), 1))
-	limiter := value.(*rate.Limiter)
-
-	return limiter.Wait(ctx)
-}
-
 var _ driver.Driver = (*Pan123)(nil)

drivers/123/meta.go

@@ -9,15 +9,15 @@ type Addition struct {
 	Username string `json:"username" required:"true"`
 	Password string `json:"password" required:"true"`
 	driver.RootID
-	//OrderBy        string `json:"order_by" type:"select" options:"file_id,file_name,size,update_at" default:"file_name"`
+	OrderBy        string `json:"order_by" type:"select" options:"file_name,size,update_at" default:"file_name"`
-	//OrderDirection string `json:"order_direction" type:"select" options:"asc,desc" default:"asc"`
+	OrderDirection string `json:"order_direction" type:"select" options:"asc,desc" default:"asc"`
-	AccessToken string
+	StreamUpload   bool   `json:"stream_upload"`
+	AccessToken    string
 }
 
 var config = driver.Config{
 	Name:        "123Pan",
 	DefaultRoot: "0",
-	LocalSort:   true,
 }
 
 func init() {

drivers/123/types.go

@@ -1,11 +1,7 @@
 package _123
 
 import (
-	"github.com/alist-org/alist/v3/pkg/utils"
-	"net/url"
-	"path"
 	"strconv"
-	"strings"
 	"time"
 
 	"github.com/alist-org/alist/v3/internal/model"
@@ -22,14 +18,6 @@ type File struct {
 	DownloadUrl string    `json:"DownloadUrl"`
 }
 
-func (f File) CreateTime() time.Time {
-	return f.UpdateAt
-}
-
-func (f File) GetHash() utils.HashInfo {
-	return utils.HashInfo{}
-}
-
 func (f File) GetPath() string {
 	return ""
 }
@@ -54,30 +42,7 @@ func (f File) GetID() string {
 	return strconv.FormatInt(f.FileId, 10)
 }
 
-func (f File) Thumb() string {
-	if f.DownloadUrl == "" {
-		return ""
-	}
-	du, err := url.Parse(f.DownloadUrl)
-	if err != nil {
-		return ""
-	}
-	du.Path = strings.TrimSuffix(du.Path, "_24_24") + "_70_70"
-	query := du.Query()
-	query.Set("w", "70")
-	query.Set("h", "70")
-	if !query.Has("type") {
-		query.Set("type", strings.TrimPrefix(path.Base(f.FileName), "."))
-	}
-	if !query.Has("trade_key") {
-		query.Set("trade_key", "123pan-thumbnail")
-	}
-	du.RawQuery = query.Encode()
-	return du.String()
-}
-
 var _ model.Obj = (*File)(nil)
-var _ model.Thumb = (*File)(nil)
 
 //func (f File) Thumb() string {
 //
@@ -87,9 +52,8 @@ var _ model.Thumb = (*File)(nil)
 type Files struct {
 	//BaseResp
 	Data struct {
-		Next     string `json:"Next"`
-		Total    int    `json:"Total"`
 		InfoList []File `json:"InfoList"`
+		Next     string `json:"Next"`
 	} `json:"data"`
 }
 

drivers/123/upload.go

@@ -25,7 +25,7 @@ func (d *Pan123) getS3PreSignedUrls(ctx context.Context, upReq *UploadResp, star
 		"StorageNode":     upReq.Data.StorageNode,
 	}
 	var s3PreSignedUrls S3PreSignedURLs
-	_, err := d.Request(S3PreSignedUrls, http.MethodPost, func(req *resty.Request) {
+	_, err := d.request(S3PreSignedUrls, http.MethodPost, func(req *resty.Request) {
 		req.SetBody(data).SetContext(ctx)
 	}, &s3PreSignedUrls)
 	if err != nil {
@@ -34,54 +34,25 @@ func (d *Pan123) getS3PreSignedUrls(ctx context.Context, upReq *UploadResp, star
 	return &s3PreSignedUrls, nil
 }
 
-func (d *Pan123) getS3Auth(ctx context.Context, upReq *UploadResp, start, end int) (*S3PreSignedURLs, error) {
+func (d *Pan123) completeS3(ctx context.Context, upReq *UploadResp) error {
 	data := base.Json{
-		"StorageNode":     upReq.Data.StorageNode,
-		"bucket":          upReq.Data.Bucket,
-		"key":             upReq.Data.Key,
-		"partNumberEnd":   end,
-		"partNumberStart": start,
-		"uploadId":        upReq.Data.UploadId,
-	}
-	var s3PreSignedUrls S3PreSignedURLs
-	_, err := d.Request(S3Auth, http.MethodPost, func(req *resty.Request) {
-		req.SetBody(data).SetContext(ctx)
-	}, &s3PreSignedUrls)
-	if err != nil {
-		return nil, err
-	}
-	return &s3PreSignedUrls, nil
-}
-
-func (d *Pan123) completeS3(ctx context.Context, upReq *UploadResp, file model.FileStreamer, isMultipart bool) error {
-	data := base.Json{
-		"StorageNode": upReq.Data.StorageNode,
 		"bucket":      upReq.Data.Bucket,
-		"fileId":      upReq.Data.FileId,
-		"fileSize":    file.GetSize(),
-		"isMultipart": isMultipart,
 		"key":         upReq.Data.Key,
 		"uploadId":    upReq.Data.UploadId,
+		"StorageNode": upReq.Data.StorageNode,
 	}
-	_, err := d.Request(UploadCompleteV2, http.MethodPost, func(req *resty.Request) {
+	_, err := d.request(S3Complete, http.MethodPost, func(req *resty.Request) {
 		req.SetBody(data).SetContext(ctx)
 	}, nil)
 	return err
 }
 
-func (d *Pan123) newUpload(ctx context.Context, upReq *UploadResp, file model.FileStreamer, up driver.UpdateProgress) error {
+func (d *Pan123) newUpload(ctx context.Context, upReq *UploadResp, file model.FileStreamer, reader io.Reader, up driver.UpdateProgress) error {
-	chunkSize := int64(1024 * 1024 * 16)
+	chunkSize := int64(1024 * 1024 * 5)
 	// fetch s3 pre signed urls
 	chunkCount := int(math.Ceil(float64(file.GetSize()) / float64(chunkSize)))
-	// only 1 batch is allowed
+	// upload 10 chunks each batch
-	isMultipart := chunkCount > 1
+	batchSize := 10
-	batchSize := 1
-	getS3UploadUrl := d.getS3Auth
-	if isMultipart {
-		batchSize = 10
-		getS3UploadUrl = d.getS3PreSignedUrls
-	}
-	limited := driver.NewLimitedUploadStream(ctx, file)
 	for i := 1; i <= chunkCount; i += batchSize {
 		if utils.IsCanceled(ctx) {
 			return ctx.Err()
@@ -91,7 +62,7 @@ func (d *Pan123) newUpload(ctx context.Context, upReq *UploadResp, file model.Fi
 		if end > chunkCount+1 {
 			end = chunkCount + 1
 		}
-		s3PreSignedUrls, err := getS3UploadUrl(ctx, upReq, start, end)
+		s3PreSignedUrls, err := d.getS3PreSignedUrls(ctx, upReq, start, end)
 		if err != nil {
 			return err
 		}
@@ -104,18 +75,18 @@ func (d *Pan123) newUpload(ctx context.Context, upReq *UploadResp, file model.Fi
 			if j == chunkCount {
 				curSize = file.GetSize() - (int64(chunkCount)-1)*chunkSize
 			}
-			err = d.uploadS3Chunk(ctx, upReq, s3PreSignedUrls, j, end, io.LimitReader(limited, chunkSize), curSize, false, getS3UploadUrl)
+			err = d.uploadS3Chunk(ctx, upReq, s3PreSignedUrls, j, end, io.LimitReader(reader, chunkSize), curSize, false)
 			if err != nil {
 				return err
 			}
-			up(float64(j) * 100 / float64(chunkCount))
+			up(j * 100 / chunkCount)
 		}
 	}
 	// complete s3 upload
-	return d.completeS3(ctx, upReq, file, chunkCount > 1)
+	return d.completeS3(ctx, upReq)
 }
 
-func (d *Pan123) uploadS3Chunk(ctx context.Context, upReq *UploadResp, s3PreSignedUrls *S3PreSignedURLs, cur, end int, reader io.Reader, curSize int64, retry bool, getS3UploadUrl func(ctx context.Context, upReq *UploadResp, start int, end int) (*S3PreSignedURLs, error)) error {
+func (d *Pan123) uploadS3Chunk(ctx context.Context, upReq *UploadResp, s3PreSignedUrls *S3PreSignedURLs, cur, end int, reader io.Reader, curSize int64, retry bool) error {
 	uploadUrl := s3PreSignedUrls.Data.PreSignedUrls[strconv.Itoa(cur)]
 	if uploadUrl == "" {
 		return fmt.Errorf("upload url is empty, s3PreSignedUrls: %+v", s3PreSignedUrls)
@@ -137,13 +108,13 @@ func (d *Pan123) uploadS3Chunk(ctx context.Context, upReq *UploadResp, s3PreSign
 			return fmt.Errorf("upload s3 chunk %d failed, status code: %d", cur, res.StatusCode)
 		}
 		// refresh s3 pre signed urls
-		newS3PreSignedUrls, err := getS3UploadUrl(ctx, upReq, cur, end)
+		newS3PreSignedUrls, err := d.getS3PreSignedUrls(ctx, upReq, cur, end)
 		if err != nil {
 			return err
 		}
 		s3PreSignedUrls.Data.PreSignedUrls = newS3PreSignedUrls.Data.PreSignedUrls
 		// retry
-		return d.uploadS3Chunk(ctx, upReq, s3PreSignedUrls, cur, end, reader, curSize, true, getS3UploadUrl)
+		return d.uploadS3Chunk(ctx, upReq, s3PreSignedUrls, cur, end, reader, curSize, true)
 	}
 	if res.StatusCode != http.StatusOK {
 		body, err := io.ReadAll(res.Body)

drivers/123/util.go

@@ -1,149 +1,35 @@
 package _123
 
 import (
-	"context"
 	"errors"
 	"fmt"
-	"hash/crc32"
-	"math"
-	"math/rand"
 	"net/http"
-	"net/url"
 	"strconv"
-	"strings"
-	"time"
 
 	"github.com/alist-org/alist/v3/drivers/base"
 	"github.com/alist-org/alist/v3/pkg/utils"
 	"github.com/go-resty/resty/v2"
 	jsoniter "github.com/json-iterator/go"
-	log "github.com/sirupsen/logrus"
 )
 
 // do others that not defined in Driver interface
 
 const (
-	Api              = "https://www.123pan.com/api"
+	API             = "https://www.123pan.com/b/api"
-	AApi             = "https://www.123pan.com/a/api"
+	SignIn          = API + "/user/sign_in"
-	BApi             = "https://www.123pan.com/b/api"
+	UserInfo        = API + "/user/info"
-	LoginApi         = "https://login.123pan.com/api"
+	FileList        = API + "/file/list/new"
-	MainApi          = BApi
+	DownloadInfo    = "https://www.123pan.com/a/api/file/download_info"
-	SignIn           = LoginApi + "/user/sign_in"
+	Mkdir           = API + "/file/upload_request"
-	Logout           = MainApi + "/user/logout"
+	Move            = API + "/file/mod_pid"
-	UserInfo         = MainApi + "/user/info"
+	Rename          = API + "/file/rename"
-	FileList         = MainApi + "/file/list/new"
+	Trash           = API + "/file/trash"
-	DownloadInfo     = MainApi + "/file/download_info"
+	UploadRequest   = API + "/file/upload_request"
-	Mkdir            = MainApi + "/file/upload_request"
+	UploadComplete  = API + "/file/upload_complete"
-	Move             = MainApi + "/file/mod_pid"
+	S3PreSignedUrls = API + "/file/s3_repare_upload_parts_batch"
-	Rename           = MainApi + "/file/rename"
+	S3Complete      = API + "/file/s3_complete_multipart_upload"
-	Trash            = MainApi + "/file/trash"
-	UploadRequest    = MainApi + "/file/upload_request"
-	UploadComplete   = MainApi + "/file/upload_complete"
-	S3PreSignedUrls  = MainApi + "/file/s3_repare_upload_parts_batch"
-	S3Auth           = MainApi + "/file/s3_upload_object/auth"
-	UploadCompleteV2 = MainApi + "/file/upload_complete/v2"
-	S3Complete       = MainApi + "/file/s3_complete_multipart_upload"
-	//AuthKeySalt      = "8-8D$sL8gPjom7bk#cY"
 )
 
-func signPath(path string, os string, version string) (k string, v string) {
-	table := []byte{'a', 'd', 'e', 'f', 'g', 'h', 'l', 'm', 'y', 'i', 'j', 'n', 'o', 'p', 'k', 'q', 'r', 's', 't', 'u', 'b', 'c', 'v', 'w', 's', 'z'}
-	random := fmt.Sprintf("%.f", math.Round(1e7*rand.Float64()))
-	now := time.Now().In(time.FixedZone("CST", 8*3600))
-	timestamp := fmt.Sprint(now.Unix())
-	nowStr := []byte(now.Format("200601021504"))
-	for i := 0; i < len(nowStr); i++ {
-		nowStr[i] = table[nowStr[i]-48]
-	}
-	timeSign := fmt.Sprint(crc32.ChecksumIEEE(nowStr))
-	data := strings.Join([]string{timestamp, random, path, os, version, timeSign}, "|")
-	dataSign := fmt.Sprint(crc32.ChecksumIEEE([]byte(data)))
-	return timeSign, strings.Join([]string{timestamp, random, dataSign}, "-")
-}
-
-func GetApi(rawUrl string) string {
-	u, _ := url.Parse(rawUrl)
-	query := u.Query()
-	query.Add(signPath(u.Path, "web", "3"))
-	u.RawQuery = query.Encode()
-	return u.String()
-}
-
-//func GetApi(url string) string {
-//	vm := js.New()
-//	vm.Set("url", url[22:])
-//	r, err := vm.RunString(`
-//	(function(e){
-//        function A(t, e) {
-//            e = 1 < arguments.length && void 0 !== e ? e : 10;
-//            for (var n = function() {
-//                for (var t = [], e = 0; e < 256; e++) {
-//                    for (var n = e, r = 0; r < 8; r++)
-//                        n = 1 & n ? 3988292384 ^ n >>> 1 : n >>> 1;
-//                    t[e] = n
-//                }
-//                return t
-//            }(), r = function(t) {
-//                t = t.replace(/\\r\\n/g, "\\n");
-//                for (var e = "", n = 0; n < t.length; n++) {
-//                    var r = t.charCodeAt(n);
-//                    r < 128 ? e += String.fromCharCode(r) : e = 127 < r && r < 2048 ? (e += String.fromCharCode(r >> 6 | 192)) + String.fromCharCode(63 & r | 128) : (e = (e += String.fromCharCode(r >> 12 | 224)) + String.fromCharCode(r >> 6 & 63 | 128)) + String.fromCharCode(63 & r | 128)
-//                }
-//                return e
-//            }(t), a = -1, i = 0; i < r.length; i++)
-//                a = a >>> 8 ^ n[255 & (a ^ r.charCodeAt(i))];
-//            return (a = (-1 ^ a) >>> 0).toString(e)
-//        }
-//
-//	   function v(t) {
-//	       return (v = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(t) {
-//	                   return typeof t
-//	               }
-//	               : function(t) {
-//	                   return t && "function" == typeof Symbol && t.constructor === Symbol && t !== Symbol.prototype ? "symbol" : typeof t
-//	               }
-//	       )(t)
-//	   }
-//
-//		for (p in a = Math.round(1e7 * Math.random()),
-//		o = Math.round(((new Date).getTime() + 60 * (new Date).getTimezoneOffset() * 1e3 + 288e5) / 1e3).toString(),
-//		m = ["a", "d", "e", "f", "g", "h", "l", "m", "y", "i", "j", "n", "o", "p", "k", "q", "r", "s", "t", "u", "b", "c", "v", "w", "s", "z"],
-//		u = function(t, e, n) {
-//			var r;
-//			n = 2 < arguments.length && void 0 !== n ? n : 8;
-//			return 0 === arguments.length ? null : (r = "object" === v(t) ? t : (10 === "".concat(t).length && (t = 1e3 * Number.parseInt(t)),
-//			new Date(t)),
-//			t += 6e4 * new Date(t).getTimezoneOffset(),
-//			{
-//				y: (r = new Date(t + 36e5 * n)).getFullYear(),
-//				m: r.getMonth() + 1 < 10 ? "0".concat(r.getMonth() + 1) : r.getMonth() + 1,
-//				d: r.getDate() < 10 ? "0".concat(r.getDate()) : r.getDate(),
-//				h: r.getHours() < 10 ? "0".concat(r.getHours()) : r.getHours(),
-//				f: r.getMinutes() < 10 ? "0".concat(r.getMinutes()) : r.getMinutes()
-//			})
-//		}(o),
-//		h = u.y,
-//		g = u.m,
-//		l = u.d,
-//		c = u.h,
-//		u = u.f,
-//		d = [h, g, l, c, u].join(""),
-//		f = [],
-//		d)
-//			f.push(m[Number(d[p])]);
-//		return h = A(f.join("")),
-//		g = A("".concat(o, "|").concat(a, "|").concat(e, "|").concat("web", "|").concat("3", "|").concat(h)),
-//		"".concat(h, "=").concat(o, "-").concat(a, "-").concat(g);
-//	})(url)
-//	   `)
-//	if err != nil {
-//		fmt.Println(err)
-//		return url
-//	}
-//	v, _ := r.Export().(string)
-//	return url + "?" + v
-//}
-
 func (d *Pan123) login() error {
 	var body base.Json
 	if utils.IsEmailFormat(d.Username) {
@@ -156,18 +42,9 @@ func (d *Pan123) login() error {
 		body = base.Json{
 			"passport": d.Username,
 			"password": d.Password,
-			"remember": true,
 		}
 	}
 	res, err := base.RestyClient.R().
-		SetHeaders(map[string]string{
-			"origin":      "https://www.123pan.com",
-			"referer":     "https://www.123pan.com/",
-			"user-agent":  "Dart/2.19(dart:io)-alist",
-			"platform":    "web",
-			"app-version": "3",
-			//"user-agent":  base.UserAgent,
-		}).
 		SetBody(body).Post(SignIn)
 	if err != nil {
 		return err
@@ -180,32 +57,13 @@ func (d *Pan123) login() error {
 	return err
 }
 
-//func authKey(reqUrl string) (*string, error) {
+func (d *Pan123) request(url string, method string, callback base.ReqCallback, resp interface{}) ([]byte, error) {
-//	reqURL, err := url.Parse(reqUrl)
-//	if err != nil {
-//		return nil, err
-//	}
-//
-//	nowUnix := time.Now().Unix()
-//	random := rand.Intn(0x989680)
-//
-//	p4 := fmt.Sprintf("%d|%d|%s|%s|%s|%s", nowUnix, random, reqURL.Path, "web", "3", AuthKeySalt)
-//	authKey := fmt.Sprintf("%d-%d-%x", nowUnix, random, md5.Sum([]byte(p4)))
-//	return &authKey, nil
-//}
-
-func (d *Pan123) Request(url string, method string, callback base.ReqCallback, resp interface{}) ([]byte, error) {
-	isRetry := false
-do:
 	req := base.RestyClient.R()
 	req.SetHeaders(map[string]string{
 		"origin":        "https://www.123pan.com",
-		"referer":       "https://www.123pan.com/",
 		"authorization": "Bearer " + d.AccessToken,
-		"user-agent":    "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) alist-client",
 		"platform":      "web",
-		"app-version":   "3",
+		"app-version":   "1.2",
-		//"user-agent":    base.UserAgent,
 	})
 	if callback != nil {
 		callback(req)
@@ -213,72 +71,51 @@ do:
 	if resp != nil {
 		req.SetResult(resp)
 	}
-	//authKey, err := authKey(url)
+	res, err := req.Execute(method, url)
-	//if err != nil {
-	//	return nil, err
-	//}
-	//req.SetQueryParam("auth-key", *authKey)
-	res, err := req.Execute(method, GetApi(url))
 	if err != nil {
 		return nil, err
 	}
 	body := res.Body()
 	code := utils.Json.Get(body, "code").ToInt()
 	if code != 0 {
-		if !isRetry && code == 401 {
+		if code == 401 {
 			err := d.login()
 			if err != nil {
 				return nil, err
 			}
-			isRetry = true
+			return d.request(url, method, callback, resp)
-			goto do
 		}
 		return nil, errors.New(jsoniter.Get(body, "message").ToString())
 	}
 	return body, nil
 }
 
-func (d *Pan123) getFiles(ctx context.Context, parentId string, name string) ([]File, error) {
+func (d *Pan123) getFiles(parentId string) ([]File, error) {
 	page := 1
-	total := 0
 	res := make([]File, 0)
-	// 2024-02-06 fix concurrency by 123pan
 	for {
-		if err := d.APIRateLimit(ctx, FileList); err != nil {
-			return nil, err
-		}
 		var resp Files
 		query := map[string]string{
-			"driveId":              "0",
+			"driveId":        "0",
-			"limit":                "100",
+			"limit":          "100",
-			"next":                 "0",
+			"next":           "0",
-			"orderBy":              "file_id",
+			"orderBy":        d.OrderBy,
-			"orderDirection":       "desc",
+			"orderDirection": d.OrderDirection,
-			"parentFileId":         parentId,
+			"parentFileId":   parentId,
-			"trashed":              "false",
+			"trashed":        "false",
-			"SearchData":           "",
+			"Page":           strconv.Itoa(page),
-			"Page":                 strconv.Itoa(page),
-			"OnlyLookAbnormalFile": "0",
-			"event":                "homeListFile",
-			"operateType":          "4",
-			"inDirectSpace":        "false",
 		}
-		_res, err := d.Request(FileList, http.MethodGet, func(req *resty.Request) {
+		_, err := d.request(FileList, http.MethodGet, func(req *resty.Request) {
 			req.SetQueryParams(query)
 		}, &resp)
 		if err != nil {
 			return nil, err
 		}
-		log.Debug(string(_res))
 		page++
 		res = append(res, resp.Data.InfoList...)
-		total = resp.Data.Total
 		if len(resp.Data.InfoList) == 0 || resp.Data.Next == "-1" {
 			break
 		}
 	}
-	if len(res) != total {
-		log.Warnf("incorrect file count from remote at %s: expected %d, got %d", name, total, len(res))
-	}
 	return res, nil
 }

drivers/123_link/driver.go

@@ -1,77 +0,0 @@
-package _123Link
-
-import (
-	"context"
-	stdpath "path"
-	"time"
-
-	"github.com/alist-org/alist/v3/internal/driver"
-	"github.com/alist-org/alist/v3/internal/errs"
-	"github.com/alist-org/alist/v3/internal/model"
-	"github.com/alist-org/alist/v3/pkg/utils"
-)
-
-type Pan123Link struct {
-	model.Storage
-	Addition
-	root *Node
-}
-
-func (d *Pan123Link) Config() driver.Config {
-	return config
-}
-
-func (d *Pan123Link) GetAddition() driver.Additional {
-	return &d.Addition
-}
-
-func (d *Pan123Link) Init(ctx context.Context) error {
-	node, err := BuildTree(d.OriginURLs)
-	if err != nil {
-		return err
-	}
-	node.calSize()
-	d.root = node
-	return nil
-}
-
-func (d *Pan123Link) Drop(ctx context.Context) error {
-	return nil
-}
-
-func (d *Pan123Link) Get(ctx context.Context, path string) (model.Obj, error) {
-	node := GetNodeFromRootByPath(d.root, path)
-	return nodeToObj(node, path)
-}
-
-func (d *Pan123Link) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([]model.Obj, error) {
-	node := GetNodeFromRootByPath(d.root, dir.GetPath())
-	if node == nil {
-		return nil, errs.ObjectNotFound
-	}
-	if node.isFile() {
-		return nil, errs.NotFolder
-	}
-	return utils.SliceConvert(node.Children, func(node *Node) (model.Obj, error) {
-		return nodeToObj(node, stdpath.Join(dir.GetPath(), node.Name))
-	})
-}
-
-func (d *Pan123Link) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
-	node := GetNodeFromRootByPath(d.root, file.GetPath())
-	if node == nil {
-		return nil, errs.ObjectNotFound
-	}
-	if node.isFile() {
-		signUrl, err := SignURL(node.Url, d.PrivateKey, d.UID, time.Duration(d.ValidDuration)*time.Minute)
-		if err != nil {
-			return nil, err
-		}
-		return &model.Link{
-			URL: signUrl,
-		}, nil
-	}
-	return nil, errs.NotFile
-}
-
-var _ driver.Driver = (*Pan123Link)(nil)

drivers/123_link/meta.go

@@ -1,23 +0,0 @@
-package _123Link
-
-import (
-	"github.com/alist-org/alist/v3/internal/driver"
-	"github.com/alist-org/alist/v3/internal/op"
-)
-
-type Addition struct {
-	OriginURLs    string `json:"origin_urls" type:"text" required:"true" default:"https://vip.123pan.com/29/folder/file.mp3" help:"structure:FolderName:\n  [FileSize:][Modified:]Url"`
-	PrivateKey    string `json:"private_key"`
-	UID           uint64 `json:"uid" type:"number"`
-	ValidDuration int64  `json:"valid_duration" type:"number" default:"30" help:"minutes"`
-}
-
-var config = driver.Config{
-	Name: "123PanLink",
-}
-
-func init() {
-	op.RegisterDriver(func() driver.Driver {
-		return &Pan123Link{}
-	})
-}

drivers/123_link/parse.go

@@ -1,152 +0,0 @@
-package _123Link
-
-import (
-	"fmt"
-	url2 "net/url"
-	stdpath "path"
-	"strconv"
-	"strings"
-	"time"
-)
-
-// build tree from text, text structure definition:
-/**
- * FolderName:
- *   [FileSize:][Modified:]Url
- */
-/**
- * For example:
- * folder1:
- *   name1:url1
- *   url2
- *   folder2:
- *     url3
- *     url4
- *   url5
- * folder3:
- *   url6
- *   url7
- * url8
- */
-// if there are no name, use the last segment of url as name
-func BuildTree(text string) (*Node, error) {
-	lines := strings.Split(text, "\n")
-	var root = &Node{Level: -1, Name: "root"}
-	stack := []*Node{root}
-	for _, line := range lines {
-		// calculate indent
-		indent := 0
-		for i := 0; i < len(line); i++ {
-			if line[i] != ' ' {
-				break
-			}
-			indent++
-		}
-		// if indent is not a multiple of 2, it is an error
-		if indent%2 != 0 {
-			return nil, fmt.Errorf("the line '%s' is not a multiple of 2", line)
-		}
-		// calculate level
-		level := indent / 2
-		line = strings.TrimSpace(line[indent:])
-		// if the line is empty, skip
-		if line == "" {
-			continue
-		}
-		// if level isn't greater than the level of the top of the stack
-		// it is not the child of the top of the stack
-		for level <= stack[len(stack)-1].Level {
-			// pop the top of the stack
-			stack = stack[:len(stack)-1]
-		}
-		// if the line is a folder
-		if isFolder(line) {
-			// create a new node
-			node := &Node{
-				Level: level,
-				Name:  strings.TrimSuffix(line, ":"),
-			}
-			// add the node to the top of the stack
-			stack[len(stack)-1].Children = append(stack[len(stack)-1].Children, node)
-			// push the node to the stack
-			stack = append(stack, node)
-		} else {
-			// if the line is a file
-			// create a new node
-			node, err := parseFileLine(line)
-			if err != nil {
-				return nil, err
-			}
-			node.Level = level
-			// add the node to the top of the stack
-			stack[len(stack)-1].Children = append(stack[len(stack)-1].Children, node)
-		}
-	}
-	return root, nil
-}
-
-func isFolder(line string) bool {
-	return strings.HasSuffix(line, ":")
-}
-
-// line definition:
-// [FileSize:][Modified:]Url
-func parseFileLine(line string) (*Node, error) {
-	// if there is no url, it is an error
-	if !strings.Contains(line, "http://") && !strings.Contains(line, "https://") {
-		return nil, fmt.Errorf("invalid line: %s, because url is required for file", line)
-	}
-	index := strings.Index(line, "http://")
-	if index == -1 {
-		index = strings.Index(line, "https://")
-	}
-	url := line[index:]
-	info := line[:index]
-	node := &Node{
-		Url: url,
-	}
-	name := stdpath.Base(url)
-	unescape, err := url2.PathUnescape(name)
-	if err == nil {
-		name = unescape
-	}
-	node.Name = name
-	if index > 0 {
-		if !strings.HasSuffix(info, ":") {
-			return nil, fmt.Errorf("invalid line: %s, because file info must end with ':'", line)
-		}
-		info = info[:len(info)-1]
-		if info == "" {
-			return nil, fmt.Errorf("invalid line: %s, because file name can't be empty", line)
-		}
-		infoParts := strings.Split(info, ":")
-		size, err := strconv.ParseInt(infoParts[0], 10, 64)
-		if err != nil {
-			return nil, fmt.Errorf("invalid line: %s, because file size must be an integer", line)
-		}
-		node.Size = size
-		if len(infoParts) > 1 {
-			modified, err := strconv.ParseInt(infoParts[1], 10, 64)
-			if err != nil {
-				return nil, fmt.Errorf("invalid line: %s, because file modified must be an unix timestamp", line)
-			}
-			node.Modified = modified
-		} else {
-			node.Modified = time.Now().Unix()
-		}
-	}
-	return node, nil
-}
-
-func splitPath(path string) []string {
-	if path == "/" {
-		return []string{"root"}
-	}
-	parts := strings.Split(path, "/")
-	parts[0] = "root"
-	return parts
-}
-
-func GetNodeFromRootByPath(root *Node, path string) *Node {
-	return root.getByPath(splitPath(path))
-}

drivers/123_link/types.go

@@ -1,66 +0,0 @@
-package _123Link
-
-import (
-	"time"
-
-	"github.com/alist-org/alist/v3/internal/errs"
-	"github.com/alist-org/alist/v3/internal/model"
-)
-
-// Node is a node in the folder tree
-type Node struct {
-	Url      string
-	Name     string
-	Level    int
-	Modified int64
-	Size     int64
-	Children []*Node
-}
-
-func (node *Node) getByPath(paths []string) *Node {
-	if len(paths) == 0 || node == nil {
-		return nil
-	}
-	if node.Name != paths[0] {
-		return nil
-	}
-	if len(paths) == 1 {
-		return node
-	}
-	for _, child := range node.Children {
-		tmp := child.getByPath(paths[1:])
-		if tmp != nil {
-			return tmp
-		}
-	}
-	return nil
-}
-
-func (node *Node) isFile() bool {
-	return node.Url != ""
-}
-
-func (node *Node) calSize() int64 {
-	if node.isFile() {
-		return node.Size
-	}
-	var size int64 = 0
-	for _, child := range node.Children {
-		size += child.calSize()
-	}
-	node.Size = size
-	return size
-}
-
-func nodeToObj(node *Node, path string) (model.Obj, error) {
-	if node == nil {
-		return nil, errs.ObjectNotFound
-	}
-	return &model.Object{
-		Name:     node.Name,
-		Size:     node.Size,
-		Modified: time.Unix(node.Modified, 0),
-		IsFolder: !node.isFile(),
-		Path:     path,
-	}, nil
-}

drivers/123_link/util.go

@@ -1,30 +0,0 @@
-package _123Link
-
-import (
-	"crypto/md5"
-	"fmt"
-	"math/rand"
-	"net/url"
-	"time"
-)
-
-func SignURL(originURL, privateKey string, uid uint64, validDuration time.Duration) (newURL string, err error) {
-	if privateKey == "" {
-		return originURL, nil
-	}
-	var (
-		ts     = time.Now().Add(validDuration).Unix() // 有效时间戳
-		rInt   = rand.Int()                           // 随机正整数
-		objURL *url.URL
-	)
-	objURL, err = url.Parse(originURL)
-	if err != nil {
-		return "", err
-	}
-	authKey := fmt.Sprintf("%d-%d-%d-%x", ts, rInt, uid, md5.Sum([]byte(fmt.Sprintf("%s-%d-%d-%d-%s",
-		objURL.Path, ts, rInt, uid, privateKey))))
-	v := objURL.Query()
-	v.Add("auth_key", authKey)
-	objURL.RawQuery = v.Encode()
-	return objURL.String(), nil
-}

drivers/123_share/driver.go

@@ -1,174 +0,0 @@
-package _123Share
-
-import (
-	"context"
-	"encoding/base64"
-	"fmt"
-	"net/http"
-	"net/url"
-	"sync"
-	"time"
-
-	"golang.org/x/time/rate"
-
-	_123 "github.com/alist-org/alist/v3/drivers/123"
-	"github.com/alist-org/alist/v3/drivers/base"
-	"github.com/alist-org/alist/v3/internal/driver"
-	"github.com/alist-org/alist/v3/internal/errs"
-	"github.com/alist-org/alist/v3/internal/model"
-	"github.com/alist-org/alist/v3/pkg/utils"
-	"github.com/go-resty/resty/v2"
-	log "github.com/sirupsen/logrus"
-)
-
-type Pan123Share struct {
-	model.Storage
-	Addition
-	apiRateLimit sync.Map
-	ref          *_123.Pan123
-}
-
-func (d *Pan123Share) Config() driver.Config {
-	return config
-}
-
-func (d *Pan123Share) GetAddition() driver.Additional {
-	return &d.Addition
-}
-
-func (d *Pan123Share) Init(ctx context.Context) error {
-	// TODO login / refresh token
-	//op.MustSaveDriverStorage(d)
-	return nil
-}
-
-func (d *Pan123Share) InitReference(storage driver.Driver) error {
-	refStorage, ok := storage.(*_123.Pan123)
-	if ok {
-		d.ref = refStorage
-		return nil
-	}
-	return fmt.Errorf("ref: storage is not 123Pan")
-}
-
-func (d *Pan123Share) Drop(ctx context.Context) error {
-	d.ref = nil
-	return nil
-}
-
-func (d *Pan123Share) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([]model.Obj, error) {
-	// TODO return the files list, required
-	files, err := d.getFiles(ctx, dir.GetID())
-	if err != nil {
-		return nil, err
-	}
-	return utils.SliceConvert(files, func(src File) (model.Obj, error) {
-		return src, nil
-	})
-}
-
-func (d *Pan123Share) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
-	// TODO return link of file, required
-	if f, ok := file.(File); ok {
-		//var resp DownResp
-		var headers map[string]string
-		if !utils.IsLocalIPAddr(args.IP) {
-			headers = map[string]string{
-				//"X-Real-IP":       "1.1.1.1",
-				"X-Forwarded-For": args.IP,
-			}
-		}
-		data := base.Json{
-			"shareKey":  d.ShareKey,
-			"SharePwd":  d.SharePwd,
-			"etag":      f.Etag,
-			"fileId":    f.FileId,
-			"s3keyFlag": f.S3KeyFlag,
-			"size":      f.Size,
-		}
-		resp, err := d.request(DownloadInfo, http.MethodPost, func(req *resty.Request) {
-			req.SetBody(data).SetHeaders(headers)
-		}, nil)
-		if err != nil {
-			return nil, err
-		}
-		downloadUrl := utils.Json.Get(resp, "data", "DownloadURL").ToString()
-		u, err := url.Parse(downloadUrl)
-		if err != nil {
-			return nil, err
-		}
-		nu := u.Query().Get("params")
-		if nu != "" {
-			du, _ := base64.StdEncoding.DecodeString(nu)
-			u, err = url.Parse(string(du))
-			if err != nil {
-				return nil, err
-			}
-		}
-		u_ := u.String()
-		log.Debug("download url: ", u_)
-		res, err := base.NoRedirectClient.R().SetHeader("Referer", "https://www.123pan.com/").Get(u_)
-		if err != nil {
-			return nil, err
-		}
-		log.Debug(res.String())
-		link := model.Link{
-			URL: u_,
-		}
-		log.Debugln("res code: ", res.StatusCode())
-		if res.StatusCode() == 302 {
-			link.URL = res.Header().Get("location")
-		} else if res.StatusCode() < 300 {
-			link.URL = utils.Json.Get(res.Body(), "data", "redirect_url").ToString()
-		}
-		link.Header = http.Header{
-			"Referer": []string{"https://www.123pan.com/"},
-		}
-		return &link, nil
-	}
-	return nil, fmt.Errorf("can't convert obj")
-}
-
-func (d *Pan123Share) MakeDir(ctx context.Context, parentDir model.Obj, dirName string) error {
-	// TODO create folder, optional
-	return errs.NotSupport
-}
-
-func (d *Pan123Share) Move(ctx context.Context, srcObj, dstDir model.Obj) error {
-	// TODO move obj, optional
-	return errs.NotSupport
-}
-
-func (d *Pan123Share) Rename(ctx context.Context, srcObj model.Obj, newName string) error {
-	// TODO rename obj, optional
-	return errs.NotSupport
-}
-
-func (d *Pan123Share) Copy(ctx context.Context, srcObj, dstDir model.Obj) error {
-	// TODO copy obj, optional
-	return errs.NotSupport
-}
-
-func (d *Pan123Share) Remove(ctx context.Context, obj model.Obj) error {
-	// TODO remove obj, optional
-	return errs.NotSupport
-}
-
-func (d *Pan123Share) Put(ctx context.Context, dstDir model.Obj, stream model.FileStreamer, up driver.UpdateProgress) error {
-	// TODO upload file, optional
-	return errs.NotSupport
-}
-
-//func (d *Pan123Share) Other(ctx context.Context, args model.OtherArgs) (interface{}, error) {
-//	return nil, errs.NotSupport
-//}
-
-func (d *Pan123Share) APIRateLimit(ctx context.Context, api string) error {
-	value, _ := d.apiRateLimit.LoadOrStore(api,
-		rate.NewLimiter(rate.Every(700*time.Millisecond), 1))
-	limiter := value.(*rate.Limiter)
-
-	return limiter.Wait(ctx)
-}
-
-var _ driver.Driver = (*Pan123Share)(nil)

drivers/123_share/meta.go

@@ -1,35 +0,0 @@
-package _123Share
-
-import (
-	"github.com/alist-org/alist/v3/internal/driver"
-	"github.com/alist-org/alist/v3/internal/op"
-)
-
-type Addition struct {
-	ShareKey string `json:"sharekey" required:"true"`
-	SharePwd string `json:"sharepassword"`
-	driver.RootID
-	//OrderBy        string `json:"order_by" type:"select" options:"file_name,size,update_at" default:"file_name"`
-	//OrderDirection string `json:"order_direction" type:"select" options:"asc,desc" default:"asc"`
-	AccessToken string `json:"accesstoken" type:"text"`
-}
-
-var config = driver.Config{
-	Name:              "123PanShare",
-	LocalSort:         true,
-	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 &Pan123Share{}
-	})
-}

drivers/123_share/types.go

@@ -1,99 +0,0 @@
-package _123Share
-
-import (
-	"github.com/alist-org/alist/v3/pkg/utils"
-	"net/url"
-	"path"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/alist-org/alist/v3/internal/model"
-)
-
-type File struct {
-	FileName    string    `json:"FileName"`
-	Size        int64     `json:"Size"`
-	UpdateAt    time.Time `json:"UpdateAt"`
-	FileId      int64     `json:"FileId"`
-	Type        int       `json:"Type"`
-	Etag        string    `json:"Etag"`
-	S3KeyFlag   string    `json:"S3KeyFlag"`
-	DownloadUrl string    `json:"DownloadUrl"`
-}
-
-func (f File) GetHash() utils.HashInfo {
-	return utils.HashInfo{}
-}
-
-func (f File) GetPath() string {
-	return ""
-}
-
-func (f File) GetSize() int64 {
-	return f.Size
-}
-
-func (f File) GetName() string {
-	return f.FileName
-}
-
-func (f File) ModTime() time.Time {
-	return f.UpdateAt
-}
-func (f File) CreateTime() time.Time {
-	return f.UpdateAt
-}
-
-func (f File) IsDir() bool {
-	return f.Type == 1
-}
-
-func (f File) GetID() string {
-	return strconv.FormatInt(f.FileId, 10)
-}
-
-func (f File) Thumb() string {
-	if f.DownloadUrl == "" {
-		return ""
-	}
-	du, err := url.Parse(f.DownloadUrl)
-	if err != nil {
-		return ""
-	}
-	du.Path = strings.TrimSuffix(du.Path, "_24_24") + "_70_70"
-	query := du.Query()
-	query.Set("w", "70")
-	query.Set("h", "70")
-	if !query.Has("type") {
-		query.Set("type", strings.TrimPrefix(path.Base(f.FileName), "."))
-	}
-	if !query.Has("trade_key") {
-		query.Set("trade_key", "123pan-thumbnail")
-	}
-	du.RawQuery = query.Encode()
-	return du.String()
-}
-
-var _ model.Obj = (*File)(nil)
-var _ model.Thumb = (*File)(nil)
-
-//func (f File) Thumb() string {
-//
-//}
-//var _ model.Thumb = (*File)(nil)
-
-type Files struct {
-	//BaseResp
-	Data struct {
-		InfoList []File `json:"InfoList"`
-		Next     string `json:"Next"`
-	} `json:"data"`
-}
-
-//type DownResp struct {
-//	//BaseResp
-//	Data struct {
-//		DownloadUrl string `json:"DownloadUrl"`
-//	} `json:"data"`
-//}

drivers/123_share/util.go

@@ -1,120 +0,0 @@
-package _123Share
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"hash/crc32"
-	"math"
-	"math/rand"
-	"net/http"
-	"net/url"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/alist-org/alist/v3/drivers/base"
-	"github.com/alist-org/alist/v3/pkg/utils"
-	"github.com/go-resty/resty/v2"
-	jsoniter "github.com/json-iterator/go"
-)
-
-const (
-	Api          = "https://www.123pan.com/api"
-	AApi         = "https://www.123pan.com/a/api"
-	BApi         = "https://www.123pan.com/b/api"
-	MainApi      = BApi
-	FileList     = MainApi + "/share/get"
-	DownloadInfo = MainApi + "/share/download/info"
-	//AuthKeySalt      = "8-8D$sL8gPjom7bk#cY"
-)
-
-func signPath(path string, os string, version string) (k string, v string) {
-	table := []byte{'a', 'd', 'e', 'f', 'g', 'h', 'l', 'm', 'y', 'i', 'j', 'n', 'o', 'p', 'k', 'q', 'r', 's', 't', 'u', 'b', 'c', 'v', 'w', 's', 'z'}
-	random := fmt.Sprintf("%.f", math.Round(1e7*rand.Float64()))
-	now := time.Now().In(time.FixedZone("CST", 8*3600))
-	timestamp := fmt.Sprint(now.Unix())
-	nowStr := []byte(now.Format("200601021504"))
-	for i := 0; i < len(nowStr); i++ {
-		nowStr[i] = table[nowStr[i]-48]
-	}
-	timeSign := fmt.Sprint(crc32.ChecksumIEEE(nowStr))
-	data := strings.Join([]string{timestamp, random, path, os, version, timeSign}, "|")
-	dataSign := fmt.Sprint(crc32.ChecksumIEEE([]byte(data)))
-	return timeSign, strings.Join([]string{timestamp, random, dataSign}, "-")
-}
-
-func GetApi(rawUrl string) string {
-	u, _ := url.Parse(rawUrl)
-	query := u.Query()
-	query.Add(signPath(u.Path, "web", "3"))
-	u.RawQuery = query.Encode()
-	return u.String()
-}
-
-func (d *Pan123Share) request(url string, method string, callback base.ReqCallback, resp interface{}) ([]byte, error) {
-	if d.ref != nil {
-		return d.ref.Request(url, method, callback, resp)
-	}
-	req := base.RestyClient.R()
-	req.SetHeaders(map[string]string{
-		"origin":        "https://www.123pan.com",
-		"referer":       "https://www.123pan.com/",
-		"authorization": "Bearer " + d.AccessToken,
-		"user-agent":    "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) alist-client",
-		"platform":      "web",
-		"app-version":   "3",
-		//"user-agent":    base.UserAgent,
-	})
-	if callback != nil {
-		callback(req)
-	}
-	if resp != nil {
-		req.SetResult(resp)
-	}
-	res, err := req.Execute(method, GetApi(url))
-	if err != nil {
-		return nil, err
-	}
-	body := res.Body()
-	code := utils.Json.Get(body, "code").ToInt()
-	if code != 0 {
-		return nil, errors.New(jsoniter.Get(body, "message").ToString())
-	}
-	return body, nil
-}
-
-func (d *Pan123Share) getFiles(ctx context.Context, parentId string) ([]File, error) {
-	page := 1
-	res := make([]File, 0)
-	for {
-		if err := d.APIRateLimit(ctx, FileList); err != nil {
-			return nil, err
-		}
-		var resp Files
-		query := map[string]string{
-			"limit":          "100",
-			"next":           "0",
-			"orderBy":        "file_id",
-			"orderDirection": "desc",
-			"parentFileId":   parentId,
-			"Page":           strconv.Itoa(page),
-			"shareKey":       d.ShareKey,
-			"SharePwd":       d.SharePwd,
-		}
-		_, err := d.request(FileList, http.MethodGet, func(req *resty.Request) {
-			req.SetQueryParams(query)
-		}, &resp)
-		if err != nil {
-			return nil, err
-		}
-		page++
-		res = append(res, resp.Data.InfoList...)
-		if len(resp.Data.InfoList) == 0 || resp.Data.Next == "-1" {
-			break
-		}
-	}
-	return res, nil
-}
-
-// do others that not defined in Driver interface

drivers/139/meta.go

@@ -9,22 +9,17 @@ type Addition struct {
 	//Account       string `json:"account" required:"true"`
 	Authorization string `json:"authorization" type:"text" required:"true"`
 	driver.RootID
-	Type                 string `json:"type" type:"select" options:"personal_new,family,group,personal" default:"personal_new"`
+	Type    string `json:"type" type:"select" options:"personal,family" default:"personal"`
-	CloudID              string `json:"cloud_id"`
+	CloudID string `json:"cloud_id"`
-	CustomUploadPartSize int64  `json:"custom_upload_part_size" type:"number" default:"0" help:"0 for auto"`
-	ReportRealSize       bool   `json:"report_real_size" type:"bool" default:"true" help:"Enable to report the real file size during upload"`
 }
 
 var config = driver.Config{
-	Name:             "139Yun",
+	Name:      "139Yun",
-	LocalSort:        true,
+	LocalSort: true,
-	ProxyRangeOption: true,
 }
 
 func init() {
 	op.RegisterDriver(func() driver.Driver {
-		d := &Yun139{}
+		return &Yun139{}
-		d.ProxyRange = true
-		return d
 	})
 }

drivers/139/types.go

@@ -1,16 +1,5 @@
 package _139
 
-import (
-	"encoding/xml"
-)
-
-const (
-	MetaPersonal    string = "personal"
-	MetaFamily      string = "family"
-	MetaGroup       string = "group"
-	MetaPersonalNew string = "personal_new"
-)
-
 type BaseResp struct {
 	Success bool   `json:"success"`
 	Code    string `json:"code"`
@@ -21,7 +10,7 @@ type Catalog struct {
 	CatalogID   string `json:"catalogID"`
 	CatalogName string `json:"catalogName"`
 	//CatalogType     int         `json:"catalogType"`
-	CreateTime string `json:"createTime"`
+	//CreateTime      string      `json:"createTime"`
 	UpdateTime string `json:"updateTime"`
 	//IsShared        bool        `json:"isShared"`
 	//CatalogLevel    int         `json:"catalogLevel"`
@@ -55,7 +44,6 @@ type Content struct {
 	//ContentDesc     string      `json:"contentDesc"`
 	//ContentType     int         `json:"contentType"`
 	//ContentOrigin   int         `json:"contentOrigin"`
-	CreateTime string `json:"createTime"`
 	UpdateTime string `json:"updateTime"`
 	//CommentCount    int         `json:"commentCount"`
 	ThumbnailURL string `json:"thumbnailURL"`
@@ -75,7 +63,7 @@ type Content struct {
 	//ParentCatalogID string      `json:"parentCatalogId"`
 	//Channel         string      `json:"channel"`
 	//GeoLocFlag      string      `json:"geoLocFlag"`
-	Digest string `json:"digest"`
+	//Digest          string      `json:"digest"`
 	//Version         string      `json:"version"`
 	//FileEtag        string      `json:"fileEtag"`
 	//FileVersion     string      `json:"fileVersion"`
@@ -143,13 +131,6 @@ type UploadResp struct {
 	} `json:"data"`
 }
 
-type InterLayerUploadResult struct {
-	XMLName    xml.Name `xml:"result"`
-	Text       string   `xml:",chardata"`
-	ResultCode int      `xml:"resultCode"`
-	Msg        string   `xml:"msg"`
-}
-
 type CloudContent struct {
 	ContentID string `json:"contentID"`
 	//Modifier         string      `json:"modifier"`
@@ -160,7 +141,7 @@ type CloudContent struct {
 	//ContentSuffix    string      `json:"contentSuffix"`
 	ContentSize int64 `json:"contentSize"`
 	//ContentDesc      string      `json:"contentDesc"`
-	CreateTime string `json:"createTime"`
+	//CreateTime       string      `json:"createTime"`
 	//Shottime         interface{} `json:"shottime"`
 	LastUpdateTime string `json:"lastUpdateTime"`
 	ThumbnailURL   string `json:"thumbnailURL"`
@@ -184,7 +165,7 @@ type CloudCatalog struct {
 	CatalogID   string `json:"catalogID"`
 	CatalogName string `json:"catalogName"`
 	//CloudID         string `json:"cloudID"`
-	CreateTime     string `json:"createTime"`
+	//CreateTime      string `json:"createTime"`
 	LastUpdateTime string `json:"lastUpdateTime"`
 	//Creator         string `json:"creator"`
 	//CreatorNickname string `json:"creatorNickname"`
@@ -204,92 +185,3 @@ type QueryContentListResp struct {
 		RecallContent    interface{}    `json:"recallContent"`
 	} `json:"data"`
 }
-
-type QueryGroupContentListResp struct {
-	BaseResp
-	Data struct {
-		Result struct {
-			ResultCode string `json:"resultCode"`
-			ResultDesc string `json:"resultDesc"`
-		} `json:"result"`
-		GetGroupContentResult struct {
-			ParentCatalogID string `json:"parentCatalogID"` // 根目录是"0"
-			CatalogList     []struct {
-				Catalog
-				Path string `json:"path"`
-			} `json:"catalogList"`
-			ContentList []Content `json:"contentList"`
-			NodeCount   int       `json:"nodeCount"` // 文件+文件夹数量
-			CtlgCnt     int       `json:"ctlgCnt"`   // 文件夹数量
-			ContCnt     int       `json:"contCnt"`   // 文件数量
-		} `json:"getGroupContentResult"`
-	} `json:"data"`
-}
-
-type ParallelHashCtx struct {
-	PartOffset int64 `json:"partOffset"`
-}
-
-type PartInfo struct {
-	PartNumber      int64           `json:"partNumber"`
-	PartSize        int64           `json:"partSize"`
-	ParallelHashCtx ParallelHashCtx `json:"parallelHashCtx"`
-}
-
-type PersonalThumbnail struct {
-	Style string `json:"style"`
-	Url   string `json:"url"`
-}
-
-type PersonalFileItem struct {
-	FileId     string              `json:"fileId"`
-	Name       string              `json:"name"`
-	Size       int64               `json:"size"`
-	Type       string              `json:"type"`
-	CreatedAt  string              `json:"createdAt"`
-	UpdatedAt  string              `json:"updatedAt"`
-	Thumbnails []PersonalThumbnail `json:"thumbnailUrls"`
-}
-
-type PersonalListResp struct {
-	BaseResp
-	Data struct {
-		Items          []PersonalFileItem `json:"items"`
-		NextPageCursor string             `json:"nextPageCursor"`
-	}
-}
-
-type PersonalPartInfo struct {
-	PartNumber int    `json:"partNumber"`
-	UploadUrl  string `json:"uploadUrl"`
-}
-
-type PersonalUploadResp struct {
-	BaseResp
-	Data struct {
-		FileId      string             `json:"fileId"`
-		FileName    string             `json:"fileName"`
-		PartInfos   []PersonalPartInfo `json:"partInfos"`
-		Exist       bool               `json:"exist"`
-		RapidUpload bool               `json:"rapidUpload"`
-		UploadId    string             `json:"uploadId"`
-	}
-}
-
-type PersonalUploadUrlResp struct {
-	BaseResp
-	Data struct {
-		FileId    string             `json:"fileId"`
-		UploadId  string             `json:"uploadId"`
-		PartInfos []PersonalPartInfo `json:"partInfos"`
-	}
-}
-
-type RefreshTokenResp struct {
-	XMLName     xml.Name   `xml:"root"`
-	Return      string     `xml:"return"`
-	Token       string     `xml:"token"`
-	Expiretime  int32      `xml:"expiretime"`
-	AccessToken string     `xml:"accessToken"`
-	Desc        string     `xml:"desc"`
-}

drivers/139/util.go

@@ -6,7 +6,6 @@ import (
 	"fmt"
 	"net/http"
 	"net/url"
-	"path"
 	"sort"
 	"strconv"
 	"strings"
@@ -14,7 +13,6 @@ import (
 
 	"github.com/alist-org/alist/v3/drivers/base"
 	"github.com/alist-org/alist/v3/internal/model"
-	"github.com/alist-org/alist/v3/internal/op"
 	"github.com/alist-org/alist/v3/pkg/utils"
 	"github.com/alist-org/alist/v3/pkg/utils/random"
 	"github.com/go-resty/resty/v2"
@@ -44,65 +42,16 @@ func calSign(body, ts, randStr string) string {
 	sort.Strings(strs)
 	body = strings.Join(strs, "")
 	body = base64.StdEncoding.EncodeToString([]byte(body))
-	res := utils.GetMD5EncodeStr(body) + utils.GetMD5EncodeStr(ts+":"+randStr)
+	res := utils.GetMD5Encode(body) + utils.GetMD5Encode(ts+":"+randStr)
-	res = strings.ToUpper(utils.GetMD5EncodeStr(res))
+	res = strings.ToUpper(utils.GetMD5Encode(res))
 	return res
 }
 
 func getTime(t string) time.Time {
-	stamp, _ := time.ParseInLocation("20060102150405", t, utils.CNLoc)
+	stamp, _ := time.ParseInLocation("20060102150405", t, time.Local)
 	return stamp
 }
 
-func (d *Yun139) refreshToken() error {
-	if d.ref != nil {
-		return d.ref.refreshToken()
-	}
-	decode, err := base64.StdEncoding.DecodeString(d.Authorization)
-	if err != nil {
-		return fmt.Errorf("authorization decode failed: %s", err)
-	}
-	decodeStr := string(decode)
-	splits := strings.Split(decodeStr, ":")
-	if len(splits) < 3 {
-		return fmt.Errorf("authorization is invalid, splits < 3")
-	}
-	strs := strings.Split(splits[2], "|")
-	if len(strs) < 4 {
-		return fmt.Errorf("authorization is invalid, strs < 4")
-	}
-	expiration, err := strconv.ParseInt(strs[3], 10, 64)
-	if err != nil {
-		return fmt.Errorf("authorization is invalid")
-	}
-	expiration -= time.Now().UnixMilli()
-	if expiration > 1000*60*60*24*15 {
-		// Authorization有效期大于15天无需刷新
-		return nil
-	}
-	if expiration < 0 {
-		return fmt.Errorf("authorization has expired")
-	}
-
-	url := "https://aas.caiyun.feixin.10086.cn:443/tellin/authTokenRefresh.do"
-	var resp RefreshTokenResp
-	reqBody := "<root><token>" + splits[2] + "</token><account>" + splits[1] + "</account><clienttype>656</clienttype></root>"
-	_, err = base.RestyClient.R().
-		ForceContentType("application/xml").
-		SetBody(reqBody).
-		SetResult(&resp).
-		Post(url)
-	if err != nil {
-		return err
-	}
-	if resp.Return != "0" {
-		return fmt.Errorf("failed to refresh token: %s", resp.Desc)
-	}
-	d.Authorization = base64.StdEncoding.EncodeToString([]byte(splits[0] + ":" + splits[1] + ":" + resp.Token))
-	op.MustSaveDriverStorage(d)
-	return nil
-}
-
 func (d *Yun139) request(pathname string, method string, callback base.ReqCallback, resp interface{}) ([]byte, error) {
 	url := "https://yun.139.com" + pathname
 	req := base.RestyClient.R()
@@ -123,22 +72,21 @@ func (d *Yun139) request(pathname string, method string, callback base.ReqCallba
 	req.SetHeaders(map[string]string{
 		"Accept":         "application/json, text/plain, */*",
 		"CMS-DEVICE":     "default",
-		"Authorization":  "Basic " + d.getAuthorization(),
+		"Authorization":  "Basic " + d.Authorization,
 		"mcloud-channel": "1000101",
 		"mcloud-client":  "10701",
 		//"mcloud-route": "001",
 		"mcloud-sign": fmt.Sprintf("%s,%s,%s", ts, randStr, sign),
 		//"mcloud-skey":"",
-		"mcloud-version":         "7.14.0",
+		"mcloud-version":      "6.6.0",
-		"Origin":                 "https://yun.139.com",
+		"Origin":              "https://yun.139.com",
-		"Referer":                "https://yun.139.com/w/",
+		"Referer":             "https://yun.139.com/w/",
-		"x-DeviceInfo":           "||9|7.14.0|chrome|120.0.0.0|||windows 10||zh-CN|||",
+		"x-DeviceInfo":        "||9|6.6.0|chrome|95.0.4638.69|uwIy75obnsRPIwlJSd7D9GhUvFwG96ce||macos 10.15.2||zh-CN|||",
-		"x-huawei-channelSrc":    "10000034",
+		"x-huawei-channelSrc": "10000034",
-		"x-inner-ntwk":           "2",
+		"x-inner-ntwk":        "2",
-		"x-m4c-caller":           "PC",
+		"x-m4c-caller":        "PC",
-		"x-m4c-src":              "10002",
+		"x-m4c-src":           "10002",
-		"x-SvcType":              svcType,
+		"x-SvcType":           svcType,
-		"Inner-Hcy-Router-Https": "1",
 	})
 
 	var e BaseResp
@@ -176,7 +124,7 @@ func (d *Yun139) getFiles(catalogID string) ([]model.Obj, error) {
 			"catalogSortType": 0,
 			"contentSortType": 0,
 			"commonAccountInfo": base.Json{
-				"account":     d.getAccount(),
+				"account":     d.Account,
 				"accountType": 1,
 			},
 		}
@@ -191,7 +139,6 @@ func (d *Yun139) getFiles(catalogID string) ([]model.Obj, error) {
 				Name:     catalog.CatalogName,
 				Size:     0,
 				Modified: getTime(catalog.UpdateTime),
-				Ctime:    getTime(catalog.CreateTime),
 				IsFolder: true,
 			}
 			files = append(files, &f)
@@ -203,7 +150,6 @@ func (d *Yun139) getFiles(catalogID string) ([]model.Obj, error) {
 					Name:     content.ContentName,
 					Size:     content.ContentSize,
 					Modified: getTime(content.UpdateTime),
-					HashInfo: utils.NewHashInfo(utils.MD5, content.Digest),
 				},
 				Thumbnail: model.Thumbnail{Thumbnail: content.ThumbnailURL},
 				//Thumbnail: content.BigthumbnailURL,
@@ -224,7 +170,7 @@ func (d *Yun139) newJson(data map[string]interface{}) base.Json {
 		"cloudID":     d.CloudID,
 		"cloudType":   1,
 		"commonAccountInfo": base.Json{
-			"account":     d.getAccount(),
+			"account":     d.Account,
 			"accountType": 1,
 		},
 	}
@@ -245,11 +191,10 @@ func (d *Yun139) familyGetFiles(catalogID string) ([]model.Obj, error) {
 			"sortDirection": 1,
 		})
 		var resp QueryContentListResp
-		_, err := d.post("/orchestration/familyCloud-rebuild/content/v1.2/queryContentList", data, &resp)
+		_, err := d.post("/orchestration/familyCloud/content/v1.0/queryContentList", data, &resp)
 		if err != nil {
 			return nil, err
 		}
-		path := resp.Data.Path
 		for _, catalog := range resp.Data.CloudCatalogList {
 			f := model.Object{
 				ID:       catalog.CatalogID,
@@ -257,8 +202,6 @@ func (d *Yun139) familyGetFiles(catalogID string) ([]model.Obj, error) {
 				Size:     0,
 				IsFolder: true,
 				Modified: getTime(catalog.LastUpdateTime),
-				Ctime:    getTime(catalog.CreateTime),
-				Path:     path, // 文件夹上一级的Path
 			}
 			files = append(files, &f)
 		}
@@ -269,15 +212,13 @@ func (d *Yun139) familyGetFiles(catalogID string) ([]model.Obj, error) {
 					Name:     content.ContentName,
 					Size:     content.ContentSize,
 					Modified: getTime(content.LastUpdateTime),
-					Ctime:    getTime(content.CreateTime),
-					Path:     path, // 文件所在目录的Path
 				},
 				Thumbnail: model.Thumbnail{Thumbnail: content.ThumbnailURL},
 				//Thumbnail: content.BigthumbnailURL,
 			}
 			files = append(files, &f)
 		}
-		if resp.Data.TotalCount == 0 {
+		if 100*pageNum > resp.Data.TotalCount {
 			break
 		}
 		pageNum++
@@ -285,67 +226,12 @@ func (d *Yun139) familyGetFiles(catalogID string) ([]model.Obj, error) {
 	return files, nil
 }
 
-func (d *Yun139) groupGetFiles(catalogID string) ([]model.Obj, error) {
-	pageNum := 1
-	files := make([]model.Obj, 0)
-	for {
-		data := d.newJson(base.Json{
-			"groupID":         d.CloudID,
-			"catalogID":       path.Base(catalogID),
-			"contentSortType": 0,
-			"sortDirection":   1,
-			"startNumber":     pageNum,
-			"endNumber":       pageNum + 99,
-			"path":            path.Join(d.RootFolderID, catalogID),
-		})
-
-		var resp QueryGroupContentListResp
-		_, err := d.post("/orchestration/group-rebuild/content/v1.0/queryGroupContentList", data, &resp)
-		if err != nil {
-			return nil, err
-		}
-		path := resp.Data.GetGroupContentResult.ParentCatalogID
-		for _, catalog := range resp.Data.GetGroupContentResult.CatalogList {
-			f := model.Object{
-				ID:       catalog.CatalogID,
-				Name:     catalog.CatalogName,
-				Size:     0,
-				IsFolder: true,
-				Modified: getTime(catalog.UpdateTime),
-				Ctime:    getTime(catalog.CreateTime),
-				Path:     catalog.Path, // 文件夹的真实Path， root:/开头
-			}
-			files = append(files, &f)
-		}
-		for _, content := range resp.Data.GetGroupContentResult.ContentList {
-			f := model.ObjThumb{
-				Object: model.Object{
-					ID:       content.ContentID,
-					Name:     content.ContentName,
-					Size:     content.ContentSize,
-					Modified: getTime(content.UpdateTime),
-					Ctime:    getTime(content.CreateTime),
-					Path:     path, // 文件所在目录的Path
-				},
-				Thumbnail: model.Thumbnail{Thumbnail: content.ThumbnailURL},
-				//Thumbnail: content.BigthumbnailURL,
-			}
-			files = append(files, &f)
-		}
-		if (pageNum + 99) > resp.Data.GetGroupContentResult.NodeCount {
-			break
-		}
-		pageNum = pageNum + 100
-	}
-	return files, nil
-}
-
 func (d *Yun139) getLink(contentId string) (string, error) {
 	data := base.Json{
 		"appName":   "",
 		"contentID": contentId,
 		"commonAccountInfo": base.Json{
-			"account":     d.getAccount(),
+			"account":     d.Account,
 			"accountType": 1,
 		},
 	}
@@ -356,199 +242,9 @@ func (d *Yun139) getLink(contentId string) (string, error) {
 	}
 	return jsoniter.Get(res, "data", "downloadURL").ToString(), nil
 }
-func (d *Yun139) familyGetLink(contentId string, path string) (string, error) {
-	data := d.newJson(base.Json{
-		"contentID": contentId,
-		"path":      path,
-	})
-	res, err := d.post("/orchestration/familyCloud-rebuild/content/v1.0/getFileDownLoadURL",
-		data, nil)
-	if err != nil {
-		return "", err
-	}
-	return jsoniter.Get(res, "data", "downloadURL").ToString(), nil
-}
-
-func (d *Yun139) groupGetLink(contentId string, path string) (string, error) {
-	data := d.newJson(base.Json{
-		"contentID": contentId,
-		"groupID":   d.CloudID,
-		"path":      path,
-	})
-	res, err := d.post("/orchestration/group-rebuild/groupManage/v1.0/getGroupFileDownLoadURL",
-		data, nil)
-	if err != nil {
-		return "", err
-	}
-	return jsoniter.Get(res, "data", "downloadURL").ToString(), nil
-}
 
 func unicode(str string) string {
 	textQuoted := strconv.QuoteToASCII(str)
 	textUnquoted := textQuoted[1 : len(textQuoted)-1]
 	return textUnquoted
 }
-
-func (d *Yun139) personalRequest(pathname string, method string, callback base.ReqCallback, resp interface{}) ([]byte, error) {
-	url := "https://personal-kd-njs.yun.139.com" + pathname
-	req := base.RestyClient.R()
-	randStr := random.String(16)
-	ts := time.Now().Format("2006-01-02 15:04:05")
-	if callback != nil {
-		callback(req)
-	}
-	body, err := utils.Json.Marshal(req.Body)
-	if err != nil {
-		return nil, err
-	}
-	sign := calSign(string(body), ts, randStr)
-	svcType := "1"
-	if d.isFamily() {
-		svcType = "2"
-	}
-	req.SetHeaders(map[string]string{
-		"Accept":               "application/json, text/plain, */*",
-		"Authorization":        "Basic " + d.getAuthorization(),
-		"Caller":               "web",
-		"Cms-Device":           "default",
-		"Mcloud-Channel":       "1000101",
-		"Mcloud-Client":        "10701",
-		"Mcloud-Route":         "001",
-		"Mcloud-Sign":          fmt.Sprintf("%s,%s,%s", ts, randStr, sign),
-		"Mcloud-Version":       "7.14.0",
-		"Origin":               "https://yun.139.com",
-		"Referer":              "https://yun.139.com/w/",
-		"x-DeviceInfo":         "||9|7.14.0|chrome|120.0.0.0|||windows 10||zh-CN|||",
-		"x-huawei-channelSrc":  "10000034",
-		"x-inner-ntwk":         "2",
-		"x-m4c-caller":         "PC",
-		"x-m4c-src":            "10002",
-		"x-SvcType":            svcType,
-		"X-Yun-Api-Version":    "v1",
-		"X-Yun-App-Channel":    "10000034",
-		"X-Yun-Channel-Source": "10000034",
-		"X-Yun-Client-Info":    "||9|7.14.0|chrome|120.0.0.0|||windows 10||zh-CN|||dW5kZWZpbmVk||",
-		"X-Yun-Module-Type":    "100",
-		"X-Yun-Svc-Type":       "1",
-	})
-
-	var e BaseResp
-	req.SetResult(&e)
-	res, err := req.Execute(method, url)
-	if err != nil {
-		return nil, err
-	}
-	log.Debugln(res.String())
-	if !e.Success {
-		return nil, errors.New(e.Message)
-	}
-	if resp != nil {
-		err = utils.Json.Unmarshal(res.Body(), resp)
-		if err != nil {
-			return nil, err
-		}
-	}
-	return res.Body(), nil
-}
-func (d *Yun139) personalPost(pathname string, data interface{}, resp interface{}) ([]byte, error) {
-	return d.personalRequest(pathname, http.MethodPost, func(req *resty.Request) {
-		req.SetBody(data)
-	}, resp)
-}
-
-func getPersonalTime(t string) time.Time {
-	stamp, err := time.ParseInLocation("2006-01-02T15:04:05.999-07:00", t, utils.CNLoc)
-	if err != nil {
-		panic(err)
-	}
-	return stamp
-}
-
-func (d *Yun139) personalGetFiles(fileId string) ([]model.Obj, error) {
-	files := make([]model.Obj, 0)
-	nextPageCursor := ""
-	for {
-		data := base.Json{
-			"imageThumbnailStyleList": []string{"Small", "Large"},
-			"orderBy":                 "updated_at",
-			"orderDirection":          "DESC",
-			"pageInfo": base.Json{
-				"pageCursor": nextPageCursor,
-				"pageSize":   100,
-			},
-			"parentFileId": fileId,
-		}
-		var resp PersonalListResp
-		_, err := d.personalPost("/hcy/file/list", data, &resp)
-		if err != nil {
-			return nil, err
-		}
-		nextPageCursor = resp.Data.NextPageCursor
-		for _, item := range resp.Data.Items {
-			var isFolder = (item.Type == "folder")
-			var f model.Obj
-			if isFolder {
-				f = &model.Object{
-					ID:       item.FileId,
-					Name:     item.Name,
-					Size:     0,
-					Modified: getPersonalTime(item.UpdatedAt),
-					Ctime:    getPersonalTime(item.CreatedAt),
-					IsFolder: isFolder,
-				}
-			} else {
-				var Thumbnails = item.Thumbnails
-				var ThumbnailUrl string
-				if len(Thumbnails) > 0 {
-					ThumbnailUrl = Thumbnails[len(Thumbnails)-1].Url
-				}
-				f = &model.ObjThumb{
-					Object: model.Object{
-						ID:       item.FileId,
-						Name:     item.Name,
-						Size:     item.Size,
-						Modified: getPersonalTime(item.UpdatedAt),
-						Ctime:    getPersonalTime(item.CreatedAt),
-						IsFolder: isFolder,
-					},
-					Thumbnail: model.Thumbnail{Thumbnail: ThumbnailUrl},
-				}
-			}
-			files = append(files, f)
-		}
-		if len(nextPageCursor) == 0 {
-			break
-		}
-	}
-	return files, nil
-}
-
-func (d *Yun139) personalGetLink(fileId string) (string, error) {
-	data := base.Json{
-		"fileId": fileId,
-	}
-	res, err := d.personalPost("/hcy/file/getDownloadUrl",
-		data, nil)
-	if err != nil {
-		return "", err
-	}
-	var cdnUrl = jsoniter.Get(res, "data", "cdnUrl").ToString()
-	if cdnUrl != "" {
-		return cdnUrl, nil
-	} else {
-		return jsoniter.Get(res, "data", "url").ToString(), nil
-	}
-}
-
-func (d *Yun139) getAuthorization() string {
-	if d.ref != nil {
-		return d.ref.getAuthorization()
-	}
-	return d.Authorization
-}
-func (d *Yun139) getAccount() string {
-	if d.ref != nil {
-		return d.ref.getAccount()
-	}
-	return d.Account
-}

drivers/189/util.go

@@ -365,7 +365,7 @@ func (d *Cloud189) newUpload(ctx context.Context, dstDir model.Obj, file model.F
 		log.Debugf("uploadData: %+v", uploadData)
 		requestURL := uploadData.RequestURL
 		uploadHeaders := strings.Split(decodeURIComponent(uploadData.RequestHeader), "&")
-		req, err := http.NewRequest(http.MethodPut, requestURL, driver.NewLimitedUploadStream(ctx, bytes.NewReader(byteData)))
+		req, err := http.NewRequest(http.MethodPut, requestURL, bytes.NewReader(byteData))
 		if err != nil {
 			return err
 		}
@@ -375,17 +375,17 @@ func (d *Cloud189) newUpload(ctx context.Context, dstDir model.Obj, file model.F
 			req.Header.Set(v[0:i], v[i+1:])
 		}
 		r, err := base.HttpClient.Do(req)
+		log.Debugf("%+v %+v", r, r.Request.Header)
+		r.Body.Close()
 		if err != nil {
 			return err
 		}
-		log.Debugf("%+v %+v", r, r.Request.Header)
+		up(int(i * 100 / count))
-		_ = r.Body.Close()
-		up(float64(i) * 100 / float64(count))
 	}
 	fileMd5 := hex.EncodeToString(md5Sum.Sum(nil))
 	sliceMd5 := fileMd5
 	if file.GetSize() > DEFAULT {
-		sliceMd5 = utils.GetMD5EncodeStr(strings.Join(md5s, "\n"))
+		sliceMd5 = utils.GetMD5Encode(strings.Join(md5s, "\n"))
 	}
 	res, err = d.uploadRequest("/person/commitMultiUploadFile", map[string]string{
 		"uploadFileId": uploadFileId,

drivers/189pc/driver.go

@@ -2,19 +2,14 @@ package _189pc
 
 import (
 	"context"
-	"fmt"
 	"net/http"
-	"strconv"
 	"strings"
-	"time"
 
 	"github.com/alist-org/alist/v3/drivers/base"
 	"github.com/alist-org/alist/v3/internal/driver"
-	"github.com/alist-org/alist/v3/internal/errs"
 	"github.com/alist-org/alist/v3/internal/model"
 	"github.com/alist-org/alist/v3/pkg/utils"
 	"github.com/go-resty/resty/v2"
-	"github.com/google/uuid"
 )
 
 type Cloud189PC struct {
@@ -27,21 +22,10 @@ type Cloud189PC struct {
 
 	loginParam *LoginParam
 	tokenInfo  *AppSessionResp
-
-	uploadThread int
-
-	familyTransferFolder    *Cloud189Folder
-	cleanFamilyTransferFile func()
-
-	storageConfig driver.Config
-	ref           *Cloud189PC
 }
 
 func (y *Cloud189PC) Config() driver.Config {
-	if y.storageConfig.Name == "" {
+	return config
-		y.storageConfig = config
-	}
-	return y.storageConfig
 }
 
 func (y *Cloud189PC) GetAddition() driver.Additional {
@@ -49,90 +33,47 @@ func (y *Cloud189PC) GetAddition() driver.Additional {
 }
 
 func (y *Cloud189PC) Init(ctx context.Context) (err error) {
-	y.storageConfig = config
-	if y.isFamily() {
-		// 兼容旧上传接口
-		if y.Addition.RapidUpload || y.Addition.UploadMethod == "old" {
-			y.storageConfig.NoOverwriteUpload = true
-		}
-	} else {
-		// 家庭云转存，不支持覆盖上传
-		if y.Addition.FamilyTransfer {
-			y.storageConfig.NoOverwriteUpload = true
-		}
-	}
 	// 处理个人云和家庭云参数
 	if y.isFamily() && y.RootFolderID == "-11" {
 		y.RootFolderID = ""
 	}
 	if !y.isFamily() && y.RootFolderID == "" {
 		y.RootFolderID = "-11"
+		y.FamilyID = ""
 	}
 
-	// 限制上传线程数
+	// 初始化请求客户端
-	y.uploadThread, _ = strconv.Atoi(y.UploadThread)
+	if y.client == nil {
-	if y.uploadThread < 1 || y.uploadThread > 32 {
+		y.client = base.NewRestyClient().SetHeaders(map[string]string{
-		y.uploadThread, y.UploadThread = 3, "3"
+			"Accept":  "application/json;charset=UTF-8",
+			"Referer": WEB_URL,
+		})
 	}
 
-	if y.ref == nil {
+	// 避免重复登陆
-		// 初始化请求客户端
+	identity := utils.GetMD5Encode(y.Username + y.Password)
-		if y.client == nil {
+	if !y.isLogin() || y.identity != identity {
-			y.client = base.NewRestyClient().SetHeaders(map[string]string{
+		y.identity = identity
-				"Accept":  "application/json;charset=UTF-8",
+		if err = y.login(); err != nil {
-				"Referer": WEB_URL,
+			return
-			})
-		}
-
-		// 避免重复登陆
-		identity := utils.GetMD5EncodeStr(y.Username + y.Password)
-		if !y.isLogin() || y.identity != identity {
-			y.identity = identity
-			if err = y.login(); err != nil {
-				return
-			}
 		}
 	}
 
 	// 处理家庭云ID
-	if y.FamilyID == "" {
+	if y.isFamily() && y.FamilyID == "" {
 		if y.FamilyID, err = y.getFamilyID(); err != nil {
 			return err
 		}
 	}
-
-	// 创建中转文件夹
-	if y.FamilyTransfer {
-		if err := y.createFamilyTransferFolder(); err != nil {
-			return err
-		}
-	}
-
-	// 清理转存文件节流
-	y.cleanFamilyTransferFile = utils.NewThrottle2(time.Minute, func() {
-		if err := y.cleanFamilyTransfer(context.TODO()); err != nil {
-			utils.Log.Errorf("cleanFamilyTransferFolderError:%s", err)
-		}
-	})
 	return
 }
 
-func (d *Cloud189PC) InitReference(storage driver.Driver) error {
-	refStorage, ok := storage.(*Cloud189PC)
-	if ok {
-		d.ref = refStorage
-		return nil
-	}
-	return errs.NotSupport
-}
-
 func (y *Cloud189PC) Drop(ctx context.Context) error {
-	y.ref = nil
 	return nil
 }
 
 func (y *Cloud189PC) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([]model.Obj, error) {
-	return y.getFiles(ctx, dir.GetID(), y.isFamily())
+	return y.getFiles(ctx, dir.GetID())
 }
 
 func (y *Cloud189PC) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
@@ -140,9 +81,8 @@ func (y *Cloud189PC) Link(ctx context.Context, file model.Obj, args model.LinkAr
 		URL string `json:"fileDownloadUrl"`
 	}
 
-	isFamily := y.isFamily()
 	fullUrl := API_URL
-	if isFamily {
+	if y.isFamily() {
 		fullUrl += "/family/file"
 	}
 	fullUrl += "/getFileDownloadUrl.action"
@@ -150,7 +90,7 @@ func (y *Cloud189PC) Link(ctx context.Context, file model.Obj, args model.LinkAr
 	_, err := y.get(fullUrl, func(r *resty.Request) {
 		r.SetContext(ctx)
 		r.SetQueryParam("fileId", file.GetID())
-		if isFamily {
+		if y.isFamily() {
 			r.SetQueryParams(map[string]string{
 				"familyId": y.FamilyID,
 			})
@@ -160,18 +100,17 @@ func (y *Cloud189PC) Link(ctx context.Context, file model.Obj, args model.LinkAr
 				"flag": "1",
 			})
 		}
-	}, &downloadUrl, isFamily)
+	}, &downloadUrl)
 	if err != nil {
 		return nil, err
 	}
 
 	// 重定向获取真实链接
 	downloadUrl.URL = strings.Replace(strings.ReplaceAll(downloadUrl.URL, "&amp;", "&"), "http://", "https://", 1)
-	res, err := base.NoRedirectClient.R().SetContext(ctx).SetDoNotParseResponse(true).Get(downloadUrl.URL)
+	res, err := base.NoRedirectClient.R().SetContext(ctx).Get(downloadUrl.URL)
 	if err != nil {
 		return nil, err
 	}
-	defer res.RawBody().Close()
 	if res.StatusCode() == 302 {
 		downloadUrl.URL = res.Header().Get("location")
 	}
@@ -196,22 +135,20 @@ func (y *Cloud189PC) Link(ctx context.Context, file model.Obj, args model.LinkAr
 	return like, nil
 }
 
-func (y *Cloud189PC) MakeDir(ctx context.Context, parentDir model.Obj, dirName string) (model.Obj, error) {
+func (y *Cloud189PC) MakeDir(ctx context.Context, parentDir model.Obj, dirName string) error {
-	isFamily := y.isFamily()
 	fullUrl := API_URL
-	if isFamily {
+	if y.isFamily() {
 		fullUrl += "/family/file"
 	}
 	fullUrl += "/createFolder.action"
 
-	var newFolder Cloud189Folder
 	_, err := y.post(fullUrl, func(req *resty.Request) {
 		req.SetContext(ctx)
 		req.SetQueryParams(map[string]string{
 			"folderName":   dirName,
 			"relativePath": "",
 		})
-		if isFamily {
+		if y.isFamily() {
 			req.SetQueryParams(map[string]string{
 				"familyId": y.FamilyID,
 				"parentId": parentDir.GetID(),
@@ -221,179 +158,117 @@ func (y *Cloud189PC) MakeDir(ctx context.Context, parentDir model.Obj, dirName s
 				"parentFolderId": parentDir.GetID(),
 			})
 		}
-	}, &newFolder, isFamily)
+	}, nil)
-	if err != nil {
+	return err
-		return nil, err
-	}
-	return &newFolder, nil
 }
 
-func (y *Cloud189PC) Move(ctx context.Context, srcObj, dstDir model.Obj) (model.Obj, error) {
+func (y *Cloud189PC) Move(ctx context.Context, srcObj, dstDir model.Obj) error {
-	isFamily := y.isFamily()
+	_, err := y.post(API_URL+"/batch/createBatchTask.action", func(req *resty.Request) {
-	other := map[string]string{"targetFileName": dstDir.GetName()}
+		req.SetContext(ctx)
-
+		req.SetFormData(map[string]string{
-	resp, err := y.CreateBatchTask("MOVE", IF(isFamily, y.FamilyID, ""), dstDir.GetID(), other, BatchTaskInfo{
+			"type": "MOVE",
-		FileId:   srcObj.GetID(),
+			"taskInfos": MustString(utils.Json.MarshalToString(
-		FileName: srcObj.GetName(),
+				[]BatchTaskInfo{
-		IsFolder: BoolToNumber(srcObj.IsDir()),
+					{
-	})
+						FileId:   srcObj.GetID(),
-	if err != nil {
+						FileName: srcObj.GetName(),
-		return nil, err
+						IsFolder: BoolToNumber(srcObj.IsDir()),
-	}
+					},
-	if err = y.WaitBatchTask("MOVE", resp.TaskID, time.Millisecond*400); err != nil {
+				})),
-		return nil, err
+			"targetFolderId": dstDir.GetID(),
-	}
+		})
-	return srcObj, nil
+		if y.isFamily() {
+			req.SetFormData(map[string]string{
+				"familyId": y.FamilyID,
+			})
+		}
+	}, nil)
+	return err
 }
 
-func (y *Cloud189PC) Rename(ctx context.Context, srcObj model.Obj, newName string) (model.Obj, error) {
+func (y *Cloud189PC) Rename(ctx context.Context, srcObj model.Obj, newName string) error {
-	isFamily := y.isFamily()
 	queryParam := make(map[string]string)
 	fullUrl := API_URL
 	method := http.MethodPost
-	if isFamily {
+	if y.isFamily() {
 		fullUrl += "/family/file"
 		method = http.MethodGet
 		queryParam["familyId"] = y.FamilyID
 	}
-
+	if srcObj.IsDir() {
-	var newObj model.Obj
-	switch f := srcObj.(type) {
-	case *Cloud189File:
-		fullUrl += "/renameFile.action"
-		queryParam["fileId"] = srcObj.GetID()
-		queryParam["destFileName"] = newName
-		newObj = &Cloud189File{Icon: f.Icon} // 复用预览
-	case *Cloud189Folder:
 		fullUrl += "/renameFolder.action"
 		queryParam["folderId"] = srcObj.GetID()
 		queryParam["destFolderName"] = newName
-		newObj = &Cloud189Folder{}
+	} else {
-	default:
+		fullUrl += "/renameFile.action"
-		return nil, errs.NotSupport
+		queryParam["fileId"] = srcObj.GetID()
+		queryParam["destFileName"] = newName
 	}
-
 	_, err := y.request(fullUrl, method, func(req *resty.Request) {
-		req.SetContext(ctx).SetQueryParams(queryParam)
+		req.SetContext(ctx)
-	}, nil, newObj, isFamily)
+		req.SetQueryParams(queryParam)
-	if err != nil {
+	}, nil, nil)
-		return nil, err
+	return err
-	}
-	return newObj, nil
 }
 
 func (y *Cloud189PC) Copy(ctx context.Context, srcObj, dstDir model.Obj) error {
-	isFamily := y.isFamily()
+	_, err := y.post(API_URL+"/batch/createBatchTask.action", func(req *resty.Request) {
-	other := map[string]string{"targetFileName": dstDir.GetName()}
+		req.SetContext(ctx)
-
+		req.SetFormData(map[string]string{
-	resp, err := y.CreateBatchTask("COPY", IF(isFamily, y.FamilyID, ""), dstDir.GetID(), other, BatchTaskInfo{
+			"type": "COPY",
-		FileId:   srcObj.GetID(),
+			"taskInfos": MustString(utils.Json.MarshalToString(
-		FileName: srcObj.GetName(),
+				[]BatchTaskInfo{
-		IsFolder: BoolToNumber(srcObj.IsDir()),
+					{
-	})
+						FileId:   srcObj.GetID(),
-
+						FileName: srcObj.GetName(),
-	if err != nil {
+						IsFolder: BoolToNumber(srcObj.IsDir()),
-		return err
+					},
-	}
+				})),
-	return y.WaitBatchTask("COPY", resp.TaskID, time.Second)
+			"targetFolderId": dstDir.GetID(),
+			"targetFileName": dstDir.GetName(),
+		})
+		if y.isFamily() {
+			req.SetFormData(map[string]string{
+				"familyId": y.FamilyID,
+			})
+		}
+	}, nil)
+	return err
 }
 
 func (y *Cloud189PC) Remove(ctx context.Context, obj model.Obj) error {
-	isFamily := y.isFamily()
+	_, err := y.post(API_URL+"/batch/createBatchTask.action", func(req *resty.Request) {
+		req.SetContext(ctx)
+		req.SetFormData(map[string]string{
+			"type": "DELETE",
+			"taskInfos": MustString(utils.Json.MarshalToString(
+				[]*BatchTaskInfo{
+					{
+						FileId:   obj.GetID(),
+						FileName: obj.GetName(),
+						IsFolder: BoolToNumber(obj.IsDir()),
+					},
+				})),
+		})
 
-	resp, err := y.CreateBatchTask("DELETE", IF(isFamily, y.FamilyID, ""), "", nil, BatchTaskInfo{
+		if y.isFamily() {
-		FileId:   obj.GetID(),
+			req.SetFormData(map[string]string{
-		FileName: obj.GetName(),
+				"familyId": y.FamilyID,
-		IsFolder: BoolToNumber(obj.IsDir()),
+			})
-	})
+		}
-	if err != nil {
+	}, nil)
-		return err
+	return err
-	}
-	// 批量任务数量限制，过快会导致无法删除
-	return y.WaitBatchTask("DELETE", resp.TaskID, time.Millisecond*200)
 }
 
-func (y *Cloud189PC) Put(ctx context.Context, dstDir model.Obj, stream model.FileStreamer, up driver.UpdateProgress) (newObj model.Obj, err error) {
+func (y *Cloud189PC) Put(ctx context.Context, dstDir model.Obj, stream model.FileStreamer, up driver.UpdateProgress) error {
-	overwrite := true
+	switch y.UploadMethod {
-	isFamily := y.isFamily()
-
-	// 响应时间长,按需启用
-	if y.Addition.RapidUpload && !stream.IsForceStreamUpload() {
-		if newObj, err := y.RapidUpload(ctx, dstDir, stream, isFamily, overwrite); err == nil {
-			return newObj, nil
-		}
-	}
-
-	uploadMethod := y.UploadMethod
-	if stream.IsForceStreamUpload() {
-		uploadMethod = "stream"
-	}
-
-	// 旧版上传家庭云也有限制
-	if uploadMethod == "old" {
-		return y.OldUpload(ctx, dstDir, stream, up, isFamily, overwrite)
-	}
-
-	// 开启家庭云转存
-	if !isFamily && y.FamilyTransfer {
-		// 修改上传目标为家庭云文件夹
-		transferDstDir := dstDir
-		dstDir = y.familyTransferFolder
-
-		// 使用临时文件名
-		srcName := stream.GetName()
-		stream = &WrapFileStreamer{
-			FileStreamer: stream,
-			Name:         fmt.Sprintf("0%s.transfer", uuid.NewString()),
-		}
-
-		// 使用家庭云上传
-		isFamily = true
-		overwrite = false
-
-		defer func() {
-			if newObj != nil {
-				// 转存家庭云文件到个人云
-				err = y.SaveFamilyFileToPersonCloud(context.TODO(), y.FamilyID, newObj, transferDstDir, true)
-				// 删除家庭云源文件
-				go y.Delete(context.TODO(), y.FamilyID, newObj)
-				// 批量任务有概率删不掉
-				go y.cleanFamilyTransferFile()
-				// 转存失败返回错误
-				if err != nil {
-					return
-				}
-
-				// 查找转存文件
-				var file *Cloud189File
-				file, err = y.findFileByName(context.TODO(), newObj.GetName(), transferDstDir.GetID(), false)
-				if err != nil {
-					if err == errs.ObjectNotFound {
-						err = fmt.Errorf("unknown error: No transfer file obtained %s", newObj.GetName())
-					}
-					return
-				}
-
-				// 重命名转存文件
-				newObj, err = y.Rename(context.TODO(), file, srcName)
-				if err != nil {
-					// 重命名失败删除源文件
-					_ = y.Delete(context.TODO(), "", file)
-				}
-				return
-			}
-		}()
-	}
-
-	switch uploadMethod {
-	case "rapid":
-		return y.FastUpload(ctx, dstDir, stream, up, isFamily, overwrite)
 	case "stream":
-		if stream.GetSize() == 0 {
+		return y.CommonUpload(ctx, dstDir, stream, up)
-			return y.FastUpload(ctx, dstDir, stream, up, isFamily, overwrite)
+	case "old":
-		}
+		return y.OldUpload(ctx, dstDir, stream, up)
-		fallthrough
+	case "rapid":
+		return y.FastUpload(ctx, dstDir, stream, up)
 	default:
-		return y.StreamUpload(ctx, dstDir, stream, up, isFamily, overwrite)
+		return y.CommonUpload(ctx, dstDir, stream, up)
 	}
 }

drivers/189pc/help.go

@@ -10,7 +10,6 @@ import (
 	"crypto/x509"
 	"encoding/hex"
 	"encoding/pem"
-	"encoding/xml"
 	"fmt"
 	"math"
 	"net/http"
@@ -18,7 +17,6 @@ import (
 	"strings"
 	"time"
 
-	"github.com/alist-org/alist/v3/internal/model"
 	"github.com/alist-org/alist/v3/pkg/utils/random"
 )
 
@@ -85,55 +83,6 @@ func MustParseTime(str string) *time.Time {
 	return &lastOpTime
 }
 
-type Time time.Time
-
-func (t *Time) UnmarshalJSON(b []byte) error { return t.Unmarshal(b) }
-func (t *Time) UnmarshalXML(e *xml.Decoder, ee xml.StartElement) error {
-	b, err := e.Token()
-	if err != nil {
-		return err
-	}
-	if b, ok := b.(xml.CharData); ok {
-		if err = t.Unmarshal(b); err != nil {
-			return err
-		}
-	}
-	return e.Skip()
-}
-func (t *Time) Unmarshal(b []byte) error {
-	bs := strings.Trim(string(b), "\"")
-	var v time.Time
-	var err error
-	for _, f := range []string{"2006-01-02 15:04:05 -07", "Jan 2, 2006 15:04:05 PM -07"} {
-		v, err = time.ParseInLocation(f, bs+" +08", time.Local)
-		if err == nil {
-			break
-		}
-	}
-	*t = Time(v)
-	return err
-}
-
-type String string
-
-func (t *String) UnmarshalJSON(b []byte) error { return t.Unmarshal(b) }
-func (t *String) UnmarshalXML(e *xml.Decoder, ee xml.StartElement) error {
-	b, err := e.Token()
-	if err != nil {
-		return err
-	}
-	if b, ok := b.(xml.CharData); ok {
-		if err = t.Unmarshal(b); err != nil {
-			return err
-		}
-	}
-	return e.Skip()
-}
-func (s *String) Unmarshal(b []byte) error {
-	*s = String(bytes.Trim(b, "\""))
-	return nil
-}
-
 func toFamilyOrderBy(o string) string {
 	switch o {
 	case "filename":
@@ -161,8 +110,9 @@ func toDesc(o string) string {
 func ParseHttpHeader(str string) map[string]string {
 	header := make(map[string]string)
 	for _, value := range strings.Split(str, "&") {
-		if k, v, found := strings.Cut(value, "="); found {
+		i := strings.Index(value, "=")
-			header[k] = v
+		if i > 0 {
+			header[strings.TrimSpace(value[0:i])] = strings.TrimSpace(value[i+1:])
 		}
 	}
 	return header
@@ -172,6 +122,10 @@ func MustString(str string, err error) string {
 	return str
 }
 
+func MustToBytes(b []byte, err error) []byte {
+	return b
+}
+
 func BoolToNumber(b bool) int {
 	if b {
 		return 1
@@ -193,28 +147,3 @@ func partSize(size int64) int64 {
 	}
 	return DEFAULT
 }
-
-func isBool(bs ...bool) bool {
-	for _, b := range bs {
-		if b {
-			return true
-		}
-	}
-	return false
-}
-
-func IF[V any](o bool, t V, f V) V {
-	if o {
-		return t
-	}
-	return f
-}
-
-type WrapFileStreamer struct {
-	model.FileStreamer
-	Name string
-}
-
-func (w *WrapFileStreamer) GetName() string {
-	return w.Name
-}

drivers/189pc/meta.go

@@ -15,9 +15,6 @@ type Addition struct {
 	Type           string `json:"type" type:"select" options:"personal,family" default:"personal"`
 	FamilyID       string `json:"family_id"`
 	UploadMethod   string `json:"upload_method" type:"select" options:"stream,rapid,old" default:"stream"`
-	UploadThread   string `json:"upload_thread" default:"3" help:"1<=thread<=32"`
-	FamilyTransfer bool   `json:"family_transfer"`
-	RapidUpload    bool   `json:"rapid_upload"`
 	NoUseOcr       bool   `json:"no_use_ocr"`
 }
 

drivers/189pc/types.go

@@ -6,8 +6,6 @@ import (
 	"sort"
 	"strings"
 	"time"
-
-	"github.com/alist-org/alist/v3/pkg/utils"
 )
 
 // 居然有四种返回方式
@@ -143,7 +141,7 @@ type FamilyInfoListResp struct {
 type FamilyInfoResp struct {
 	Count      int    `json:"count"`
 	CreateTime string `json:"createTime"`
-	FamilyID   int64  `json:"familyId"`
+	FamilyID   int    `json:"familyId"`
 	RemarkName string `json:"remarkName"`
 	Type       int    `json:"type"`
 	UseFlag    int    `json:"useFlag"`
@@ -153,13 +151,8 @@ type FamilyInfoResp struct {
 /*文件部分*/
 // 文件
 type Cloud189File struct {
-	ID   String `json:"id"`
+	CreateDate string `json:"createDate"`
-	Name string `json:"name"`
+	FileCata   int64  `json:"fileCata"`
-	Size int64  `json:"size"`
-	Md5  string `json:"md5"`
-
-	LastOpTime Time `json:"lastOpTime"`
-	CreateDate Time `json:"createDate"`
 	Icon       struct {
 		//iconOption 5
 		SmallUrl string `json:"smallUrl"`
@@ -169,60 +162,62 @@ type Cloud189File struct {
 		Max600    string `json:"max600"`
 		MediumURL string `json:"mediumUrl"`
 	} `json:"icon"`
+	ID          int64  `json:"id"`
+	LastOpTime  string `json:"lastOpTime"`
+	Md5         string `json:"md5"`
+	MediaType   int    `json:"mediaType"`
+	Name        string `json:"name"`
+	Orientation int64  `json:"orientation"`
+	Rev         string `json:"rev"`
+	Size        int64  `json:"size"`
+	StarLabel   int64  `json:"starLabel"`
 
-	// Orientation int64  `json:"orientation"`
+	parseTime *time.Time
-	// FileCata   int64  `json:"fileCata"`
-	// MediaType   int    `json:"mediaType"`
-	// Rev         string `json:"rev"`
-	// StarLabel   int64  `json:"starLabel"`
 }
 
-func (c *Cloud189File) CreateTime() time.Time {
+func (c *Cloud189File) GetSize() int64  { return c.Size }
-	return time.Time(c.CreateDate)
+func (c *Cloud189File) GetName() string { return c.Name }
+func (c *Cloud189File) ModTime() time.Time {
+	if c.parseTime == nil {
+		c.parseTime = MustParseTime(c.LastOpTime)
+	}
+	return *c.parseTime
 }
-
+func (c *Cloud189File) IsDir() bool     { return false }
-func (c *Cloud189File) GetHash() utils.HashInfo {
+func (c *Cloud189File) GetID() string   { return fmt.Sprint(c.ID) }
-	return utils.NewHashInfo(utils.MD5, c.Md5)
+func (c *Cloud189File) GetPath() string { return "" }
-}
+func (c *Cloud189File) Thumb() string   { return c.Icon.SmallUrl }
-
-func (c *Cloud189File) GetSize() int64     { return c.Size }
-func (c *Cloud189File) GetName() string    { return c.Name }
-func (c *Cloud189File) ModTime() time.Time { return time.Time(c.LastOpTime) }
-func (c *Cloud189File) IsDir() bool        { return false }
-func (c *Cloud189File) GetID() string      { return string(c.ID) }
-func (c *Cloud189File) GetPath() string    { return "" }
-func (c *Cloud189File) Thumb() string      { return c.Icon.SmallUrl }
 
 // 文件夹
 type Cloud189Folder struct {
-	ID       String `json:"id"`
+	ID       int64  `json:"id"`
 	ParentID int64  `json:"parentId"`
 	Name     string `json:"name"`
 
-	LastOpTime Time `json:"lastOpTime"`
+	FileCata  int64 `json:"fileCata"`
-	CreateDate Time `json:"createDate"`
+	FileCount int64 `json:"fileCount"`
 
-	// FileListSize int64 `json:"fileListSize"`
+	LastOpTime string `json:"lastOpTime"`
-	// FileCount int64 `json:"fileCount"`
+	CreateDate string `json:"createDate"`
-	// FileCata  int64 `json:"fileCata"`
+
-	// Rev          string `json:"rev"`
+	FileListSize int64  `json:"fileListSize"`
-	// StarLabel    int64  `json:"starLabel"`
+	Rev          string `json:"rev"`
+	StarLabel    int64  `json:"starLabel"`
+
+	parseTime *time.Time
 }
 
-func (c *Cloud189Folder) CreateTime() time.Time {
+func (c *Cloud189Folder) GetSize() int64  { return 0 }
-	return time.Time(c.CreateDate)
+func (c *Cloud189Folder) GetName() string { return c.Name }
+func (c *Cloud189Folder) ModTime() time.Time {
+	if c.parseTime == nil {
+		c.parseTime = MustParseTime(c.LastOpTime)
+	}
+	return *c.parseTime
 }
-
+func (c *Cloud189Folder) IsDir() bool     { return true }
-func (c *Cloud189Folder) GetHash() utils.HashInfo {
+func (c *Cloud189Folder) GetID() string   { return fmt.Sprint(c.ID) }
-	return utils.HashInfo{}
+func (c *Cloud189Folder) GetPath() string { return "" }
-}
-
-func (c *Cloud189Folder) GetSize() int64     { return 0 }
-func (c *Cloud189Folder) GetName() string    { return c.Name }
-func (c *Cloud189Folder) ModTime() time.Time { return time.Time(c.LastOpTime) }
-func (c *Cloud189Folder) IsDir() bool        { return true }
-func (c *Cloud189Folder) GetID() string      { return string(c.ID) }
-func (c *Cloud189Folder) GetPath() string    { return "" }
 
 type Cloud189FilesResp struct {
 	//ResCode    int    `json:"res_code"`
@@ -243,12 +238,7 @@ type BatchTaskInfo struct {
 	// IsFolder 是否是文件夹，0-否，1-是
 	IsFolder int `json:"isFolder"`
 	// SrcParentId 文件所在父目录ID
-	SrcParentId string `json:"srcParentId,omitempty"`
+	//SrcParentId string `json:"srcParentId"`
-
-	/* 冲突管理 */
-	// 1 -> 跳过 2 -> 保留 3 -> 覆盖
-	DealWay    int `json:"dealWay,omitempty"`
-	IsConflict int `json:"isConflict,omitempty"`
 }
 
 /* 上传部分 */
@@ -262,25 +252,14 @@ type InitMultiUploadResp struct {
 	} `json:"data"`
 }
 type UploadUrlsResp struct {
-	Code string                    `json:"code"`
+	Code       string          `json:"code"`
-	Data map[string]UploadUrlsData `json:"uploadUrls"`
+	UploadUrls map[string]Part `json:"uploadUrls"`
 }
-type UploadUrlsData struct {
+type Part struct {
 	RequestURL    string `json:"requestURL"`
 	RequestHeader string `json:"requestHeader"`
 }
 
-type UploadUrlInfo struct {
-	PartNumber int
-	Headers    map[string]string
-	UploadUrlsData
-}
-
-type UploadProgress struct {
-	UploadInfo  InitMultiUploadResp
-	UploadParts []string
-}
-
 /* 第二种上传方式 */
 type CreateUploadFileResp struct {
 	// 上传文件请求ID
@@ -305,68 +284,15 @@ func (r *GetUploadFileStatusResp) GetSize() int64 {
 	return r.DataSize + r.Size
 }
 
-type CommitMultiUploadFileResp struct {
+type CommitUploadFileResp struct {
-	File struct {
-		UserFileID String `json:"userFileId"`
-		FileName   string `json:"fileName"`
-		FileSize   int64  `json:"fileSize"`
-		FileMd5    string `json:"fileMd5"`
-		CreateDate Time   `json:"createDate"`
-	} `json:"file"`
-}
-
-func (f *CommitMultiUploadFileResp) toFile() *Cloud189File {
-	return &Cloud189File{
-		ID:         f.File.UserFileID,
-		Name:       f.File.FileName,
-		Size:       f.File.FileSize,
-		Md5:        f.File.FileMd5,
-		LastOpTime: f.File.CreateDate,
-		CreateDate: f.File.CreateDate,
-	}
-}
-
-type OldCommitUploadFileResp struct {
 	XMLName    xml.Name `xml:"file"`
-	ID         String   `xml:"id"`
+	Id         string   `xml:"id"`
 	Name       string   `xml:"name"`
-	Size       int64    `xml:"size"`
+	Size       string   `xml:"size"`
 	Md5        string   `xml:"md5"`
-	CreateDate Time     `xml:"createDate"`
+	CreateDate string   `xml:"createDate"`
-}
+	Rev        string   `xml:"rev"`
-
+	UserId     string   `xml:"userId"`
-func (f *OldCommitUploadFileResp) toFile() *Cloud189File {
-	return &Cloud189File{
-		ID:         f.ID,
-		Name:       f.Name,
-		Size:       f.Size,
-		Md5:        f.Md5,
-		CreateDate: f.CreateDate,
-		LastOpTime: f.CreateDate,
-	}
-}
-
-type CreateBatchTaskResp struct {
-	TaskID string `json:"taskId"`
-}
-
-type BatchTaskStateResp struct {
-	FailedCount         int     `json:"failedCount"`
-	Process             int     `json:"process"`
-	SkipCount           int     `json:"skipCount"`
-	SubTaskCount        int     `json:"subTaskCount"`
-	SuccessedCount      int     `json:"successedCount"`
-	SuccessedFileIDList []int64 `json:"successedFileIdList"`
-	TaskID              string  `json:"taskId"`
-	TaskStatus          int     `json:"taskStatus"` //1 初始化 2 存在冲突 3 执行中，4 完成
-}
-
-type BatchTaskConflictTaskInfoResp struct {
-	SessionKey     string `json:"sessionKey"`
-	TargetFolderID int    `json:"targetFolderId"`
-	TaskID         string `json:"taskId"`
-	TaskInfos      []BatchTaskInfo
-	TaskType       int `json:"taskType"`
 }
 
 /* query 加密参数*/

drivers/alias/driver.go

@@ -3,12 +3,10 @@ package alias
 import (
 	"context"
 	"errors"
-	stdpath "path"
 	"strings"
 
 	"github.com/alist-org/alist/v3/internal/driver"
 	"github.com/alist-org/alist/v3/internal/errs"
-	"github.com/alist-org/alist/v3/internal/fs"
 	"github.com/alist-org/alist/v3/internal/model"
 	"github.com/alist-org/alist/v3/pkg/utils"
 )
@@ -47,9 +45,6 @@ func (d *Alias) Init(ctx context.Context) error {
 			d.oneKey = k
 		}
 		d.autoFlatten = true
-	} else {
-		d.oneKey = ""
-		d.autoFlatten = false
 	}
 	return nil
 }
@@ -92,9 +87,8 @@ func (d *Alias) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([
 		return nil, errs.ObjectNotFound
 	}
 	var objs []model.Obj
-	fsArgs := &fs.ListArgs{NoLog: true, Refresh: args.Refresh}
 	for _, dst := range dsts {
-		tmp, err := d.list(ctx, dst, sub, fsArgs)
+		tmp, err := d.list(ctx, dst, sub)
 		if err == nil {
 			objs = append(objs, tmp...)
 		}
@@ -111,211 +105,10 @@ func (d *Alias) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (
 	for _, dst := range dsts {
 		link, err := d.link(ctx, dst, sub, args)
 		if err == nil {
-			if !args.Redirect && len(link.URL) > 0 {
-				// 正常情况下 多并发 仅支持返回URL的驱动
-				// alias套娃alias 可以让crypt、mega等驱动(不返回URL的) 支持并发
-				if d.DownloadConcurrency > 0 {
-					link.Concurrency = d.DownloadConcurrency
-				}
-				if d.DownloadPartSize > 0 {
-					link.PartSize = d.DownloadPartSize * utils.KB
-				}
-			}
 			return link, nil
 		}
 	}
 	return nil, errs.ObjectNotFound
 }
 
-func (d *Alias) MakeDir(ctx context.Context, parentDir model.Obj, dirName string) error {
-	if !d.Writable {
-		return errs.PermissionDenied
-	}
-	reqPath, err := d.getReqPath(ctx, parentDir, true)
-	if err == nil {
-		return fs.MakeDir(ctx, stdpath.Join(*reqPath, dirName))
-	}
-	if errs.IsNotImplement(err) {
-		return errors.New("same-name dirs cannot make sub-dir")
-	}
-	return err
-}
-
-func (d *Alias) Move(ctx context.Context, srcObj, dstDir model.Obj) error {
-	if !d.Writable {
-		return errs.PermissionDenied
-	}
-	srcPath, err := d.getReqPath(ctx, srcObj, false)
-	if errs.IsNotImplement(err) {
-		return errors.New("same-name files cannot be moved")
-	}
-	if err != nil {
-		return err
-	}
-	dstPath, err := d.getReqPath(ctx, dstDir, true)
-	if errs.IsNotImplement(err) {
-		return errors.New("same-name dirs cannot be moved to")
-	}
-	if err != nil {
-		return err
-	}
-	return fs.Move(ctx, *srcPath, *dstPath)
-}
-
-func (d *Alias) Rename(ctx context.Context, srcObj model.Obj, newName string) error {
-	if !d.Writable {
-		return errs.PermissionDenied
-	}
-	reqPath, err := d.getReqPath(ctx, srcObj, false)
-	if err == nil {
-		return fs.Rename(ctx, *reqPath, newName)
-	}
-	if errs.IsNotImplement(err) {
-		return errors.New("same-name files cannot be Rename")
-	}
-	return err
-}
-
-func (d *Alias) Copy(ctx context.Context, srcObj, dstDir model.Obj) error {
-	if !d.Writable {
-		return errs.PermissionDenied
-	}
-	srcPath, err := d.getReqPath(ctx, srcObj, false)
-	if errs.IsNotImplement(err) {
-		return errors.New("same-name files cannot be copied")
-	}
-	if err != nil {
-		return err
-	}
-	dstPath, err := d.getReqPath(ctx, dstDir, true)
-	if errs.IsNotImplement(err) {
-		return errors.New("same-name dirs cannot be copied to")
-	}
-	if err != nil {
-		return err
-	}
-	_, err = fs.Copy(ctx, *srcPath, *dstPath)
-	return err
-}
-
-func (d *Alias) Remove(ctx context.Context, obj model.Obj) error {
-	if !d.Writable {
-		return errs.PermissionDenied
-	}
-	reqPath, err := d.getReqPath(ctx, obj, false)
-	if err == nil {
-		return fs.Remove(ctx, *reqPath)
-	}
-	if errs.IsNotImplement(err) {
-		return errors.New("same-name files cannot be Delete")
-	}
-	return err
-}
-
-func (d *Alias) Put(ctx context.Context, dstDir model.Obj, s model.FileStreamer, up driver.UpdateProgress) error {
-	if !d.Writable {
-		return errs.PermissionDenied
-	}
-	reqPath, err := d.getReqPath(ctx, dstDir, true)
-	if err == nil {
-		return fs.PutDirectly(ctx, *reqPath, s)
-	}
-	if errs.IsNotImplement(err) {
-		return errors.New("same-name dirs cannot be Put")
-	}
-	return err
-}
-
-func (d *Alias) PutURL(ctx context.Context, dstDir model.Obj, name, url string) error {
-	if !d.Writable {
-		return errs.PermissionDenied
-	}
-	reqPath, err := d.getReqPath(ctx, dstDir, true)
-	if err == nil {
-		return fs.PutURL(ctx, *reqPath, name, url)
-	}
-	if errs.IsNotImplement(err) {
-		return errors.New("same-name files cannot offline download")
-	}
-	return err
-}
-
-func (d *Alias) GetArchiveMeta(ctx context.Context, obj model.Obj, args model.ArchiveArgs) (model.ArchiveMeta, error) {
-	root, sub := d.getRootAndPath(obj.GetPath())
-	dsts, ok := d.pathMap[root]
-	if !ok {
-		return nil, errs.ObjectNotFound
-	}
-	for _, dst := range dsts {
-		meta, err := d.getArchiveMeta(ctx, dst, sub, args)
-		if err == nil {
-			return meta, nil
-		}
-	}
-	return nil, errs.NotImplement
-}
-
-func (d *Alias) ListArchive(ctx context.Context, obj model.Obj, args model.ArchiveInnerArgs) ([]model.Obj, error) {
-	root, sub := d.getRootAndPath(obj.GetPath())
-	dsts, ok := d.pathMap[root]
-	if !ok {
-		return nil, errs.ObjectNotFound
-	}
-	for _, dst := range dsts {
-		l, err := d.listArchive(ctx, dst, sub, args)
-		if err == nil {
-			return l, nil
-		}
-	}
-	return nil, errs.NotImplement
-}
-
-func (d *Alias) Extract(ctx context.Context, obj model.Obj, args model.ArchiveInnerArgs) (*model.Link, error) {
-	// alias的两个驱动，一个支持驱动提取，一个不支持，如何兼容？
-	// 如果访问的是不支持驱动提取的驱动内的压缩文件，GetArchiveMeta就会返回errs.NotImplement，提取URL前缀就会是/ae，Extract就不会被调用
-	// 如果访问的是支持驱动提取的驱动内的压缩文件，GetArchiveMeta就会返回有效值，提取URL前缀就会是/ad，Extract就会被调用
-	root, sub := d.getRootAndPath(obj.GetPath())
-	dsts, ok := d.pathMap[root]
-	if !ok {
-		return nil, errs.ObjectNotFound
-	}
-	for _, dst := range dsts {
-		link, err := d.extract(ctx, dst, sub, args)
-		if err == nil {
-			if !args.Redirect && len(link.URL) > 0 {
-				if d.DownloadConcurrency > 0 {
-					link.Concurrency = d.DownloadConcurrency
-				}
-				if d.DownloadPartSize > 0 {
-					link.PartSize = d.DownloadPartSize * utils.KB
-				}
-			}
-			return link, nil
-		}
-	}
-	return nil, errs.NotImplement
-}
-
-func (d *Alias) ArchiveDecompress(ctx context.Context, srcObj, dstDir model.Obj, args model.ArchiveDecompressArgs) error {
-	if !d.Writable {
-		return errs.PermissionDenied
-	}
-	srcPath, err := d.getReqPath(ctx, srcObj, false)
-	if errs.IsNotImplement(err) {
-		return errors.New("same-name files cannot be decompressed")
-	}
-	if err != nil {
-		return err
-	}
-	dstPath, err := d.getReqPath(ctx, dstDir, true)
-	if errs.IsNotImplement(err) {
-		return errors.New("same-name dirs cannot be decompressed to")
-	}
-	if err != nil {
-		return err
-	}
-	_, err = fs.ArchiveDecompress(ctx, *srcPath, *dstPath, args)
-	return err
-}
-
 var _ driver.Driver = (*Alias)(nil)

drivers/alias/meta.go

@@ -9,28 +9,19 @@ type Addition struct {
 	// Usually one of two
 	// driver.RootPath
 	// define other
-	Paths               string `json:"paths" required:"true" type:"text"`
+	Paths string `json:"paths" required:"true" type:"text"`
-	ProtectSameName     bool   `json:"protect_same_name" default:"true" required:"false" help:"Protects same-name files from Delete or Rename"`
-	DownloadConcurrency int    `json:"download_concurrency" default:"0" required:"false" type:"number" help:"Need to enable proxy"`
-	DownloadPartSize    int    `json:"download_part_size" default:"0" type:"number" required:"false" help:"Need to enable proxy. Unit: KB"`
-	Writable            bool   `json:"writable" type:"bool" default:"false"`
 }
 
 var config = driver.Config{
-	Name:             "Alias",
+	Name:        "Alias",
-	LocalSort:        true,
+	LocalSort:   true,
-	NoCache:          true,
+	NoCache:     true,
-	NoUpload:         false,
+	NoUpload:    true,
-	DefaultRoot:      "/",
+	DefaultRoot: "/",
-	ProxyRangeOption: true,
 }
 
 func init() {
 	op.RegisterDriver(func() driver.Driver {
-		return &Alias{
+		return &Alias{}
-			Addition: Addition{
-				ProtectSameName: true,
-			},
-		}
 	})
 }

drivers/alias/util.go

@@ -3,15 +3,11 @@ package alias
 import (
 	"context"
 	"fmt"
-	"net/url"
 	stdpath "path"
 	"strings"
 
-	"github.com/alist-org/alist/v3/internal/driver"
-	"github.com/alist-org/alist/v3/internal/errs"
 	"github.com/alist-org/alist/v3/internal/fs"
 	"github.com/alist-org/alist/v3/internal/model"
-	"github.com/alist-org/alist/v3/internal/op"
 	"github.com/alist-org/alist/v3/internal/sign"
 	"github.com/alist-org/alist/v3/pkg/utils"
 	"github.com/alist-org/alist/v3/server/common"
@@ -19,7 +15,7 @@ import (
 
 func (d *Alias) listRoot() []model.Obj {
 	var objs []model.Obj
-	for k := range d.pathMap {
+	for k, _ := range d.pathMap {
 		obj := model.Object{
 			Name:     k,
 			IsFolder: true,
@@ -65,12 +61,11 @@ func (d *Alias) get(ctx context.Context, path string, dst, sub string) (model.Ob
 		Size:     obj.GetSize(),
 		Modified: obj.ModTime(),
 		IsFolder: obj.IsDir(),
-		HashInfo: obj.GetHash(),
 	}, nil
 }
 
-func (d *Alias) list(ctx context.Context, dst, sub string, args *fs.ListArgs) ([]model.Obj, error) {
+func (d *Alias) list(ctx context.Context, dst, sub string) ([]model.Obj, error) {
-	objs, err := fs.List(ctx, stdpath.Join(dst, sub), args)
+	objs, err := fs.List(ctx, stdpath.Join(dst, sub), &fs.ListArgs{NoLog: true})
 	// the obj must implement the model.SetPath interface
 	// return objs, err
 	if err != nil {
@@ -98,128 +93,22 @@ func (d *Alias) list(ctx context.Context, dst, sub string, args *fs.ListArgs) ([
 
 func (d *Alias) link(ctx context.Context, dst, sub string, args model.LinkArgs) (*model.Link, error) {
 	reqPath := stdpath.Join(dst, sub)
-	// 参考 crypt 驱动
+	storage, err := fs.GetStorage(reqPath, &fs.GetStoragesArgs{})
-	storage, reqActualPath, err := op.GetStorageAndActualPath(reqPath)
 	if err != nil {
 		return nil, err
 	}
-	if _, ok := storage.(*Alias); !ok && !args.Redirect {
-		link, _, err := op.Link(ctx, storage, reqActualPath, args)
-		return link, err
-	}
 	_, err = fs.Get(ctx, reqPath, &fs.GetArgs{NoLog: true})
 	if err != nil {
 		return nil, err
 	}
 	if common.ShouldProxy(storage, stdpath.Base(sub)) {
-		link := &model.Link{
+		return &model.Link{
 			URL: fmt.Sprintf("%s/p%s?sign=%s",
 				common.GetApiUrl(args.HttpReq),
 				utils.EncodePath(reqPath, true),
 				sign.Sign(reqPath)),
-		}
+		}, nil
-		if args.HttpReq != nil && d.ProxyRange {
-			link.RangeReadCloser = common.NoProxyRange
-		}
-		return link, nil
 	}
-	link, _, err := op.Link(ctx, storage, reqActualPath, args)
+	link, _, err := fs.Link(ctx, reqPath, args)
 	return link, err
 }
-
-func (d *Alias) getReqPath(ctx context.Context, obj model.Obj, isParent bool) (*string, error) {
-	root, sub := d.getRootAndPath(obj.GetPath())
-	if sub == "" && !isParent {
-		return nil, errs.NotSupport
-	}
-	dsts, ok := d.pathMap[root]
-	if !ok {
-		return nil, errs.ObjectNotFound
-	}
-	var reqPath *string
-	for _, dst := range dsts {
-		path := stdpath.Join(dst, sub)
-		_, err := fs.Get(ctx, path, &fs.GetArgs{NoLog: true})
-		if err != nil {
-			continue
-		}
-		if !d.ProtectSameName {
-			return &path, nil
-		}
-		if ok {
-			ok = false
-		} else {
-			return nil, errs.NotImplement
-		}
-		reqPath = &path
-	}
-	if reqPath == nil {
-		return nil, errs.ObjectNotFound
-	}
-	return reqPath, nil
-}
-
-func (d *Alias) getArchiveMeta(ctx context.Context, dst, sub string, args model.ArchiveArgs) (model.ArchiveMeta, error) {
-	reqPath := stdpath.Join(dst, sub)
-	storage, reqActualPath, err := op.GetStorageAndActualPath(reqPath)
-	if err != nil {
-		return nil, err
-	}
-	if _, ok := storage.(driver.ArchiveReader); ok {
-		return op.GetArchiveMeta(ctx, storage, reqActualPath, model.ArchiveMetaArgs{
-			ArchiveArgs: args,
-			Refresh:     true,
-		})
-	}
-	return nil, errs.NotImplement
-}
-
-func (d *Alias) listArchive(ctx context.Context, dst, sub string, args model.ArchiveInnerArgs) ([]model.Obj, error) {
-	reqPath := stdpath.Join(dst, sub)
-	storage, reqActualPath, err := op.GetStorageAndActualPath(reqPath)
-	if err != nil {
-		return nil, err
-	}
-	if _, ok := storage.(driver.ArchiveReader); ok {
-		return op.ListArchive(ctx, storage, reqActualPath, model.ArchiveListArgs{
-			ArchiveInnerArgs: args,
-			Refresh:          true,
-		})
-	}
-	return nil, errs.NotImplement
-}
-
-func (d *Alias) extract(ctx context.Context, dst, sub string, args model.ArchiveInnerArgs) (*model.Link, error) {
-	reqPath := stdpath.Join(dst, sub)
-	storage, reqActualPath, err := op.GetStorageAndActualPath(reqPath)
-	if err != nil {
-		return nil, err
-	}
-	if _, ok := storage.(driver.ArchiveReader); ok {
-		if _, ok := storage.(*Alias); !ok && !args.Redirect {
-			link, _, err := op.DriverExtract(ctx, storage, reqActualPath, args)
-			return link, err
-		}
-		_, err = fs.Get(ctx, reqPath, &fs.GetArgs{NoLog: true})
-		if err != nil {
-			return nil, err
-		}
-		if common.ShouldProxy(storage, stdpath.Base(sub)) {
-			link := &model.Link{
-				URL: fmt.Sprintf("%s/ap%s?inner=%s&pass=%s&sign=%s",
-					common.GetApiUrl(args.HttpReq),
-					utils.EncodePath(reqPath, true),
-					utils.EncodePath(args.InnerPath, true),
-					url.QueryEscape(args.Password),
-					sign.SignArchive(reqPath)),
-			}
-			if args.HttpReq != nil && d.ProxyRange {
-				link.RangeReadCloser = common.NoProxyRange
-			}
-			return link, nil
-		}
-		link, _, err := op.DriverExtract(ctx, storage, reqActualPath, args)
-		return link, err
-	}
-	return nil, errs.NotImplement
-}

drivers/alist_v3/driver.go

@@ -3,21 +3,18 @@ package alist_v3
 import (
 	"context"
 	"fmt"
-	"io"
 	"net/http"
-	"net/url"
 	"path"
+	"strconv"
 	"strings"
 
 	"github.com/alist-org/alist/v3/drivers/base"
 	"github.com/alist-org/alist/v3/internal/conf"
 	"github.com/alist-org/alist/v3/internal/driver"
-	"github.com/alist-org/alist/v3/internal/errs"
 	"github.com/alist-org/alist/v3/internal/model"
 	"github.com/alist-org/alist/v3/pkg/utils"
 	"github.com/alist-org/alist/v3/server/common"
 	"github.com/go-resty/resty/v2"
-	log "github.com/sirupsen/logrus"
 )
 
 type AListV3 struct {
@@ -36,29 +33,29 @@ func (d *AListV3) GetAddition() driver.Additional {
 func (d *AListV3) Init(ctx context.Context) error {
 	d.Addition.Address = strings.TrimSuffix(d.Addition.Address, "/")
 	var resp common.Resp[MeResp]
-	_, _, err := d.request("/me", http.MethodGet, func(req *resty.Request) {
+	_, err := d.request("/me", http.MethodGet, func(req *resty.Request) {
 		req.SetResult(&resp)
 	})
 	if err != nil {
 		return err
 	}
 	// if the username is not empty and the username is not the same as the current username, then login again
-	if d.Username != resp.Data.Username {
+	if d.Username != "" && d.Username != resp.Data.Username {
 		err = d.login()
 		if err != nil {
 			return err
 		}
 	}
 	// re-get the user info
-	_, _, err = d.request("/me", http.MethodGet, func(req *resty.Request) {
+	_, err = d.request("/me", http.MethodGet, func(req *resty.Request) {
 		req.SetResult(&resp)
 	})
 	if err != nil {
 		return err
 	}
 	if resp.Data.Role == model.GUEST {
-		u := d.Address + "/api/public/settings"
+		url := d.Address + "/api/public/settings"
-		res, err := base.RestyClient.R().Get(u)
+		res, err := base.RestyClient.R().Get(url)
 		if err != nil {
 			return err
 		}
@@ -76,7 +73,7 @@ func (d *AListV3) Drop(ctx context.Context) error {
 
 func (d *AListV3) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([]model.Obj, error) {
 	var resp common.Resp[FsListResp]
-	_, _, err := d.request("/fs/list", http.MethodPost, func(req *resty.Request) {
+	_, err := d.request("/fs/list", http.MethodPost, func(req *resty.Request) {
 		req.SetResult(&resp).SetBody(ListReq{
 			PageReq: model.PageReq{
 				Page:    1,
@@ -96,10 +93,8 @@ func (d *AListV3) List(ctx context.Context, dir model.Obj, args model.ListArgs)
 			Object: model.Object{
 				Name:     f.Name,
 				Modified: f.Modified,
-				Ctime:    f.Created,
 				Size:     f.Size,
 				IsFolder: f.IsDir,
-				HashInfo: utils.FromString(f.HashInfo),
 			},
 			Thumbnail: model.Thumbnail{Thumbnail: f.Thumb},
 		}
@@ -110,19 +105,11 @@ func (d *AListV3) List(ctx context.Context, dir model.Obj, args model.ListArgs)
 
 func (d *AListV3) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
 	var resp common.Resp[FsGetResp]
-	// if PassUAToUpsteam is true, then pass the user-agent to the upstream
+	_, err := d.request("/fs/get", http.MethodPost, func(req *resty.Request) {
-	userAgent := base.UserAgent
-	if d.PassUAToUpsteam {
-		userAgent = args.Header.Get("user-agent")
-		if userAgent == "" {
-			userAgent = base.UserAgent
-		}
-	}
-	_, _, err := d.request("/fs/get", http.MethodPost, func(req *resty.Request) {
 		req.SetResult(&resp).SetBody(FsGetReq{
 			Path:     file.GetPath(),
 			Password: d.MetaPassword,
-		}).SetHeader("user-agent", userAgent)
+		})
 	})
 	if err != nil {
 		return nil, err
@@ -133,7 +120,7 @@ func (d *AListV3) Link(ctx context.Context, file model.Obj, args model.LinkArgs)
 }
 
 func (d *AListV3) MakeDir(ctx context.Context, parentDir model.Obj, dirName string) error {
-	_, _, err := d.request("/fs/mkdir", http.MethodPost, func(req *resty.Request) {
+	_, err := d.request("/fs/mkdir", http.MethodPost, func(req *resty.Request) {
 		req.SetBody(MkdirOrLinkReq{
 			Path: path.Join(parentDir.GetPath(), dirName),
 		})
@@ -142,7 +129,7 @@ func (d *AListV3) MakeDir(ctx context.Context, parentDir model.Obj, dirName stri
 }
 
 func (d *AListV3) Move(ctx context.Context, srcObj, dstDir model.Obj) error {
-	_, _, err := d.request("/fs/move", http.MethodPost, func(req *resty.Request) {
+	_, err := d.request("/fs/move", http.MethodPost, func(req *resty.Request) {
 		req.SetBody(MoveCopyReq{
 			SrcDir: path.Dir(srcObj.GetPath()),
 			DstDir: dstDir.GetPath(),
@@ -153,7 +140,7 @@ func (d *AListV3) Move(ctx context.Context, srcObj, dstDir model.Obj) error {
 }
 
 func (d *AListV3) Rename(ctx context.Context, srcObj model.Obj, newName string) error {
-	_, _, err := d.request("/fs/rename", http.MethodPost, func(req *resty.Request) {
+	_, err := d.request("/fs/rename", http.MethodPost, func(req *resty.Request) {
 		req.SetBody(RenameReq{
 			Path: srcObj.GetPath(),
 			Name: newName,
@@ -163,7 +150,7 @@ func (d *AListV3) Rename(ctx context.Context, srcObj model.Obj, newName string)
 }
 
 func (d *AListV3) Copy(ctx context.Context, srcObj, dstDir model.Obj) error {
-	_, _, err := d.request("/fs/copy", http.MethodPost, func(req *resty.Request) {
+	_, err := d.request("/fs/copy", http.MethodPost, func(req *resty.Request) {
 		req.SetBody(MoveCopyReq{
 			SrcDir: path.Dir(srcObj.GetPath()),
 			DstDir: dstDir.GetPath(),
@@ -174,7 +161,7 @@ func (d *AListV3) Copy(ctx context.Context, srcObj, dstDir model.Obj) error {
 }
 
 func (d *AListV3) Remove(ctx context.Context, obj model.Obj) error {
-	_, _, err := d.request("/fs/remove", http.MethodPost, func(req *resty.Request) {
+	_, err := d.request("/fs/remove", http.MethodPost, func(req *resty.Request) {
 		req.SetBody(RemoveReq{
 			Dir:   path.Dir(obj.GetPath()),
 			Names: []string{obj.GetName()},
@@ -183,174 +170,13 @@ func (d *AListV3) Remove(ctx context.Context, obj model.Obj) error {
 	return err
 }
 
-func (d *AListV3) Put(ctx context.Context, dstDir model.Obj, s model.FileStreamer, up driver.UpdateProgress) error {
+func (d *AListV3) Put(ctx context.Context, dstDir model.Obj, stream model.FileStreamer, up driver.UpdateProgress) error {
-	reader := driver.NewLimitedUploadStream(ctx, &driver.ReaderUpdatingProgress{
+	_, err := d.request("/fs/put", http.MethodPut, func(req *resty.Request) {
-		Reader:         s,
+		req.SetHeader("File-Path", path.Join(dstDir.GetPath(), stream.GetName())).
-		UpdateProgress: up,
+			SetHeader("Password", d.MetaPassword).
-	})
+			SetHeader("Content-Length", strconv.FormatInt(stream.GetSize(), 10)).
-	req, err := http.NewRequestWithContext(ctx, http.MethodPut, d.Address+"/api/fs/put", reader)
+			SetContentLength(true).
-	if err != nil {
+			SetBody(stream.GetReadCloser())
-		return err
-	}
-	req.Header.Set("Authorization", d.Token)
-	req.Header.Set("File-Path", path.Join(dstDir.GetPath(), s.GetName()))
-	req.Header.Set("Password", d.MetaPassword)
-	if md5 := s.GetHash().GetHash(utils.MD5); len(md5) > 0 {
-		req.Header.Set("X-File-Md5", md5)
-	}
-	if sha1 := s.GetHash().GetHash(utils.SHA1); len(sha1) > 0 {
-		req.Header.Set("X-File-Sha1", sha1)
-	}
-	if sha256 := s.GetHash().GetHash(utils.SHA256); len(sha256) > 0 {
-		req.Header.Set("X-File-Sha256", sha256)
-	}
-
-	req.ContentLength = s.GetSize()
-	// client := base.NewHttpClient()
-	// client.Timeout = time.Hour * 6
-	res, err := base.HttpClient.Do(req)
-	if err != nil {
-		return err
-	}
-
-	bytes, err := io.ReadAll(res.Body)
-	if err != nil {
-		return err
-	}
-	log.Debugf("[alist_v3] response body: %s", string(bytes))
-	if res.StatusCode >= 400 {
-		return fmt.Errorf("request failed, status: %s", res.Status)
-	}
-	code := utils.Json.Get(bytes, "code").ToInt()
-	if code != 200 {
-		if code == 401 || code == 403 {
-			err = d.login()
-			if err != nil {
-				return err
-			}
-		}
-		return fmt.Errorf("request failed,code: %d, message: %s", code, utils.Json.Get(bytes, "message").ToString())
-	}
-	return nil
-}
-
-func (d *AListV3) GetArchiveMeta(ctx context.Context, obj model.Obj, args model.ArchiveArgs) (model.ArchiveMeta, error) {
-	if !d.ForwardArchiveReq {
-		return nil, errs.NotImplement
-	}
-	var resp common.Resp[ArchiveMetaResp]
-	_, code, err := d.request("/fs/archive/meta", http.MethodPost, func(req *resty.Request) {
-		req.SetResult(&resp).SetBody(ArchiveMetaReq{
-			ArchivePass: args.Password,
-			Password:    d.MetaPassword,
-			Path:        obj.GetPath(),
-			Refresh:     false,
-		})
-	})
-	if code == 202 {
-		return nil, errs.WrongArchivePassword
-	}
-	if err != nil {
-		return nil, err
-	}
-	var tree []model.ObjTree
-	if resp.Data.Content != nil {
-		tree = make([]model.ObjTree, 0, len(resp.Data.Content))
-		for _, content := range resp.Data.Content {
-			tree = append(tree, &content)
-		}
-	}
-	return &model.ArchiveMetaInfo{
-		Comment:   resp.Data.Comment,
-		Encrypted: resp.Data.Encrypted,
-		Tree:      tree,
-	}, nil
-}
-
-func (d *AListV3) ListArchive(ctx context.Context, obj model.Obj, args model.ArchiveInnerArgs) ([]model.Obj, error) {
-	if !d.ForwardArchiveReq {
-		return nil, errs.NotImplement
-	}
-	var resp common.Resp[ArchiveListResp]
-	_, code, err := d.request("/fs/archive/list", http.MethodPost, func(req *resty.Request) {
-		req.SetResult(&resp).SetBody(ArchiveListReq{
-			ArchiveMetaReq: ArchiveMetaReq{
-				ArchivePass: args.Password,
-				Password:    d.MetaPassword,
-				Path:        obj.GetPath(),
-				Refresh:     false,
-			},
-			PageReq: model.PageReq{
-				Page:    1,
-				PerPage: 0,
-			},
-			InnerPath: args.InnerPath,
-		})
-	})
-	if code == 202 {
-		return nil, errs.WrongArchivePassword
-	}
-	if err != nil {
-		return nil, err
-	}
-	var files []model.Obj
-	for _, f := range resp.Data.Content {
-		file := model.ObjThumb{
-			Object: model.Object{
-				Name:     f.Name,
-				Modified: f.Modified,
-				Ctime:    f.Created,
-				Size:     f.Size,
-				IsFolder: f.IsDir,
-				HashInfo: utils.FromString(f.HashInfo),
-			},
-			Thumbnail: model.Thumbnail{Thumbnail: f.Thumb},
-		}
-		files = append(files, &file)
-	}
-	return files, nil
-}
-
-func (d *AListV3) Extract(ctx context.Context, obj model.Obj, args model.ArchiveInnerArgs) (*model.Link, error) {
-	if !d.ForwardArchiveReq {
-		return nil, errs.NotSupport
-	}
-	var resp common.Resp[ArchiveMetaResp]
-	_, _, err := d.request("/fs/archive/meta", http.MethodPost, func(req *resty.Request) {
-		req.SetResult(&resp).SetBody(ArchiveMetaReq{
-			ArchivePass: args.Password,
-			Password:    d.MetaPassword,
-			Path:        obj.GetPath(),
-			Refresh:     false,
-		})
-	})
-	if err != nil {
-		return nil, err
-	}
-	return &model.Link{
-		URL: fmt.Sprintf("%s?inner=%s&pass=%s&sign=%s",
-			resp.Data.RawURL,
-			utils.EncodePath(args.InnerPath, true),
-			url.QueryEscape(args.Password),
-			resp.Data.Sign),
-	}, nil
-}
-
-func (d *AListV3) ArchiveDecompress(ctx context.Context, srcObj, dstDir model.Obj, args model.ArchiveDecompressArgs) error {
-	if !d.ForwardArchiveReq {
-		return errs.NotImplement
-	}
-	dir, name := path.Split(srcObj.GetPath())
-	_, _, err := d.request("/fs/archive/decompress", http.MethodPost, func(req *resty.Request) {
-		req.SetBody(DecompressReq{
-			ArchivePass:   args.Password,
-			CacheFull:     args.CacheFull,
-			DstDir:        dstDir.GetPath(),
-			InnerPath:     args.InnerPath,
-			Name:          []string{name},
-			PutIntoNewDir: args.PutIntoNewDir,
-			SrcDir:        dir,
-		})
 	})
 	return err
 }

drivers/alist_v3/meta.go

@@ -7,21 +7,18 @@ import (
 
 type Addition struct {
 	driver.RootPath
-	Address           string `json:"url" required:"true"`
+	Address      string `json:"url" required:"true"`
-	MetaPassword      string `json:"meta_password"`
+	MetaPassword string `json:"meta_password"`
-	Username          string `json:"username"`
+	Username     string `json:"username"`
-	Password          string `json:"password"`
+	Password     string `json:"password"`
-	Token             string `json:"token"`
+	Token        string `json:"token"`
-	PassUAToUpsteam   bool   `json:"pass_ua_to_upsteam" default:"true"`
-	ForwardArchiveReq bool   `json:"forward_archive_requests" default:"true"`
 }
 
 var config = driver.Config{
-	Name:             "AList V3",
+	Name:        "AList V3",
-	LocalSort:        true,
+	LocalSort:   true,
-	DefaultRoot:      "/",
+	DefaultRoot: "/",
-	CheckStatus:      true,
+	CheckStatus: true,
-	ProxyRangeOption: true,
 }
 
 func init() {

drivers/alist_v3/types.go

@@ -4,7 +4,6 @@ import (
 	"time"
 
 	"github.com/alist-org/alist/v3/internal/model"
-	"github.com/alist-org/alist/v3/pkg/utils"
 )
 
 type ListReq struct {
@@ -19,11 +18,9 @@ type ObjResp struct {
 	Size     int64     `json:"size"`
 	IsDir    bool      `json:"is_dir"`
 	Modified time.Time `json:"modified"`
-	Created  time.Time `json:"created"`
 	Sign     string    `json:"sign"`
 	Thumb    string    `json:"thumb"`
 	Type     int       `json:"type"`
-	HashInfo string    `json:"hashinfo"`
 }
 
 type FsListResp struct {
@@ -82,89 +79,3 @@ type MeResp struct {
 	SsoId      string `json:"sso_id"`
 	Otp        bool   `json:"otp"`
 }
-
-type ArchiveMetaReq struct {
-	ArchivePass string `json:"archive_pass"`
-	Password    string `json:"password"`
-	Path        string `json:"path"`
-	Refresh     bool   `json:"refresh"`
-}
-
-type TreeResp struct {
-	ObjResp
-	Children  []TreeResp `json:"children"`
-	hashCache *utils.HashInfo
-}
-
-func (t *TreeResp) GetSize() int64 {
-	return t.Size
-}
-
-func (t *TreeResp) GetName() string {
-	return t.Name
-}
-
-func (t *TreeResp) ModTime() time.Time {
-	return t.Modified
-}
-
-func (t *TreeResp) CreateTime() time.Time {
-	return t.Created
-}
-
-func (t *TreeResp) IsDir() bool {
-	return t.ObjResp.IsDir
-}
-
-func (t *TreeResp) GetHash() utils.HashInfo {
-	return utils.FromString(t.HashInfo)
-}
-
-func (t *TreeResp) GetID() string {
-	return ""
-}
-
-func (t *TreeResp) GetPath() string {
-	return ""
-}
-
-func (t *TreeResp) GetChildren() []model.ObjTree {
-	ret := make([]model.ObjTree, 0, len(t.Children))
-	for _, child := range t.Children {
-		ret = append(ret, &child)
-	}
-	return ret
-}
-
-func (t *TreeResp) Thumb() string {
-	return t.ObjResp.Thumb
-}
-
-type ArchiveMetaResp struct {
-	Comment   string     `json:"comment"`
-	Encrypted bool       `json:"encrypted"`
-	Content   []TreeResp `json:"content"`
-	RawURL    string     `json:"raw_url"`
-	Sign      string     `json:"sign"`
-}
-
-type ArchiveListReq struct {
-	model.PageReq
-	ArchiveMetaReq
-	InnerPath string `json:"inner_path"`
-}
-
-type ArchiveListResp struct {
-	Content []ObjResp `json:"content"`
-	Total   int64     `json:"total"`
-}
-
-type DecompressReq struct {
-	ArchivePass   string   `json:"archive_pass"`
-	CacheFull     bool     `json:"cache_full"`
-	DstDir        string   `json:"dst_dir"`
-	InnerPath     string   `json:"inner_path"`
-	Name          []string `json:"name"`
-	PutIntoNewDir bool     `json:"put_into_new_dir"`
-	SrcDir        string   `json:"src_dir"`
-}

drivers/alist_v3/util.go

@@ -13,11 +13,8 @@ import (
 )
 
 func (d *AListV3) login() error {
-	if d.Username == "" {
-		return nil
-	}
 	var resp common.Resp[LoginResp]
-	_, _, err := d.request("/auth/login", http.MethodPost, func(req *resty.Request) {
+	_, err := d.request("/auth/login", http.MethodPost, func(req *resty.Request) {
 		req.SetResult(&resp).SetBody(base.Json{
 			"username": d.Username,
 			"password": d.Password,
@@ -31,7 +28,7 @@ func (d *AListV3) login() error {
 	return nil
 }
 
-func (d *AListV3) request(api, method string, callback base.ReqCallback, retry ...bool) ([]byte, int, error) {
+func (d *AListV3) request(api, method string, callback base.ReqCallback, retry ...bool) ([]byte, error) {
 	url := d.Address + "/api" + api
 	req := base.RestyClient.R()
 	req.SetHeader("Authorization", d.Token)
@@ -40,26 +37,22 @@ func (d *AListV3) request(api, method string, callback base.ReqCallback, retry .
 	}
 	res, err := req.Execute(method, url)
 	if err != nil {
-		code := 0
+		return nil, err
-		if res != nil {
-			code = res.StatusCode()
-		}
-		return nil, code, err
 	}
 	log.Debugf("[alist_v3] response body: %s", res.String())
 	if res.StatusCode() >= 400 {
-		return nil, res.StatusCode(), fmt.Errorf("request failed, status: %s", res.Status())
+		return nil, fmt.Errorf("request failed, status: %s", res.Status())
 	}
 	code := utils.Json.Get(res.Body(), "code").ToInt()
 	if code != 200 {
 		if (code == 401 || code == 403) && !utils.IsBool(retry...) {
 			err = d.login()
 			if err != nil {
-				return nil, code, err
+				return nil, err
 			}
 			return d.request(api, method, callback, true)
 		}
-		return nil, code, fmt.Errorf("request failed,code: %d, message: %s", code, utils.Json.Get(res.Body(), "message").ToString())
+		return nil, fmt.Errorf("request failed,code: %d, message: %s", code, utils.Json.Get(res.Body(), "message").ToString())
 	}
-	return res.Body(), 200, nil
+	return res.Body(), nil
 }

drivers/aliyundrive/driver.go

@@ -19,7 +19,6 @@ import (
 	"github.com/alist-org/alist/v3/internal/driver"
 	"github.com/alist-org/alist/v3/internal/errs"
 	"github.com/alist-org/alist/v3/internal/model"
-	"github.com/alist-org/alist/v3/internal/stream"
 	"github.com/alist-org/alist/v3/pkg/cron"
 	"github.com/alist-org/alist/v3/pkg/utils"
 	"github.com/go-resty/resty/v2"
@@ -51,7 +50,7 @@ func (d *AliDrive) Init(ctx context.Context) error {
 		return err
 	}
 	// get driver id
-	res, err, _ := d.request("https://api.alipan.com/v2/user/get", http.MethodPost, nil, nil)
+	res, err, _ := d.request("https://api.aliyundrive.com/v2/user/get", http.MethodPost, nil, nil)
 	if err != nil {
 		return err
 	}
@@ -68,7 +67,7 @@ func (d *AliDrive) Init(ctx context.Context) error {
 		return nil
 	}
 	// init deviceID
-	deviceID := utils.HashData(utils.SHA256, []byte(d.UserID))
+	deviceID := utils.GetSHA256Encode(d.UserID)
 	// init privateKey
 	privateKey, _ := NewPrivateKeyFromHex(deviceID)
 	state := State{
@@ -105,7 +104,7 @@ func (d *AliDrive) Link(ctx context.Context, file model.Obj, args model.LinkArgs
 		"file_id":    file.GetID(),
 		"expire_sec": 14400,
 	}
-	res, err, _ := d.request("https://api.alipan.com/v2/file/get_download_url", http.MethodPost, func(req *resty.Request) {
+	res, err, _ := d.request("https://api.aliyundrive.com/v2/file/get_download_url", http.MethodPost, func(req *resty.Request) {
 		req.SetBody(data)
 	}, nil)
 	if err != nil {
@@ -113,14 +112,14 @@ func (d *AliDrive) Link(ctx context.Context, file model.Obj, args model.LinkArgs
 	}
 	return &model.Link{
 		Header: http.Header{
-			"Referer": []string{"https://www.alipan.com/"},
+			"Referer": []string{"https://www.aliyundrive.com/"},
 		},
 		URL: utils.Json.Get(res, "url").ToString(),
 	}, nil
 }
 
 func (d *AliDrive) MakeDir(ctx context.Context, parentDir model.Obj, dirName string) error {
-	_, err, _ := d.request("https://api.alipan.com/adrive/v2/file/createWithFolders", http.MethodPost, func(req *resty.Request) {
+	_, err, _ := d.request("https://api.aliyundrive.com/adrive/v2/file/createWithFolders", http.MethodPost, func(req *resty.Request) {
 		req.SetBody(base.Json{
 			"check_name_mode": "refuse",
 			"drive_id":        d.DriveId,
@@ -138,7 +137,7 @@ func (d *AliDrive) Move(ctx context.Context, srcObj, dstDir model.Obj) error {
 }
 
 func (d *AliDrive) Rename(ctx context.Context, srcObj model.Obj, newName string) error {
-	_, err, _ := d.request("https://api.alipan.com/v3/file/update", http.MethodPost, func(req *resty.Request) {
+	_, err, _ := d.request("https://api.aliyundrive.com/v3/file/update", http.MethodPost, func(req *resty.Request) {
 		req.SetBody(base.Json{
 			"check_name_mode": "refuse",
 			"drive_id":        d.DriveId,
@@ -155,7 +154,7 @@ func (d *AliDrive) Copy(ctx context.Context, srcObj, dstDir model.Obj) error {
 }
 
 func (d *AliDrive) Remove(ctx context.Context, obj model.Obj) error {
-	_, err, _ := d.request("https://api.alipan.com/v2/recyclebin/trash", http.MethodPost, func(req *resty.Request) {
+	_, err, _ := d.request("https://api.aliyundrive.com/v2/recyclebin/trash", http.MethodPost, func(req *resty.Request) {
 		req.SetBody(base.Json{
 			"drive_id": d.DriveId,
 			"file_id":  obj.GetID(),
@@ -164,14 +163,14 @@ func (d *AliDrive) Remove(ctx context.Context, obj model.Obj) error {
 	return err
 }
 
-func (d *AliDrive) Put(ctx context.Context, dstDir model.Obj, streamer model.FileStreamer, up driver.UpdateProgress) error {
+func (d *AliDrive) Put(ctx context.Context, dstDir model.Obj, stream model.FileStreamer, up driver.UpdateProgress) error {
-	file := stream.FileStream{
+	file := model.FileStream{
-		Obj:      streamer,
+		Obj:        stream,
-		Reader:   streamer,
+		ReadCloser: stream,
-		Mimetype: streamer.GetMimetype(),
+		Mimetype:   stream.GetMimetype(),
 	}
 	const DEFAULT int64 = 10485760
-	var count = int(math.Ceil(float64(streamer.GetSize()) / float64(DEFAULT)))
+	var count = int(math.Ceil(float64(stream.GetSize()) / float64(DEFAULT)))
 
 	partInfoList := make([]base.Json, 0, count)
 	for i := 1; i <= count; i++ {
@@ -188,28 +187,25 @@ func (d *AliDrive) Put(ctx context.Context, dstDir model.Obj, streamer model.Fil
 	}
 
 	var localFile *os.File
-	if fileStream, ok := file.Reader.(*stream.FileStream); ok {
+	if fileStream, ok := file.ReadCloser.(*model.FileStream); ok {
-		localFile, _ = fileStream.Reader.(*os.File)
+		localFile, _ = fileStream.ReadCloser.(*os.File)
 	}
 	if d.RapidUpload {
 		buf := bytes.NewBuffer(make([]byte, 0, 1024))
-		_, err := utils.CopyWithBufferN(buf, file, 1024)
+		io.CopyN(buf, file, 1024)
-		if err != nil {
+		reqBody["pre_hash"] = utils.GetSHA1Encode(buf.String())
-			return err
-		}
-		reqBody["pre_hash"] = utils.HashData(utils.SHA1, buf.Bytes())
 		if localFile != nil {
 			if _, err := localFile.Seek(0, io.SeekStart); err != nil {
 				return err
 			}
 		} else {
 			// 把头部拼接回去
-			file.Reader = struct {
+			file.ReadCloser = struct {
 				io.Reader
 				io.Closer
 			}{
 				Reader: io.MultiReader(buf, file),
-				Closer: &file,
+				Closer: file,
 			}
 		}
 	} else {
@@ -218,7 +214,7 @@ func (d *AliDrive) Put(ctx context.Context, dstDir model.Obj, streamer model.Fil
 	}
 
 	var resp UploadResp
-	_, err, e := d.request("https://api.alipan.com/adrive/v2/file/createWithFolders", http.MethodPost, func(req *resty.Request) {
+	_, err, e := d.request("https://api.aliyundrive.com/adrive/v2/file/createWithFolders", http.MethodPost, func(req *resty.Request) {
 		req.SetBody(reqBody)
 	}, &resp)
 
@@ -263,7 +259,7 @@ func (d *AliDrive) Put(ctx context.Context, dstDir model.Obj, streamer model.Fil
 			(t.file.slice(o.toNumber(), Math.min(o.plus(8).toNumber(), t.file.size)))
 		*/
 		buf := make([]byte, 8)
-		r, _ := new(big.Int).SetString(utils.GetMD5EncodeStr(d.AccessToken)[:16], 16)
+		r, _ := new(big.Int).SetString(utils.GetMD5Encode(d.AccessToken)[:16], 16)
 		i := new(big.Int).SetInt64(file.GetSize())
 		o := new(big.Int).SetInt64(0)
 		if file.GetSize() > 0 {
@@ -272,7 +268,7 @@ func (d *AliDrive) Put(ctx context.Context, dstDir model.Obj, streamer model.Fil
 		n, _ := io.NewSectionReader(localFile, o.Int64(), 8).Read(buf[:8])
 		reqBody["proof_code"] = base64.StdEncoding.EncodeToString(buf[:n])
 
-		_, err, e := d.request("https://api.alipan.com/adrive/v2/file/createWithFolders", http.MethodPost, func(req *resty.Request) {
+		_, err, e := d.request("https://api.aliyundrive.com/adrive/v2/file/createWithFolders", http.MethodPost, func(req *resty.Request) {
 			req.SetBody(reqBody)
 		}, &resp)
 		if err != nil && e.Code != "PreHashMatched" {
@@ -285,10 +281,9 @@ func (d *AliDrive) Put(ctx context.Context, dstDir model.Obj, streamer model.Fil
 		if _, err = localFile.Seek(0, io.SeekStart); err != nil {
 			return err
 		}
-		file.Reader = localFile
+		file.ReadCloser = localFile
 	}
 
-	rateLimited := driver.NewLimitedUploadStream(ctx, file)
 	for i, partInfo := range resp.PartInfoList {
 		if utils.IsCanceled(ctx) {
 			return ctx.Err()
@@ -297,7 +292,7 @@ func (d *AliDrive) Put(ctx context.Context, dstDir model.Obj, streamer model.Fil
 		if d.InternalUpload {
 			url = partInfo.InternalUploadUrl
 		}
-		req, err := http.NewRequest("PUT", url, io.LimitReader(rateLimited, DEFAULT))
+		req, err := http.NewRequest("PUT", url, io.LimitReader(file, DEFAULT))
 		if err != nil {
 			return err
 		}
@@ -306,13 +301,13 @@ func (d *AliDrive) Put(ctx context.Context, dstDir model.Obj, streamer model.Fil
 		if err != nil {
 			return err
 		}
-		_ = res.Body.Close()
+		res.Body.Close()
 		if count > 0 {
-			up(float64(i) * 100 / float64(count))
+			up(i * 100 / count)
 		}
 	}
 	var resp2 base.Json
-	_, err, e = d.request("https://api.alipan.com/v2/file/complete", http.MethodPost, func(req *resty.Request) {
+	_, err, e = d.request("https://api.aliyundrive.com/v2/file/complete", http.MethodPost, func(req *resty.Request) {
 		req.SetBody(base.Json{
 			"drive_id":  d.DriveId,
 			"file_id":   resp.FileId,
@@ -337,10 +332,10 @@ func (d *AliDrive) Other(ctx context.Context, args model.OtherArgs) (interface{}
 	}
 	switch args.Method {
 	case "doc_preview":
-		url = "https://api.alipan.com/v2/file/get_office_preview_url"
+		url = "https://api.aliyundrive.com/v2/file/get_office_preview_url"
 		data["access_token"] = d.AccessToken
 	case "video_preview":
-		url = "https://api.alipan.com/v2/file/get_video_preview_play_info"
+		url = "https://api.aliyundrive.com/v2/file/get_video_preview_play_info"
 		data["category"] = "live_transcoding"
 		data["url_expire_sec"] = 14400
 	default:

drivers/aliyundrive/util.go

@@ -26,7 +26,7 @@ func (d *AliDrive) createSession() error {
 		state.retry = 0
 		return fmt.Errorf("createSession failed after three retries")
 	}
-	_, err, _ := d.request("https://api.alipan.com/users/v1/users/device/create_session", http.MethodPost, func(req *resty.Request) {
+	_, err, _ := d.request("https://api.aliyundrive.com/users/v1/users/device/create_session", http.MethodPost, func(req *resty.Request) {
 		req.SetBody(base.Json{
 			"deviceName":   "samsung",
 			"modelName":    "SM-G9810",
@@ -42,7 +42,7 @@ func (d *AliDrive) createSession() error {
 }
 
 // func (d *AliDrive) renewSession() error {
-// 	_, err, _ := d.request("https://api.alipan.com/users/v1/users/device/renew_session", http.MethodPost, nil, nil)
+// 	_, err, _ := d.request("https://api.aliyundrive.com/users/v1/users/device/renew_session", http.MethodPost, nil, nil)
 // 	return err
 // }
 
@@ -58,7 +58,7 @@ func (d *AliDrive) sign() {
 // do others that not defined in Driver interface
 
 func (d *AliDrive) refreshToken() error {
-	url := "https://auth.alipan.com/v2/account/token"
+	url := "https://auth.aliyundrive.com/v2/account/token"
 	var resp base.TokenResp
 	var e RespErr
 	_, err := base.RestyClient.R().
@@ -85,7 +85,7 @@ func (d *AliDrive) request(url, method string, callback base.ReqCallback, resp i
 	req := base.RestyClient.R()
 	state, ok := global.Load(d.UserID)
 	if !ok {
-		if url == "https://api.alipan.com/v2/user/get" {
+		if url == "https://api.aliyundrive.com/v2/user/get" {
 			state = &State{}
 		} else {
 			return nil, fmt.Errorf("can't load user state, user_id: %s", d.UserID), RespErr{}
@@ -94,8 +94,8 @@ func (d *AliDrive) request(url, method string, callback base.ReqCallback, resp i
 	req.SetHeaders(map[string]string{
 		"Authorization": "Bearer\t" + d.AccessToken,
 		"content-type":  "application/json",
-		"origin":        "https://www.alipan.com",
+		"origin":        "https://www.aliyundrive.com",
-		"Referer":       "https://alipan.com/",
+		"Referer":       "https://aliyundrive.com/",
 		"X-Signature":   state.signature,
 		"x-request-id":  uuid.NewString(),
 		"X-Canary":      "client=Android,app=adrive,version=v4.1.0",
@@ -158,7 +158,7 @@ func (d *AliDrive) getFiles(fileId string) ([]File, error) {
 			"video_thumbnail_process": "video/snapshot,t_0,f_jpg,ar_auto,w_300",
 			"url_expire_sec":          14400,
 		}
-		_, err, _ := d.request("https://api.alipan.com/v2/file/list", http.MethodPost, func(req *resty.Request) {
+		_, err, _ := d.request("https://api.aliyundrive.com/v2/file/list", http.MethodPost, func(req *resty.Request) {
 			req.SetBody(data)
 		}, &resp)
 
@@ -172,7 +172,7 @@ func (d *AliDrive) getFiles(fileId string) ([]File, error) {
 }
 
 func (d *AliDrive) batch(srcId, dstId string, url string) error {
-	res, err, _ := d.request("https://api.alipan.com/v3/batch", http.MethodPost, func(req *resty.Request) {
+	res, err, _ := d.request("https://api.aliyundrive.com/v3/batch", http.MethodPost, func(req *resty.Request) {
 		req.SetBody(base.Json{
 			"requests": []base.Json{
 				{

drivers/aliyundrive_open/driver.go

@@ -2,12 +2,11 @@ package aliyundrive_open
 
 import (
 	"context"
-	"errors"
+	"io"
-	"fmt"
+	"math"
 	"net/http"
 	"time"
 
-	"github.com/Xhofe/rateg"
 	"github.com/alist-org/alist/v3/drivers/base"
 	"github.com/alist-org/alist/v3/internal/driver"
 	"github.com/alist-org/alist/v3/internal/errs"
@@ -19,12 +18,12 @@ import (
 type AliyundriveOpen struct {
 	model.Storage
 	Addition
+	base string
 
 	DriveId string
 
 	limitList func(ctx context.Context, data base.Json) (*Files, error)
 	limitLink func(ctx context.Context, file model.Obj) (*model.Link, error)
-	ref       *AliyundriveOpen
 }
 
 func (d *AliyundriveOpen) Config() driver.Config {
@@ -36,46 +35,21 @@ func (d *AliyundriveOpen) GetAddition() driver.Additional {
 }
 
 func (d *AliyundriveOpen) Init(ctx context.Context) error {
-	if d.LIVPDownloadFormat == "" {
-		d.LIVPDownloadFormat = "jpeg"
-	}
-	if d.DriveType == "" {
-		d.DriveType = "default"
-	}
 	res, err := d.request("/adrive/v1.0/user/getDriveInfo", http.MethodPost, nil)
 	if err != nil {
 		return err
 	}
-	d.DriveId = utils.Json.Get(res, d.DriveType+"_drive_id").ToString()
+	d.DriveId = utils.Json.Get(res, "default_drive_id").ToString()
-	d.limitList = rateg.LimitFnCtx(d.list, rateg.LimitFnOption{
+	d.limitList = utils.LimitRateCtx(d.list, time.Second/4)
-		Limit:  4,
+	d.limitLink = utils.LimitRateCtx(d.link, time.Second)
-		Bucket: 1,
-	})
-	d.limitLink = rateg.LimitFnCtx(d.link, rateg.LimitFnOption{
-		Limit:  1,
-		Bucket: 1,
-	})
 	return nil
 }
 
-func (d *AliyundriveOpen) InitReference(storage driver.Driver) error {
-	refStorage, ok := storage.(*AliyundriveOpen)
-	if ok {
-		d.ref = refStorage
-		return nil
-	}
-	return errs.NotSupport
-}
-
 func (d *AliyundriveOpen) Drop(ctx context.Context) error {
-	d.ref = nil
 	return nil
 }
 
 func (d *AliyundriveOpen) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([]model.Obj, error) {
-	if d.limitList == nil {
-		return nil, fmt.Errorf("driver not init")
-	}
 	files, err := d.getFiles(ctx, dir.GetID())
 	if err != nil {
 		return nil, err
@@ -97,13 +71,7 @@ func (d *AliyundriveOpen) link(ctx context.Context, file model.Obj) (*model.Link
 		return nil, err
 	}
 	url := utils.Json.Get(res, "url").ToString()
-	if url == "" {
+	exp := time.Hour
-		if utils.Ext(file.GetName()) != "livp" {
-			return nil, errors.New("get download url failed: " + string(res))
-		}
-		url = utils.Json.Get(res, "streamsUrl", d.LIVPDownloadFormat).ToString()
-	}
-	exp := time.Minute
 	return &model.Link{
 		URL:        url,
 		Expiration: &exp,
@@ -111,15 +79,10 @@ func (d *AliyundriveOpen) link(ctx context.Context, file model.Obj) (*model.Link
 }
 
 func (d *AliyundriveOpen) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
-	if d.limitLink == nil {
-		return nil, fmt.Errorf("driver not init")
-	}
 	return d.limitLink(ctx, file)
 }
 
-func (d *AliyundriveOpen) MakeDir(ctx context.Context, parentDir model.Obj, dirName string) (model.Obj, error) {
+func (d *AliyundriveOpen) MakeDir(ctx context.Context, parentDir model.Obj, dirName string) error {
-	nowTime, _ := getNowTime()
-	newDir := File{CreatedAt: nowTime, UpdatedAt: nowTime}
 	_, err := d.request("/adrive/v1.0/openFile/create", http.MethodPost, func(req *resty.Request) {
 		req.SetBody(base.Json{
 			"drive_id":        d.DriveId,
@@ -127,16 +90,12 @@ func (d *AliyundriveOpen) MakeDir(ctx context.Context, parentDir model.Obj, dirN
 			"name":            dirName,
 			"type":            "folder",
 			"check_name_mode": "refuse",
-		}).SetResult(&newDir)
+		})
 	})
-	if err != nil {
+	return err
-		return nil, err
-	}
-	return fileToObj(newDir), nil
 }
 
-func (d *AliyundriveOpen) Move(ctx context.Context, srcObj, dstDir model.Obj) (model.Obj, error) {
+func (d *AliyundriveOpen) Move(ctx context.Context, srcObj, dstDir model.Obj) error {
-	var resp MoveOrCopyResp
 	_, err := d.request("/adrive/v1.0/openFile/move", http.MethodPost, func(req *resty.Request) {
 		req.SetBody(base.Json{
 			"drive_id":          d.DriveId,
@@ -144,36 +103,20 @@ func (d *AliyundriveOpen) Move(ctx context.Context, srcObj, dstDir model.Obj) (m
 			"to_parent_file_id": dstDir.GetID(),
 			"check_name_mode":   "refuse", // optional:ignore,auto_rename,refuse
 			//"new_name":          "newName", // The new name to use when a file of the same name exists
-		}).SetResult(&resp)
+		})
 	})
-	if err != nil {
+	return err
-		return nil, err
-	}
-	if resp.Exist {
-		return nil, errors.New("existence of files with the same name")
-	}
-
-	if srcObj, ok := srcObj.(*model.ObjThumb); ok {
-		srcObj.ID = resp.FileID
-		srcObj.Modified = time.Now()
-		return srcObj, nil
-	}
-	return nil, nil
 }
 
-func (d *AliyundriveOpen) Rename(ctx context.Context, srcObj model.Obj, newName string) (model.Obj, error) {
+func (d *AliyundriveOpen) Rename(ctx context.Context, srcObj model.Obj, newName string) error {
-	var newFile File
 	_, err := d.request("/adrive/v1.0/openFile/update", http.MethodPost, func(req *resty.Request) {
 		req.SetBody(base.Json{
 			"drive_id": d.DriveId,
 			"file_id":  srcObj.GetID(),
 			"name":     newName,
-		}).SetResult(&newFile)
+		})
 	})
-	if err != nil {
+	return err
-		return nil, err
-	}
-	return fileToObj(newFile), nil
 }
 
 func (d *AliyundriveOpen) Copy(ctx context.Context, srcObj, dstDir model.Obj) error {
@@ -202,8 +145,60 @@ func (d *AliyundriveOpen) Remove(ctx context.Context, obj model.Obj) error {
 	return err
 }
 
-func (d *AliyundriveOpen) Put(ctx context.Context, dstDir model.Obj, stream model.FileStreamer, up driver.UpdateProgress) (model.Obj, error) {
+func (d *AliyundriveOpen) Put(ctx context.Context, dstDir model.Obj, stream model.FileStreamer, up driver.UpdateProgress) error {
-	return d.upload(ctx, dstDir, stream, up)
+	// rapid_upload is not currently supported
+	// 1. create
+	const DEFAULT int64 = 20971520
+	createData := base.Json{
+		"drive_id":        d.DriveId,
+		"parent_file_id":  dstDir.GetID(),
+		"name":            stream.GetName(),
+		"type":            "file",
+		"check_name_mode": "ignore",
+	}
+	count := 1
+	if stream.GetSize() > DEFAULT {
+		count = int(math.Ceil(float64(stream.GetSize()) / float64(DEFAULT)))
+		createData["part_info_list"] = makePartInfos(count)
+	}
+	var createResp CreateResp
+	_, err := d.request("/adrive/v1.0/openFile/create", http.MethodPost, func(req *resty.Request) {
+		req.SetBody(createData).SetResult(&createResp)
+	})
+	if err != nil {
+		return err
+	}
+	// 2. upload
+	preTime := time.Now()
+	for i := 1; i <= len(createResp.PartInfoList); i++ {
+		if utils.IsCanceled(ctx) {
+			return ctx.Err()
+		}
+		err = d.uploadPart(ctx, i, count, utils.NewMultiReadable(io.LimitReader(stream, DEFAULT)), &createResp, true)
+		if err != nil {
+			return err
+		}
+		if count > 0 {
+			up(i * 100 / count)
+		}
+		// refresh upload url if 50 minutes passed
+		if time.Since(preTime) > 50*time.Minute {
+			createResp.PartInfoList, err = d.getUploadUrl(count, createResp.FileId, createResp.UploadId)
+			if err != nil {
+				return err
+			}
+			preTime = time.Now()
+		}
+	}
+	// 3. complete
+	_, err = d.request("/adrive/v1.0/openFile/complete", http.MethodPost, func(req *resty.Request) {
+		req.SetBody(base.Json{
+			"drive_id":  d.DriveId,
+			"file_id":   createResp.FileId,
+			"upload_id": createResp.UploadId,
+		})
+	})
+	return err
 }
 
 func (d *AliyundriveOpen) Other(ctx context.Context, args model.OtherArgs) (interface{}, error) {
@@ -231,7 +226,3 @@ func (d *AliyundriveOpen) Other(ctx context.Context, args model.OtherArgs) (inte
 }
 
 var _ driver.Driver = (*AliyundriveOpen)(nil)
-var _ driver.MkdirResult = (*AliyundriveOpen)(nil)
-var _ driver.MoveResult = (*AliyundriveOpen)(nil)
-var _ driver.RenameResult = (*AliyundriveOpen)(nil)
-var _ driver.PutResult = (*AliyundriveOpen)(nil)

drivers/aliyundrive_open/meta.go

@@ -6,19 +6,16 @@ import (
 )
 
 type Addition struct {
-	DriveType string `json:"drive_type" type:"select" options:"default,resource,backup" default:"resource"`
 	driver.RootID
-	RefreshToken       string `json:"refresh_token" required:"true"`
+	RefreshToken   string `json:"refresh_token" required:"true"`
-	OrderBy            string `json:"order_by" type:"select" options:"name,size,updated_at,created_at"`
+	OrderBy        string `json:"order_by" type:"select" options:"name,size,updated_at,created_at"`
-	OrderDirection     string `json:"order_direction" type:"select" options:"ASC,DESC"`
+	OrderDirection string `json:"order_direction" type:"select" options:"ASC,DESC"`
-	OauthTokenURL      string `json:"oauth_token_url" default:"https://api.nn.ci/alist/ali_open/token"`
+	OauthTokenURL  string `json:"oauth_token_url" default:"https://api.xhofe.top/alist/ali_open/token"`
-	ClientID           string `json:"client_id" required:"false" help:"Keep it empty if you don't have one"`
+	ClientID       string `json:"client_id" required:"false" help:"Keep it empty if you don't have one"`
-	ClientSecret       string `json:"client_secret" required:"false" help:"Keep it empty if you don't have one"`
+	ClientSecret   string `json:"client_secret" required:"false" help:"Keep it empty if you don't have one"`
-	RemoveWay          string `json:"remove_way" required:"true" type:"select" options:"trash,delete"`
+	RemoveWay      string `json:"remove_way" required:"true" type:"select" options:"trash,delete"`
-	RapidUpload        bool   `json:"rapid_upload" help:"If you enable this option, the file will be uploaded to the server first, so the progress will be incorrect"`
+	InternalUpload bool   `json:"internal_upload" help:"If you are using Aliyun ECS is located in Beijing, you can turn it on to boost the upload speed"`
-	InternalUpload     bool   `json:"internal_upload" help:"If you are using Aliyun ECS is located in Beijing, you can turn it on to boost the upload speed"`
+	AccessToken    string
-	LIVPDownloadFormat string `json:"livp_download_format" type:"select" options:"jpeg,mov" default:"jpeg"`
-	AccessToken        string
 }
 
 var config = driver.Config{
@@ -32,10 +29,11 @@ var config = driver.Config{
 	DefaultRoot:       "root",
 	NoOverwriteUpload: true,
 }
-var API_URL = "https://openapi.alipan.com"
 
 func init() {
 	op.RegisterDriver(func() driver.Driver {
-		return &AliyundriveOpen{}
+		return &AliyundriveOpen{
+			base: "https://openapi.aliyundrive.com",
+		}
 	})
 }

drivers/aliyundrive_open/types.go

@@ -1,7 +1,6 @@
 package aliyundrive_open
 
 import (
-	"github.com/alist-org/alist/v3/pkg/utils"
 	"time"
 
 	"github.com/alist-org/alist/v3/internal/model"
@@ -18,28 +17,22 @@ type Files struct {
 }
 
 type File struct {
-	DriveId       string    `json:"drive_id"`
+	DriveId       string     `json:"drive_id"`
-	FileId        string    `json:"file_id"`
+	FileId        string     `json:"file_id"`
-	ParentFileId  string    `json:"parent_file_id"`
+	ParentFileId  string     `json:"parent_file_id"`
-	Name          string    `json:"name"`
+	Name          string     `json:"name"`
-	Size          int64     `json:"size"`
+	Size          int64      `json:"size"`
-	FileExtension string    `json:"file_extension"`
+	FileExtension string     `json:"file_extension"`
-	ContentHash   string    `json:"content_hash"`
+	ContentHash   string     `json:"content_hash"`
-	Category      string    `json:"category"`
+	Category      string     `json:"category"`
-	Type          string    `json:"type"`
+	Type          string     `json:"type"`
-	Thumbnail     string    `json:"thumbnail"`
+	Thumbnail     string     `json:"thumbnail"`
-	Url           string    `json:"url"`
+	Url           string     `json:"url"`
-	CreatedAt     time.Time `json:"created_at"`
+	CreatedAt     *time.Time `json:"created_at"`
-	UpdatedAt     time.Time `json:"updated_at"`
+	UpdatedAt     time.Time  `json:"updated_at"`
-
-	// create only
-	FileName string `json:"file_name"`
 }
 
 func fileToObj(f File) *model.ObjThumb {
-	if f.Name == "" {
-		f.Name = f.FileName
-	}
 	return &model.ObjThumb{
 		Object: model.Object{
 			ID:       f.FileId,
@@ -47,8 +40,6 @@ func fileToObj(f File) *model.ObjThumb {
 			Size:     f.Size,
 			Modified: f.UpdatedAt,
 			IsFolder: f.Type == "folder",
-			Ctime:    f.CreatedAt,
-			HashInfo: utils.NewHashInfo(utils.SHA1, f.ContentHash),
 		},
 		Thumbnail: model.Thumbnail{Thumbnail: f.Thumbnail},
 	}
@@ -76,9 +67,3 @@ type CreateResp struct {
 	RapidUpload  bool       `json:"rapid_upload"`
 	PartInfoList []PartInfo `json:"part_info_list"`
 }
-
-type MoveOrCopyResp struct {
-	Exist   bool   `json:"exist"`
-	DriveID string `json:"drive_id"`
-	FileID  string `json:"file_id"`
-}

drivers/aliyundrive_open/upload.go

@@ -1,274 +0,0 @@
-package aliyundrive_open
-
-import (
-	"bytes"
-	"context"
-	"encoding/base64"
-	"fmt"
-	"io"
-	"math"
-	"net/http"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/alist-org/alist/v3/drivers/base"
-	"github.com/alist-org/alist/v3/internal/driver"
-	"github.com/alist-org/alist/v3/internal/model"
-	"github.com/alist-org/alist/v3/pkg/http_range"
-	"github.com/alist-org/alist/v3/pkg/utils"
-	"github.com/avast/retry-go"
-	"github.com/go-resty/resty/v2"
-	log "github.com/sirupsen/logrus"
-)
-
-func makePartInfos(size int) []base.Json {
-	partInfoList := make([]base.Json, size)
-	for i := 0; i < size; i++ {
-		partInfoList[i] = base.Json{"part_number": 1 + i}
-	}
-	return partInfoList
-}
-
-func calPartSize(fileSize int64) int64 {
-	var partSize int64 = 20 * utils.MB
-	if fileSize > partSize {
-		if fileSize > 1*utils.TB { // file Size over 1TB
-			partSize = 5 * utils.GB // file part size 5GB
-		} else if fileSize > 768*utils.GB { // over 768GB
-			partSize = 109951163 // ≈ 104.8576MB, split 1TB into 10,000 part
-		} else if fileSize > 512*utils.GB { // over 512GB
-			partSize = 82463373 // ≈ 78.6432MB
-		} else if fileSize > 384*utils.GB { // over 384GB
-			partSize = 54975582 // ≈ 52.4288MB
-		} else if fileSize > 256*utils.GB { // over 256GB
-			partSize = 41231687 // ≈ 39.3216MB
-		} else if fileSize > 128*utils.GB { // over 128GB
-			partSize = 27487791 // ≈ 26.2144MB
-		}
-	}
-	return partSize
-}
-
-func (d *AliyundriveOpen) getUploadUrl(count int, fileId, uploadId string) ([]PartInfo, error) {
-	partInfoList := makePartInfos(count)
-	var resp CreateResp
-	_, err := d.request("/adrive/v1.0/openFile/getUploadUrl", http.MethodPost, func(req *resty.Request) {
-		req.SetBody(base.Json{
-			"drive_id":       d.DriveId,
-			"file_id":        fileId,
-			"part_info_list": partInfoList,
-			"upload_id":      uploadId,
-		}).SetResult(&resp)
-	})
-	return resp.PartInfoList, err
-}
-
-func (d *AliyundriveOpen) uploadPart(ctx context.Context, r io.Reader, partInfo PartInfo) error {
-	uploadUrl := partInfo.UploadUrl
-	if d.InternalUpload {
-		uploadUrl = strings.ReplaceAll(uploadUrl, "https://cn-beijing-data.aliyundrive.net/", "http://ccp-bj29-bj-1592982087.oss-cn-beijing-internal.aliyuncs.com/")
-	}
-	req, err := http.NewRequestWithContext(ctx, "PUT", uploadUrl, r)
-	if err != nil {
-		return err
-	}
-	res, err := base.HttpClient.Do(req)
-	if err != nil {
-		return err
-	}
-	_ = res.Body.Close()
-	if res.StatusCode != http.StatusOK && res.StatusCode != http.StatusConflict {
-		return fmt.Errorf("upload status: %d", res.StatusCode)
-	}
-	return nil
-}
-
-func (d *AliyundriveOpen) completeUpload(fileId, uploadId string) (model.Obj, error) {
-	// 3. complete
-	var newFile File
-	_, err := d.request("/adrive/v1.0/openFile/complete", http.MethodPost, func(req *resty.Request) {
-		req.SetBody(base.Json{
-			"drive_id":  d.DriveId,
-			"file_id":   fileId,
-			"upload_id": uploadId,
-		}).SetResult(&newFile)
-	})
-	if err != nil {
-		return nil, err
-	}
-	return fileToObj(newFile), nil
-}
-
-type ProofRange struct {
-	Start int64
-	End   int64
-}
-
-func getProofRange(input string, size int64) (*ProofRange, error) {
-	if size == 0 {
-		return &ProofRange{}, nil
-	}
-	tmpStr := utils.GetMD5EncodeStr(input)[0:16]
-	tmpInt, err := strconv.ParseUint(tmpStr, 16, 64)
-	if err != nil {
-		return nil, err
-	}
-	index := tmpInt % uint64(size)
-	pr := &ProofRange{
-		Start: int64(index),
-		End:   int64(index) + 8,
-	}
-	if pr.End >= size {
-		pr.End = size
-	}
-	return pr, nil
-}
-
-func (d *AliyundriveOpen) calProofCode(stream model.FileStreamer) (string, error) {
-	proofRange, err := getProofRange(d.getAccessToken(), stream.GetSize())
-	if err != nil {
-		return "", err
-	}
-	length := proofRange.End - proofRange.Start
-	buf := bytes.NewBuffer(make([]byte, 0, length))
-	reader, err := stream.RangeRead(http_range.Range{Start: proofRange.Start, Length: length})
-	if err != nil {
-		return "", err
-	}
-	_, err = utils.CopyWithBufferN(buf, reader, length)
-	if err != nil {
-		return "", err
-	}
-	return base64.StdEncoding.EncodeToString(buf.Bytes()), nil
-}
-
-func (d *AliyundriveOpen) upload(ctx context.Context, dstDir model.Obj, stream model.FileStreamer, up driver.UpdateProgress) (model.Obj, error) {
-	// 1. create
-	// Part Size Unit: Bytes, Default: 20MB,
-	// Maximum number of slices 10,000, ≈195.3125GB
-	var partSize = calPartSize(stream.GetSize())
-	const dateFormat = "2006-01-02T15:04:05.000Z"
-	mtimeStr := stream.ModTime().UTC().Format(dateFormat)
-	ctimeStr := stream.CreateTime().UTC().Format(dateFormat)
-
-	createData := base.Json{
-		"drive_id":          d.DriveId,
-		"parent_file_id":    dstDir.GetID(),
-		"name":              stream.GetName(),
-		"type":              "file",
-		"check_name_mode":   "ignore",
-		"local_modified_at": mtimeStr,
-		"local_created_at":  ctimeStr,
-	}
-	count := int(math.Ceil(float64(stream.GetSize()) / float64(partSize)))
-	createData["part_info_list"] = makePartInfos(count)
-	// rapid upload
-	rapidUpload := !stream.IsForceStreamUpload() && stream.GetSize() > 100*utils.KB && d.RapidUpload
-	if rapidUpload {
-		log.Debugf("[aliyundrive_open] start cal pre_hash")
-		// read 1024 bytes to calculate pre hash
-		reader, err := stream.RangeRead(http_range.Range{Start: 0, Length: 1024})
-		if err != nil {
-			return nil, err
-		}
-		hash, err := utils.HashReader(utils.SHA1, reader)
-		if err != nil {
-			return nil, err
-		}
-		createData["size"] = stream.GetSize()
-		createData["pre_hash"] = hash
-	}
-	var createResp CreateResp
-	_, err, e := d.requestReturnErrResp("/adrive/v1.0/openFile/create", http.MethodPost, func(req *resty.Request) {
-		req.SetBody(createData).SetResult(&createResp)
-	})
-	var tmpF model.File
-	if err != nil {
-		if e.Code != "PreHashMatched" || !rapidUpload {
-			return nil, err
-		}
-		log.Debugf("[aliyundrive_open] pre_hash matched, start rapid upload")
-
-		hi := stream.GetHash()
-		hash := hi.GetHash(utils.SHA1)
-		if len(hash) <= 0 {
-			tmpF, err = stream.CacheFullInTempFile()
-			if err != nil {
-				return nil, err
-			}
-			hash, err = utils.HashFile(utils.SHA1, tmpF)
-			if err != nil {
-				return nil, err
-			}
-
-		}
-
-		delete(createData, "pre_hash")
-		createData["proof_version"] = "v1"
-		createData["content_hash_name"] = "sha1"
-		createData["content_hash"] = hash
-		createData["proof_code"], err = d.calProofCode(stream)
-		if err != nil {
-			return nil, fmt.Errorf("cal proof code error: %s", err.Error())
-		}
-		_, err = d.request("/adrive/v1.0/openFile/create", http.MethodPost, func(req *resty.Request) {
-			req.SetBody(createData).SetResult(&createResp)
-		})
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	if !createResp.RapidUpload {
-		// 2. normal upload
-		log.Debugf("[aliyundive_open] normal upload")
-
-		preTime := time.Now()
-		var offset, length int64 = 0, partSize
-		//var length
-		for i := 0; i < len(createResp.PartInfoList); i++ {
-			if utils.IsCanceled(ctx) {
-				return nil, ctx.Err()
-			}
-			// refresh upload url if 50 minutes passed
-			if time.Since(preTime) > 50*time.Minute {
-				createResp.PartInfoList, err = d.getUploadUrl(count, createResp.FileId, createResp.UploadId)
-				if err != nil {
-					return nil, err
-				}
-				preTime = time.Now()
-			}
-			if remain := stream.GetSize() - offset; length > remain {
-				length = remain
-			}
-			rd := utils.NewMultiReadable(io.LimitReader(stream, partSize))
-			if rapidUpload {
-				srd, err := stream.RangeRead(http_range.Range{Start: offset, Length: length})
-				if err != nil {
-					return nil, err
-				}
-				rd = utils.NewMultiReadable(srd)
-			}
-			err = retry.Do(func() error {
-				_ = rd.Reset()
-				rateLimitedRd := driver.NewLimitedUploadStream(ctx, rd)
-				return d.uploadPart(ctx, rateLimitedRd, createResp.PartInfoList[i])
-			},
-				retry.Attempts(3),
-				retry.DelayType(retry.BackOffDelay),
-				retry.Delay(time.Second))
-			if err != nil {
-				return nil, err
-			}
-			offset += partSize
-			up(float64(i*100) / float64(count))
-		}
-	} else {
-		log.Debugf("[aliyundrive_open] rapid upload success, file id: %s", createResp.FileId)
-	}
-
-	log.Debugf("[aliyundrive_open] create file success, resp: %+v", createResp)
-	// 3. complete
-	return d.completeUpload(createResp.FileId, createResp.UploadId)
-}

drivers/aliyundrive_open/util.go

@@ -2,108 +2,55 @@ package aliyundrive_open
 
 import (
 	"context"
-	"encoding/base64"
 	"errors"
 	"fmt"
 	"net/http"
 	"strings"
-	"time"
 
 	"github.com/alist-org/alist/v3/drivers/base"
 	"github.com/alist-org/alist/v3/internal/op"
 	"github.com/alist-org/alist/v3/pkg/utils"
 	"github.com/go-resty/resty/v2"
-	log "github.com/sirupsen/logrus"
 )
 
 // do others that not defined in Driver interface
 
-func (d *AliyundriveOpen) _refreshToken() (string, string, error) {
+func (d *AliyundriveOpen) refreshToken() error {
-	url := API_URL + "/oauth/access_token"
+	url := d.base + "/oauth/access_token"
 	if d.OauthTokenURL != "" && d.ClientID == "" {
 		url = d.OauthTokenURL
 	}
-	//var resp base.TokenResp
+	var resp base.TokenResp
 	var e ErrResp
-	res, err := base.RestyClient.R().
+	_, err := base.RestyClient.R().
-		//ForceContentType("application/json").
+		ForceContentType("application/json").
 		SetBody(base.Json{
 			"client_id":     d.ClientID,
 			"client_secret": d.ClientSecret,
 			"grant_type":    "refresh_token",
 			"refresh_token": d.RefreshToken,
 		}).
-		//SetResult(&resp).
+		SetResult(&resp).
 		SetError(&e).
 		Post(url)
-	if err != nil {
-		return "", "", err
-	}
-	log.Debugf("[ali_open] refresh token response: %s", res.String())
-	if e.Code != "" {
-		return "", "", fmt.Errorf("failed to refresh token: %s", e.Message)
-	}
-	refresh, access := utils.Json.Get(res.Body(), "refresh_token").ToString(), utils.Json.Get(res.Body(), "access_token").ToString()
-	if refresh == "" {
-		return "", "", fmt.Errorf("failed to refresh token: refresh token is empty, resp: %s", res.String())
-	}
-	curSub, err := getSub(d.RefreshToken)
-	if err != nil {
-		return "", "", err
-	}
-	newSub, err := getSub(refresh)
-	if err != nil {
-		return "", "", err
-	}
-	if curSub != newSub {
-		return "", "", errors.New("failed to refresh token: sub not match")
-	}
-	return refresh, access, nil
-}
-
-func getSub(token string) (string, error) {
-	segments := strings.Split(token, ".")
-	if len(segments) != 3 {
-		return "", errors.New("not a jwt token because of invalid segments")
-	}
-	bs, err := base64.RawStdEncoding.DecodeString(segments[1])
-	if err != nil {
-		return "", errors.New("failed to decode jwt token")
-	}
-	return utils.Json.Get(bs, "sub").ToString(), nil
-}
-
-func (d *AliyundriveOpen) refreshToken() error {
-	if d.ref != nil {
-		return d.ref.refreshToken()
-	}
-	refresh, access, err := d._refreshToken()
-	for i := 0; i < 3; i++ {
-		if err == nil {
-			break
-		} else {
-			log.Errorf("[ali_open] failed to refresh token: %s", err)
-		}
-		refresh, access, err = d._refreshToken()
-	}
 	if err != nil {
 		return err
 	}
-	log.Infof("[ali_open] token exchange: %s -> %s", d.RefreshToken, refresh)
+	if e.Code != "" {
-	d.RefreshToken, d.AccessToken = refresh, access
+		return fmt.Errorf("failed to refresh token: %s", e.Message)
+	}
+	if resp.RefreshToken == "" {
+		return errors.New("failed to refresh token: refresh token is empty")
+	}
+	d.RefreshToken, d.AccessToken = resp.RefreshToken, resp.AccessToken
 	op.MustSaveDriverStorage(d)
 	return nil
 }
 
 func (d *AliyundriveOpen) request(uri, method string, callback base.ReqCallback, retry ...bool) ([]byte, error) {
-	b, err, _ := d.requestReturnErrResp(uri, method, callback, retry...)
-	return b, err
-}
-
-func (d *AliyundriveOpen) requestReturnErrResp(uri, method string, callback base.ReqCallback, retry ...bool) ([]byte, error, *ErrResp) {
 	req := base.RestyClient.R()
 	// TODO check whether access_token is expired
-	req.SetHeader("Authorization", "Bearer "+d.getAccessToken())
+	req.SetHeader("Authorization", "Bearer "+d.AccessToken)
 	if method == http.MethodPost {
 		req.SetHeader("Content-Type", "application/json")
 	}
@@ -112,25 +59,22 @@ func (d *AliyundriveOpen) requestReturnErrResp(uri, method string, callback base
 	}
 	var e ErrResp
 	req.SetError(&e)
-	res, err := req.Execute(method, API_URL+uri)
+	res, err := req.Execute(method, d.base+uri)
 	if err != nil {
-		if res != nil {
+		return nil, err
-			log.Errorf("[aliyundrive_open] request error: %s", res.String())
-		}
-		return nil, err, nil
 	}
 	isRetry := len(retry) > 0 && retry[0]
 	if e.Code != "" {
-		if !isRetry && (utils.SliceContains([]string{"AccessTokenInvalid", "AccessTokenExpired", "I400JD"}, e.Code) || d.getAccessToken() == "") {
+		if !isRetry && (utils.SliceContains([]string{"AccessTokenInvalid", "AccessTokenExpired", "I400JD"}, e.Code) || d.AccessToken == "") {
 			err = d.refreshToken()
 			if err != nil {
-				return nil, err, nil
+				return nil, err
 			}
-			return d.requestReturnErrResp(uri, method, callback, true)
+			return d.request(uri, method, callback, true)
 		}
-		return nil, fmt.Errorf("%s:%s", e.Code, e.Message), &e
+		return nil, fmt.Errorf("%s:%s", e.Code, e.Message)
 	}
-	return res.Body(), nil, nil
+	return res.Body(), nil
 }
 
 func (d *AliyundriveOpen) list(ctx context.Context, data base.Json) (*Files, error) {
@@ -174,15 +118,58 @@ func (d *AliyundriveOpen) getFiles(ctx context.Context, fileId string) ([]File,
 	return res, nil
 }
 
-func getNowTime() (time.Time, string) {
+func makePartInfos(size int) []base.Json {
-	nowTime := time.Now()
+	partInfoList := make([]base.Json, size)
-	nowTimeStr := nowTime.Format("2006-01-02T15:04:05.000Z")
+	for i := 0; i < size; i++ {
-	return nowTime, nowTimeStr
+		partInfoList[i] = base.Json{"part_number": 1 + i}
+	}
+	return partInfoList
 }
 
-func (d *AliyundriveOpen) getAccessToken() string {
+func (d *AliyundriveOpen) getUploadUrl(count int, fileId, uploadId string) ([]PartInfo, error) {
-	if d.ref != nil {
+	partInfoList := makePartInfos(count)
-		return d.ref.getAccessToken()
+	var resp CreateResp
-	}
+	_, err := d.request("/adrive/v1.0/openFile/getUploadUrl", http.MethodPost, func(req *resty.Request) {
-	return d.AccessToken
+		req.SetBody(base.Json{
+			"drive_id":       d.DriveId,
+			"file_id":        fileId,
+			"part_info_list": partInfoList,
+			"upload_id":      uploadId,
+		}).SetResult(&resp)
+	})
+	return resp.PartInfoList, err
+}
+
+func (d *AliyundriveOpen) uploadPart(ctx context.Context, i, count int, reader *utils.MultiReadable, resp *CreateResp, retry bool) error {
+	partInfo := resp.PartInfoList[i-1]
+	uploadUrl := partInfo.UploadUrl
+	if d.InternalUpload {
+		uploadUrl = strings.ReplaceAll(uploadUrl, "https://cn-beijing-data.aliyundrive.net/", "http://ccp-bj29-bj-1592982087.oss-cn-beijing-internal.aliyuncs.com/")
+	}
+	req, err := http.NewRequest("PUT", uploadUrl, reader)
+	if err != nil {
+		return err
+	}
+	req = req.WithContext(ctx)
+	res, err := base.HttpClient.Do(req)
+	if err != nil {
+		if retry {
+			reader.Reset()
+			return d.uploadPart(ctx, i, count, reader, resp, false)
+		}
+		return err
+	}
+	res.Body.Close()
+	if retry && res.StatusCode == http.StatusForbidden {
+		resp.PartInfoList, err = d.getUploadUrl(count, resp.FileId, resp.UploadId)
+		if err != nil {
+			return err
+		}
+		reader.Reset()
+		return d.uploadPart(ctx, i, count, reader, resp, false)
+	}
+	if res.StatusCode != http.StatusOK && res.StatusCode != http.StatusConflict {
+		return fmt.Errorf("upload status: %d", res.StatusCode)
+	}
+	return nil
 }

drivers/aliyundrive_share/driver.go

@@ -2,11 +2,9 @@ package aliyundrive_share
 
 import (
 	"context"
-	"fmt"
 	"net/http"
 	"time"
 
-	"github.com/Xhofe/rateg"
 	"github.com/alist-org/alist/v3/drivers/base"
 	"github.com/alist-org/alist/v3/internal/driver"
 	"github.com/alist-org/alist/v3/internal/errs"
@@ -24,9 +22,6 @@ type AliyundriveShare struct {
 	ShareToken  string
 	DriveId     string
 	cron        *cron.Cron
-
-	limitList func(ctx context.Context, dir model.Obj) ([]model.Obj, error)
-	limitLink func(ctx context.Context, file model.Obj) (*model.Link, error)
 }
 
 func (d *AliyundriveShare) Config() driver.Config {
@@ -53,14 +48,6 @@ func (d *AliyundriveShare) Init(ctx context.Context) error {
 			log.Errorf("%+v", err)
 		}
 	})
-	d.limitList = rateg.LimitFnCtx(d.list, rateg.LimitFnOption{
-		Limit:  4,
-		Bucket: 1,
-	})
-	d.limitLink = rateg.LimitFnCtx(d.link, rateg.LimitFnOption{
-		Limit:  1,
-		Bucket: 1,
-	})
 	return nil
 }
 
@@ -73,13 +60,6 @@ func (d *AliyundriveShare) Drop(ctx context.Context) error {
 }
 
 func (d *AliyundriveShare) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([]model.Obj, error) {
-	if d.limitList == nil {
-		return nil, fmt.Errorf("driver not init")
-	}
-	return d.limitList(ctx, dir)
-}
-
-func (d *AliyundriveShare) list(ctx context.Context, dir model.Obj) ([]model.Obj, error) {
 	files, err := d.getFiles(dir.GetID())
 	if err != nil {
 		return nil, err
@@ -90,13 +70,6 @@ func (d *AliyundriveShare) list(ctx context.Context, dir model.Obj) ([]model.Obj
 }
 
 func (d *AliyundriveShare) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
-	if d.limitLink == nil {
-		return nil, fmt.Errorf("driver not init")
-	}
-	return d.limitLink(ctx, file)
-}
-
-func (d *AliyundriveShare) link(ctx context.Context, file model.Obj) (*model.Link, error) {
 	data := base.Json{
 		"drive_id": d.DriveId,
 		"file_id":  file.GetID(),
@@ -105,15 +78,15 @@ func (d *AliyundriveShare) link(ctx context.Context, file model.Obj) (*model.Lin
 		"share_id":   d.ShareId,
 	}
 	var resp ShareLinkResp
-	_, err := d.request("https://api.alipan.com/v2/file/get_share_link_download_url", http.MethodPost, func(req *resty.Request) {
+	_, err := d.request("https://api.aliyundrive.com/v2/file/get_share_link_download_url", http.MethodPost, func(req *resty.Request) {
-		req.SetHeader(CanaryHeaderKey, CanaryHeaderValue).SetBody(data).SetResult(&resp)
+		req.SetBody(data).SetResult(&resp)
 	})
 	if err != nil {
 		return nil, err
 	}
 	return &model.Link{
 		Header: http.Header{
-			"Referer": []string{"https://www.alipan.com/"},
+			"Referer": []string{"https://www.aliyundrive.com/"},
 		},
 		URL: resp.DownloadUrl,
 	}, nil
@@ -128,9 +101,9 @@ func (d *AliyundriveShare) Other(ctx context.Context, args model.OtherArgs) (int
 	}
 	switch args.Method {
 	case "doc_preview":
-		url = "https://api.alipan.com/v2/file/get_office_preview_url"
+		url = "https://api.aliyundrive.com/v2/file/get_office_preview_url"
 	case "video_preview":
-		url = "https://api.alipan.com/v2/file/get_video_preview_play_info"
+		url = "https://api.aliyundrive.com/v2/file/get_video_preview_play_info"
 		data["category"] = "live_transcoding"
 	default:
 		return nil, errs.NotSupport

drivers/aliyundrive_share/types.go

@@ -44,7 +44,6 @@ func fileToObj(f File) *model.ObjThumb {
 			Name:     f.Name,
 			Size:     f.Size,
 			Modified: f.UpdatedAt,
-			Ctime:    f.CreatedAt,
 			IsFolder: f.Type == "folder",
 		},
 		Thumbnail: model.Thumbnail{Thumbnail: f.Thumbnail},

drivers/aliyundrive_share/util.go

@@ -9,14 +9,8 @@ import (
 	log "github.com/sirupsen/logrus"
 )
 
-const (
-	// CanaryHeaderKey CanaryHeaderValue for lifting rate limit restrictions
-	CanaryHeaderKey   = "X-Canary"
-	CanaryHeaderValue = "client=web,app=share,version=v2.3.1"
-)
-
 func (d *AliyundriveShare) refreshToken() error {
-	url := "https://auth.alipan.com/v2/account/token"
+	url := "https://auth.aliyundrive.com/v2/account/token"
 	var resp base.TokenResp
 	var e ErrorResp
 	_, err := base.RestyClient.R().
@@ -47,7 +41,7 @@ func (d *AliyundriveShare) getShareToken() error {
 	var resp ShareTokenResp
 	_, err := base.RestyClient.R().
 		SetResult(&resp).SetError(&e).SetBody(data).
-		Post("https://api.alipan.com/v2/share_link/get_share_token")
+		Post("https://api.aliyundrive.com/v2/share_link/get_share_token")
 	if err != nil {
 		return err
 	}
@@ -64,7 +58,6 @@ func (d *AliyundriveShare) request(url, method string, callback base.ReqCallback
 		SetError(&e).
 		SetHeader("content-type", "application/json").
 		SetHeader("Authorization", "Bearer\t"+d.AccessToken).
-		SetHeader(CanaryHeaderKey, CanaryHeaderValue).
 		SetHeader("x-share-token", d.ShareToken)
 	if callback != nil {
 		callback(req)
@@ -114,9 +107,8 @@ func (d *AliyundriveShare) getFiles(fileId string) ([]File, error) {
 		var resp ListResp
 		res, err := base.RestyClient.R().
 			SetHeader("x-share-token", d.ShareToken).
-			SetHeader(CanaryHeaderKey, CanaryHeaderValue).
 			SetResult(&resp).SetError(&e).SetBody(data).
-			Post("https://api.alipan.com/adrive/v3/file/list")
+			Post("https://api.aliyundrive.com/adrive/v3/file/list")
 		if err != nil {
 			return nil, err
 		}

drivers/all.go

@@ -2,11 +2,7 @@ package drivers
 
 import (
 	_ "github.com/alist-org/alist/v3/drivers/115"
-	_ "github.com/alist-org/alist/v3/drivers/115_open"
-	_ "github.com/alist-org/alist/v3/drivers/115_share"
 	_ "github.com/alist-org/alist/v3/drivers/123"
-	_ "github.com/alist-org/alist/v3/drivers/123_link"
-	_ "github.com/alist-org/alist/v3/drivers/123_share"
 	_ "github.com/alist-org/alist/v3/drivers/139"
 	_ "github.com/alist-org/alist/v3/drivers/189"
 	_ "github.com/alist-org/alist/v3/drivers/189pc"
@@ -16,41 +12,23 @@ import (
 	_ "github.com/alist-org/alist/v3/drivers/aliyundrive"
 	_ "github.com/alist-org/alist/v3/drivers/aliyundrive_open"
 	_ "github.com/alist-org/alist/v3/drivers/aliyundrive_share"
-	_ "github.com/alist-org/alist/v3/drivers/azure_blob"
 	_ "github.com/alist-org/alist/v3/drivers/baidu_netdisk"
 	_ "github.com/alist-org/alist/v3/drivers/baidu_photo"
 	_ "github.com/alist-org/alist/v3/drivers/baidu_share"
-	_ "github.com/alist-org/alist/v3/drivers/chaoxing"
 	_ "github.com/alist-org/alist/v3/drivers/cloudreve"
-	_ "github.com/alist-org/alist/v3/drivers/crypt"
-	_ "github.com/alist-org/alist/v3/drivers/doubao"
-	_ "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/github"
-	_ "github.com/alist-org/alist/v3/drivers/github_releases"
 	_ "github.com/alist-org/alist/v3/drivers/google_drive"
 	_ "github.com/alist-org/alist/v3/drivers/google_photo"
-	_ "github.com/alist-org/alist/v3/drivers/halalcloud"
-	_ "github.com/alist-org/alist/v3/drivers/ilanzou"
 	_ "github.com/alist-org/alist/v3/drivers/ipfs_api"
-	_ "github.com/alist-org/alist/v3/drivers/kodbox"
 	_ "github.com/alist-org/alist/v3/drivers/lanzou"
-	_ "github.com/alist-org/alist/v3/drivers/lenovonas_share"
 	_ "github.com/alist-org/alist/v3/drivers/local"
 	_ "github.com/alist-org/alist/v3/drivers/mediatrack"
 	_ "github.com/alist-org/alist/v3/drivers/mega"
-	_ "github.com/alist-org/alist/v3/drivers/misskey"
-	_ "github.com/alist-org/alist/v3/drivers/mopan"
-	_ "github.com/alist-org/alist/v3/drivers/netease_music"
 	_ "github.com/alist-org/alist/v3/drivers/onedrive"
 	_ "github.com/alist-org/alist/v3/drivers/onedrive_app"
-	_ "github.com/alist-org/alist/v3/drivers/onedrive_sharelink"
 	_ "github.com/alist-org/alist/v3/drivers/pikpak"
 	_ "github.com/alist-org/alist/v3/drivers/pikpak_share"
 	_ "github.com/alist-org/alist/v3/drivers/quark_uc"
-	_ "github.com/alist-org/alist/v3/drivers/quark_uc_tv"
-	_ "github.com/alist-org/alist/v3/drivers/quqi"
 	_ "github.com/alist-org/alist/v3/drivers/s3"
 	_ "github.com/alist-org/alist/v3/drivers/seafile"
 	_ "github.com/alist-org/alist/v3/drivers/sftp"
@@ -58,15 +36,11 @@ import (
 	_ "github.com/alist-org/alist/v3/drivers/teambition"
 	_ "github.com/alist-org/alist/v3/drivers/terabox"
 	_ "github.com/alist-org/alist/v3/drivers/thunder"
-	_ "github.com/alist-org/alist/v3/drivers/thunder_browser"
-	_ "github.com/alist-org/alist/v3/drivers/thunderx"
 	_ "github.com/alist-org/alist/v3/drivers/trainbit"
 	_ "github.com/alist-org/alist/v3/drivers/url_tree"
 	_ "github.com/alist-org/alist/v3/drivers/uss"
 	_ "github.com/alist-org/alist/v3/drivers/virtual"
-	_ "github.com/alist-org/alist/v3/drivers/vtencent"
 	_ "github.com/alist-org/alist/v3/drivers/webdav"
-	_ "github.com/alist-org/alist/v3/drivers/weiyun"
 	_ "github.com/alist-org/alist/v3/drivers/wopan"
 	_ "github.com/alist-org/alist/v3/drivers/yandex_disk"
 )

drivers/azure_blob/driver.go

@@ -1,313 +0,0 @@
-package azure_blob
-
-import (
-	"context"
-	"fmt"
-	"io"
-	"path"
-	"regexp"
-	"strings"
-	"time"
-
-	"github.com/Azure/azure-sdk-for-go/sdk/azcore"
-	"github.com/Azure/azure-sdk-for-go/sdk/azcore/policy"
-	"github.com/Azure/azure-sdk-for-go/sdk/storage/azblob"
-	"github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/container"
-	"github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/sas"
-	"github.com/alist-org/alist/v3/internal/driver"
-	"github.com/alist-org/alist/v3/internal/model"
-)
-// Azure Blob Storage based on the blob APIs
-// Link: https://learn.microsoft.com/rest/api/storageservices/blob-service-rest-api
-type AzureBlob struct {
-	model.Storage
-	Addition
-	client          *azblob.Client
-	containerClient *container.Client
-	config          driver.Config
-}
-
-// Config returns the driver configuration.
-func (d *AzureBlob) Config() driver.Config {
-	return d.config
-}
-
-// GetAddition returns additional settings specific to Azure Blob Storage.
-func (d *AzureBlob) GetAddition() driver.Additional {
-	return &d.Addition
-}
-
-// Init initializes the Azure Blob Storage client using shared key authentication.
-func (d *AzureBlob) Init(ctx context.Context) error {
-	// Validate the endpoint URL
-	accountName := extractAccountName(d.Addition.Endpoint)
-	if !regexp.MustCompile(`^[a-z0-9]+$`).MatchString(accountName) {
-		return fmt.Errorf("invalid storage account name: must be chars of lowercase letters or numbers only")
-	}
-
-	credential, err := azblob.NewSharedKeyCredential(accountName, d.Addition.AccessKey)
-	if err != nil {
-		return fmt.Errorf("failed to create credential: %w", err)
-	}
-
-	// Check if Endpoint is just account name
-	endpoint := d.Addition.Endpoint
-	if accountName == endpoint {
-		endpoint = fmt.Sprintf("https://%s.blob.core.windows.net/", accountName)
-	}
-	// Initialize Azure Blob client with retry policy
-	client, err := azblob.NewClientWithSharedKeyCredential(endpoint, credential,
-		&azblob.ClientOptions{ClientOptions: azcore.ClientOptions{
-			Retry: policy.RetryOptions{
-				MaxRetries: MaxRetries,
-				RetryDelay: RetryDelay,
-			},
-		}})
-	if err != nil {
-		return fmt.Errorf("failed to create client: %w", err)
-	}
-	d.client = client
-
-	// Ensure container exists or create it
-	containerName := strings.Trim(d.Addition.ContainerName, "/ \\")
-	if containerName == "" {
-		return fmt.Errorf("container name cannot be empty")
-	}
-	return d.createContainerIfNotExists(ctx, containerName)
-}
-
-// Drop releases resources associated with the Azure Blob client.
-func (d *AzureBlob) Drop(ctx context.Context) error {
-	d.client = nil
-	return nil
-}
-
-// List retrieves blobs and directories under the specified path.
-func (d *AzureBlob) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([]model.Obj, error) {
-	prefix := ensureTrailingSlash(dir.GetPath())
-
-	pager := d.containerClient.NewListBlobsHierarchyPager("/", &container.ListBlobsHierarchyOptions{
-		Prefix: &prefix,
-	})
-
-	var objs []model.Obj
-	for pager.More() {
-		page, err := pager.NextPage(ctx)
-		if err != nil {
-			return nil, fmt.Errorf("failed to list blobs: %w", err)
-		}
-
-		// Process directories
-		for _, blobPrefix := range page.Segment.BlobPrefixes {
-			objs = append(objs, &model.Object{
-				Name:     path.Base(strings.TrimSuffix(*blobPrefix.Name, "/")),
-				Path:     *blobPrefix.Name,
-				Modified: *blobPrefix.Properties.LastModified,
-				Ctime:    *blobPrefix.Properties.CreationTime,
-				IsFolder: true,
-			})
-		}
-
-		// Process files
-		for _, blob := range page.Segment.BlobItems {
-			if strings.HasSuffix(*blob.Name, "/") {
-				continue
-			}
-			objs = append(objs, &model.Object{
-				Name:     path.Base(*blob.Name),
-				Path:     *blob.Name,
-				Size:     *blob.Properties.ContentLength,
-				Modified: *blob.Properties.LastModified,
-				Ctime:    *blob.Properties.CreationTime,
-				IsFolder: false,
-			})
-		}
-	}
-	return objs, nil
-}
-
-// Link generates a temporary SAS URL for accessing a blob.
-func (d *AzureBlob) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
-	blobClient := d.containerClient.NewBlobClient(file.GetPath())
-	expireDuration := time.Hour * time.Duration(d.SignURLExpire)
-
-	sasURL, err := blobClient.GetSASURL(sas.BlobPermissions{Read: true}, time.Now().Add(expireDuration), nil)
-	if err != nil {
-		return nil, fmt.Errorf("failed to generate SAS URL: %w", err)
-	}
-	return &model.Link{URL: sasURL}, nil
-}
-
-// MakeDir creates a virtual directory by uploading an empty blob as a marker.
-func (d *AzureBlob) MakeDir(ctx context.Context, parentDir model.Obj, dirName string) (model.Obj, error) {
-	dirPath := path.Join(parentDir.GetPath(), dirName)
-	if err := d.mkDir(ctx, dirPath); err != nil {
-		return nil, fmt.Errorf("failed to create directory marker: %w", err)
-	}
-
-	return &model.Object{
-		Path:     dirPath,
-		Name:     dirName,
-		IsFolder: true,
-	}, nil
-}
-
-// Move relocates an object (file or directory) to a new directory.
-func (d *AzureBlob) Move(ctx context.Context, srcObj, dstDir model.Obj) (model.Obj, error) {
-	srcPath := srcObj.GetPath()
-	dstPath := path.Join(dstDir.GetPath(), srcObj.GetName())
-
-	if err := d.moveOrRename(ctx, srcPath, dstPath, srcObj.IsDir(), srcObj.GetSize()); err != nil {
-		return nil, fmt.Errorf("move operation failed: %w", err)
-	}
-
-	return &model.Object{
-		Path:     dstPath,
-		Name:     srcObj.GetName(),
-		Modified: time.Now(),
-		IsFolder: srcObj.IsDir(),
-		Size:     srcObj.GetSize(),
-	}, nil
-}
-
-// Rename changes the name of an existing object.
-func (d *AzureBlob) Rename(ctx context.Context, srcObj model.Obj, newName string) (model.Obj, error) {
-	srcPath := srcObj.GetPath()
-	dstPath := path.Join(path.Dir(srcPath), newName)
-
-	if err := d.moveOrRename(ctx, srcPath, dstPath, srcObj.IsDir(), srcObj.GetSize()); err != nil {
-		return nil, fmt.Errorf("rename operation failed: %w", err)
-	}
-
-	return &model.Object{
-		Path:     dstPath,
-		Name:     newName,
-		Modified: time.Now(),
-		IsFolder: srcObj.IsDir(),
-		Size:     srcObj.GetSize(),
-	}, nil
-}
-
-// Copy duplicates an object (file or directory) to a specified destination directory.
-func (d *AzureBlob) Copy(ctx context.Context, srcObj, dstDir model.Obj) (model.Obj, error) {
-	dstPath := path.Join(dstDir.GetPath(), srcObj.GetName())
-
-	// Handle directory copying using flat listing
-	if srcObj.IsDir() {
-		srcPrefix := srcObj.GetPath()
-		srcPrefix = ensureTrailingSlash(srcPrefix)
-
-		// Get all blobs under the source directory
-		blobs, err := d.flattenListBlobs(ctx, srcPrefix)
-		if err != nil {
-			return nil, fmt.Errorf("failed to list source directory contents: %w", err)
-		}
-
-		// Process each blob - copy to destination
-		for _, blob := range blobs {
-			// Skip the directory marker itself
-			if *blob.Name == srcPrefix {
-				continue
-			}
-
-			// Calculate relative path from source
-			relPath := strings.TrimPrefix(*blob.Name, srcPrefix)
-			itemDstPath := path.Join(dstPath, relPath)
-
-			if strings.HasSuffix(itemDstPath, "/") || (blob.Metadata["hdi_isfolder"] != nil && *blob.Metadata["hdi_isfolder"] == "true") {
-				// Create directory marker at destination
-				err := d.mkDir(ctx, itemDstPath)
-				if err != nil {
-					return nil, fmt.Errorf("failed to create directory marker [%s]: %w", itemDstPath, err)
-				}
-			} else {
-				// Copy the blob
-				if err := d.copyFile(ctx, *blob.Name, itemDstPath); err != nil {
-					return nil, fmt.Errorf("failed to copy %s: %w", *blob.Name, err)
-				}
-			}
-
-		}
-
-		// Create directory marker at destination if needed
-		if len(blobs) == 0 {
-			err := d.mkDir(ctx, dstPath)
-			if err != nil {
-				return nil, fmt.Errorf("failed to create directory [%s]: %w", dstPath, err)
-			}
-		}
-
-		return &model.Object{
-			Path:     dstPath,
-			Name:     srcObj.GetName(),
-			Modified: time.Now(),
-			IsFolder: true,
-		}, nil
-	}
-
-	// Copy a single file
-	if err := d.copyFile(ctx, srcObj.GetPath(), dstPath); err != nil {
-		return nil, fmt.Errorf("failed to copy blob: %w", err)
-	}
-	return &model.Object{
-		Path:     dstPath,
-		Name:     srcObj.GetName(),
-		Size:     srcObj.GetSize(),
-		Modified: time.Now(),
-		IsFolder: false,
-	}, nil
-}
-
-// Remove deletes a specified blob or recursively deletes a directory and its contents.
-func (d *AzureBlob) Remove(ctx context.Context, obj model.Obj) error {
-	path := obj.GetPath()
-
-	// Handle recursive directory deletion
-	if obj.IsDir() {
-		return d.deleteFolder(ctx, path)
-	}
-
-	// Delete single file
-	return d.deleteFile(ctx, path, false)
-}
-
-// Put uploads a file stream to Azure Blob Storage with progress tracking.
-func (d *AzureBlob) Put(ctx context.Context, dstDir model.Obj, stream model.FileStreamer, up driver.UpdateProgress) (model.Obj, error) {
-	blobPath := path.Join(dstDir.GetPath(), stream.GetName())
-	blobClient := d.containerClient.NewBlockBlobClient(blobPath)
-
-	// Determine optimal upload options based on file size
-	options := optimizedUploadOptions(stream.GetSize())
-
-	// Track upload progress
-	progressTracker := &progressTracker{
-		total:          stream.GetSize(),
-		updateProgress: up,
-	}
-
-	// Wrap stream to handle context cancellation and progress tracking
-	limitedStream := driver.NewLimitedUploadStream(ctx, io.TeeReader(stream, progressTracker))
-
-	// Upload the stream to Azure Blob Storage
-	_, err := blobClient.UploadStream(ctx, limitedStream, options)
-	if err != nil {
-		return nil, fmt.Errorf("failed to upload file: %w", err)
-	}
-
-	return &model.Object{
-		Path:     blobPath,
-		Name:     stream.GetName(),
-		Size:     stream.GetSize(),
-		Modified: time.Now(),
-		IsFolder: false,
-	}, nil
-}
-
-// The following methods related to archive handling are not implemented yet.
-// func (d *AzureBlob) GetArchiveMeta(...) {...}
-// func (d *AzureBlob) ListArchive(...) {...}
-// func (d *AzureBlob) Extract(...) {...}
-// func (d *AzureBlob) ArchiveDecompress(...) {...}
-
-// Ensure AzureBlob implements the driver.Driver interface.
-var _ driver.Driver = (*AzureBlob)(nil)

drivers/azure_blob/meta.go

@@ -1,27 +0,0 @@
-package azure_blob
-
-import (
-	"github.com/alist-org/alist/v3/internal/driver"
-	"github.com/alist-org/alist/v3/internal/op"
-)
-
-type Addition struct {
-	Endpoint      string `json:"endpoint" required:"true" default:"https://<accountname>.blob.core.windows.net/" help:"e.g. https://accountname.blob.core.windows.net/. The full endpoint URL for Azure Storage, including the unique storage account name (3 ~ 24 numbers and lowercase letters only)."`
-	AccessKey     string `json:"access_key" required:"true" help:"The access key for Azure Storage, used for authentication. https://learn.microsoft.com/azure/storage/common/storage-account-keys-manage"`
-	ContainerName string `json:"container_name" required:"true" help:"The name of the container in Azure Storage (created in the Azure portal). https://learn.microsoft.com/azure/storage/blobs/blob-containers-portal"`
-	SignURLExpire int    `json:"sign_url_expire" type:"number" default:"4" help:"The expiration time for SAS URLs, in hours."`
-}
-
-var config = driver.Config{
-	Name:        "Azure Blob Storage",
-	LocalSort:   true,
-	CheckStatus: true,
-}
-
-func init() {
-	op.RegisterDriver(func() driver.Driver {
-		return &AzureBlob{
-			config: config,
-		}
-	})
-}

drivers/azure_blob/types.go

@@ -1,20 +0,0 @@
-package azure_blob
-
-import "github.com/alist-org/alist/v3/internal/driver"
-
-// progressTracker is used to track upload progress
-type progressTracker struct {
-	total          int64
-	current        int64
-	updateProgress driver.UpdateProgress
-}
-
-// Write implements io.Writer to track progress
-func (pt *progressTracker) Write(p []byte) (n int, err error) {
-	n = len(p)
-	pt.current += int64(n)
-	if pt.updateProgress != nil && pt.total > 0 {
-		pt.updateProgress(float64(pt.current) * 100 / float64(pt.total))
-	}
-	return n, nil
-}

drivers/azure_blob/util.go

@@ -1,401 +0,0 @@
-package azure_blob
-
-import (
-	"bytes"
-	"context"
-	"errors"
-	"fmt"
-	"io"
-	"path"
-	"sort"
-	"strings"
-	"time"
-
-	"github.com/Azure/azure-sdk-for-go/sdk/azcore"
-	"github.com/Azure/azure-sdk-for-go/sdk/azcore/to"
-	"github.com/Azure/azure-sdk-for-go/sdk/storage/azblob"
-	"github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/blockblob"
-	"github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/container"
-	"github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/sas"
-	"github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/service"
-	log "github.com/sirupsen/logrus"
-)
-
-const (
-	// MaxRetries defines the maximum number of retry attempts for Azure operations
-	MaxRetries = 3
-	// RetryDelay defines the base delay between retries
-	RetryDelay = 3 * time.Second
-	// MaxBatchSize defines the maximum number of operations in a single batch request
-	MaxBatchSize = 128
-)
-
-// extractAccountName 从 Azure 存储 Endpoint 中提取账户名
-func extractAccountName(endpoint string) string {
-	// 移除协议前缀
-	endpoint = strings.TrimPrefix(endpoint, "https://")
-	endpoint = strings.TrimPrefix(endpoint, "http://")
-
-	// 获取第一个点之前的部分（即账户名）
-	parts := strings.Split(endpoint, ".")
-	if len(parts) > 0 {
-		// to lower case
-		return strings.ToLower(parts[0])
-	}
-	return ""
-}
-
-// isNotFoundError checks if the error is a "not found" type error
-func isNotFoundError(err error) bool {
-	var storageErr *azcore.ResponseError
-	if errors.As(err, &storageErr) {
-		return storageErr.StatusCode == 404
-	}
-	// Fallback to string matching for backwards compatibility
-	return err != nil && strings.Contains(err.Error(), "BlobNotFound")
-}
-
-// flattenListBlobs - Optimize blob listing to handle pagination better
-func (d *AzureBlob) flattenListBlobs(ctx context.Context, prefix string) ([]container.BlobItem, error) {
-	// Standardize prefix format
-	prefix = ensureTrailingSlash(prefix)
-
-	var blobItems []container.BlobItem
-	pager := d.containerClient.NewListBlobsFlatPager(&container.ListBlobsFlatOptions{
-		Prefix: &prefix,
-		Include: container.ListBlobsInclude{
-			Metadata: true,
-		},
-	})
-
-	for pager.More() {
-		page, err := pager.NextPage(ctx)
-		if err != nil {
-			return nil, fmt.Errorf("failed to list blobs: %w", err)
-		}
-
-		for _, blob := range page.Segment.BlobItems {
-			blobItems = append(blobItems, *blob)
-		}
-	}
-
-	return blobItems, nil
-}
-
-// batchDeleteBlobs - Simplify batch deletion logic
-func (d *AzureBlob) batchDeleteBlobs(ctx context.Context, blobPaths []string) error {
-	if len(blobPaths) == 0 {
-		return nil
-	}
-
-	// Process in batches of MaxBatchSize
-	for i := 0; i < len(blobPaths); i += MaxBatchSize {
-		end := min(i+MaxBatchSize, len(blobPaths))
-		currentBatch := blobPaths[i:end]
-
-		// Create batch builder
-		batchBuilder, err := d.containerClient.NewBatchBuilder()
-		if err != nil {
-			return fmt.Errorf("failed to create batch builder: %w", err)
-		}
-
-		// Add delete operations
-		for _, blobPath := range currentBatch {
-			if err := batchBuilder.Delete(blobPath, nil); err != nil {
-				return fmt.Errorf("failed to add delete operation for %s: %w", blobPath, err)
-			}
-		}
-
-		// Submit batch
-		responses, err := d.containerClient.SubmitBatch(ctx, batchBuilder, nil)
-		if err != nil {
-			return fmt.Errorf("batch delete request failed: %w", err)
-		}
-
-		// Check responses
-		for _, resp := range responses.Responses {
-			if resp.Error != nil && !isNotFoundError(resp.Error) {
-				// 获取 blob 名称以提供更好的错误信息
-				blobName := "unknown"
-				if resp.BlobName != nil {
-					blobName = *resp.BlobName
-				}
-				return fmt.Errorf("failed to delete blob %s: %v", blobName, resp.Error)
-			}
-		}
-	}
-
-	return nil
-}
-
-// deleteFolder recursively deletes a directory and all its contents
-func (d *AzureBlob) deleteFolder(ctx context.Context, prefix string) error {
-	// Ensure directory path ends with slash
-	prefix = ensureTrailingSlash(prefix)
-
-	// Get all blobs under the directory using flattenListBlobs
-	globs, err := d.flattenListBlobs(ctx, prefix)
-	if err != nil {
-		return fmt.Errorf("failed to list blobs for deletion: %w", err)
-	}
-
-	// If there are blobs in the directory, delete them
-	if len(globs) > 0 {
-		// 分离文件和目录标记
-		var filePaths []string
-		var dirPaths []string
-
-		for _, blob := range globs {
-			blobName := *blob.Name
-			if isDirectory(blob) {
-				// remove trailing slash for directory names
-				dirPaths = append(dirPaths, strings.TrimSuffix(blobName, "/"))
-			} else {
-				filePaths = append(filePaths, blobName)
-			}
-		}
-
-		// 先删除文件，再删除目录
-		if len(filePaths) > 0 {
-			if err := d.batchDeleteBlobs(ctx, filePaths); err != nil {
-				return err
-			}
-		}
-		if len(dirPaths) > 0 {
-			// 按路径深度分组
-			depthMap := make(map[int][]string)
-			for _, dir := range dirPaths {
-				depth := strings.Count(dir, "/") // 计算目录深度
-				depthMap[depth] = append(depthMap[depth], dir)
-			}
-
-			// 按深度从大到小排序
-			var depths []int
-			for depth := range depthMap {
-				depths = append(depths, depth)
-			}
-			sort.Sort(sort.Reverse(sort.IntSlice(depths)))
-
-			// 按深度逐层批量删除
-			for _, depth := range depths {
-				batch := depthMap[depth]
-				if err := d.batchDeleteBlobs(ctx, batch); err != nil {
-					return err
-				}
-			}
-		}
-	}
-
-	// 最后删除目录标记本身
-	return d.deleteEmptyDirectory(ctx, prefix)
-}
-
-// deleteFile deletes a single file or blob with better error handling
-func (d *AzureBlob) deleteFile(ctx context.Context, path string, isDir bool) error {
-	blobClient := d.containerClient.NewBlobClient(path)
-	_, err := blobClient.Delete(ctx, nil)
-	if err != nil && !(isDir && isNotFoundError(err)) {
-		return err
-	}
-	return nil
-}
-
-// copyFile copies a single blob from source path to destination path
-func (d *AzureBlob) copyFile(ctx context.Context, srcPath, dstPath string) error {
-	srcBlob := d.containerClient.NewBlobClient(srcPath)
-	dstBlob := d.containerClient.NewBlobClient(dstPath)
-
-	// Use configured expiration time for SAS URL
-	expireDuration := time.Hour * time.Duration(d.SignURLExpire)
-	srcURL, err := srcBlob.GetSASURL(sas.BlobPermissions{Read: true}, time.Now().Add(expireDuration), nil)
-	if err != nil {
-		return fmt.Errorf("failed to generate source SAS URL: %w", err)
-	}
-
-	_, err = dstBlob.StartCopyFromURL(ctx, srcURL, nil)
-	return err
-
-}
-
-// createContainerIfNotExists - Create container if not exists
-// Clean up commented code
-func (d *AzureBlob) createContainerIfNotExists(ctx context.Context, containerName string) error {
-	serviceClient := d.client.ServiceClient()
-	containerClient := serviceClient.NewContainerClient(containerName)
-
-	var options = service.CreateContainerOptions{}
-	_, err := containerClient.Create(ctx, &options)
-	if err != nil {
-		var responseErr *azcore.ResponseError
-		if errors.As(err, &responseErr) && responseErr.ErrorCode != "ContainerAlreadyExists" {
-			return fmt.Errorf("failed to create or access container [%s]: %w", containerName, err)
-		}
-	}
-
-	d.containerClient = containerClient
-	return nil
-}
-
-// mkDir creates a virtual directory marker by uploading an empty blob with metadata.
-func (d *AzureBlob) mkDir(ctx context.Context, fullDirName string) error {
-	dirPath := ensureTrailingSlash(fullDirName)
-	blobClient := d.containerClient.NewBlockBlobClient(dirPath)
-
-	// Upload an empty blob with metadata indicating it's a directory
-	_, err := blobClient.Upload(ctx, struct {
-		*bytes.Reader
-		io.Closer
-	}{
-		Reader: bytes.NewReader([]byte{}),
-		Closer: io.NopCloser(nil),
-	}, &blockblob.UploadOptions{
-		Metadata: map[string]*string{
-			"hdi_isfolder": to.Ptr("true"),
-		},
-	})
-	return err
-}
-
-// ensureTrailingSlash ensures the provided path ends with a trailing slash.
-func ensureTrailingSlash(path string) string {
-	if !strings.HasSuffix(path, "/") {
-		return path + "/"
-	}
-	return path
-}
-
-// moveOrRename moves or renames blobs or directories from source to destination.
-func (d *AzureBlob) moveOrRename(ctx context.Context, srcPath, dstPath string, isDir bool, srcSize int64) error {
-	if isDir {
-		// Normalize paths for directory operations
-		srcPath = ensureTrailingSlash(srcPath)
-		dstPath = ensureTrailingSlash(dstPath)
-
-		// List all blobs under the source directory
-		blobs, err := d.flattenListBlobs(ctx, srcPath)
-		if err != nil {
-			return fmt.Errorf("failed to list blobs: %w", err)
-		}
-
-		// Iterate and copy each blob to the destination
-		for _, item := range blobs {
-			srcBlobName := *item.Name
-			relPath := strings.TrimPrefix(srcBlobName, srcPath)
-			itemDstPath := path.Join(dstPath, relPath)
-
-			if isDirectory(item) {
-				// Create directory marker at destination
-				if err := d.mkDir(ctx, itemDstPath); err != nil {
-					return fmt.Errorf("failed to create directory marker [%s]: %w", itemDstPath, err)
-				}
-			} else {
-				// Copy file blob to destination
-				if err := d.copyFile(ctx, srcBlobName, itemDstPath); err != nil {
-					return fmt.Errorf("failed to copy blob [%s]: %w", srcBlobName, err)
-				}
-			}
-		}
-
-		// Handle empty directories by creating a marker at destination
-		if len(blobs) == 0 {
-			if err := d.mkDir(ctx, dstPath); err != nil {
-				return fmt.Errorf("failed to create directory [%s]: %w", dstPath, err)
-			}
-		}
-
-		// Delete source directory and its contents
-		if err := d.deleteFolder(ctx, srcPath); err != nil {
-			log.Warnf("failed to delete source directory [%s]: %v\n, and try again", srcPath, err)
-			// Retry deletion once more and ignore the result
-			if err := d.deleteFolder(ctx, srcPath); err != nil {
-				log.Errorf("Retry deletion of source directory [%s] failed: %v", srcPath, err)
-			}
-		}
-
-		return nil
-	}
-
-	// Single file move or rename operation
-	if err := d.copyFile(ctx, srcPath, dstPath); err != nil {
-		return fmt.Errorf("failed to copy file: %w", err)
-	}
-
-	// Delete source file after successful copy
-	if err := d.deleteFile(ctx, srcPath, false); err != nil {
-		log.Errorf("Error deleting source file [%s]: %v", srcPath, err)
-	}
-	return nil
-}
-
-// optimizedUploadOptions returns the optimal upload options based on file size
-func optimizedUploadOptions(fileSize int64) *azblob.UploadStreamOptions {
-	options := &azblob.UploadStreamOptions{
-		BlockSize:   4 * 1024 * 1024, // 4MB block size
-		Concurrency: 4,               // Default concurrency
-	}
-
-	// For large files, increase block size and concurrency
-	if fileSize > 256*1024*1024 { // For files larger than 256MB
-		options.BlockSize = 8 * 1024 * 1024 // 8MB blocks
-		options.Concurrency = 8             // More concurrent uploads
-	}
-
-	// For very large files (>1GB)
-	if fileSize > 1024*1024*1024 {
-		options.BlockSize = 16 * 1024 * 1024 // 16MB blocks
-		options.Concurrency = 16             // Higher concurrency
-	}
-
-	return options
-}
-
-// isDirectory determines if a blob represents a directory
-// Checks multiple indicators: path suffix, metadata, and content type
-func isDirectory(blob container.BlobItem) bool {
-	// Check path suffix
-	if strings.HasSuffix(*blob.Name, "/") {
-		return true
-	}
-
-	// Check metadata for directory marker
-	if blob.Metadata != nil {
-		if val, ok := blob.Metadata["hdi_isfolder"]; ok && val != nil && *val == "true" {
-			return true
-		}
-		// Azure Storage Explorer and other tools may use different metadata keys
-		if val, ok := blob.Metadata["is_directory"]; ok && val != nil && strings.ToLower(*val) == "true" {
-			return true
-		}
-	}
-
-	// Check content type (some tools mark directories with specific content types)
-	if blob.Properties != nil && blob.Properties.ContentType != nil {
-		contentType := strings.ToLower(*blob.Properties.ContentType)
-		if blob.Properties.ContentLength != nil && *blob.Properties.ContentLength == 0 && (contentType == "application/directory" || contentType == "directory") {
-			return true
-		}
-	}
-
-	return false
-}
-
-// deleteEmptyDirectory deletes a directory only if it's empty
-func (d *AzureBlob) deleteEmptyDirectory(ctx context.Context, dirPath string) error {
-	// Directory is empty, delete the directory marker
-	blobClient := d.containerClient.NewBlobClient(strings.TrimSuffix(dirPath, "/"))
-	_, err := blobClient.Delete(ctx, nil)
-
-	// Also try deleting with trailing slash (for different directory marker formats)
-	if err != nil && isNotFoundError(err) {
-		blobClient = d.containerClient.NewBlobClient(dirPath)
-		_, err = blobClient.Delete(ctx, nil)
-	}
-
-	// Ignore not found errors
-	if err != nil && isNotFoundError(err) {
-		log.Infof("Directory [%s] not found during deletion: %v", dirPath, err)
-		return nil
-	}
-
-	return err
-}

drivers/baidu_netdisk/driver.go

@@ -1,35 +1,28 @@
 package baidu_netdisk
 
 import (
+	"bytes"
 	"context"
 	"crypto/md5"
 	"encoding/hex"
-	"errors"
+	"fmt"
 	"io"
 	"math"
-	"net/url"
+	"os"
 	stdpath "path"
 	"strconv"
-	"time"
+	"strings"
-
-	"golang.org/x/sync/semaphore"
 
 	"github.com/alist-org/alist/v3/drivers/base"
 	"github.com/alist-org/alist/v3/internal/driver"
-	"github.com/alist-org/alist/v3/internal/errs"
 	"github.com/alist-org/alist/v3/internal/model"
-	"github.com/alist-org/alist/v3/pkg/errgroup"
 	"github.com/alist-org/alist/v3/pkg/utils"
-	"github.com/avast/retry-go"
 	log "github.com/sirupsen/logrus"
 )
 
 type BaiduNetdisk struct {
 	model.Storage
 	Addition
-
-	uploadThread int
-	vipType      int // 会员类型，0普通用户(4G/4M)、1普通会员(10G/16M)、2超级会员(20G/32M)
 }
 
 func (d *BaiduNetdisk) Config() driver.Config {
@@ -41,24 +34,11 @@ func (d *BaiduNetdisk) GetAddition() driver.Additional {
 }
 
 func (d *BaiduNetdisk) Init(ctx context.Context) error {
-	d.uploadThread, _ = strconv.Atoi(d.UploadThread)
-	if d.uploadThread < 1 || d.uploadThread > 32 {
-		d.uploadThread, d.UploadThread = 3, "3"
-	}
-
-	if _, err := url.Parse(d.UploadAPI); d.UploadAPI == "" || err != nil {
-		d.UploadAPI = "https://d.pcs.baidu.com"
-	}
-
 	res, err := d.get("/xpan/nas", map[string]string{
 		"method": "uinfo",
 	}, nil)
 	log.Debugf("[baidu] get uinfo: %s", string(res))
-	if err != nil {
+	return err
-		return err
-	}
-	d.vipType = utils.Json.Get(res, "vip_type").ToInt()
-	return nil
 }
 
 func (d *BaiduNetdisk) Drop(ctx context.Context) error {
@@ -78,22 +58,16 @@ func (d *BaiduNetdisk) List(ctx context.Context, dir model.Obj, args model.ListA
 func (d *BaiduNetdisk) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
 	if d.DownloadAPI == "crack" {
 		return d.linkCrack(file, args)
-	} else if d.DownloadAPI == "crack_video" {
-		return d.linkCrackVideo(file, args)
 	}
 	return d.linkOfficial(file, args)
 }
 
-func (d *BaiduNetdisk) MakeDir(ctx context.Context, parentDir model.Obj, dirName string) (model.Obj, error) {
+func (d *BaiduNetdisk) MakeDir(ctx context.Context, parentDir model.Obj, dirName string) error {
-	var newDir File
+	_, err := d.create(stdpath.Join(parentDir.GetPath(), dirName), 0, 1, "", "")
-	_, err := d.create(stdpath.Join(parentDir.GetPath(), dirName), 0, 1, "", "", &newDir, 0, 0)
+	return err
-	if err != nil {
-		return nil, err
-	}
-	return fileToObj(newDir), nil
 }
 
-func (d *BaiduNetdisk) Move(ctx context.Context, srcObj, dstDir model.Obj) (model.Obj, error) {
+func (d *BaiduNetdisk) Move(ctx context.Context, srcObj, dstDir model.Obj) error {
 	data := []base.Json{
 		{
 			"path":    srcObj.GetPath(),
@@ -102,18 +76,10 @@ func (d *BaiduNetdisk) Move(ctx context.Context, srcObj, dstDir model.Obj) (mode
 		},
 	}
 	_, err := d.manage("move", data)
-	if err != nil {
+	return err
-		return nil, err
-	}
-	if srcObj, ok := srcObj.(*model.ObjThumb); ok {
-		srcObj.SetPath(stdpath.Join(dstDir.GetPath(), srcObj.GetName()))
-		srcObj.Modified = time.Now()
-		return srcObj, nil
-	}
-	return nil, nil
 }
 
-func (d *BaiduNetdisk) Rename(ctx context.Context, srcObj model.Obj, newName string) (model.Obj, error) {
+func (d *BaiduNetdisk) Rename(ctx context.Context, srcObj model.Obj, newName string) error {
 	data := []base.Json{
 		{
 			"path":    srcObj.GetPath(),
@@ -121,17 +87,7 @@ func (d *BaiduNetdisk) Rename(ctx context.Context, srcObj model.Obj, newName str
 		},
 	}
 	_, err := d.manage("rename", data)
-	if err != nil {
+	return err
-		return nil, err
-	}
-
-	if srcObj, ok := srcObj.(*model.ObjThumb); ok {
-		srcObj.SetPath(stdpath.Join(stdpath.Dir(srcObj.GetPath()), newName))
-		srcObj.Name = newName
-		srcObj.Modified = time.Now()
-		return srcObj, nil
-	}
-	return nil, nil
 }
 
 func (d *BaiduNetdisk) Copy(ctx context.Context, srcObj, dstDir model.Obj) error {
@@ -152,191 +108,126 @@ func (d *BaiduNetdisk) Remove(ctx context.Context, obj model.Obj) error {
 	return err
 }
 
-func (d *BaiduNetdisk) PutRapid(ctx context.Context, dstDir model.Obj, stream model.FileStreamer) (model.Obj, error) {
+func (d *BaiduNetdisk) Put(ctx context.Context, dstDir model.Obj, stream model.FileStreamer, up driver.UpdateProgress) error {
-	contentMd5 := stream.GetHash().GetHash(utils.MD5)
+	tempFile, err := utils.CreateTempFile(stream.GetReadCloser())
-	if len(contentMd5) < utils.MD5.Width {
-		return nil, errors.New("invalid hash")
-	}
-
-	streamSize := stream.GetSize()
-	path := stdpath.Join(dstDir.GetPath(), stream.GetName())
-	mtime := stream.ModTime().Unix()
-	ctime := stream.CreateTime().Unix()
-	blockList, _ := utils.Json.MarshalToString([]string{contentMd5})
-
-	var newFile File
-	_, err := d.create(path, streamSize, 0, "", blockList, &newFile, mtime, ctime)
-	if err != nil {
-		return nil, err
-	}
-	// 修复时间，具体原因见 Put 方法注释的 **注意**
-	newFile.Ctime = stream.CreateTime().Unix()
-	newFile.Mtime = stream.ModTime().Unix()
-	return fileToObj(newFile), nil
-}
-
-// Put
-//
-// **注意**: 截至 2024/04/20 百度云盘 api 接口返回的时间永远是当前时间，而不是文件时间。
-// 而实际上云盘存储的时间是文件时间，所以此处需要覆盖时间，保证缓存与云盘的数据一致
-func (d *BaiduNetdisk) Put(ctx context.Context, dstDir model.Obj, stream model.FileStreamer, up driver.UpdateProgress) (model.Obj, error) {
-	// rapid upload
-	if newObj, err := d.PutRapid(ctx, dstDir, stream); err == nil {
-		return newObj, nil
-	}
-
-	tempFile, err := stream.CacheFullInTempFile()
-	if err != nil {
-		return nil, err
-	}
-
-	streamSize := stream.GetSize()
-	sliceSize := d.getSliceSize(streamSize)
-	count := int(math.Max(math.Ceil(float64(streamSize)/float64(sliceSize)), 1))
-	lastBlockSize := streamSize % sliceSize
-	if streamSize > 0 && lastBlockSize == 0 {
-		lastBlockSize = sliceSize
-	}
-
-	//cal md5 for first 256k data
-	const SliceSize int64 = 256 * utils.KB
-	// cal md5
-	blockList := make([]string, 0, count)
-	byteSize := sliceSize
-	fileMd5H := md5.New()
-	sliceMd5H := md5.New()
-	sliceMd5H2 := md5.New()
-	slicemd5H2Write := utils.LimitWriter(sliceMd5H2, SliceSize)
-
-	for i := 1; i <= count; i++ {
-		if utils.IsCanceled(ctx) {
-			return nil, ctx.Err()
-		}
-		if i == count {
-			byteSize = lastBlockSize
-		}
-		_, err := utils.CopyWithBufferN(io.MultiWriter(fileMd5H, sliceMd5H, slicemd5H2Write), tempFile, byteSize)
-		if err != nil && err != io.EOF {
-			return nil, err
-		}
-		blockList = append(blockList, hex.EncodeToString(sliceMd5H.Sum(nil)))
-		sliceMd5H.Reset()
-	}
-	contentMd5 := hex.EncodeToString(fileMd5H.Sum(nil))
-	sliceMd5 := hex.EncodeToString(sliceMd5H2.Sum(nil))
-	blockListStr, _ := utils.Json.MarshalToString(blockList)
-	path := stdpath.Join(dstDir.GetPath(), stream.GetName())
-	mtime := stream.ModTime().Unix()
-	ctime := stream.CreateTime().Unix()
-
-	// step.1 预上传
-	// 尝试获取之前的进度
-	precreateResp, ok := base.GetUploadProgress[*PrecreateResp](d, d.AccessToken, contentMd5)
-	if !ok {
-		params := map[string]string{
-			"method": "precreate",
-		}
-		form := map[string]string{
-			"path":        path,
-			"size":        strconv.FormatInt(streamSize, 10),
-			"isdir":       "0",
-			"autoinit":    "1",
-			"rtype":       "3",
-			"block_list":  blockListStr,
-			"content-md5": contentMd5,
-			"slice-md5":   sliceMd5,
-		}
-		joinTime(form, ctime, mtime)
-
-		log.Debugf("[baidu_netdisk] precreate data: %s", form)
-		_, err = d.postForm("/xpan/file", params, form, &precreateResp)
-		if err != nil {
-			return nil, err
-		}
-		log.Debugf("%+v", precreateResp)
-		if precreateResp.ReturnType == 2 {
-			//rapid upload, since got md5 match from baidu server
-			// 修复时间，具体原因见 Put 方法注释的 **注意**
-			precreateResp.File.Ctime = ctime
-			precreateResp.File.Mtime = mtime
-			return fileToObj(precreateResp.File), nil
-		}
-	}
-	// step.2 上传分片
-	threadG, upCtx := errgroup.NewGroupWithContext(ctx, d.uploadThread,
-		retry.Attempts(1),
-		retry.Delay(time.Second),
-		retry.DelayType(retry.BackOffDelay))
-	sem := semaphore.NewWeighted(3)
-	for i, partseq := range precreateResp.BlockList {
-		if utils.IsCanceled(upCtx) {
-			break
-		}
-
-		i, partseq, offset, byteSize := i, partseq, int64(partseq)*sliceSize, sliceSize
-		if partseq+1 == count {
-			byteSize = lastBlockSize
-		}
-		threadG.Go(func(ctx context.Context) error {
-			if err = sem.Acquire(ctx, 1); err != nil {
-				return err
-			}
-			defer sem.Release(1)
-			params := map[string]string{
-				"method":       "upload",
-				"access_token": d.AccessToken,
-				"type":         "tmpfile",
-				"path":         path,
-				"uploadid":     precreateResp.Uploadid,
-				"partseq":      strconv.Itoa(partseq),
-			}
-			err := d.uploadSlice(ctx, params, stream.GetName(),
-				driver.NewLimitedUploadStream(ctx, io.NewSectionReader(tempFile, offset, byteSize)))
-			if err != nil {
-				return err
-			}
-			up(float64(threadG.Success()) * 100 / float64(len(precreateResp.BlockList)))
-			precreateResp.BlockList[i] = -1
-			return nil
-		})
-	}
-	if err = threadG.Wait(); err != nil {
-		// 如果属于用户主动取消，则保存上传进度
-		if errors.Is(err, context.Canceled) {
-			precreateResp.BlockList = utils.SliceFilter(precreateResp.BlockList, func(s int) bool { return s >= 0 })
-			base.SaveUploadProgress(d, precreateResp, d.AccessToken, contentMd5)
-		}
-		return nil, err
-	}
-
-	// step.3 创建文件
-	var newFile File
-	_, err = d.create(path, streamSize, 0, precreateResp.Uploadid, blockListStr, &newFile, mtime, ctime)
-	if err != nil {
-		return nil, err
-	}
-	// 修复时间，具体原因见 Put 方法注释的 **注意**
-	newFile.Ctime = ctime
-	newFile.Mtime = mtime
-	return fileToObj(newFile), nil
-}
-
-func (d *BaiduNetdisk) uploadSlice(ctx context.Context, params map[string]string, fileName string, file io.Reader) error {
-	res, err := base.RestyClient.R().
-		SetContext(ctx).
-		SetQueryParams(params).
-		SetFileReader("file", fileName, file).
-		Post(d.UploadAPI + "/rest/2.0/pcs/superfile2")
 	if err != nil {
 		return err
 	}
-	log.Debugln(res.RawResponse.Status + res.String())
+	defer func() {
-	errCode := utils.Json.Get(res.Body(), "error_code").ToInt()
+		_ = tempFile.Close()
-	errNo := utils.Json.Get(res.Body(), "errno").ToInt()
+		_ = os.Remove(tempFile.Name())
-	if errCode != 0 || errNo != 0 {
+	}()
-		return errs.NewErr(errs.StreamIncomplete, "error in uploading to baidu, will retry. response=%s", res.String())
+	var Default int64 = 4 * 1024 * 1024
+	defaultByteData := make([]byte, Default)
+	count := int(math.Ceil(float64(stream.GetSize()) / float64(Default)))
+	var SliceSize int64 = 256 * 1024
+	// cal md5
+	h1 := md5.New()
+	h2 := md5.New()
+	block_list := make([]string, 0)
+	content_md5 := ""
+	slice_md5 := ""
+	left := stream.GetSize()
+	for i := 0; i < count; i++ {
+		byteSize := Default
+		var byteData []byte
+		if left < Default {
+			byteSize = left
+			byteData = make([]byte, byteSize)
+		} else {
+			byteData = defaultByteData
+		}
+		left -= byteSize
+		_, err = io.ReadFull(tempFile, byteData)
+		if err != nil {
+			return err
+		}
+		h1.Write(byteData)
+		h2.Write(byteData)
+		block_list = append(block_list, fmt.Sprintf("\"%s\"", hex.EncodeToString(h2.Sum(nil))))
+		h2.Reset()
 	}
-	return nil
+	content_md5 = hex.EncodeToString(h1.Sum(nil))
+	_, err = tempFile.Seek(0, io.SeekStart)
+	if err != nil {
+		return err
+	}
+	if stream.GetSize() <= SliceSize {
+		slice_md5 = content_md5
+	} else {
+		sliceData := make([]byte, SliceSize)
+		_, err = io.ReadFull(tempFile, sliceData)
+		if err != nil {
+			return err
+		}
+		h2.Write(sliceData)
+		slice_md5 = hex.EncodeToString(h2.Sum(nil))
+		_, err = tempFile.Seek(0, io.SeekStart)
+		if err != nil {
+			return err
+		}
+	}
+	rawPath := stdpath.Join(dstDir.GetPath(), stream.GetName())
+	path := encodeURIComponent(rawPath)
+	block_list_str := fmt.Sprintf("[%s]", strings.Join(block_list, ","))
+	data := fmt.Sprintf("path=%s&size=%d&isdir=0&autoinit=1&block_list=%s&content-md5=%s&slice-md5=%s",
+		path, stream.GetSize(),
+		block_list_str,
+		content_md5, slice_md5)
+	params := map[string]string{
+		"method": "precreate",
+	}
+	var precreateResp PrecreateResp
+	_, err = d.post("/xpan/file", params, data, &precreateResp)
+	if err != nil {
+		return err
+	}
+	log.Debugf("%+v", precreateResp)
+	if precreateResp.ReturnType == 2 {
+		return nil
+	}
+	params = map[string]string{
+		"method":       "upload",
+		"access_token": d.AccessToken,
+		"type":         "tmpfile",
+		"path":         path,
+		"uploadid":     precreateResp.Uploadid,
+	}
+	left = stream.GetSize()
+	for i, partseq := range precreateResp.BlockList {
+		if utils.IsCanceled(ctx) {
+			return ctx.Err()
+		}
+		byteSize := Default
+		var byteData []byte
+		if left < Default {
+			byteSize = left
+			byteData = make([]byte, byteSize)
+		} else {
+			byteData = defaultByteData
+		}
+		left -= byteSize
+		_, err = io.ReadFull(tempFile, byteData)
+		if err != nil {
+			return err
+		}
+		u := "https://d.pcs.baidu.com/rest/2.0/pcs/superfile2"
+		params["partseq"] = strconv.Itoa(partseq)
+		res, err := base.RestyClient.R().
+			SetContext(ctx).
+			SetQueryParams(params).
+			SetFileReader("file", stream.GetName(), bytes.NewReader(byteData)).
+			Post(u)
+		if err != nil {
+			return err
+		}
+		log.Debugln(res.String())
+		if len(precreateResp.BlockList) > 0 {
+			up(i * 100 / len(precreateResp.BlockList))
+		}
+	}
+	_, err = d.create(rawPath, stream.GetSize(), 0, precreateResp.Uploadid, block_list_str)
+	return err
 }
 
 var _ driver.Driver = (*BaiduNetdisk)(nil)

drivers/baidu_netdisk/meta.go

@@ -8,18 +8,13 @@ import (
 type Addition struct {
 	RefreshToken string `json:"refresh_token" required:"true"`
 	driver.RootPath
-	OrderBy               string `json:"order_by" type:"select" options:"name,time,size" default:"name"`
+	OrderBy        string `json:"order_by" type:"select" options:"name,time,size" default:"name"`
-	OrderDirection        string `json:"order_direction" type:"select" options:"asc,desc" default:"asc"`
+	OrderDirection string `json:"order_direction" type:"select" options:"asc,desc" default:"asc"`
-	DownloadAPI           string `json:"download_api" type:"select" options:"official,crack,crack_video" default:"official"`
+	DownloadAPI    string `json:"download_api" type:"select" options:"official,crack" default:"official"`
-	ClientID              string `json:"client_id" required:"true" default:"iYCeC9g08h5vuP9UqvPHKKSVrKFXGa1v"`
+	ClientID       string `json:"client_id" required:"true" default:"iYCeC9g08h5vuP9UqvPHKKSVrKFXGa1v"`
-	ClientSecret          string `json:"client_secret" required:"true" default:"jXiFMOPVPCWlO2M5CwWQzffpNPaGTRBG"`
+	ClientSecret   string `json:"client_secret" required:"true" default:"jXiFMOPVPCWlO2M5CwWQzffpNPaGTRBG"`
-	CustomCrackUA         string `json:"custom_crack_ua" required:"true" default:"netdisk"`
+	CustomCrackUA  string `json:"custom_crack_ua" required:"true" default:"netdisk"`
-	AccessToken           string
+	AccessToken    string
-	UploadThread          string `json:"upload_thread" default:"3" help:"1<=thread<=32"`
-	UploadAPI             string `json:"upload_api" default:"https://d.pcs.baidu.com"`
-	CustomUploadPartSize  int64  `json:"custom_upload_part_size" type:"number" default:"0" help:"0 for auto"`
-	LowBandwithUploadMode bool   `json:"low_bandwith_upload_mode" default:"false"`
-	OnlyListVideoFile     bool   `json:"only_list_video_file" default:"false"`
 }
 
 var config = driver.Config{

drivers/baidu_netdisk/types.go

@@ -1,12 +1,10 @@
 package baidu_netdisk
 
 import (
-	"path"
 	"strconv"
 	"time"
 
 	"github.com/alist-org/alist/v3/internal/model"
-	"github.com/alist-org/alist/v3/pkg/utils"
 )
 
 type TokenErrResp struct {
@@ -17,10 +15,12 @@ type TokenErrResp struct {
 type File struct {
 	//TkbindId     int    `json:"tkbind_id"`
 	//OwnerType    int    `json:"owner_type"`
-	Category int `json:"category"`
+	//Category     int    `json:"category"`
 	//RealCategory string `json:"real_category"`
-	FsId int64 `json:"fs_id"`
+	FsId        int64 `json:"fs_id"`
+	ServerMtime int64 `json:"server_mtime"`
 	//OperId      int   `json:"oper_id"`
+	//ServerCtime int   `json:"server_ctime"`
 	Thumbs struct {
 		//Icon string `json:"icon"`
 		Url3 string `json:"url3"`
@@ -28,52 +28,29 @@ type File struct {
 		//Url1 string `json:"url1"`
 	} `json:"thumbs"`
 	//Wpfile         int    `json:"wpfile"`
-
+	//LocalMtime     int    `json:"local_mtime"`
 	Size int64 `json:"size"`
 	//ExtentTinyint7 int    `json:"extent_tinyint7"`
 	Path string `json:"path"`
 	//Share          int    `json:"share"`
+	//ServerAtime    int    `json:"server_atime"`
 	//Pl             int    `json:"pl"`
+	//LocalCtime     int    `json:"local_ctime"`
 	ServerFilename string `json:"server_filename"`
-	Md5            string `json:"md5"`
+	//Md5            string `json:"md5"`
 	//OwnerId        int    `json:"owner_id"`
 	//Unlist int `json:"unlist"`
 	Isdir int `json:"isdir"`
-
-	// list resp
-	ServerCtime int64 `json:"server_ctime"`
-	ServerMtime int64 `json:"server_mtime"`
-	LocalMtime  int64 `json:"local_mtime"`
-	LocalCtime  int64 `json:"local_ctime"`
-	//ServerAtime    int64    `json:"server_atime"` `
-
-	// only create and precreate resp
-	Ctime int64 `json:"ctime"`
-	Mtime int64 `json:"mtime"`
 }
 
 func fileToObj(f File) *model.ObjThumb {
-	if f.ServerFilename == "" {
-		f.ServerFilename = path.Base(f.Path)
-	}
-	if f.ServerCtime == 0 {
-		f.ServerCtime = f.Ctime
-	}
-	if f.ServerMtime == 0 {
-		f.ServerMtime = f.Mtime
-	}
 	return &model.ObjThumb{
 		Object: model.Object{
 			ID:       strconv.FormatInt(f.FsId, 10),
-			Path:     f.Path,
 			Name:     f.ServerFilename,
 			Size:     f.Size,
 			Modified: time.Unix(f.ServerMtime, 0),
-			Ctime:    time.Unix(f.ServerCtime, 0),
 			IsFolder: f.Isdir == 1,
-
-			// 直接获取的MD5是错误的
-			HashInfo: utils.NewHashInfo(utils.MD5, DecryptMd5(f.Md5)),
 		},
 		Thumbnail: model.Thumbnail{Thumbnail: f.Thumbs.Url3},
 	}
@@ -177,15 +154,10 @@ type DownloadResp2 struct {
 }
 
 type PrecreateResp struct {
-	Errno      int   `json:"errno"`
+	Path       string `json:"path"`
-	RequestId  int64 `json:"request_id"`
+	Uploadid   string `json:"uploadid"`
-	ReturnType int   `json:"return_type"`
+	ReturnType int    `json:"return_type"`
-
+	BlockList  []int  `json:"block_list"`
-	// return_type=1
+	Errno      int    `json:"errno"`
-	Path      string `json:"path"`
+	RequestId  int64  `json:"request_id"`
-	Uploadid  string `json:"uploadid"`
-	BlockList []int  `json:"block_list"`
-
-	// return_type=2
-	File File `json:"info"`
 }