fix(deps): update module github.com/go-webauthn/webauthn to v0.11.2

.github/workflows/beta_release.yml

@@ -8,9 +8,6 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
-permissions:
-  contents: write
-
 jobs:
   changelog:
     strategy:
@@ -32,17 +29,12 @@ jobs:
           ref: tags/beta
           sha: ${{ github.sha }}
 
-      - name: Delete beta tag
-        run: git tag -d beta
-        continue-on-error: true
-
       - name: changelog # or changelogithub@0.12 if ensure the stable result
         id: changelog
         run: |
           git tag -l
           npx changelogithub --output CHANGELOG.md
 #          npx changelogen@latest --output CHANGELOG.md
-
       - name: Upload assets
         uses: softprops/action-gh-release@v2
         with:
@@ -57,7 +49,7 @@ jobs:
     strategy:
       matrix:
         include:
-          - target: '!(*musl*|*windows-arm64*|*android*|*freebsd*)' # xgo
+          - target: '!(*musl*|*windows-arm64*|*android*)' # xgo
             hash: "md5"
           - target: 'linux-!(arm*)-musl*' #musl-not-arm
             hash: "md5-linux-musl"
@@ -67,9 +59,6 @@ jobs:
             hash: "md5-windows-arm64"
           - target: 'android-*' #android
             hash: "md5-android"
-          - target: 'freebsd-*' #freebsd
-            hash: "md5-freebsd"
-
     name: Beta Release
     runs-on: ubuntu-latest
     steps:
@@ -87,17 +76,12 @@ jobs:
         run: bash build.sh dev web
 
       - name: Build
+        id: test-action
         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: |
@@ -116,23 +100,14 @@ jobs:
     name: Beta Release Desktop
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout repo
-        uses: actions/checkout@v4
+      - uses: peter-evans/create-or-update-comment@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
+          issue-number: 69
+          body: |
+            /release-beta
+            - triggered by @${{ github.actor }}
+            - commit sha: ${{ github.sha }}
+            - view files: https://github.com/alist-org/alist/tree/${{ github.sha }}
+          reactions: 'rocket'
+          token: ${{ secrets.MY_TOKEN }}
           repository: alist-org/desktop-release

.github/workflows/build.yml

@@ -15,17 +15,14 @@ jobs:
     strategy:
       matrix:
         platform: [ubuntu-latest]
-        target: 
-          - darwin-amd64
-          - darwin-arm64
-          - windows-amd64
-          - linux-arm64-musl
-          - linux-amd64-musl
-          - windows-arm64
-          - android-arm64
+        go-version: [ '1.21' ]
     name: Build
     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
@@ -33,29 +30,19 @@ jobs:
       - uses: benjlevesque/short-sha@v3.0
         id: short-sha
 
-      - name: Setup Go
-        uses: actions/setup-go@v5
-        with:
-          go-version: '1.22'
-
-      - name: Setup web
-        run: bash build.sh dev web
+      - name: Install dependencies
+        run: |
+          sudo snap install zig --classic --beta
+          docker pull crazymax/xgo:latest
+          go install github.com/crazy-max/xgo@latest
+          sudo apt install upx
 
       - 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
+        run: |
+          bash build.sh dev
 
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:
-          name: alist_${{ env.SHA }}_${{ matrix.target }}
-          path: build/*
+          name: alist_${{ env.SHA }}
+          path: dist

.github/workflows/build_docker.yml

@@ -0,0 +1,126 @@
+name: build_docker
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  build_docker:
+    name: Build Docker
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: xhofe/alist
+          tags: |
+            type=schedule
+            type=ref,event=branch
+            type=ref,event=tag
+            type=ref,event=pr
+            type=raw,value=beta,enable={{is_default_branch}}
+
+      - name: Docker meta with ffmpeg
+        id: meta-ffmpeg
+        uses: docker/metadata-action@v5
+        with:
+          images: xhofe/alist
+          flavor: |
+            suffix=-ffmpeg
+          tags: |
+            type=schedule
+            type=ref,event=branch
+            type=ref,event=tag
+            type=ref,event=pr
+            type=raw,value=beta,enable={{is_default_branch}}
+
+      - 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
+
+      - name: Download Musl Library
+        if: steps.cache-musl.outputs.cache-hit != 'true'
+        run: bash build.sh prepare docker-multiplatform
+
+      - name: Build go binary
+        run: bash build.sh dev docker-multiplatform
+
+      - 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: github.event_name == 'push'
+        uses: docker/login-action@v3
+        with:
+          username: xhofe
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build and push
+        id: docker_build
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: Dockerfile.ci
+          push: ${{ github.event_name == 'push' }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/386,linux/arm/v6,linux/s390x
+
+      - name: Build and push with ffmpeg
+        id: docker_build_ffmpeg
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: Dockerfile.ci
+          push: ${{ github.event_name == 'push' }}
+          tags: ${{ steps.meta-ffmpeg.outputs.tags }}
+          labels: ${{ steps.meta-ffmpeg.outputs.labels }}
+          build-args: INSTALL_FFMPEG=true
+          platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/386,linux/arm/v6,linux/s390x
+
+  build_docker_with_aria2:
+    needs: build_docker
+    name: Build docker with aria2
+    runs-on: ubuntu-latest
+    if: github.event_name == 'push'
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v4
+        with:
+          repository: alist-org/with_aria2
+          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/with_aria2

.github/workflows/changelog.yml

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

.github/workflows/release.yml

@@ -13,23 +13,6 @@ jobs:
     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:

.github/workflows/release_docker.yml

@@ -4,34 +4,10 @@ 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
+  release_docker:
+    name: Release Docker
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -46,59 +22,20 @@ jobs:
         uses: actions/cache@v4
         with:
           path: build/musl-libs
-          key: docker-musl-libs-v2
+          key: docker-musl-libs
 
       - name: Download Musl Library
         if: steps.cache-musl.outputs.cache-hit != 'true'
         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'
+      - name: Build go binary
         run: bash build.sh release docker-multiplatform
 
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v4
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
         with:
-          name: ${{ env.ARTIFACT_NAME }}
-          overwrite: true
-          path: |
-            build/
-            !build/*.tgz
-            !build/musl-libs/**
-
-  release_docker:
-    needs: build_binary
-    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/download-artifact@v4
-        with:
-          name: ${{ env.ARTIFACT_NAME }}
-          path: 'build/'
+          images: xhofe/alist
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
@@ -107,22 +44,10 @@ jobs:
         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
-        with:
-          images: ${{ env.REGISTRY }}
-          tags: ${{ env.IMAGE_IS_PROD == 'true' && '' || env.IMAGE_TAGS_BETA }}
-          flavor: |
-            ${{ env.IMAGE_IS_PROD == 'true' && 'latest=true' || '' }}
-            ${{ matrix.tag_favor }}
+          username: xhofe
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Build and push
         id: docker_build
@@ -130,8 +55,54 @@ jobs:
         with:
           context: .
           file: Dockerfile.ci
-          push: ${{ env.IMAGE_PUSH == 'true' }}
-          build-args: ${{ matrix.build_arg }}
+          push: true
           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
+
+      - name: Docker meta with ffmpeg
+        id: meta-ffmpeg
+        uses: docker/metadata-action@v5
+        with:
+          images: xhofe/alist
+          flavor: |
+            latest=true
+            suffix=-ffmpeg,onlatest=true
+            
+      - name: Build and push with ffmpeg
+        id: docker_build_ffmpeg
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: Dockerfile.ci
+          push: true
+          tags: ${{ steps.meta-ffmpeg.outputs.tags }}
+          labels: ${{ steps.meta-ffmpeg.outputs.labels }}
+          build-args: INSTALL_FFMPEG=true
+          platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/386,linux/arm/v6,linux/s390x
+
+  release_docker_with_aria2:
+    needs: release_docker
+    name: Release docker with aria2
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v4
+        with:
+          repository: alist-org/with_aria2
+          ref: main
+          persist-credentials: false
+          fetch-depth: 0
+
+      - name: Add tag
+        run: |
+          git config --local user.email "bot@nn.ci"
+          git config --local user.name "IlaBot"
+          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/*

Dockerfile

@@ -10,7 +10,6 @@ RUN bash build.sh release docker
 FROM alpine:edge
 
 ARG INSTALL_FFMPEG=false
-ARG INSTALL_ARIA2=false
 LABEL MAINTAINER="i@nn.ci"
 
 WORKDIR /opt/alist/
@@ -19,25 +18,13 @@ 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 && \
-    chmod +x /entrypoint.sh && /entrypoint.sh version
+RUN chmod +x /entrypoint.sh && /entrypoint.sh version
 
-ENV PUID=0 PGID=0 UMASK=022 RUN_ARIA2=${INSTALL_ARIA2}
+ENV PUID=0 PGID=0 UMASK=022
 VOLUME /opt/alist/data/
 EXPOSE 5244 5245
 CMD [ "/entrypoint.sh" ]

Dockerfile.ci

@@ -2,7 +2,6 @@ FROM alpine:edge
 
 ARG TARGETPLATFORM
 ARG INSTALL_FFMPEG=false
-ARG INSTALL_ARIA2=false
 LABEL MAINTAINER="i@nn.ci"
 
 WORKDIR /opt/alist/
@@ -11,25 +10,13 @@ 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
+RUN chmod +x /entrypoint.sh && /entrypoint.sh version
 
-ENV PUID=0 PGID=0 UMASK=022 RUN_ARIA2=${INSTALL_ARIA2}
+ENV PUID=0 PGID=0 UMASK=022
 VOLUME /opt/alist/data/
 EXPOSE 5244 5245
 CMD [ "/entrypoint.sh" ]

README.md

@@ -39,7 +39,7 @@
 
 ---
 
-English | [中文](./README_cn.md) | [日本語](./README_ja.md) | [Contributing](./CONTRIBUTING.md) | [CODE_OF_CONDUCT](./CODE_OF_CONDUCT.md)
+English | [中文](./README_cn.md)| [日本語](./README_ja.md) | [Contributing](./CONTRIBUTING.md) | [CODE_OF_CONDUCT](./CODE_OF_CONDUCT.md)
 
 ## Features
 
@@ -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)
@@ -77,7 +77,6 @@ English | [中文](./README_cn.md) | [日本語](./README_ja.md) | [Contributing
     - [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
@@ -99,7 +98,7 @@ English | [中文](./README_cn.md) | [日本語](./README_ja.md) | [Contributing
 
 ## Document
 
-<https://alistgo.com/>
+<https://alist.nn.ci/>
 
 ## Demo
 
@@ -139,4 +138,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/alist-org) · [@TelegramGroup](https://t.me/alist_chat) · [@Discord](https://discord.gg/F4ymsH4xv2)

README_cn.md

@@ -58,7 +58,7 @@
     - [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)

README_ja.md

@@ -58,7 +58,7 @@
     - [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)

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' \
@@ -94,7 +92,7 @@ BuildDocker() {
 PrepareBuildDockerMusl() {
   mkdir -p build/musl-libs
   BASE="https://musl.cc/"
-  FILES=(x86_64-linux-musl-cross aarch64-linux-musl-cross i486-linux-musl-cross s390x-linux-musl-cross armv6-linux-musleabihf-cross armv7l-linux-musleabihf-cross riscv64-linux-musl-cross powerpc64le-linux-musl-cross)
+  FILES=(x86_64-linux-musl-cross aarch64-linux-musl-cross i486-linux-musl-cross s390x-linux-musl-cross armv6-linux-musleabihf-cross armv7l-linux-musleabihf-cross)
   for i in "${FILES[@]}"; do
     url="${BASE}${i}.tgz"
     lib_tgz="build/${i}.tgz"
@@ -113,8 +111,8 @@ BuildDockerMultiplatform() {
   docker_lflags="--extldflags '-static -fpic' $ldflags"
   export CGO_ENABLED=1
 
-  OS_ARCHES=(linux-amd64 linux-arm64 linux-386 linux-s390x linux-riscv64 linux-ppc64le)
-  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)
+  OS_ARCHES=(linux-amd64 linux-arm64 linux-386 linux-s390x)
+  CGO_ARGS=(x86_64-linux-musl-gcc aarch64-linux-musl-gcc i486-linux-musl-gcc s390x-linux-musl-gcc)
   for i in "${!OS_ARCHES[@]}"; do
     os_arch=${OS_ARCHES[$i]}
     cgo_cc=${CGO_ARGS[$i]}
@@ -234,29 +232,6 @@ BuildReleaseAndroid() {
   done
 }
 
-BuildReleaseFreeBSD() {
-  rm -rf .git/
-  mkdir -p "build/freebsd"
-  OS_ARCHES=(amd64 arm64 i386)
-  GO_ARCHES=(amd64 arm64 386)
-  CGO_ARGS=(x86_64-unknown-freebsd14.1 aarch64-unknown-freebsd14.1 i386-unknown-freebsd14.1)
-  for i in "${!OS_ARCHES[@]}"; do
-    os_arch=${OS_ARCHES[$i]}
-    cgo_cc="clang --target=${CGO_ARGS[$i]} --sysroot=/opt/freebsd/${os_arch}"
-    echo building for freebsd-${os_arch}
-    sudo mkdir -p "/opt/freebsd/${os_arch}"
-    wget -q https://download.freebsd.org/releases/${os_arch}/14.1-RELEASE/base.txz
-    sudo tar -xf ./base.txz -C /opt/freebsd/${os_arch}
-    rm base.txz
-    export GOOS=freebsd
-    export GOARCH=${GO_ARCHES[$i]}
-    export CC=${cgo_cc}
-    export CGO_ENABLED=1
-    export CGO_LDFLAGS="-fuse-ld=lld"
-    go build -o ./build/$appName-freebsd-$os_arch -ldflags="$ldflags" -tags=jsoniter .
-  done
-}
-
 MakeRelease() {
   cd build
   mkdir compress
@@ -275,11 +250,6 @@ MakeRelease() {
     tar -czvf compress/"$i".tar.gz alist
     rm -f alist
   done
-  for i in $(find . -type f -name "$appName-freebsd-*"); do
-    cp "$i" alist
-    tar -czvf compress/"$i".tar.gz alist
-    rm -f alist
-  done
   for i in $(find . -type f -name "$appName-windows-*"); do
     cp "$i" alist.exe
     zip compress/$(echo $i | sed 's/\.[^.]*$//').zip alist.exe
@@ -302,12 +272,8 @@ if [ "$1" = "dev" ]; then
   else
     BuildDev
   fi
-elif [ "$1" = "release" -o "$1" = "beta" ]; then
-  if [ "$1" = "beta" ]; then
-    FetchWebDev
-  else
-    FetchWebRelease
-  fi
+elif [ "$1" = "release" ]; then
+  FetchWebRelease
   if [ "$2" = "docker" ]; then
     BuildDocker
   elif [ "$2" = "docker-multiplatform" ]; then
@@ -321,9 +287,6 @@ elif [ "$1" = "release" -o "$1" = "beta" ]; then
   elif [ "$2" = "android" ]; then
     BuildReleaseAndroid
     MakeRelease "md5-android.txt"
-  elif [ "$2" = "freebsd" ]; then
-    BuildReleaseFreeBSD
-    MakeRelease "md5-freebsd.txt"
   elif [ "$2" = "web" ]; then
     echo "web only"
   else

cmd/common.go

@@ -17,9 +17,7 @@ func Init() {
 	bootstrap.Log()
 	bootstrap.InitDB()
 	data.InitData()
-	bootstrap.InitStreamLimit()
 	bootstrap.InitIndex()
-	bootstrap.InitUpgradePatch()
 }
 
 func Release() {

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,7 +137,6 @@ 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())

cmd/root.go

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

@@ -4,9 +4,6 @@ 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"
@@ -115,42 +112,6 @@ the address is defined in config file`,
 				}
 			}()
 		}
-		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,7 +121,6 @@ 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()
@@ -192,25 +152,6 @@ the address is defined in config file`,
 				}
 			}()
 		}
-		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)
-				}
-			}()
-		}
 		wg.Wait()
 		utils.Log.Println("Server exit")
 	},

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

@@ -3,7 +3,6 @@ package _115
 import (
 	"context"
 	"strings"
-	"sync"
 
 	driver115 "github.com/SheltonZhu/115driver/pkg/driver"
 	"github.com/alist-org/alist/v3/internal/driver"
@@ -17,9 +16,8 @@ import (
 type Pan115 struct {
 	model.Storage
 	Addition
-	client     *driver115.Pan115Client
-	limiter    *rate.Limiter
-	appVerOnce sync.Once
+	client  *driver115.Pan115Client
+	limiter *rate.Limiter
 }
 
 func (d *Pan115) Config() driver.Config {
@@ -31,7 +29,6 @@ func (d *Pan115) GetAddition() driver.Additional {
 }
 
 func (d *Pan115) Init(ctx context.Context) error {
-	d.appVerOnce.Do(d.initAppVer)
 	if d.LimitRate > 0 {
 		d.limiter = rate.NewLimiter(rate.Limit(d.LimitRate), 1)
 	}
@@ -79,60 +76,28 @@ 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 {
-		return nil, err
+		return err
 	}
-
-	result := driver115.MkdirResp{}
-	form := map[string]string{
-		"pid":   parentDir.GetID(),
-		"cname": dirName,
+	if _, err := d.client.Mkdir(parentDir.GetID(), dirName); err != nil {
+		return err
 	}
-	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
+	return 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 nil, err
+		return 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
+	return d.client.Move(dstDir.GetID(), srcObj.GetID())
 }
 
-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 nil, err
+		return 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
+	return d.client.Rename(srcObj.GetID(), newName)
 }
 
 func (d *Pan115) Copy(ctx context.Context, srcObj, dstDir model.Obj) error {
@@ -149,9 +114,9 @@ func (d *Pan115) Remove(ctx context.Context, obj model.Obj) error {
 	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 {
-		return nil, err
+		return err
 	}
 
 	var (
@@ -160,10 +125,10 @@ func (d *Pan115) Put(ctx context.Context, dstDir model.Obj, stream model.FileStr
 	)
 
 	if ok, err := d.client.UploadAvailable(); err != nil || !ok {
-		return nil, err
+		return err
 	}
 	if stream.GetSize() > d.client.UploadMetaInfo.SizeLimit {
-		return nil, driver115.ErrUploadTooLarge
+		return driver115.ErrUploadTooLarge
 	}
 	//if digest, err = d.client.GetDigestResult(stream); err != nil {
 	//	return err
@@ -176,22 +141,22 @@ func (d *Pan115) Put(ctx context.Context, dstDir model.Obj, stream model.FileStr
 	}
 	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)
 	if err != nil {
-		return nil, err
+		return err
 	}
 	preHash = strings.ToUpper(preHash)
 	fullHash := stream.GetHash().GetHash(utils.SHA1)
 	if len(fullHash) <= 0 {
 		tmpF, err := stream.CacheFullInTempFile()
 		if err != nil {
-			return nil, err
+			return err
 		}
 		fullHash, err = utils.HashFile(utils.SHA1, tmpF)
 		if err != nil {
-			return nil, err
+			return err
 		}
 	}
 	fullHash = strings.ToUpper(fullHash)
@@ -200,36 +165,20 @@ func (d *Pan115) Put(ctx context.Context, dstDir model.Obj, stream model.FileStr
 	// 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
+		return err
 	}
 	if matched, err := fastInfo.Ok(); err != nil {
-		return nil, err
+		return err
 	} else if matched {
-		f, err := d.getNewFileByPickCode(fastInfo.PickCode)
-		if err != nil {
-			return nil, nil
-		}
-		return f, nil
+		return 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
-		}
+	if stream.GetSize() <= utils.KB { // 文件大小小于1KB，改用普通模式上传
+		return d.client.UploadByOSS(&fastInfo.UploadOSSParams, stream, dirID)
 	}
-
-	file, err := d.getNewFile(uploadResult.Data.FileID)
-	if err != nil {
-		return nil, nil
-	}
-	return file, nil
+	// 分片上传
+	return d.UploadByMultipart(&fastInfo.UploadOSSParams, stream.GetSize(), stream, dirID)
 }
 
 func (d *Pan115) OfflineList(ctx context.Context) ([]*driver115.OfflineTask, error) {
@@ -241,7 +190,7 @@ func (d *Pan115) OfflineList(ctx context.Context) ([]*driver115.OfflineTask, err
 }
 
 func (d *Pan115) OfflineDownload(ctx context.Context, uris []string, dstDir model.Obj) ([]string, error) {
-	return d.client.AddOfflineTaskURIs(uris, dstDir.GetID(), driver115.WithAppVer(appVer))
+	return d.client.AddOfflineTaskURIs(uris, dstDir.GetID())
 }
 
 func (d *Pan115) DeleteOfflineTasks(ctx context.Context, hashes []string, deleteFiles bool) error {

drivers/115/meta.go

@@ -9,8 +9,8 @@ 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 ([limit]r/1s)"`
+	PageSize     int64   `json:"page_size" type:"number" default:"56" help:"list api per page size of 115 driver"`
+	LimitRate    float64 `json:"limit_rate" type:"number" default:"2" help:"limit all api request rate (1r/[limit_rate]s)"`
 	driver.RootID
 }
 

drivers/115/types.go

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

drivers/115/util.go

@@ -2,39 +2,36 @@ package _115
 
 import (
 	"bytes"
-	"context"
-	"crypto/md5"
 	"crypto/tls"
-	"encoding/hex"
 	"encoding/json"
 	"fmt"
 	"io"
 	"net/http"
 	"net/url"
+	"path/filepath"
 	"strconv"
 	"strings"
 	"sync"
-	"sync/atomic"
 	"time"
 
 	"github.com/alist-org/alist/v3/internal/conf"
-	"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/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"
+	crypto "github.com/gaoyb7/115drive-webdav/115"
+	"github.com/orzogc/fake115uploader/cipher"
 	"github.com/pkg/errors"
 )
 
-// var UserAgent = driver115.UA115Browser
+var UserAgent = driver115.UA115Desktop
+
 func (d *Pan115) login() error {
 	var err error
 	opts := []driver115.Option{
-		driver115.UA(d.getUA()),
+		driver115.UA(UserAgent),
 		func(c *driver115.Pan115Client) {
 			c.Client.SetTLSClientConfig(&tls.Config{InsecureSkipVerify: conf.Conf.TlsInsecureSkipVerify})
 		},
@@ -48,7 +45,7 @@ func (d *Pan115) login() error {
 		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.Cookie = fmt.Sprintf("UID=%s;CID=%s;SEID=%s", cr.UID, cr.CID, cr.SEID)
 		d.QRCodeToken = ""
 	} else if d.Cookie != "" {
 		if err = cr.FromCookie(d.Cookie); err != nil {
@@ -66,7 +63,7 @@ func (d *Pan115) getFiles(fileId string) ([]FileObj, error) {
 	if d.PageSize <= 0 {
 		d.PageSize = driver115.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
 	}
@@ -76,42 +73,14 @@ func (d *Pan115) getFiles(fileId string) ([]FileObj, error) {
 	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
-}
+const (
+	appVer = "2.0.3.6"
+)
 
-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) {
+func (c *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})
+	params, err := utils.Json.Marshal(map[string]string{"pickcode": pickCode})
 	if err != nil {
 		return nil, err
 	}
@@ -119,13 +88,13 @@ func (d *Pan115) DownloadWithUA(pickCode, ua string) (*driver115.DownloadInfo, e
 	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())
+	reqUrl := fmt.Sprintf("%s?t=%s", driver115.ApiDownloadGetUrl, driver115.Now().String())
 	req, _ := http.NewRequest(http.MethodPost, reqUrl, bodyReader)
 	req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
-	req.Header.Set("Cookie", d.Cookie)
+	req.Header.Set("Cookie", c.Cookie)
 	req.Header.Set("User-Agent", ua)
 
-	resp, err := d.client.Client.GetClient().Do(req)
+	resp, err := c.client.Client.GetClient().Do(req)
 	if err != nil {
 		return nil, err
 	}
@@ -143,30 +112,24 @@ func (d *Pan115) DownloadWithUA(pickCode, ua string) (*driver115.DownloadInfo, e
 		return nil, err
 	}
 
-	b, err := crypto.Decode(string(result.EncodedData), key)
+	bytes, 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 {
+	downloadInfo := driver115.DownloadData{}
+	if err := utils.Json.Unmarshal(bytes, &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[:])
+	for _, info := range downloadInfo {
+		if info.FileSize < 0 {
+			return nil, driver115.ErrDownloadEmpty
+		}
+		info.Header = resp.Request.Header
+		return info, nil
+	}
+	return nil, driver115.ErrUnexpected
 }
 
 func (d *Pan115) rapidUpload(fileSize int64, fileName, dirID, preID, fileID string, stream model.FileStreamer) (*driver115.UploadInitResp, error) {
@@ -198,7 +161,7 @@ func (d *Pan115) rapidUpload(fileSize int64, fileName, dirID, preID, fileID stri
 
 	signKey, signVal := "", ""
 	for retry := true; retry; {
-		t := driver115.NowMilli()
+		t := driver115.Now()
 
 		if encodedToken, err = ecdhCipher.EncodeToken(t.ToInt64()); err != nil {
 			return nil, err
@@ -209,7 +172,7 @@ func (d *Pan115) rapidUpload(fileSize int64, fileName, dirID, preID, fileID stri
 		}
 
 		form.Set("t", t.String())
-		form.Set("token", d.GenerateToken(fileID, preID, t.String(), fileSizeStr, signKey, signVal))
+		form.Set("token", d.client.GenerateToken(fileID, preID, t.String(), fileSizeStr, signKey, signVal))
 		if signKey != "" && signVal != "" {
 			form.Set("sign_key", signKey)
 			form.Set("sign_val", signVal)
@@ -262,9 +225,6 @@ func UploadDigestRange(stream model.FileStreamer, rangeSpec string) (result stri
 
 	length := end - start + 1
 	reader, err := stream.RangeRead(http_range.Range{Start: start, Length: length})
-	if err != nil {
-		return "", err
-	}
 	hashStr, err := utils.HashReader(utils.SHA1, reader)
 	if err != nil {
 		return "", err
@@ -273,43 +233,8 @@ func UploadDigestRange(stream model.FileStreamer, rangeSpec string) (result stri
 	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) {
+func (d *Pan115) UploadByMultipart(params *driver115.UploadOSSParams, fileSize int64, stream model.FileStreamer, dirID string, opts ...driver115.UploadMultipartOption) error {
 	var (
 		chunks    []oss.FileChunk
 		parts     []oss.UploadPart
@@ -317,13 +242,12 @@ func (d *Pan115) UploadByMultipart(ctx context.Context, params *driver115.Upload
 		ossClient *oss.Client
 		bucket    *oss.Bucket
 		ossToken  *driver115.UploadOSSTokenResp
-		bodyBytes []byte
 		err       error
 	)
 
-	tmpF, err := s.CacheFullInTempFile()
+	tmpF, err := stream.CacheFullInTempFile()
 	if err != nil {
-		return nil, err
+		return err
 	}
 
 	options := driver115.DefalutUploadMultipartOptions()
@@ -332,19 +256,17 @@ func (d *Pan115) UploadByMultipart(ctx context.Context, params *driver115.Upload
 			f(options)
 		}
 	}
-	// oss 启用Sequential必须按顺序上传
-	options.ThreadsNum = 1
 
 	if ossToken, err = d.client.GetOSSToken(); err != nil {
-		return nil, err
+		return err
 	}
 
-	if ossClient, err = oss.New(driver115.OSSEndpoint, ossToken.AccessKeyID, ossToken.AccessKeySecret, oss.EnableMD5(true), oss.EnableCRC(true)); err != nil {
-		return nil, err
+	if ossClient, err = oss.New(driver115.OSSEndpoint, ossToken.AccessKeyID, ossToken.AccessKeySecret); err != nil {
+		return err
 	}
 
 	if bucket, err = ossClient.Bucket(params.Bucket); err != nil {
-		return nil, err
+		return err
 	}
 
 	// ossToken一小时后就会失效，所以每50分钟重新获取一次
@@ -354,15 +276,14 @@ func (d *Pan115) UploadByMultipart(ctx context.Context, params *driver115.Upload
 	timeout := time.NewTimer(options.Timeout)
 
 	if chunks, err = SplitFile(fileSize); err != nil {
-		return nil, err
+		return 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
+		return err
 	}
 
 	wg := sync.WaitGroup{}
@@ -380,7 +301,6 @@ func (d *Pan115) UploadByMultipart(ctx context.Context, params *driver115.Upload
 		quit <- struct{}{}
 	}()
 
-	completedNum := atomic.Int32{}
 	// consumers
 	for i := 0; i < options.ThreadsNum; i++ {
 		go func(threadId int) {
@@ -393,28 +313,25 @@ func (d *Pan115) UploadByMultipart(ctx context.Context, params *driver115.Upload
 				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 {
+
+					b := bytes.NewBuffer(buf)
+					if part, err = bucket.UploadPart(imur, b, 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)))
+					errCh <- errors.Wrap(err, fmt.Sprintf("上传 %s 的第%d个分片时出现错误：%v", stream.GetName(), chunk.Number, err))
 				}
 				UploadedPartsCh <- part
 			}
@@ -433,31 +350,25 @@ LOOP:
 		case <-ticker.C:
 			// 到时重新获取ossToken
 			if ossToken, err = d.client.GetOSSToken(); err != nil {
-				return nil, err
+				return err
 			}
 		case <-quit:
 			break LOOP
 		case <-errCh:
-			return nil, err
+			return err
 		case <-timeout.C:
-			return nil, fmt.Errorf("time out")
+			return 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
+	// EOF错误是xml的Unmarshal导致的，响应其实是json格式，所以实际上上传是成功的
+	if _, err = bucket.CompleteMultipartUpload(imur, parts, driver115.OssOption(params, ossToken)...); err != nil && !errors.Is(err, io.EOF) {
+		// 当文件名含有 &< 这两个字符之一时响应的xml解析会出现错误，实际上上传是成功的
+		if filename := filepath.Base(stream.GetName()); !strings.ContainsAny(filename, "&<") {
+			return err
+		}
 	}
-
-	var uploadResult UploadResult
-	if err = json.Unmarshal(bodyBytes, &uploadResult); err != nil {
-		return nil, err
-	}
-	return &uploadResult, uploadResult.Err(string(bodyBytes))
+	return d.checkUploadStatus(dirID, params.SHA1)
 }
 
 func chunksProducer(ch chan oss.FileChunk, chunks []oss.FileChunk) {
@@ -466,6 +377,27 @@ func chunksProducer(ch chan oss.FileChunk, chunks []oss.FileChunk) {
 	}
 }
 
+func (d *Pan115) checkUploadStatus(dirID, sha1 string) error {
+	// 验证上传是否成功
+	req := d.client.NewRequest().ForceContentType("application/json;charset=UTF-8")
+	opts := []driver115.GetFileOptions{
+		driver115.WithOrder(driver115.FileOrderByTime),
+		driver115.WithShowDirEnable(false),
+		driver115.WithAsc(false),
+		driver115.WithLimit(500),
+	}
+	fResp, err := driver115.GetFiles(req, dirID, opts...)
+	if err != nil {
+		return err
+	}
+	for _, fileInfo := range fResp.Files {
+		if fileInfo.Sha1 == sha1 {
+			return nil
+		}
+	}
+	return driver115.ErrUploadFailed
+}
+
 func SplitFile(fileSize int64) (chunks []oss.FileChunk, err error) {
 	for i := int64(1); i < 10; i++ {
 		if fileSize < i*utils.GB { // 文件大小小于iGB时分为i*1000片

drivers/115_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/meta.go

@@ -9,8 +9,8 @@ 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)"`
+	PageSize     int64   `json:"page_size" type:"number" default:"20" help:"list api per page size of 115 driver"`
+	LimitRate    float64 `json:"limit_rate" type:"number" default:"2" help:"limit all api request rate (1r/[limit_rate]s)"`
 	ShareCode    string  `json:"share_code" type:"text" required:"true" help:"share code of 115 share link"`
 	ReceiveCode  string  `json:"receive_code" type:"text" required:"true" help:"receive code of 115 share link"`
 	driver.RootID
@@ -18,7 +18,7 @@ type Addition struct {
 
 var config = driver.Config{
 	Name:        "115 Share",
-	DefaultRoot: "0",
+	DefaultRoot: "",
 	// OnlyProxy:   true,
 	// OnlyLocal:         true,
 	CheckStatus:       false,

drivers/115_share/utils.go

@@ -96,7 +96,7 @@ func (d *Pan115Share) login() error {
 		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.Cookie = fmt.Sprintf("UID=%s;CID=%s;SEID=%s", cr.UID, cr.CID, cr.SEID)
 		d.QRCodeToken = ""
 	} else if d.Cookie != "" {
 		if err = cr.FromCookie(d.Cookie); err != nil {

drivers/123/driver.go

@@ -6,14 +6,13 @@ import (
 	"encoding/base64"
 	"encoding/hex"
 	"fmt"
+	"golang.org/x/time/rate"
 	"io"
 	"net/http"
 	"net/url"
 	"sync"
 	"time"
 
-	"golang.org/x/time/rate"
-
 	"github.com/alist-org/alist/v3/drivers/base"
 	"github.com/alist-org/alist/v3/internal/driver"
 	"github.com/alist-org/alist/v3/internal/errs"
@@ -42,12 +41,12 @@ 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) {
+	_, _ = d.request(Logout, http.MethodPost, func(req *resty.Request) {
 		req.SetBody(base.Json{})
 	}, nil)
 	return nil
@@ -82,8 +81,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 {
@@ -136,7 +134,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 +145,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 +157,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 +174,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 +183,36 @@ 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 {
-	etag := file.GetHash().GetHash(utils.MD5)
-	if len(etag) < utils.MD5.Width {
-		// const DEFAULT int64 = 10485760
-		h := md5.New()
-		// need to calculate md5 of the full content
-		tempFile, err := file.CacheFullInTempFile()
-		if err != nil {
-			return err
-		}
-		defer func() {
-			_ = tempFile.Close()
-		}()
-		if _, err = utils.CopyWithBuffer(h, tempFile); err != nil {
-			return err
-		}
-		_, err = tempFile.Seek(0, io.SeekStart)
-		if err != nil {
-			return err
-		}
-		etag = hex.EncodeToString(h.Sum(nil))
+func (d *Pan123) Put(ctx context.Context, dstDir model.Obj, stream model.FileStreamer, up driver.UpdateProgress) error {
+	// const DEFAULT int64 = 10485760
+	h := md5.New()
+	// need to calculate md5 of the full content
+	tempFile, err := stream.CacheFullInTempFile()
+	if err != nil {
+		return err
 	}
+	defer func() {
+		_ = tempFile.Close()
+	}()
+	if _, err = utils.CopyWithBuffer(h, tempFile); err != nil {
+		return err
+	}
+	_, err = tempFile.Seek(0, io.SeekStart)
+	if err != nil {
+		return err
+	}
+	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,7 +223,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, tempFile, up)
 		return err
 	} else {
 		cfg := &aws.Config{
@@ -242,23 +237,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)
+		if stream.GetSize() > s3manager.MaxUploadParts*s3manager.DefaultUploadPartSize {
+			uploader.PartSize = stream.GetSize() / (s3manager.MaxUploadParts - 1)
 		}
 		input := &s3manager.UploadInput{
 			Bucket: &resp.Data.Bucket,
 			Key:    &resp.Data.Key,
-			Body: driver.NewLimitedUploadStream(ctx, &driver.ReaderUpdatingProgress{
-				Reader:         file,
-				UpdateProgress: up,
-			}),
+			Body:   tempFile,
 		}
 		_, err = uploader.UploadWithContext(ctx, input)
-		if err != nil {
-			return err
-		}
 	}
-	_, err = d.Request(UploadComplete, http.MethodPost, func(req *resty.Request) {
+	_, err = d.request(UploadComplete, http.MethodPost, func(req *resty.Request) {
 		req.SetBody(base.Json{
 			"fileId": resp.Data.FileId,
 		}).SetContext(ctx)

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 {
@@ -44,7 +44,7 @@ func (d *Pan123) getS3Auth(ctx context.Context, upReq *UploadResp, start, end in
 		"uploadId":        upReq.Data.UploadId,
 	}
 	var s3PreSignedUrls S3PreSignedURLs
-	_, err := d.Request(S3Auth, http.MethodPost, func(req *resty.Request) {
+	_, err := d.request(S3Auth, http.MethodPost, func(req *resty.Request) {
 		req.SetBody(data).SetContext(ctx)
 	}, &s3PreSignedUrls)
 	if err != nil {
@@ -63,13 +63,13 @@ func (d *Pan123) completeS3(ctx context.Context, upReq *UploadResp, file model.F
 		"key":         upReq.Data.Key,
 		"uploadId":    upReq.Data.UploadId,
 	}
-	_, err := d.Request(UploadCompleteV2, http.MethodPost, func(req *resty.Request) {
+	_, err := d.request(UploadCompleteV2, 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)
 	// fetch s3 pre signed urls
 	chunkCount := int(math.Ceil(float64(file.GetSize()) / float64(chunkSize)))
@@ -81,7 +81,6 @@ func (d *Pan123) newUpload(ctx context.Context, upReq *UploadResp, file model.Fi
 		batchSize = 10
 		getS3UploadUrl = d.getS3PreSignedUrls
 	}
-	limited := driver.NewLimitedUploadStream(ctx, file)
 	for i := 1; i <= chunkCount; i += batchSize {
 		if utils.IsCanceled(ctx) {
 			return ctx.Err()
@@ -104,7 +103,7 @@ 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, getS3UploadUrl)
 			if err != nil {
 				return err
 			}

drivers/123/util.go

@@ -26,9 +26,8 @@ const (
 	Api              = "https://www.123pan.com/api"
 	AApi             = "https://www.123pan.com/a/api"
 	BApi             = "https://www.123pan.com/b/api"
-	LoginApi         = "https://login.123pan.com/api"
 	MainApi          = BApi
-	SignIn           = LoginApi + "/user/sign_in"
+	SignIn           = MainApi + "/user/sign_in"
 	Logout           = MainApi + "/user/logout"
 	UserInfo         = MainApi + "/user/info"
 	FileList         = MainApi + "/file/list/new"
@@ -194,9 +193,7 @@ func (d *Pan123) login() error {
 //	return &authKey, nil
 //}
 
-func (d *Pan123) Request(url string, method string, callback base.ReqCallback, resp interface{}) ([]byte, error) {
-	isRetry := false
-do:
+func (d *Pan123) request(url string, method string, callback base.ReqCallback, resp interface{}) ([]byte, error) {
 	req := base.RestyClient.R()
 	req.SetHeaders(map[string]string{
 		"origin":        "https://www.123pan.com",
@@ -225,13 +222,12 @@ do:
 	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
-			goto do
+			return d.request(url, method, callback, resp)
 		}
 		return nil, errors.New(jsoniter.Get(body, "message").ToString())
 	}
@@ -263,7 +259,7 @@ func (d *Pan123) getFiles(ctx context.Context, parentId string, name string) ([]
 			"operateType":          "4",
 			"inDirectSpace":        "false",
 		}
-		_res, err := d.Request(FileList, http.MethodGet, func(req *resty.Request) {
+		_res, err := d.request(FileList, http.MethodGet, func(req *resty.Request) {
 			req.SetQueryParams(query)
 		}, &resp)
 		if err != nil {

drivers/123_share/driver.go

@@ -4,14 +4,12 @@ import (
 	"context"
 	"encoding/base64"
 	"fmt"
+	"golang.org/x/time/rate"
 	"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"
@@ -25,7 +23,6 @@ type Pan123Share struct {
 	model.Storage
 	Addition
 	apiRateLimit sync.Map
-	ref          *_123.Pan123
 }
 
 func (d *Pan123Share) Config() driver.Config {
@@ -42,17 +39,7 @@ func (d *Pan123Share) Init(ctx context.Context) error {
 	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
 }
 

drivers/123_share/util.go

@@ -53,9 +53,6 @@ func GetApi(rawUrl string) 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",

drivers/139/driver.go

@@ -3,11 +3,9 @@ package _139
 import (
 	"context"
 	"encoding/base64"
-	"encoding/xml"
 	"fmt"
 	"io"
 	"net/http"
-	"path"
 	"strconv"
 	"strings"
 	"time"
@@ -16,18 +14,16 @@ import (
 	"github.com/alist-org/alist/v3/internal/driver"
 	"github.com/alist-org/alist/v3/internal/errs"
 	"github.com/alist-org/alist/v3/internal/model"
-	"github.com/alist-org/alist/v3/pkg/cron"
 	"github.com/alist-org/alist/v3/pkg/utils"
-	"github.com/alist-org/alist/v3/pkg/utils/random"
+	"github.com/alist-org/alist/v3/pkg/cron"
 	log "github.com/sirupsen/logrus"
 )
 
 type Yun139 struct {
 	model.Storage
 	Addition
-	cron    *cron.Cron
+	cron   *cron.Cron
 	Account string
-	ref     *Yun139
 }
 
 func (d *Yun139) Config() driver.Config {
@@ -39,77 +35,56 @@ func (d *Yun139) GetAddition() driver.Additional {
 }
 
 func (d *Yun139) Init(ctx context.Context) error {
-	if d.ref == nil {
-		if d.Authorization == "" {
-			return fmt.Errorf("authorization is empty")
-		}
+	if d.Authorization == "" {
+		return fmt.Errorf("authorization is empty")
+	}
+	d.cron = cron.NewCron(time.Hour * 24 * 7)
+	d.cron.Do(func() {
 		err := d.refreshToken()
 		if err != nil {
-			return err
+			log.Errorf("%+v", err)
 		}
-		d.cron = cron.NewCron(time.Hour * 12)
-		d.cron.Do(func() {
-			err := d.refreshToken()
-			if err != nil {
-				log.Errorf("%+v", err)
-			}
-		})
-	}
+	})
 	switch d.Addition.Type {
 	case MetaPersonalNew:
 		if len(d.Addition.RootFolderID) == 0 {
 			d.RootFolderID = "/"
 		}
+		return nil
 	case MetaPersonal:
 		if len(d.Addition.RootFolderID) == 0 {
 			d.RootFolderID = "root"
 		}
-	case MetaGroup:
-		if len(d.Addition.RootFolderID) == 0 {
-			d.RootFolderID = d.CloudID
-		}
+		fallthrough
 	case MetaFamily:
+		decode, err := base64.StdEncoding.DecodeString(d.Authorization)
+		if err != nil {
+			return err
+		}
+		decodeStr := string(decode)
+		splits := strings.Split(decodeStr, ":")
+		if len(splits) < 2 {
+			return fmt.Errorf("authorization is invalid, splits < 2")
+		}
+		d.Account = splits[1]
+		_, err = d.post("/orchestration/personalCloud/user/v1.0/qryUserExternInfo", base.Json{
+			"qryUserExternInfoReq": base.Json{
+				"commonAccountInfo": base.Json{
+					"account":     d.Account,
+					"accountType": 1,
+				},
+			},
+		}, nil)
+		return err
 	default:
 		return errs.NotImplement
 	}
-	if d.ref != nil {
-		return nil
-	}
-	decode, err := base64.StdEncoding.DecodeString(d.Authorization)
-	if err != nil {
-		return err
-	}
-	decodeStr := string(decode)
-	splits := strings.Split(decodeStr, ":")
-	if len(splits) < 2 {
-		return fmt.Errorf("authorization is invalid, splits < 2")
-	}
-	d.Account = splits[1]
-	_, err = d.post("/orchestration/personalCloud/user/v1.0/qryUserExternInfo", base.Json{
-		"qryUserExternInfoReq": base.Json{
-			"commonAccountInfo": base.Json{
-				"account":     d.getAccount(),
-				"accountType": 1,
-			},
-		},
-	}, nil)
-	return err
-}
-
-func (d *Yun139) InitReference(storage driver.Driver) error {
-	refStorage, ok := storage.(*Yun139)
-	if ok {
-		d.ref = refStorage
-		return nil
-	}
-	return errs.NotSupport
 }
 
 func (d *Yun139) Drop(ctx context.Context) error {
 	if d.cron != nil {
 		d.cron.Stop()
 	}
-	d.ref = nil
 	return nil
 }
 
@@ -121,8 +96,6 @@ func (d *Yun139) List(ctx context.Context, dir model.Obj, args model.ListArgs) (
 		return d.getFiles(dir.GetID())
 	case MetaFamily:
 		return d.familyGetFiles(dir.GetID())
-	case MetaGroup:
-		return d.groupGetFiles(dir.GetID())
 	default:
 		return nil, errs.NotImplement
 	}
@@ -135,11 +108,9 @@ func (d *Yun139) Link(ctx context.Context, file model.Obj, args model.LinkArgs)
 	case MetaPersonalNew:
 		url, err = d.personalGetLink(file.GetID())
 	case MetaPersonal:
-		url, err = d.getLink(file.GetID())
+		fallthrough
 	case MetaFamily:
-		url, err = d.familyGetLink(file.GetID(), file.GetPath())
-	case MetaGroup:
-		url, err = d.groupGetLink(file.GetID(), file.GetPath())
+		url, err = d.getLink(file.GetID())
 	default:
 		return nil, errs.NotImplement
 	}
@@ -168,7 +139,7 @@ func (d *Yun139) MakeDir(ctx context.Context, parentDir model.Obj, dirName strin
 				"parentCatalogID": parentDir.GetID(),
 				"newCatalogName":  dirName,
 				"commonAccountInfo": base.Json{
-					"account":     d.getAccount(),
+					"account":     d.Account,
 					"accountType": 1,
 				},
 			},
@@ -179,26 +150,12 @@ func (d *Yun139) MakeDir(ctx context.Context, parentDir model.Obj, dirName strin
 		data := base.Json{
 			"cloudID": d.CloudID,
 			"commonAccountInfo": base.Json{
-				"account":     d.getAccount(),
+				"account":     d.Account,
 				"accountType": 1,
 			},
 			"docLibName": dirName,
-			"path":       path.Join(parentDir.GetPath(), parentDir.GetID()),
 		}
-		pathname := "/orchestration/familyCloud-rebuild/cloudCatalog/v1.0/createCloudDoc"
-		_, err = d.post(pathname, data, nil)
-	case MetaGroup:
-		data := base.Json{
-			"catalogName": dirName,
-			"commonAccountInfo": base.Json{
-				"account":     d.getAccount(),
-				"accountType": 1,
-			},
-			"groupID":      d.CloudID,
-			"parentFileId": parentDir.GetID(),
-			"path":         path.Join(parentDir.GetPath(), parentDir.GetID()),
-		}
-		pathname := "/orchestration/group-rebuild/catalog/v1.0/createGroupCatalog"
+		pathname := "/orchestration/familyCloud/cloudCatalog/v1.0/createCloudDoc"
 		_, err = d.post(pathname, data, nil)
 	default:
 		err = errs.NotImplement
@@ -219,34 +176,6 @@ func (d *Yun139) Move(ctx context.Context, srcObj, dstDir model.Obj) (model.Obj,
 			return nil, err
 		}
 		return srcObj, nil
-	case MetaGroup:
-		var contentList []string
-		var catalogList []string
-		if srcObj.IsDir() {
-			catalogList = append(catalogList, srcObj.GetID())
-		} else {
-			contentList = append(contentList, srcObj.GetID())
-		}
-		data := base.Json{
-			"taskType":    3,
-			"srcType":     2,
-			"srcGroupID":  d.CloudID,
-			"destType":    2,
-			"destGroupID": d.CloudID,
-			"destPath":    dstDir.GetPath(),
-			"contentList": contentList,
-			"catalogList": catalogList,
-			"commonAccountInfo": base.Json{
-				"account":     d.getAccount(),
-				"accountType": 1,
-			},
-		}
-		pathname := "/orchestration/group-rebuild/task/v1.0/createBatchOprTask"
-		_, err := d.post(pathname, data, nil)
-		if err != nil {
-			return nil, err
-		}
-		return srcObj, nil
 	case MetaPersonal:
 		var contentInfoList []string
 		var catalogInfoList []string
@@ -265,7 +194,7 @@ func (d *Yun139) Move(ctx context.Context, srcObj, dstDir model.Obj) (model.Obj,
 					"newCatalogID":    dstDir.GetID(),
 				},
 				"commonAccountInfo": base.Json{
-					"account":     d.getAccount(),
+					"account":     d.Account,
 					"accountType": 1,
 				},
 			},
@@ -300,7 +229,7 @@ func (d *Yun139) Rename(ctx context.Context, srcObj model.Obj, newName string) e
 				"catalogID":   srcObj.GetID(),
 				"catalogName": newName,
 				"commonAccountInfo": base.Json{
-					"account":     d.getAccount(),
+					"account":     d.Account,
 					"accountType": 1,
 				},
 			}
@@ -310,72 +239,13 @@ func (d *Yun139) Rename(ctx context.Context, srcObj model.Obj, newName string) e
 				"contentID":   srcObj.GetID(),
 				"contentName": newName,
 				"commonAccountInfo": base.Json{
-					"account":     d.getAccount(),
+					"account":     d.Account,
 					"accountType": 1,
 				},
 			}
 			pathname = "/orchestration/personalCloud/content/v1.0/updateContentInfo"
 		}
 		_, err = d.post(pathname, data, nil)
-	case MetaGroup:
-		var data base.Json
-		var pathname string
-		if srcObj.IsDir() {
-			data = base.Json{
-				"groupID":           d.CloudID,
-				"modifyCatalogID":   srcObj.GetID(),
-				"modifyCatalogName": newName,
-				"path":              srcObj.GetPath(),
-				"commonAccountInfo": base.Json{
-					"account":     d.getAccount(),
-					"accountType": 1,
-				},
-			}
-			pathname = "/orchestration/group-rebuild/catalog/v1.0/modifyGroupCatalog"
-		} else {
-			data = base.Json{
-				"groupID":     d.CloudID,
-				"contentID":   srcObj.GetID(),
-				"contentName": newName,
-				"path":        srcObj.GetPath(),
-				"commonAccountInfo": base.Json{
-					"account":     d.getAccount(),
-					"accountType": 1,
-				},
-			}
-			pathname = "/orchestration/group-rebuild/content/v1.0/modifyGroupContent"
-		}
-		_, err = d.post(pathname, data, nil)
-	case MetaFamily:
-		var data base.Json
-		var pathname string
-		if srcObj.IsDir() {
-			// 网页接口不支持重命名家庭云文件夹
-			// data = base.Json{
-			// 	"catalogType": 3,
-			// 	"catalogID":   srcObj.GetID(),
-			// 	"catalogName": newName,
-			// 	"commonAccountInfo": base.Json{
-			// 		"account":     d.getAccount(),
-			// 		"accountType": 1,
-			// 	},
-			// 	"path": srcObj.GetPath(),
-			// }
-			// pathname = "/orchestration/familyCloud-rebuild/photoContent/v1.0/modifyCatalogInfo"
-			return errs.NotImplement
-		} else {
-			data = base.Json{
-				"contentID":   srcObj.GetID(),
-				"contentName": newName,
-				"commonAccountInfo": base.Json{
-					"account":     d.getAccount(),
-					"accountType": 1,
-				},
-				"path": srcObj.GetPath(),
-			}
-			pathname = "/orchestration/familyCloud-rebuild/photoContent/v1.0/modifyContentInfo"
-		}
-		_, err = d.post(pathname, data, nil)
 	default:
 		err = errs.NotImplement
 	}
@@ -411,7 +281,7 @@ func (d *Yun139) Copy(ctx context.Context, srcObj, dstDir model.Obj) error {
 					"newCatalogID":    dstDir.GetID(),
 				},
 				"commonAccountInfo": base.Json{
-					"account":     d.getAccount(),
+					"account":     d.Account,
 					"accountType": 1,
 				},
 			},
@@ -433,28 +303,6 @@ func (d *Yun139) Remove(ctx context.Context, obj model.Obj) error {
 		pathname := "/hcy/recyclebin/batchTrash"
 		_, err := d.personalPost(pathname, data, nil)
 		return err
-	case MetaGroup:
-		var contentList []string
-		var catalogList []string
-		// 必须使用完整路径删除
-		if obj.IsDir() {
-			catalogList = append(catalogList, obj.GetPath())
-		} else {
-			contentList = append(contentList, path.Join(obj.GetPath(), obj.GetID()))
-		}
-		data := base.Json{
-			"taskType":    2,
-			"srcGroupID":  d.CloudID,
-			"contentList": contentList,
-			"catalogList": catalogList,
-			"commonAccountInfo": base.Json{
-				"account":     d.getAccount(),
-				"accountType": 1,
-			},
-		}
-		pathname := "/orchestration/group-rebuild/task/v1.0/createBatchOprTask"
-		_, err := d.post(pathname, data, nil)
-		return err
 	case MetaPersonal:
 		fallthrough
 	case MetaFamily:
@@ -475,7 +323,7 @@ func (d *Yun139) Remove(ctx context.Context, obj model.Obj) error {
 					"catalogInfoList": catalogInfoList,
 				},
 				"commonAccountInfo": base.Json{
-					"account":     d.getAccount(),
+					"account":     d.Account,
 					"accountType": 1,
 				},
 			},
@@ -486,15 +334,13 @@ func (d *Yun139) Remove(ctx context.Context, obj model.Obj) error {
 				"catalogList": catalogInfoList,
 				"contentList": contentInfoList,
 				"commonAccountInfo": base.Json{
-					"account":     d.getAccount(),
+					"account":     d.Account,
 					"accountType": 1,
 				},
-				"sourceCloudID":     d.CloudID,
 				"sourceCatalogType": 1002,
 				"taskType":          2,
-				"path":              obj.GetPath(),
 			}
-			pathname = "/orchestration/familyCloud-rebuild/batchOprTask/v1.0/createBatchOprTask"
+			pathname = "/orchestration/familyCloud/batchOprTask/v1.0/createBatchOprTask"
 		}
 		_, err := d.post(pathname, data, nil)
 		return err
@@ -511,10 +357,7 @@ const (
 	TB
 )
 
-func (d *Yun139) getPartSize(size int64) int64 {
-	if d.CustomUploadPartSize != 0 {
-		return d.CustomUploadPartSize
-	}
+func getPartSize(size int64) int64 {
 	// 网盘对于分片数量存在上限
 	if size/GB > 30 {
 		return 512 * MB
@@ -537,51 +380,24 @@ func (d *Yun139) Put(ctx context.Context, dstDir model.Obj, stream model.FileStr
 				return err
 			}
 		}
-
-		partInfos := []PartInfo{}
-		var partSize = d.getPartSize(stream.GetSize())
-		part := (stream.GetSize() + partSize - 1) / partSize
-		if part == 0 {
-			part = 1
-		}
-		for i := int64(0); i < part; i++ {
-			if utils.IsCanceled(ctx) {
-				return ctx.Err()
-			}
-			start := i * partSize
-			byteSize := stream.GetSize() - start
-			if byteSize > partSize {
-				byteSize = partSize
-			}
-			partNumber := i + 1
-			partInfo := PartInfo{
-				PartNumber: partNumber,
-				PartSize:   byteSize,
-				ParallelHashCtx: ParallelHashCtx{
-					PartOffset: start,
-				},
-			}
-			partInfos = append(partInfos, partInfo)
-		}
-
-		// 筛选出前 100 个 partInfos
-		firstPartInfos := partInfos
-		if len(firstPartInfos) > 100 {
-			firstPartInfos = firstPartInfos[:100]
-		}
-
-		// 创建任务，获取上传信息和前100个分片的上传地址
+		// return errs.NotImplement
 		data := base.Json{
 			"contentHash":          fullHash,
 			"contentHashAlgorithm": "SHA256",
 			"contentType":          "application/octet-stream",
 			"parallelUpload":       false,
-			"partInfos":            firstPartInfos,
-			"size":                 stream.GetSize(),
-			"parentFileId":         dstDir.GetID(),
-			"name":                 stream.GetName(),
-			"type":                 "file",
-			"fileRenameMode":       "auto_rename",
+			"partInfos": []base.Json{{
+				"parallelHashCtx": base.Json{
+					"partOffset": 0,
+				},
+				"partNumber": 1,
+				"partSize":   stream.GetSize(),
+			}},
+			"size":           stream.GetSize(),
+			"parentFileId":   dstDir.GetID(),
+			"name":           stream.GetName(),
+			"type":           "file",
+			"fileRenameMode": "auto_rename",
 		}
 		pathname := "/hcy/file/create"
 		var resp PersonalUploadResp
@@ -590,215 +406,101 @@ func (d *Yun139) Put(ctx context.Context, dstDir model.Obj, stream model.FileStr
 			return err
 		}
 
-		// 判断文件是否已存在
-		// resp.Data.Exist: true 已存在同名文件且校验相同，云端不会重复增加文件，无需手动处理冲突
-		if resp.Data.Exist {
+		if resp.Data.Exist || resp.Data.RapidUpload {
 			return nil
 		}
 
-		// 判断文件是否支持快传
-		// resp.Data.RapidUpload: true 支持快传，但此处直接检测是否返回分片的上传地址
-		// 快传的情况下同样需要手动处理冲突
-		if resp.Data.PartInfos != nil {
-			// 读取前100个分片的上传地址
-			uploadPartInfos := resp.Data.PartInfos
-
-			// 获取后续分片的上传地址
-			for i := 101; i < len(partInfos); i += 100 {
-				end := i + 100
-				if end > len(partInfos) {
-					end = len(partInfos)
-				}
-				batchPartInfos := partInfos[i:end]
-
-				moredata := base.Json{
-					"fileId":    resp.Data.FileId,
-					"uploadId":  resp.Data.UploadId,
-					"partInfos": batchPartInfos,
-					"commonAccountInfo": base.Json{
-						"account":     d.getAccount(),
-						"accountType": 1,
-					},
-				}
-				pathname := "/hcy/file/getUploadUrl"
-				var moreresp PersonalUploadUrlResp
-				_, err = d.personalPost(pathname, moredata, &moreresp)
-				if err != nil {
-					return err
-				}
-				uploadPartInfos = append(uploadPartInfos, moreresp.Data.PartInfos...)
-			}
-
-			// Progress
-			p := driver.NewProgress(stream.GetSize(), up)
-
-			rateLimited := driver.NewLimitedUploadStream(ctx, stream)
-			// 上传所有分片
-			for _, uploadPartInfo := range uploadPartInfos {
-				index := uploadPartInfo.PartNumber - 1
-				partSize := partInfos[index].PartSize
-				log.Debugf("[139] uploading part %+v/%+v", index, len(uploadPartInfos))
-				limitReader := io.LimitReader(rateLimited, partSize)
-
-				// Update Progress
-				r := io.TeeReader(limitReader, p)
-
-				req, err := http.NewRequest("PUT", uploadPartInfo.UploadUrl, r)
-				if err != nil {
-					return err
-				}
-				req = req.WithContext(ctx)
-				req.Header.Set("Content-Type", "application/octet-stream")
-				req.Header.Set("Content-Length", fmt.Sprint(partSize))
-				req.Header.Set("Origin", "https://yun.139.com")
-				req.Header.Set("Referer", "https://yun.139.com/")
-				req.ContentLength = partSize
-
-				res, err := base.HttpClient.Do(req)
-				if err != nil {
-					return err
-				}
-				_ = res.Body.Close()
-				log.Debugf("[139] uploaded: %+v", res)
-				if res.StatusCode != http.StatusOK {
-					return fmt.Errorf("unexpected status code: %d", res.StatusCode)
-				}
-			}
-
-			data = base.Json{
-				"contentHash":          fullHash,
-				"contentHashAlgorithm": "SHA256",
-				"fileId":               resp.Data.FileId,
-				"uploadId":             resp.Data.UploadId,
-			}
-			_, err = d.personalPost("/hcy/file/complete", data, nil)
-			if err != nil {
-				return err
-			}
-		}
-
-		// 处理冲突
-		if resp.Data.FileName != stream.GetName() {
-			log.Debugf("[139] conflict detected: %s != %s", resp.Data.FileName, stream.GetName())
-			// 给服务器一定时间处理数据，避免无法刷新文件列表
-			time.Sleep(time.Millisecond * 500)
-			// 刷新并获取文件列表
-			files, err := d.List(ctx, dstDir, model.ListArgs{Refresh: true})
-			if err != nil {
-				return err
-			}
-			// 删除旧文件
-			for _, file := range files {
-				if file.GetName() == stream.GetName() {
-					log.Debugf("[139] conflict: removing old: %s", file.GetName())
-					// 删除前重命名旧文件，避免仍旧冲突
-					err = d.Rename(ctx, file, stream.GetName()+random.String(4))
-					if err != nil {
-						return err
-					}
-					err = d.Remove(ctx, file)
-					if err != nil {
-						return err
-					}
-					break
-				}
-			}
-			// 重命名新文件
-			for _, file := range files {
-				if file.GetName() == resp.Data.FileName {
-					log.Debugf("[139] conflict: renaming new: %s => %s", file.GetName(), stream.GetName())
-					err = d.Rename(ctx, file, stream.GetName())
-					if err != nil {
-						return err
-					}
-					break
-				}
-			}
-		}
-		return nil
-	case MetaPersonal:
-		fallthrough
-	case MetaFamily:
-		// 处理冲突
-		// 获取文件列表
-		files, err := d.List(ctx, dstDir, model.ListArgs{})
-		if err != nil {
-			return err
-		}
-		// 删除旧文件
-		for _, file := range files {
-			if file.GetName() == stream.GetName() {
-				log.Debugf("[139] conflict: removing old: %s", file.GetName())
-				// 删除前重命名旧文件，避免仍旧冲突
-				err = d.Rename(ctx, file, stream.GetName()+random.String(4))
-				if err != nil {
-					return err
-				}
-				err = d.Remove(ctx, file)
-				if err != nil {
-					return err
-				}
-				break
-			}
-		}
-		var reportSize int64
-		if d.ReportRealSize {
-			reportSize = stream.GetSize()
-		} else {
-			reportSize = 0
-		}
-		data := base.Json{
-			"manualRename": 2,
-			"operation":    0,
-			"fileCount":    1,
-			"totalSize":    reportSize,
-			"uploadContentList": []base.Json{{
-				"contentName": stream.GetName(),
-				"contentSize": reportSize,
-				// "digest": "5a3231986ce7a6b46e408612d385bafa"
-			}},
-			"parentCatalogID": dstDir.GetID(),
-			"newCatalogName":  "",
-			"commonAccountInfo": base.Json{
-				"account":     d.getAccount(),
-				"accountType": 1,
-			},
-		}
-		pathname := "/orchestration/personalCloud/uploadAndDownload/v1.0/pcUploadFileRequest"
-		if d.isFamily() {
-			data = d.newJson(base.Json{
-				"fileCount":    1,
-				"manualRename": 2,
-				"operation":    0,
-				"path":         path.Join(dstDir.GetPath(), dstDir.GetID()),
-				"seqNo":        random.String(32), //序列号不能为空
-				"totalSize":    reportSize,
-				"uploadContentList": []base.Json{{
-					"contentName": stream.GetName(),
-					"contentSize": reportSize,
-					// "digest": "5a3231986ce7a6b46e408612d385bafa"
-				}},
-			})
-			pathname = "/orchestration/familyCloud-rebuild/content/v1.0/getFileUploadURL"
-		}
-		var resp UploadResp
-		_, err = d.post(pathname, data, &resp)
-		if err != nil {
-			return err
-		}
-		if resp.Data.Result.ResultCode != "0" {
-			return fmt.Errorf("get file upload url failed with result code: %s, message: %s", resp.Data.Result.ResultCode, resp.Data.Result.ResultDesc)
-		}
-
 		// Progress
 		p := driver.NewProgress(stream.GetSize(), up)
 
-		var partSize = d.getPartSize(stream.GetSize())
+		// Update Progress
+		r := io.TeeReader(stream, p)
+
+		req, err := http.NewRequest("PUT", resp.Data.PartInfos[0].UploadUrl, r)
+		if err != nil {
+			return err
+		}
+		req = req.WithContext(ctx)
+		req.Header.Set("Content-Type", "application/octet-stream")
+		req.Header.Set("Content-Length", fmt.Sprint(stream.GetSize()))
+		req.Header.Set("Origin", "https://yun.139.com")
+		req.Header.Set("Referer", "https://yun.139.com/")
+		req.ContentLength = stream.GetSize()
+
+		res, err := base.HttpClient.Do(req)
+		if err != nil {
+			return err
+		}
+
+		_ = res.Body.Close()
+		log.Debugf("%+v", res)
+		if res.StatusCode != http.StatusOK {
+			return fmt.Errorf("unexpected status code: %d", res.StatusCode)
+		}
+
+		data = base.Json{
+			"contentHash":          fullHash,
+			"contentHashAlgorithm": "SHA256",
+			"fileId":               resp.Data.FileId,
+			"uploadId":             resp.Data.UploadId,
+		}
+		_, err = d.personalPost("/hcy/file/complete", data, nil)
+		if err != nil {
+			return err
+		}
+		return nil
+	case MetaPersonal:
+		fallthrough
+	case MetaFamily:
+		data := base.Json{
+			"manualRename": 2,
+			"operation":    0,
+			"fileCount":    1,
+			"totalSize":    0, // 去除上传大小限制
+			"uploadContentList": []base.Json{{
+				"contentName": stream.GetName(),
+				"contentSize": 0, // 去除上传大小限制
+				// "digest": "5a3231986ce7a6b46e408612d385bafa"
+			}},
+			"parentCatalogID": dstDir.GetID(),
+			"newCatalogName":  "",
+			"commonAccountInfo": base.Json{
+				"account":     d.Account,
+				"accountType": 1,
+			},
+		}
+		pathname := "/orchestration/personalCloud/uploadAndDownload/v1.0/pcUploadFileRequest"
+		if d.isFamily() {
+			// data = d.newJson(base.Json{
+			// 	"fileCount":    1,
+			// 	"manualRename": 2,
+			// 	"operation":    0,
+			// 	"path":         "",
+			// 	"seqNo":        "",
+			// 	"totalSize":    0,
+			// 	"uploadContentList": []base.Json{{
+			// 		"contentName": stream.GetName(),
+			// 		"contentSize": 0,
+			// 		// "digest": "5a3231986ce7a6b46e408612d385bafa"
+			// 	}},
+			// })
+			// pathname = "/orchestration/familyCloud/content/v1.0/getFileUploadURL"
+			return errs.NotImplement
+		}
+		var resp UploadResp
+		_, err := d.post(pathname, data, &resp)
+		if err != nil {
+			return err
+		}
+
+		// Progress
+		p := driver.NewProgress(stream.GetSize(), up)
+
+		var partSize = getPartSize(stream.GetSize())
 		part := (stream.GetSize() + partSize - 1) / partSize
 		if part == 0 {
 			part = 1
 		}
-		rateLimited := driver.NewLimitedUploadStream(ctx, stream)
 		for i := int64(0); i < part; i++ {
 			if utils.IsCanceled(ctx) {
 				return ctx.Err()
@@ -810,7 +512,7 @@ func (d *Yun139) Put(ctx context.Context, dstDir model.Obj, stream model.FileStr
 				byteSize = partSize
 			}
 
-			limitReader := io.LimitReader(rateLimited, byteSize)
+			limitReader := io.LimitReader(stream, byteSize)
 			// Update Progress
 			r := io.TeeReader(limitReader, p)
 			req, err := http.NewRequest("POST", resp.Data.UploadResult.RedirectionURL, r)
@@ -830,23 +532,13 @@ func (d *Yun139) Put(ctx context.Context, dstDir model.Obj, stream model.FileStr
 			if err != nil {
 				return err
 			}
+			_ = res.Body.Close()
+			log.Debugf("%+v", res)
 			if res.StatusCode != http.StatusOK {
-				res.Body.Close()
 				return fmt.Errorf("unexpected status code: %d", res.StatusCode)
 			}
-			bodyBytes, err := io.ReadAll(res.Body)
-			if err != nil {
-				return fmt.Errorf("error reading response body: %v", err)
-			}
-			var result InterLayerUploadResult
-			err = xml.Unmarshal(bodyBytes, &result)
-			if err != nil {
-				return fmt.Errorf("error parsing XML: %v", err)
-			}
-			if result.ResultCode != 0 {
-				return fmt.Errorf("upload failed with result code: %d, message: %s", result.ResultCode, result.Msg)
-			}
 		}
+
 		return nil
 	default:
 		return errs.NotImplement

drivers/139/meta.go

@@ -9,10 +9,8 @@ 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"`
-	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"`
+	Type    string `json:"type" type:"select" options:"personal,family,personal_new" default:"personal"`
+	CloudID string `json:"cloud_id"`
 }
 
 var config = driver.Config{

drivers/139/types.go

@@ -7,7 +7,6 @@ import (
 const (
 	MetaPersonal    string = "personal"
 	MetaFamily      string = "family"
-	MetaGroup       string = "group"
 	MetaPersonalNew string = "personal_new"
 )
 
@@ -55,7 +54,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"`
@@ -143,13 +141,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"`
@@ -205,37 +196,6 @@ type QueryContentListResp struct {
 	} `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"`
@@ -268,7 +228,6 @@ 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"`
@@ -276,15 +235,6 @@ type PersonalUploadResp struct {
 	}
 }
 
-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"`

drivers/139/util.go

@@ -6,7 +6,6 @@ import (
 	"fmt"
 	"net/http"
 	"net/url"
-	"path"
 	"sort"
 	"strconv"
 	"strings"
@@ -14,9 +13,9 @@ 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/alist-org/alist/v3/internal/op"
 	"github.com/go-resty/resty/v2"
 	jsoniter "github.com/json-iterator/go"
 	log "github.com/sirupsen/logrus"
@@ -55,37 +54,14 @@ func getTime(t string) time.Time {
 }
 
 func (d *Yun139) refreshToken() error {
-	if d.ref != nil {
-		return d.ref.refreshToken()
-	}
+	url := "https://aas.caiyun.feixin.10086.cn:443/tellin/authTokenRefresh.do"
+	var resp RefreshTokenResp
 	decode, err := base64.StdEncoding.DecodeString(d.Authorization)
 	if err != nil {
-		return fmt.Errorf("authorization decode failed: %s", err)
+		return 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").
@@ -123,22 +99,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",
-		"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,
-		"Inner-Hcy-Router-Https": "1",
+		"mcloud-version":      "6.6.0",
+		"Origin":              "https://yun.139.com",
+		"Referer":             "https://yun.139.com/w/",
+		"x-DeviceInfo":        "||9|6.6.0|chrome|95.0.4638.69|uwIy75obnsRPIwlJSd7D9GhUvFwG96ce||macos 10.15.2||zh-CN|||",
+		"x-huawei-channelSrc": "10000034",
+		"x-inner-ntwk":        "2",
+		"x-m4c-caller":        "PC",
+		"x-m4c-src":           "10002",
+		"x-SvcType":           svcType,
 	})
 
 	var e BaseResp
@@ -176,7 +151,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,
 			},
 		}
@@ -224,7 +199,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 +220,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,
@@ -258,7 +232,6 @@ func (d *Yun139) familyGetFiles(catalogID string) ([]model.Obj, error) {
 				IsFolder: true,
 				Modified: getTime(catalog.LastUpdateTime),
 				Ctime:    getTime(catalog.CreateTime),
-				Path:     path, // 文件夹上一级的Path
 			}
 			files = append(files, &f)
 		}
@@ -270,14 +243,13 @@ func (d *Yun139) familyGetFiles(catalogID string) ([]model.Obj, error) {
 					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 +257,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,32 +273,6 @@ 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)
@@ -408,17 +299,17 @@ func (d *Yun139) personalRequest(pathname string, method string, callback base.R
 	}
 	req.SetHeaders(map[string]string{
 		"Accept":               "application/json, text/plain, */*",
-		"Authorization":        "Basic " + d.getAuthorization(),
+		"Authorization":        "Basic " + d.Authorization,
 		"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",
+		"Mcloud-Version":       "7.13.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-DeviceInfo":         "||9|7.13.0|chrome|120.0.0.0|||windows 10||zh-CN|||",
 		"x-huawei-channelSrc":  "10000034",
 		"x-inner-ntwk":         "2",
 		"x-m4c-caller":         "PC",
@@ -427,7 +318,7 @@ func (d *Yun139) personalRequest(pathname string, method string, callback base.R
 		"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-Client-Info":    "||9|7.13.0|chrome|120.0.0.0|||windows 10||zh-CN|||dW5kZWZpbmVk||",
 		"X-Yun-Module-Type":    "100",
 		"X-Yun-Svc-Type":       "1",
 	})
@@ -539,16 +430,3 @@ func (d *Yun139) personalGetLink(fileId string) (string, error) {
 		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,11 +375,11 @@ 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)
-		_ = r.Body.Close()
 		up(float64(i) * 100 / float64(count))
 	}
 	fileMd5 := hex.EncodeToString(md5Sum.Sum(nil))

drivers/189pc/driver.go

@@ -1,8 +1,8 @@
 package _189pc
 
 import (
+	"container/ring"
 	"context"
-	"fmt"
 	"net/http"
 	"strconv"
 	"strings"
@@ -14,7 +14,6 @@ import (
 	"github.com/alist-org/alist/v3/internal/model"
 	"github.com/alist-org/alist/v3/pkg/utils"
 	"github.com/go-resty/resty/v2"
-	"github.com/google/uuid"
 )
 
 type Cloud189PC struct {
@@ -30,11 +29,10 @@ type Cloud189PC struct {
 
 	uploadThread int
 
-	familyTransferFolder    *Cloud189Folder
+	familyTransferFolder    *ring.Ring
 	cleanFamilyTransferFile func()
 
 	storageConfig driver.Config
-	ref           *Cloud189PC
 }
 
 func (y *Cloud189PC) Config() driver.Config {
@@ -49,18 +47,9 @@ 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
-		}
-	}
+	// 兼容旧上传接口
+	y.storageConfig.NoOverwriteUpload = y.isFamily() && (y.Addition.RapidUpload || y.Addition.UploadMethod == "old")
+
 	// 处理个人云和家庭云参数
 	if y.isFamily() && y.RootFolderID == "-11" {
 		y.RootFolderID = ""
@@ -75,22 +64,20 @@ func (y *Cloud189PC) Init(ctx context.Context) (err error) {
 		y.uploadThread, y.UploadThread = 3, "3"
 	}
 
-	if y.ref == nil {
-		// 初始化请求客户端
-		if y.client == nil {
-			y.client = base.NewRestyClient().SetHeaders(map[string]string{
-				"Accept":  "application/json;charset=UTF-8",
-				"Referer": WEB_URL,
-			})
-		}
+	// 初始化请求客户端
+	if y.client == nil {
+		y.client = base.NewRestyClient().SetHeaders(map[string]string{
+			"Accept":  "application/json;charset=UTF-8",
+			"Referer": WEB_URL,
+		})
+	}
 
-		// 避免重复登陆
-		identity := utils.GetMD5EncodeStr(y.Username + y.Password)
-		if !y.isLogin() || y.identity != identity {
-			y.identity = identity
-			if err = y.login(); err != nil {
-				return
-			}
+	// 避免重复登陆
+	identity := utils.GetMD5EncodeStr(y.Username + y.Password)
+	if !y.isLogin() || y.identity != identity {
+		y.identity = identity
+		if err = y.login(); err != nil {
+			return
 		}
 	}
 
@@ -101,14 +88,13 @@ func (y *Cloud189PC) Init(ctx context.Context) (err error) {
 		}
 	}
 
-	// 创建中转文件夹
+	// 创建中转文件夹,防止重名文件
 	if y.FamilyTransfer {
-		if err := y.createFamilyTransferFolder(); err != nil {
+		if y.familyTransferFolder, err = y.createFamilyTransferFolder(32); 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)
@@ -117,17 +103,7 @@ func (y *Cloud189PC) Init(ctx context.Context) (err error) {
 	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
 }
 
@@ -338,49 +314,35 @@ func (y *Cloud189PC) Put(ctx context.Context, dstDir model.Obj, stream model.Fil
 	if !isFamily && y.FamilyTransfer {
 		// 修改上传目标为家庭云文件夹
 		transferDstDir := dstDir
-		dstDir = y.familyTransferFolder
+		dstDir = (y.familyTransferFolder.Value).(*Cloud189Folder)
+		y.familyTransferFolder = y.familyTransferFolder.Next()
 
-		// 使用临时文件名
-		srcName := stream.GetName()
-		stream = &WrapFileStreamer{
-			FileStreamer: stream,
-			Name:         fmt.Sprintf("0%s.transfer", uuid.NewString()),
-		}
-
-		// 使用家庭云上传
 		isFamily = true
 		overwrite = false
 
 		defer func() {
 			if newObj != nil {
+				// 批量任务有概率删不掉
+				y.cleanFamilyTransferFile()
+
 				// 转存家庭云文件到个人云
 				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
+
+				task := BatchTaskInfo{
+					FileId:   newObj.GetID(),
+					FileName: newObj.GetName(),
+					IsFolder: BoolToNumber(newObj.IsDir()),
 				}
 
-				// 查找转存文件
-				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())
+				// 删除源文件
+				if resp, err := y.CreateBatchTask("DELETE", y.FamilyID, "", nil, task); err == nil {
+					y.WaitBatchTask("DELETE", resp.TaskID, time.Second)
+					// 永久删除
+					if resp, err := y.CreateBatchTask("CLEAR_RECYCLE", y.FamilyID, "", nil, task); err == nil {
+						y.WaitBatchTask("CLEAR_RECYCLE", resp.TaskID, time.Second)
 					}
-					return
 				}
-
-				// 重命名转存文件
-				newObj, err = y.Rename(context.TODO(), file, srcName)
-				if err != nil {
-					// 重命名失败删除源文件
-					_ = y.Delete(context.TODO(), "", file)
-				}
-				return
+				newObj = nil
 			}
 		}()
 	}

drivers/189pc/help.go

@@ -18,7 +18,6 @@ import (
 	"strings"
 	"time"
 
-	"github.com/alist-org/alist/v3/internal/model"
 	"github.com/alist-org/alist/v3/pkg/utils/random"
 )
 
@@ -209,12 +208,3 @@ func IF[V any](o bool, t V, f V) V {
 	}
 	return f
 }
-
-type WrapFileStreamer struct {
-	model.FileStreamer
-	Name string
-}
-
-func (w *WrapFileStreamer) GetName() string {
-	return w.Name
-}

drivers/189pc/utils.go

@@ -2,6 +2,7 @@ package _189pc
 
 import (
 	"bytes"
+	"container/ring"
 	"context"
 	"crypto/md5"
 	"encoding/base64"
@@ -19,12 +20,9 @@ import (
 	"strings"
 	"time"
 
-	"golang.org/x/sync/semaphore"
-
 	"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/internal/op"
 	"github.com/alist-org/alist/v3/internal/setting"
@@ -59,11 +57,11 @@ const (
 
 func (y *Cloud189PC) SignatureHeader(url, method, params string, isFamily bool) map[string]string {
 	dateOfGmt := getHttpDateStr()
-	sessionKey := y.getTokenInfo().SessionKey
-	sessionSecret := y.getTokenInfo().SessionSecret
+	sessionKey := y.tokenInfo.SessionKey
+	sessionSecret := y.tokenInfo.SessionSecret
 	if isFamily {
-		sessionKey = y.getTokenInfo().FamilySessionKey
-		sessionSecret = y.getTokenInfo().FamilySessionSecret
+		sessionKey = y.tokenInfo.FamilySessionKey
+		sessionSecret = y.tokenInfo.FamilySessionSecret
 	}
 
 	header := map[string]string{
@@ -76,9 +74,9 @@ func (y *Cloud189PC) SignatureHeader(url, method, params string, isFamily bool)
 }
 
 func (y *Cloud189PC) EncryptParams(params Params, isFamily bool) string {
-	sessionSecret := y.getTokenInfo().SessionSecret
+	sessionSecret := y.tokenInfo.SessionSecret
 	if isFamily {
-		sessionSecret = y.getTokenInfo().FamilySessionSecret
+		sessionSecret = y.tokenInfo.FamilySessionSecret
 	}
 	if params != nil {
 		return AesECBEncrypt(params.Encode(), sessionSecret[:16])
@@ -87,7 +85,7 @@ func (y *Cloud189PC) EncryptParams(params Params, isFamily bool) string {
 }
 
 func (y *Cloud189PC) request(url, method string, callback base.ReqCallback, params Params, resp interface{}, isFamily ...bool) ([]byte, error) {
-	req := y.getClient().R().SetQueryParams(clientSuffix())
+	req := y.client.R().SetQueryParams(clientSuffix())
 
 	// 设置params
 	paramsData := y.EncryptParams(params, isBool(isFamily...))
@@ -176,8 +174,8 @@ func (y *Cloud189PC) put(ctx context.Context, url string, headers map[string]str
 	}
 
 	var erron RespErr
-	_ = jsoniter.Unmarshal(body, &erron)
-	_ = xml.Unmarshal(body, &erron)
+	jsoniter.Unmarshal(body, &erron)
+	xml.Unmarshal(body, &erron)
 	if erron.HasError() {
 		return nil, &erron
 	}
@@ -187,9 +185,39 @@ func (y *Cloud189PC) put(ctx context.Context, url string, headers map[string]str
 	return body, nil
 }
 func (y *Cloud189PC) getFiles(ctx context.Context, fileId string, isFamily bool) ([]model.Obj, error) {
-	res := make([]model.Obj, 0, 100)
+	fullUrl := API_URL
+	if isFamily {
+		fullUrl += "/family/file"
+	}
+	fullUrl += "/listFiles.action"
+
+	res := make([]model.Obj, 0, 130)
 	for pageNum := 1; ; pageNum++ {
-		resp, err := y.getFilesWithPage(ctx, fileId, isFamily, pageNum, 1000, y.OrderBy, y.OrderDirection)
+		var resp Cloud189FilesResp
+		_, err := y.get(fullUrl, func(r *resty.Request) {
+			r.SetContext(ctx)
+			r.SetQueryParams(map[string]string{
+				"folderId":   fileId,
+				"fileType":   "0",
+				"mediaAttr":  "0",
+				"iconOption": "5",
+				"pageNum":    fmt.Sprint(pageNum),
+				"pageSize":   "130",
+			})
+			if isFamily {
+				r.SetQueryParams(map[string]string{
+					"familyId":   y.FamilyID,
+					"orderBy":    toFamilyOrderBy(y.OrderBy),
+					"descending": toDesc(y.OrderDirection),
+				})
+			} else {
+				r.SetQueryParams(map[string]string{
+					"recursive":  "0",
+					"orderBy":    y.OrderBy,
+					"descending": toDesc(y.OrderDirection),
+				})
+			}
+		}, &resp, isFamily)
 		if err != nil {
 			return nil, err
 		}
@@ -208,63 +236,6 @@ func (y *Cloud189PC) getFiles(ctx context.Context, fileId string, isFamily bool)
 	return res, nil
 }
 
-func (y *Cloud189PC) getFilesWithPage(ctx context.Context, fileId string, isFamily bool, pageNum int, pageSize int, orderBy string, orderDirection string) (*Cloud189FilesResp, error) {
-	fullUrl := API_URL
-	if isFamily {
-		fullUrl += "/family/file"
-	}
-	fullUrl += "/listFiles.action"
-
-	var resp Cloud189FilesResp
-	_, err := y.get(fullUrl, func(r *resty.Request) {
-		r.SetContext(ctx)
-		r.SetQueryParams(map[string]string{
-			"folderId":   fileId,
-			"fileType":   "0",
-			"mediaAttr":  "0",
-			"iconOption": "5",
-			"pageNum":    fmt.Sprint(pageNum),
-			"pageSize":   fmt.Sprint(pageSize),
-		})
-		if isFamily {
-			r.SetQueryParams(map[string]string{
-				"familyId":   y.FamilyID,
-				"orderBy":    toFamilyOrderBy(orderBy),
-				"descending": toDesc(orderDirection),
-			})
-		} else {
-			r.SetQueryParams(map[string]string{
-				"recursive":  "0",
-				"orderBy":    orderBy,
-				"descending": toDesc(orderDirection),
-			})
-		}
-	}, &resp, isFamily)
-	if err != nil {
-		return nil, err
-	}
-	return &resp, nil
-}
-
-func (y *Cloud189PC) findFileByName(ctx context.Context, searchName string, folderId string, isFamily bool) (*Cloud189File, error) {
-	for pageNum := 1; ; pageNum++ {
-		resp, err := y.getFilesWithPage(ctx, folderId, isFamily, pageNum, 10, "filename", "asc")
-		if err != nil {
-			return nil, err
-		}
-		// 获取完毕跳出
-		if resp.FileListAO.Count == 0 {
-			return nil, errs.ObjectNotFound
-		}
-		for i := 0; i < len(resp.FileListAO.FileList); i++ {
-			file := resp.FileListAO.FileList[i]
-			if file.Name == searchName {
-				return &file, nil
-			}
-		}
-	}
-}
-
 func (y *Cloud189PC) login() (err error) {
 	// 初始化登陆所需参数
 	if y.loginParam == nil {
@@ -432,9 +403,6 @@ func (y *Cloud189PC) initLoginParam() error {
 
 // 刷新会话
 func (y *Cloud189PC) refreshSession() (err error) {
-	if y.ref != nil {
-		return y.ref.refreshSession()
-	}
 	var erron RespErr
 	var userSessionResp UserSessionResp
 	_, err = y.client.R().
@@ -510,7 +478,6 @@ func (y *Cloud189PC) StreamUpload(ctx context.Context, dstDir model.Obj, file mo
 		retry.Attempts(3),
 		retry.Delay(time.Second),
 		retry.DelayType(retry.BackOffDelay))
-	sem := semaphore.NewWeighted(3)
 
 	fileMd5 := md5.New()
 	silceMd5 := md5.New()
@@ -520,6 +487,7 @@ func (y *Cloud189PC) StreamUpload(ctx context.Context, dstDir model.Obj, file mo
 		if utils.IsCanceled(upCtx) {
 			break
 		}
+
 		byteData := make([]byte, sliceSize)
 		if i == count {
 			byteData = byteData[:lastPartSize]
@@ -528,7 +496,6 @@ func (y *Cloud189PC) StreamUpload(ctx context.Context, dstDir model.Obj, file mo
 		// 读取块
 		silceMd5.Reset()
 		if _, err := io.ReadFull(io.TeeReader(file, io.MultiWriter(fileMd5, silceMd5)), byteData); err != io.EOF && err != nil {
-			sem.Release(1)
 			return nil, err
 		}
 
@@ -538,10 +505,6 @@ func (y *Cloud189PC) StreamUpload(ctx context.Context, dstDir model.Obj, file mo
 		partInfo := fmt.Sprintf("%d-%s", i, base64.StdEncoding.EncodeToString(md5Bytes))
 
 		threadG.Go(func(ctx context.Context) error {
-			if err = sem.Acquire(ctx, 1); err != nil {
-				return err
-			}
-			defer sem.Release(1)
 			uploadUrls, err := y.GetMultiUploadUrls(ctx, isFamily, initMultiUpload.Data.UploadFileID, partInfo)
 			if err != nil {
 				return err
@@ -549,8 +512,7 @@ func (y *Cloud189PC) StreamUpload(ctx context.Context, dstDir model.Obj, file mo
 
 			// step.4 上传切片
 			uploadUrl := uploadUrls[0]
-			_, err = y.put(ctx, uploadUrl.RequestURL, uploadUrl.Headers, false,
-				driver.NewLimitedUploadStream(ctx, bytes.NewReader(byteData)), isFamily)
+			_, err = y.put(ctx, uploadUrl.RequestURL, uploadUrl.Headers, false, bytes.NewReader(byteData), isFamily)
 			if err != nil {
 				return err
 			}
@@ -658,7 +620,7 @@ func (y *Cloud189PC) FastUpload(ctx context.Context, dstDir model.Obj, file mode
 	}
 
 	// 尝试恢复进度
-	uploadProgress, ok := base.GetUploadProgress[*UploadProgress](y, y.getTokenInfo().SessionKey, fileMd5Hex)
+	uploadProgress, ok := base.GetUploadProgress[*UploadProgress](y, y.tokenInfo.SessionKey, fileMd5Hex)
 	if !ok {
 		//step.2 预上传
 		params := Params{
@@ -725,7 +687,7 @@ func (y *Cloud189PC) FastUpload(ctx context.Context, dstDir model.Obj, file mode
 		if err = threadG.Wait(); err != nil {
 			if errors.Is(err, context.Canceled) {
 				uploadProgress.UploadParts = utils.SliceFilter(uploadProgress.UploadParts, func(s string) bool { return s != "" })
-				base.SaveUploadProgress(y, uploadProgress, y.getTokenInfo().SessionKey, fileMd5Hex)
+				base.SaveUploadProgress(y, uploadProgress, y.tokenInfo.SessionKey, fileMd5Hex)
 			}
 			return nil, err
 		}
@@ -802,7 +764,6 @@ func (y *Cloud189PC) OldUpload(ctx context.Context, dstDir model.Obj, file model
 	if err != nil {
 		return nil, err
 	}
-	rateLimited := driver.NewLimitedUploadStream(ctx, io.NopCloser(tempFile))
 
 	// 创建上传会话
 	uploadInfo, err := y.OldUploadCreate(ctx, dstDir.GetID(), fileMd5, file.GetName(), fmt.Sprint(file.GetSize()), isFamily)
@@ -829,7 +790,7 @@ func (y *Cloud189PC) OldUpload(ctx context.Context, dstDir model.Obj, file model
 			header["Edrive-UploadFileId"] = fmt.Sprint(status.UploadFileId)
 		}
 
-		_, err := y.put(ctx, status.FileUploadUrl, header, true, rateLimited, isFamily)
+		_, err := y.put(ctx, status.FileUploadUrl, header, true, io.NopCloser(tempFile), isFamily)
 		if err, ok := err.(*RespErr); ok && err.Code != "InputStreamReadError" {
 			return nil, err
 		}
@@ -938,7 +899,8 @@ func (y *Cloud189PC) isLogin() bool {
 }
 
 // 创建家庭云中转文件夹
-func (y *Cloud189PC) createFamilyTransferFolder() error {
+func (y *Cloud189PC) createFamilyTransferFolder(count int) (*ring.Ring, error) {
+	folders := ring.New(count)
 	var rootFolder Cloud189Folder
 	_, err := y.post(API_URL+"/family/file/createFolder.action", func(req *resty.Request) {
 		req.SetQueryParams(map[string]string{
@@ -947,61 +909,81 @@ func (y *Cloud189PC) createFamilyTransferFolder() error {
 		})
 	}, &rootFolder, true)
 	if err != nil {
-		return err
+		return nil, err
 	}
-	y.familyTransferFolder = &rootFolder
-	return nil
+
+	folderCount := 0
+
+	// 获取已有目录
+	files, err := y.getFiles(context.TODO(), rootFolder.GetID(), true)
+	if err != nil {
+		return nil, err
+	}
+	for _, file := range files {
+		if folder, ok := file.(*Cloud189Folder); ok {
+			folders.Value = folder
+			folders = folders.Next()
+			folderCount++
+		}
+	}
+
+	// 创建新的目录
+	for folderCount < count {
+		var newFolder Cloud189Folder
+		_, err := y.post(API_URL+"/family/file/createFolder.action", func(req *resty.Request) {
+			req.SetQueryParams(map[string]string{
+				"folderName": uuid.NewString(),
+				"familyId":   y.FamilyID,
+				"parentId":   rootFolder.GetID(),
+			})
+		}, &newFolder, true)
+		if err != nil {
+			return nil, err
+		}
+		folders.Value = &newFolder
+		folders = folders.Next()
+		folderCount++
+	}
+	return folders, nil
 }
 
 // 清理中转文件夹
 func (y *Cloud189PC) cleanFamilyTransfer(ctx context.Context) error {
-	transferFolderId := y.familyTransferFolder.GetID()
-	for pageNum := 1; ; pageNum++ {
-		resp, err := y.getFilesWithPage(ctx, transferFolderId, true, pageNum, 100, "lastOpTime", "asc")
+	var tasks []BatchTaskInfo
+	r := y.familyTransferFolder
+	for p := r.Next(); p != r; p = p.Next() {
+		folder := p.Value.(*Cloud189Folder)
+
+		files, err := y.getFiles(ctx, folder.GetID(), true)
 		if err != nil {
 			return err
 		}
-		// 获取完毕跳出
-		if resp.FileListAO.Count == 0 {
-			break
-		}
-
-		var tasks []BatchTaskInfo
-		for i := 0; i < len(resp.FileListAO.FolderList); i++ {
-			folder := resp.FileListAO.FolderList[i]
-			tasks = append(tasks, BatchTaskInfo{
-				FileId:   folder.GetID(),
-				FileName: folder.GetName(),
-				IsFolder: BoolToNumber(folder.IsDir()),
-			})
-		}
-		for i := 0; i < len(resp.FileListAO.FileList); i++ {
-			file := resp.FileListAO.FileList[i]
+		for _, file := range files {
 			tasks = append(tasks, BatchTaskInfo{
 				FileId:   file.GetID(),
 				FileName: file.GetName(),
 				IsFolder: BoolToNumber(file.IsDir()),
 			})
 		}
+	}
 
-		if len(tasks) > 0 {
-			// 删除
-			resp, err := y.CreateBatchTask("DELETE", y.FamilyID, "", nil, tasks...)
-			if err != nil {
-				return err
-			}
-			err = y.WaitBatchTask("DELETE", resp.TaskID, time.Second)
-			if err != nil {
-				return err
-			}
-			// 永久删除
-			resp, err = y.CreateBatchTask("CLEAR_RECYCLE", y.FamilyID, "", nil, tasks...)
-			if err != nil {
-				return err
-			}
-			err = y.WaitBatchTask("CLEAR_RECYCLE", resp.TaskID, time.Second)
+	if len(tasks) > 0 {
+		// 删除
+		resp, err := y.CreateBatchTask("DELETE", y.FamilyID, "", nil, tasks...)
+		if err != nil {
 			return err
 		}
+		err = y.WaitBatchTask("DELETE", resp.TaskID, time.Second)
+		if err != nil {
+			return err
+		}
+		// 永久删除
+		resp, err = y.CreateBatchTask("CLEAR_RECYCLE", y.FamilyID, "", nil, tasks...)
+		if err != nil {
+			return err
+		}
+		err = y.WaitBatchTask("CLEAR_RECYCLE", resp.TaskID, time.Second)
+		return err
 	}
 	return nil
 }
@@ -1026,7 +1008,7 @@ func (y *Cloud189PC) getFamilyID() (string, error) {
 		return "", fmt.Errorf("cannot get automatically,please input family_id")
 	}
 	for _, info := range infos {
-		if strings.Contains(y.getTokenInfo().LoginName, info.RemarkName) {
+		if strings.Contains(y.tokenInfo.LoginName, info.RemarkName) {
 			return fmt.Sprint(info.FamilyID), nil
 		}
 	}
@@ -1078,34 +1060,6 @@ func (y *Cloud189PC) SaveFamilyFileToPersonCloud(ctx context.Context, familyId s
 	}
 }
 
-// 永久删除文件
-func (y *Cloud189PC) Delete(ctx context.Context, familyId string, srcObj model.Obj) error {
-	task := BatchTaskInfo{
-		FileId:   srcObj.GetID(),
-		FileName: srcObj.GetName(),
-		IsFolder: BoolToNumber(srcObj.IsDir()),
-	}
-	// 删除源文件
-	resp, err := y.CreateBatchTask("DELETE", familyId, "", nil, task)
-	if err != nil {
-		return err
-	}
-	err = y.WaitBatchTask("DELETE", resp.TaskID, time.Second)
-	if err != nil {
-		return err
-	}
-	// 清除回收站
-	resp, err = y.CreateBatchTask("CLEAR_RECYCLE", familyId, "", nil, task)
-	if err != nil {
-		return err
-	}
-	err = y.WaitBatchTask("CLEAR_RECYCLE", resp.TaskID, time.Second)
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
 func (y *Cloud189PC) CreateBatchTask(aType string, familyID string, targetFolderId string, other map[string]string, taskInfos ...BatchTaskInfo) (*CreateBatchTaskResp, error) {
 	var resp CreateBatchTaskResp
 	_, err := y.post(API_URL+"/batch/createBatchTask.action", func(req *resty.Request) {
@@ -1188,17 +1142,3 @@ func (y *Cloud189PC) WaitBatchTask(aType string, taskID string, t time.Duration)
 		time.Sleep(t)
 	}
 }
-
-func (y *Cloud189PC) getTokenInfo() *AppSessionResp {
-	if y.ref != nil {
-		return y.ref.getTokenInfo()
-	}
-	return y.tokenInfo
-}
-
-func (y *Cloud189PC) getClient() *resty.Client {
-	if y.ref != nil {
-		return y.ref.getClient()
-	}
-	return y.client
-}

drivers/alias/driver.go

@@ -3,7 +3,6 @@ package alias
 import (
 	"context"
 	"errors"
-	stdpath "path"
 	"strings"
 
 	"github.com/alist-org/alist/v3/internal/driver"
@@ -111,62 +110,14 @@ 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)
+	reqPath, err := d.getReqPath(ctx, srcObj)
 	if err == nil {
 		return fs.Rename(ctx, *reqPath, newName)
 	}
@@ -176,33 +127,8 @@ func (d *Alias) Rename(ctx context.Context, srcObj model.Obj, newName string) er
 	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)
+	reqPath, err := d.getReqPath(ctx, obj)
 	if err == nil {
 		return fs.Remove(ctx, *reqPath)
 	}
@@ -212,110 +138,4 @@ func (d *Alias) Remove(ctx context.Context, obj model.Obj) error {
 	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,18 +9,15 @@ type Addition struct {
 	// Usually one of two
 	// driver.RootPath
 	// define other
-	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"`
+	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"`
 }
 
 var config = driver.Config{
 	Name:             "Alias",
 	LocalSort:        true,
 	NoCache:          true,
-	NoUpload:         false,
+	NoUpload:         true,
 	DefaultRoot:      "/",
 	ProxyRangeOption: true,
 }

drivers/alias/util.go

@@ -3,15 +3,12 @@ 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"
@@ -65,7 +62,6 @@ 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
 }
 
@@ -98,15 +94,10 @@ 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, reqActualPath, err := op.GetStorageAndActualPath(reqPath)
+	storage, err := fs.GetStorage(reqPath, &fs.GetStoragesArgs{})
 	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
@@ -123,13 +114,13 @@ func (d *Alias) link(ctx context.Context, dst, sub string, args model.LinkArgs)
 		}
 		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) {
+func (d *Alias) getReqPath(ctx context.Context, obj model.Obj) (*string, error) {
 	root, sub := d.getRootAndPath(obj.GetPath())
-	if sub == "" && !isParent {
+	if sub == "" {
 		return nil, errs.NotSupport
 	}
 	dsts, ok := d.pathMap[root]
@@ -158,68 +149,3 @@ func (d *Alias) getReqPath(ctx context.Context, obj model.Obj, isParent bool) (*
 	}
 	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

@@ -5,14 +5,12 @@ import (
 	"fmt"
 	"io"
 	"net/http"
-	"net/url"
 	"path"
 	"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"
@@ -36,7 +34,7 @@ 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 {
@@ -50,15 +48,15 @@ func (d *AListV3) Init(ctx context.Context) error {
 		}
 	}
 	// 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"
-		res, err := base.RestyClient.R().Get(u)
+		url := d.Address + "/api/public/settings"
+		res, err := base.RestyClient.R().Get(url)
 		if err != nil {
 			return err
 		}
@@ -76,7 +74,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,
@@ -118,7 +116,7 @@ func (d *AListV3) Link(ctx context.Context, file model.Obj, args model.LinkArgs)
 			userAgent = base.UserAgent
 		}
 	}
-	_, _, err := d.request("/fs/get", http.MethodPost, func(req *resty.Request) {
+	_, err := d.request("/fs/get", http.MethodPost, func(req *resty.Request) {
 		req.SetResult(&resp).SetBody(FsGetReq{
 			Path:     file.GetPath(),
 			Password: d.MetaPassword,
@@ -133,7 +131,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 +140,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 +151,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 +161,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 +172,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,29 +181,16 @@ 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 {
-	reader := driver.NewLimitedUploadStream(ctx, &driver.ReaderUpdatingProgress{
-		Reader:         s,
-		UpdateProgress: up,
-	})
-	req, err := http.NewRequestWithContext(ctx, http.MethodPut, d.Address+"/api/fs/put", reader)
+func (d *AListV3) Put(ctx context.Context, dstDir model.Obj, stream model.FileStreamer, up driver.UpdateProgress) error {
+	req, err := http.NewRequestWithContext(ctx, http.MethodPut, d.Address+"/api/fs/put", stream)
 	if err != nil {
 		return err
 	}
 	req.Header.Set("Authorization", d.Token)
-	req.Header.Set("File-Path", path.Join(dstDir.GetPath(), s.GetName()))
+	req.Header.Set("File-Path", path.Join(dstDir.GetPath(), stream.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()
+	req.ContentLength = stream.GetSize()
 	// client := base.NewHttpClient()
 	// client.Timeout = time.Hour * 6
 	res, err := base.HttpClient.Do(req)
@@ -234,127 +219,6 @@ func (d *AListV3) Put(ctx context.Context, dstDir model.Obj, s model.FileStreame
 	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
-}
-
 //func (d *AList) Other(ctx context.Context, args model.OtherArgs) (interface{}, error) {
 //	return nil, errs.NotSupport
 //}

drivers/alist_v3/meta.go

@@ -7,13 +7,12 @@ import (
 
 type Addition struct {
 	driver.RootPath
-	Address           string `json:"url" required:"true"`
-	MetaPassword      string `json:"meta_password"`
-	Username          string `json:"username"`
-	Password          string `json:"password"`
-	Token             string `json:"token"`
-	PassUAToUpsteam   bool   `json:"pass_ua_to_upsteam" default:"true"`
-	ForwardArchiveReq bool   `json:"forward_archive_requests" default:"true"`
+	Address         string `json:"url" required:"true"`
+	MetaPassword    string `json:"meta_password"`
+	Username        string `json:"username"`
+	Password        string `json:"password"`
+	Token           string `json:"token"`
+	PassUAToUpsteam bool   `json:"pass_ua_to_upsteam" default:"true"`
 }
 
 var config = driver.Config{

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 {
@@ -82,89 +81,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

@@ -17,7 +17,7 @@ func (d *AListV3) login() error {
 		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 +31,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 +40,22 @@ func (d *AListV3) request(api, method string, callback base.ReqCallback, retry .
 	}
 	res, err := req.Execute(method, url)
 	if err != nil {
-		code := 0
-		if res != nil {
-			code = res.StatusCode()
-		}
-		return nil, code, err
+		return nil, 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

@@ -14,12 +14,13 @@ import (
 	"os"
 	"time"
 
+	"github.com/alist-org/alist/v3/internal/stream"
+
 	"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/internal/stream"
 	"github.com/alist-org/alist/v3/pkg/cron"
 	"github.com/alist-org/alist/v3/pkg/utils"
 	"github.com/go-resty/resty/v2"
@@ -193,10 +194,7 @@ func (d *AliDrive) Put(ctx context.Context, dstDir model.Obj, streamer model.Fil
 	}
 	if d.RapidUpload {
 		buf := bytes.NewBuffer(make([]byte, 0, 1024))
-		_, err := utils.CopyWithBufferN(buf, file, 1024)
-		if err != nil {
-			return err
-		}
+		utils.CopyWithBufferN(buf, file, 1024)
 		reqBody["pre_hash"] = utils.HashData(utils.SHA1, buf.Bytes())
 		if localFile != nil {
 			if _, err := localFile.Seek(0, io.SeekStart); err != nil {
@@ -288,7 +286,6 @@ func (d *AliDrive) Put(ctx context.Context, dstDir model.Obj, streamer model.Fil
 		file.Reader = localFile
 	}
 
-	rateLimited := driver.NewLimitedUploadStream(ctx, file)
 	for i, partInfo := range resp.PartInfoList {
 		if utils.IsCanceled(ctx) {
 			return ctx.Err()
@@ -297,7 +294,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,7 +303,7 @@ 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))
 		}

drivers/aliyundrive_open/driver.go

@@ -19,12 +19,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 {
@@ -58,17 +58,7 @@ func (d *AliyundriveOpen) Init(ctx context.Context) error {
 	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
 }
 

drivers/aliyundrive_open/meta.go

@@ -6,7 +6,7 @@ import (
 )
 
 type Addition struct {
-	DriveType string `json:"drive_type" type:"select" options:"default,resource,backup" default:"resource"`
+	DriveType string `json:"drive_type" type:"select" options:"default,resource,backup" default:"default"`
 	driver.RootID
 	RefreshToken       string `json:"refresh_token" required:"true"`
 	OrderBy            string `json:"order_by" type:"select" options:"name,size,updated_at,created_at"`
@@ -32,10 +32,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.alipan.com",
+		}
 	})
 }

drivers/aliyundrive_open/upload.go

@@ -77,7 +77,7 @@ func (d *AliyundriveOpen) uploadPart(ctx context.Context, r io.Reader, partInfo
 	if err != nil {
 		return err
 	}
-	_ = res.Body.Close()
+	res.Body.Close()
 	if res.StatusCode != http.StatusOK && res.StatusCode != http.StatusConflict {
 		return fmt.Errorf("upload status: %d", res.StatusCode)
 	}
@@ -126,7 +126,7 @@ func getProofRange(input string, size int64) (*ProofRange, error) {
 }
 
 func (d *AliyundriveOpen) calProofCode(stream model.FileStreamer) (string, error) {
-	proofRange, err := getProofRange(d.getAccessToken(), stream.GetSize())
+	proofRange, err := getProofRange(d.AccessToken, stream.GetSize())
 	if err != nil {
 		return "", err
 	}
@@ -251,9 +251,8 @@ func (d *AliyundriveOpen) upload(ctx context.Context, dstDir model.Obj, stream m
 				rd = utils.NewMultiReadable(srd)
 			}
 			err = retry.Do(func() error {
-				_ = rd.Reset()
-				rateLimitedRd := driver.NewLimitedUploadStream(ctx, rd)
-				return d.uploadPart(ctx, rateLimitedRd, createResp.PartInfoList[i])
+				rd.Reset()
+				return d.uploadPart(ctx, rd, createResp.PartInfoList[i])
 			},
 				retry.Attempts(3),
 				retry.DelayType(retry.BackOffDelay),

drivers/aliyundrive_open/util.go

@@ -19,7 +19,7 @@ import (
 // do others that not defined in Driver interface
 
 func (d *AliyundriveOpen) _refreshToken() (string, string, error) {
-	url := API_URL + "/oauth/access_token"
+	url := d.base + "/oauth/access_token"
 	if d.OauthTokenURL != "" && d.ClientID == "" {
 		url = d.OauthTokenURL
 	}
@@ -74,9 +74,6 @@ func getSub(token string) (string, error) {
 }
 
 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 {
@@ -103,7 +100,7 @@ func (d *AliyundriveOpen) request(uri, method string, callback base.ReqCallback,
 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,7 +109,7 @@ 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 {
 			log.Errorf("[aliyundrive_open] request error: %s", res.String())
@@ -121,7 +118,7 @@ func (d *AliyundriveOpen) requestReturnErrResp(uri, method string, callback base
 	}
 	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
@@ -179,10 +176,3 @@ func getNowTime() (time.Time, string) {
 	nowTimeStr := nowTime.Format("2006-01-02T15:04:05.000Z")
 	return nowTime, nowTimeStr
 }
-
-func (d *AliyundriveOpen) getAccessToken() string {
-	if d.ref != nil {
-		return d.ref.getAccessToken()
-	}
-	return d.AccessToken
-}

drivers/all.go

@@ -2,7 +2,6 @@ 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"
@@ -16,19 +15,14 @@ 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"
@@ -40,7 +34,6 @@ import (
 	_ "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"

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

@@ -12,8 +12,6 @@ import (
 	"strconv"
 	"time"
 
-	"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"
@@ -78,8 +76,6 @@ 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)
 }
@@ -191,7 +187,7 @@ func (d *BaiduNetdisk) Put(ctx context.Context, dstDir model.Obj, stream model.F
 	}
 
 	streamSize := stream.GetSize()
-	sliceSize := d.getSliceSize(streamSize)
+	sliceSize := d.getSliceSize()
 	count := int(math.Max(math.Ceil(float64(streamSize)/float64(sliceSize)), 1))
 	lastBlockSize := streamSize % sliceSize
 	if streamSize > 0 && lastBlockSize == 0 {
@@ -199,7 +195,7 @@ func (d *BaiduNetdisk) Put(ctx context.Context, dstDir model.Obj, stream model.F
 	}
 
 	//cal md5 for first 256k data
-	const SliceSize int64 = 256 * utils.KB
+	const SliceSize int64 = 256 * 1024
 	// cal md5
 	blockList := make([]string, 0, count)
 	byteSize := sliceSize
@@ -264,10 +260,9 @@ func (d *BaiduNetdisk) Put(ctx context.Context, dstDir model.Obj, stream model.F
 	}
 	// step.2 上传分片
 	threadG, upCtx := errgroup.NewGroupWithContext(ctx, d.uploadThread,
-		retry.Attempts(1),
+		retry.Attempts(3),
 		retry.Delay(time.Second),
 		retry.DelayType(retry.BackOffDelay))
-	sem := semaphore.NewWeighted(3)
 	for i, partseq := range precreateResp.BlockList {
 		if utils.IsCanceled(upCtx) {
 			break
@@ -278,10 +273,6 @@ func (d *BaiduNetdisk) Put(ctx context.Context, dstDir model.Obj, stream model.F
 			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,
@@ -290,8 +281,7 @@ func (d *BaiduNetdisk) Put(ctx context.Context, dstDir model.Obj, stream model.F
 				"uploadid":     precreateResp.Uploadid,
 				"partseq":      strconv.Itoa(partseq),
 			}
-			err := d.uploadSlice(ctx, params, stream.GetName(),
-				driver.NewLimitedUploadStream(ctx, io.NewSectionReader(tempFile, offset, byteSize)))
+			err := d.uploadSlice(ctx, params, stream.GetName(), io.NewSectionReader(tempFile, offset, byteSize))
 			if err != nil {
 				return err
 			}

drivers/baidu_netdisk/meta.go

@@ -8,18 +8,16 @@ 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"`
-	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"`
-	ClientID              string `json:"client_id" required:"true" default:"iYCeC9g08h5vuP9UqvPHKKSVrKFXGa1v"`
-	ClientSecret          string `json:"client_secret" required:"true" default:"jXiFMOPVPCWlO2M5CwWQzffpNPaGTRBG"`
-	CustomCrackUA         string `json:"custom_crack_ua" required:"true" default:"netdisk"`
-	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"`
+	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"`
+	DownloadAPI          string `json:"download_api" type:"select" options:"official,crack" default:"official"`
+	ClientID             string `json:"client_id" required:"true" default:"iYCeC9g08h5vuP9UqvPHKKSVrKFXGa1v"`
+	ClientSecret         string `json:"client_secret" required:"true" default:"jXiFMOPVPCWlO2M5CwWQzffpNPaGTRBG"`
+	CustomCrackUA        string `json:"custom_crack_ua" required:"true" default:"netdisk"`
+	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"`
 }
 
 var config = driver.Config{

drivers/baidu_netdisk/types.go

@@ -6,7 +6,6 @@ import (
 	"time"
 
 	"github.com/alist-org/alist/v3/internal/model"
-	"github.com/alist-org/alist/v3/pkg/utils"
 )
 
 type TokenErrResp struct {
@@ -17,7 +16,7 @@ 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"`
 	//OperId      int   `json:"oper_id"`
@@ -56,11 +55,11 @@ 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.LocalCtime == 0 {
+		f.LocalCtime = f.Ctime
 	}
-	if f.ServerMtime == 0 {
-		f.ServerMtime = f.Mtime
+	if f.LocalMtime == 0 {
+		f.LocalMtime = f.Mtime
 	}
 	return &model.ObjThumb{
 		Object: model.Object{
@@ -68,12 +67,12 @@ func fileToObj(f File) *model.ObjThumb {
 			Path:     f.Path,
 			Name:     f.ServerFilename,
 			Size:     f.Size,
-			Modified: time.Unix(f.ServerMtime, 0),
-			Ctime:    time.Unix(f.ServerCtime, 0),
+			Modified: time.Unix(f.LocalMtime, 0),
+			Ctime:    time.Unix(f.LocalCtime, 0),
 			IsFolder: f.Isdir == 1,
 
 			// 直接获取的MD5是错误的
-			HashInfo: utils.NewHashInfo(utils.MD5, DecryptMd5(f.Md5)),
+			// HashInfo: utils.NewHashInfo(utils.MD5, f.Md5),
 		},
 		Thumbnail: model.Thumbnail{Thumbnail: f.Thumbs.Url3},
 	}

drivers/baidu_netdisk/util.go

@@ -1,14 +1,11 @@
 package baidu_netdisk
 
 import (
-	"encoding/hex"
 	"errors"
 	"fmt"
 	"net/http"
 	"strconv"
-	"strings"
 	"time"
-	"unicode"
 
 	"github.com/alist-org/alist/v3/drivers/base"
 	"github.com/alist-org/alist/v3/internal/errs"
@@ -79,12 +76,6 @@ func (d *BaiduNetdisk) request(furl string, method string, callback base.ReqCall
 					return retry.Unrecoverable(err2)
 				}
 			}
-
-			if 31023 == errno && d.DownloadAPI == "crack_video" {
-				result = res.Body()
-				return nil
-			}
-
 			return fmt.Errorf("req: [%s] ,errno: %d, refer to https://pan.baidu.com/union/doc/", furl, errno)
 		}
 		result = res.Body()
@@ -137,21 +128,12 @@ func (d *BaiduNetdisk) getFiles(dir string) ([]File, error) {
 		if len(resp.List) == 0 {
 			break
 		}
-
-		if d.OnlyListVideoFile {
-			for _, file := range resp.List {
-				if file.Isdir == 1 || file.Category == 1 {
-					res = append(res, file)
-				}
-			}
-		} else {
-			res = append(res, resp.List...)
-		}
+		res = append(res, resp.List...)
 	}
 	return res, nil
 }
 
-func (d *BaiduNetdisk) linkOfficial(file model.Obj, _ model.LinkArgs) (*model.Link, error) {
+func (d *BaiduNetdisk) linkOfficial(file model.Obj, args model.LinkArgs) (*model.Link, error) {
 	var resp DownloadResp
 	params := map[string]string{
 		"method": "filemetas",
@@ -171,6 +153,8 @@ func (d *BaiduNetdisk) linkOfficial(file model.Obj, _ model.LinkArgs) (*model.Li
 	u = res.Header().Get("location")
 	//}
 
+	updateObjMd5(file, "pan.baidu.com", u)
+
 	return &model.Link{
 		URL: u,
 		Header: http.Header{
@@ -179,7 +163,7 @@ func (d *BaiduNetdisk) linkOfficial(file model.Obj, _ model.LinkArgs) (*model.Li
 	}, nil
 }
 
-func (d *BaiduNetdisk) linkCrack(file model.Obj, _ model.LinkArgs) (*model.Link, error) {
+func (d *BaiduNetdisk) linkCrack(file model.Obj, args model.LinkArgs) (*model.Link, error) {
 	var resp DownloadResp2
 	param := map[string]string{
 		"target": fmt.Sprintf("[\"%s\"]", file.GetPath()),
@@ -194,6 +178,8 @@ func (d *BaiduNetdisk) linkCrack(file model.Obj, _ model.LinkArgs) (*model.Link,
 		return nil, err
 	}
 
+	updateObjMd5(file, d.CustomCrackUA, resp.Info[0].Dlink)
+
 	return &model.Link{
 		URL: resp.Info[0].Dlink,
 		Header: http.Header{
@@ -202,34 +188,6 @@ func (d *BaiduNetdisk) linkCrack(file model.Obj, _ model.LinkArgs) (*model.Link,
 	}, nil
 }
 
-func (d *BaiduNetdisk) linkCrackVideo(file model.Obj, _ model.LinkArgs) (*model.Link, error) {
-	param := map[string]string{
-		"type":       "VideoURL",
-		"path":       fmt.Sprintf("%s", file.GetPath()),
-		"fs_id":      file.GetID(),
-		"devuid":     "0%1",
-		"clienttype": "1",
-		"channel":    "android_15_25010PN30C_bd-netdisk_1523a",
-		"nom3u8":     "1",
-		"dlink":      "1",
-		"media":      "1",
-		"origin":     "dlna",
-	}
-	resp, err := d.request("https://pan.baidu.com/api/mediainfo", http.MethodGet, func(req *resty.Request) {
-		req.SetQueryParams(param)
-	}, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	return &model.Link{
-		URL: utils.Json.Get(resp, "info", "dlink").ToString(),
-		Header: http.Header{
-			"User-Agent": []string{d.CustomCrackUA},
-		},
-	}, nil
-}
-
 func (d *BaiduNetdisk) manage(opera string, filelist any) ([]byte, error) {
 	params := map[string]string{
 		"method": "filemanager",
@@ -271,74 +229,37 @@ func joinTime(form map[string]string, ctime, mtime int64) {
 	form["local_ctime"] = strconv.FormatInt(ctime, 10)
 }
 
+func updateObjMd5(obj model.Obj, userAgent, u string) {
+	object := model.GetRawObject(obj)
+	if object != nil {
+		req, _ := http.NewRequest(http.MethodHead, u, nil)
+		req.Header.Add("User-Agent", userAgent)
+		resp, _ := base.HttpClient.Do(req)
+		if resp != nil {
+			contentMd5 := resp.Header.Get("Content-Md5")
+			object.HashInfo = utils.NewHashInfo(utils.MD5, contentMd5)
+		}
+	}
+}
+
 const (
 	DefaultSliceSize int64 = 4 * utils.MB
-	VipSliceSize     int64 = 16 * utils.MB
-	SVipSliceSize    int64 = 32 * utils.MB
-
-	MaxSliceNum       = 2048 // 文档写的是 1024/没写 ，但实际测试是 2048
-	SliceStep   int64 = 1 * utils.MB
+	VipSliceSize           = 16 * utils.MB
+	SVipSliceSize          = 32 * utils.MB
 )
 
-func (d *BaiduNetdisk) getSliceSize(filesize int64) int64 {
-	// 非会员固定为 4MB
-	if d.vipType == 0 {
-		if d.CustomUploadPartSize != 0 {
-			log.Warnf("CustomUploadPartSize is not supported for non-vip user, use DefaultSliceSize")
-		}
-		if filesize > MaxSliceNum*DefaultSliceSize {
-			log.Warnf("File size(%d) is too large, may cause upload failure", filesize)
-		}
-
-		return DefaultSliceSize
-	}
-
+func (d *BaiduNetdisk) getSliceSize() int64 {
 	if d.CustomUploadPartSize != 0 {
-		if d.CustomUploadPartSize < DefaultSliceSize {
-			log.Warnf("CustomUploadPartSize(%d) is less than DefaultSliceSize(%d), use DefaultSliceSize", d.CustomUploadPartSize, DefaultSliceSize)
-			return DefaultSliceSize
-		}
-
-		if d.vipType == 1 && d.CustomUploadPartSize > VipSliceSize {
-			log.Warnf("CustomUploadPartSize(%d) is greater than VipSliceSize(%d), use VipSliceSize", d.CustomUploadPartSize, VipSliceSize)
-			return VipSliceSize
-		}
-
-		if d.vipType == 2 && d.CustomUploadPartSize > SVipSliceSize {
-			log.Warnf("CustomUploadPartSize(%d) is greater than SVipSliceSize(%d), use SVipSliceSize", d.CustomUploadPartSize, SVipSliceSize)
-			return SVipSliceSize
-		}
-
 		return d.CustomUploadPartSize
 	}
-
-	maxSliceSize := DefaultSliceSize
-
 	switch d.vipType {
 	case 1:
-		maxSliceSize = VipSliceSize
+		return VipSliceSize
 	case 2:
-		maxSliceSize = SVipSliceSize
+		return SVipSliceSize
+	default:
+		return DefaultSliceSize
 	}
-
-	// upload on low bandwidth
-	if d.LowBandwithUploadMode {
-		size := DefaultSliceSize
-
-		for size <= maxSliceSize {
-			if filesize <= MaxSliceNum*size {
-				return size
-			}
-
-			size += SliceStep
-		}
-	}
-
-	if filesize > MaxSliceNum*maxSliceSize {
-		log.Warnf("File size(%d) is too large, may cause upload failure", filesize)
-	}
-
-	return maxSliceSize
 }
 
 // func encodeURIComponent(str string) string {
@@ -346,40 +267,3 @@ func (d *BaiduNetdisk) getSliceSize(filesize int64) int64 {
 // 	r = strings.ReplaceAll(r, "+", "%20")
 // 	return r
 // }
-
-func DecryptMd5(encryptMd5 string) string {
-	if _, err := hex.DecodeString(encryptMd5); err == nil {
-		return encryptMd5
-	}
-
-	var out strings.Builder
-	out.Grow(len(encryptMd5))
-	for i, n := 0, int64(0); i < len(encryptMd5); i++ {
-		if i == 9 {
-			n = int64(unicode.ToLower(rune(encryptMd5[i])) - 'g')
-		} else {
-			n, _ = strconv.ParseInt(encryptMd5[i:i+1], 16, 64)
-		}
-		out.WriteString(strconv.FormatInt(n^int64(15&i), 16))
-	}
-
-	encryptMd5 = out.String()
-	return encryptMd5[8:16] + encryptMd5[:8] + encryptMd5[24:32] + encryptMd5[16:24]
-}
-
-func EncryptMd5(originalMd5 string) string {
-	reversed := originalMd5[8:16] + originalMd5[:8] + originalMd5[24:32] + originalMd5[16:24]
-
-	var out strings.Builder
-	out.Grow(len(reversed))
-	for i, n := 0, int64(0); i < len(reversed); i++ {
-		n, _ = strconv.ParseInt(reversed[i:i+1], 16, 64)
-		n ^= int64(15 & i)
-		if i == 9 {
-			out.WriteRune(rune(n) + 'g')
-		} else {
-			out.WriteString(strconv.FormatInt(n, 16))
-		}
-	}
-	return out.String()
-}

drivers/baidu_photo/driver.go

@@ -13,8 +13,6 @@ import (
 	"strings"
 	"time"
 
-	"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"
@@ -29,10 +27,9 @@ type BaiduPhoto struct {
 	model.Storage
 	Addition
 
-	// AccessToken string
-	Uk       int64
-	bdstoken string
-	root     model.Obj
+	AccessToken string
+	Uk          int64
+	root        model.Obj
 
 	uploadThread int
 }
@@ -51,9 +48,9 @@ func (d *BaiduPhoto) Init(ctx context.Context) error {
 		d.uploadThread, d.UploadThread = 3, "3"
 	}
 
-	// if err := d.refreshToken(); err != nil {
-	// 	return err
-	// }
+	if err := d.refreshToken(); err != nil {
+		return err
+	}
 
 	// root
 	if d.AlbumID != "" {
@@ -76,10 +73,6 @@ func (d *BaiduPhoto) Init(ctx context.Context) error {
 	if err != nil {
 		return err
 	}
-	d.bdstoken, err = d.getBDStoken()
-	if err != nil {
-		return err
-	}
 	d.Uk, err = strconv.ParseInt(info.YouaID, 10, 64)
 	return err
 }
@@ -89,7 +82,7 @@ func (d *BaiduPhoto) GetRoot(ctx context.Context) (model.Obj, error) {
 }
 
 func (d *BaiduPhoto) Drop(ctx context.Context) error {
-	// d.AccessToken = ""
+	d.AccessToken = ""
 	d.Uk = 0
 	d.root = nil
 	return nil
@@ -147,13 +140,14 @@ func (d *BaiduPhoto) Link(ctx context.Context, file model.Obj, args model.LinkAr
 		// 处理共享相册
 		if d.Uk != file.Uk {
 			// 有概率无法获取到链接
-			// return d.linkAlbum(ctx, file, args)
+			return d.linkAlbum(ctx, file, args)
 
-			f, err := d.CopyAlbumFile(ctx, file)
-			if err != nil {
-				return nil, err
-			}
-			return d.linkFile(ctx, f, args)
+			// 接口被限制，只能使用cookie
+			// f, err := d.CopyAlbumFile(ctx, file)
+			// if err != nil {
+			// 	return nil, err
+			// }
+			// return d.linkFile(ctx, f, args)
 		}
 		return d.linkFile(ctx, &file.File, args)
 	}
@@ -298,12 +292,11 @@ func (d *BaiduPhoto) Put(ctx context.Context, dstDir model.Obj, stream model.Fil
 	}
 
 	// 尝试获取之前的进度
-	precreateResp, ok := base.GetUploadProgress[*PrecreateResp](d, strconv.FormatInt(d.Uk, 10), contentMd5)
+	precreateResp, ok := base.GetUploadProgress[*PrecreateResp](d, d.AccessToken, contentMd5)
 	if !ok {
 		_, err = d.Post(FILE_API_URL_V1+"/precreate", func(r *resty.Request) {
 			r.SetContext(ctx)
 			r.SetFormData(params)
-			r.SetQueryParam("bdstoken", d.bdstoken)
 		}, &precreateResp)
 		if err != nil {
 			return nil, err
@@ -316,7 +309,6 @@ func (d *BaiduPhoto) Put(ctx context.Context, dstDir model.Obj, stream model.Fil
 			retry.Attempts(3),
 			retry.Delay(time.Second),
 			retry.DelayType(retry.BackOffDelay))
-		sem := semaphore.NewWeighted(3)
 		for i, partseq := range precreateResp.BlockList {
 			if utils.IsCanceled(upCtx) {
 				break
@@ -328,22 +320,17 @@ func (d *BaiduPhoto) Put(ctx context.Context, dstDir model.Obj, stream model.Fil
 			}
 
 			threadG.Go(func(ctx context.Context) error {
-				if err = sem.Acquire(ctx, 1); err != nil {
-					return err
-				}
-				defer sem.Release(1)
 				uploadParams := map[string]string{
 					"method":   "upload",
 					"path":     params["path"],
 					"partseq":  fmt.Sprint(partseq),
 					"uploadid": precreateResp.UploadID,
-					"app_id":   "16051585",
 				}
+
 				_, err = d.Post("https://c3.pcs.baidu.com/rest/2.0/pcs/superfile2", func(r *resty.Request) {
 					r.SetContext(ctx)
 					r.SetQueryParams(uploadParams)
-					r.SetFileReader("file", stream.GetName(),
-						driver.NewLimitedUploadStream(ctx, io.NewSectionReader(tempFile, offset, byteSize)))
+					r.SetFileReader("file", stream.GetName(), io.NewSectionReader(tempFile, offset, byteSize))
 				}, nil)
 				if err != nil {
 					return err
@@ -356,7 +343,7 @@ func (d *BaiduPhoto) Put(ctx context.Context, dstDir model.Obj, stream model.Fil
 		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, strconv.FormatInt(d.Uk, 10), contentMd5)
+				base.SaveUploadProgress(d, precreateResp, d.AccessToken, contentMd5)
 			}
 			return nil, err
 		}
@@ -366,7 +353,6 @@ func (d *BaiduPhoto) Put(ctx context.Context, dstDir model.Obj, stream model.Fil
 		_, err = d.Post(FILE_API_URL_V1+"/create", func(r *resty.Request) {
 			r.SetContext(ctx)
 			r.SetFormData(params)
-			r.SetQueryParam("bdstoken", d.bdstoken)
 		}, &precreateResp)
 		if err != nil {
 			return nil, err

drivers/baidu_photo/meta.go

@@ -6,14 +6,13 @@ import (
 )
 
 type Addition struct {
-	// RefreshToken string `json:"refresh_token" required:"true"`
-	Cookie   string `json:"cookie" required:"true"`
-	ShowType string `json:"show_type" type:"select" options:"root,root_only_album,root_only_file" default:"root"`
-	AlbumID  string `json:"album_id"`
+	RefreshToken string `json:"refresh_token" required:"true"`
+	ShowType     string `json:"show_type" type:"select" options:"root,root_only_album,root_only_file" default:"root"`
+	AlbumID      string `json:"album_id"`
 	//AlbumPassword string `json:"album_password"`
-	DeleteOrigin bool `json:"delete_origin"`
-	// ClientID     string `json:"client_id" required:"true" default:"iYCeC9g08h5vuP9UqvPHKKSVrKFXGa1v"`
-	// ClientSecret string `json:"client_secret" required:"true" default:"jXiFMOPVPCWlO2M5CwWQzffpNPaGTRBG"`
+	DeleteOrigin bool   `json:"delete_origin"`
+	ClientID     string `json:"client_id" required:"true" default:"iYCeC9g08h5vuP9UqvPHKKSVrKFXGa1v"`
+	ClientSecret string `json:"client_secret" required:"true" default:"jXiFMOPVPCWlO2M5CwWQzffpNPaGTRBG"`
 	UploadThread string `json:"upload_thread" default:"3" help:"1<=thread<=32"`
 }
 

drivers/baidu_photo/types.go

@@ -72,7 +72,7 @@ func (c *File) Thumb() string {
 }
 
 func (c *File) GetHash() utils.HashInfo {
-	return utils.NewHashInfo(utils.MD5, DecryptMd5(c.Md5))
+	return utils.NewHashInfo(utils.MD5, c.Md5)
 }
 
 /*相册部分*/

drivers/baidu_photo/utils.go

@@ -2,15 +2,13 @@ package baiduphoto
 
 import (
 	"context"
-	"encoding/hex"
 	"fmt"
 	"net/http"
-	"strconv"
-	"strings"
-	"unicode"
 
 	"github.com/alist-org/alist/v3/drivers/base"
+	"github.com/alist-org/alist/v3/internal/errs"
 	"github.com/alist-org/alist/v3/internal/model"
+	"github.com/alist-org/alist/v3/internal/op"
 	"github.com/alist-org/alist/v3/pkg/utils"
 	"github.com/go-resty/resty/v2"
 )
@@ -25,8 +23,7 @@ const (
 
 func (d *BaiduPhoto) Request(client *resty.Client, furl string, method string, callback base.ReqCallback, resp interface{}) (*resty.Response, error) {
 	req := client.R().
-		// SetQueryParam("access_token", d.AccessToken)
-		SetHeader("Cookie", d.Cookie)
+		SetQueryParam("access_token", d.AccessToken)
 	if callback != nil {
 		callback(req)
 	}
@@ -48,10 +45,10 @@ func (d *BaiduPhoto) Request(client *resty.Client, furl string, method string, c
 		return nil, fmt.Errorf("no shared albums found")
 	case 50100:
 		return nil, fmt.Errorf("illegal title, only supports 50 characters")
-	// case -6:
-	// 	if err = d.refreshToken(); err != nil {
-	// 		return nil, err
-	// 	}
+	case -6:
+		if err = d.refreshToken(); err != nil {
+			return nil, err
+		}
 	default:
 		return nil, fmt.Errorf("errno: %d, refer to https://photo.baidu.com/union/doc", erron)
 	}
@@ -66,29 +63,29 @@ func (d *BaiduPhoto) Request(client *resty.Client, furl string, method string, c
 //	return res.Body(), nil
 //}
 
-// func (d *BaiduPhoto) refreshToken() error {
-// 	u := "https://openapi.baidu.com/oauth/2.0/token"
-// 	var resp base.TokenResp
-// 	var e TokenErrResp
-// 	_, err := base.RestyClient.R().SetResult(&resp).SetError(&e).SetQueryParams(map[string]string{
-// 		"grant_type":    "refresh_token",
-// 		"refresh_token": d.RefreshToken,
-// 		"client_id":     d.ClientID,
-// 		"client_secret": d.ClientSecret,
-// 	}).Get(u)
-// 	if err != nil {
-// 		return err
-// 	}
-// 	if e.ErrorMsg != "" {
-// 		return &e
-// 	}
-// 	if resp.RefreshToken == "" {
-// 		return errs.EmptyToken
-// 	}
-// 	d.AccessToken, d.RefreshToken = resp.AccessToken, resp.RefreshToken
-// 	op.MustSaveDriverStorage(d)
-// 	return nil
-// }
+func (d *BaiduPhoto) refreshToken() error {
+	u := "https://openapi.baidu.com/oauth/2.0/token"
+	var resp base.TokenResp
+	var e TokenErrResp
+	_, err := base.RestyClient.R().SetResult(&resp).SetError(&e).SetQueryParams(map[string]string{
+		"grant_type":    "refresh_token",
+		"refresh_token": d.RefreshToken,
+		"client_id":     d.ClientID,
+		"client_secret": d.ClientSecret,
+	}).Get(u)
+	if err != nil {
+		return err
+	}
+	if e.ErrorMsg != "" {
+		return &e
+	}
+	if resp.RefreshToken == "" {
+		return errs.EmptyToken
+	}
+	d.AccessToken, d.RefreshToken = resp.AccessToken, resp.RefreshToken
+	op.MustSaveDriverStorage(d)
+	return nil
+}
 
 func (d *BaiduPhoto) Get(furl string, callback base.ReqCallback, resp interface{}) (*resty.Response, error) {
 	return d.Request(base.RestyClient, furl, http.MethodGet, callback, resp)
@@ -362,6 +359,10 @@ func (d *BaiduPhoto) linkAlbum(ctx context.Context, file *AlbumFile, args model.
 
 	location := resp.Header().Get("Location")
 
+	if err != nil {
+		return nil, err
+	}
+
 	link := &model.Link{
 		URL: location,
 		Header: http.Header{
@@ -383,36 +384,36 @@ func (d *BaiduPhoto) linkFile(ctx context.Context, file *File, args model.LinkAr
 		headers["X-Forwarded-For"] = args.IP
 	}
 
-	var downloadUrl struct {
-		Dlink string `json:"dlink"`
-	}
-	_, err := d.Get(FILE_API_URL_V2+"/download", func(r *resty.Request) {
-		r.SetContext(ctx)
-		r.SetHeaders(headers)
-		r.SetQueryParams(map[string]string{
-			"fsid": fmt.Sprint(file.Fsid),
-		})
-	}, &downloadUrl)
-
-	// resp, err := d.Request(base.NoRedirectClient, FILE_API_URL_V1+"/download", http.MethodHead, func(r *resty.Request) {
+	// var downloadUrl struct {
+	// 	Dlink string `json:"dlink"`
+	// }
+	// _, err := d.Get(FILE_API_URL_V1+"/download", func(r *resty.Request) {
 	// 	r.SetContext(ctx)
 	// 	r.SetHeaders(headers)
 	// 	r.SetQueryParams(map[string]string{
 	// 		"fsid": fmt.Sprint(file.Fsid),
 	// 	})
-	// }, nil)
+	// }, &downloadUrl)
+
+	resp, err := d.Request(base.NoRedirectClient, FILE_API_URL_V1+"/download", http.MethodHead, func(r *resty.Request) {
+		r.SetContext(ctx)
+		r.SetHeaders(headers)
+		r.SetQueryParams(map[string]string{
+			"fsid": fmt.Sprint(file.Fsid),
+		})
+	}, nil)
 
 	if err != nil {
 		return nil, err
 	}
 
-	// if resp.StatusCode() != 302 {
-	// 	return nil, fmt.Errorf("not found 302 redirect")
-	// }
+	if resp.StatusCode() != 302 {
+		return nil, fmt.Errorf("not found 302 redirect")
+	}
 
-	// location := resp.Header().Get("Location")
+	location := resp.Header().Get("Location")
 	link := &model.Link{
-		URL: downloadUrl.Dlink,
+		URL: location,
 		Header: http.Header{
 			"User-Agent": []string{headers["User-Agent"]},
 			"Referer":    []string{"https://photo.baidu.com/"},
@@ -475,55 +476,3 @@ func (d *BaiduPhoto) uInfo() (*UInfo, error) {
 	}
 	return &info, nil
 }
-
-func (d *BaiduPhoto) getBDStoken() (string, error) {
-	var info struct {
-		Result struct {
-			Bdstoken string `json:"bdstoken"`
-			Token    string `json:"token"`
-			Uk       int64  `json:"uk"`
-		} `json:"result"`
-	}
-	_, err := d.Get("https://pan.baidu.com/api/gettemplatevariable?fields=[%22bdstoken%22,%22token%22,%22uk%22]", nil, &info)
-	if err != nil {
-		return "", err
-	}
-	return info.Result.Bdstoken, nil
-}
-
-func DecryptMd5(encryptMd5 string) string {
-	if _, err := hex.DecodeString(encryptMd5); err == nil {
-		return encryptMd5
-	}
-
-	var out strings.Builder
-	out.Grow(len(encryptMd5))
-	for i, n := 0, int64(0); i < len(encryptMd5); i++ {
-		if i == 9 {
-			n = int64(unicode.ToLower(rune(encryptMd5[i])) - 'g')
-		} else {
-			n, _ = strconv.ParseInt(encryptMd5[i:i+1], 16, 64)
-		}
-		out.WriteString(strconv.FormatInt(n^int64(15&i), 16))
-	}
-
-	encryptMd5 = out.String()
-	return encryptMd5[8:16] + encryptMd5[:8] + encryptMd5[24:32] + encryptMd5[16:24]
-}
-
-func EncryptMd5(originalMd5 string) string {
-	reversed := originalMd5[8:16] + originalMd5[:8] + originalMd5[24:32] + originalMd5[16:24]
-
-	var out strings.Builder
-	out.Grow(len(reversed))
-	for i, n := 0, int64(0); i < len(reversed); i++ {
-		n, _ = strconv.ParseInt(reversed[i:i+1], 16, 64)
-		n ^= int64(15 & i)
-		if i == 9 {
-			out.WriteRune(rune(n) + 'g')
-		} else {
-			out.WriteString(strconv.FormatInt(n, 16))
-		}
-	}
-	return out.String()
-}

drivers/base/client.go

@@ -6,7 +6,6 @@ import (
 	"time"
 
 	"github.com/alist-org/alist/v3/internal/conf"
-	"github.com/alist-org/alist/v3/internal/net"
 	"github.com/go-resty/resty/v2"
 )
 
@@ -27,7 +26,7 @@ func InitClient() {
 	NoRedirectClient.SetHeader("user-agent", UserAgent)
 
 	RestyClient = NewRestyClient()
-	HttpClient = net.NewHttpClient()
+	HttpClient = NewHttpClient()
 }
 
 func NewRestyClient() *resty.Client {
@@ -39,3 +38,13 @@ func NewRestyClient() *resty.Client {
 		SetTLSClientConfig(&tls.Config{InsecureSkipVerify: conf.Conf.TlsInsecureSkipVerify})
 	return client
 }
+
+func NewHttpClient() *http.Client {
+	return &http.Client{
+		Timeout: time.Hour * 48,
+		Transport: &http.Transport{
+			Proxy:           http.ProxyFromEnvironment,
+			TLSClientConfig: &tls.Config{InsecureSkipVerify: conf.Conf.TlsInsecureSkipVerify},
+		},
+	}
+}

drivers/chaoxing/driver.go

@@ -67,9 +67,7 @@ func (d *ChaoXing) Init(ctx context.Context) error {
 }
 
 func (d *ChaoXing) Drop(ctx context.Context) error {
-	if d.cron != nil {
-		d.cron.Stop()
-	}
+	d.cron.Stop()
 	return nil
 }
 
@@ -215,7 +213,7 @@ func (d *ChaoXing) Remove(ctx context.Context, obj model.Obj) error {
 	return nil
 }
 
-func (d *ChaoXing) Put(ctx context.Context, dstDir model.Obj, file model.FileStreamer, up driver.UpdateProgress) error {
+func (d *ChaoXing) Put(ctx context.Context, dstDir model.Obj, stream model.FileStreamer, up driver.UpdateProgress) error {
 	var resp UploadDataRsp
 	_, err := d.request("https://noteyd.chaoxing.com/pc/files/getUploadConfig", http.MethodGet, func(req *resty.Request) {
 	}, &resp)
@@ -227,11 +225,11 @@ func (d *ChaoXing) Put(ctx context.Context, dstDir model.Obj, file model.FileStr
 	}
 	body := &bytes.Buffer{}
 	writer := multipart.NewWriter(body)
-	filePart, err := writer.CreateFormFile("file", file.GetName())
+	filePart, err := writer.CreateFormFile("file", stream.GetName())
 	if err != nil {
 		return err
 	}
-	_, err = utils.CopyWithBuffer(filePart, file)
+	_, err = utils.CopyWithBuffer(filePart, stream)
 	if err != nil {
 		return err
 	}
@@ -248,14 +246,7 @@ func (d *ChaoXing) Put(ctx context.Context, dstDir model.Obj, file model.FileStr
 	if err != nil {
 		return err
 	}
-	r := driver.NewLimitedUploadStream(ctx, &driver.ReaderUpdatingProgress{
-		Reader: &driver.SimpleReaderWithSize{
-			Reader: body,
-			Size:   int64(body.Len()),
-		},
-		UpdateProgress: up,
-	})
-	req, err := http.NewRequestWithContext(ctx, "POST", "https://pan-yz.chaoxing.com/upload", r)
+	req, err := http.NewRequest("POST", "https://pan-yz.chaoxing.com/upload", body)
 	if err != nil {
 		return err
 	}

drivers/cloudreve/driver.go

@@ -4,12 +4,11 @@ import (
 	"context"
 	"io"
 	"net/http"
-	"path"
+	"strconv"
 	"strings"
 
 	"github.com/alist-org/alist/v3/drivers/base"
 	"github.com/alist-org/alist/v3/internal/driver"
-	"github.com/alist-org/alist/v3/internal/errs"
 	"github.com/alist-org/alist/v3/internal/model"
 	"github.com/alist-org/alist/v3/pkg/utils"
 	"github.com/go-resty/resty/v2"
@@ -91,7 +90,7 @@ func (d *Cloudreve) MakeDir(ctx context.Context, parentDir model.Obj, dirName st
 func (d *Cloudreve) Move(ctx context.Context, srcObj, dstDir model.Obj) error {
 	body := base.Json{
 		"action":  "move",
-		"src_dir": path.Dir(srcObj.GetPath()),
+		"src_dir": srcObj.GetPath(),
 		"dst":     dstDir.GetPath(),
 		"src":     convertSrc(srcObj),
 	}
@@ -113,7 +112,7 @@ func (d *Cloudreve) Rename(ctx context.Context, srcObj model.Obj, newName string
 
 func (d *Cloudreve) Copy(ctx context.Context, srcObj, dstDir model.Obj) error {
 	body := base.Json{
-		"src_dir": path.Dir(srcObj.GetPath()),
+		"src_dir": srcObj.GetPath(),
 		"dst":     dstDir.GetPath(),
 		"src":     convertSrc(srcObj),
 	}
@@ -134,8 +133,6 @@ func (d *Cloudreve) Put(ctx context.Context, dstDir model.Obj, stream model.File
 	if io.ReadCloser(stream) == http.NoBody {
 		return d.create(ctx, dstDir, stream)
 	}
-
-	// 获取存储策略
 	var r DirectoryResp
 	err := d.request(http.MethodGet, "/directory"+dstDir.GetPath(), nil, &r)
 	if err != nil {
@@ -146,10 +143,8 @@ func (d *Cloudreve) Put(ctx context.Context, dstDir model.Obj, stream model.File
 		"size":          stream.GetSize(),
 		"name":          stream.GetName(),
 		"policy_id":     r.Policy.Id,
-		"last_modified": stream.ModTime().UnixMilli(),
+		"last_modified": stream.ModTime().Unix(),
 	}
-
-	// 获取上传会话信息
 	var u UploadInfo
 	err = d.request(http.MethodPut, "/file/upload", func(req *resty.Request) {
 		req.SetBody(uploadBody)
@@ -157,26 +152,36 @@ func (d *Cloudreve) Put(ctx context.Context, dstDir model.Obj, stream model.File
 	if err != nil {
 		return err
 	}
+	var chunkSize = u.ChunkSize
+	var buf []byte
+	var chunk int
+	for {
+		var n int
+		buf = make([]byte, chunkSize)
+		n, err = io.ReadAtLeast(stream, buf, chunkSize)
+		if err != nil && err != io.ErrUnexpectedEOF {
+			if err == io.EOF {
+				return nil
+			}
+			return err
+		}
+
+		if n == 0 {
+			break
+		}
+		buf = buf[:n]
+		err = d.request(http.MethodPost, "/file/upload/"+u.SessionID+"/"+strconv.Itoa(chunk), func(req *resty.Request) {
+			req.SetHeader("Content-Type", "application/octet-stream")
+			req.SetHeader("Content-Length", strconv.Itoa(n))
+			req.SetBody(buf)
+		}, nil)
+		if err != nil {
+			break
+		}
+		chunk++
 
-	// 根据存储方式选择分片上传的方法
-	switch r.Policy.Type {
-	case "onedrive":
-		err = d.upOneDrive(ctx, stream, u, up)
-	case "s3":
-		err = d.upS3(ctx, stream, u, up)
-	case "remote": // 从机存储
-		err = d.upRemote(ctx, stream, u, up)
-	case "local": // 本机存储
-		err = d.upLocal(ctx, stream, u, up)
-	default:
-		err = errs.NotImplement
 	}
-	if err != nil {
-		// 删除失败的会话
-		_ = d.request(http.MethodDelete, "/file/upload/"+u.SessionID, nil, nil)
-		return err
-	}
-	return nil
+	return err
 }
 
 func (d *Cloudreve) create(ctx context.Context, dir model.Obj, file model.Obj) error {

drivers/cloudreve/types.go

@@ -21,12 +21,9 @@ type Policy struct {
 }
 
 type UploadInfo struct {
-	SessionID   string   `json:"sessionID"`
-	ChunkSize   int      `json:"chunkSize"`
-	Expires     int      `json:"expires"`
-	UploadURLs  []string `json:"uploadURLs"`
-	Credential  string   `json:"credential,omitempty"`  // local
-	CompleteURL string   `json:"completeURL,omitempty"` // s3
+	SessionID string `json:"sessionID"`
+	ChunkSize int    `json:"chunkSize"`
+	Expires   int    `json:"expires"`
 }
 
 type DirectoryResp struct {

drivers/cloudreve/util.go

@@ -1,23 +1,16 @@
 package cloudreve
 
 import (
-	"bytes"
-	"context"
 	"encoding/base64"
 	"errors"
-	"fmt"
-	"io"
 	"net/http"
-	"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/model"
 	"github.com/alist-org/alist/v3/internal/setting"
 	"github.com/alist-org/alist/v3/pkg/cookie"
-	"github.com/alist-org/alist/v3/pkg/utils"
 	"github.com/go-resty/resty/v2"
 	json "github.com/json-iterator/go"
 	jsoniter "github.com/json-iterator/go"
@@ -27,20 +20,17 @@ import (
 
 const loginPath = "/user/session"
 
-func (d *Cloudreve) getUA() string {
-	if d.CustomUA != "" {
-		return d.CustomUA
-	}
-	return base.UserAgent
-}
-
 func (d *Cloudreve) request(method string, path string, callback base.ReqCallback, out interface{}) error {
 	u := d.Address + "/api/v3" + path
+	ua := d.CustomUA
+	if ua == "" {
+		ua = base.UserAgent
+	}
 	req := base.RestyClient.R()
 	req.SetHeaders(map[string]string{
 		"Cookie":     "cloudreve-session=" + d.Cookie,
 		"Accept":     "application/json, text/plain, */*",
-		"User-Agent": d.getUA(),
+		"User-Agent": ua,
 	})
 
 	var r Resp
@@ -103,7 +93,7 @@ func (d *Cloudreve) login() error {
 		if err == nil {
 			break
 		}
-		if err.Error() != "CAPTCHA not match." {
+		if err != nil && err.Error() != "CAPTCHA not match." {
 			break
 		}
 	}
@@ -164,11 +154,15 @@ func (d *Cloudreve) GetThumb(file Object) (model.Thumbnail, error) {
 	if !d.Addition.EnableThumbAndFolderSize {
 		return model.Thumbnail{}, nil
 	}
+	ua := d.CustomUA
+	if ua == "" {
+		ua = base.UserAgent
+	}
 	req := base.NoRedirectClient.R()
 	req.SetHeaders(map[string]string{
 		"Cookie":     "cloudreve-session=" + d.Cookie,
 		"Accept":     "image/webp,image/apng,image/svg+xml,image/*,*/*;q=0.8",
-		"User-Agent": d.getUA(),
+		"User-Agent": ua,
 	})
 	resp, err := req.Execute(http.MethodGet, d.Address+"/api/v3/file/thumb/"+file.Id)
 	if err != nil {
@@ -178,216 +172,3 @@ func (d *Cloudreve) GetThumb(file Object) (model.Thumbnail, error) {
 		Thumbnail: resp.Header().Get("Location"),
 	}, nil
 }
-
-func (d *Cloudreve) upLocal(ctx context.Context, stream model.FileStreamer, u UploadInfo, up driver.UpdateProgress) error {
-	var finish int64 = 0
-	var chunk int = 0
-	DEFAULT := int64(u.ChunkSize)
-	for finish < stream.GetSize() {
-		if utils.IsCanceled(ctx) {
-			return ctx.Err()
-		}
-		utils.Log.Debugf("[Cloudreve-Local] upload: %d", finish)
-		var byteSize = DEFAULT
-		left := stream.GetSize() - finish
-		if left < DEFAULT {
-			byteSize = left
-		}
-		byteData := make([]byte, byteSize)
-		n, err := io.ReadFull(stream, byteData)
-		utils.Log.Debug(err, n)
-		if err != nil {
-			return err
-		}
-		err = d.request(http.MethodPost, "/file/upload/"+u.SessionID+"/"+strconv.Itoa(chunk), func(req *resty.Request) {
-			req.SetHeader("Content-Type", "application/octet-stream")
-			req.SetContentLength(true)
-			req.SetHeader("Content-Length", strconv.FormatInt(byteSize, 10))
-			req.SetHeader("User-Agent", d.getUA())
-			req.SetBody(driver.NewLimitedUploadStream(ctx, bytes.NewBuffer(byteData)))
-		}, nil)
-		if err != nil {
-			break
-		}
-		finish += byteSize
-		up(float64(finish) * 100 / float64(stream.GetSize()))
-		chunk++
-	}
-	return nil
-}
-
-func (d *Cloudreve) upRemote(ctx context.Context, stream model.FileStreamer, u UploadInfo, up driver.UpdateProgress) error {
-	uploadUrl := u.UploadURLs[0]
-	credential := u.Credential
-	var finish int64 = 0
-	var chunk int = 0
-	DEFAULT := int64(u.ChunkSize)
-	for finish < stream.GetSize() {
-		if utils.IsCanceled(ctx) {
-			return ctx.Err()
-		}
-		utils.Log.Debugf("[Cloudreve-Remote] upload: %d", finish)
-		var byteSize = DEFAULT
-		left := stream.GetSize() - finish
-		if left < DEFAULT {
-			byteSize = left
-		}
-		byteData := make([]byte, byteSize)
-		n, err := io.ReadFull(stream, byteData)
-		utils.Log.Debug(err, n)
-		if err != nil {
-			return err
-		}
-		req, err := http.NewRequest("POST", uploadUrl+"?chunk="+strconv.Itoa(chunk),
-			driver.NewLimitedUploadStream(ctx, bytes.NewBuffer(byteData)))
-		if err != nil {
-			return err
-		}
-		req = req.WithContext(ctx)
-		req.ContentLength = byteSize
-		// req.Header.Set("Content-Length", strconv.Itoa(int(byteSize)))
-		req.Header.Set("Authorization", fmt.Sprint(credential))
-		req.Header.Set("User-Agent", d.getUA())
-		finish += byteSize
-		res, err := base.HttpClient.Do(req)
-		if err != nil {
-			return err
-		}
-		_ = res.Body.Close()
-		up(float64(finish) * 100 / float64(stream.GetSize()))
-		chunk++
-	}
-	return nil
-}
-
-func (d *Cloudreve) upOneDrive(ctx context.Context, stream model.FileStreamer, u UploadInfo, up driver.UpdateProgress) error {
-	uploadUrl := u.UploadURLs[0]
-	var finish int64 = 0
-	DEFAULT := int64(u.ChunkSize)
-	for finish < stream.GetSize() {
-		if utils.IsCanceled(ctx) {
-			return ctx.Err()
-		}
-		utils.Log.Debugf("[Cloudreve-OneDrive] upload: %d", finish)
-		var byteSize = DEFAULT
-		left := stream.GetSize() - finish
-		if left < DEFAULT {
-			byteSize = left
-		}
-		byteData := make([]byte, byteSize)
-		n, err := io.ReadFull(stream, byteData)
-		utils.Log.Debug(err, n)
-		if err != nil {
-			return err
-		}
-		req, err := http.NewRequest("PUT", uploadUrl, driver.NewLimitedUploadStream(ctx, bytes.NewBuffer(byteData)))
-		if err != nil {
-			return err
-		}
-		req = req.WithContext(ctx)
-		req.ContentLength = byteSize
-		// req.Header.Set("Content-Length", strconv.Itoa(int(byteSize)))
-		req.Header.Set("Content-Range", fmt.Sprintf("bytes %d-%d/%d", finish, finish+byteSize-1, stream.GetSize()))
-		req.Header.Set("User-Agent", d.getUA())
-		finish += byteSize
-		res, err := base.HttpClient.Do(req)
-		if err != nil {
-			return err
-		}
-		// https://learn.microsoft.com/zh-cn/onedrive/developer/rest-api/api/driveitem_createuploadsession
-		if res.StatusCode != 201 && res.StatusCode != 202 && res.StatusCode != 200 {
-			data, _ := io.ReadAll(res.Body)
-			_ = res.Body.Close()
-			return errors.New(string(data))
-		}
-		_ = res.Body.Close()
-		up(float64(finish) * 100 / float64(stream.GetSize()))
-	}
-	// 上传成功发送回调请求
-	err := d.request(http.MethodPost, "/callback/onedrive/finish/"+u.SessionID, func(req *resty.Request) {
-		req.SetBody("{}")
-	}, nil)
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-func (d *Cloudreve) upS3(ctx context.Context, stream model.FileStreamer, u UploadInfo, up driver.UpdateProgress) error {
-	var finish int64 = 0
-	var chunk int = 0
-	var etags []string
-	DEFAULT := int64(u.ChunkSize)
-	for finish < stream.GetSize() {
-		if utils.IsCanceled(ctx) {
-			return ctx.Err()
-		}
-		utils.Log.Debugf("[Cloudreve-S3] upload: %d", finish)
-		var byteSize = DEFAULT
-		left := stream.GetSize() - finish
-		if left < DEFAULT {
-			byteSize = left
-		}
-		byteData := make([]byte, byteSize)
-		n, err := io.ReadFull(stream, byteData)
-		utils.Log.Debug(err, n)
-		if err != nil {
-			return err
-		}
-		req, err := http.NewRequest("PUT", u.UploadURLs[chunk],
-			driver.NewLimitedUploadStream(ctx, bytes.NewBuffer(byteData)))
-		if err != nil {
-			return err
-		}
-		req = req.WithContext(ctx)
-		req.ContentLength = byteSize
-		finish += byteSize
-		res, err := base.HttpClient.Do(req)
-		if err != nil {
-			return err
-		}
-		_ = res.Body.Close()
-		etags = append(etags, res.Header.Get("ETag"))
-		up(float64(finish) * 100 / float64(stream.GetSize()))
-		chunk++
-	}
-
-	// s3LikeFinishUpload
-	// https://github.com/cloudreve/frontend/blob/b485bf297974cbe4834d2e8e744ae7b7e5b2ad39/src/component/Uploader/core/api/index.ts#L204-L252
-	bodyBuilder := &strings.Builder{}
-	bodyBuilder.WriteString("<CompleteMultipartUpload>")
-	for i, etag := range etags {
-		bodyBuilder.WriteString(fmt.Sprintf(
-			`<Part><PartNumber>%d</PartNumber><ETag>%s</ETag></Part>`,
-			i+1, // PartNumber 从 1 开始
-			etag,
-		))
-	}
-	bodyBuilder.WriteString("</CompleteMultipartUpload>")
-	req, err := http.NewRequest(
-		"POST",
-		u.CompleteURL,
-		strings.NewReader(bodyBuilder.String()),
-	)
-	if err != nil {
-		return err
-	}
-	req.Header.Set("Content-Type", "application/xml")
-	req.Header.Set("User-Agent", d.getUA())
-	res, err := base.HttpClient.Do(req)
-	if err != nil {
-		return err
-	}
-	defer res.Body.Close()
-	if res.StatusCode != http.StatusOK {
-		body, _ := io.ReadAll(res.Body)
-		return fmt.Errorf("up status: %d, error: %s", res.StatusCode, string(body))
-	}
-
-	// 上传成功发送回调请求
-	err = d.request(http.MethodGet, "/callback/s3/"+u.SessionID, nil, nil)
-	if err != nil {
-		return err
-	}
-	return nil
-}

drivers/crypt/driver.go

@@ -13,7 +13,6 @@ import (
 	"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/internal/stream"
 	"github.com/alist-org/alist/v3/pkg/http_range"
 	"github.com/alist-org/alist/v3/pkg/utils"
@@ -161,11 +160,7 @@ func (d *Crypt) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([
 				// discarding hash as it's encrypted
 			}
 			if d.Thumbnail && thumb == "" {
-				thumbPath := stdpath.Join(args.ReqPath, ".thumbnails", name+".webp")
-				thumb = fmt.Sprintf("%s/d%s?sign=%s",
-					common.GetApiUrl(common.GetHttpReq(ctx)),
-					utils.EncodePath(thumbPath, true),
-					sign.Sign(thumbPath))
+				thumb = utils.EncodePath(common.GetApiUrl(nil)+stdpath.Join("/d", args.ReqPath, ".thumbnails", name+".webp"), true)
 			}
 			if !ok && !d.Thumbnail {
 				result = append(result, &objRes)
@@ -263,13 +258,19 @@ func (d *Crypt) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (
 		}
 		rrc := remoteLink.RangeReadCloser
 		if len(remoteLink.URL) > 0 {
-			var converted, err = stream.GetRangeReadCloserFromLink(remoteFileSize, remoteLink)
+
+			rangedRemoteLink := &model.Link{
+				URL:    remoteLink.URL,
+				Header: remoteLink.Header,
+			}
+			var converted, err = stream.GetRangeReadCloserFromLink(remoteFileSize, rangedRemoteLink)
 			if err != nil {
 				return nil, err
 			}
 			rrc = converted
 		}
 		if rrc != nil {
+			//remoteRangeReader, err :=
 			remoteReader, err := rrc.RangeRead(ctx, http_range.Range{Start: underlyingOffset, Length: length})
 			remoteClosers.AddClosers(rrc.GetClosers())
 			if err != nil {
@@ -282,6 +283,7 @@ func (d *Crypt) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (
 			if err != nil {
 				return nil, err
 			}
+			//remoteClosers.Add(remoteLink.MFile)
 			//keep reuse same MFile and close at last.
 			remoteClosers.Add(remoteLink.MFile)
 			return io.NopCloser(remoteLink.MFile), nil
@@ -300,6 +302,7 @@ func (d *Crypt) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (
 
 	resultRangeReadCloser := &model.RangeReadCloser{RangeReader: resultRangeReader, Closers: remoteClosers}
 	resultLink := &model.Link{
+		Header:          remoteLink.Header,
 		RangeReadCloser: resultRangeReadCloser,
 		Expiration:      remoteLink.Expiration,
 	}

drivers/doubao/driver.go

@@ -1,174 +0,0 @@
-package doubao
-
-import (
-	"context"
-	"errors"
-	"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/go-resty/resty/v2"
-	"github.com/google/uuid"
-)
-
-type Doubao struct {
-	model.Storage
-	Addition
-}
-
-func (d *Doubao) Config() driver.Config {
-	return config
-}
-
-func (d *Doubao) GetAddition() driver.Additional {
-	return &d.Addition
-}
-
-func (d *Doubao) Init(ctx context.Context) error {
-	// TODO login / refresh token
-	//op.MustSaveDriverStorage(d)
-	return nil
-}
-
-func (d *Doubao) Drop(ctx context.Context) error {
-	return nil
-}
-
-func (d *Doubao) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([]model.Obj, error) {
-	var files []model.Obj
-	var r NodeInfoResp
-	_, err := d.request("/samantha/aispace/node_info", "POST", func(req *resty.Request) {
-		req.SetBody(base.Json{
-			"node_id":        dir.GetID(),
-			"need_full_path": false,
-		})
-	}, &r)
-	if err != nil {
-		return nil, err
-	}
-
-	for _, child := range r.Data.Children {
-		files = append(files, &Object{
-			Object: model.Object{
-				ID:       child.ID,
-				Path:     child.ParentID,
-				Name:     child.Name,
-				Size:     child.Size,
-				Modified: time.Unix(child.UpdateTime, 0),
-				Ctime:    time.Unix(child.CreateTime, 0),
-				IsFolder: child.NodeType == 1,
-			},
-			Key: child.Key,
-		})
-	}
-	return files, nil
-}
-
-func (d *Doubao) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
-	if u, ok := file.(*Object); ok {
-		var r GetFileUrlResp
-		_, err := d.request("/alice/message/get_file_url", "POST", func(req *resty.Request) {
-			req.SetBody(base.Json{
-				"uris": []string{u.Key},
-				"type": "file",
-			})
-		}, &r)
-		if err != nil {
-			return nil, err
-		}
-		return &model.Link{
-			URL: r.Data.FileUrls[0].MainURL,
-		}, nil
-	}
-	return nil, errors.New("can't convert obj to URL")
-}
-
-func (d *Doubao) MakeDir(ctx context.Context, parentDir model.Obj, dirName string) error {
-	var r UploadNodeResp
-	_, err := d.request("/samantha/aispace/upload_node", "POST", func(req *resty.Request) {
-		req.SetBody(base.Json{
-			"node_list": []base.Json{
-				{
-					"local_id":  uuid.New().String(),
-					"name":      dirName,
-					"parent_id": parentDir.GetID(),
-					"node_type": 1,
-				},
-			},
-		})
-	}, &r)
-	return err
-}
-
-func (d *Doubao) Move(ctx context.Context, srcObj, dstDir model.Obj) error {
-	var r UploadNodeResp
-	_, err := d.request("/samantha/aispace/move_node", "POST", func(req *resty.Request) {
-		req.SetBody(base.Json{
-			"node_list": []base.Json{
-				{"id": srcObj.GetID()},
-			},
-			"current_parent_id": srcObj.GetPath(),
-			"target_parent_id":  dstDir.GetID(),
-		})
-	}, &r)
-	return err
-}
-
-func (d *Doubao) Rename(ctx context.Context, srcObj model.Obj, newName string) error {
-	var r BaseResp
-	_, err := d.request("/samantha/aispace/rename_node", "POST", func(req *resty.Request) {
-		req.SetBody(base.Json{
-			"node_id":   srcObj.GetID(),
-			"node_name": newName,
-		})
-	}, &r)
-	return err
-}
-
-func (d *Doubao) Copy(ctx context.Context, srcObj, dstDir model.Obj) (model.Obj, error) {
-	// TODO copy obj, optional
-	return nil, errs.NotImplement
-}
-
-func (d *Doubao) Remove(ctx context.Context, obj model.Obj) error {
-	var r BaseResp
-	_, err := d.request("/samantha/aispace/delete_node", "POST", func(req *resty.Request) {
-		req.SetBody(base.Json{"node_list": []base.Json{{"id": obj.GetID()}}})
-	}, &r)
-	return err
-}
-
-func (d *Doubao) Put(ctx context.Context, dstDir model.Obj, file model.FileStreamer, up driver.UpdateProgress) (model.Obj, error) {
-	// TODO upload file, optional
-	return nil, errs.NotImplement
-}
-
-func (d *Doubao) 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 *Doubao) 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 *Doubao) 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 *Doubao) 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 *Doubao) Other(ctx context.Context, args model.OtherArgs) (interface{}, error) {
-//	return nil, errs.NotSupport
-//}
-
-var _ driver.Driver = (*Doubao)(nil)

drivers/doubao/meta.go

@@ -1,34 +0,0 @@
-package doubao
-
-import (
-	"github.com/alist-org/alist/v3/internal/driver"
-	"github.com/alist-org/alist/v3/internal/op"
-)
-
-type Addition struct {
-	// Usually one of two
-	// driver.RootPath
-	driver.RootID
-	// define other
-	Cookie string `json:"cookie" type:"text"`
-}
-
-var config = driver.Config{
-	Name:              "Doubao",
-	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 &Doubao{}
-	})
-}

drivers/doubao/types.go

@@ -1,64 +0,0 @@
-package doubao
-
-import "github.com/alist-org/alist/v3/internal/model"
-
-type BaseResp struct {
-	Code int    `json:"code"`
-	Msg  string `json:"msg"`
-}
-
-type NodeInfoResp struct {
-	BaseResp
-	Data struct {
-		NodeInfo   NodeInfo   `json:"node_info"`
-		Children   []NodeInfo `json:"children"`
-		NextCursor string     `json:"next_cursor"`
-		HasMore    bool       `json:"has_more"`
-	} `json:"data"`
-}
-
-type NodeInfo struct {
-	ID                  string `json:"id"`
-	Name                string `json:"name"`
-	Key                 string `json:"key"`
-	NodeType            int    `json:"node_type"` // 0: 文件, 1: 文件夹
-	Size                int64  `json:"size"`
-	Source              int    `json:"source"`
-	NameReviewStatus    int    `json:"name_review_status"`
-	ContentReviewStatus int    `json:"content_review_status"`
-	RiskReviewStatus    int    `json:"risk_review_status"`
-	ConversationID      string `json:"conversation_id"`
-	ParentID            string `json:"parent_id"`
-	CreateTime          int64  `json:"create_time"`
-	UpdateTime          int64  `json:"update_time"`
-}
-
-type GetFileUrlResp struct {
-	BaseResp
-	Data struct {
-		FileUrls []struct {
-			URI     string `json:"uri"`
-			MainURL string `json:"main_url"`
-			BackURL string `json:"back_url"`
-		} `json:"file_urls"`
-	} `json:"data"`
-}
-
-type UploadNodeResp struct {
-	BaseResp
-	Data struct {
-		NodeList []struct {
-			LocalID  string `json:"local_id"`
-			ID       string `json:"id"`
-			ParentID string `json:"parent_id"`
-			Name     string `json:"name"`
-			Key      string `json:"key"`
-			NodeType int    `json:"node_type"` // 0: 文件, 1: 文件夹
-		} `json:"node_list"`
-	} `json:"data"`
-}
-
-type Object struct {
-	model.Object
-	Key string
-}

drivers/doubao/util.go

@@ -1,38 +0,0 @@
-package doubao
-
-import (
-	"errors"
-
-	"github.com/alist-org/alist/v3/drivers/base"
-	"github.com/alist-org/alist/v3/pkg/utils"
-	log "github.com/sirupsen/logrus"
-)
-
-// do others that not defined in Driver interface
-func (d *Doubao) request(path string, method string, callback base.ReqCallback, resp interface{}) ([]byte, error) {
-	url := "https://www.doubao.com" + path
-	req := base.RestyClient.R()
-	req.SetHeader("Cookie", d.Cookie)
-	if callback != nil {
-		callback(req)
-	}
-	var r BaseResp
-	req.SetResult(&r)
-	res, err := req.Execute(method, url)
-	log.Debugln(res.String())
-	if err != nil {
-		return nil, err
-	}
-
-	// 业务状态码检查（优先于HTTP状态码）
-	if r.Code != 0 {
-		return res.Body(), errors.New(r.Msg)
-	}
-	if resp != nil {
-		err = utils.Json.Unmarshal(res.Body(), resp)
-		if err != nil {
-			return nil, err
-		}
-	}
-	return res.Body(), nil
-}

drivers/dropbox/driver.go

@@ -191,7 +191,7 @@ func (d *Dropbox) Put(ctx context.Context, dstDir model.Obj, stream model.FileSt
 		}
 
 		url := d.contentBase + "/2/files/upload_session/append_v2"
-		reader := driver.NewLimitedUploadStream(ctx, io.LimitReader(stream, PartSize))
+		reader := io.LimitReader(stream, PartSize)
 		req, err := http.NewRequest(http.MethodPost, url, reader)
 		if err != nil {
 			log.Errorf("failed to update file when append to upload session, err: %+v", err)
@@ -219,8 +219,13 @@ func (d *Dropbox) Put(ctx context.Context, dstDir model.Obj, stream model.FileSt
 			return err
 		}
 		_ = res.Body.Close()
-		up(float64(i+1) * 100 / float64(count))
+
+		if count > 0 {
+			up(float64(i+1) * 100 / float64(count))
+		}
+
 		offset += byteSize
+
 	}
 	// 3.finish
 	toPath := dstDir.GetPath() + "/" + stream.GetName()

drivers/febbox/driver.go

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

drivers/febbox/meta.go

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

drivers/febbox/oauth2.go

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

drivers/febbox/types.go

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

drivers/febbox/util.go

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

drivers/ftp/driver.go

@@ -114,15 +114,13 @@ func (d *FTP) Remove(ctx context.Context, obj model.Obj) error {
 	}
 }
 
-func (d *FTP) Put(ctx context.Context, dstDir model.Obj, s model.FileStreamer, up driver.UpdateProgress) error {
+func (d *FTP) Put(ctx context.Context, dstDir model.Obj, stream model.FileStreamer, up driver.UpdateProgress) error {
 	if err := d.login(); err != nil {
 		return err
 	}
-	path := stdpath.Join(dstDir.GetPath(), s.GetName())
-	return d.conn.Stor(encode(path, d.Encoding), driver.NewLimitedUploadStream(ctx, &driver.ReaderUpdatingProgress{
-		Reader:         s,
-		UpdateProgress: up,
-	}))
+	// TODO: support cancel
+	path := stdpath.Join(dstDir.GetPath(), stream.GetName())
+	return d.conn.Stor(encode(path, d.Encoding), stream)
 }
 
 var _ driver.Driver = (*FTP)(nil)

drivers/github/driver.go

@@ -1,975 +0,0 @@
-package github
-
-import (
-	"context"
-	"encoding/base64"
-	"fmt"
-	"io"
-	"net/http"
-	stdpath "path"
-	"strings"
-	"sync"
-	"text/template"
-
-	"github.com/ProtonMail/go-crypto/openpgp"
-	"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/pkg/errors"
-	log "github.com/sirupsen/logrus"
-)
-
-type Github struct {
-	model.Storage
-	Addition
-	client        *resty.Client
-	mkdirMsgTmpl  *template.Template
-	deleteMsgTmpl *template.Template
-	putMsgTmpl    *template.Template
-	renameMsgTmpl *template.Template
-	copyMsgTmpl   *template.Template
-	moveMsgTmpl   *template.Template
-	isOnBranch    bool
-	commitMutex   sync.Mutex
-	pgpEntity     *openpgp.Entity
-}
-
-func (d *Github) Config() driver.Config {
-	return config
-}
-
-func (d *Github) GetAddition() driver.Additional {
-	return &d.Addition
-}
-
-func (d *Github) Init(ctx context.Context) error {
-	d.RootFolderPath = utils.FixAndCleanPath(d.RootFolderPath)
-	if d.CommitterName != "" && d.CommitterEmail == "" {
-		return errors.New("committer email is required")
-	}
-	if d.CommitterName == "" && d.CommitterEmail != "" {
-		return errors.New("committer name is required")
-	}
-	if d.AuthorName != "" && d.AuthorEmail == "" {
-		return errors.New("author email is required")
-	}
-	if d.AuthorName == "" && d.AuthorEmail != "" {
-		return errors.New("author name is required")
-	}
-	var err error
-	d.mkdirMsgTmpl, err = template.New("mkdirCommitMsgTemplate").Parse(d.MkdirCommitMsg)
-	if err != nil {
-		return err
-	}
-	d.deleteMsgTmpl, err = template.New("deleteCommitMsgTemplate").Parse(d.DeleteCommitMsg)
-	if err != nil {
-		return err
-	}
-	d.putMsgTmpl, err = template.New("putCommitMsgTemplate").Parse(d.PutCommitMsg)
-	if err != nil {
-		return err
-	}
-	d.renameMsgTmpl, err = template.New("renameCommitMsgTemplate").Parse(d.RenameCommitMsg)
-	if err != nil {
-		return err
-	}
-	d.copyMsgTmpl, err = template.New("copyCommitMsgTemplate").Parse(d.CopyCommitMsg)
-	if err != nil {
-		return err
-	}
-	d.moveMsgTmpl, err = template.New("moveCommitMsgTemplate").Parse(d.MoveCommitMsg)
-	if err != nil {
-		return err
-	}
-	d.client = base.NewRestyClient().
-		SetHeader("Accept", "application/vnd.github.object+json").
-		SetHeader("X-GitHub-Api-Version", "2022-11-28").
-		SetLogger(log.StandardLogger()).
-		SetDebug(false)
-	token := strings.TrimSpace(d.Token)
-	if token != "" {
-		d.client = d.client.SetHeader("Authorization", "Bearer "+token)
-	}
-	if d.Ref == "" {
-		repo, err := d.getRepo()
-		if err != nil {
-			return err
-		}
-		d.Ref = repo.DefaultBranch
-		d.isOnBranch = true
-	} else {
-		_, err = d.getBranchHead()
-		d.isOnBranch = err == nil
-	}
-	if d.GPGPrivateKey != "" {
-		if d.CommitterName == "" || d.AuthorName == "" {
-			user, e := d.getAuthenticatedUser()
-			if e != nil {
-				return e
-			}
-			if d.CommitterName == "" {
-				d.CommitterName = user.Name
-				d.CommitterEmail = user.Email
-			}
-			if d.AuthorName == "" {
-				d.AuthorName = user.Name
-				d.AuthorEmail = user.Email
-			}
-		}
-		d.pgpEntity, err = loadPrivateKey(d.GPGPrivateKey, d.GPGKeyPassphrase)
-		if err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func (d *Github) Drop(ctx context.Context) error {
-	return nil
-}
-
-func (d *Github) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([]model.Obj, error) {
-	obj, err := d.get(dir.GetPath())
-	if err != nil {
-		return nil, err
-	}
-	if obj.Entries == nil {
-		return nil, errs.NotFolder
-	}
-	if len(obj.Entries) >= 1000 {
-		tree, err := d.getTree(obj.Sha)
-		if err != nil {
-			return nil, err
-		}
-		if tree.Truncated {
-			return nil, fmt.Errorf("tree %s is truncated", dir.GetPath())
-		}
-		ret := make([]model.Obj, 0, len(tree.Trees))
-		for _, t := range tree.Trees {
-			if t.Path != ".gitkeep" {
-				ret = append(ret, t.toModelObj())
-			}
-		}
-		return ret, nil
-	} else {
-		ret := make([]model.Obj, 0, len(obj.Entries))
-		for _, entry := range obj.Entries {
-			if entry.Name != ".gitkeep" {
-				ret = append(ret, entry.toModelObj())
-			}
-		}
-		return ret, nil
-	}
-}
-
-func (d *Github) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
-	obj, err := d.get(file.GetPath())
-	if err != nil {
-		return nil, err
-	}
-	if obj.Type == "submodule" {
-		return nil, errors.New("cannot download a submodule")
-	}
-	url := obj.DownloadURL
-	ghProxy := strings.TrimSpace(d.Addition.GitHubProxy)
-	if ghProxy != "" {
-		url = strings.Replace(url, "https://raw.githubusercontent.com", ghProxy, 1)
-	}
-	return &model.Link{
-		URL: url,
-	}, nil
-}
-
-func (d *Github) MakeDir(ctx context.Context, parentDir model.Obj, dirName string) error {
-	if !d.isOnBranch {
-		return errors.New("cannot write to non-branch reference")
-	}
-	d.commitMutex.Lock()
-	defer d.commitMutex.Unlock()
-	parent, err := d.get(parentDir.GetPath())
-	if err != nil {
-		return err
-	}
-	if parent.Entries == nil {
-		return errs.NotFolder
-	}
-	subDirSha, err := d.newTree("", []interface{}{
-		map[string]string{
-			"path":    ".gitkeep",
-			"mode":    "100644",
-			"type":    "blob",
-			"content": "",
-		},
-	})
-	if err != nil {
-		return err
-	}
-	newTree := make([]interface{}, 0, 2)
-	newTree = append(newTree, TreeObjReq{
-		Path: dirName,
-		Mode: "040000",
-		Type: "tree",
-		Sha:  subDirSha,
-	})
-	if len(parent.Entries) == 1 && parent.Entries[0].Name == ".gitkeep" {
-		newTree = append(newTree, TreeObjReq{
-			Path: ".gitkeep",
-			Mode: "100644",
-			Type: "blob",
-			Sha:  nil,
-		})
-	}
-	newSha, err := d.newTree(parent.Sha, newTree)
-	if err != nil {
-		return err
-	}
-	rootSha, err := d.renewParentTrees(parentDir.GetPath(), parent.Sha, newSha, "/")
-	if err != nil {
-		return err
-	}
-
-	commitMessage, err := getMessage(d.mkdirMsgTmpl, &MessageTemplateVars{
-		UserName:   getUsername(ctx),
-		ObjName:    dirName,
-		ObjPath:    stdpath.Join(parentDir.GetPath(), dirName),
-		ParentName: parentDir.GetName(),
-		ParentPath: parentDir.GetPath(),
-	}, "mkdir")
-	if err != nil {
-		return err
-	}
-	return d.commit(commitMessage, rootSha)
-}
-
-func (d *Github) Move(ctx context.Context, srcObj, dstDir model.Obj) error {
-	if !d.isOnBranch {
-		return errors.New("cannot write to non-branch reference")
-	}
-	if strings.HasPrefix(dstDir.GetPath(), srcObj.GetPath()) {
-		return errors.New("cannot move parent dir to child")
-	}
-	d.commitMutex.Lock()
-	defer d.commitMutex.Unlock()
-
-	var rootSha string
-	if strings.HasPrefix(dstDir.GetPath(), stdpath.Dir(srcObj.GetPath())) { // /aa/1 -> /aa/bb/
-		dstOldSha, dstNewSha, ancestorOldSha, srcParentTree, err := d.copyWithoutRenewTree(srcObj, dstDir)
-		if err != nil {
-			return err
-		}
-
-		srcParentPath := stdpath.Dir(srcObj.GetPath())
-		dstRest := dstDir.GetPath()[len(srcParentPath):]
-		if dstRest[0] == '/' {
-			dstRest = dstRest[1:]
-		}
-		dstNextName, _, _ := strings.Cut(dstRest, "/")
-		dstNextPath := stdpath.Join(srcParentPath, dstNextName)
-		dstNextTreeSha, err := d.renewParentTrees(dstDir.GetPath(), dstOldSha, dstNewSha, dstNextPath)
-		if err != nil {
-			return err
-		}
-		var delSrc, dstNextTree *TreeObjReq = nil, nil
-		for _, t := range srcParentTree.Trees {
-			if t.Path == dstNextName {
-				dstNextTree = &t.TreeObjReq
-				dstNextTree.Sha = dstNextTreeSha
-			}
-			if t.Path == srcObj.GetName() {
-				delSrc = &t.TreeObjReq
-				delSrc.Sha = nil
-			}
-			if delSrc != nil && dstNextTree != nil {
-				break
-			}
-		}
-		if delSrc == nil || dstNextTree == nil {
-			return errs.ObjectNotFound
-		}
-		ancestorNewSha, err := d.newTree(ancestorOldSha, []interface{}{*delSrc, *dstNextTree})
-		if err != nil {
-			return err
-		}
-		rootSha, err = d.renewParentTrees(srcParentPath, ancestorOldSha, ancestorNewSha, "/")
-		if err != nil {
-			return err
-		}
-	} else if strings.HasPrefix(srcObj.GetPath(), dstDir.GetPath()) { // /aa/bb/1 -> /aa/
-		srcParentPath := stdpath.Dir(srcObj.GetPath())
-		srcParentTree, srcParentOldSha, err := d.getTreeDirectly(srcParentPath)
-		if err != nil {
-			return err
-		}
-		var src *TreeObjReq = nil
-		for _, t := range srcParentTree.Trees {
-			if t.Path == srcObj.GetName() {
-				if t.Type == "commit" {
-					return errors.New("cannot move a submodule")
-				}
-				src = &t.TreeObjReq
-				break
-			}
-		}
-		if src == nil {
-			return errs.ObjectNotFound
-		}
-
-		delSrc := *src
-		delSrc.Sha = nil
-		delSrcTree := make([]interface{}, 0, 2)
-		delSrcTree = append(delSrcTree, delSrc)
-		if len(srcParentTree.Trees) == 1 {
-			delSrcTree = append(delSrcTree, map[string]string{
-				"path":    ".gitkeep",
-				"mode":    "100644",
-				"type":    "blob",
-				"content": "",
-			})
-		}
-		srcParentNewSha, err := d.newTree(srcParentOldSha, delSrcTree)
-		if err != nil {
-			return err
-		}
-		srcRest := srcObj.GetPath()[len(dstDir.GetPath()):]
-		if srcRest[0] == '/' {
-			srcRest = srcRest[1:]
-		}
-		srcNextName, _, ok := strings.Cut(srcRest, "/")
-		if !ok { // /aa/1 -> /aa/
-			return errors.New("cannot move in place")
-		}
-		srcNextPath := stdpath.Join(dstDir.GetPath(), srcNextName)
-		srcNextTreeSha, err := d.renewParentTrees(srcParentPath, srcParentOldSha, srcParentNewSha, srcNextPath)
-		if err != nil {
-			return err
-		}
-
-		ancestorTree, ancestorOldSha, err := d.getTreeDirectly(dstDir.GetPath())
-		if err != nil {
-			return err
-		}
-		var srcNextTree *TreeObjReq = nil
-		for _, t := range ancestorTree.Trees {
-			if t.Path == srcNextName {
-				srcNextTree = &t.TreeObjReq
-				srcNextTree.Sha = srcNextTreeSha
-				break
-			}
-		}
-		if srcNextTree == nil {
-			return errs.ObjectNotFound
-		}
-		ancestorNewSha, err := d.newTree(ancestorOldSha, []interface{}{*srcNextTree, *src})
-		if err != nil {
-			return err
-		}
-		rootSha, err = d.renewParentTrees(dstDir.GetPath(), ancestorOldSha, ancestorNewSha, "/")
-		if err != nil {
-			return err
-		}
-	} else { // /aa/1 -> /bb/
-		// do copy
-		dstOldSha, dstNewSha, srcParentOldSha, srcParentTree, err := d.copyWithoutRenewTree(srcObj, dstDir)
-		if err != nil {
-			return err
-		}
-
-		// delete src object and create new tree
-		var srcNewTree *TreeObjReq = nil
-		for _, t := range srcParentTree.Trees {
-			if t.Path == srcObj.GetName() {
-				srcNewTree = &t.TreeObjReq
-				srcNewTree.Sha = nil
-				break
-			}
-		}
-		if srcNewTree == nil {
-			return errs.ObjectNotFound
-		}
-		delSrcTree := make([]interface{}, 0, 2)
-		delSrcTree = append(delSrcTree, *srcNewTree)
-		if len(srcParentTree.Trees) == 1 {
-			delSrcTree = append(delSrcTree, map[string]string{
-				"path":    ".gitkeep",
-				"mode":    "100644",
-				"type":    "blob",
-				"content": "",
-			})
-		}
-		srcParentNewSha, err := d.newTree(srcParentOldSha, delSrcTree)
-		if err != nil {
-			return err
-		}
-
-		// renew but the common ancestor of srcPath and dstPath
-		ancestor, srcChildName, dstChildName, _, _ := getPathCommonAncestor(srcObj.GetPath(), dstDir.GetPath())
-		dstNextTreeSha, err := d.renewParentTrees(dstDir.GetPath(), dstOldSha, dstNewSha, stdpath.Join(ancestor, dstChildName))
-		if err != nil {
-			return err
-		}
-		srcNextTreeSha, err := d.renewParentTrees(stdpath.Dir(srcObj.GetPath()), srcParentOldSha, srcParentNewSha, stdpath.Join(ancestor, srcChildName))
-		if err != nil {
-			return err
-		}
-
-		// renew the tree of the last common ancestor
-		ancestorTree, ancestorOldSha, err := d.getTreeDirectly(ancestor)
-		if err != nil {
-			return err
-		}
-		newTree := make([]interface{}, 2)
-		srcBind := false
-		dstBind := false
-		for _, t := range ancestorTree.Trees {
-			if t.Path == srcChildName {
-				t.Sha = srcNextTreeSha
-				newTree[0] = t.TreeObjReq
-				srcBind = true
-			}
-			if t.Path == dstChildName {
-				t.Sha = dstNextTreeSha
-				newTree[1] = t.TreeObjReq
-				dstBind = true
-			}
-			if srcBind && dstBind {
-				break
-			}
-		}
-		if !srcBind || !dstBind {
-			return errs.ObjectNotFound
-		}
-		ancestorNewSha, err := d.newTree(ancestorOldSha, newTree)
-		if err != nil {
-			return err
-		}
-		// renew until root
-		rootSha, err = d.renewParentTrees(ancestor, ancestorOldSha, ancestorNewSha, "/")
-		if err != nil {
-			return err
-		}
-	}
-
-	// commit
-	message, err := getMessage(d.moveMsgTmpl, &MessageTemplateVars{
-		UserName:   getUsername(ctx),
-		ObjName:    srcObj.GetName(),
-		ObjPath:    srcObj.GetPath(),
-		ParentName: stdpath.Base(stdpath.Dir(srcObj.GetPath())),
-		ParentPath: stdpath.Dir(srcObj.GetPath()),
-		TargetName: stdpath.Base(dstDir.GetPath()),
-		TargetPath: dstDir.GetPath(),
-	}, "move")
-	if err != nil {
-		return err
-	}
-	return d.commit(message, rootSha)
-}
-
-func (d *Github) Rename(ctx context.Context, srcObj model.Obj, newName string) error {
-	if !d.isOnBranch {
-		return errors.New("cannot write to non-branch reference")
-	}
-	d.commitMutex.Lock()
-	defer d.commitMutex.Unlock()
-	parentDir := stdpath.Dir(srcObj.GetPath())
-	tree, _, err := d.getTreeDirectly(parentDir)
-	if err != nil {
-		return err
-	}
-	newTree := make([]interface{}, 2)
-	operated := false
-	for _, t := range tree.Trees {
-		if t.Path == srcObj.GetName() {
-			if t.Type == "commit" {
-				return errors.New("cannot rename a submodule")
-			}
-			delCopy := t.TreeObjReq
-			delCopy.Sha = nil
-			newTree[0] = delCopy
-			t.Path = newName
-			newTree[1] = t.TreeObjReq
-			operated = true
-			break
-		}
-	}
-	if !operated {
-		return errs.ObjectNotFound
-	}
-	newSha, err := d.newTree(tree.Sha, newTree)
-	if err != nil {
-		return err
-	}
-	rootSha, err := d.renewParentTrees(parentDir, tree.Sha, newSha, "/")
-	if err != nil {
-		return err
-	}
-	message, err := getMessage(d.renameMsgTmpl, &MessageTemplateVars{
-		UserName:   getUsername(ctx),
-		ObjName:    srcObj.GetName(),
-		ObjPath:    srcObj.GetPath(),
-		ParentName: stdpath.Base(parentDir),
-		ParentPath: parentDir,
-		TargetName: newName,
-		TargetPath: stdpath.Join(parentDir, newName),
-	}, "rename")
-	if err != nil {
-		return err
-	}
-	return d.commit(message, rootSha)
-}
-
-func (d *Github) Copy(ctx context.Context, srcObj, dstDir model.Obj) error {
-	if !d.isOnBranch {
-		return errors.New("cannot write to non-branch reference")
-	}
-	if strings.HasPrefix(dstDir.GetPath(), srcObj.GetPath()) {
-		return errors.New("cannot copy parent dir to child")
-	}
-	d.commitMutex.Lock()
-	defer d.commitMutex.Unlock()
-
-	dstSha, newSha, _, _, err := d.copyWithoutRenewTree(srcObj, dstDir)
-	if err != nil {
-		return err
-	}
-	rootSha, err := d.renewParentTrees(dstDir.GetPath(), dstSha, newSha, "/")
-	if err != nil {
-		return err
-	}
-	message, err := getMessage(d.copyMsgTmpl, &MessageTemplateVars{
-		UserName:   getUsername(ctx),
-		ObjName:    srcObj.GetName(),
-		ObjPath:    srcObj.GetPath(),
-		ParentName: stdpath.Base(stdpath.Dir(srcObj.GetPath())),
-		ParentPath: stdpath.Dir(srcObj.GetPath()),
-		TargetName: stdpath.Base(dstDir.GetPath()),
-		TargetPath: dstDir.GetPath(),
-	}, "copy")
-	if err != nil {
-		return err
-	}
-	return d.commit(message, rootSha)
-}
-
-func (d *Github) Remove(ctx context.Context, obj model.Obj) error {
-	if !d.isOnBranch {
-		return errors.New("cannot write to non-branch reference")
-	}
-	d.commitMutex.Lock()
-	defer d.commitMutex.Unlock()
-	parentDir := stdpath.Dir(obj.GetPath())
-	tree, treeSha, err := d.getTreeDirectly(parentDir)
-	if err != nil {
-		return err
-	}
-	var del *TreeObjReq = nil
-	for _, t := range tree.Trees {
-		if t.Path == obj.GetName() {
-			if t.Type == "commit" {
-				return errors.New("cannot remove a submodule")
-			}
-			del = &t.TreeObjReq
-			del.Sha = nil
-			break
-		}
-	}
-	if del == nil {
-		return errs.ObjectNotFound
-	}
-	newTree := make([]interface{}, 0, 2)
-	newTree = append(newTree, *del)
-	if len(tree.Trees) == 1 { // completely emptying the repository will get a 404
-		newTree = append(newTree, map[string]string{
-			"path":    ".gitkeep",
-			"mode":    "100644",
-			"type":    "blob",
-			"content": "",
-		})
-	}
-	newSha, err := d.newTree(treeSha, newTree)
-	if err != nil {
-		return err
-	}
-	rootSha, err := d.renewParentTrees(parentDir, treeSha, newSha, "/")
-	if err != nil {
-		return err
-	}
-	commitMessage, err := getMessage(d.deleteMsgTmpl, &MessageTemplateVars{
-		UserName:   getUsername(ctx),
-		ObjName:    obj.GetName(),
-		ObjPath:    obj.GetPath(),
-		ParentName: stdpath.Base(parentDir),
-		ParentPath: parentDir,
-	}, "remove")
-	if err != nil {
-		return err
-	}
-	return d.commit(commitMessage, rootSha)
-}
-
-func (d *Github) Put(ctx context.Context, dstDir model.Obj, stream model.FileStreamer, up driver.UpdateProgress) error {
-	if !d.isOnBranch {
-		return errors.New("cannot write to non-branch reference")
-	}
-	blob, err := d.putBlob(ctx, stream, up)
-	if err != nil {
-		return err
-	}
-	d.commitMutex.Lock()
-	defer d.commitMutex.Unlock()
-	parent, err := d.get(dstDir.GetPath())
-	if err != nil {
-		return err
-	}
-	if parent.Entries == nil {
-		return errs.NotFolder
-	}
-	newTree := make([]interface{}, 0, 2)
-	newTree = append(newTree, TreeObjReq{
-		Path: stream.GetName(),
-		Mode: "100644",
-		Type: "blob",
-		Sha:  blob,
-	})
-	if len(parent.Entries) == 1 && parent.Entries[0].Name == ".gitkeep" {
-		newTree = append(newTree, TreeObjReq{
-			Path: ".gitkeep",
-			Mode: "100644",
-			Type: "blob",
-			Sha:  nil,
-		})
-	}
-	newSha, err := d.newTree(parent.Sha, newTree)
-	if err != nil {
-		return err
-	}
-	rootSha, err := d.renewParentTrees(dstDir.GetPath(), parent.Sha, newSha, "/")
-	if err != nil {
-		return err
-	}
-
-	commitMessage, err := getMessage(d.putMsgTmpl, &MessageTemplateVars{
-		UserName:   getUsername(ctx),
-		ObjName:    stream.GetName(),
-		ObjPath:    stdpath.Join(dstDir.GetPath(), stream.GetName()),
-		ParentName: dstDir.GetName(),
-		ParentPath: dstDir.GetPath(),
-	}, "upload")
-	if err != nil {
-		return err
-	}
-	return d.commit(commitMessage, rootSha)
-}
-
-var _ driver.Driver = (*Github)(nil)
-
-func (d *Github) getContentApiUrl(path string) string {
-	path = utils.FixAndCleanPath(path)
-	return fmt.Sprintf("https://api.github.com/repos/%s/%s/contents%s", d.Owner, d.Repo, path)
-}
-
-func (d *Github) get(path string) (*Object, error) {
-	res, err := d.client.R().SetQueryParam("ref", d.Ref).Get(d.getContentApiUrl(path))
-	if err != nil {
-		return nil, err
-	}
-	if res.StatusCode() != 200 {
-		return nil, toErr(res)
-	}
-	var resp Object
-	err = utils.Json.Unmarshal(res.Body(), &resp)
-	return &resp, err
-}
-
-func (d *Github) putBlob(ctx context.Context, s model.FileStreamer, up driver.UpdateProgress) (string, error) {
-	beforeContent := "{\"encoding\":\"base64\",\"content\":\""
-	afterContent := "\"}"
-	length := int64(len(beforeContent)) + calculateBase64Length(s.GetSize()) + int64(len(afterContent))
-	beforeContentReader := strings.NewReader(beforeContent)
-	contentReader, contentWriter := io.Pipe()
-	go func() {
-		encoder := base64.NewEncoder(base64.StdEncoding, contentWriter)
-		if _, err := utils.CopyWithBuffer(encoder, s); err != nil {
-			_ = contentWriter.CloseWithError(err)
-			return
-		}
-		_ = encoder.Close()
-		_ = contentWriter.Close()
-	}()
-	afterContentReader := strings.NewReader(afterContent)
-	req, err := http.NewRequestWithContext(ctx, http.MethodPost,
-		fmt.Sprintf("https://api.github.com/repos/%s/%s/git/blobs", d.Owner, d.Repo),
-		driver.NewLimitedUploadStream(ctx, &driver.ReaderUpdatingProgress{
-			Reader: &driver.SimpleReaderWithSize{
-				Reader: io.MultiReader(beforeContentReader, contentReader, afterContentReader),
-				Size:   length,
-			},
-			UpdateProgress: up,
-		}))
-	if err != nil {
-		return "", err
-	}
-	req.Header.Set("Accept", "application/vnd.github+json")
-	req.Header.Set("X-GitHub-Api-Version", "2022-11-28")
-	token := strings.TrimSpace(d.Token)
-	if token != "" {
-		req.Header.Set("Authorization", "Bearer "+token)
-	}
-	req.ContentLength = length
-
-	res, err := base.HttpClient.Do(req)
-	if err != nil {
-		return "", err
-	}
-	defer res.Body.Close()
-	resBody, err := io.ReadAll(res.Body)
-	if err != nil {
-		return "", err
-	}
-	if res.StatusCode != 201 {
-		var errMsg ErrResp
-		if err = utils.Json.Unmarshal(resBody, &errMsg); err != nil {
-			return "", errors.New(res.Status)
-		} else {
-			return "", fmt.Errorf("%s: %s", res.Status, errMsg.Message)
-		}
-	}
-	var resp PutBlobResp
-	if err = utils.Json.Unmarshal(resBody, &resp); err != nil {
-		return "", err
-	}
-	return resp.Sha, nil
-}
-
-func (d *Github) renewParentTrees(path, prevSha, curSha, until string) (string, error) {
-	for path != until {
-		path = stdpath.Dir(path)
-		tree, sha, err := d.getTreeDirectly(path)
-		if err != nil {
-			return "", err
-		}
-		var newTree *TreeObjReq = nil
-		for _, t := range tree.Trees {
-			if t.Sha == prevSha {
-				newTree = &t.TreeObjReq
-				newTree.Sha = curSha
-				break
-			}
-		}
-		if newTree == nil {
-			return "", errs.ObjectNotFound
-		}
-		curSha, err = d.newTree(sha, []interface{}{*newTree})
-		if err != nil {
-			return "", err
-		}
-		prevSha = sha
-	}
-	return curSha, nil
-}
-
-func (d *Github) getTree(sha string) (*TreeResp, error) {
-	res, err := d.client.R().Get(fmt.Sprintf("https://api.github.com/repos/%s/%s/git/trees/%s", d.Owner, d.Repo, sha))
-	if err != nil {
-		return nil, err
-	}
-	if res.StatusCode() != 200 {
-		return nil, toErr(res)
-	}
-	var resp TreeResp
-	if err = utils.Json.Unmarshal(res.Body(), &resp); err != nil {
-		return nil, err
-	}
-	return &resp, nil
-}
-
-func (d *Github) getTreeDirectly(path string) (*TreeResp, string, error) {
-	p, err := d.get(path)
-	if err != nil {
-		return nil, "", err
-	}
-	if p.Entries == nil {
-		return nil, "", fmt.Errorf("%s is not a folder", path)
-	}
-	tree, err := d.getTree(p.Sha)
-	if err != nil {
-		return nil, "", err
-	}
-	if tree.Truncated {
-		return nil, "", fmt.Errorf("tree %s is truncated", path)
-	}
-	return tree, p.Sha, nil
-}
-
-func (d *Github) newTree(baseSha string, tree []interface{}) (string, error) {
-	body := &TreeReq{Trees: tree}
-	if baseSha != "" {
-		body.BaseTree = baseSha
-	}
-	res, err := d.client.R().SetBody(body).
-		Post(fmt.Sprintf("https://api.github.com/repos/%s/%s/git/trees", d.Owner, d.Repo))
-	if err != nil {
-		return "", err
-	}
-	if res.StatusCode() != 201 {
-		return "", toErr(res)
-	}
-	var resp TreeResp
-	if err = utils.Json.Unmarshal(res.Body(), &resp); err != nil {
-		return "", err
-	}
-	return resp.Sha, nil
-}
-
-func (d *Github) commit(message, treeSha string) error {
-	oldCommit, err := d.getBranchHead()
-	body := map[string]interface{}{
-		"message": message,
-		"tree":    treeSha,
-		"parents": []string{oldCommit},
-	}
-	d.addCommitterAndAuthor(&body)
-	if d.pgpEntity != nil {
-		signature, e := signCommit(&body, d.pgpEntity)
-		if e != nil {
-			return e
-		}
-		body["signature"] = signature
-	}
-	res, err := d.client.R().SetBody(body).Post(fmt.Sprintf("https://api.github.com/repos/%s/%s/git/commits", d.Owner, d.Repo))
-	if err != nil {
-		return err
-	}
-	if res.StatusCode() != 201 {
-		return toErr(res)
-	}
-	var resp CommitResp
-	if err = utils.Json.Unmarshal(res.Body(), &resp); err != nil {
-		return err
-	}
-
-	// update branch head
-	res, err = d.client.R().
-		SetBody(&UpdateRefReq{
-			Sha:   resp.Sha,
-			Force: false,
-		}).
-		Patch(fmt.Sprintf("https://api.github.com/repos/%s/%s/git/refs/heads/%s", d.Owner, d.Repo, d.Ref))
-	if err != nil {
-		return err
-	}
-	if res.StatusCode() != 200 {
-		return toErr(res)
-	}
-	return nil
-}
-
-func (d *Github) getBranchHead() (string, error) {
-	res, err := d.client.R().Get(fmt.Sprintf("https://api.github.com/repos/%s/%s/branches/%s", d.Owner, d.Repo, d.Ref))
-	if err != nil {
-		return "", err
-	}
-	if res.StatusCode() != 200 {
-		return "", toErr(res)
-	}
-	var resp BranchResp
-	if err = utils.Json.Unmarshal(res.Body(), &resp); err != nil {
-		return "", err
-	}
-	return resp.Commit.Sha, nil
-}
-
-func (d *Github) copyWithoutRenewTree(srcObj, dstDir model.Obj) (dstSha, newSha, srcParentSha string, srcParentTree *TreeResp, err error) {
-	dst, err := d.get(dstDir.GetPath())
-	if err != nil {
-		return "", "", "", nil, err
-	}
-	if dst.Entries == nil {
-		return "", "", "", nil, errs.NotFolder
-	}
-	dstSha = dst.Sha
-	srcParentPath := stdpath.Dir(srcObj.GetPath())
-	srcParentTree, srcParentSha, err = d.getTreeDirectly(srcParentPath)
-	if err != nil {
-		return "", "", "", nil, err
-	}
-	var src *TreeObjReq = nil
-	for _, t := range srcParentTree.Trees {
-		if t.Path == srcObj.GetName() {
-			if t.Type == "commit" {
-				return "", "", "", nil, errors.New("cannot copy a submodule")
-			}
-			src = &t.TreeObjReq
-			break
-		}
-	}
-	if src == nil {
-		return "", "", "", nil, errs.ObjectNotFound
-	}
-
-	newTree := make([]interface{}, 0, 2)
-	newTree = append(newTree, *src)
-	if len(dst.Entries) == 1 && dst.Entries[0].Name == ".gitkeep" {
-		newTree = append(newTree, TreeObjReq{
-			Path: ".gitkeep",
-			Mode: "100644",
-			Type: "blob",
-			Sha:  nil,
-		})
-	}
-	newSha, err = d.newTree(dstSha, newTree)
-	if err != nil {
-		return "", "", "", nil, err
-	}
-	return dstSha, newSha, srcParentSha, srcParentTree, nil
-}
-
-func (d *Github) getRepo() (*RepoResp, error) {
-	res, err := d.client.R().Get(fmt.Sprintf("https://api.github.com/repos/%s/%s", d.Owner, d.Repo))
-	if err != nil {
-		return nil, err
-	}
-	if res.StatusCode() != 200 {
-		return nil, toErr(res)
-	}
-	var resp RepoResp
-	if err = utils.Json.Unmarshal(res.Body(), &resp); err != nil {
-		return nil, err
-	}
-	return &resp, nil
-}
-
-func (d *Github) getAuthenticatedUser() (*UserResp, error) {
-	res, err := d.client.R().Get("https://api.github.com/user")
-	if err != nil {
-		return nil, err
-	}
-	if res.StatusCode() != 200 {
-		return nil, toErr(res)
-	}
-	resp := &UserResp{}
-	if err = utils.Json.Unmarshal(res.Body(), resp); err != nil {
-		return nil, err
-	}
-	return resp, nil
-}
-
-func (d *Github) addCommitterAndAuthor(m *map[string]interface{}) {
-	if d.CommitterName != "" {
-		committer := map[string]string{
-			"name":  d.CommitterName,
-			"email": d.CommitterEmail,
-		}
-		(*m)["committer"] = committer
-	}
-	if d.AuthorName != "" {
-		author := map[string]string{
-			"name":  d.AuthorName,
-			"email": d.AuthorEmail,
-		}
-		(*m)["author"] = author
-	}
-}

drivers/github/meta.go

@@ -1,39 +0,0 @@
-package github
-
-import (
-	"github.com/alist-org/alist/v3/internal/driver"
-	"github.com/alist-org/alist/v3/internal/op"
-)
-
-type Addition struct {
-	driver.RootPath
-	Token            string `json:"token" type:"string" required:"true"`
-	Owner            string `json:"owner" type:"string" required:"true"`
-	Repo             string `json:"repo" type:"string" required:"true"`
-	Ref              string `json:"ref" type:"string" help:"A branch, a tag or a commit SHA, main branch by default."`
-	GitHubProxy      string `json:"gh_proxy" type:"string" help:"GitHub proxy, e.g. https://ghproxy.net/raw.githubusercontent.com or https://gh-proxy.com/raw.githubusercontent.com"`
-	GPGPrivateKey    string `json:"gpg_private_key" type:"text"`
-	GPGKeyPassphrase string `json:"gpg_key_passphrase" type:"string"`
-	CommitterName    string `json:"committer_name" type:"string"`
-	CommitterEmail   string `json:"committer_email" type:"string"`
-	AuthorName       string `json:"author_name" type:"string"`
-	AuthorEmail      string `json:"author_email" type:"string"`
-	MkdirCommitMsg   string `json:"mkdir_commit_message" type:"text" default:"{{.UserName}} mkdir {{.ObjPath}}"`
-	DeleteCommitMsg  string `json:"delete_commit_message" type:"text" default:"{{.UserName}} remove {{.ObjPath}}"`
-	PutCommitMsg     string `json:"put_commit_message" type:"text" default:"{{.UserName}} upload {{.ObjPath}}"`
-	RenameCommitMsg  string `json:"rename_commit_message" type:"text" default:"{{.UserName}} rename {{.ObjPath}} to {{.TargetName}}"`
-	CopyCommitMsg    string `json:"copy_commit_message" type:"text" default:"{{.UserName}} copy {{.ObjPath}} to {{.TargetPath}}"`
-	MoveCommitMsg    string `json:"move_commit_message" type:"text" default:"{{.UserName}} move {{.ObjPath}} to {{.TargetPath}}"`
-}
-
-var config = driver.Config{
-	Name:        "GitHub API",
-	LocalSort:   true,
-	DefaultRoot: "/",
-}
-
-func init() {
-	op.RegisterDriver(func() driver.Driver {
-		return &Github{}
-	})
-}

drivers/github/types.go

@@ -1,107 +0,0 @@
-package github
-
-import (
-	"github.com/alist-org/alist/v3/internal/model"
-	"time"
-)
-
-type Links struct {
-	Git  string `json:"git"`
-	Html string `json:"html"`
-	Self string `json:"self"`
-}
-
-type Object struct {
-	Type            string   `json:"type"`
-	Encoding        string   `json:"encoding" required:"false"`
-	Size            int64    `json:"size"`
-	Name            string   `json:"name"`
-	Path            string   `json:"path"`
-	Content         string   `json:"Content" required:"false"`
-	Sha             string   `json:"sha"`
-	URL             string   `json:"url"`
-	GitURL          string   `json:"git_url"`
-	HtmlURL         string   `json:"html_url"`
-	DownloadURL     string   `json:"download_url"`
-	Entries         []Object `json:"entries" required:"false"`
-	Links           Links    `json:"_links"`
-	SubmoduleGitURL string   `json:"submodule_git_url" required:"false"`
-	Target          string   `json:"target" required:"false"`
-}
-
-func (o *Object) toModelObj() *model.Object {
-	return &model.Object{
-		Name:     o.Name,
-		Size:     o.Size,
-		Modified: time.Unix(0, 0),
-		IsFolder: o.Type == "dir",
-	}
-}
-
-type PutBlobResp struct {
-	URL string `json:"url"`
-	Sha string `json:"sha"`
-}
-
-type ErrResp struct {
-	Message          string `json:"message"`
-	DocumentationURL string `json:"documentation_url"`
-	Status           string `json:"status"`
-}
-
-type TreeObjReq struct {
-	Path string      `json:"path"`
-	Mode string      `json:"mode"`
-	Type string      `json:"type"`
-	Sha  interface{} `json:"sha"`
-}
-
-type TreeObjResp struct {
-	TreeObjReq
-	Size int64  `json:"size" required:"false"`
-	URL  string `json:"url"`
-}
-
-func (o *TreeObjResp) toModelObj() *model.Object {
-	return &model.Object{
-		Name:     o.Path,
-		Size:     o.Size,
-		Modified: time.Unix(0, 0),
-		IsFolder: o.Type == "tree",
-	}
-}
-
-type TreeResp struct {
-	Sha       string        `json:"sha"`
-	URL       string        `json:"url"`
-	Trees     []TreeObjResp `json:"tree"`
-	Truncated bool          `json:"truncated"`
-}
-
-type TreeReq struct {
-	BaseTree interface{}   `json:"base_tree,omitempty"`
-	Trees    []interface{} `json:"tree"`
-}
-
-type CommitResp struct {
-	Sha string `json:"sha"`
-}
-
-type BranchResp struct {
-	Name   string     `json:"name"`
-	Commit CommitResp `json:"commit"`
-}
-
-type UpdateRefReq struct {
-	Sha   string `json:"sha"`
-	Force bool   `json:"force"`
-}
-
-type RepoResp struct {
-	DefaultBranch string `json:"default_branch"`
-}
-
-type UserResp struct {
-	Name  string `json:"name"`
-	Email string `json:"email"`
-}

drivers/github/util.go

@@ -1,167 +0,0 @@
-package github
-
-import (
-	"bytes"
-	"context"
-	"errors"
-	"fmt"
-	"io"
-	"strings"
-	"text/template"
-	"time"
-
-	"github.com/ProtonMail/go-crypto/openpgp"
-	"github.com/ProtonMail/go-crypto/openpgp/armor"
-	"github.com/alist-org/alist/v3/internal/model"
-	"github.com/alist-org/alist/v3/pkg/utils"
-	"github.com/go-resty/resty/v2"
-)
-
-type MessageTemplateVars struct {
-	UserName   string
-	ObjName    string
-	ObjPath    string
-	ParentName string
-	ParentPath string
-	TargetName string
-	TargetPath string
-}
-
-func getMessage(tmpl *template.Template, vars *MessageTemplateVars, defaultOpStr string) (string, error) {
-	sb := strings.Builder{}
-	if err := tmpl.Execute(&sb, vars); err != nil {
-		return fmt.Sprintf("%s %s %s", vars.UserName, defaultOpStr, vars.ObjPath), err
-	}
-	return sb.String(), nil
-}
-
-func calculateBase64Length(inputLength int64) int64 {
-	return 4 * ((inputLength + 2) / 3)
-}
-
-func toErr(res *resty.Response) error {
-	var errMsg ErrResp
-	if err := utils.Json.Unmarshal(res.Body(), &errMsg); err != nil {
-		return errors.New(res.Status())
-	} else {
-		return fmt.Errorf("%s: %s", res.Status(), errMsg.Message)
-	}
-}
-
-// Example input:
-// a = /aaa/bbb/ccc
-// b = /aaa/b11/ddd/ccc
-//
-// Output:
-// ancestor = /aaa
-// aChildName = bbb
-// bChildName = b11
-// aRest = bbb/ccc
-// bRest = b11/ddd/ccc
-func getPathCommonAncestor(a, b string) (ancestor, aChildName, bChildName, aRest, bRest string) {
-	a = utils.FixAndCleanPath(a)
-	b = utils.FixAndCleanPath(b)
-	idx := 1
-	for idx < len(a) && idx < len(b) {
-		if a[idx] != b[idx] {
-			break
-		}
-		idx++
-	}
-	aNextIdx := idx
-	for aNextIdx < len(a) {
-		if a[aNextIdx] == '/' {
-			break
-		}
-		aNextIdx++
-	}
-	bNextIdx := idx
-	for bNextIdx < len(b) {
-		if b[bNextIdx] == '/' {
-			break
-		}
-		bNextIdx++
-	}
-	for idx > 0 {
-		if a[idx] == '/' {
-			break
-		}
-		idx--
-	}
-	ancestor = utils.FixAndCleanPath(a[:idx])
-	aChildName = a[idx+1 : aNextIdx]
-	bChildName = b[idx+1 : bNextIdx]
-	aRest = a[idx+1:]
-	bRest = b[idx+1:]
-	return ancestor, aChildName, bChildName, aRest, bRest
-}
-
-func getUsername(ctx context.Context) string {
-	user, ok := ctx.Value("user").(*model.User)
-	if !ok {
-		return "<system>"
-	}
-	return user.Username
-}
-
-func loadPrivateKey(key, passphrase string) (*openpgp.Entity, error) {
-	entityList, err := openpgp.ReadArmoredKeyRing(strings.NewReader(key))
-	if err != nil {
-		return nil, err
-	}
-	if len(entityList) < 1 {
-		return nil, fmt.Errorf("no keys found in key ring")
-	}
-	entity := entityList[0]
-
-	pass := []byte(passphrase)
-	if entity.PrivateKey != nil && entity.PrivateKey.Encrypted {
-		if err = entity.PrivateKey.Decrypt(pass); err != nil {
-			return nil, fmt.Errorf("password incorrect: %+v", err)
-		}
-	}
-	for _, subKey := range entity.Subkeys {
-		if subKey.PrivateKey != nil && subKey.PrivateKey.Encrypted {
-			if err = subKey.PrivateKey.Decrypt(pass); err != nil {
-				return nil, fmt.Errorf("password incorrect: %+v", err)
-			}
-		}
-	}
-	return entity, nil
-}
-
-func signCommit(m *map[string]interface{}, entity *openpgp.Entity) (string, error) {
-	var commit strings.Builder
-	commit.WriteString(fmt.Sprintf("tree %s\n", (*m)["tree"].(string)))
-	parents := (*m)["parents"].([]string)
-	for _, p := range parents {
-		commit.WriteString(fmt.Sprintf("parent %s\n", p))
-	}
-	now := time.Now()
-	_, offset := now.Zone()
-	hour := offset / 3600
-	author := (*m)["author"].(map[string]string)
-	commit.WriteString(fmt.Sprintf("author %s <%s> %d %+03d00\n", author["name"], author["email"], now.Unix(), hour))
-	author["date"] = now.Format(time.RFC3339)
-	committer := (*m)["committer"].(map[string]string)
-	commit.WriteString(fmt.Sprintf("committer %s <%s> %d %+03d00\n", committer["name"], committer["email"], now.Unix(), hour))
-	committer["date"] = now.Format(time.RFC3339)
-	commit.WriteString(fmt.Sprintf("\n%s", (*m)["message"].(string)))
-	data := commit.String()
-
-	var sigBuffer bytes.Buffer
-	err := openpgp.DetachSign(&sigBuffer, entity, strings.NewReader(data), nil)
-	if err != nil {
-		return "", fmt.Errorf("signing failed: %v", err)
-	}
-	var armoredSig bytes.Buffer
-	armorWriter, err := armor.Encode(&armoredSig, "PGP SIGNATURE", nil)
-	if err != nil {
-		return "", err
-	}
-	if _, err = io.Copy(armorWriter, &sigBuffer); err != nil {
-		return "", err
-	}
-	_ = armorWriter.Close()
-	return armoredSig.String(), nil
-}

drivers/github_releases/driver.go

@@ -1,167 +0,0 @@
-package github_releases
-
-import (
-	"context"
-	"fmt"
-	"net/http"
-	"strings"
-
-	"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 GithubReleases struct {
-	model.Storage
-	Addition
-
-	points []MountPoint
-}
-
-func (d *GithubReleases) Config() driver.Config {
-	return config
-}
-
-func (d *GithubReleases) GetAddition() driver.Additional {
-	return &d.Addition
-}
-
-func (d *GithubReleases) Init(ctx context.Context) error {
-	d.ParseRepos(d.Addition.RepoStructure)
-	return nil
-}
-
-func (d *GithubReleases) Drop(ctx context.Context) error {
-	return nil
-}
-
-func (d *GithubReleases) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([]model.Obj, error) {
-	files := make([]File, 0)
-	path := fmt.Sprintf("/%s", strings.Trim(dir.GetPath(), "/"))
-
-	for i := range d.points {
-		point := &d.points[i]
-
-		if !d.Addition.ShowAllVersion { // latest
-			point.RequestRelease(d.GetRequest, args.Refresh)
-
-			if point.Point == path { // 与仓库路径相同
-				files = append(files, point.GetLatestRelease()...)
-				if d.Addition.ShowReadme {
-					files = append(files, point.GetOtherFile(d.GetRequest, args.Refresh)...)
-				}
-			} else if strings.HasPrefix(point.Point, path) { // 仓库目录的父目录
-				nextDir := GetNextDir(point.Point, path)
-				if nextDir == "" {
-					continue
-				}
-
-				hasSameDir := false
-				for index := range files {
-					if files[index].GetName() == nextDir {
-						hasSameDir = true
-						files[index].Size += point.GetLatestSize()
-						break
-					}
-				}
-				if !hasSameDir {
-					files = append(files, File{
-						Path:     path + "/" + nextDir,
-						FileName: nextDir,
-						Size:     point.GetLatestSize(),
-						UpdateAt: point.Release.PublishedAt,
-						CreateAt: point.Release.CreatedAt,
-						Type:     "dir",
-						Url:      "",
-					})
-				}
-			}
-		} else { // all version
-			point.RequestReleases(d.GetRequest, args.Refresh)
-
-			if point.Point == path { // 与仓库路径相同
-				files = append(files, point.GetAllVersion()...)
-				if d.Addition.ShowReadme {
-					files = append(files, point.GetOtherFile(d.GetRequest, args.Refresh)...)
-				}
-			} else if strings.HasPrefix(point.Point, path) { // 仓库目录的父目录
-				nextDir := GetNextDir(point.Point, path)
-				if nextDir == "" {
-					continue
-				}
-
-				hasSameDir := false
-				for index := range files {
-					if files[index].GetName() == nextDir {
-						hasSameDir = true
-						files[index].Size += point.GetAllVersionSize()
-						break
-					}
-				}
-				if !hasSameDir {
-					files = append(files, File{
-						FileName: nextDir,
-						Path:     path + "/" + nextDir,
-						Size:     point.GetAllVersionSize(),
-						UpdateAt: (*point.Releases)[0].PublishedAt,
-						CreateAt: (*point.Releases)[0].CreatedAt,
-						Type:     "dir",
-						Url:      "",
-					})
-				}
-			} else if strings.HasPrefix(path, point.Point) { // 仓库目录的子目录
-				tagName := GetNextDir(path, point.Point)
-				if tagName == "" {
-					continue
-				}
-
-				files = append(files, point.GetReleaseByTagName(tagName)...)
-			}
-		}
-	}
-
-	return utils.SliceConvert(files, func(src File) (model.Obj, error) {
-		return src, nil
-	})
-}
-
-func (d *GithubReleases) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
-	url := file.GetID()
-	gh_proxy := strings.TrimSpace(d.Addition.GitHubProxy)
-
-	if gh_proxy != "" {
-		url = strings.Replace(url, "https://github.com", gh_proxy, 1)
-	}
-
-	link := model.Link{
-		URL:    url,
-		Header: http.Header{},
-	}
-	return &link, nil
-}
-
-func (d *GithubReleases) MakeDir(ctx context.Context, parentDir model.Obj, dirName string) (model.Obj, error) {
-	// TODO create folder, optional
-	return nil, errs.NotImplement
-}
-
-func (d *GithubReleases) Move(ctx context.Context, srcObj, dstDir model.Obj) (model.Obj, error) {
-	// TODO move obj, optional
-	return nil, errs.NotImplement
-}
-
-func (d *GithubReleases) Rename(ctx context.Context, srcObj model.Obj, newName string) (model.Obj, error) {
-	// TODO rename obj, optional
-	return nil, errs.NotImplement
-}
-
-func (d *GithubReleases) Copy(ctx context.Context, srcObj, dstDir model.Obj) (model.Obj, error) {
-	// TODO copy obj, optional
-	return nil, errs.NotImplement
-}
-
-func (d *GithubReleases) Remove(ctx context.Context, obj model.Obj) error {
-	// TODO remove obj, optional
-	return errs.NotImplement
-}

drivers/github_releases/meta.go

@@ -1,35 +0,0 @@
-package github_releases
-
-import (
-	"github.com/alist-org/alist/v3/internal/driver"
-	"github.com/alist-org/alist/v3/internal/op"
-)
-
-type Addition struct {
-	driver.RootID
-	RepoStructure  string `json:"repo_structure" type:"text" required:"true" default:"alistGo/alist" help:"structure:[path:]org/repo"`
-	ShowReadme     bool   `json:"show_readme" type:"bool" default:"true" help:"show README、LICENSE file"`
-	Token          string `json:"token" type:"string" required:"false" help:"GitHub token, if you want to access private repositories or increase the rate limit"`
-	ShowAllVersion bool   `json:"show_all_version" type:"bool" default:"false" help:"show all versions"`
-	GitHubProxy    string `json:"gh_proxy" type:"string" default:"" help:"GitHub proxy, e.g. https://ghproxy.net/github.com or https://gh-proxy.com/github.com "`
-}
-
-var config = driver.Config{
-	Name:              "GitHub Releases",
-	LocalSort:         false,
-	OnlyLocal:         false,
-	OnlyProxy:         false,
-	NoCache:           false,
-	NoUpload:          false,
-	NeedMs:            false,
-	DefaultRoot:       "",
-	CheckStatus:       false,
-	Alert:             "",
-	NoOverwriteUpload: false,
-}
-
-func init() {
-	op.RegisterDriver(func() driver.Driver {
-		return &GithubReleases{}
-	})
-}

drivers/github_releases/models.go

@@ -1,86 +0,0 @@
-package github_releases
-
-type Release struct {
-	Url             string    `json:"url"`
-	AssetsUrl       string    `json:"assets_url"`
-	UploadUrl       string    `json:"upload_url"`
-	HtmlUrl         string    `json:"html_url"`
-	Id              int       `json:"id"`
-	Author          User      `json:"author"`
-	NodeId          string    `json:"node_id"`
-	TagName         string    `json:"tag_name"`
-	TargetCommitish string    `json:"target_commitish"`
-	Name            string    `json:"name"`
-	Draft           bool      `json:"draft"`
-	Prerelease      bool      `json:"prerelease"`
-	CreatedAt       string    `json:"created_at"`
-	PublishedAt     string    `json:"published_at"`
-	Assets          []Asset   `json:"assets"`
-	TarballUrl      string    `json:"tarball_url"`
-	ZipballUrl      string    `json:"zipball_url"`
-	Body            string    `json:"body"`
-	Reactions       Reactions `json:"reactions"`
-}
-
-type User struct {
-	Login             string `json:"login"`
-	Id                int    `json:"id"`
-	NodeId            string `json:"node_id"`
-	AvatarUrl         string `json:"avatar_url"`
-	GravatarId        string `json:"gravatar_id"`
-	Url               string `json:"url"`
-	HtmlUrl           string `json:"html_url"`
-	FollowersUrl      string `json:"followers_url"`
-	FollowingUrl      string `json:"following_url"`
-	GistsUrl          string `json:"gists_url"`
-	StarredUrl        string `json:"starred_url"`
-	SubscriptionsUrl  string `json:"subscriptions_url"`
-	OrganizationsUrl  string `json:"organizations_url"`
-	ReposUrl          string `json:"repos_url"`
-	EventsUrl         string `json:"events_url"`
-	ReceivedEventsUrl string `json:"received_events_url"`
-	Type              string `json:"type"`
-	UserViewType      string `json:"user_view_type"`
-	SiteAdmin         bool   `json:"site_admin"`
-}
-
-type Asset struct {
-	Url                string `json:"url"`
-	Id                 int    `json:"id"`
-	NodeId             string `json:"node_id"`
-	Name               string `json:"name"`
-	Label              string `json:"label"`
-	Uploader           User   `json:"uploader"`
-	ContentType        string `json:"content_type"`
-	State              string `json:"state"`
-	Size               int64  `json:"size"`
-	DownloadCount      int    `json:"download_count"`
-	CreatedAt          string `json:"created_at"`
-	UpdatedAt          string `json:"updated_at"`
-	BrowserDownloadUrl string `json:"browser_download_url"`
-}
-
-type Reactions struct {
-	Url        string `json:"url"`
-	TotalCount int    `json:"total_count"`
-	PlusOne    int    `json:"+1"`
-	MinusOne   int    `json:"-1"`
-	Laugh      int    `json:"laugh"`
-	Hooray     int    `json:"hooray"`
-	Confused   int    `json:"confused"`
-	Heart      int    `json:"heart"`
-	Rocket     int    `json:"rocket"`
-	Eyes       int    `json:"eyes"`
-}
-
-type FileInfo struct {
-	Name        string `json:"name"`
-	Path        string `json:"path"`
-	Sha         string `json:"sha"`
-	Size        int64  `json:"size"`
-	Url         string `json:"url"`
-	HtmlUrl     string `json:"html_url"`
-	GitUrl      string `json:"git_url"`
-	DownloadUrl string `json:"download_url"`
-	Type        string `json:"type"`
-}

drivers/github_releases/types.go

@@ -1,213 +0,0 @@
-package github_releases
-
-import (
-	"encoding/json"
-	"strings"
-	"time"
-
-	"github.com/alist-org/alist/v3/pkg/utils"
-	"github.com/go-resty/resty/v2"
-)
-
-type MountPoint struct {
-	Point     string      // 挂载点
-	Repo      string      // 仓库名 owner/repo
-	Release   *Release    // Release 指针 latest
-	Releases  *[]Release  // []Release 指针
-	OtherFile *[]FileInfo // 仓库根目录下的其他文件
-}
-
-// 请求最新版本
-func (m *MountPoint) RequestRelease(get func(url string) (*resty.Response, error), refresh bool) {
-	if m.Repo == "" {
-		return
-	}
-
-	if m.Release == nil || refresh {
-		resp, _ := get("https://api.github.com/repos/" + m.Repo + "/releases/latest")
-		m.Release = new(Release)
-		json.Unmarshal(resp.Body(), m.Release)
-	}
-}
-
-// 请求所有版本
-func (m *MountPoint) RequestReleases(get func(url string) (*resty.Response, error), refresh bool) {
-	if m.Repo == "" {
-		return
-	}
-
-	if m.Releases == nil || refresh {
-		resp, _ := get("https://api.github.com/repos/" + m.Repo + "/releases")
-		m.Releases = new([]Release)
-		json.Unmarshal(resp.Body(), m.Releases)
-	}
-}
-
-// 获取最新版本
-func (m *MountPoint) GetLatestRelease() []File {
-	files := make([]File, 0)
-	for _, asset := range m.Release.Assets {
-		files = append(files, File{
-			Path:     m.Point + "/" + asset.Name,
-			FileName: asset.Name,
-			Size:     asset.Size,
-			Type:     "file",
-			UpdateAt: asset.UpdatedAt,
-			CreateAt: asset.CreatedAt,
-			Url:      asset.BrowserDownloadUrl,
-		})
-	}
-	return files
-}
-
-// 获取最新版本大小
-func (m *MountPoint) GetLatestSize() int64 {
-	size := int64(0)
-	for _, asset := range m.Release.Assets {
-		size += asset.Size
-	}
-	return size
-}
-
-// 获取所有版本
-func (m *MountPoint) GetAllVersion() []File {
-	files := make([]File, 0)
-	for _, release := range *m.Releases {
-		file := File{
-			Path:     m.Point + "/" + release.TagName,
-			FileName: release.TagName,
-			Size:     m.GetSizeByTagName(release.TagName),
-			Type:     "dir",
-			UpdateAt: release.PublishedAt,
-			CreateAt: release.CreatedAt,
-			Url:      release.HtmlUrl,
-		}
-		for _, asset := range release.Assets {
-			file.Size += asset.Size
-		}
-		files = append(files, file)
-	}
-	return files
-}
-
-// 根据版本号获取版本
-func (m *MountPoint) GetReleaseByTagName(tagName string) []File {
-	for _, item := range *m.Releases {
-		if item.TagName == tagName {
-			files := make([]File, 0)
-			for _, asset := range item.Assets {
-				files = append(files, File{
-					Path:     m.Point + "/" + tagName + "/" + asset.Name,
-					FileName: asset.Name,
-					Size:     asset.Size,
-					Type:     "file",
-					UpdateAt: asset.UpdatedAt,
-					CreateAt: asset.CreatedAt,
-					Url:      asset.BrowserDownloadUrl,
-				})
-			}
-			return files
-		}
-	}
-	return nil
-}
-
-// 根据版本号获取版本大小
-func (m *MountPoint) GetSizeByTagName(tagName string) int64 {
-	if m.Releases == nil {
-		return 0
-	}
-	for _, item := range *m.Releases {
-		if item.TagName == tagName {
-			size := int64(0)
-			for _, asset := range item.Assets {
-				size += asset.Size
-			}
-			return size
-		}
-	}
-	return 0
-}
-
-// 获取所有版本大小
-func (m *MountPoint) GetAllVersionSize() int64 {
-	if m.Releases == nil {
-		return 0
-	}
-	size := int64(0)
-	for _, release := range *m.Releases {
-		for _, asset := range release.Assets {
-			size += asset.Size
-		}
-	}
-	return size
-}
-
-func (m *MountPoint) GetOtherFile(get func(url string) (*resty.Response, error), refresh bool) []File {
-	if m.OtherFile == nil || refresh {
-		resp, _ := get("https://api.github.com/repos/" + m.Repo + "/contents")
-		m.OtherFile = new([]FileInfo)
-		json.Unmarshal(resp.Body(), m.OtherFile)
-	}
-
-	files := make([]File, 0)
-	defaultTime := "1970-01-01T00:00:00Z"
-	for _, file := range *m.OtherFile {
-		if strings.HasSuffix(file.Name, ".md") || strings.HasPrefix(file.Name, "LICENSE") {
-			files = append(files, File{
-				Path:     m.Point + "/" + file.Name,
-				FileName: file.Name,
-				Size:     file.Size,
-				Type:     "file",
-				UpdateAt: defaultTime,
-				CreateAt: defaultTime,
-				Url:      file.DownloadUrl,
-			})
-		}
-	}
-	return files
-}
-
-type File struct {
-	Path     string // 文件路径
-	FileName string // 文件名
-	Size     int64  // 文件大小
-	Type     string // 文件类型
-	UpdateAt string // 更新时间 eg:"2025-01-27T16:10:16Z"
-	CreateAt string // 创建时间
-	Url      string // 下载链接
-}
-
-func (f File) GetHash() utils.HashInfo {
-	return utils.HashInfo{}
-}
-
-func (f File) GetPath() string {
-	return f.Path
-}
-
-func (f File) GetSize() int64 {
-	return f.Size
-}
-
-func (f File) GetName() string {
-	return f.FileName
-}
-
-func (f File) ModTime() time.Time {
-	t, _ := time.Parse(time.RFC3339, f.CreateAt)
-	return t
-}
-
-func (f File) CreateTime() time.Time {
-	t, _ := time.Parse(time.RFC3339, f.CreateAt)
-	return t
-}
-
-func (f File) IsDir() bool {
-	return f.Type == "dir"
-}
-
-func (f File) GetID() string {
-	return f.Url
-}

drivers/github_releases/util.go

@@ -1,85 +0,0 @@
-package github_releases
-
-import (
-	"fmt"
-	"path/filepath"
-	"strings"
-
-	"github.com/alist-org/alist/v3/drivers/base"
-	"github.com/go-resty/resty/v2"
-	log "github.com/sirupsen/logrus"
-)
-
-// 发送 GET 请求
-func (d *GithubReleases) GetRequest(url string) (*resty.Response, error) {
-	req := base.RestyClient.R()
-	req.SetHeader("Accept", "application/vnd.github+json")
-	req.SetHeader("X-GitHub-Api-Version", "2022-11-28")
-	if d.Addition.Token != "" {
-		req.SetHeader("Authorization", fmt.Sprintf("Bearer %s", d.Addition.Token))
-	}
-	res, err := req.Get(url)
-	if err != nil {
-		return nil, err
-	}
-	if res.StatusCode() != 200 {
-		log.Warn("failed to get request: ", res.StatusCode(), res.String())
-	}
-	return res, nil
-}
-
-// 解析挂载结构
-func (d *GithubReleases) ParseRepos(text string) ([]MountPoint, error) {
-	lines := strings.Split(text, "\n")
-	points := make([]MountPoint, 0)
-	for _, line := range lines {
-		line = strings.TrimSpace(line)
-		if line == "" {
-			continue
-		}
-		parts := strings.Split(line, ":")
-		path, repo := "", ""
-		if len(parts) == 1 {
-			path = "/"
-			repo = parts[0]
-		} else if len(parts) == 2 {
-			path = fmt.Sprintf("/%s", strings.Trim(parts[0], "/"))
-			repo = parts[1]
-		} else {
-			return nil, fmt.Errorf("invalid format: %s", line)
-		}
-
-		points = append(points, MountPoint{
-			Point:    path,
-			Repo:     repo,
-			Release:  nil,
-			Releases: nil,
-		})
-	}
-	d.points = points
-	return points, nil
-}
-
-// 获取下一级目录
-func GetNextDir(wholePath string, basePath string) string {
-	basePath = fmt.Sprintf("%s/", strings.TrimRight(basePath, "/"))
-	if !strings.HasPrefix(wholePath, basePath) {
-		return ""
-	}
-	remainingPath := strings.TrimLeft(strings.TrimPrefix(wholePath, basePath), "/")
-	if remainingPath != "" {
-		parts := strings.Split(remainingPath, "/")
-		nextDir := parts[0]
-		if strings.HasPrefix(wholePath, strings.TrimRight(basePath, "/")+"/"+nextDir) {
-			return nextDir
-		}
-	}
-	return ""
-}
-
-// 判断当前目录是否是目标目录的祖先目录
-func IsAncestorDir(parentDir string, targetDir string) bool {
-	absTargetDir, _ := filepath.Abs(targetDir)
-	absParentDir, _ := filepath.Abs(parentDir)
-	return strings.HasPrefix(absTargetDir, absParentDir)
-}

drivers/google_drive/driver.go

@@ -158,8 +158,7 @@ func (d *GoogleDrive) Put(ctx context.Context, dstDir model.Obj, stream model.Fi
 	putUrl := res.Header().Get("location")
 	if stream.GetSize() < d.ChunkSize*1024*1024 {
 		_, err = d.request(putUrl, http.MethodPut, func(req *resty.Request) {
-			req.SetHeader("Content-Length", strconv.FormatInt(stream.GetSize(), 10)).
-				SetBody(driver.NewLimitedUploadStream(ctx, stream))
+			req.SetHeader("Content-Length", strconv.FormatInt(stream.GetSize(), 10)).SetBody(stream)
 		}, nil)
 	} else {
 		err = d.chunkUpload(ctx, stream, putUrl)

drivers/google_drive/util.go

@@ -11,10 +11,10 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/alist-org/alist/v3/drivers/base"
-	"github.com/alist-org/alist/v3/internal/driver"
-	"github.com/alist-org/alist/v3/internal/model"
 	"github.com/alist-org/alist/v3/pkg/http_range"
+
+	"github.com/alist-org/alist/v3/drivers/base"
+	"github.com/alist-org/alist/v3/internal/model"
 	"github.com/alist-org/alist/v3/pkg/utils"
 	"github.com/go-resty/resty/v2"
 	"github.com/golang-jwt/jwt/v4"
@@ -126,7 +126,8 @@ func (d *GoogleDrive) refreshToken() error {
 		}
 		d.AccessToken = resp.AccessToken
 		return nil
-	} else if os.IsExist(gdsaFileErr) {
+	}
+	if gdsaFileErr != nil && os.IsExist(gdsaFileErr) {
 		return gdsaFileErr
 	}
 	url := "https://www.googleapis.com/oauth2/v4/token"
@@ -228,7 +229,6 @@ func (d *GoogleDrive) chunkUpload(ctx context.Context, stream model.FileStreamer
 		if err != nil {
 			return err
 		}
-		reader = driver.NewLimitedUploadStream(ctx, reader)
 		_, err = d.request(url, http.MethodPut, func(req *resty.Request) {
 			req.SetHeaders(map[string]string{
 				"Content-Length": strconv.FormatInt(chunkSize, 10),

drivers/google_photo/driver.go

@@ -58,9 +58,33 @@ func (d *GooglePhoto) Link(ctx context.Context, file model.Obj, args model.LinkA
 			URL: f.BaseURL + "=d",
 		}, nil
 	} else if strings.Contains(f.MimeType, "video/") {
-		return &model.Link{
-			URL: f.BaseURL + "=dv",
-		}, nil
+		var width, height int
+
+		fmt.Sscanf(f.MediaMetadata.Width, "%d", &width)
+		fmt.Sscanf(f.MediaMetadata.Height, "%d", &height)
+
+		switch {
+		// 1080P
+		case width == 1920 && height == 1080:
+			return &model.Link{
+				URL: f.BaseURL + "=m37",
+			}, nil
+		// 720P
+		case width == 1280 && height == 720:
+			return &model.Link{
+				URL: f.BaseURL + "=m22",
+			}, nil
+		// 360P
+		case width == 640 && height == 360:
+			return &model.Link{
+				URL: f.BaseURL + "=m18",
+			}, nil
+		default:
+			return &model.Link{
+				URL: f.BaseURL + "=dv",
+			}, nil
+		}
+
 	}
 	return &model.Link{}, nil
 }
@@ -124,7 +148,7 @@ func (d *GooglePhoto) Put(ctx context.Context, dstDir model.Obj, stream model.Fi
 	}
 
 	resp, err := d.request(postUrl, http.MethodPost, func(req *resty.Request) {
-		req.SetBody(driver.NewLimitedUploadStream(ctx, stream)).SetContext(ctx)
+		req.SetBody(stream).SetContext(ctx)
 	}, nil, postHeaders)
 
 	if err != nil {