wip: dropbox surpport

.github/FUNDING.yml

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

.github/ISSUE_TEMPLATE/bug_report.yml

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

.github/stale.yml

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

.github/workflows/auto_lang.yml

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

.github/workflows/build.yml

@@ -6,29 +6,22 @@ on:
   pull_request:
     branches: [ 'main' ]
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
-
 jobs:
   build:
     strategy:
       matrix:
         platform: [ubuntu-latest]
-        go-version: [ '1.21' ]
+        go-version: [ '1.20' ]
     name: Build
     runs-on: ${{ matrix.platform }}
     steps:
       - name: Setup Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v4
         with:
           go-version: ${{ matrix.go-version }}
 
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
-
-      - uses: benjlevesque/short-sha@v2.2
-        id: short-sha
 
       - name: Install dependencies
         run: |
@@ -42,7 +35,7 @@ jobs:
           bash build.sh dev
 
       - name: Upload artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
-          name: alist_${{ env.SHA }}
+          name: alist
           path: dist

.github/workflows/build_docker.yml

@@ -3,84 +3,48 @@ 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
+    name: Build docker
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
-
       - name: Docker meta
         id: meta
-        uses: docker/metadata-action@v5
+        uses: docker/metadata-action@v4
         with:
           images: xhofe/alist
-
+      - name: Replace release with dev
-      - name: Docker meta with ffmpeg
+        run: |
-        id: meta-ffmpeg
+          sed -i 's/release/dev/g' Dockerfile
-        uses: docker/metadata-action@v5
-        with:
-          images: xhofe/alist
-          flavor: |
-            suffix=-ffmpeg,onlatest=true
-
-      - uses: actions/setup-go@v4
-        with:
-          go-version: 'stable'
-
-      - name: Build go binary
-        run: bash build.sh dev docker-multiplatform
-
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
+        uses: docker/setup-qemu-action@v2
-        
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v2
-
       - name: Login to DockerHub
-        if: github.event_name == 'push'
+        uses: docker/login-action@v2
-        uses: docker/login-action@v3
         with:
           username: xhofe
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-
       - name: Build and push
         id: docker_build
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v4
         with:
           context: .
-          file: Dockerfile.ci
+          push: true
-          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
+          platforms: linux/amd64,linux/arm64
-
-      - name: Build and push with ffmpeg
-        id: docker_build_ffmpeg
-        uses: docker/build-push-action@v5
-        with:
-          file: Dockerfile.ffmpeg
-          push: ${{ github.event_name == 'push' }}
-          tags: ${{ steps.meta-ffmpeg.outputs.tags }}
-          labels: ${{ steps.meta-ffmpeg.outputs.labels }}
-          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
+        uses: actions/checkout@v3
         with:
           repository: alist-org/with_aria2
           ref: main
@@ -89,8 +53,8 @@ jobs:
 
       - name: Commit
         run: |
-          git config --local user.email "bot@nn.ci"
+          git config --local user.email "i@nn.ci"
-          git config --local user.name "IlaBot"
+          git config --local user.name "Noah Hsu"
           git commit --allow-empty -m "Trigger build for ${{ github.sha }}"
 
       - name: Push commit

.github/workflows/changelog.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
       - run: npx changelogithub # or changelogithub@0.12 if ensure the stable result

.github/workflows/issue_on_close.yml

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

.github/workflows/issue_question.yml

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

.github/workflows/release.yml

@@ -9,7 +9,7 @@ jobs:
     strategy:
       matrix:
         platform: [ ubuntu-latest ]
-        go-version: [ '1.21' ]
+        go-version: [ '1.20' ]
     name: Release
     runs-on: ${{ matrix.platform }}
     steps:
@@ -21,12 +21,12 @@ jobs:
           prerelease: true
 
       - name: Setup Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v4
         with:
           go-version: ${{ matrix.go-version }}
 
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
@@ -41,11 +41,17 @@ jobs:
         run: |
           bash build.sh release
 
+      - name: Release latest
+        uses: irongut/EditRelease@v1.2.0
+        with:
+          token: ${{ secrets.MY_TOKEN }}
+          id: ${{ github.event.release.id }}
+          prerelease: false
+
       - name: Upload assets
         uses: softprops/action-gh-release@v1
         with:
           files: build/compress/*
-          prerelease: false
 
   release_desktop:
     needs: release
@@ -53,7 +59,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           repository: alist-org/desktop-release
           ref: main
@@ -62,8 +68,8 @@ jobs:
 
       - name: Add tag
         run: |
-          git config --local user.email "bot@nn.ci"
+          git config --local user.email "i@nn.ci"
-          git config --local user.name "IlaBot"
+          git config --local user.name "Andy Hsu"
           version=$(wget -qO- -t1 -T2 "https://api.github.com/repos/alist-org/alist/releases/latest" | grep "tag_name" | head -n 1 | awk -F ":" '{print $2}' | sed 's/\"//g;s/,//g;s/ //g')
           git tag -a $version -m "release $version"
 

.github/workflows/release_android.yml

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

.github/workflows/release_docker.yml

@@ -11,70 +11,43 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
-
-      - uses: actions/setup-go@v4
-        with:
-          go-version: 'stable'
-
-      - name: Build go binary
-        run: bash build.sh release docker-multiplatform
 
       - name: Docker meta
         id: meta
-        uses: docker/metadata-action@v5
+        uses: docker/metadata-action@v4
         with:
           images: xhofe/alist
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
+        uses: docker/setup-qemu-action@v2
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v2
 
       - name: Login to DockerHub
-        uses: docker/login-action@v3
+        uses: docker/login-action@v2
         with:
           username: xhofe
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Build and push
         id: docker_build
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v4
         with:
           context: .
-          file: Dockerfile.ci
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/386,linux/arm/v6,linux/s390x
 
-      - 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@v5
-        with:
-          file: Dockerfile.ffmpeg
-          push: true
-          tags: ${{ steps.meta-ffmpeg.outputs.tags }}
-          labels: ${{ steps.meta-ffmpeg.outputs.labels }}
-          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
+        uses: actions/checkout@v3
         with:
           repository: alist-org/with_aria2
           ref: main
@@ -83,8 +56,8 @@ jobs:
 
       - name: Add tag
         run: |
-          git config --local user.email "bot@nn.ci"
+          git config --local user.email "i@nn.ci"
-          git config --local user.name "IlaBot"
+          git config --local user.name "Andy Hsu"
           git tag -a ${{ github.ref_name }} -m "release ${{ github.ref_name }}"
 
       - name: Push tags

.github/workflows/release_linux_musl.yml

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

.github/workflows/release_linux_musl_arm.yml

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

.gitignore

@@ -29,5 +29,3 @@ output/
 /daemon/
 /public/dist/*
 /!public/dist/README.md
-
-.VSCodeCounter

CONTRIBUTING.md

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

Dockerfile

@@ -1,23 +1,18 @@
-FROM alpine:edge as builder
+FROM alpine:3.18 as builder
 LABEL stage=go-builder
 WORKDIR /app/
-RUN apk add --no-cache bash curl gcc git go musl-dev
-COPY go.mod go.sum ./
-RUN go mod download
 COPY ./ ./
-RUN bash build.sh release docker
+RUN apk add --no-cache bash curl gcc git go musl-dev; \
+    bash build.sh release docker
 
-FROM alpine:edge
+FROM alpine:3.18
 LABEL MAINTAINER="i@nn.ci"
 VOLUME /opt/alist/data/
 WORKDIR /opt/alist/
 COPY --from=builder /app/bin/alist ./
 COPY entrypoint.sh /entrypoint.sh
-RUN apk update && \
+RUN apk add --no-cache bash ca-certificates su-exec tzdata; \
-    apk upgrade --no-cache && \
+    chmod +x /entrypoint.sh
-    apk add --no-cache bash ca-certificates su-exec tzdata; \
-    chmod +x /entrypoint.sh && \
-    rm -rf /var/cache/apk/*
 ENV PUID=0 PGID=0 UMASK=022
 EXPOSE 5244 5245
 CMD [ "/entrypoint.sh" ]

Dockerfile.ci

@@ -1,16 +0,0 @@
-FROM alpine:edge
-ARG TARGETPLATFORM
-LABEL MAINTAINER="i@nn.ci"
-VOLUME /opt/alist/data/
-WORKDIR /opt/alist/
-COPY /${TARGETPLATFORM}/alist ./
-COPY entrypoint.sh /entrypoint.sh
-RUN apk update && \
-    apk upgrade --no-cache && \
-    apk add --no-cache bash ca-certificates su-exec tzdata; \
-    chmod +x /entrypoint.sh && \
-    rm -rf /var/cache/apk/* && \
-    /entrypoint.sh version
-ENV PUID=0 PGID=0 UMASK=022
-EXPOSE 5244 5245
-CMD [ "/entrypoint.sh" ]

Dockerfile.ffmpeg

@@ -1,4 +0,0 @@
-FROM xhofe/alist:latest
-RUN apk update && \
-    apk add --no-cache ffmpeg \
-    rm -rf /var/cache/apk/*

README.md

@@ -39,13 +39,13 @@
 
 ---
 
-English | [中文](./README_cn.md)| [日本語](./README_ja.md) | [Contributing](./CONTRIBUTING.md) | [CODE_OF_CONDUCT](./CODE_OF_CONDUCT.md)
+English | [中文](./README_cn.md) | [Contributing](./CONTRIBUTING.md) | [CODE_OF_CONDUCT](./CODE_OF_CONDUCT.md)
 
 ## Features
 
-- [x] Multiple storages
+- [x] Multiple storage
     - [x] Local storage
-    - [x] [Aliyundrive](https://www.alipan.com/)
+    - [x] [Aliyundrive](https://www.aliyundrive.com/)
     - [x] OneDrive / Sharepoint ([global](https://www.office.com/), [cn](https://portal.partner.microsoftonline.cn),de,us)
     - [x] [189cloud](https://cloud.189.cn) (Personal, Family)
     - [x] [GoogleDrive](https://drive.google.com/)
@@ -66,16 +66,13 @@ English | [中文](./README_cn.md)| [日本語](./README_ja.md) | [Contributing]
     - [x] [Quark](https://pan.quark.cn)
     - [x] [Thunder](https://pan.xunlei.com)
     - [x] [Lanzou](https://www.lanzou.com/)
-    - [x] [ILanzou](https://www.ilanzou.com/)
+    - [x] [Aliyundrive share](https://www.aliyundrive.com/)
-    - [x] [Aliyundrive share](https://www.alipan.com/)
     - [x] [Google photo](https://photos.google.com/)
     - [x] [Mega.nz](https://mega.nz)
     - [x] [Baidu photo](https://photo.baidu.com/)
     - [x] SMB
     - [x] [115](https://115.com/)
     - [X] Cloudreve
-    - [x] [Dropbox](https://www.dropbox.com/)
-    - [x] [FeijiPan](https://www.feijipan.com/)
 - [x] Easy to deploy and out-of-the-box
 - [x] File preview (PDF, markdown, code, plain text, ...)
 - [x] Image preview in gallery mode
@@ -88,12 +85,11 @@ English | [中文](./README_cn.md)| [日本語](./README_ja.md) | [Contributing]
 - [x] Protected routes (password protection and authentication)
 - [x] WebDav (see https://alist.nn.ci/guide/webdav.html for details)
 - [x] [Docker Deploy](https://hub.docker.com/r/xhofe/alist)
-- [x] Cloudflare Workers proxy
+- [x] Cloudflare workers proxy
 - [x] File/Folder package download
 - [x] Web upload(Can allow visitors to upload), delete, mkdir, rename, move and copy
 - [x] Offline download
 - [x] Copy files between two storage
-- [x] Multi-thread downloading acceleration for single-thread download/stream
 
 ## Document
 
@@ -105,7 +101,7 @@ English | [中文](./README_cn.md)| [日本語](./README_ja.md) | [Contributing]
 
 ## Discussion
 
-Please go to our [discussion forum](https://github.com/Xhofe/alist/discussions) for general questions, **issues are for bug reports and feature requests only.**
+Please go to our [discussion forum](https://github.com/Xhofe/alist/discussions) for general questions, **issues are for bug reports and feature request only.**
 
 ## Sponsor
 
@@ -114,22 +110,23 @@ https://alist.nn.ci/guide/sponsor.html
 
 ### Special sponsors
 
-- [VidHub](https://okaapps.com/product/1659622164?ref=alist) - An elegant cloud video player within the Apple ecosystem. Support for iPhone, iPad, Mac, and Apple TV.
+- [亚洲云 - 高防服务器|服务器租用|福州高防|广东电信|香港服务器|美国服务器|海外服务器 - 国内靠谱的企业级云计算服务提供商](https://www.asiayun.com/aff/QQCOOQKZ) (sponsored Chinese API server)
-- [亚洲云](https://www.asiayun.com/aff/QQCOOQKZ) - 高防服务器|服务器租用|福州高防|广东电信|香港服务器|美国服务器|海外服务器 - 国内靠谱的企业级云计算服务提供商 (sponsored Chinese API server)
+- [找资源 - 阿里云盘资源搜索引擎](https://zhaoziyuan.la/)
-- [找资源](https://zhaoziyuan.pw/) - 阿里云盘资源搜索引擎
+- [KinhDown 百度云盘不限速下载！永久免费！已稳定运行3年！非常可靠！Q群 -> 786799372](https://kinhdown.com)
+- [JetBrains: Essential tools for software developers and teams](https://www.jetbrains.com/)
 
 ## Contributors
 
 Thanks goes to these wonderful people:
 
-[![Contributors](http://contrib.nn.ci/api?repo=alist-org/alist&repo=alist-org/alist-web&repo=alist-org/docs)](https://github.com/alist-org/alist/graphs/contributors)
+[![Contributors](http://contributors.nn.ci/api?repo=alist-org/alist&repo=alist-org/alist-web&repo=alist-org/docs)](https://github.com/alist-org/alist/graphs/contributors)
 
 ## License
 
 The `AList` is open-source software licensed under the AGPL-3.0 license.
 
 ## Disclaimer
-- This program is a free and open source project. It is designed to share files on the network disk, which is convenient for downloading and learning Golang. Please abide by relevant laws and regulations when using it, and do not abuse it;
+- This program is a free and open source project. It is designed to share files on the network disk, which is convenient for downloading and learning golang. Please abide by relevant laws and regulations when using it, and do not abuse it;
 - This program is implemented by calling the official sdk/interface, without destroying the official interface behavior;
 - This program only does 302 redirect/traffic forwarding, and does not intercept, store, or tamper with any user data;
 - Before using this program, you should understand and bear the corresponding risks, including but not limited to account ban, download speed limit, etc., which is none of this program's business;

README_cn.md

@@ -39,13 +39,13 @@
 
 ---
 
-[English](./README.md) | 中文 | [日本語](./README_ja.md) | [Contributing](./CONTRIBUTING.md) | [CODE_OF_CONDUCT](./CODE_OF_CONDUCT.md)
+[English](./README.md) | 中文 | [Contributing](./CONTRIBUTING.md) | [CODE_OF_CONDUCT](./CODE_OF_CONDUCT.md)
 
 ## 功能
 
 - [x] 多种存储
     - [x] 本地存储
-    - [x] [阿里云盘](https://www.alipan.com/)
+    - [x] [阿里云盘](https://www.aliyundrive.com/)
     - [x] OneDrive / Sharepoint（[国际版](https://www.office.com/), [世纪互联](https://portal.partner.microsoftonline.cn),de,us）
     - [x] [天翼云盘](https://cloud.189.cn) (个人云, 家庭云)
     - [x] [GoogleDrive](https://drive.google.com/)
@@ -65,16 +65,13 @@
     - [x] [夸克网盘](https://pan.quark.cn)
     - [x] [迅雷网盘](https://pan.xunlei.com)
     - [x] [蓝奏云](https://www.lanzou.com/)
-    - [x] [蓝奏云优享版](https://www.ilanzou.com/)
+    - [x] [阿里云盘分享](https://www.aliyundrive.com/)
-    - [x] [阿里云盘分享](https://www.alipan.com/)
     - [x] [谷歌相册](https://photos.google.com/)
     - [x] [Mega.nz](https://mega.nz)
     - [x] [一刻相册](https://photo.baidu.com/)
     - [x] SMB
     - [x] [115](https://115.com/)
     - [X] Cloudreve
-    - [x] [Dropbox](https://www.dropbox.com/)
-    - [x] [飞机盘](https://www.feijipan.com/)
 - [x] 部署方便，开箱即用
 - [x] 文件预览（PDF、markdown、代码、纯文本……）
 - [x] 画廊模式下的图像预览
@@ -92,7 +89,6 @@
 - [x] 网页上传(可以允许访客上传)，删除，新建文件夹，重命名，移动，复制
 - [x] 离线下载
 - [x] 跨存储复制文件
-- [x] 单线程下载/串流的多线程下载加速
 
 ## 文档
 
@@ -112,15 +108,16 @@ AList 是一个开源软件，如果你碰巧喜欢这个项目，并希望我
 
 ### 特别赞助
 
-- [VidHub](https://zh.okaapps.com/product/1659622164?ref=alist) - 苹果生态下优雅的网盘视频播放器，iPhone，iPad，Mac，Apple TV全平台支持。
+- [亚洲云 - 高防服务器|服务器租用|福州高防|广东电信|香港服务器|美国服务器|海外服务器 - 国内靠谱的企业级云计算服务提供商](https://www.asiayun.com/aff/QQCOOQKZ) (国内API服务器赞助)
-- [亚洲云](https://www.asiayun.com/aff/QQCOOQKZ) - 高防服务器|服务器租用|福州高防|广东电信|香港服务器|美国服务器|海外服务器 - 国内靠谱的企业级云计算服务提供商 (国内API服务器赞助)
+- [找资源 - 阿里云盘资源搜索引擎](https://zhaoziyuan.la/)
-- [找资源](https://zhaoziyuan.pw/) - 阿里云盘资源搜索引擎
+- [KinhDown 百度云盘不限速下载！永久免费！已稳定运行3年！非常可靠！Q群 -> 786799372](https://kinhdown.com)
+- [JetBrains: Essential tools for software developers and teams](https://www.jetbrains.com/)
 
 ## 贡献者
 
 Thanks goes to these wonderful people:
 
-[![Contributors](http://contrib.nn.ci/api?repo=alist-org/alist&repo=alist-org/alist-web&repo=alist-org/docs)](https://github.com/alist-org/alist/graphs/contributors)
+[![Contributors](http://contributors.nn.ci/api?repo=alist-org/alist&repo=alist-org/alist-web&repo=alist-org/docs)](https://github.com/alist-org/alist/graphs/contributors)
 
 ## 许可
 

README_ja.md

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

build.sh

@@ -49,7 +49,6 @@ BuildWinArm64() {
   export GOARCH=arm64
   export CC=$(pwd)/wrapper/zcc-arm64
   export CXX=$(pwd)/wrapper/zcxx-arm64
-  export CGO_ENABLED=1
   go build -o "$1" -ldflags="$ldflags" -tags=jsoniter .
 }
 
@@ -76,7 +75,7 @@ BuildDev() {
     export CGO_ENABLED=1
     go build -o ./dist/$appName-$os_arch -ldflags="$muslflags" -tags=jsoniter .
   done
-  xgo -targets=windows/amd64,darwin/amd64,darwin/arm64 -out "$appName" -ldflags="$ldflags" -tags=jsoniter .
+  xgo -targets=windows/amd64,darwin/amd64 -out "$appName" -ldflags="$ldflags" -tags=jsoniter .
   mv alist-* dist
   cd dist
   cp ./alist-windows-amd64.exe ./alist-windows-amd64-upx.exe
@@ -85,87 +84,23 @@ BuildDev() {
   cat md5.txt
 }
 
-PrepareBuildDocker() {
-  echo "replace github.com/mattn/go-sqlite3 => github.com/leso-kn/go-sqlite3 v0.0.0-20230710125852-03158dc838ed" >>go.mod
-  go get gorm.io/driver/sqlite@v1.4.4
-  go mod download
-}
-
 BuildDocker() {
-  PrepareBuildDocker
   go build -o ./bin/alist -ldflags="$ldflags" -tags=jsoniter .
 }
 
-BuildDockerMultiplatform() {
-  PrepareBuildDocker
-
-  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)
-  for i in "${FILES[@]}"; do
-    url="${BASE}${i}.tgz"
-    curl -L -o "${i}.tgz" "${url}"
-    sudo tar xf "${i}.tgz" --strip-components 1 -C /usr/local
-    rm -f "${i}.tgz"
-  done
-
-  docker_lflags="--extldflags '-static -fpic' $ldflags"
-  export CGO_ENABLED=1
-
-  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]}
-    os=${os_arch%%-*}
-    arch=${os_arch##*-}
-    export GOOS=$os
-    export GOARCH=$arch
-    export CC=${cgo_cc}
-    echo "building for $os_arch"
-    go build -o ./$os/$arch/alist -ldflags="$docker_lflags" -tags=jsoniter .
-  done
-
-  DOCKER_ARM_ARCHES=(linux-arm/v6 linux-arm/v7)
-  CGO_ARGS=(armv6-linux-musleabihf-gcc armv7l-linux-musleabihf-gcc)
-  GO_ARM=(6 7)
-  export GOOS=linux
-  export GOARCH=arm
-  for i in "${!DOCKER_ARM_ARCHES[@]}"; do
-    docker_arch=${DOCKER_ARM_ARCHES[$i]}
-    cgo_cc=${CGO_ARGS[$i]}
-    export GOARM=${GO_ARM[$i]}
-    export CC=${cgo_cc}
-    echo "building for $docker_arch"
-    go build -o ./${docker_arch%%-*}/${docker_arch##*-}/alist -ldflags="$docker_lflags" -tags=jsoniter .
-  done
-}
-
 BuildRelease() {
-  rm -rf .git/
-  mkdir -p "build"
-  BuildWinArm64 ./build/alist-windows-arm64.exe
-  xgo -out "$appName" -ldflags="$ldflags" -tags=jsoniter .
-  # why? Because some target platforms seem to have issues with upx compression
-  upx -9 ./alist-linux-amd64
-  cp ./alist-windows-amd64.exe ./alist-windows-amd64-upx.exe
-  upx -9 ./alist-windows-amd64-upx.exe
-  mv alist-* build
-}
-
-BuildReleaseLinuxMusl() {
   rm -rf .git/
   mkdir -p "build"
   muslflags="--extldflags '-static -fpic' $ldflags"
   BASE="https://musl.nn.ci/"
-  FILES=(x86_64-linux-musl-cross aarch64-linux-musl-cross mips-linux-musl-cross mips64-linux-musl-cross mips64el-linux-musl-cross mipsel-linux-musl-cross powerpc64le-linux-musl-cross s390x-linux-musl-cross)
+  FILES=(x86_64-linux-musl-cross aarch64-linux-musl-cross arm-linux-musleabihf-cross mips-linux-musl-cross mips64-linux-musl-cross mips64el-linux-musl-cross mipsel-linux-musl-cross powerpc64le-linux-musl-cross s390x-linux-musl-cross)
   for i in "${FILES[@]}"; do
     url="${BASE}${i}.tgz"
     curl -L -o "${i}.tgz" "${url}"
     sudo tar xf "${i}.tgz" --strip-components 1 -C /usr/local
-    rm -f "${i}.tgz"
   done
-  OS_ARCHES=(linux-musl-amd64 linux-musl-arm64 linux-musl-mips linux-musl-mips64 linux-musl-mips64le linux-musl-mipsle linux-musl-ppc64le linux-musl-s390x)
+  OS_ARCHES=(linux-musl-amd64 linux-musl-arm64 linux-musl-arm linux-musl-mips linux-musl-mips64 linux-musl-mips64le linux-musl-mipsle linux-musl-ppc64le linux-musl-s390x)
-  CGO_ARGS=(x86_64-linux-musl-gcc aarch64-linux-musl-gcc mips-linux-musl-gcc mips64-linux-musl-gcc mips64el-linux-musl-gcc mipsel-linux-musl-gcc powerpc64le-linux-musl-gcc s390x-linux-musl-gcc)
+  CGO_ARGS=(x86_64-linux-musl-gcc aarch64-linux-musl-gcc arm-linux-musleabihf-gcc mips-linux-musl-gcc mips64-linux-musl-gcc mips64el-linux-musl-gcc mipsel-linux-musl-gcc powerpc64le-linux-musl-gcc s390x-linux-musl-gcc)
   for i in "${!OS_ARCHES[@]}"; do
     os_arch=${OS_ARCHES[$i]}
     cgo_cc=${CGO_ARGS[$i]}
@@ -176,60 +111,13 @@ BuildReleaseLinuxMusl() {
     export CGO_ENABLED=1
     go build -o ./build/$appName-$os_arch -ldflags="$muslflags" -tags=jsoniter .
   done
-}
+  BuildWinArm64 ./build/alist-windows-arm64.exe
-
+  xgo -out "$appName" -ldflags="$ldflags" -tags=jsoniter .
-BuildReleaseLinuxMuslArm() {
+  # why? Because some target platforms seem to have issues with upx compression
-  rm -rf .git/
+  upx -9 ./alist-linux-amd64
-  mkdir -p "build"
+  cp ./alist-windows-amd64.exe ./alist-windows-amd64-upx.exe
-  muslflags="--extldflags '-static -fpic' $ldflags"
+  upx -9 ./alist-windows-amd64-upx.exe
-  BASE="https://musl.nn.ci/"
+  mv alist-* build
-#  FILES=(arm-linux-musleabi-cross arm-linux-musleabihf-cross armeb-linux-musleabi-cross armeb-linux-musleabihf-cross armel-linux-musleabi-cross armel-linux-musleabihf-cross armv5l-linux-musleabi-cross armv5l-linux-musleabihf-cross armv6-linux-musleabi-cross armv6-linux-musleabihf-cross armv7l-linux-musleabihf-cross armv7m-linux-musleabi-cross armv7r-linux-musleabihf-cross)
-  FILES=(arm-linux-musleabi-cross arm-linux-musleabihf-cross armel-linux-musleabi-cross armel-linux-musleabihf-cross armv5l-linux-musleabi-cross armv5l-linux-musleabihf-cross armv6-linux-musleabi-cross armv6-linux-musleabihf-cross armv7l-linux-musleabihf-cross armv7m-linux-musleabi-cross armv7r-linux-musleabihf-cross)
-  for i in "${FILES[@]}"; do
-    url="${BASE}${i}.tgz"
-    curl -L -o "${i}.tgz" "${url}"
-    sudo tar xf "${i}.tgz" --strip-components 1 -C /usr/local
-    rm -f "${i}.tgz"
-  done
-#  OS_ARCHES=(linux-musleabi-arm linux-musleabihf-arm linux-musleabi-armeb linux-musleabihf-armeb linux-musleabi-armel linux-musleabihf-armel linux-musleabi-armv5l linux-musleabihf-armv5l linux-musleabi-armv6 linux-musleabihf-armv6 linux-musleabihf-armv7l linux-musleabi-armv7m linux-musleabihf-armv7r)
-#  CGO_ARGS=(arm-linux-musleabi-gcc arm-linux-musleabihf-gcc armeb-linux-musleabi-gcc armeb-linux-musleabihf-gcc armel-linux-musleabi-gcc armel-linux-musleabihf-gcc armv5l-linux-musleabi-gcc armv5l-linux-musleabihf-gcc armv6-linux-musleabi-gcc armv6-linux-musleabihf-gcc armv7l-linux-musleabihf-gcc armv7m-linux-musleabi-gcc armv7r-linux-musleabihf-gcc)
-#  GOARMS=('' '' '' '' '' '' '5' '5' '6' '6' '7' '7' '7')
-  OS_ARCHES=(linux-musleabi-arm linux-musleabihf-arm linux-musleabi-armel linux-musleabihf-armel linux-musleabi-armv5l linux-musleabihf-armv5l linux-musleabi-armv6 linux-musleabihf-armv6 linux-musleabihf-armv7l linux-musleabi-armv7m linux-musleabihf-armv7r)
-  CGO_ARGS=(arm-linux-musleabi-gcc arm-linux-musleabihf-gcc armel-linux-musleabi-gcc armel-linux-musleabihf-gcc armv5l-linux-musleabi-gcc armv5l-linux-musleabihf-gcc armv6-linux-musleabi-gcc armv6-linux-musleabihf-gcc armv7l-linux-musleabihf-gcc armv7m-linux-musleabi-gcc armv7r-linux-musleabihf-gcc)
-  GOARMS=('' '' '' '' '5' '5' '6' '6' '7' '7' '7')
-  for i in "${!OS_ARCHES[@]}"; do
-    os_arch=${OS_ARCHES[$i]}
-    cgo_cc=${CGO_ARGS[$i]}
-    arm=${GOARMS[$i]}
-    echo building for ${os_arch}
-    export GOOS=linux
-    export GOARCH=arm
-    export CC=${cgo_cc}
-    export CGO_ENABLED=1
-    export GOARM=${arm}
-    go build -o ./build/$appName-$os_arch -ldflags="$muslflags" -tags=jsoniter .
-  done
-}
-
-BuildReleaseAndroid() {
-  rm -rf .git/
-  mkdir -p "build"
-  wget https://dl.google.com/android/repository/android-ndk-r26b-linux.zip
-  unzip android-ndk-r26b-linux.zip
-  rm android-ndk-r26b-linux.zip
-  OS_ARCHES=(amd64 arm64 386 arm)
-  CGO_ARGS=(x86_64-linux-android24-clang aarch64-linux-android24-clang i686-linux-android24-clang armv7a-linux-androideabi24-clang)
-  for i in "${!OS_ARCHES[@]}"; do
-    os_arch=${OS_ARCHES[$i]}
-    cgo_cc=$(realpath android-ndk-r26b/toolchains/llvm/prebuilt/linux-x86_64/bin/${CGO_ARGS[$i]})
-    echo building for android-${os_arch}
-    export GOOS=android
-    export GOARCH=${os_arch##*-}
-    export CC=${cgo_cc}
-    export CGO_ENABLED=1
-    go build -o ./build/$appName-android-$os_arch -ldflags="$ldflags" -tags=jsoniter .
-    android-ndk-r26b/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip ./build/$appName-android-$os_arch
-  done
 }
 
 MakeRelease() {
@@ -239,11 +127,6 @@ MakeRelease() {
     cp "$i" alist
     tar -czvf compress/"$i".tar.gz alist
     rm -f alist
-  done
-    for i in $(find . -type f -name "$appName-android-*"); do
-    cp "$i" alist
-    tar -czvf compress/"$i".tar.gz alist
-    rm -f alist
   done
   for i in $(find . -type f -name "$appName-darwin-*"); do
     cp "$i" alist
@@ -256,8 +139,8 @@ MakeRelease() {
     rm -f alist.exe
   done
   cd compress
-  find . -type f -print0 | xargs -0 md5sum >"$1"
+  find . -type f -print0 | xargs -0 md5sum >md5.txt
-  cat "$1"
+  cat md5.txt
   cd ../..
 }
 
@@ -265,8 +148,6 @@ if [ "$1" = "dev" ]; then
   FetchWebDev
   if [ "$2" = "docker" ]; then
     BuildDocker
-  elif [ "$2" = "docker-multiplatform" ]; then
-      BuildDockerMultiplatform
   else
     BuildDev
   fi
@@ -274,20 +155,9 @@ elif [ "$1" = "release" ]; then
   FetchWebRelease
   if [ "$2" = "docker" ]; then
     BuildDocker
-  elif [ "$2" = "docker-multiplatform" ]; then
-    BuildDockerMultiplatform
-  elif [ "$2" = "linux_musl_arm" ]; then
-    BuildReleaseLinuxMuslArm
-    MakeRelease "md5-linux-musl-arm.txt"
-  elif [ "$2" = "linux_musl" ]; then
-    BuildReleaseLinuxMusl
-    MakeRelease "md5-linux-musl.txt"
-  elif [ "$2" = "android" ]; then
-    BuildReleaseAndroid
-    MakeRelease "md5-android.txt"
   else
     BuildRelease
-    MakeRelease "md5.txt"
+    MakeRelease
   fi
 else
   echo -e "Parameter error"

cmd/admin.go

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

cmd/cancel2FA.go

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

cmd/common.go

@@ -7,7 +7,6 @@ import (
 
 	"github.com/alist-org/alist/v3/internal/bootstrap"
 	"github.com/alist-org/alist/v3/internal/bootstrap/data"
-	"github.com/alist-org/alist/v3/internal/db"
 	"github.com/alist-org/alist/v3/pkg/utils"
 	log "github.com/sirupsen/logrus"
 )
@@ -20,10 +19,6 @@ func Init() {
 	bootstrap.InitIndex()
 }
 
-func Release() {
-	db.Close()
-}
-
 var pid = -1
 var pidFile string
 

cmd/root.go

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

cmd/server.go

@@ -2,18 +2,16 @@ package cmd
 
 import (
 	"context"
-	"errors"
 	"fmt"
-	"net"
 	"net/http"
 	"os"
 	"os/signal"
-	"strconv"
 	"sync"
 	"syscall"
 	"time"
 
 	"github.com/alist-org/alist/v3/cmd/flags"
+	_ "github.com/alist-org/alist/v3/drivers"
 	"github.com/alist-org/alist/v3/internal/bootstrap"
 	"github.com/alist-org/alist/v3/internal/conf"
 	"github.com/alist-org/alist/v3/pkg/utils"
@@ -35,59 +33,35 @@ the address is defined in config file`,
 			utils.Log.Infof("delayed start for %d seconds", conf.Conf.DelayedStart)
 			time.Sleep(time.Duration(conf.Conf.DelayedStart) * time.Second)
 		}
-		bootstrap.InitOfflineDownloadTools()
+		bootstrap.InitAria2()
+		bootstrap.InitQbittorrent()
 		bootstrap.LoadStorages()
-		bootstrap.InitTaskManager()
 		if !flags.Debug && !flags.Dev {
 			gin.SetMode(gin.ReleaseMode)
 		}
 		r := gin.New()
 		r.Use(gin.LoggerWithWriter(log.StandardLogger().Out), gin.RecoveryWithWriter(log.StandardLogger().Out))
 		server.Init(r)
-		var httpSrv, httpsSrv, unixSrv *http.Server
+		var httpSrv, httpsSrv *http.Server
-		if conf.Conf.Scheme.HttpPort != -1 {
+		if !conf.Conf.Scheme.DisableHttp {
-			httpBase := fmt.Sprintf("%s:%d", conf.Conf.Scheme.Address, conf.Conf.Scheme.HttpPort)
+			httpBase := fmt.Sprintf("%s:%d", conf.Conf.Address, conf.Conf.Port)
 			utils.Log.Infof("start HTTP server @ %s", httpBase)
 			httpSrv = &http.Server{Addr: httpBase, Handler: r}
 			go func() {
 				err := httpSrv.ListenAndServe()
-				if err != nil && !errors.Is(err, http.ErrServerClosed) {
+				if err != nil && err != http.ErrServerClosed {
-					utils.Log.Fatalf("failed to start http: %s", err.Error())
+					utils.Log.Fatalf("failed to start: %s", err.Error())
 				}
 			}()
 		}
-		if conf.Conf.Scheme.HttpsPort != -1 {
+		if conf.Conf.Scheme.Https {
-			httpsBase := fmt.Sprintf("%s:%d", conf.Conf.Scheme.Address, conf.Conf.Scheme.HttpsPort)
+			httpsBase := fmt.Sprintf("%s:%d", conf.Conf.Address, conf.Conf.HttpsPort)
 			utils.Log.Infof("start HTTPS server @ %s", httpsBase)
 			httpsSrv = &http.Server{Addr: httpsBase, Handler: r}
 			go func() {
 				err := httpsSrv.ListenAndServeTLS(conf.Conf.Scheme.CertFile, conf.Conf.Scheme.KeyFile)
-				if err != nil && !errors.Is(err, http.ErrServerClosed) {
+				if err != nil && err != http.ErrServerClosed {
-					utils.Log.Fatalf("failed to start https: %s", err.Error())
+					utils.Log.Fatalf("failed to start: %s", err.Error())
-				}
-			}()
-		}
-		if conf.Conf.Scheme.UnixFile != "" {
-			utils.Log.Infof("start unix server @ %s", conf.Conf.Scheme.UnixFile)
-			unixSrv = &http.Server{Handler: r}
-			go func() {
-				listener, err := net.Listen("unix", conf.Conf.Scheme.UnixFile)
-				if err != nil {
-					utils.Log.Fatalf("failed to listen unix: %+v", err)
-				}
-				// set socket file permission
-				mode, err := strconv.ParseUint(conf.Conf.Scheme.UnixFilePerm, 8, 32)
-				if err != nil {
-					utils.Log.Errorf("failed to parse socket file permission: %+v", err)
-				} else {
-					err = os.Chmod(conf.Conf.Scheme.UnixFile, os.FileMode(mode))
-					if err != nil {
-						utils.Log.Errorf("failed to chmod socket file: %+v", err)
-					}
-				}
-				err = unixSrv.Serve(listener)
-				if err != nil && !errors.Is(err, http.ErrServerClosed) {
-					utils.Log.Fatalf("failed to start unix: %s", err.Error())
 				}
 			}()
 		}
@@ -100,34 +74,25 @@ the address is defined in config file`,
 		signal.Notify(quit, syscall.SIGINT, syscall.SIGTERM)
 		<-quit
 		utils.Log.Println("Shutdown server...")
-		Release()
+
 		ctx, cancel := context.WithTimeout(context.Background(), 1*time.Second)
 		defer cancel()
 		var wg sync.WaitGroup
-		if conf.Conf.Scheme.HttpPort != -1 {
+		if !conf.Conf.Scheme.DisableHttp {
 			wg.Add(1)
 			go func() {
 				defer wg.Done()
 				if err := httpSrv.Shutdown(ctx); err != nil {
-					utils.Log.Fatal("HTTP server shutdown err: ", err)
+					utils.Log.Fatal("HTTP server shutdown:", err)
 				}
 			}()
 		}
-		if conf.Conf.Scheme.HttpsPort != -1 {
+		if conf.Conf.Scheme.Https {
 			wg.Add(1)
 			go func() {
 				defer wg.Done()
 				if err := httpsSrv.Shutdown(ctx); err != nil {
-					utils.Log.Fatal("HTTPS server shutdown err: ", err)
+					utils.Log.Fatal("HTTPS server shutdown:", err)
-				}
-			}()
-		}
-		if conf.Conf.Scheme.UnixFile != "" {
-			wg.Add(1)
-			go func() {
-				defer wg.Done()
-				if err := unixSrv.Shutdown(ctx); err != nil {
-					utils.Log.Fatal("Unix server shutdown err: ", err)
 				}
 			}()
 		}

cmd/storage.go

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

cmd/user.go

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

drivers/115/driver.go

@@ -2,22 +2,19 @@ package _115
 
 import (
 	"context"
-	"strings"
+	"os"
 
 	driver115 "github.com/SheltonZhu/115driver/pkg/driver"
 	"github.com/alist-org/alist/v3/internal/driver"
 	"github.com/alist-org/alist/v3/internal/model"
-	"github.com/alist-org/alist/v3/pkg/http_range"
 	"github.com/alist-org/alist/v3/pkg/utils"
 	"github.com/pkg/errors"
-	"golang.org/x/time/rate"
 )
 
 type Pan115 struct {
 	model.Storage
 	Addition
 	client *driver115.Pan115Client
-	limiter *rate.Limiter
 }
 
 func (d *Pan115) Config() driver.Config {
@@ -29,43 +26,29 @@ func (d *Pan115) GetAddition() driver.Additional {
 }
 
 func (d *Pan115) Init(ctx context.Context) error {
-	if d.LimitRate > 0 {
-		d.limiter = rate.NewLimiter(rate.Limit(d.LimitRate), 1)
-	}
 	return d.login()
 }
 
-func (d *Pan115) WaitLimit(ctx context.Context) error {
-	if d.limiter != nil {
-		return d.limiter.Wait(ctx)
-	}
-	return nil
-}
-
 func (d *Pan115) Drop(ctx context.Context) error {
 	return nil
 }
 
 func (d *Pan115) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([]model.Obj, error) {
-	if err := d.WaitLimit(ctx); err != nil {
-		return nil, err
-	}
 	files, err := d.getFiles(dir.GetID())
 	if err != nil && !errors.Is(err, driver115.ErrNotExist) {
 		return nil, err
 	}
-	return utils.SliceConvert(files, func(src FileObj) (model.Obj, error) {
+	return utils.SliceConvert(files, func(src driver115.File) (model.Obj, error) {
-		return &src, nil
+		return src, nil
 	})
 }
 
 func (d *Pan115) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
-	if err := d.WaitLimit(ctx); err != nil {
+	downloadInfo, err := d.client.
-		return nil, err
+		SetUserAgent(driver115.UA115Browser).
-	}
+		Download(file.(driver115.File).PickCode)
-	var userAgent = args.Header.Get("User-Agent")
+	// recover for upload
-	downloadInfo, err := d.
+	d.client.SetUserAgent(driver115.UA115Desktop)
-		DownloadWithUA(file.(*FileObj).PickCode, userAgent)
 	if err != nil {
 		return nil, err
 	}
@@ -77,9 +60,6 @@ func (d *Pan115) Link(ctx context.Context, file model.Obj, args model.LinkArgs)
 }
 
 func (d *Pan115) MakeDir(ctx context.Context, parentDir model.Obj, dirName string) error {
-	if err := d.WaitLimit(ctx); err != nil {
-		return err
-	}
 	if _, err := d.client.Mkdir(parentDir.GetID(), dirName); err != nil {
 		return err
 	}
@@ -87,99 +67,31 @@ func (d *Pan115) MakeDir(ctx context.Context, parentDir model.Obj, dirName strin
 }
 
 func (d *Pan115) Move(ctx context.Context, srcObj, dstDir model.Obj) error {
-	if err := d.WaitLimit(ctx); err != nil {
-		return err
-	}
 	return d.client.Move(dstDir.GetID(), srcObj.GetID())
 }
 
 func (d *Pan115) Rename(ctx context.Context, srcObj model.Obj, newName string) error {
-	if err := d.WaitLimit(ctx); err != nil {
-		return err
-	}
 	return d.client.Rename(srcObj.GetID(), newName)
 }
 
 func (d *Pan115) Copy(ctx context.Context, srcObj, dstDir model.Obj) error {
-	if err := d.WaitLimit(ctx); err != nil {
-		return err
-	}
 	return d.client.Copy(dstDir.GetID(), srcObj.GetID())
 }
 
 func (d *Pan115) Remove(ctx context.Context, obj model.Obj) error {
-	if err := d.WaitLimit(ctx); err != nil {
-		return err
-	}
 	return d.client.Delete(obj.GetID())
 }
 
 func (d *Pan115) Put(ctx context.Context, dstDir model.Obj, stream model.FileStreamer, up driver.UpdateProgress) error {
-	if err := d.WaitLimit(ctx); err != nil {
+	tempFile, err := utils.CreateTempFile(stream.GetReadCloser())
-		return err
-	}
-
-	var (
-		fastInfo *driver115.UploadInitResp
-		dirID    = dstDir.GetID()
-	)
-
-	if ok, err := d.client.UploadAvailable(); err != nil || !ok {
-		return err
-	}
-	if stream.GetSize() > d.client.UploadMetaInfo.SizeLimit {
-		return driver115.ErrUploadTooLarge
-	}
-	//if digest, err = d.client.GetDigestResult(stream); err != nil {
-	//	return err
-	//}
-
-	const PreHashSize int64 = 128 * utils.KB
-	hashSize := PreHashSize
-	if stream.GetSize() < PreHashSize {
-		hashSize = stream.GetSize()
-	}
-	reader, err := stream.RangeRead(http_range.Range{Start: 0, Length: hashSize})
 	if err != nil {
 		return err
 	}
-	preHash, err := utils.HashReader(utils.SHA1, reader)
+	defer func() {
-	if err != nil {
+		_ = tempFile.Close()
-		return err
+		_ = os.Remove(tempFile.Name())
-	}
+	}()
-	preHash = strings.ToUpper(preHash)
+	return d.client.UploadFastOrByMultipart(dstDir.GetID(), stream.GetName(), stream.GetSize(), tempFile)
-	fullHash := stream.GetHash().GetHash(utils.SHA1)
-	if len(fullHash) <= 0 {
-		tmpF, err := stream.CacheFullInTempFile()
-		if err != nil {
-			return err
-		}
-		fullHash, err = utils.HashFile(utils.SHA1, tmpF)
-		if err != nil {
-			return err
-		}
-	}
-	fullHash = strings.ToUpper(fullHash)
-
-	// rapid-upload
-	// note that 115 add timeout for rapid-upload,
-	// and "sig invalid" err is thrown even when the hash is correct after timeout.
-	if fastInfo, err = d.rapidUpload(stream.GetSize(), stream.GetName(), dirID, preHash, fullHash, stream); err != nil {
-		return err
-	}
-	if matched, err := fastInfo.Ok(); err != nil {
-		return err
-	} else if matched {
-		return nil
-	}
-
-	// 闪传失败，上传
-	if stream.GetSize() <= utils.KB { // 文件大小小于1KB，改用普通模式上传
-		return d.client.UploadByOSS(&fastInfo.UploadOSSParams, stream, dirID)
-	}
-	// 分片上传
-	return d.UploadByMultipart(&fastInfo.UploadOSSParams, stream.GetSize(), stream, dirID)
-
 }
 
 var _ driver.Driver = (*Pan115)(nil)

drivers/115/meta.go

@@ -8,17 +8,15 @@ import (
 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,linux,mac,windows,tv" default:"linux" help:"select the QR code device, default linux"`
 	PageSize    int64  `json:"page_size" type:"number" default:"56" help:"list api per page size of 115 driver"`
-	LimitRate    float64 `json:"limit_rate" type:"number" default:"2" help:"limit all api request rate (1r/[limit_rate]s)"`
 	driver.RootID
 }
 
 var config = driver.Config{
 	Name:              "115 Cloud",
 	DefaultRoot:       "0",
-	//OnlyProxy:   true,
+	OnlyProxy:         true,
-	//OnlyLocal:         true,
+	OnlyLocal:         true,
 	NoOverwriteUpload: true,
 }
 

drivers/115/types.go

@@ -3,20 +3,6 @@ package _115
 import (
 	"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)
+var _ model.Obj = (*driver.File)(nil)
-
-type FileObj struct {
-	driver.File
-}
-
-func (f *FileObj) CreateTime() time.Time {
-	return f.File.CreateTime
-}
-
-func (f *FileObj) GetHash() utils.HashInfo {
-	return utils.NewHashInfo(utils.SHA1, f.Sha1)
-}

drivers/115/util.go

@@ -1,48 +1,28 @@
 package _115
 
 import (
-	"bytes"
-	"crypto/tls"
-	"encoding/json"
 	"fmt"
-	"io"
-	"net/http"
-	"net/url"
-	"path/filepath"
-	"strconv"
-	"strings"
-	"sync"
-	"time"
 
-	"github.com/alist-org/alist/v3/internal/conf"
+	"github.com/SheltonZhu/115driver/pkg/driver"
-	"github.com/alist-org/alist/v3/internal/model"
+	"github.com/alist-org/alist/v3/drivers/base"
-	"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"
-
-	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.UA115Desktop
+var UserAgent = driver.UA115Desktop
 
 func (d *Pan115) login() error {
 	var err error
-	opts := []driver115.Option{
+	opts := []driver.Option{
-		driver115.UA(UserAgent),
+		driver.UA(UserAgent),
-		func(c *driver115.Pan115Client) {
-			c.Client.SetTLSClientConfig(&tls.Config{InsecureSkipVerify: conf.Conf.TlsInsecureSkipVerify})
-		},
 	}
-	d.client = driver115.New(opts...)
+	d.client = driver.New(opts...)
-	cr := &driver115.Credential{}
+	d.client.SetHttpClient(base.HttpClient)
+	cr := &driver.Credential{}
 	if d.Addition.QRCodeToken != "" {
-		s := &driver115.QRCodeSession{
+		s := &driver.QRCodeSession{
 			UID: d.Addition.QRCodeToken,
 		}
-		if cr, err = d.client.QRCodeLoginWithApp(s, driver115.LoginApp(d.QRCodeSource)); err != nil {
+		if cr, err = d.client.QRCodeLogin(s); err != nil {
 			return errors.Wrap(err, "failed to login by qrcode")
 		}
 		d.Addition.Cookie = fmt.Sprintf("UID=%s;CID=%s;SEID=%s", cr.UID, cr.CID, cr.SEID)
@@ -58,422 +38,17 @@ func (d *Pan115) login() error {
 	return d.client.LoginCheck()
 }
 
-func (d *Pan115) getFiles(fileId string) ([]FileObj, error) {
+func (d *Pan115) getFiles(fileId string) ([]driver.File, error) {
-	res := make([]FileObj, 0)
+	res := make([]driver.File, 0)
 	if d.PageSize <= 0 {
-		d.PageSize = driver115.FileListLimit
+		d.PageSize = driver.FileListLimit
 	}
 	files, err := d.client.ListWithLimit(fileId, d.PageSize)
 	if err != nil {
 		return nil, err
 	}
 	for _, file := range *files {
-		res = append(res, FileObj{file})
+		res = append(res, file)
 	}
 	return res, nil
 }
-
-const (
-	appVer = "2.0.3.6"
-)
-
-func (c *Pan115) DownloadWithUA(pickCode, ua string) (*driver115.DownloadInfo, error) {
-	key := crypto.GenerateKey()
-	result := driver115.DownloadResp{}
-	params, err := utils.Json.Marshal(map[string]string{"pickcode": pickCode})
-	if err != nil {
-		return nil, err
-	}
-
-	data := crypto.Encode(params, key)
-
-	bodyReader := strings.NewReader(url.Values{"data": []string{data}}.Encode())
-	reqUrl := fmt.Sprintf("%s?t=%s", driver115.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", c.Cookie)
-	req.Header.Set("User-Agent", ua)
-
-	resp, err := c.client.Client.GetClient().Do(req)
-	if err != nil {
-		return nil, err
-	}
-	defer resp.Body.Close()
-
-	body, err := io.ReadAll(resp.Body)
-	if err != nil {
-		return nil, err
-	}
-	if err := utils.Json.Unmarshal(body, &result); err != nil {
-		return nil, err
-	}
-
-	if err = result.Err(string(body)); err != nil {
-		return nil, err
-	}
-
-	bytes, err := crypto.Decode(string(result.EncodedData), key)
-	if err != nil {
-		return nil, err
-	}
-
-	downloadInfo := driver115.DownloadData{}
-	if err := utils.Json.Unmarshal(bytes, &downloadInfo); err != nil {
-		return nil, err
-	}
-
-	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) {
-	var (
-		ecdhCipher   *cipher.EcdhCipher
-		encrypted    []byte
-		decrypted    []byte
-		encodedToken string
-		err          error
-		target       = "U_1_" + dirID
-		bodyBytes    []byte
-		result       = driver115.UploadInitResp{}
-		fileSizeStr  = strconv.FormatInt(fileSize, 10)
-	)
-	if ecdhCipher, err = cipher.NewEcdhCipher(); err != nil {
-		return nil, err
-	}
-
-	userID := strconv.FormatInt(d.client.UserID, 10)
-	form := url.Values{}
-	form.Set("appid", "0")
-	form.Set("appversion", appVer)
-	form.Set("userid", userID)
-	form.Set("filename", fileName)
-	form.Set("filesize", fileSizeStr)
-	form.Set("fileid", fileID)
-	form.Set("target", target)
-	form.Set("sig", d.client.GenerateSignature(fileID, target))
-
-	signKey, signVal := "", ""
-	for retry := true; retry; {
-		t := driver115.Now()
-
-		if encodedToken, err = ecdhCipher.EncodeToken(t.ToInt64()); err != nil {
-			return nil, err
-		}
-
-		params := map[string]string{
-			"k_ec": encodedToken,
-		}
-
-		form.Set("t", t.String())
-		form.Set("token", d.client.GenerateToken(fileID, preID, t.String(), fileSizeStr, signKey, signVal))
-		if signKey != "" && signVal != "" {
-			form.Set("sign_key", signKey)
-			form.Set("sign_val", signVal)
-		}
-		if encrypted, err = ecdhCipher.Encrypt([]byte(form.Encode())); err != nil {
-			return nil, err
-		}
-
-		req := d.client.NewRequest().
-			SetQueryParams(params).
-			SetBody(encrypted).
-			SetHeaderVerbatim("Content-Type", "application/x-www-form-urlencoded").
-			SetDoNotParseResponse(true)
-		resp, err := req.Post(driver115.ApiUploadInit)
-		if err != nil {
-			return nil, err
-		}
-		data := resp.RawBody()
-		defer data.Close()
-		if bodyBytes, err = io.ReadAll(data); err != nil {
-			return nil, err
-		}
-		if decrypted, err = ecdhCipher.Decrypt(bodyBytes); err != nil {
-			return nil, err
-		}
-		if err = driver115.CheckErr(json.Unmarshal(decrypted, &result), &result, resp); err != nil {
-			return nil, err
-		}
-		if result.Status == 7 {
-			// Update signKey & signVal
-			signKey = result.SignKey
-			signVal, err = UploadDigestRange(stream, result.SignCheck)
-			if err != nil {
-				return nil, err
-			}
-		} else {
-			retry = false
-		}
-		result.SHA1 = fileID
-	}
-
-	return &result, nil
-}
-
-func UploadDigestRange(stream model.FileStreamer, rangeSpec string) (result string, err error) {
-	var start, end int64
-	if _, err = fmt.Sscanf(rangeSpec, "%d-%d", &start, &end); err != nil {
-		return
-	}
-
-	length := end - start + 1
-	reader, err := stream.RangeRead(http_range.Range{Start: start, Length: length})
-	hashStr, err := utils.HashReader(utils.SHA1, reader)
-	if err != nil {
-		return "", err
-	}
-	result = strings.ToUpper(hashStr)
-	return
-}
-
-// UploadByMultipart upload by mutipart blocks
-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
-		imur      oss.InitiateMultipartUploadResult
-		ossClient *oss.Client
-		bucket    *oss.Bucket
-		ossToken  *driver115.UploadOSSTokenResp
-		err       error
-	)
-
-	tmpF, err := stream.CacheFullInTempFile()
-	if err != nil {
-		return err
-	}
-
-	options := driver115.DefalutUploadMultipartOptions()
-	if len(opts) > 0 {
-		for _, f := range opts {
-			f(options)
-		}
-	}
-
-	if ossToken, err = d.client.GetOSSToken(); err != nil {
-		return 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 err
-	}
-
-	// ossToken一小时后就会失效，所以每50分钟重新获取一次
-	ticker := time.NewTicker(options.TokenRefreshTime)
-	defer ticker.Stop()
-	// 设置超时
-	timeout := time.NewTimer(options.Timeout)
-
-	if chunks, err = SplitFile(fileSize); err != nil {
-		return err
-	}
-
-	if imur, err = bucket.InitiateMultipartUpload(params.Object,
-		oss.SetHeader(driver115.OssSecurityTokenHeaderName, ossToken.SecurityToken),
-		oss.UserAgentHeader(driver115.OSSUserAgent),
-	); err != nil {
-		return err
-	}
-
-	wg := sync.WaitGroup{}
-	wg.Add(len(chunks))
-
-	chunksCh := make(chan oss.FileChunk)
-	errCh := make(chan error)
-	UploadedPartsCh := make(chan oss.UploadPart)
-	quit := make(chan struct{})
-
-	// producer
-	go chunksProducer(chunksCh, chunks)
-	go func() {
-		wg.Wait()
-		quit <- struct{}{}
-	}()
-
-	// consumers
-	for i := 0; i < options.ThreadsNum; i++ {
-		go func(threadId int) {
-			defer func() {
-				if r := recover(); r != nil {
-					errCh <- fmt.Errorf("recovered in %v", r)
-				}
-			}()
-			for chunk := range chunksCh {
-				var part oss.UploadPart // 出现错误就继续尝试，共尝试3次
-				for retry := 0; retry < 3; retry++ {
-					select {
-					case <-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
-					}
-
-					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", stream.GetName(), chunk.Number, err))
-				}
-				UploadedPartsCh <- part
-			}
-		}(i)
-	}
-
-	go func() {
-		for part := range UploadedPartsCh {
-			parts = append(parts, part)
-			wg.Done()
-		}
-	}()
-LOOP:
-	for {
-		select {
-		case <-ticker.C:
-			// 到时重新获取ossToken
-			if ossToken, err = d.client.GetOSSToken(); err != nil {
-				return err
-			}
-		case <-quit:
-			break LOOP
-		case <-errCh:
-			return err
-		case <-timeout.C:
-			return fmt.Errorf("time out")
-		}
-	}
-
-	// 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
-		}
-	}
-	return d.checkUploadStatus(dirID, params.SHA1)
-}
-func chunksProducer(ch chan oss.FileChunk, chunks []oss.FileChunk) {
-	for _, chunk := range chunks {
-		ch <- chunk
-	}
-}
-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片
-			if chunks, err = SplitFileByPartNum(fileSize, int(i*1000)); err != nil {
-				return
-			}
-			break
-		}
-	}
-	if fileSize > 9*utils.GB { // 文件大小大于9GB时分为10000片
-		if chunks, err = SplitFileByPartNum(fileSize, 10000); err != nil {
-			return
-		}
-	}
-	// 单个分片大小不能小于100KB
-	if chunks[0].Size < 100*utils.KB {
-		if chunks, err = SplitFileByPartSize(fileSize, 100*utils.KB); err != nil {
-			return
-		}
-	}
-	return
-}
-
-// SplitFileByPartNum splits big file into parts by the num of parts.
-// Split the file with specified parts count, returns the split result when error is nil.
-func SplitFileByPartNum(fileSize int64, chunkNum int) ([]oss.FileChunk, error) {
-	if chunkNum <= 0 || chunkNum > 10000 {
-		return nil, errors.New("chunkNum invalid")
-	}
-
-	if int64(chunkNum) > fileSize {
-		return nil, errors.New("oss: chunkNum invalid")
-	}
-
-	var chunks []oss.FileChunk
-	var chunk = oss.FileChunk{}
-	var chunkN = (int64)(chunkNum)
-	for i := int64(0); i < chunkN; i++ {
-		chunk.Number = int(i + 1)
-		chunk.Offset = i * (fileSize / chunkN)
-		if i == chunkN-1 {
-			chunk.Size = fileSize/chunkN + fileSize%chunkN
-		} else {
-			chunk.Size = fileSize / chunkN
-		}
-		chunks = append(chunks, chunk)
-	}
-
-	return chunks, nil
-}
-
-// SplitFileByPartSize splits big file into parts by the size of parts.
-// Splits the file by the part size. Returns the FileChunk when error is nil.
-func SplitFileByPartSize(fileSize int64, chunkSize int64) ([]oss.FileChunk, error) {
-	if chunkSize <= 0 {
-		return nil, errors.New("chunkSize invalid")
-	}
-
-	var chunkN = fileSize / chunkSize
-	if chunkN >= 10000 {
-		return nil, errors.New("Too many parts, please increase part size")
-	}
-
-	var chunks []oss.FileChunk
-	var chunk = oss.FileChunk{}
-	for i := int64(0); i < chunkN; i++ {
-		chunk.Number = int(i + 1)
-		chunk.Offset = i * chunkSize
-		chunk.Size = chunkSize
-		chunks = append(chunks, chunk)
-	}
-
-	if fileSize%chunkSize > 0 {
-		chunk.Number = len(chunks) + 1
-		chunk.Offset = int64(len(chunks)) * chunkSize
-		chunk.Size = fileSize % chunkSize
-		chunks = append(chunks, chunk)
-	}
-
-	return chunks, nil
-}

drivers/115_share/driver.go

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

drivers/115_share/meta.go

@@ -1,34 +0,0 @@
-package _115_share
-
-import (
-	"github.com/alist-org/alist/v3/internal/driver"
-	"github.com/alist-org/alist/v3/internal/op"
-)
-
-type Addition struct {
-	Cookie       string  `json:"cookie" type:"text" help:"one of QR code token and cookie required"`
-	QRCodeToken  string  `json:"qrcode_token" type:"text" help:"one of QR code token and cookie required"`
-	QRCodeSource string  `json:"qrcode_source" type:"select" options:"web,android,ios,linux,mac,windows,tv" default:"linux" help:"select the QR code device, default linux"`
-	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
-}
-
-var config = driver.Config{
-	Name:        "115 Share",
-	DefaultRoot: "",
-	// OnlyProxy:   true,
-	// OnlyLocal:         true,
-	CheckStatus:       false,
-	Alert:             "",
-	NoOverwriteUpload: true,
-	NoUpload:          true,
-}
-
-func init() {
-	op.RegisterDriver(func() driver.Driver {
-		return &Pan115Share{}
-	})
-}

drivers/115_share/utils.go

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

drivers/123/driver.go

@@ -1,17 +1,17 @@
 package _123
 
 import (
+	"bytes"
 	"context"
 	"crypto/md5"
 	"encoding/base64"
+	"encoding/binary"
 	"encoding/hex"
 	"fmt"
-	"golang.org/x/time/rate"
 	"io"
 	"net/http"
 	"net/url"
-	"sync"
+	"os"
-	"time"
 
 	"github.com/alist-org/alist/v3/drivers/base"
 	"github.com/alist-org/alist/v3/internal/driver"
@@ -29,7 +29,6 @@ import (
 type Pan123 struct {
 	model.Storage
 	Addition
-	apiRateLimit sync.Map
 }
 
 func (d *Pan123) Config() driver.Config {
@@ -46,9 +45,6 @@ func (d *Pan123) Init(ctx context.Context) error {
 }
 
 func (d *Pan123) Drop(ctx context.Context) error {
-	_, _ = d.request(Logout, http.MethodPost, func(req *resty.Request) {
-		req.SetBody(base.Json{})
-	}, nil)
 	return nil
 }
 
@@ -102,7 +98,7 @@ func (d *Pan123) Link(ctx context.Context, file model.Obj, args model.LinkArgs)
 		}
 		u_ := u.String()
 		log.Debug("download url: ", u_)
-		res, err := base.NoRedirectClient.R().SetHeader("Referer", "https://www.123pan.com/").Get(u_)
+		res, err := base.NoRedirectClient.R().Get(u_)
 		if err != nil {
 			return nil, err
 		}
@@ -113,12 +109,9 @@ func (d *Pan123) Link(ctx context.Context, file model.Obj, args model.LinkArgs)
 		log.Debugln("res code: ", res.StatusCode())
 		if res.StatusCode() == 302 {
 			link.URL = res.Header().Get("location")
-		} else if res.StatusCode() < 300 {
+		} else if res.StatusCode() == 200 {
 			link.URL = utils.Json.Get(res.Body(), "data", "redirect_url").ToString()
 		}
-		link.Header = http.Header{
-			"Referer": []string{"https://www.123pan.com/"},
-		}
 		return &link, nil
 	} else {
 		return nil, fmt.Errorf("can't convert obj")
@@ -184,15 +177,31 @@ func (d *Pan123) Remove(ctx context.Context, obj model.Obj) error {
 }
 
 func (d *Pan123) Put(ctx context.Context, dstDir model.Obj, stream model.FileStreamer, up driver.UpdateProgress) error {
-	// const DEFAULT int64 = 10485760
+	const DEFAULT int64 = 10485760
+	var uploadFile io.Reader
 	h := md5.New()
-	// need to calculate md5 of the full content
+	if d.StreamUpload && stream.GetSize() > DEFAULT {
-	tempFile, err := stream.CacheFullInTempFile()
+		// 只计算前10MIB
+		buf := bytes.NewBuffer(make([]byte, 0, DEFAULT))
+		if n, err := io.CopyN(io.MultiWriter(buf, h), stream, DEFAULT); err != io.EOF && n == 0 {
+			return err
+		}
+		// 增加额外参数防止MD5碰撞
+		h.Write([]byte(stream.GetName()))
+		num := make([]byte, 8)
+		binary.BigEndian.PutUint64(num, uint64(stream.GetSize()))
+		h.Write(num)
+		// 拼装
+		uploadFile = io.MultiReader(buf, stream)
+	} else {
+		// 计算完整文件MD5
+		tempFile, err := utils.CreateTempFile(stream.GetReadCloser())
 		if err != nil {
 			return err
 		}
 		defer func() {
 			_ = tempFile.Close()
+			_ = os.Remove(tempFile.Name())
 		}()
 		if _, err = io.Copy(h, tempFile); err != nil {
 			return err
@@ -201,6 +210,8 @@ func (d *Pan123) Put(ctx context.Context, dstDir model.Obj, stream model.FileStr
 		if err != nil {
 			return err
 		}
+		uploadFile = tempFile
+	}
 	etag := hex.EncodeToString(h.Sum(nil))
 	data := base.Json{
 		"driveId":      0,
@@ -223,8 +234,7 @@ func (d *Pan123) Put(ctx context.Context, dstDir model.Obj, stream model.FileStr
 		return nil
 	}
 	if resp.Data.AccessKeyId == "" || resp.Data.SecretAccessKey == "" || resp.Data.SessionToken == "" {
-		err = d.newUpload(ctx, &resp, stream, tempFile, up)
+		err = d.newUpload(ctx, &resp, stream, uploadFile, up)
-		return err
 	} else {
 		cfg := &aws.Config{
 			Credentials:      credentials.NewStaticCredentials(resp.Data.AccessKeyId, resp.Data.SecretAccessKey, resp.Data.SessionToken),
@@ -237,13 +247,10 @@ func (d *Pan123) Put(ctx context.Context, dstDir model.Obj, stream model.FileStr
 			return err
 		}
 		uploader := s3manager.NewUploader(s)
-		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:   tempFile,
+			Body:   uploadFile,
 		}
 		_, err = uploader.UploadWithContext(ctx, input)
 	}
@@ -258,11 +265,4 @@ func (d *Pan123) Put(ctx context.Context, dstDir model.Obj, stream model.FileStr
 	return err
 }
 
-func (d *Pan123) APIRateLimit(api string) bool {
-	limiter, _ := d.apiRateLimit.LoadOrStore(api,
-		rate.NewLimiter(rate.Every(time.Millisecond*700), 1))
-	ins := limiter.(*rate.Limiter)
-	return ins.Allow()
-}
-
 var _ driver.Driver = (*Pan123)(nil)

drivers/123/meta.go

@@ -11,6 +11,7 @@ type Addition struct {
 	driver.RootID
 	OrderBy        string `json:"order_by" type:"select" options:"file_name,size,update_at" default:"file_name"`
 	OrderDirection string `json:"order_direction" type:"select" options:"asc,desc" default:"asc"`
+	StreamUpload   bool   `json:"stream_upload"`
 	AccessToken    string
 }
 

drivers/123/types.go

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

drivers/123/upload.go

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

drivers/123/util.go

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

drivers/123_link/driver.go

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

drivers/123_link/meta.go

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

drivers/123_link/parse.go

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

drivers/123_link/types.go

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

drivers/123_link/util.go

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

drivers/123_share/driver.go

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

drivers/123_share/meta.go

@@ -1,34 +0,0 @@
-package _123Share
-
-import (
-	"github.com/alist-org/alist/v3/internal/driver"
-	"github.com/alist-org/alist/v3/internal/op"
-)
-
-type Addition struct {
-	ShareKey string `json:"sharekey" required:"true"`
-	SharePwd string `json:"sharepassword" required:"true"`
-	driver.RootID
-	OrderBy        string `json:"order_by" type:"select" options:"file_name,size,update_at" default:"file_name"`
-	OrderDirection string `json:"order_direction" type:"select" options:"asc,desc" default:"asc"`
-}
-
-var config = driver.Config{
-	Name:              "123PanShare",
-	LocalSort:         true,
-	OnlyLocal:         false,
-	OnlyProxy:         false,
-	NoCache:           false,
-	NoUpload:          true,
-	NeedMs:            false,
-	DefaultRoot:       "0",
-	CheckStatus:       false,
-	Alert:             "",
-	NoOverwriteUpload: false,
-}
-
-func init() {
-	op.RegisterDriver(func() driver.Driver {
-		return &Pan123Share{}
-	})
-}

drivers/123_share/types.go

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

drivers/123_share/util.go

@@ -1,81 +0,0 @@
-package _123Share
-
-import (
-	"errors"
-	"net/http"
-	"strconv"
-
-	"github.com/alist-org/alist/v3/drivers/base"
-	"github.com/alist-org/alist/v3/pkg/utils"
-	"github.com/go-resty/resty/v2"
-	jsoniter "github.com/json-iterator/go"
-)
-
-const (
-	Api          = "https://www.123pan.com/api"
-	AApi         = "https://www.123pan.com/a/api"
-	BApi         = "https://www.123pan.com/b/api"
-	MainApi      = Api
-	FileList     = MainApi + "/share/get"
-	DownloadInfo = MainApi + "/share/download/info"
-	//AuthKeySalt      = "8-8D$sL8gPjom7bk#cY"
-)
-
-func (d *Pan123Share) 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",
-		"referer":     "https://www.123pan.com/",
-		"user-agent":  "Dart/2.19(dart:io)",
-		"platform":    "android",
-		"app-version": "36",
-	})
-	if callback != nil {
-		callback(req)
-	}
-	if resp != nil {
-		req.SetResult(resp)
-	}
-	res, err := req.Execute(method, url)
-	if err != nil {
-		return nil, err
-	}
-	body := res.Body()
-	code := utils.Json.Get(body, "code").ToInt()
-	if code != 0 {
-		return nil, errors.New(jsoniter.Get(body, "message").ToString())
-	}
-	return body, nil
-}
-
-func (d *Pan123Share) getFiles(parentId string) ([]File, error) {
-	page := 1
-	res := make([]File, 0)
-	for {
-		var resp Files
-		query := map[string]string{
-			"limit":          "100",
-			"next":           "0",
-			"orderBy":        d.OrderBy,
-			"orderDirection": d.OrderDirection,
-			"parentFileId":   parentId,
-			"Page":           strconv.Itoa(page),
-			"shareKey":       d.ShareKey,
-			"SharePwd":       d.SharePwd,
-		}
-		_, err := d.request(FileList, http.MethodGet, func(req *resty.Request) {
-			req.SetQueryParams(query)
-		}, &resp)
-		if err != nil {
-			return nil, err
-		}
-		page++
-		res = append(res, resp.Data.InfoList...)
-		if len(resp.Data.InfoList) == 0 || resp.Data.Next == "-1" {
-			break
-		}
-	}
-	return res, nil
-}
-
-// do others that not defined in Driver interface

drivers/139/driver.go

@@ -35,18 +35,6 @@ func (d *Yun139) Init(ctx context.Context) error {
 	if d.Authorization == "" {
 		return fmt.Errorf("authorization is empty")
 	}
-	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"
-		}
-		fallthrough
-	case MetaFamily:
 	decode, err := base64.StdEncoding.DecodeString(d.Authorization)
 	if err != nil {
 		return err
@@ -66,9 +54,6 @@ func (d *Yun139) Init(ctx context.Context) error {
 		},
 	}, nil)
 	return err
-	default:
-		return errs.NotImplement
-	}
 }
 
 func (d *Yun139) Drop(ctx context.Context) error {
@@ -76,51 +61,22 @@ func (d *Yun139) Drop(ctx context.Context) error {
 }
 
 func (d *Yun139) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([]model.Obj, error) {
-	switch d.Addition.Type {
+	if d.isFamily() {
-	case MetaPersonalNew:
-		return d.personalGetFiles(dir.GetID())
-	case MetaPersonal:
-		return d.getFiles(dir.GetID())
-	case MetaFamily:
 		return d.familyGetFiles(dir.GetID())
-	default:
+	} else {
-		return nil, errs.NotImplement
+		return d.getFiles(dir.GetID())
 	}
 }
 
 func (d *Yun139) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
-	var url string
+	u, err := d.getLink(file.GetID())
-	var err error
-	switch d.Addition.Type {
-	case MetaPersonalNew:
-		url, err = d.personalGetLink(file.GetID())
-	case MetaPersonal:
-		fallthrough
-	case MetaFamily:
-		url, err = d.getLink(file.GetID())
-	default:
-		return nil, errs.NotImplement
-	}
 	if err != nil {
 		return nil, err
 	}
-	return &model.Link{URL: url}, nil
+	return &model.Link{URL: u}, nil
 }
 
 func (d *Yun139) MakeDir(ctx context.Context, parentDir model.Obj, dirName string) error {
-	var err error
-	switch d.Addition.Type {
-	case MetaPersonalNew:
-		data := base.Json{
-			"parentFileId":   parentDir.GetID(),
-			"name":           dirName,
-			"description":    "",
-			"type":           "folder",
-			"fileRenameMode": "force_rename",
-		}
-		pathname := "/hcy/file/create"
-		_, err = d.personalPost(pathname, data, nil)
-	case MetaPersonal:
 	data := base.Json{
 		"createCatalogExtReq": base.Json{
 			"parentCatalogID": parentDir.GetID(),
@@ -132,9 +88,8 @@ func (d *Yun139) MakeDir(ctx context.Context, parentDir model.Obj, dirName strin
 		},
 	}
 	pathname := "/orchestration/personalCloud/catalog/v1.0/createCatalogExt"
-		_, err = d.post(pathname, data, nil)
+	if d.isFamily() {
-	case MetaFamily:
+		data = base.Json{
-		data := base.Json{
 			"cloudID": d.CloudID,
 			"commonAccountInfo": base.Json{
 				"account":     d.Account,
@@ -142,28 +97,16 @@ func (d *Yun139) MakeDir(ctx context.Context, parentDir model.Obj, dirName strin
 			},
 			"docLibName": dirName,
 		}
-		pathname := "/orchestration/familyCloud/cloudCatalog/v1.0/createCloudDoc"
+		pathname = "/orchestration/familyCloud/cloudCatalog/v1.0/createCloudDoc"
-		_, err = d.post(pathname, data, nil)
-	default:
-		err = errs.NotImplement
 	}
+	_, err := d.post(pathname, data, nil)
 	return err
 }
 
-func (d *Yun139) Move(ctx context.Context, srcObj, dstDir model.Obj) (model.Obj, error) {
+func (d *Yun139) Move(ctx context.Context, srcObj, dstDir model.Obj) error {
-	switch d.Addition.Type {
+	if d.isFamily() {
-	case MetaPersonalNew:
+		return errs.NotImplement
-		data := base.Json{
-			"fileIds":        []string{srcObj.GetID()},
-			"toParentFileId": dstDir.GetID(),
 	}
-		pathname := "/hcy/file/batchMove"
-		_, err := d.personalPost(pathname, data, nil)
-		if err != nil {
-			return nil, err
-		}
-		return srcObj, nil
-	case MetaPersonal:
 	var contentInfoList []string
 	var catalogInfoList []string
 	if srcObj.IsDir() {
@@ -188,27 +131,13 @@ func (d *Yun139) Move(ctx context.Context, srcObj, dstDir model.Obj) (model.Obj,
 	}
 	pathname := "/orchestration/personalCloud/batchOprTask/v1.0/createBatchOprTask"
 	_, err := d.post(pathname, data, nil)
-		if err != nil {
+	return err
-			return nil, err
-		}
-		return srcObj, nil
-	default:
-		return nil, errs.NotImplement
-	}
 }
 
 func (d *Yun139) Rename(ctx context.Context, srcObj model.Obj, newName string) error {
-	var err error
+	if d.isFamily() {
-	switch d.Addition.Type {
+		return errs.NotImplement
-	case MetaPersonalNew:
-		data := base.Json{
-			"fileId":      srcObj.GetID(),
-			"name":        newName,
-			"description": "",
 	}
-		pathname := "/hcy/file/update"
-		_, err = d.personalPost(pathname, data, nil)
-	case MetaPersonal:
 	var data base.Json
 	var pathname string
 	if srcObj.IsDir() {
@@ -232,25 +161,14 @@ func (d *Yun139) Rename(ctx context.Context, srcObj model.Obj, newName string) e
 		}
 		pathname = "/orchestration/personalCloud/content/v1.0/updateContentInfo"
 	}
-		_, err = d.post(pathname, data, nil)
+	_, err := d.post(pathname, data, nil)
-	default:
-		err = errs.NotImplement
-	}
 	return err
 }
 
 func (d *Yun139) Copy(ctx context.Context, srcObj, dstDir model.Obj) error {
-	var err error
+	if d.isFamily() {
-	switch d.Addition.Type {
+		return errs.NotImplement
-	case MetaPersonalNew:
-		data := base.Json{
-			"fileIds":        []string{srcObj.GetID()},
-			"toParentFileId": dstDir.GetID(),
 	}
-		pathname := "/hcy/file/batchCopy"
-		_, err := d.personalPost(pathname, data, nil)
-		return err
-	case MetaPersonal:
 	var contentInfoList []string
 	var catalogInfoList []string
 	if srcObj.IsDir() {
@@ -274,25 +192,11 @@ func (d *Yun139) Copy(ctx context.Context, srcObj, dstDir model.Obj) error {
 		},
 	}
 	pathname := "/orchestration/personalCloud/batchOprTask/v1.0/createBatchOprTask"
-		_, err = d.post(pathname, data, nil)
+	_, err := d.post(pathname, data, nil)
-	default:
-		err = errs.NotImplement
-	}
 	return err
 }
 
 func (d *Yun139) Remove(ctx context.Context, obj model.Obj) error {
-	switch d.Addition.Type {
-	case MetaPersonalNew:
-		data := base.Json{
-			"fileIds": []string{obj.GetID()},
-		}
-		pathname := "/hcy/recyclebin/batchTrash"
-		_, err := d.personalPost(pathname, data, nil)
-		return err
-	case MetaPersonal:
-		fallthrough
-	case MetaFamily:
 	var contentInfoList []string
 	var catalogInfoList []string
 	if obj.IsDir() {
@@ -331,9 +235,6 @@ func (d *Yun139) Remove(ctx context.Context, obj model.Obj) error {
 	}
 	_, err := d.post(pathname, data, nil)
 	return err
-	default:
-		return errs.NotImplement
-	}
 }
 
 const (
@@ -353,92 +254,6 @@ func getPartSize(size int64) int64 {
 }
 
 func (d *Yun139) Put(ctx context.Context, dstDir model.Obj, stream model.FileStreamer, up driver.UpdateProgress) error {
-	switch d.Addition.Type {
-	case MetaPersonalNew:
-		var err error
-		fullHash := stream.GetHash().GetHash(utils.SHA256)
-		if len(fullHash) <= 0 {
-			tmpF, err := stream.CacheFullInTempFile()
-			if err != nil {
-				return err
-			}
-			fullHash, err = utils.HashFile(utils.SHA256, tmpF)
-			if err != nil {
-				return err
-			}
-		}
-		// return errs.NotImplement
-		data := base.Json{
-			"contentHash":          fullHash,
-			"contentHashAlgorithm": "SHA256",
-			"contentType":          "application/octet-stream",
-			"parallelUpload":       false,
-			"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
-		_, err = d.personalPost(pathname, data, &resp)
-		if err != nil {
-			return err
-		}
-
-		if resp.Data.Exist || resp.Data.RapidUpload {
-			return nil
-		}
-
-		// Progress
-		p := driver.NewProgress(stream.GetSize(), up)
-
-		// 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,
@@ -458,20 +273,20 @@ func (d *Yun139) Put(ctx context.Context, dstDir model.Obj, stream model.FileStr
 	}
 	pathname := "/orchestration/personalCloud/uploadAndDownload/v1.0/pcUploadFileRequest"
 	if d.isFamily() {
-			// data = d.newJson(base.Json{
+		data = d.newJson(base.Json{
-			// 	"fileCount":    1,
+			"fileCount":    1,
-			// 	"manualRename": 2,
+			"manualRename": 2,
-			// 	"operation":    0,
+			"operation":    0,
-			// 	"path":         "",
+			"path":         "",
-			// 	"seqNo":        "",
+			"seqNo":        "",
-			// 	"totalSize":    0,
+			"totalSize":    0,
-			// 	"uploadContentList": []base.Json{{
+			"uploadContentList": []base.Json{{
-			// 		"contentName": stream.GetName(),
+				"contentName": stream.GetName(),
-			// 		"contentSize": 0,
+				"contentSize": 0,
-			// 		// "digest": "5a3231986ce7a6b46e408612d385bafa"
+				// "digest": "5a3231986ce7a6b46e408612d385bafa"
-			// 	}},
+			}},
-			// })
+		})
-			// pathname = "/orchestration/familyCloud/content/v1.0/getFileUploadURL"
+		pathname = "/orchestration/familyCloud/content/v1.0/getFileUploadURL"
 		return errs.NotImplement
 	}
 	var resp UploadResp
@@ -485,9 +300,6 @@ func (d *Yun139) Put(ctx context.Context, dstDir model.Obj, stream model.FileStr
 
 	var partSize = 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()
@@ -519,42 +331,16 @@ 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 {
 			return fmt.Errorf("unexpected status code: %d", res.StatusCode)
 		}
+
+		res.Body.Close()
 	}
 
 	return nil
-	default:
-		return errs.NotImplement
-	}
-}
-
-func (d *Yun139) Other(ctx context.Context, args model.OtherArgs) (interface{}, error) {
-	switch d.Addition.Type {
-	case MetaPersonalNew:
-		var resp base.Json
-		var uri string
-		data := base.Json{
-			"category": "video",
-			"fileId":   args.Obj.GetID(),
-		}
-		switch args.Method {
-		case "video_preview":
-			uri = "/hcy/videoPreview/getPreviewInfo"
-		default:
-			return nil, errs.NotSupport
-		}
-		_, err := d.personalPost(uri, data, &resp)
-		if err != nil {
-			return nil, err
-		}
-		return resp["data"], nil
-	default:
-		return nil, errs.NotImplement
-	}
 }
 
 var _ driver.Driver = (*Yun139)(nil)

drivers/139/meta.go

@@ -9,7 +9,7 @@ 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,family,personal_new" default:"personal"`
+	Type    string `json:"type" type:"select" options:"personal,family" default:"personal"`
 	CloudID string `json:"cloud_id"`
 }
 

drivers/139/types.go

@@ -1,11 +1,5 @@
 package _139
 
-const (
-	MetaPersonal    string = "personal"
-	MetaFamily      string = "family"
-	MetaPersonalNew string = "personal_new"
-)
-
 type BaseResp struct {
 	Success bool   `json:"success"`
 	Code    string `json:"code"`
@@ -16,7 +10,7 @@ type Catalog struct {
 	CatalogID   string `json:"catalogID"`
 	CatalogName string `json:"catalogName"`
 	//CatalogType     int         `json:"catalogType"`
-	CreateTime string `json:"createTime"`
+	//CreateTime      string      `json:"createTime"`
 	UpdateTime string `json:"updateTime"`
 	//IsShared        bool        `json:"isShared"`
 	//CatalogLevel    int         `json:"catalogLevel"`
@@ -69,7 +63,7 @@ type Content struct {
 	//ParentCatalogID string      `json:"parentCatalogId"`
 	//Channel         string      `json:"channel"`
 	//GeoLocFlag      string      `json:"geoLocFlag"`
-	Digest string `json:"digest"`
+	//Digest          string      `json:"digest"`
 	//Version         string      `json:"version"`
 	//FileEtag        string      `json:"fileEtag"`
 	//FileVersion     string      `json:"fileVersion"`
@@ -147,7 +141,7 @@ type CloudContent struct {
 	//ContentSuffix    string      `json:"contentSuffix"`
 	ContentSize int64 `json:"contentSize"`
 	//ContentDesc      string      `json:"contentDesc"`
-	CreateTime string `json:"createTime"`
+	//CreateTime       string      `json:"createTime"`
 	//Shottime         interface{} `json:"shottime"`
 	LastUpdateTime string `json:"lastUpdateTime"`
 	ThumbnailURL   string `json:"thumbnailURL"`
@@ -171,7 +165,7 @@ type CloudCatalog struct {
 	CatalogID   string `json:"catalogID"`
 	CatalogName string `json:"catalogName"`
 	//CloudID         string `json:"cloudID"`
-	CreateTime     string `json:"createTime"`
+	//CreateTime      string `json:"createTime"`
 	LastUpdateTime string `json:"lastUpdateTime"`
 	//Creator         string `json:"creator"`
 	//CreatorNickname string `json:"creatorNickname"`
@@ -191,42 +185,3 @@ type QueryContentListResp struct {
 		RecallContent    interface{}    `json:"recallContent"`
 	} `json:"data"`
 }
-
-type PersonalThumbnail struct {
-	Style string `json:"style"`
-	Url   string `json:"url"`
-}
-
-type PersonalFileItem struct {
-	FileId     string              `json:"fileId"`
-	Name       string              `json:"name"`
-	Size       int64               `json:"size"`
-	Type       string              `json:"type"`
-	CreatedAt  string              `json:"createdAt"`
-	UpdatedAt  string              `json:"updatedAt"`
-	Thumbnails []PersonalThumbnail `json:"thumbnailUrls"`
-}
-
-type PersonalListResp struct {
-	BaseResp
-	Data struct {
-		Items          []PersonalFileItem `json:"items"`
-		NextPageCursor string             `json:"nextPageCursor"`
-	}
-}
-
-type PersonalPartInfo struct {
-	PartNumber int    `json:"partNumber"`
-	UploadUrl  string `json:"uploadUrl"`
-}
-
-type PersonalUploadResp struct {
-	BaseResp
-	Data struct {
-		FileId      string             `json:"fileId"`
-		PartInfos   []PersonalPartInfo `json:"partInfos"`
-		Exist       bool               `json:"exist"`
-		RapidUpload bool               `json:"rapidUpload"`
-		UploadId    string             `json:"uploadId"`
-	}
-}

drivers/139/util.go

@@ -42,13 +42,13 @@ func calSign(body, ts, randStr string) string {
 	sort.Strings(strs)
 	body = strings.Join(strs, "")
 	body = base64.StdEncoding.EncodeToString([]byte(body))
-	res := utils.GetMD5EncodeStr(body) + utils.GetMD5EncodeStr(ts+":"+randStr)
+	res := utils.GetMD5Encode(body) + utils.GetMD5Encode(ts+":"+randStr)
-	res = strings.ToUpper(utils.GetMD5EncodeStr(res))
+	res = strings.ToUpper(utils.GetMD5Encode(res))
 	return res
 }
 
 func getTime(t string) time.Time {
-	stamp, _ := time.ParseInLocation("20060102150405", t, utils.CNLoc)
+	stamp, _ := time.ParseInLocation("20060102150405", t, time.Local)
 	return stamp
 }
 
@@ -139,7 +139,6 @@ func (d *Yun139) getFiles(catalogID string) ([]model.Obj, error) {
 				Name:     catalog.CatalogName,
 				Size:     0,
 				Modified: getTime(catalog.UpdateTime),
-				Ctime:    getTime(catalog.CreateTime),
 				IsFolder: true,
 			}
 			files = append(files, &f)
@@ -151,7 +150,6 @@ func (d *Yun139) getFiles(catalogID string) ([]model.Obj, error) {
 					Name:     content.ContentName,
 					Size:     content.ContentSize,
 					Modified: getTime(content.UpdateTime),
-					HashInfo: utils.NewHashInfo(utils.MD5, content.Digest),
 				},
 				Thumbnail: model.Thumbnail{Thumbnail: content.ThumbnailURL},
 				//Thumbnail: content.BigthumbnailURL,
@@ -204,7 +202,6 @@ func (d *Yun139) familyGetFiles(catalogID string) ([]model.Obj, error) {
 				Size:     0,
 				IsFolder: true,
 				Modified: getTime(catalog.LastUpdateTime),
-				Ctime:    getTime(catalog.CreateTime),
 			}
 			files = append(files, &f)
 		}
@@ -215,7 +212,6 @@ func (d *Yun139) familyGetFiles(catalogID string) ([]model.Obj, error) {
 					Name:     content.ContentName,
 					Size:     content.ContentSize,
 					Modified: getTime(content.LastUpdateTime),
-					Ctime:    getTime(content.CreateTime),
 				},
 				Thumbnail: model.Thumbnail{Thumbnail: content.ThumbnailURL},
 				//Thumbnail: content.BigthumbnailURL,
@@ -252,154 +248,3 @@ func unicode(str string) string {
 	textUnquoted := textQuoted[1 : len(textQuoted)-1]
 	return textUnquoted
 }
-
-func (d *Yun139) personalRequest(pathname string, method string, callback base.ReqCallback, resp interface{}) ([]byte, error) {
-	url := "https://personal-kd-njs.yun.139.com" + pathname
-	req := base.RestyClient.R()
-	randStr := random.String(16)
-	ts := time.Now().Format("2006-01-02 15:04:05")
-	if callback != nil {
-		callback(req)
-	}
-	body, err := utils.Json.Marshal(req.Body)
-	if err != nil {
-		return nil, err
-	}
-	sign := calSign(string(body), ts, randStr)
-	svcType := "1"
-	if d.isFamily() {
-		svcType = "2"
-	}
-	req.SetHeaders(map[string]string{
-		"Accept":               "application/json, text/plain, */*",
-		"Authorization":        "Basic " + d.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.13.0",
-		"Origin":               "https://yun.139.com",
-		"Referer":              "https://yun.139.com/w/",
-		"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",
-		"x-m4c-src":            "10002",
-		"x-SvcType":            svcType,
-		"X-Yun-Api-Version":    "v1",
-		"X-Yun-App-Channel":    "10000034",
-		"X-Yun-Channel-Source": "10000034",
-		"X-Yun-Client-Info":    "||9|7.13.0|chrome|120.0.0.0|||windows 10||zh-CN|||dW5kZWZpbmVk||",
-		"X-Yun-Module-Type":    "100",
-		"X-Yun-Svc-Type":       "1",
-	})
-
-	var e BaseResp
-	req.SetResult(&e)
-	res, err := req.Execute(method, url)
-	if err != nil {
-		return nil, err
-	}
-	log.Debugln(res.String())
-	if !e.Success {
-		return nil, errors.New(e.Message)
-	}
-	if resp != nil {
-		err = utils.Json.Unmarshal(res.Body(), resp)
-		if err != nil {
-			return nil, err
-		}
-	}
-	return res.Body(), nil
-}
-func (d *Yun139) personalPost(pathname string, data interface{}, resp interface{}) ([]byte, error) {
-	return d.personalRequest(pathname, http.MethodPost, func(req *resty.Request) {
-		req.SetBody(data)
-	}, resp)
-}
-
-func getPersonalTime(t string) time.Time {
-	stamp, err := time.ParseInLocation("2006-01-02T15:04:05.999-07:00", t, utils.CNLoc)
-	if err != nil {
-		panic(err)
-	}
-	return stamp
-}
-
-func (d *Yun139) personalGetFiles(fileId string) ([]model.Obj, error) {
-	files := make([]model.Obj, 0)
-	nextPageCursor := ""
-	for {
-		data := base.Json{
-			"imageThumbnailStyleList": []string{"Small", "Large"},
-			"orderBy":                 "updated_at",
-			"orderDirection":          "DESC",
-			"pageInfo": base.Json{
-				"pageCursor": nextPageCursor,
-				"pageSize":   100,
-			},
-			"parentFileId": fileId,
-		}
-		var resp PersonalListResp
-		_, err := d.personalPost("/hcy/file/list", data, &resp)
-		if err != nil {
-			return nil, err
-		}
-		nextPageCursor = resp.Data.NextPageCursor
-		for _, item := range resp.Data.Items {
-			var isFolder = (item.Type == "folder")
-			var f model.Obj
-			if isFolder {
-				f = &model.Object{
-					ID:       item.FileId,
-					Name:     item.Name,
-					Size:     0,
-					Modified: getPersonalTime(item.UpdatedAt),
-					Ctime:    getPersonalTime(item.CreatedAt),
-					IsFolder: isFolder,
-				}
-			} else {
-				var Thumbnails = item.Thumbnails
-				var ThumbnailUrl string
-				if len(Thumbnails) > 0 {
-					ThumbnailUrl = Thumbnails[len(Thumbnails)-1].Url
-				}
-				f = &model.ObjThumb{
-					Object: model.Object{
-						ID:       item.FileId,
-						Name:     item.Name,
-						Size:     item.Size,
-						Modified: getPersonalTime(item.UpdatedAt),
-						Ctime:    getPersonalTime(item.CreatedAt),
-						IsFolder: isFolder,
-					},
-					Thumbnail: model.Thumbnail{Thumbnail: ThumbnailUrl},
-				}
-			}
-			files = append(files, f)
-		}
-		if len(nextPageCursor) == 0 {
-			break
-		}
-	}
-	return files, nil
-}
-
-func (d *Yun139) personalGetLink(fileId string) (string, error) {
-	data := base.Json{
-		"fileId": fileId,
-	}
-	res, err := d.personalPost("/hcy/file/getDownloadUrl",
-		data, nil)
-	if err != nil {
-		return "", err
-	}
-	var cdnUrl = jsoniter.Get(res, "data", "cdnUrl").ToString()
-	if cdnUrl != "" {
-		return cdnUrl, nil
-	} else {
-		return jsoniter.Get(res, "data", "url").ToString(), nil
-	}
-}

drivers/189/util.go

@@ -380,12 +380,12 @@ func (d *Cloud189) newUpload(ctx context.Context, dstDir model.Obj, file model.F
 		if err != nil {
 			return err
 		}
-		up(float64(i) * 100 / float64(count))
+		up(int(i * 100 / count))
 	}
 	fileMd5 := hex.EncodeToString(md5Sum.Sum(nil))
 	sliceMd5 := fileMd5
 	if file.GetSize() > DEFAULT {
-		sliceMd5 = utils.GetMD5EncodeStr(strings.Join(md5s, "\n"))
+		sliceMd5 = utils.GetMD5Encode(strings.Join(md5s, "\n"))
 	}
 	res, err = d.uploadRequest("/person/commitMultiUploadFile", map[string]string{
 		"uploadFileId": uploadFileId,

drivers/189pc/driver.go

@@ -3,13 +3,10 @@ package _189pc
 import (
 	"context"
 	"net/http"
-	"strconv"
 	"strings"
-	"time"
 
 	"github.com/alist-org/alist/v3/drivers/base"
 	"github.com/alist-org/alist/v3/internal/driver"
-	"github.com/alist-org/alist/v3/internal/errs"
 	"github.com/alist-org/alist/v3/internal/model"
 	"github.com/alist-org/alist/v3/pkg/utils"
 	"github.com/go-resty/resty/v2"
@@ -25,17 +22,10 @@ type Cloud189PC struct {
 
 	loginParam *LoginParam
 	tokenInfo  *AppSessionResp
-
-	uploadThread int
-
-	storageConfig driver.Config
 }
 
 func (y *Cloud189PC) Config() driver.Config {
-	if y.storageConfig.Name == "" {
+	return config
-		y.storageConfig = config
-	}
-	return y.storageConfig
 }
 
 func (y *Cloud189PC) GetAddition() driver.Additional {
@@ -43,9 +33,6 @@ func (y *Cloud189PC) GetAddition() driver.Additional {
 }
 
 func (y *Cloud189PC) Init(ctx context.Context) (err error) {
-	// 兼容旧上传接口
-	y.storageConfig.NoOverwriteUpload = y.isFamily() && (y.Addition.RapidUpload || y.Addition.UploadMethod == "old")
-
 	// 处理个人云和家庭云参数
 	if y.isFamily() && y.RootFolderID == "-11" {
 		y.RootFolderID = ""
@@ -55,12 +42,6 @@ func (y *Cloud189PC) Init(ctx context.Context) (err error) {
 		y.FamilyID = ""
 	}
 
-	// 限制上传线程数
-	y.uploadThread, _ = strconv.Atoi(y.UploadThread)
-	if y.uploadThread < 1 || y.uploadThread > 32 {
-		y.uploadThread, y.UploadThread = 3, "3"
-	}
-
 	// 初始化请求客户端
 	if y.client == nil {
 		y.client = base.NewRestyClient().SetHeaders(map[string]string{
@@ -70,7 +51,7 @@ func (y *Cloud189PC) Init(ctx context.Context) (err error) {
 	}
 
 	// 避免重复登陆
-	identity := utils.GetMD5EncodeStr(y.Username + y.Password)
+	identity := utils.GetMD5Encode(y.Username + y.Password)
 	if !y.isLogin() || y.identity != identity {
 		y.identity = identity
 		if err = y.login(); err != nil {
@@ -126,11 +107,10 @@ func (y *Cloud189PC) Link(ctx context.Context, file model.Obj, args model.LinkAr
 
 	// 重定向获取真实链接
 	downloadUrl.URL = strings.Replace(strings.ReplaceAll(downloadUrl.URL, "&amp;", "&"), "http://", "https://", 1)
-	res, err := base.NoRedirectClient.R().SetContext(ctx).SetDoNotParseResponse(true).Get(downloadUrl.URL)
+	res, err := base.NoRedirectClient.R().SetContext(ctx).Get(downloadUrl.URL)
 	if err != nil {
 		return nil, err
 	}
-	defer res.RawBody().Close()
 	if res.StatusCode() == 302 {
 		downloadUrl.URL = res.Header().Get("location")
 	}
@@ -155,14 +135,13 @@ func (y *Cloud189PC) Link(ctx context.Context, file model.Obj, args model.LinkAr
 	return like, nil
 }
 
-func (y *Cloud189PC) MakeDir(ctx context.Context, parentDir model.Obj, dirName string) (model.Obj, error) {
+func (y *Cloud189PC) MakeDir(ctx context.Context, parentDir model.Obj, dirName string) error {
 	fullUrl := API_URL
 	if y.isFamily() {
 		fullUrl += "/family/file"
 	}
 	fullUrl += "/createFolder.action"
 
-	var newFolder Cloud189Folder
 	_, err := y.post(fullUrl, func(req *resty.Request) {
 		req.SetContext(ctx)
 		req.SetQueryParams(map[string]string{
@@ -179,15 +158,11 @@ func (y *Cloud189PC) MakeDir(ctx context.Context, parentDir model.Obj, dirName s
 				"parentFolderId": parentDir.GetID(),
 			})
 		}
-	}, &newFolder)
+	}, nil)
-	if err != nil {
+	return err
-		return nil, err
-	}
-	return &newFolder, nil
 }
 
-func (y *Cloud189PC) Move(ctx context.Context, srcObj, dstDir model.Obj) (model.Obj, error) {
+func (y *Cloud189PC) Move(ctx context.Context, srcObj, dstDir model.Obj) error {
-	var resp CreateBatchTaskResp
 	_, err := y.post(API_URL+"/batch/createBatchTask.action", func(req *resty.Request) {
 		req.SetContext(ctx)
 		req.SetFormData(map[string]string{
@@ -207,17 +182,11 @@ func (y *Cloud189PC) Move(ctx context.Context, srcObj, dstDir model.Obj) (model.
 				"familyId": y.FamilyID,
 			})
 		}
-	}, &resp)
+	}, nil)
-	if err != nil {
+	return err
-		return nil, err
-	}
-	if err = y.WaitBatchTask("MOVE", resp.TaskID, time.Millisecond*400); err != nil {
-		return nil, err
-	}
-	return srcObj, nil
 }
 
-func (y *Cloud189PC) Rename(ctx context.Context, srcObj model.Obj, newName string) (model.Obj, error) {
+func (y *Cloud189PC) Rename(ctx context.Context, srcObj model.Obj, newName string) error {
 	queryParam := make(map[string]string)
 	fullUrl := API_URL
 	method := http.MethodPost
@@ -226,34 +195,23 @@ func (y *Cloud189PC) Rename(ctx context.Context, srcObj model.Obj, newName strin
 		method = http.MethodGet
 		queryParam["familyId"] = y.FamilyID
 	}
-
+	if srcObj.IsDir() {
-	var newObj model.Obj
-	switch f := srcObj.(type) {
-	case *Cloud189File:
-		fullUrl += "/renameFile.action"
-		queryParam["fileId"] = srcObj.GetID()
-		queryParam["destFileName"] = newName
-		newObj = &Cloud189File{Icon: f.Icon} // 复用预览
-	case *Cloud189Folder:
 		fullUrl += "/renameFolder.action"
 		queryParam["folderId"] = srcObj.GetID()
 		queryParam["destFolderName"] = newName
-		newObj = &Cloud189Folder{}
+	} else {
-	default:
+		fullUrl += "/renameFile.action"
-		return nil, errs.NotSupport
+		queryParam["fileId"] = srcObj.GetID()
+		queryParam["destFileName"] = newName
 	}
-
 	_, err := y.request(fullUrl, method, func(req *resty.Request) {
-		req.SetContext(ctx).SetQueryParams(queryParam)
+		req.SetContext(ctx)
-	}, nil, newObj)
+		req.SetQueryParams(queryParam)
-	if err != nil {
+	}, nil, nil)
-		return nil, err
+	return err
-	}
-	return newObj, nil
 }
 
 func (y *Cloud189PC) Copy(ctx context.Context, srcObj, dstDir model.Obj) error {
-	var resp CreateBatchTaskResp
 	_, err := y.post(API_URL+"/batch/createBatchTask.action", func(req *resty.Request) {
 		req.SetContext(ctx)
 		req.SetFormData(map[string]string{
@@ -274,15 +232,11 @@ func (y *Cloud189PC) Copy(ctx context.Context, srcObj, dstDir model.Obj) error {
 				"familyId": y.FamilyID,
 			})
 		}
-	}, &resp)
+	}, nil)
-	if err != nil {
 	return err
 }
-	return y.WaitBatchTask("COPY", resp.TaskID, time.Second)
-}
 
 func (y *Cloud189PC) Remove(ctx context.Context, obj model.Obj) error {
-	var resp CreateBatchTaskResp
 	_, err := y.post(API_URL+"/batch/createBatchTask.action", func(req *resty.Request) {
 		req.SetContext(ctx)
 		req.SetFormData(map[string]string{
@@ -302,33 +256,19 @@ func (y *Cloud189PC) Remove(ctx context.Context, obj model.Obj) error {
 				"familyId": y.FamilyID,
 			})
 		}
-	}, &resp)
+	}, nil)
-	if err != nil {
 	return err
 }
-	// 批量任务数量限制，过快会导致无法删除
-	return y.WaitBatchTask("DELETE", resp.TaskID, time.Millisecond*200)
-}
-
-func (y *Cloud189PC) Put(ctx context.Context, dstDir model.Obj, stream model.FileStreamer, up driver.UpdateProgress) (model.Obj, error) {
-	// 响应时间长,按需启用
-	if y.Addition.RapidUpload {
-		if newObj, err := y.RapidUpload(ctx, dstDir, stream); err == nil {
-			return newObj, nil
-		}
-	}
 
+func (y *Cloud189PC) Put(ctx context.Context, dstDir model.Obj, stream model.FileStreamer, up driver.UpdateProgress) error {
 	switch y.UploadMethod {
+	case "stream":
+		return y.CommonUpload(ctx, dstDir, stream, up)
 	case "old":
 		return y.OldUpload(ctx, dstDir, stream, up)
 	case "rapid":
 		return y.FastUpload(ctx, dstDir, stream, up)
-	case "stream":
-		if stream.GetSize() == 0 {
-			return y.FastUpload(ctx, dstDir, stream, up)
-		}
-		fallthrough
 	default:
-		return y.StreamUpload(ctx, dstDir, stream, up)
+		return y.CommonUpload(ctx, dstDir, stream, up)
 	}
 }

drivers/189pc/help.go

@@ -10,7 +10,6 @@ import (
 	"crypto/x509"
 	"encoding/hex"
 	"encoding/pem"
-	"encoding/xml"
 	"fmt"
 	"math"
 	"net/http"
@@ -84,55 +83,6 @@ func MustParseTime(str string) *time.Time {
 	return &lastOpTime
 }
 
-type Time time.Time
-
-func (t *Time) UnmarshalJSON(b []byte) error { return t.Unmarshal(b) }
-func (t *Time) UnmarshalXML(e *xml.Decoder, ee xml.StartElement) error {
-	b, err := e.Token()
-	if err != nil {
-		return err
-	}
-	if b, ok := b.(xml.CharData); ok {
-		if err = t.Unmarshal(b); err != nil {
-			return err
-		}
-	}
-	return e.Skip()
-}
-func (t *Time) Unmarshal(b []byte) error {
-	bs := strings.Trim(string(b), "\"")
-	var v time.Time
-	var err error
-	for _, f := range []string{"2006-01-02 15:04:05 -07", "Jan 2, 2006 15:04:05 PM -07"} {
-		v, err = time.ParseInLocation(f, bs+" +08", time.Local)
-		if err == nil {
-			break
-		}
-	}
-	*t = Time(v)
-	return err
-}
-
-type String string
-
-func (t *String) UnmarshalJSON(b []byte) error { return t.Unmarshal(b) }
-func (t *String) UnmarshalXML(e *xml.Decoder, ee xml.StartElement) error {
-	b, err := e.Token()
-	if err != nil {
-		return err
-	}
-	if b, ok := b.(xml.CharData); ok {
-		if err = t.Unmarshal(b); err != nil {
-			return err
-		}
-	}
-	return e.Skip()
-}
-func (s *String) Unmarshal(b []byte) error {
-	*s = String(bytes.Trim(b, "\""))
-	return nil
-}
-
 func toFamilyOrderBy(o string) string {
 	switch o {
 	case "filename":
@@ -160,8 +110,9 @@ func toDesc(o string) string {
 func ParseHttpHeader(str string) map[string]string {
 	header := make(map[string]string)
 	for _, value := range strings.Split(str, "&") {
-		if k, v, found := strings.Cut(value, "="); found {
+		i := strings.Index(value, "=")
-			header[k] = v
+		if i > 0 {
+			header[strings.TrimSpace(value[0:i])] = strings.TrimSpace(value[i+1:])
 		}
 	}
 	return header
@@ -171,6 +122,10 @@ func MustString(str string, err error) string {
 	return str
 }
 
+func MustToBytes(b []byte, err error) []byte {
+	return b
+}
+
 func BoolToNumber(b bool) int {
 	if b {
 		return 1

drivers/189pc/meta.go

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

drivers/189pc/types.go

@@ -3,7 +3,6 @@ package _189pc
 import (
 	"encoding/xml"
 	"fmt"
-	"github.com/alist-org/alist/v3/pkg/utils"
 	"sort"
 	"strings"
 	"time"
@@ -152,13 +151,8 @@ type FamilyInfoResp struct {
 /*文件部分*/
 // 文件
 type Cloud189File struct {
-	ID   String `json:"id"`
+	CreateDate string `json:"createDate"`
-	Name string `json:"name"`
+	FileCata   int64  `json:"fileCata"`
-	Size int64  `json:"size"`
-	Md5  string `json:"md5"`
-
-	LastOpTime Time `json:"lastOpTime"`
-	CreateDate Time `json:"createDate"`
 	Icon       struct {
 		//iconOption 5
 		SmallUrl string `json:"smallUrl"`
@@ -168,59 +162,61 @@ type Cloud189File struct {
 		Max600    string `json:"max600"`
 		MediumURL string `json:"mediumUrl"`
 	} `json:"icon"`
+	ID          int64  `json:"id"`
+	LastOpTime  string `json:"lastOpTime"`
+	Md5         string `json:"md5"`
+	MediaType   int    `json:"mediaType"`
+	Name        string `json:"name"`
+	Orientation int64  `json:"orientation"`
+	Rev         string `json:"rev"`
+	Size        int64  `json:"size"`
+	StarLabel   int64  `json:"starLabel"`
 
-	// Orientation int64  `json:"orientation"`
+	parseTime *time.Time
-	// FileCata   int64  `json:"fileCata"`
-	// MediaType   int    `json:"mediaType"`
-	// Rev         string `json:"rev"`
-	// StarLabel   int64  `json:"starLabel"`
-}
-
-func (c *Cloud189File) CreateTime() time.Time {
-	return time.Time(c.CreateDate)
-}
-
-func (c *Cloud189File) GetHash() utils.HashInfo {
-	return utils.NewHashInfo(utils.MD5, c.Md5)
 }
 
 func (c *Cloud189File) GetSize() int64  { return c.Size }
 func (c *Cloud189File) GetName() string { return c.Name }
-func (c *Cloud189File) ModTime() time.Time { return time.Time(c.LastOpTime) }
+func (c *Cloud189File) ModTime() time.Time {
+	if c.parseTime == nil {
+		c.parseTime = MustParseTime(c.LastOpTime)
+	}
+	return *c.parseTime
+}
 func (c *Cloud189File) IsDir() bool     { return false }
-func (c *Cloud189File) GetID() string      { return string(c.ID) }
+func (c *Cloud189File) GetID() string   { return fmt.Sprint(c.ID) }
 func (c *Cloud189File) GetPath() string { return "" }
 func (c *Cloud189File) Thumb() string   { return c.Icon.SmallUrl }
 
 // 文件夹
 type Cloud189Folder struct {
-	ID       String `json:"id"`
+	ID       int64  `json:"id"`
 	ParentID int64  `json:"parentId"`
 	Name     string `json:"name"`
 
-	LastOpTime Time `json:"lastOpTime"`
+	FileCata  int64 `json:"fileCata"`
-	CreateDate Time `json:"createDate"`
+	FileCount int64 `json:"fileCount"`
 
-	// FileListSize int64 `json:"fileListSize"`
+	LastOpTime string `json:"lastOpTime"`
-	// FileCount int64 `json:"fileCount"`
+	CreateDate string `json:"createDate"`
-	// FileCata  int64 `json:"fileCata"`
-	// Rev          string `json:"rev"`
-	// StarLabel    int64  `json:"starLabel"`
-}
 
-func (c *Cloud189Folder) CreateTime() time.Time {
+	FileListSize int64  `json:"fileListSize"`
-	return time.Time(c.CreateDate)
+	Rev          string `json:"rev"`
-}
+	StarLabel    int64  `json:"starLabel"`
 
-func (c *Cloud189Folder) GetHash() utils.HashInfo {
+	parseTime *time.Time
-	return utils.HashInfo{}
 }
 
 func (c *Cloud189Folder) GetSize() int64  { return 0 }
 func (c *Cloud189Folder) GetName() string { return c.Name }
-func (c *Cloud189Folder) ModTime() time.Time { return time.Time(c.LastOpTime) }
+func (c *Cloud189Folder) ModTime() time.Time {
+	if c.parseTime == nil {
+		c.parseTime = MustParseTime(c.LastOpTime)
+	}
+	return *c.parseTime
+}
 func (c *Cloud189Folder) IsDir() bool     { return true }
-func (c *Cloud189Folder) GetID() string      { return string(c.ID) }
+func (c *Cloud189Folder) GetID() string   { return fmt.Sprint(c.ID) }
 func (c *Cloud189Folder) GetPath() string { return "" }
 
 type Cloud189FilesResp struct {
@@ -257,24 +253,13 @@ type InitMultiUploadResp struct {
 }
 type UploadUrlsResp struct {
 	Code       string          `json:"code"`
-	Data map[string]UploadUrlsData `json:"uploadUrls"`
+	UploadUrls map[string]Part `json:"uploadUrls"`
 }
-type UploadUrlsData struct {
+type Part struct {
 	RequestURL    string `json:"requestURL"`
 	RequestHeader string `json:"requestHeader"`
 }
 
-type UploadUrlInfo struct {
-	PartNumber int
-	Headers    map[string]string
-	UploadUrlsData
-}
-
-type UploadProgress struct {
-	UploadInfo  InitMultiUploadResp
-	UploadParts []string
-}
-
 /* 第二种上传方式 */
 type CreateUploadFileResp struct {
 	// 上传文件请求ID
@@ -299,60 +284,15 @@ func (r *GetUploadFileStatusResp) GetSize() int64 {
 	return r.DataSize + r.Size
 }
 
-type CommitMultiUploadFileResp struct {
+type CommitUploadFileResp struct {
-	File struct {
-		UserFileID String `json:"userFileId"`
-		FileName   string `json:"fileName"`
-		FileSize   int64  `json:"fileSize"`
-		FileMd5    string `json:"fileMd5"`
-		CreateDate Time   `json:"createDate"`
-	} `json:"file"`
-}
-
-func (f *CommitMultiUploadFileResp) toFile() *Cloud189File {
-	return &Cloud189File{
-		ID:         f.File.UserFileID,
-		Name:       f.File.FileName,
-		Size:       f.File.FileSize,
-		Md5:        f.File.FileMd5,
-		LastOpTime: f.File.CreateDate,
-		CreateDate: f.File.CreateDate,
-	}
-}
-
-type OldCommitUploadFileResp struct {
 	XMLName    xml.Name `xml:"file"`
-	ID         String   `xml:"id"`
+	Id         string   `xml:"id"`
 	Name       string   `xml:"name"`
-	Size       int64    `xml:"size"`
+	Size       string   `xml:"size"`
 	Md5        string   `xml:"md5"`
-	CreateDate Time     `xml:"createDate"`
+	CreateDate string   `xml:"createDate"`
-}
+	Rev        string   `xml:"rev"`
-
+	UserId     string   `xml:"userId"`
-func (f *OldCommitUploadFileResp) toFile() *Cloud189File {
-	return &Cloud189File{
-		ID:         f.ID,
-		Name:       f.Name,
-		Size:       f.Size,
-		Md5:        f.Md5,
-		CreateDate: f.CreateDate,
-		LastOpTime: f.CreateDate,
-	}
-}
-
-type CreateBatchTaskResp struct {
-	TaskID string `json:"taskId"`
-}
-
-type BatchTaskStateResp struct {
-	FailedCount         int     `json:"failedCount"`
-	Process             int     `json:"process"`
-	SkipCount           int     `json:"skipCount"`
-	SubTaskCount        int     `json:"subTaskCount"`
-	SuccessedCount      int     `json:"successedCount"`
-	SuccessedFileIDList []int64 `json:"successedFileIdList"`
-	TaskID              string  `json:"taskId"`
-	TaskStatus          int     `json:"taskStatus"` //1 初始化 2 存在冲突 3 执行中，4 完成
 }
 
 /* query 加密参数*/

drivers/189pc/utils.go

@@ -13,9 +13,8 @@ import (
 	"net/http"
 	"net/http/cookiejar"
 	"net/url"
+	"os"
 	"regexp"
-	"sort"
-	"strconv"
 	"strings"
 	"time"
 
@@ -25,7 +24,6 @@ import (
 	"github.com/alist-org/alist/v3/internal/model"
 	"github.com/alist-org/alist/v3/internal/op"
 	"github.com/alist-org/alist/v3/internal/setting"
-	"github.com/alist-org/alist/v3/pkg/errgroup"
 	"github.com/alist-org/alist/v3/pkg/utils"
 
 	"github.com/avast/retry-go"
@@ -270,7 +268,7 @@ func (y *Cloud189PC) login() (err error) {
 			"validateCode": y.VCode,
 			"captchaToken": param.CaptchaToken,
 			"returnUrl":    RETURN_URL,
-			// "mailSuffix":   "@189.cn",
+			"mailSuffix":   "@189.cn",
 			"dynamicCheck": "FALSE",
 			"clientType":   CLIENT_TYPE,
 			"cb_SaveName":  "1",
@@ -436,20 +434,15 @@ func (y *Cloud189PC) refreshSession() (err error) {
 }
 
 // 普通上传
-// 无法上传大小为0的文件
+func (y *Cloud189PC) CommonUpload(ctx context.Context, dstDir model.Obj, file model.FileStreamer, up driver.UpdateProgress) (err error) {
-func (y *Cloud189PC) StreamUpload(ctx context.Context, dstDir model.Obj, file model.FileStreamer, up driver.UpdateProgress) (model.Obj, error) {
+	var DEFAULT = partSize(file.GetSize())
-	var sliceSize = partSize(file.GetSize())
+	var count = int(math.Ceil(float64(file.GetSize()) / float64(DEFAULT)))
-	count := int(math.Ceil(float64(file.GetSize()) / float64(sliceSize)))
-	lastPartSize := file.GetSize() % sliceSize
-	if file.GetSize() > 0 && lastPartSize == 0 {
-		lastPartSize = sliceSize
-	}
 
 	params := Params{
 		"parentFolderId": dstDir.GetID(),
 		"fileName":       url.QueryEscape(file.GetName()),
 		"fileSize":       fmt.Sprint(file.GetSize()),
-		"sliceSize":      fmt.Sprint(sliceSize),
+		"sliceSize":      fmt.Sprint(DEFAULT),
 		"lazyCheck":      "1",
 	}
 
@@ -464,71 +457,72 @@ func (y *Cloud189PC) StreamUpload(ctx context.Context, dstDir model.Obj, file mo
 
 	// 初始化上传
 	var initMultiUpload InitMultiUploadResp
-	_, err := y.request(fullUrl+"/initMultiUpload", http.MethodGet, func(req *resty.Request) {
+	_, err = y.request(fullUrl+"/initMultiUpload", http.MethodGet, func(req *resty.Request) {
 		req.SetContext(ctx)
 	}, params, &initMultiUpload)
 	if err != nil {
-		return nil, err
+		return err
 	}
 
-	threadG, upCtx := errgroup.NewGroupWithContext(ctx, y.uploadThread,
-		retry.Attempts(3),
-		retry.Delay(time.Second),
-		retry.DelayType(retry.BackOffDelay))
-
 	fileMd5 := md5.New()
 	silceMd5 := md5.New()
 	silceMd5Hexs := make([]string, 0, count)
-
+	byteData := bytes.NewBuffer(make([]byte, DEFAULT))
 	for i := 1; i <= count; i++ {
-		if utils.IsCanceled(upCtx) {
+		if utils.IsCanceled(ctx) {
-			break
+			return ctx.Err()
-		}
-
-		byteData := make([]byte, sliceSize)
-		if i == count {
-			byteData = byteData[:lastPartSize]
 		}
 
 		// 读取块
+		byteData.Reset()
 		silceMd5.Reset()
-		if _, err := io.ReadFull(io.TeeReader(file, io.MultiWriter(fileMd5, silceMd5)), byteData); err != io.EOF && err != nil {
+		_, err := io.CopyN(io.MultiWriter(fileMd5, silceMd5, byteData), file, DEFAULT)
-			return nil, err
+		if err != io.EOF && err != io.ErrUnexpectedEOF && err != nil {
+			return err
 		}
 
 		// 计算块md5并进行hex和base64编码
 		md5Bytes := silceMd5.Sum(nil)
 		silceMd5Hexs = append(silceMd5Hexs, strings.ToUpper(hex.EncodeToString(md5Bytes)))
-		partInfo := fmt.Sprintf("%d-%s", i, base64.StdEncoding.EncodeToString(md5Bytes))
+		silceMd5Base64 := base64.StdEncoding.EncodeToString(md5Bytes)
 
-		threadG.Go(func(ctx context.Context) error {
+		// 获取上传链接
-			uploadUrls, err := y.GetMultiUploadUrls(ctx, initMultiUpload.Data.UploadFileID, partInfo)
+		var uploadUrl UploadUrlsResp
+		_, err = y.request(fullUrl+"/getMultiUploadUrls", http.MethodGet,
+			func(req *resty.Request) {
+				req.SetContext(ctx)
+			}, Params{
+				"partInfo":     fmt.Sprintf("%d-%s", i, silceMd5Base64),
+				"uploadFileId": initMultiUpload.Data.UploadFileID,
+			}, &uploadUrl)
 		if err != nil {
 			return err
 		}
 
-			// step.4 上传切片
+		// 开始上传
-			uploadUrl := uploadUrls[0]
+		uploadData := uploadUrl.UploadUrls[fmt.Sprint("partNumber_", i)]
-			_, err = y.put(ctx, uploadUrl.RequestURL, uploadUrl.Headers, false, bytes.NewReader(byteData))
+
+		err = retry.Do(func() error {
+			_, err := y.put(ctx, uploadData.RequestURL, ParseHttpHeader(uploadData.RequestHeader), false, bytes.NewReader(byteData.Bytes()))
+			return err
+		},
+			retry.Context(ctx),
+			retry.Attempts(3),
+			retry.Delay(time.Second),
+			retry.MaxDelay(5*time.Second))
 		if err != nil {
 			return err
 		}
-			up(float64(threadG.Success()) * 100 / float64(count))
+		up(int(i * 100 / count))
-			return nil
-		})
-	}
-	if err = threadG.Wait(); err != nil {
-		return nil, err
 	}
 
 	fileMd5Hex := strings.ToUpper(hex.EncodeToString(fileMd5.Sum(nil)))
 	sliceMd5Hex := fileMd5Hex
-	if file.GetSize() > sliceSize {
+	if file.GetSize() > DEFAULT {
-		sliceMd5Hex = strings.ToUpper(utils.GetMD5EncodeStr(strings.Join(silceMd5Hexs, "\n")))
+		sliceMd5Hex = strings.ToUpper(utils.GetMD5Encode(strings.Join(silceMd5Hexs, "\n")))
 	}
 
 	// 提交上传
-	var resp CommitMultiUploadFileResp
 	_, err = y.request(fullUrl+"/commitMultiUploadFile", http.MethodGet,
 		func(req *resty.Request) {
 			req.SetContext(ctx)
@@ -539,240 +533,199 @@ func (y *Cloud189PC) StreamUpload(ctx context.Context, dstDir model.Obj, file mo
 			"lazyCheck":    "1",
 			"isLog":        "0",
 			"opertype":     "3",
-		}, &resp)
+		}, nil)
-	if err != nil {
+	return err
-		return nil, err
-	}
-	return resp.toFile(), nil
-}
-
-func (y *Cloud189PC) RapidUpload(ctx context.Context, dstDir model.Obj, stream model.FileStreamer) (model.Obj, error) {
-	fileMd5 := stream.GetHash().GetHash(utils.MD5)
-	if len(fileMd5) < utils.MD5.Width {
-		return nil, errors.New("invalid hash")
-	}
-
-	uploadInfo, err := y.OldUploadCreate(ctx, dstDir.GetID(), fileMd5, stream.GetName(), fmt.Sprint(stream.GetSize()))
-	if err != nil {
-		return nil, err
-	}
-
-	if uploadInfo.FileDataExists != 1 {
-		return nil, errors.New("rapid upload fail")
-	}
-
-	return y.OldUploadCommit(ctx, uploadInfo.FileCommitUrl, uploadInfo.UploadFileId)
 }
 
 // 快传
-func (y *Cloud189PC) FastUpload(ctx context.Context, dstDir model.Obj, file model.FileStreamer, up driver.UpdateProgress) (model.Obj, error) {
+func (y *Cloud189PC) FastUpload(ctx context.Context, dstDir model.Obj, file model.FileStreamer, up driver.UpdateProgress) (err error) {
-	tempFile, err := file.CacheFullInTempFile()
+	// 需要获取完整文件md5,必须支持 io.Seek
+	tempFile, err := utils.CreateTempFile(file.GetReadCloser())
 	if err != nil {
-		return nil, err
+		return err
 	}
+	defer func() {
+		_ = tempFile.Close()
+		_ = os.Remove(tempFile.Name())
+	}()
 
-	var sliceSize = partSize(file.GetSize())
+	var DEFAULT = partSize(file.GetSize())
-	count := int(math.Ceil(float64(file.GetSize()) / float64(sliceSize)))
+	count := int(math.Ceil(float64(file.GetSize()) / float64(DEFAULT)))
-	lastSliceSize := file.GetSize() % sliceSize
-	if file.GetSize() > 0 && lastSliceSize == 0 {
-		lastSliceSize = sliceSize
-	}
 
-	//step.1 优先计算所需信息
+	// 优先计算所需信息
-	byteSize := sliceSize
 	fileMd5 := md5.New()
 	silceMd5 := md5.New()
 	silceMd5Hexs := make([]string, 0, count)
-	partInfos := make([]string, 0, count)
+	silceMd5Base64s := make([]string, 0, count)
 	for i := 1; i <= count; i++ {
 		if utils.IsCanceled(ctx) {
-			return nil, ctx.Err()
+			return ctx.Err()
-		}
-
-		if i == count {
-			byteSize = lastSliceSize
 		}
 
 		silceMd5.Reset()
-		if _, err := io.CopyN(io.MultiWriter(fileMd5, silceMd5), tempFile, byteSize); err != nil && err != io.EOF {
+		if _, err := io.CopyN(io.MultiWriter(fileMd5, silceMd5), tempFile, DEFAULT); err != nil && err != io.EOF && err != io.ErrUnexpectedEOF {
-			return nil, err
+			return err
 		}
 		md5Byte := silceMd5.Sum(nil)
 		silceMd5Hexs = append(silceMd5Hexs, strings.ToUpper(hex.EncodeToString(md5Byte)))
-		partInfos = append(partInfos, fmt.Sprint(i, "-", base64.StdEncoding.EncodeToString(md5Byte)))
+		silceMd5Base64s = append(silceMd5Base64s, fmt.Sprint(i, "-", base64.StdEncoding.EncodeToString(md5Byte)))
+	}
+	if _, err = tempFile.Seek(0, io.SeekStart); err != nil {
+		return err
 	}
 
 	fileMd5Hex := strings.ToUpper(hex.EncodeToString(fileMd5.Sum(nil)))
 	sliceMd5Hex := fileMd5Hex
-	if file.GetSize() > sliceSize {
+	if file.GetSize() > DEFAULT {
-		sliceMd5Hex = strings.ToUpper(utils.GetMD5EncodeStr(strings.Join(silceMd5Hexs, "\n")))
+		sliceMd5Hex = strings.ToUpper(utils.GetMD5Encode(strings.Join(silceMd5Hexs, "\n")))
+	}
+
+	// 检测是否支持快传
+	params := Params{
+		"parentFolderId": dstDir.GetID(),
+		"fileName":       url.QueryEscape(file.GetName()),
+		"fileSize":       fmt.Sprint(file.GetSize()),
+		"fileMd5":        fileMd5Hex,
+		"sliceSize":      fmt.Sprint(DEFAULT),
+		"sliceMd5":       sliceMd5Hex,
 	}
 
 	fullUrl := UPLOAD_URL
 	if y.isFamily() {
+		params.Set("familyId", y.FamilyID)
 		fullUrl += "/family"
 	} else {
 		//params.Set("extend", `{"opScene":"1","relativepath":"","rootfolderid":""}`)
 		fullUrl += "/person"
 	}
 
-	// 尝试恢复进度
-	uploadProgress, ok := base.GetUploadProgress[*UploadProgress](y, y.tokenInfo.SessionKey, fileMd5Hex)
-	if !ok {
-		//step.2 预上传
-		params := Params{
-			"parentFolderId": dstDir.GetID(),
-			"fileName":       url.QueryEscape(file.GetName()),
-			"fileSize":       fmt.Sprint(file.GetSize()),
-			"fileMd5":        fileMd5Hex,
-			"sliceSize":      fmt.Sprint(sliceSize),
-			"sliceMd5":       sliceMd5Hex,
-		}
-		if y.isFamily() {
-			params.Set("familyId", y.FamilyID)
-		}
 	var uploadInfo InitMultiUploadResp
 	_, err = y.request(fullUrl+"/initMultiUpload", http.MethodGet, func(req *resty.Request) {
 		req.SetContext(ctx)
 	}, params, &uploadInfo)
 	if err != nil {
-			return nil, err
+		return err
-		}
-		uploadProgress = &UploadProgress{
-			UploadInfo:  uploadInfo,
-			UploadParts: partInfos,
-		}
 	}
 
-	uploadInfo := uploadProgress.UploadInfo.Data
 	// 网盘中不存在该文件，开始上传
-	if uploadInfo.FileDataExists != 1 {
+	if uploadInfo.Data.FileDataExists != 1 {
-		threadG, upCtx := errgroup.NewGroupWithContext(ctx, y.uploadThread,
+		var uploadUrls UploadUrlsResp
+		_, err = y.request(fullUrl+"/getMultiUploadUrls", http.MethodGet,
+			func(req *resty.Request) {
+				req.SetContext(ctx)
+			}, Params{
+				"uploadFileId": uploadInfo.Data.UploadFileID,
+				"partInfo":     strings.Join(silceMd5Base64s, ","),
+			}, &uploadUrls)
+		if err != nil {
+			return err
+		}
+
+		buf := make([]byte, DEFAULT)
+		for i := 1; i <= count; i++ {
+			if utils.IsCanceled(ctx) {
+				return ctx.Err()
+			}
+
+			n, err := io.ReadFull(tempFile, buf)
+			if err != nil && err != io.EOF && err != io.ErrUnexpectedEOF {
+				return err
+			}
+			uploadData := uploadUrls.UploadUrls[fmt.Sprint("partNumber_", i)]
+			err = retry.Do(func() error {
+				_, err := y.put(ctx, uploadData.RequestURL, ParseHttpHeader(uploadData.RequestHeader), false, bytes.NewReader(buf[:n]))
+				return err
+			},
+				retry.Context(ctx),
 				retry.Attempts(3),
 				retry.Delay(time.Second),
-			retry.DelayType(retry.BackOffDelay))
+				retry.MaxDelay(5*time.Second))
-		for i, uploadPart := range uploadProgress.UploadParts {
-			if utils.IsCanceled(upCtx) {
-				break
-			}
-
-			i, uploadPart := i, uploadPart
-			threadG.Go(func(ctx context.Context) error {
-				// step.3 获取上传链接
-				uploadUrls, err := y.GetMultiUploadUrls(ctx, uploadInfo.UploadFileID, uploadPart)
-				if err != nil {
-					return err
-				}
-				uploadUrl := uploadUrls[0]
-
-				byteSize, offset := sliceSize, int64(uploadUrl.PartNumber-1)*sliceSize
-				if uploadUrl.PartNumber == count {
-					byteSize = lastSliceSize
-				}
-
-				// step.4 上传切片
-				_, err = y.put(ctx, uploadUrl.RequestURL, uploadUrl.Headers, false, io.NewSectionReader(tempFile, offset, byteSize))
 			if err != nil {
 				return err
 			}
 
-				up(float64(threadG.Success()) * 100 / float64(len(uploadUrls)))
+			up(int(i * 100 / count))
-				uploadProgress.UploadParts[i] = ""
-				return nil
-			})
-		}
-		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.tokenInfo.SessionKey, fileMd5Hex)
-			}
-			return nil, err
 		}
 	}
 
-	// step.5 提交
+	// 提交
-	var resp CommitMultiUploadFileResp
 	_, err = y.request(fullUrl+"/commitMultiUploadFile", http.MethodGet,
 		func(req *resty.Request) {
 			req.SetContext(ctx)
 		}, Params{
-			"uploadFileId": uploadInfo.UploadFileID,
+			"uploadFileId": uploadInfo.Data.UploadFileID,
 			"isLog":        "0",
 			"opertype":     "3",
-		}, &resp)
+		}, nil)
-	if err != nil {
+	return err
-		return nil, err
-	}
-	return resp.toFile(), nil
 }
 
-// 获取上传切片信息
+func (y *Cloud189PC) OldUpload(ctx context.Context, dstDir model.Obj, file model.FileStreamer, up driver.UpdateProgress) (err error) {
-// 对http body有大小限制，分片信息太多会出错
+	// 需要获取完整文件md5,必须支持 io.Seek
-func (y *Cloud189PC) GetMultiUploadUrls(ctx context.Context, uploadFileId string, partInfo ...string) ([]UploadUrlInfo, error) {
+	tempFile, err := utils.CreateTempFile(file.GetReadCloser())
-	fullUrl := UPLOAD_URL
-	if y.isFamily() {
-		fullUrl += "/family"
-	} else {
-		fullUrl += "/person"
-	}
-
-	var uploadUrlsResp UploadUrlsResp
-	_, err := y.request(fullUrl+"/getMultiUploadUrls", http.MethodGet,
-		func(req *resty.Request) {
-			req.SetContext(ctx)
-		}, Params{
-			"uploadFileId": uploadFileId,
-			"partInfo":     strings.Join(partInfo, ","),
-		}, &uploadUrlsResp)
 	if err != nil {
-		return nil, err
+		return err
 	}
-	uploadUrls := uploadUrlsResp.Data
+	defer func() {
+		_ = tempFile.Close()
+		_ = os.Remove(tempFile.Name())
+	}()
 
-	if len(uploadUrls) != len(partInfo) {
+	// 计算md5
-		return nil, fmt.Errorf("uploadUrls get error, due to get length %d, real length %d", len(partInfo), len(uploadUrls))
+	fileMd5 := md5.New()
+	if _, err := io.Copy(fileMd5, tempFile); err != nil {
+		return err
 	}
-
+	if _, err = tempFile.Seek(0, io.SeekStart); err != nil {
-	uploadUrlInfos := make([]UploadUrlInfo, 0, len(uploadUrls))
+		return err
-	for k, uploadUrl := range uploadUrls {
-		partNumber, err := strconv.Atoi(strings.TrimPrefix(k, "partNumber_"))
-		if err != nil {
-			return nil, err
-		}
-		uploadUrlInfos = append(uploadUrlInfos, UploadUrlInfo{
-			PartNumber:     partNumber,
-			Headers:        ParseHttpHeader(uploadUrl.RequestHeader),
-			UploadUrlsData: uploadUrl,
-		})
-	}
-	sort.Slice(uploadUrlInfos, func(i, j int) bool {
-		return uploadUrlInfos[i].PartNumber < uploadUrlInfos[j].PartNumber
-	})
-	return uploadUrlInfos, nil
-}
-
-// 旧版本上传，家庭云不支持覆盖
-func (y *Cloud189PC) OldUpload(ctx context.Context, dstDir model.Obj, file model.FileStreamer, up driver.UpdateProgress) (model.Obj, error) {
-	tempFile, err := file.CacheFullInTempFile()
-	if err != nil {
-		return nil, err
-	}
-	fileMd5, err := utils.HashFile(utils.MD5, tempFile)
-	if err != nil {
-		return nil, err
 	}
+	fileMd5Hex := strings.ToUpper(hex.EncodeToString(fileMd5.Sum(nil)))
 
 	// 创建上传会话
-	uploadInfo, err := y.OldUploadCreate(ctx, dstDir.GetID(), fileMd5, file.GetName(), fmt.Sprint(file.GetSize()))
+	var uploadInfo CreateUploadFileResp
+
+	fullUrl := API_URL + "/createUploadFile.action"
+	if y.isFamily() {
+		fullUrl = API_URL + "/family/file/createFamilyFile.action"
+	}
+	_, err = y.post(fullUrl, func(req *resty.Request) {
+		req.SetContext(ctx)
+		if y.isFamily() {
+			req.SetQueryParams(map[string]string{
+				"familyId":     y.FamilyID,
+				"fileMd5":      fileMd5Hex,
+				"fileName":     file.GetName(),
+				"fileSize":     fmt.Sprint(file.GetSize()),
+				"parentId":     dstDir.GetID(),
+				"resumePolicy": "1",
+			})
+		} else {
+			req.SetFormData(map[string]string{
+				"parentFolderId": dstDir.GetID(),
+				"fileName":       file.GetName(),
+				"size":           fmt.Sprint(file.GetSize()),
+				"md5":            fileMd5Hex,
+				"opertype":       "3",
+				"flag":           "1",
+				"resumePolicy":   "1",
+				"isLog":          "0",
+				// "baseFileId":     "",
+				// "lastWrite":"",
+				// "localPath": strings.ReplaceAll(param.LocalPath, "\\", "/"),
+				// "fileExt": "",
+			})
+		}
+	}, &uploadInfo)
+
 	if err != nil {
-		return nil, err
+		return err
 	}
 
 	// 网盘中不存在该文件，开始上传
-	status := GetUploadFileStatusResp{CreateUploadFileResp: *uploadInfo}
+	status := GetUploadFileStatusResp{CreateUploadFileResp: uploadInfo}
-	for status.GetSize() < file.GetSize() && status.FileDataExists != 1 {
+	for status.Size < file.GetSize() && status.FileDataExists != 1 {
 		if utils.IsCanceled(ctx) {
-			return nil, ctx.Err()
+			return ctx.Err()
 		}
 
 		header := map[string]string{
@@ -789,7 +742,7 @@ func (y *Cloud189PC) OldUpload(ctx context.Context, dstDir model.Obj, file model
 
 		_, err := y.put(ctx, status.FileUploadUrl, header, true, io.NopCloser(tempFile))
 		if err, ok := err.(*RespErr); ok && err.Code != "InputStreamReadError" {
-			return nil, err
+			return err
 		}
 
 		// 获取断点状态
@@ -807,80 +760,35 @@ func (y *Cloud189PC) OldUpload(ctx context.Context, dstDir model.Obj, file model
 			}
 		}, &status)
 		if err != nil {
-			return nil, err
+			return err
 		}
+
 		if _, err := tempFile.Seek(status.GetSize(), io.SeekStart); err != nil {
-			return nil, err
+			return err
 		}
-		up(float64(status.GetSize()) / float64(file.GetSize()) * 100)
+		up(int(status.Size / file.GetSize()))
 	}
 
-	return y.OldUploadCommit(ctx, status.FileCommitUrl, status.UploadFileId)
+	// 提交
-}
+	var resp CommitUploadFileResp
-
+	_, err = y.post(status.FileCommitUrl, func(req *resty.Request) {
-// 创建上传会话
-func (y *Cloud189PC) OldUploadCreate(ctx context.Context, parentID string, fileMd5, fileName, fileSize string) (*CreateUploadFileResp, error) {
-	var uploadInfo CreateUploadFileResp
-
-	fullUrl := API_URL + "/createUploadFile.action"
-	if y.isFamily() {
-		fullUrl = API_URL + "/family/file/createFamilyFile.action"
-	}
-	_, err := y.post(fullUrl, func(req *resty.Request) {
-		req.SetContext(ctx)
-		if y.isFamily() {
-			req.SetQueryParams(map[string]string{
-				"familyId":     y.FamilyID,
-				"parentId":     parentID,
-				"fileMd5":      fileMd5,
-				"fileName":     fileName,
-				"fileSize":     fileSize,
-				"resumePolicy": "1",
-			})
-		} else {
-			req.SetFormData(map[string]string{
-				"parentFolderId": parentID,
-				"fileName":       fileName,
-				"size":           fileSize,
-				"md5":            fileMd5,
-				"opertype":       "3",
-				"flag":           "1",
-				"resumePolicy":   "1",
-				"isLog":          "0",
-			})
-		}
-	}, &uploadInfo)
-
-	if err != nil {
-		return nil, err
-	}
-	return &uploadInfo, nil
-}
-
-// 提交上传文件
-func (y *Cloud189PC) OldUploadCommit(ctx context.Context, fileCommitUrl string, uploadFileID int64) (model.Obj, error) {
-	var resp OldCommitUploadFileResp
-	_, err := y.post(fileCommitUrl, func(req *resty.Request) {
 		req.SetContext(ctx)
 		if y.isFamily() {
 			req.SetHeaders(map[string]string{
 				"ResumePolicy": "1",
-				"UploadFileId": fmt.Sprint(uploadFileID),
+				"UploadFileId": fmt.Sprint(status.UploadFileId),
 				"FamilyId":     fmt.Sprint(y.FamilyID),
 			})
 		} else {
 			req.SetFormData(map[string]string{
 				"opertype":     "3",
 				"resumePolicy": "1",
-				"uploadFileId": fmt.Sprint(uploadFileID),
+				"uploadFileId": fmt.Sprint(status.UploadFileId),
 				"isLog":        "0",
 			})
 		}
 	}, &resp)
-	if err != nil {
+	return err
-		return nil, err
-	}
-	return resp.toFile(), nil
 }
 
 func (y *Cloud189PC) isFamily() bool {
@@ -921,33 +829,3 @@ func (y *Cloud189PC) getFamilyID() (string, error) {
 	}
 	return fmt.Sprint(infos[0].FamilyID), nil
 }
-
-func (y *Cloud189PC) CheckBatchTask(aType string, taskID string) (*BatchTaskStateResp, error) {
-	var resp BatchTaskStateResp
-	_, err := y.post(API_URL+"/batch/checkBatchTask.action", func(req *resty.Request) {
-		req.SetFormData(map[string]string{
-			"type":   aType,
-			"taskId": taskID,
-		})
-	}, &resp)
-	if err != nil {
-		return nil, err
-	}
-	return &resp, nil
-}
-
-func (y *Cloud189PC) WaitBatchTask(aType string, taskID string, t time.Duration) error {
-	for {
-		state, err := y.CheckBatchTask(aType, taskID)
-		if err != nil {
-			return err
-		}
-		switch state.TaskStatus {
-		case 2:
-			return errors.New("there is a conflict with the target object")
-		case 4:
-			return nil
-		}
-		time.Sleep(t)
-	}
-}

drivers/alist_v3/driver.go

@@ -3,12 +3,10 @@ package alist_v3
 import (
 	"context"
 	"fmt"
-	"io"
 	"net/http"
 	"path"
 	"strconv"
 	"strings"
-	"time"
 
 	"github.com/alist-org/alist/v3/drivers/base"
 	"github.com/alist-org/alist/v3/internal/conf"
@@ -95,10 +93,8 @@ func (d *AListV3) List(ctx context.Context, dir model.Obj, args model.ListArgs)
 			Object: model.Object{
 				Name:     f.Name,
 				Modified: f.Modified,
-				Ctime:    f.Created,
 				Size:     f.Size,
 				IsFolder: f.IsDir,
-				HashInfo: utils.FromString(f.HashInfo),
 			},
 			Thumbnail: model.Thumbnail{Thumbnail: f.Thumb},
 		}
@@ -175,13 +171,13 @@ func (d *AListV3) Remove(ctx context.Context, obj model.Obj) error {
 }
 
 func (d *AListV3) Put(ctx context.Context, dstDir model.Obj, stream model.FileStreamer, up driver.UpdateProgress) error {
-	_, err := d.requestWithTimeout("/fs/put", http.MethodPut, func(req *resty.Request) {
+	_, err := d.request("/fs/put", http.MethodPut, func(req *resty.Request) {
 		req.SetHeader("File-Path", path.Join(dstDir.GetPath(), stream.GetName())).
 			SetHeader("Password", d.MetaPassword).
 			SetHeader("Content-Length", strconv.FormatInt(stream.GetSize(), 10)).
 			SetContentLength(true).
-			SetBody(io.ReadCloser(stream))
+			SetBody(stream.GetReadCloser())
-	}, time.Hour*6)
+	})
 	return err
 }
 

drivers/alist_v3/types.go

@@ -18,11 +18,9 @@ type ObjResp struct {
 	Size     int64     `json:"size"`
 	IsDir    bool      `json:"is_dir"`
 	Modified time.Time `json:"modified"`
-	Created  time.Time `json:"created"`
 	Sign     string    `json:"sign"`
 	Thumb    string    `json:"thumb"`
 	Type     int       `json:"type"`
-	HashInfo string    `json:"hashinfo"`
 }
 
 type FsListResp struct {

drivers/alist_v3/util.go

@@ -3,7 +3,6 @@ package alist_v3
 import (
 	"fmt"
 	"net/http"
-	"time"
 
 	"github.com/alist-org/alist/v3/drivers/base"
 	"github.com/alist-org/alist/v3/internal/op"
@@ -57,33 +56,3 @@ func (d *AListV3) request(api, method string, callback base.ReqCallback, retry .
 	}
 	return res.Body(), nil
 }
-
-func (d *AListV3) requestWithTimeout(api, method string, callback base.ReqCallback, timeout time.Duration, retry ...bool) ([]byte, error) {
-	url := d.Address + "/api" + api
-	client := base.NewRestyClient().SetTimeout(timeout)
-	req := client.R()
-	req.SetHeader("Authorization", d.Token)
-	if callback != nil {
-		callback(req)
-	}
-	res, err := req.Execute(method, url)
-	if err != nil {
-		return nil, err
-	}
-	log.Debugf("[alist_v3] response body: %s", res.String())
-	if res.StatusCode() >= 400 {
-		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, err
-			}
-			return d.requestWithTimeout(api, method, callback, timeout, true)
-		}
-		return nil, fmt.Errorf("request failed,code: %d, message: %s", code, utils.Json.Get(res.Body(), "message").ToString())
-	}
-	return res.Body(), nil
-}

drivers/aliyundrive/driver.go

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

drivers/aliyundrive/util.go

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

drivers/aliyundrive_open/driver.go

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

drivers/aliyundrive_open/meta.go

@@ -6,18 +6,15 @@ import (
 )
 
 type Addition struct {
-	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"`
 	OrderDirection string `json:"order_direction" type:"select" options:"ASC,DESC"`
-	OauthTokenURL      string `json:"oauth_token_url" default:"https://api.nn.ci/alist/ali_open/token"`
+	OauthTokenURL  string `json:"oauth_token_url" default:"https://api.xhofe.top/alist/ali_open/token"`
 	ClientID       string `json:"client_id" required:"false" help:"Keep it empty if you don't have one"`
 	ClientSecret   string `json:"client_secret" required:"false" help:"Keep it empty if you don't have one"`
 	RemoveWay      string `json:"remove_way" required:"true" type:"select" options:"trash,delete"`
-	RapidUpload        bool   `json:"rapid_upload" help:"If you enable this option, the file will be uploaded to the server first, so the progress will be incorrect"`
 	InternalUpload bool   `json:"internal_upload" help:"If you are using Aliyun ECS is located in Beijing, you can turn it on to boost the upload speed"`
-	LIVPDownloadFormat string `json:"livp_download_format" type:"select" options:"jpeg,mov" default:"jpeg"`
 	AccessToken    string
 }
 
@@ -36,7 +33,7 @@ var config = driver.Config{
 func init() {
 	op.RegisterDriver(func() driver.Driver {
 		return &AliyundriveOpen{
-			base: "https://openapi.alipan.com",
+			base: "https://openapi.aliyundrive.com",
 		}
 	})
 }

drivers/aliyundrive_open/types.go

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

drivers/aliyundrive_open/upload.go

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

drivers/aliyundrive_open/util.go

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

drivers/aliyundrive_share/driver.go

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

drivers/aliyundrive_share/types.go

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

drivers/aliyundrive_share/util.go

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

drivers/all.go

@@ -2,10 +2,7 @@ package drivers
 
 import (
 	_ "github.com/alist-org/alist/v3/drivers/115"
-	_ "github.com/alist-org/alist/v3/drivers/115_share"
 	_ "github.com/alist-org/alist/v3/drivers/123"
-	_ "github.com/alist-org/alist/v3/drivers/123_link"
-	_ "github.com/alist-org/alist/v3/drivers/123_share"
 	_ "github.com/alist-org/alist/v3/drivers/139"
 	_ "github.com/alist-org/alist/v3/drivers/189"
 	_ "github.com/alist-org/alist/v3/drivers/189pc"
@@ -18,26 +15,20 @@ import (
 	_ "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/dropbox"
 	_ "github.com/alist-org/alist/v3/drivers/ftp"
 	_ "github.com/alist-org/alist/v3/drivers/google_drive"
 	_ "github.com/alist-org/alist/v3/drivers/google_photo"
-	_ "github.com/alist-org/alist/v3/drivers/ilanzou"
 	_ "github.com/alist-org/alist/v3/drivers/ipfs_api"
 	_ "github.com/alist-org/alist/v3/drivers/lanzou"
 	_ "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/mopan"
 	_ "github.com/alist-org/alist/v3/drivers/onedrive"
 	_ "github.com/alist-org/alist/v3/drivers/onedrive_app"
 	_ "github.com/alist-org/alist/v3/drivers/pikpak"
 	_ "github.com/alist-org/alist/v3/drivers/pikpak_share"
 	_ "github.com/alist-org/alist/v3/drivers/quark_uc"
-	_ "github.com/alist-org/alist/v3/drivers/quqi"
 	_ "github.com/alist-org/alist/v3/drivers/s3"
 	_ "github.com/alist-org/alist/v3/drivers/seafile"
 	_ "github.com/alist-org/alist/v3/drivers/sftp"
@@ -49,9 +40,7 @@ import (
 	_ "github.com/alist-org/alist/v3/drivers/url_tree"
 	_ "github.com/alist-org/alist/v3/drivers/uss"
 	_ "github.com/alist-org/alist/v3/drivers/virtual"
-	_ "github.com/alist-org/alist/v3/drivers/vtencent"
 	_ "github.com/alist-org/alist/v3/drivers/webdav"
-	_ "github.com/alist-org/alist/v3/drivers/weiyun"
 	_ "github.com/alist-org/alist/v3/drivers/wopan"
 	_ "github.com/alist-org/alist/v3/drivers/yandex_disk"
 )

drivers/baidu_netdisk/driver.go

@@ -1,33 +1,28 @@
 package baidu_netdisk
 
 import (
+	"bytes"
 	"context"
 	"crypto/md5"
 	"encoding/hex"
-	"errors"
+	"fmt"
 	"io"
 	"math"
-	"net/url"
+	"os"
 	stdpath "path"
 	"strconv"
-	"time"
+	"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/errgroup"
 	"github.com/alist-org/alist/v3/pkg/utils"
-	"github.com/avast/retry-go"
 	log "github.com/sirupsen/logrus"
 )
 
 type BaiduNetdisk struct {
 	model.Storage
 	Addition
-
-	uploadThread int
-	vipType      int // 会员类型，0普通用户(4G/4M)、1普通会员(10G/16M)、2超级会员(20G/32M)
 }
 
 func (d *BaiduNetdisk) Config() driver.Config {
@@ -39,25 +34,12 @@ func (d *BaiduNetdisk) GetAddition() driver.Additional {
 }
 
 func (d *BaiduNetdisk) Init(ctx context.Context) error {
-	d.uploadThread, _ = strconv.Atoi(d.UploadThread)
-	if d.uploadThread < 1 || d.uploadThread > 32 {
-		d.uploadThread, d.UploadThread = 3, "3"
-	}
-
-	if _, err := url.Parse(d.UploadAPI); d.UploadAPI == "" || err != nil {
-		d.UploadAPI = "https://d.pcs.baidu.com"
-	}
-
 	res, err := d.get("/xpan/nas", map[string]string{
 		"method": "uinfo",
 	}, nil)
 	log.Debugf("[baidu] get uinfo: %s", string(res))
-	if err != nil {
 	return err
 }
-	d.vipType = utils.Json.Get(res, "vip_type").ToInt()
-	return nil
-}
 
 func (d *BaiduNetdisk) Drop(ctx context.Context) error {
 	return nil
@@ -80,16 +62,12 @@ func (d *BaiduNetdisk) Link(ctx context.Context, file model.Obj, args model.Link
 	return d.linkOfficial(file, args)
 }
 
-func (d *BaiduNetdisk) MakeDir(ctx context.Context, parentDir model.Obj, dirName string) (model.Obj, error) {
+func (d *BaiduNetdisk) MakeDir(ctx context.Context, parentDir model.Obj, dirName string) error {
-	var newDir File
+	_, err := d.create(stdpath.Join(parentDir.GetPath(), dirName), 0, 1, "", "")
-	_, err := d.create(stdpath.Join(parentDir.GetPath(), dirName), 0, 1, "", "", &newDir, 0, 0)
+	return err
-	if err != nil {
-		return nil, err
-	}
-	return fileToObj(newDir), nil
 }
 
-func (d *BaiduNetdisk) Move(ctx context.Context, srcObj, dstDir model.Obj) (model.Obj, error) {
+func (d *BaiduNetdisk) Move(ctx context.Context, srcObj, dstDir model.Obj) error {
 	data := []base.Json{
 		{
 			"path":    srcObj.GetPath(),
@@ -98,18 +76,10 @@ func (d *BaiduNetdisk) Move(ctx context.Context, srcObj, dstDir model.Obj) (mode
 		},
 	}
 	_, err := d.manage("move", data)
-	if err != nil {
+	return err
-		return nil, err
-	}
-	if srcObj, ok := srcObj.(*model.ObjThumb); ok {
-		srcObj.SetPath(stdpath.Join(dstDir.GetPath(), srcObj.GetName()))
-		srcObj.Modified = time.Now()
-		return srcObj, nil
-	}
-	return nil, nil
 }
 
-func (d *BaiduNetdisk) Rename(ctx context.Context, srcObj model.Obj, newName string) (model.Obj, error) {
+func (d *BaiduNetdisk) Rename(ctx context.Context, srcObj model.Obj, newName string) error {
 	data := []base.Json{
 		{
 			"path":    srcObj.GetPath(),
@@ -117,17 +87,7 @@ func (d *BaiduNetdisk) Rename(ctx context.Context, srcObj model.Obj, newName str
 		},
 	}
 	_, err := d.manage("rename", data)
-	if err != nil {
+	return err
-		return nil, err
-	}
-
-	if srcObj, ok := srcObj.(*model.ObjThumb); ok {
-		srcObj.SetPath(stdpath.Join(stdpath.Dir(srcObj.GetPath()), newName))
-		srcObj.Name = newName
-		srcObj.Modified = time.Now()
-		return srcObj, nil
-	}
-	return nil, nil
 }
 
 func (d *BaiduNetdisk) Copy(ctx context.Context, srcObj, dstDir model.Obj) error {
@@ -148,175 +108,126 @@ func (d *BaiduNetdisk) Remove(ctx context.Context, obj model.Obj) error {
 	return err
 }
 
-func (d *BaiduNetdisk) PutRapid(ctx context.Context, dstDir model.Obj, stream model.FileStreamer) (model.Obj, error) {
+func (d *BaiduNetdisk) Put(ctx context.Context, dstDir model.Obj, stream model.FileStreamer, up driver.UpdateProgress) error {
-	contentMd5 := stream.GetHash().GetHash(utils.MD5)
+	tempFile, err := utils.CreateTempFile(stream.GetReadCloser())
-	if len(contentMd5) < utils.MD5.Width {
-		return nil, errors.New("invalid hash")
-	}
-
-	streamSize := stream.GetSize()
-	path := stdpath.Join(dstDir.GetPath(), stream.GetName())
-	mtime := stream.ModTime().Unix()
-	ctime := stream.CreateTime().Unix()
-	blockList, _ := utils.Json.MarshalToString([]string{contentMd5})
-
-	var newFile File
-	_, err := d.create(path, streamSize, 0, "", blockList, &newFile, mtime, ctime)
 	if err != nil {
-		return nil, err
+		return err
 	}
-	return fileToObj(newFile), nil
+	defer func() {
-}
+		_ = tempFile.Close()
-
+		_ = os.Remove(tempFile.Name())
-func (d *BaiduNetdisk) Put(ctx context.Context, dstDir model.Obj, stream model.FileStreamer, up driver.UpdateProgress) (model.Obj, error) {
+	}()
-	// rapid upload
+	var Default int64 = 4 * 1024 * 1024
-	if newObj, err := d.PutRapid(ctx, dstDir, stream); err == nil {
+	defaultByteData := make([]byte, Default)
-		return newObj, nil
+	count := int(math.Ceil(float64(stream.GetSize()) / float64(Default)))
-	}
+	var SliceSize int64 = 256 * 1024
-
-	tempFile, err := stream.CacheFullInTempFile()
-	if err != nil {
-		return nil, err
-	}
-
-	streamSize := stream.GetSize()
-	sliceSize := d.getSliceSize()
-	count := int(math.Max(math.Ceil(float64(streamSize)/float64(sliceSize)), 1))
-	lastBlockSize := streamSize % sliceSize
-	if streamSize > 0 && lastBlockSize == 0 {
-		lastBlockSize = sliceSize
-	}
-
-	//cal md5 for first 256k data
-	const SliceSize int64 = 256 * 1024
 	// cal md5
-	blockList := make([]string, 0, count)
+	h1 := md5.New()
-	byteSize := sliceSize
+	h2 := md5.New()
-	fileMd5H := md5.New()
+	block_list := make([]string, 0)
-	sliceMd5H := md5.New()
+	content_md5 := ""
-	sliceMd5H2 := md5.New()
+	slice_md5 := ""
-	slicemd5H2Write := utils.LimitWriter(sliceMd5H2, SliceSize)
+	left := stream.GetSize()
-
+	for i := 0; i < count; i++ {
-	for i := 1; i <= count; i++ {
+		byteSize := Default
-		if utils.IsCanceled(ctx) {
+		var byteData []byte
-			return nil, ctx.Err()
+		if left < Default {
+			byteSize = left
+			byteData = make([]byte, byteSize)
+		} else {
+			byteData = defaultByteData
 		}
-		if i == count {
+		left -= byteSize
-			byteSize = lastBlockSize
+		_, err = io.ReadFull(tempFile, byteData)
+		if err != nil {
+			return err
 		}
-		_, err := io.CopyN(io.MultiWriter(fileMd5H, sliceMd5H, slicemd5H2Write), tempFile, byteSize)
+		h1.Write(byteData)
-		if err != nil && err != io.EOF {
+		h2.Write(byteData)
-			return nil, err
+		block_list = append(block_list, fmt.Sprintf("\"%s\"", hex.EncodeToString(h2.Sum(nil))))
+		h2.Reset()
 	}
-		blockList = append(blockList, hex.EncodeToString(sliceMd5H.Sum(nil)))
+	content_md5 = hex.EncodeToString(h1.Sum(nil))
-		sliceMd5H.Reset()
+	_, err = tempFile.Seek(0, io.SeekStart)
+	if err != nil {
+		return err
 	}
-	contentMd5 := hex.EncodeToString(fileMd5H.Sum(nil))
+	if stream.GetSize() <= SliceSize {
-	sliceMd5 := hex.EncodeToString(sliceMd5H2.Sum(nil))
+		slice_md5 = content_md5
-	blockListStr, _ := utils.Json.MarshalToString(blockList)
+	} else {
-	path := stdpath.Join(dstDir.GetPath(), stream.GetName())
+		sliceData := make([]byte, SliceSize)
-	mtime := stream.ModTime().Unix()
+		_, err = io.ReadFull(tempFile, sliceData)
-	ctime := stream.CreateTime().Unix()
+		if err != nil {
-
+			return err
-	// step.1 预上传
+		}
-	// 尝试获取之前的进度
+		h2.Write(sliceData)
-	precreateResp, ok := base.GetUploadProgress[*PrecreateResp](d, d.AccessToken, contentMd5)
+		slice_md5 = hex.EncodeToString(h2.Sum(nil))
-	if !ok {
+		_, err = tempFile.Seek(0, io.SeekStart)
+		if err != nil {
+			return err
+		}
+	}
+	rawPath := stdpath.Join(dstDir.GetPath(), stream.GetName())
+	path := encodeURIComponent(rawPath)
+	block_list_str := fmt.Sprintf("[%s]", strings.Join(block_list, ","))
+	data := fmt.Sprintf("path=%s&size=%d&isdir=0&autoinit=1&block_list=%s&content-md5=%s&slice-md5=%s",
+		path, stream.GetSize(),
+		block_list_str,
+		content_md5, slice_md5)
 	params := map[string]string{
 		"method": "precreate",
 	}
-		form := map[string]string{
+	var precreateResp PrecreateResp
-			"path":        path,
+	_, err = d.post("/xpan/file", params, data, &precreateResp)
-			"size":        strconv.FormatInt(streamSize, 10),
-			"isdir":       "0",
-			"autoinit":    "1",
-			"rtype":       "3",
-			"block_list":  blockListStr,
-			"content-md5": contentMd5,
-			"slice-md5":   sliceMd5,
-		}
-		joinTime(form, ctime, mtime)
-
-		log.Debugf("[baidu_netdisk] precreate data: %s", form)
-		_, err = d.postForm("/xpan/file", params, form, &precreateResp)
 	if err != nil {
-			return nil, err
+		return err
 	}
 	log.Debugf("%+v", precreateResp)
 	if precreateResp.ReturnType == 2 {
-			//rapid upload, since got md5 match from baidu server
+		return nil
-			if err != nil {
-				return nil, err
 	}
-			return fileToObj(precreateResp.File), nil
+	params = map[string]string{
-		}
-	}
-	// step.2 上传分片
-	threadG, upCtx := errgroup.NewGroupWithContext(ctx, d.uploadThread,
-		retry.Attempts(3),
-		retry.Delay(time.Second),
-		retry.DelayType(retry.BackOffDelay))
-	for i, partseq := range precreateResp.BlockList {
-		if utils.IsCanceled(upCtx) {
-			break
-		}
-
-		i, partseq, offset, byteSize := i, partseq, int64(partseq)*sliceSize, sliceSize
-		if partseq+1 == count {
-			byteSize = lastBlockSize
-		}
-		threadG.Go(func(ctx context.Context) error {
-			params := map[string]string{
 		"method":       "upload",
 		"access_token": d.AccessToken,
 		"type":         "tmpfile",
 		"path":         path,
 		"uploadid":     precreateResp.Uploadid,
-				"partseq":      strconv.Itoa(partseq),
 	}
-			err := d.uploadSlice(ctx, params, stream.GetName(), io.NewSectionReader(tempFile, offset, byteSize))
+	left = stream.GetSize()
+	for i, partseq := range precreateResp.BlockList {
+		if utils.IsCanceled(ctx) {
+			return ctx.Err()
+		}
+		byteSize := Default
+		var byteData []byte
+		if left < Default {
+			byteSize = left
+			byteData = make([]byte, byteSize)
+		} else {
+			byteData = defaultByteData
+		}
+		left -= byteSize
+		_, err = io.ReadFull(tempFile, byteData)
 		if err != nil {
 			return err
 		}
-			up(float64(threadG.Success()) * 100 / float64(len(precreateResp.BlockList)))
+		u := "https://d.pcs.baidu.com/rest/2.0/pcs/superfile2"
-			precreateResp.BlockList[i] = -1
+		params["partseq"] = strconv.Itoa(partseq)
-			return nil
-		})
-	}
-	if err = threadG.Wait(); err != nil {
-		// 如果属于用户主动取消，则保存上传进度
-		if errors.Is(err, context.Canceled) {
-			precreateResp.BlockList = utils.SliceFilter(precreateResp.BlockList, func(s int) bool { return s >= 0 })
-			base.SaveUploadProgress(d, precreateResp, d.AccessToken, contentMd5)
-		}
-		return nil, err
-	}
-
-	// step.3 创建文件
-	var newFile File
-	_, err = d.create(path, streamSize, 0, precreateResp.Uploadid, blockListStr, &newFile, mtime, ctime)
-	if err != nil {
-		return nil, err
-	}
-	return fileToObj(newFile), nil
-}
-
-func (d *BaiduNetdisk) uploadSlice(ctx context.Context, params map[string]string, fileName string, file io.Reader) error {
 		res, err := base.RestyClient.R().
 			SetContext(ctx).
 			SetQueryParams(params).
-		SetFileReader("file", fileName, file).
+			SetFileReader("file", stream.GetName(), bytes.NewReader(byteData)).
-		Post(d.UploadAPI + "/rest/2.0/pcs/superfile2")
+			Post(u)
 		if err != nil {
 			return err
 		}
-	log.Debugln(res.RawResponse.Status + res.String())
+		log.Debugln(res.String())
-	errCode := utils.Json.Get(res.Body(), "error_code").ToInt()
+		if len(precreateResp.BlockList) > 0 {
-	errNo := utils.Json.Get(res.Body(), "errno").ToInt()
+			up(i * 100 / len(precreateResp.BlockList))
-	if errCode != 0 || errNo != 0 {
-		return errs.NewErr(errs.StreamIncomplete, "error in uploading to baidu, will retry. response=%s", res.String())
 		}
-	return nil
+	}
+	_, err = d.create(rawPath, stream.GetSize(), 0, precreateResp.Uploadid, block_list_str)
+	return err
 }
 
 var _ driver.Driver = (*BaiduNetdisk)(nil)

drivers/baidu_netdisk/meta.go

@@ -15,8 +15,6 @@ type Addition struct {
 	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"`
 }
 
 var config = driver.Config{

drivers/baidu_netdisk/types.go

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

drivers/baidu_netdisk/util.go

@@ -1,27 +1,25 @@
 package baidu_netdisk
 
 import (
-	"errors"
 	"fmt"
 	"net/http"
+	"net/url"
 	"strconv"
-	"time"
+	"strings"
 
 	"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/avast/retry-go"
 	"github.com/go-resty/resty/v2"
-	log "github.com/sirupsen/logrus"
 )
 
 // do others that not defined in Driver interface
 
 func (d *BaiduNetdisk) refreshToken() error {
 	err := d._refreshToken()
-	if err != nil && errors.Is(err, errs.EmptyToken) {
+	if err != nil && err == errs.EmptyToken {
 		err = d._refreshToken()
 	}
 	return err
@@ -52,8 +50,6 @@ func (d *BaiduNetdisk) _refreshToken() error {
 }
 
 func (d *BaiduNetdisk) request(furl string, method string, callback base.ReqCallback, resp interface{}) ([]byte, error) {
-	var result []byte
-	err := retry.Do(func() error {
 	req := base.RestyClient.R()
 	req.SetQueryParam("access_token", d.AccessToken)
 	if callback != nil {
@@ -64,28 +60,20 @@ func (d *BaiduNetdisk) request(furl string, method string, callback base.ReqCall
 	}
 	res, err := req.Execute(method, furl)
 	if err != nil {
-			return err
+		return nil, err
 	}
-		log.Debugf("[baidu_netdisk] req: %s, resp: %s", furl, res.String())
 	errno := utils.Json.Get(res.Body(), "errno").ToInt()
 	if errno != 0 {
-			if utils.SliceContains([]int{111, -6}, errno) {
+		if errno == -6 {
-				log.Info("refreshing baidu_netdisk token.")
+			err = d.refreshToken()
-				err2 := d.refreshToken()
+			if err != nil {
-				if err2 != nil {
+				return nil, err
-					return retry.Unrecoverable(err2)
 			}
+			return d.request(furl, method, callback, resp)
 		}
-			return fmt.Errorf("req: [%s] ,errno: %d, refer to https://pan.baidu.com/union/doc/", furl, errno)
+		return nil, fmt.Errorf("errno: %d, refer to https://pan.baidu.com/union/doc/", errno)
 	}
-		result = res.Body()
+	return res.Body(), nil
-		return nil
-	},
-		retry.LastErrorOnly(true),
-		retry.Attempts(3),
-		retry.Delay(time.Second),
-		retry.DelayType(retry.BackOffDelay))
-	return result, err
 }
 
 func (d *BaiduNetdisk) get(pathname string, params map[string]string, resp interface{}) ([]byte, error) {
@@ -94,10 +82,10 @@ func (d *BaiduNetdisk) get(pathname string, params map[string]string, resp inter
 	}, resp)
 }
 
-func (d *BaiduNetdisk) postForm(pathname string, params map[string]string, form map[string]string, resp interface{}) ([]byte, error) {
+func (d *BaiduNetdisk) post(pathname string, params map[string]string, data interface{}, resp interface{}) ([]byte, error) {
 	return d.request("https://pan.baidu.com/rest/2.0"+pathname, http.MethodPost, func(req *resty.Request) {
 		req.SetQueryParams(params)
-		req.SetFormData(form)
+		req.SetBody(data)
 	}, resp)
 }
 
@@ -152,9 +140,6 @@ func (d *BaiduNetdisk) linkOfficial(file model.Obj, args model.LinkArgs) (*model
 	//if res.StatusCode() == 302 {
 	u = res.Header().Get("location")
 	//}
-
-	updateObjMd5(file, "pan.baidu.com", u)
-
 	return &model.Link{
 		URL: u,
 		Header: http.Header{
@@ -177,9 +162,6 @@ func (d *BaiduNetdisk) linkCrack(file model.Obj, args model.LinkArgs) (*model.Li
 	if err != nil {
 		return nil, err
 	}
-
-	updateObjMd5(file, d.CustomCrackUA, resp.Info[0].Dlink)
-
 	return &model.Link{
 		URL: resp.Info[0].Dlink,
 		Header: http.Header{
@@ -188,79 +170,32 @@ func (d *BaiduNetdisk) linkCrack(file model.Obj, args model.LinkArgs) (*model.Li
 	}, nil
 }
 
-func (d *BaiduNetdisk) manage(opera string, filelist any) ([]byte, error) {
+func (d *BaiduNetdisk) manage(opera string, filelist interface{}) ([]byte, error) {
 	params := map[string]string{
 		"method": "filemanager",
 		"opera":  opera,
 	}
-	marshal, _ := utils.Json.MarshalToString(filelist)
+	marshal, err := utils.Json.Marshal(filelist)
-	return d.postForm("/xpan/file", params, map[string]string{
+	if err != nil {
-		"async":    "0",
+		return nil, err
-		"filelist": marshal,
+	}
-		"ondup":    "fail",
+	data := fmt.Sprintf("async=0&filelist=%s&ondup=newcopy", string(marshal))
-	}, nil)
+	return d.post("/xpan/file", params, data, nil)
 }
 
-func (d *BaiduNetdisk) create(path string, size int64, isdir int, uploadid, block_list string, resp any, mtime, ctime int64) ([]byte, error) {
+func (d *BaiduNetdisk) create(path string, size int64, isdir int, uploadid, block_list string) ([]byte, error) {
 	params := map[string]string{
 		"method": "create",
 	}
-	form := map[string]string{
+	data := fmt.Sprintf("path=%s&size=%d&isdir=%d&rtype=3", encodeURIComponent(path), size, isdir)
-		"path":  path,
-		"size":  strconv.FormatInt(size, 10),
-		"isdir": strconv.Itoa(isdir),
-		"rtype": "3",
-	}
-	if mtime != 0 && ctime != 0 {
-		joinTime(form, ctime, mtime)
-	}
-
 	if uploadid != "" {
-		form["uploadid"] = uploadid
+		data += fmt.Sprintf("&uploadid=%s&block_list=%s", uploadid, block_list)
 	}
-	if block_list != "" {
+	return d.post("/xpan/file", params, data, nil)
-		form["block_list"] = block_list
-	}
-	return d.postForm("/xpan/file", params, form, resp)
 }
 
-func joinTime(form map[string]string, ctime, mtime int64) {
+func encodeURIComponent(str string) string {
-	form["local_mtime"] = strconv.FormatInt(mtime, 10)
+	r := url.QueryEscape(str)
-	form["local_ctime"] = strconv.FormatInt(ctime, 10)
+	r = strings.ReplaceAll(r, "+", "%20")
+	return r
 }
-
-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           = 16 * utils.MB
-	SVipSliceSize          = 32 * utils.MB
-)
-
-func (d *BaiduNetdisk) getSliceSize() int64 {
-	switch d.vipType {
-	case 1:
-		return VipSliceSize
-	case 2:
-		return SVipSliceSize
-	default:
-		return DefaultSliceSize
-	}
-}
-
-// func encodeURIComponent(str string) string {
-// 	r := url.QueryEscape(str)
-// 	r = strings.ReplaceAll(r, "+", "%20")
-// 	return r
-// }

drivers/baidu_photo/driver.go

@@ -4,22 +4,18 @@ import (
 	"context"
 	"crypto/md5"
 	"encoding/hex"
-	"errors"
 	"fmt"
 	"io"
 	"math"
+	"os"
 	"regexp"
 	"strconv"
 	"strings"
-	"time"
 
-	"github.com/alist-org/alist/v3/drivers/base"
 	"github.com/alist-org/alist/v3/internal/driver"
 	"github.com/alist-org/alist/v3/internal/errs"
 	"github.com/alist-org/alist/v3/internal/model"
-	"github.com/alist-org/alist/v3/pkg/errgroup"
 	"github.com/alist-org/alist/v3/pkg/utils"
-	"github.com/avast/retry-go"
 	"github.com/go-resty/resty/v2"
 )
 
@@ -30,8 +26,6 @@ type BaiduPhoto struct {
 	AccessToken string
 	Uk          int64
 	root        model.Obj
-
-	uploadThread int
 }
 
 func (d *BaiduPhoto) Config() driver.Config {
@@ -43,11 +37,6 @@ func (d *BaiduPhoto) GetAddition() driver.Additional {
 }
 
 func (d *BaiduPhoto) Init(ctx context.Context) error {
-	d.uploadThread, _ = strconv.Atoi(d.UploadThread)
-	if d.uploadThread < 1 || d.uploadThread > 32 {
-		d.uploadThread, d.UploadThread = 3, "3"
-	}
-
 	if err := d.refreshToken(); err != nil {
 		return err
 	}
@@ -137,13 +126,7 @@ func (d *BaiduPhoto) Link(ctx context.Context, file model.Obj, args model.LinkAr
 	case *File:
 		return d.linkFile(ctx, file, args)
 	case *AlbumFile:
-		f, err := d.CopyAlbumFile(ctx, file)
+		return d.linkAlbum(ctx, file, args)
-		if err != nil {
-			return nil, err
-		}
-		return d.linkFile(ctx, f, args)
-		// 有概率无法获取到链接
-		//return d.linkAlbum(ctx, file, args)
 	}
 	return nil, errs.NotFile
 }
@@ -186,9 +169,9 @@ func (d *BaiduPhoto) Copy(ctx context.Context, srcObj, dstDir model.Obj) (model.
 }
 
 func (d *BaiduPhoto) Move(ctx context.Context, srcObj, dstDir model.Obj) (model.Obj, error) {
+	// 仅支持相册之间移动
 	if file, ok := srcObj.(*AlbumFile); ok {
-		switch dstDir.(type) {
+		if _, ok := dstDir.(*Album); ok {
-		case *Album, *Root: // albumfile -> root -> album or albumfile -> root
 			newObj, err := d.Copy(ctx, srcObj, dstDir)
 			if err != nil {
 				return nil, err
@@ -222,57 +205,45 @@ func (d *BaiduPhoto) Remove(ctx context.Context, obj model.Obj) error {
 }
 
 func (d *BaiduPhoto) Put(ctx context.Context, dstDir model.Obj, stream model.FileStreamer, up driver.UpdateProgress) (model.Obj, error) {
-	// 不支持大小为0的文件
-	if stream.GetSize() == 0 {
-		return nil, fmt.Errorf("file size cannot be zero")
-	}
-
-	// TODO:
-	// 暂时没有找到妙传方式
-
 	// 需要获取完整文件md5,必须支持 io.Seek
-	tempFile, err := stream.CacheFullInTempFile()
+	tempFile, err := utils.CreateTempFile(stream.GetReadCloser())
 	if err != nil {
 		return nil, err
 	}
-
+	defer func() {
-	const DEFAULT int64 = 1 << 22
+		_ = tempFile.Close()
-	const SliceSize int64 = 1 << 18
+		_ = os.Remove(tempFile.Name())
+	}()
 
 	// 计算需要的数据
-	streamSize := stream.GetSize()
+	const DEFAULT = 1 << 22
-	count := int(math.Ceil(float64(streamSize) / float64(DEFAULT)))
+	const SliceSize = 1 << 18
-	lastBlockSize := streamSize % DEFAULT
+	count := int(math.Ceil(float64(stream.GetSize()) / float64(DEFAULT)))
-	if lastBlockSize == 0 {
-		lastBlockSize = DEFAULT
-	}
 
-	// step.1 计算MD5
 	sliceMD5List := make([]string, 0, count)
-	byteSize := int64(DEFAULT)
+	fileMd5 := md5.New()
-	fileMd5H := md5.New()
+	sliceMd5 := md5.New()
-	sliceMd5H := md5.New()
+	sliceMd52 := md5.New()
-	sliceMd5H2 := md5.New()
+	slicemd52Write := utils.LimitWriter(sliceMd52, SliceSize)
-	slicemd5H2Write := utils.LimitWriter(sliceMd5H2, SliceSize)
 	for i := 1; i <= count; i++ {
 		if utils.IsCanceled(ctx) {
 			return nil, ctx.Err()
 		}
-		if i == count {
+
-			byteSize = lastBlockSize
+		_, err := io.CopyN(io.MultiWriter(fileMd5, sliceMd5, slicemd52Write), tempFile, DEFAULT)
-		}
+		if err != nil && err != io.EOF && err != io.ErrUnexpectedEOF {
-		_, err := io.CopyN(io.MultiWriter(fileMd5H, sliceMd5H, slicemd5H2Write), tempFile, byteSize)
-		if err != nil && err != io.EOF {
 			return nil, err
 		}
-		sliceMD5List = append(sliceMD5List, hex.EncodeToString(sliceMd5H.Sum(nil)))
+		sliceMD5List = append(sliceMD5List, hex.EncodeToString(sliceMd5.Sum(nil)))
-		sliceMd5H.Reset()
+		sliceMd5.Reset()
 	}
-	contentMd5 := hex.EncodeToString(fileMd5H.Sum(nil))
+	if _, err = tempFile.Seek(0, io.SeekStart); err != nil {
-	sliceMd5 := hex.EncodeToString(sliceMd5H2.Sum(nil))
+		return nil, err
-	blockListStr, _ := utils.Json.MarshalToString(sliceMD5List)
+	}
+	content_md5 := hex.EncodeToString(fileMd5.Sum(nil))
+	slice_md5 := hex.EncodeToString(sliceMd52.Sum(nil))
 
-	// step.2 预上传
+	// 开始执行上传
 	params := map[string]string{
 		"autoinit":    "1",
 		"isdir":       "0",
@@ -280,14 +251,13 @@ func (d *BaiduPhoto) Put(ctx context.Context, dstDir model.Obj, stream model.Fil
 		"ctype":       "11",
 		"path":        fmt.Sprintf("/%s", stream.GetName()),
 		"size":        fmt.Sprint(stream.GetSize()),
-		"slice-md5":   sliceMd5,
+		"slice-md5":   slice_md5,
-		"content-md5": contentMd5,
+		"content-md5": content_md5,
-		"block_list":  blockListStr,
+		"block_list":  MustString(utils.Json.MarshalToString(sliceMD5List)),
 	}
 
-	// 尝试获取之前的进度
+	// 预上传
-	precreateResp, ok := base.GetUploadProgress[*PrecreateResp](d, d.AccessToken, contentMd5)
+	var precreateResp PrecreateResp
-	if !ok {
 	_, err = d.Post(FILE_API_URL_V1+"/precreate", func(r *resty.Request) {
 		r.SetContext(ctx)
 		r.SetFormData(params)
@@ -295,54 +265,32 @@ func (d *BaiduPhoto) Put(ctx context.Context, dstDir model.Obj, stream model.Fil
 	if err != nil {
 		return nil, err
 	}
-	}
 
 	switch precreateResp.ReturnType {
-	case 1: //step.3 上传文件切片
+	case 1: // 上传文件
-		threadG, upCtx := errgroup.NewGroupWithContext(ctx, d.uploadThread,
-			retry.Attempts(3),
-			retry.Delay(time.Second),
-			retry.DelayType(retry.BackOffDelay))
-		for i, partseq := range precreateResp.BlockList {
-			if utils.IsCanceled(upCtx) {
-				break
-			}
-
-			i, partseq, offset, byteSize := i, partseq, int64(partseq)*DEFAULT, DEFAULT
-			if partseq+1 == count {
-				byteSize = lastBlockSize
-			}
-
-			threadG.Go(func(ctx context.Context) error {
 		uploadParams := map[string]string{
 			"method":   "upload",
 			"path":     params["path"],
-					"partseq":  fmt.Sprint(partseq),
 			"uploadid": precreateResp.UploadID,
 		}
 
+		for i := 0; i < count; i++ {
+			if utils.IsCanceled(ctx) {
+				return nil, ctx.Err()
+			}
+			uploadParams["partseq"] = fmt.Sprint(i)
 			_, err = d.Post("https://c3.pcs.baidu.com/rest/2.0/pcs/superfile2", func(r *resty.Request) {
 				r.SetContext(ctx)
 				r.SetQueryParams(uploadParams)
-					r.SetFileReader("file", stream.GetName(), io.NewSectionReader(tempFile, offset, byteSize))
+				r.SetFileReader("file", stream.GetName(), io.LimitReader(tempFile, DEFAULT))
 			}, nil)
 			if err != nil {
-					return err
-				}
-				up(float64(threadG.Success()) * 100 / float64(len(precreateResp.BlockList)))
-				precreateResp.BlockList[i] = -1
-				return nil
-			})
-		}
-		if err = threadG.Wait(); err != nil {
-			if errors.Is(err, context.Canceled) {
-				precreateResp.BlockList = utils.SliceFilter(precreateResp.BlockList, func(s int) bool { return s >= 0 })
-				base.SaveUploadProgress(d, precreateResp, d.AccessToken, contentMd5)
-			}
 				return nil, err
 			}
+			up(i * 100 / count)
+		}
 		fallthrough
-	case 2: //step.4 创建文件
+	case 2: // 创建文件
 		params["uploadid"] = precreateResp.UploadID
 		_, err = d.Post(FILE_API_URL_V1+"/create", func(r *resty.Request) {
 			r.SetContext(ctx)
@@ -352,7 +300,7 @@ func (d *BaiduPhoto) Put(ctx context.Context, dstDir model.Obj, stream model.Fil
 			return nil, err
 		}
 		fallthrough
-	case 3: //step.5 增加到相册
+	case 3: // 增加到相册
 		rootfile := precreateResp.Data.toFile()
 		if album, ok := dstDir.(*Album); ok {
 			return d.AddAlbumFile(ctx, album, rootfile)

drivers/baidu_photo/help.go

@@ -64,15 +64,8 @@ func renameAlbum(album *Album, newName string) *Album {
 		AlbumID:    album.AlbumID,
 		Tid:        album.Tid,
 		JoinTime:   album.JoinTime,
-		CreationTime: album.CreationTime,
+		CreateTime: album.CreateTime,
 		Title:      newName,
 		Mtime:      time.Now().Unix(),
 	}
 }
-
-func BoolToIntStr(b bool) string {
-	if b {
-		return "1"
-	}
-	return "0"
-}

drivers/baidu_photo/meta.go

@@ -10,10 +10,8 @@ type Addition struct {
 	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"`
-	UploadThread string `json:"upload_thread" default:"3" help:"1<=thread<=32"`
 }
 
 var config = driver.Config{

drivers/baidu_photo/types.go

@@ -4,8 +4,6 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/alist-org/alist/v3/pkg/utils"
-
 	"github.com/alist-org/alist/v3/internal/model"
 )
 
@@ -53,14 +51,19 @@ type (
 		Ctime    int64    `json:"ctime"` // 创建时间 s
 		Mtime    int64    `json:"mtime"` // 修改时间 s
 		Thumburl []string `json:"thumburl"`
-		Md5      string   `json:"md5"`
+
+		parseTime *time.Time
 	}
 )
 
 func (c *File) GetSize() int64  { return c.Size }
 func (c *File) GetName() string { return getFileName(c.Path) }
-func (c *File) CreateTime() time.Time { return time.Unix(c.Ctime, 0) }
+func (c *File) ModTime() time.Time {
-func (c *File) ModTime() time.Time    { return time.Unix(c.Mtime, 0) }
+	if c.parseTime == nil {
+		c.parseTime = toTime(c.Mtime)
+	}
+	return *c.parseTime
+}
 func (c *File) IsDir() bool     { return false }
 func (c *File) GetID() string   { return "" }
 func (c *File) GetPath() string { return "" }
@@ -71,10 +74,6 @@ func (c *File) Thumb() string {
 	return ""
 }
 
-func (c *File) GetHash() utils.HashInfo {
-	return utils.NewHashInfo(utils.MD5, c.Md5)
-}
-
 /*相册部分*/
 type (
 	AlbumListResp struct {
@@ -89,7 +88,7 @@ type (
 		Tid        int64  `json:"tid"`
 		Title      string `json:"title"`
 		JoinTime   int64  `json:"join_time"`
-		CreationTime int64  `json:"create_time"`
+		CreateTime int64  `json:"create_time"`
 		Mtime      int64  `json:"mtime"`
 
 		parseTime *time.Time
@@ -110,14 +109,14 @@ type (
 	}
 )
 
-func (a *Album) GetHash() utils.HashInfo {
-	return utils.HashInfo{}
-}
-
 func (a *Album) GetSize() int64  { return 0 }
 func (a *Album) GetName() string { return a.Title }
-func (a *Album) CreateTime() time.Time { return time.Unix(a.CreationTime, 0) }
+func (a *Album) ModTime() time.Time {
-func (a *Album) ModTime() time.Time    { return time.Unix(a.Mtime, 0) }
+	if a.parseTime == nil {
+		a.parseTime = toTime(a.Mtime)
+	}
+	return *a.parseTime
+}
 func (a *Album) IsDir() bool     { return true }
 func (a *Album) GetID() string   { return "" }
 func (a *Album) GetPath() string { return "" }
@@ -163,7 +162,7 @@ type (
 		//不存在返回
 		Path      string  `json:"path"`
 		UploadID  string  `json:"uploadid"`
-		BlockList []int  `json:"block_list"`
+		Blocklist []int64 `json:"block_list"`
 	}
 )
 

drivers/baidu_photo/utils.go

@@ -21,7 +21,7 @@ const (
 	FILE_API_URL_V2 = API_URL + "/file/v2"
 )
 
-func (d *BaiduPhoto) Request(furl string, method string, callback base.ReqCallback, resp interface{}) (*resty.Response, error) {
+func (d *BaiduPhoto) Request(furl string, method string, callback base.ReqCallback, resp interface{}) ([]byte, error) {
 	req := base.RestyClient.R().
 		SetQueryParam("access_token", d.AccessToken)
 	if callback != nil {
@@ -52,17 +52,9 @@ func (d *BaiduPhoto) Request(furl string, method string, callback base.ReqCallba
 	default:
 		return nil, fmt.Errorf("errno: %d, refer to https://photo.baidu.com/union/doc", erron)
 	}
-	return res, nil
+	return res.Body(), nil
 }
 
-//func (d *BaiduPhoto) Request(furl string, method string, callback base.ReqCallback, resp interface{}) ([]byte, error) {
-//	res, err := d.request(furl, method, callback, resp)
-//	if err != nil {
-//		return nil, err
-//	}
-//	return res.Body(), nil
-//}
-
 func (d *BaiduPhoto) refreshToken() error {
 	u := "https://openapi.baidu.com/oauth/2.0/token"
 	var resp base.TokenResp
@@ -87,11 +79,11 @@ func (d *BaiduPhoto) refreshToken() error {
 	return nil
 }
 
-func (d *BaiduPhoto) Get(furl string, callback base.ReqCallback, resp interface{}) (*resty.Response, error) {
+func (d *BaiduPhoto) Get(furl string, callback base.ReqCallback, resp interface{}) ([]byte, error) {
 	return d.Request(furl, http.MethodGet, callback, resp)
 }
 
-func (d *BaiduPhoto) Post(furl string, callback base.ReqCallback, resp interface{}) (*resty.Response, error) {
+func (d *BaiduPhoto) Post(furl string, callback base.ReqCallback, resp interface{}) ([]byte, error) {
 	return d.Request(furl, http.MethodPost, callback, resp)
 }
 
@@ -231,7 +223,7 @@ func (d *BaiduPhoto) DeleteAlbum(ctx context.Context, album *Album) error {
 		r.SetFormData(map[string]string{
 			"album_id":            album.AlbumID,
 			"tid":                 fmt.Sprint(album.Tid),
-			"delete_origin_image": BoolToIntStr(d.DeleteOrigin), // 是否删除原图 0 不删除 1 删除
+			"delete_origin_image": "0", // 是否删除原图 0 不删除 1 删除
 		})
 	}, nil)
 	return err
@@ -245,7 +237,7 @@ func (d *BaiduPhoto) DeleteAlbumFile(ctx context.Context, file *AlbumFile) error
 			"album_id":   fmt.Sprint(file.AlbumID),
 			"tid":        fmt.Sprint(file.Tid),
 			"list":       fmt.Sprintf(`[{"fsid":%d,"uk":%d}]`, file.Fsid, file.Uk),
-			"del_origin": BoolToIntStr(d.DeleteOrigin), // 是否删除原图 0 不删除 1 删除
+			"del_origin": "0", // 是否删除原图 0 不删除 1 删除
 		})
 	}, nil)
 	return err
@@ -399,49 +391,6 @@ func (d *BaiduPhoto) linkFile(ctx context.Context, file *File, args model.LinkAr
 	return link, nil
 }
 
-/*func (d *BaiduPhoto) linkStreamAlbum(ctx context.Context, file *AlbumFile) (*model.Link, error) {
-	return &model.Link{
-		Header: http.Header{},
-		Writer: func(w io.Writer) error {
-			res, err := d.Get(ALBUM_API_URL+"/streaming", func(r *resty.Request) {
-				r.SetContext(ctx)
-				r.SetQueryParams(map[string]string{
-					"fsid":     fmt.Sprint(file.Fsid),
-					"album_id": file.AlbumID,
-					"tid":      fmt.Sprint(file.Tid),
-					"uk":       fmt.Sprint(file.Uk),
-				}).SetDoNotParseResponse(true)
-			}, nil)
-			if err != nil {
-				return err
-			}
-			defer res.RawBody().Close()
-			_, err = io.Copy(w, res.RawBody())
-			return err
-		},
-	}, nil
-}*/
-
-/*func (d *BaiduPhoto) linkStream(ctx context.Context, file *File) (*model.Link, error) {
-	return &model.Link{
-		Header: http.Header{},
-		Writer: func(w io.Writer) error {
-			res, err := d.Get(FILE_API_URL_V1+"/streaming", func(r *resty.Request) {
-				r.SetContext(ctx)
-				r.SetQueryParams(map[string]string{
-					"fsid": fmt.Sprint(file.Fsid),
-				}).SetDoNotParseResponse(true)
-			}, nil)
-			if err != nil {
-				return err
-			}
-			defer res.RawBody().Close()
-			_, err = io.Copy(w, res.RawBody())
-			return err
-		},
-	}, nil
-}*/
-
 // 获取uk
 func (d *BaiduPhoto) uInfo() (*UInfo, error) {
 	var info UInfo

drivers/base/client.go

@@ -33,7 +33,6 @@ func NewRestyClient() *resty.Client {
 	client := resty.New().
 		SetHeader("user-agent", UserAgent).
 		SetRetryCount(3).
-		SetRetryResetReaders(true).
 		SetTimeout(DefaultTimeout).
 		SetTLSClientConfig(&tls.Config{InsecureSkipVerify: conf.Conf.TlsInsecureSkipVerify})
 	return client

drivers/base/upload.go

@@ -1,31 +0,0 @@
-package base
-
-import (
-	"fmt"
-	"strings"
-	"time"
-
-	"github.com/Xhofe/go-cache"
-	"github.com/alist-org/alist/v3/internal/driver"
-)
-
-// storage upload progress, for upload recovery
-var UploadStateCache = cache.NewMemCache(cache.WithShards[any](32))
-
-// Save upload progress for 20 minutes
-func SaveUploadProgress(driver driver.Driver, state any, keys ...string) bool {
-	return UploadStateCache.Set(
-		fmt.Sprint(driver.Config().Name, "-upload-", strings.Join(keys, "-")),
-		state,
-		cache.WithEx[any](time.Minute*20))
-}
-
-// An upload progress can only be made by one process alone,
-// so here you need to get it and then delete it.
-func GetUploadProgress[T any](driver driver.Driver, keys ...string) (state T, ok bool) {
-	v, ok := UploadStateCache.GetDel(fmt.Sprint(driver.Config().Name, "-upload-", strings.Join(keys, "-")))
-	if ok {
-		state, ok = v.(T)
-	}
-	return
-}

drivers/base/util.go

@@ -1 +1,30 @@
 package base
+
+import (
+	"io"
+	"net/http"
+	"strconv"
+
+	"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"
+)
+
+func HandleRange(link *model.Link, file io.ReadSeekCloser, header http.Header, size int64) {
+	if header.Get("Range") != "" {
+		r, err := http_range.ParseRange(header.Get("Range"), size)
+		if err == nil && len(r) > 0 {
+			_, err := file.Seek(r[0].Start, io.SeekStart)
+			if err == nil {
+				link.Data = utils.NewLimitReadCloser(file, func() error {
+					return file.Close()
+				}, r[0].Length)
+				link.Status = http.StatusPartialContent
+				link.Header = http.Header{
+					"Content-Range":  []string{r[0].ContentRange(size)},
+					"Content-Length": []string{strconv.FormatInt(r[0].Length, 10)},
+				}
+			}
+		}
+	}
+}

drivers/chaoxing/driver.go

@@ -1,297 +0,0 @@
-package chaoxing
-
-import (
-	"bytes"
-	"context"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"io"
-	"mime/multipart"
-	"net/http"
-	"net/url"
-	"strings"
-	"time"
-
-	"github.com/alist-org/alist/v3/internal/driver"
-	"github.com/alist-org/alist/v3/internal/errs"
-	"github.com/alist-org/alist/v3/internal/model"
-	"github.com/alist-org/alist/v3/internal/op"
-	"github.com/alist-org/alist/v3/pkg/cron"
-	"github.com/alist-org/alist/v3/pkg/utils"
-	"github.com/go-resty/resty/v2"
-	"google.golang.org/appengine/log"
-)
-
-type ChaoXing struct {
-	model.Storage
-	Addition
-	cron   *cron.Cron
-	config driver.Config
-	conf   Conf
-}
-
-func (d *ChaoXing) Config() driver.Config {
-	return d.config
-}
-
-func (d *ChaoXing) GetAddition() driver.Additional {
-	return &d.Addition
-}
-
-func (d *ChaoXing) refreshCookie() error {
-	cookie, err := d.Login()
-	if err != nil {
-		d.Status = err.Error()
-		op.MustSaveDriverStorage(d)
-		return nil
-	}
-	d.Addition.Cookie = cookie
-	op.MustSaveDriverStorage(d)
-	return nil
-}
-
-func (d *ChaoXing) Init(ctx context.Context) error {
-	err := d.refreshCookie()
-	if err != nil {
-		log.Errorf(ctx, err.Error())
-	}
-	d.cron = cron.NewCron(time.Hour * 12)
-	d.cron.Do(func() {
-		err = d.refreshCookie()
-		if err != nil {
-			log.Errorf(ctx, err.Error())
-		}
-	})
-	return nil
-}
-
-func (d *ChaoXing) Drop(ctx context.Context) error {
-	d.cron.Stop()
-	return nil
-}
-
-func (d *ChaoXing) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([]model.Obj, error) {
-	files, err := d.GetFiles(dir.GetID())
-	if err != nil {
-		return nil, err
-	}
-	return utils.SliceConvert(files, func(src File) (model.Obj, error) {
-		return fileToObj(src), nil
-	})
-}
-
-func (d *ChaoXing) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
-	var resp DownResp
-	ua := d.conf.ua
-	fileId := strings.Split(file.GetID(), "$")[1]
-	_, err := d.requestDownload("/screen/note_note/files/status/"+fileId, http.MethodPost, func(req *resty.Request) {
-		req.SetHeader("User-Agent", ua)
-	}, &resp)
-	if err != nil {
-		return nil, err
-	}
-	u := resp.Download
-	return &model.Link{
-		URL: u,
-		Header: http.Header{
-			"Cookie":     []string{d.Cookie},
-			"Referer":    []string{d.conf.referer},
-			"User-Agent": []string{ua},
-		},
-		Concurrency: 2,
-		PartSize:    10 * utils.MB,
-	}, nil
-}
-
-func (d *ChaoXing) MakeDir(ctx context.Context, parentDir model.Obj, dirName string) error {
-	query := map[string]string{
-		"bbsid": d.Addition.Bbsid,
-		"name":  dirName,
-		"pid":   parentDir.GetID(),
-	}
-	var resp ListFileResp
-	_, err := d.request("/pc/resource/addResourceFolder", http.MethodGet, func(req *resty.Request) {
-		req.SetQueryParams(query)
-	}, &resp)
-	if err != nil {
-		return err
-	}
-	if resp.Result != 1 {
-		msg := fmt.Sprintf("error:%s", resp.Msg)
-		return errors.New(msg)
-	}
-	return nil
-}
-
-func (d *ChaoXing) Move(ctx context.Context, srcObj, dstDir model.Obj) error {
-	query := map[string]string{
-		"bbsid":     d.Addition.Bbsid,
-		"folderIds": srcObj.GetID(),
-		"targetId":  dstDir.GetID(),
-	}
-	if !srcObj.IsDir() {
-		query = map[string]string{
-			"bbsid":    d.Addition.Bbsid,
-			"recIds":   strings.Split(srcObj.GetID(), "$")[0],
-			"targetId": dstDir.GetID(),
-		}
-	}
-	var resp ListFileResp
-	_, err := d.request("/pc/resource/moveResource", http.MethodGet, func(req *resty.Request) {
-		req.SetQueryParams(query)
-	}, &resp)
-	if err != nil {
-		return err
-	}
-	if !resp.Status {
-		msg := fmt.Sprintf("error:%s", resp.Msg)
-		return errors.New(msg)
-	}
-	return nil
-}
-
-func (d *ChaoXing) Rename(ctx context.Context, srcObj model.Obj, newName string) error {
-	query := map[string]string{
-		"bbsid":    d.Addition.Bbsid,
-		"folderId": srcObj.GetID(),
-		"name":     newName,
-	}
-	path := "/pc/resource/updateResourceFolderName"
-	if !srcObj.IsDir() {
-		// path = "/pc/resource/updateResourceFileName"
-		// query = map[string]string{
-		// 	"bbsid":    d.Addition.Bbsid,
-		// 	"recIds":   strings.Split(srcObj.GetID(), "$")[0],
-		// 	"name":     newName,
-		// }
-		return errors.New("此网盘不支持修改文件名")
-	}
-	var resp ListFileResp
-	_, err := d.request(path, http.MethodGet, func(req *resty.Request) {
-		req.SetQueryParams(query)
-	}, &resp)
-	if err != nil {
-		return err
-	}
-	if resp.Result != 1 {
-		msg := fmt.Sprintf("error:%s", resp.Msg)
-		return errors.New(msg)
-	}
-	return nil
-}
-
-func (d *ChaoXing) Copy(ctx context.Context, srcObj, dstDir model.Obj) error {
-	// TODO copy obj, optional
-	return errs.NotImplement
-}
-
-func (d *ChaoXing) Remove(ctx context.Context, obj model.Obj) error {
-	query := map[string]string{
-		"bbsid":     d.Addition.Bbsid,
-		"folderIds": obj.GetID(),
-	}
-	path := "/pc/resource/deleteResourceFolder"
-	var resp ListFileResp
-	if !obj.IsDir() {
-		path = "/pc/resource/deleteResourceFile"
-		query = map[string]string{
-			"bbsid":  d.Addition.Bbsid,
-			"recIds": strings.Split(obj.GetID(), "$")[0],
-		}
-	}
-	_, err := d.request(path, http.MethodGet, func(req *resty.Request) {
-		req.SetQueryParams(query)
-	}, &resp)
-	if err != nil {
-		return err
-	}
-	if resp.Result != 1 {
-		msg := fmt.Sprintf("error:%s", resp.Msg)
-		return errors.New(msg)
-	}
-	return nil
-}
-
-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)
-	if err != nil {
-		return err
-	}
-	if resp.Result != 1 {
-		return errors.New("get upload data error")
-	}
-	body := &bytes.Buffer{}
-	writer := multipart.NewWriter(body)
-	filePart, err := writer.CreateFormFile("file", stream.GetName())
-	if err != nil {
-		return err
-	}
-	_, err = io.Copy(filePart, stream)
-	if err != nil {
-		return err
-	}
-	err = writer.WriteField("_token", resp.Msg.Token)
-	if err != nil {
-		return err
-	}
-	err = writer.WriteField("puid", fmt.Sprintf("%d", resp.Msg.Puid))
-	if err != nil {
-		fmt.Println("Error writing param2 to request body:", err)
-		return err
-	}
-	err = writer.Close()
-	if err != nil {
-		return err
-	}
-	req, err := http.NewRequest("POST", "https://pan-yz.chaoxing.com/upload", body)
-	if err != nil {
-		return err
-	}
-	req.Header.Set("Content-Type", writer.FormDataContentType())
-	req.Header.Set("Content-Length", fmt.Sprintf("%d", body.Len()))
-	resps, err := http.DefaultClient.Do(req)
-	if err != nil {
-		return err
-	}
-	defer resps.Body.Close()
-	bodys, err := io.ReadAll(resps.Body)
-	if err != nil {
-		return err
-	}
-	var fileRsp UploadFileDataRsp
-	err = json.Unmarshal(bodys, &fileRsp)
-	if err != nil {
-		return err
-	}
-	if fileRsp.Msg != "success" {
-		return errors.New(fileRsp.Msg)
-	}
-	uploadDoneParam := UploadDoneParam{Key: fileRsp.ObjectID, Cataid: "100000019", Param: fileRsp.Data}
-	params, err := json.Marshal(uploadDoneParam)
-	if err != nil {
-		return err
-	}
-	query := map[string]string{
-		"bbsid":  d.Addition.Bbsid,
-		"pid":    dstDir.GetID(),
-		"type":   "yunpan",
-		"params": url.QueryEscape("[" + string(params) + "]"),
-	}
-	var respd ListFileResp
-	_, err = d.request("/pc/resource/addResource", http.MethodGet, func(req *resty.Request) {
-		req.SetQueryParams(query)
-	}, &respd)
-	if err != nil {
-		return err
-	}
-	if respd.Result != 1 {
-		msg := fmt.Sprintf("error:%v", resp.Msg)
-		return errors.New(msg)
-	}
-	return nil
-}
-
-var _ driver.Driver = (*ChaoXing)(nil)

drivers/chaoxing/meta.go

@@ -1,47 +0,0 @@
-package chaoxing
-
-import (
-	"github.com/alist-org/alist/v3/internal/driver"
-	"github.com/alist-org/alist/v3/internal/op"
-)
-
-// 此程序挂载的是超星小组网盘，需要代理才能使用；
-// 登录超星后进入个人空间，进入小组，新建小组，点击进去。
-// url中就有bbsid的参数，系统限制单文件大小2G，没有总容量限制
-type Addition struct {
-	// 超星用户名及密码
-	UserName string `json:"user_name" required:"true"`
-	Password string `json:"password" required:"true"`
-	// 从自己新建的小组url里获取
-	Bbsid string `json:"bbsid" required:"true"`
-	driver.RootID
-	// 可不填，程序会自动登录获取
-	Cookie string `json:"cookie"`
-}
-
-type Conf struct {
-	ua         string
-	referer    string
-	api        string
-	DowloadApi string
-}
-
-func init() {
-	op.RegisterDriver(func() driver.Driver {
-		return &ChaoXing{
-			config: driver.Config{
-				Name:              "ChaoXingGroupDrive",
-				OnlyProxy:         true,
-				OnlyLocal:         false,
-				DefaultRoot:       "-1",
-				NoOverwriteUpload: true,
-			},
-			conf: Conf{
-				ua:         "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) quark-cloud-drive/2.5.20 Chrome/100.0.4896.160 Electron/18.3.5.4-b478491100 Safari/537.36 Channel/pckk_other_ch",
-				referer:    "https://chaoxing.com/",
-				api:        "https://groupweb.chaoxing.com",
-				DowloadApi: "https://noteyd.chaoxing.com",
-			},
-		}
-	})
-}

drivers/chaoxing/types.go

@@ -1,279 +0,0 @@
-package chaoxing
-
-import (
-	"bytes"
-	"fmt"
-	"strconv"
-	"time"
-
-	"github.com/alist-org/alist/v3/internal/model"
-)
-
-type Resp struct {
-	Result int `json:"result"`
-}
-
-type UserAuth struct {
-	GroupAuth struct {
-		AddData                 int    `json:"addData"`
-		AddDataFolder           int    `json:"addDataFolder"`
-		AddLebel                int    `json:"addLebel"`
-		AddManager              int    `json:"addManager"`
-		AddMem                  int    `json:"addMem"`
-		AddTopicFolder          int    `json:"addTopicFolder"`
-		AnonymousAddReply       int    `json:"anonymousAddReply"`
-		AnonymousAddTopic       int    `json:"anonymousAddTopic"`
-		BatchOperation          int    `json:"batchOperation"`
-		DelData                 int    `json:"delData"`
-		DelDataFolder           int    `json:"delDataFolder"`
-		DelMem                  int    `json:"delMem"`
-		DelTopicFolder          int    `json:"delTopicFolder"`
-		Dismiss                 int    `json:"dismiss"`
-		ExamEnc                 string `json:"examEnc"`
-		GroupChat               int    `json:"groupChat"`
-		IsShowCircleChatButton  int    `json:"isShowCircleChatButton"`
-		IsShowCircleCloudButton int    `json:"isShowCircleCloudButton"`
-		IsShowCompanyButton     int    `json:"isShowCompanyButton"`
-		Join                    int    `json:"join"`
-		MemberShowRankSet       int    `json:"memberShowRankSet"`
-		ModifyDataFolder        int    `json:"modifyDataFolder"`
-		ModifyExpose            int    `json:"modifyExpose"`
-		ModifyName              int    `json:"modifyName"`
-		ModifyShowPic           int    `json:"modifyShowPic"`
-		ModifyTopicFolder       int    `json:"modifyTopicFolder"`
-		ModifyVisibleState      int    `json:"modifyVisibleState"`
-		OnlyMgrScoreSet         int    `json:"onlyMgrScoreSet"`
-		Quit                    int    `json:"quit"`
-		SendNotice              int    `json:"sendNotice"`
-		ShowActivityManage      int    `json:"showActivityManage"`
-		ShowActivitySet         int    `json:"showActivitySet"`
-		ShowAttentionSet        int    `json:"showAttentionSet"`
-		ShowAutoClearStatus     int    `json:"showAutoClearStatus"`
-		ShowBarcode             int    `json:"showBarcode"`
-		ShowChatRoomSet         int    `json:"showChatRoomSet"`
-		ShowCircleActivitySet   int    `json:"showCircleActivitySet"`
-		ShowCircleSet           int    `json:"showCircleSet"`
-		ShowCmem                int    `json:"showCmem"`
-		ShowDataFolder          int    `json:"showDataFolder"`
-		ShowDelReason           int    `json:"showDelReason"`
-		ShowForward             int    `json:"showForward"`
-		ShowGroupChat           int    `json:"showGroupChat"`
-		ShowGroupChatSet        int    `json:"showGroupChatSet"`
-		ShowGroupSquareSet      int    `json:"showGroupSquareSet"`
-		ShowLockAddSet          int    `json:"showLockAddSet"`
-		ShowManager             int    `json:"showManager"`
-		ShowManagerIdentitySet  int    `json:"showManagerIdentitySet"`
-		ShowNeedDelReasonSet    int    `json:"showNeedDelReasonSet"`
-		ShowNotice              int    `json:"showNotice"`
-		ShowOnlyManagerReplySet int    `json:"showOnlyManagerReplySet"`
-		ShowRank                int    `json:"showRank"`
-		ShowRank2               int    `json:"showRank2"`
-		ShowRecycleBin          int    `json:"showRecycleBin"`
-		ShowReplyByClass        int    `json:"showReplyByClass"`
-		ShowReplyNeedCheck      int    `json:"showReplyNeedCheck"`
-		ShowSignbanSet          int    `json:"showSignbanSet"`
-		ShowSpeechSet           int    `json:"showSpeechSet"`
-		ShowTopicCheck          int    `json:"showTopicCheck"`
-		ShowTopicNeedCheck      int    `json:"showTopicNeedCheck"`
-		ShowTransferSet         int    `json:"showTransferSet"`
-	} `json:"groupAuth"`
-	OperationAuth struct {
-		Add                int `json:"add"`
-		AddTopicToFolder   int `json:"addTopicToFolder"`
-		ChoiceSet          int `json:"choiceSet"`
-		DelTopicFromFolder int `json:"delTopicFromFolder"`
-		Delete             int `json:"delete"`
-		Reply              int `json:"reply"`
-		ScoreSet           int `json:"scoreSet"`
-		TopSet             int `json:"topSet"`
-		Update             int `json:"update"`
-	} `json:"operationAuth"`
-}
-
-// 手机端学习通上传的文件的json内容(content字段)与网页端上传的有所不同
-// 网页端json `"puid": 54321, "size": 12345`
-// 手机端json `"puid": "54321". "size": "12345"`
-type int_str int
-
-// json 字符串数字和纯数字解析
-func (ios *int_str) UnmarshalJSON(data []byte) error {
-	intValue, err := strconv.Atoi(string(bytes.Trim(data, "\"")))
-	if err != nil {
-		return err
-	}
-	*ios = int_str(intValue)
-	return nil
-}
-
-type File struct {
-	Cataid  int `json:"cataid"`
-	Cfid    int `json:"cfid"`
-	Content struct {
-		Cfid             int     `json:"cfid"`
-		Pid              int     `json:"pid"`
-		FolderName       string  `json:"folderName"`
-		ShareType        int     `json:"shareType"`
-		Preview          string  `json:"preview"`
-		Filetype         string  `json:"filetype"`
-		PreviewURL       string  `json:"previewUrl"`
-		IsImg            bool    `json:"isImg"`
-		ParentPath       string  `json:"parentPath"`
-		Icon             string  `json:"icon"`
-		Suffix           string  `json:"suffix"`
-		Duration         int     `json:"duration"`
-		Pantype          string  `json:"pantype"`
-		Puid             int_str `json:"puid"`
-		Filepath         string  `json:"filepath"`
-		Crc              string  `json:"crc"`
-		Isfile           bool    `json:"isfile"`
-		Residstr         string  `json:"residstr"`
-		ObjectID         string  `json:"objectId"`
-		Extinfo          string  `json:"extinfo"`
-		Thumbnail        string  `json:"thumbnail"`
-		Creator          int     `json:"creator"`
-		ResTypeValue     int     `json:"resTypeValue"`
-		UploadDateFormat string  `json:"uploadDateFormat"`
-		DisableOpt       bool    `json:"disableOpt"`
-		DownPath         string  `json:"downPath"`
-		Sort             int     `json:"sort"`
-		Topsort          int     `json:"topsort"`
-		Restype          string  `json:"restype"`
-		Size             int_str `json:"size"`
-		UploadDate       string  `json:"uploadDate"`
-		FileSize         string  `json:"fileSize"`
-		Name             string  `json:"name"`
-		FileID           string  `json:"fileId"`
-	} `json:"content"`
-	CreatorID  int    `json:"creatorId"`
-	DesID      string `json:"des_id"`
-	ID         int    `json:"id"`
-	Inserttime int64  `json:"inserttime"`
-	Key        string `json:"key"`
-	Norder     int    `json:"norder"`
-	OwnerID    int    `json:"ownerId"`
-	OwnerType  int    `json:"ownerType"`
-	Path       string `json:"path"`
-	Rid        int    `json:"rid"`
-	Status     int    `json:"status"`
-	Topsign    int    `json:"topsign"`
-}
-
-type ListFileResp struct {
-	Msg      string   `json:"msg"`
-	Result   int      `json:"result"`
-	Status   bool     `json:"status"`
-	UserAuth UserAuth `json:"userAuth"`
-	List     []File   `json:"list"`
-}
-
-type DownResp struct {
-	Msg        string `json:"msg"`
-	Duration   int    `json:"duration"`
-	Download   string `json:"download"`
-	FileStatus string `json:"fileStatus"`
-	URL        string `json:"url"`
-	Status     bool   `json:"status"`
-}
-
-type UploadDataRsp struct {
-	Result int `json:"result"`
-	Msg    struct {
-		Puid  int    `json:"puid"`
-		Token string `json:"token"`
-	} `json:"msg"`
-}
-
-type UploadFileDataRsp struct {
-	Result   bool   `json:"result"`
-	Msg      string `json:"msg"`
-	Crc      string `json:"crc"`
-	ObjectID string `json:"objectId"`
-	Resid    int64  `json:"resid"`
-	Puid     int    `json:"puid"`
-	Data     struct {
-		DisableOpt       bool      `json:"disableOpt"`
-		Resid            int64     `json:"resid"`
-		Crc              string    `json:"crc"`
-		Puid             int       `json:"puid"`
-		Isfile           bool      `json:"isfile"`
-		Pantype          string    `json:"pantype"`
-		Size             int       `json:"size"`
-		Name             string    `json:"name"`
-		ObjectID         string    `json:"objectId"`
-		Restype          string    `json:"restype"`
-		UploadDate       time.Time `json:"uploadDate"`
-		ModifyDate       time.Time `json:"modifyDate"`
-		UploadDateFormat string    `json:"uploadDateFormat"`
-		Residstr         string    `json:"residstr"`
-		Suffix           string    `json:"suffix"`
-		Preview          string    `json:"preview"`
-		Thumbnail        string    `json:"thumbnail"`
-		Creator          int       `json:"creator"`
-		Duration         int       `json:"duration"`
-		IsImg            bool      `json:"isImg"`
-		PreviewURL       string    `json:"previewUrl"`
-		Filetype         string    `json:"filetype"`
-		Filepath         string    `json:"filepath"`
-		Sort             int       `json:"sort"`
-		Topsort          int       `json:"topsort"`
-		ResTypeValue     int       `json:"resTypeValue"`
-		Extinfo          string    `json:"extinfo"`
-	} `json:"data"`
-}
-
-type UploadDoneParam struct {
-	Cataid string `json:"cataid"`
-	Key    string `json:"key"`
-	Param  struct {
-		DisableOpt       bool      `json:"disableOpt"`
-		Resid            int64     `json:"resid"`
-		Crc              string    `json:"crc"`
-		Puid             int       `json:"puid"`
-		Isfile           bool      `json:"isfile"`
-		Pantype          string    `json:"pantype"`
-		Size             int       `json:"size"`
-		Name             string    `json:"name"`
-		ObjectID         string    `json:"objectId"`
-		Restype          string    `json:"restype"`
-		UploadDate       time.Time `json:"uploadDate"`
-		ModifyDate       time.Time `json:"modifyDate"`
-		UploadDateFormat string    `json:"uploadDateFormat"`
-		Residstr         string    `json:"residstr"`
-		Suffix           string    `json:"suffix"`
-		Preview          string    `json:"preview"`
-		Thumbnail        string    `json:"thumbnail"`
-		Creator          int       `json:"creator"`
-		Duration         int       `json:"duration"`
-		IsImg            bool      `json:"isImg"`
-		PreviewURL       string    `json:"previewUrl"`
-		Filetype         string    `json:"filetype"`
-		Filepath         string    `json:"filepath"`
-		Sort             int       `json:"sort"`
-		Topsort          int       `json:"topsort"`
-		ResTypeValue     int       `json:"resTypeValue"`
-		Extinfo          string    `json:"extinfo"`
-	} `json:"param"`
-}
-
-func fileToObj(f File) *model.Object {
-	if len(f.Content.FolderName) > 0 {
-		return &model.Object{
-			ID:       fmt.Sprintf("%d", f.ID),
-			Name:     f.Content.FolderName,
-			Size:     0,
-			Modified: time.UnixMilli(f.Inserttime),
-			IsFolder: true,
-		}
-	}
-	paserTime, err := time.Parse("2006-01-02 15:04", f.Content.UploadDate)
-	if err != nil {
-		paserTime = time.Now()
-	}
-	return &model.Object{
-		ID:       fmt.Sprintf("%d$%s", f.ID, f.Content.FileID),
-		Name:     f.Content.Name,
-		Size:     int64(f.Content.Size),
-		Modified: paserTime,
-		IsFolder: false,
-	}
-}

drivers/chaoxing/util.go

@@ -1,183 +0,0 @@
-package chaoxing
-
-import (
-	"bytes"
-	"crypto/aes"
-	"crypto/cipher"
-	"encoding/base64"
-	"errors"
-	"fmt"
-	"mime/multipart"
-	"net/http"
-	"strings"
-
-	"github.com/alist-org/alist/v3/drivers/base"
-	"github.com/go-resty/resty/v2"
-)
-
-func (d *ChaoXing) requestDownload(pathname string, method string, callback base.ReqCallback, resp interface{}) ([]byte, error) {
-	u := d.conf.DowloadApi + pathname
-	req := base.RestyClient.R()
-	req.SetHeaders(map[string]string{
-		"Cookie":  d.Cookie,
-		"Accept":  "application/json, text/plain, */*",
-		"Referer": d.conf.referer,
-	})
-	if callback != nil {
-		callback(req)
-	}
-	if resp != nil {
-		req.SetResult(resp)
-	}
-	var e Resp
-	req.SetError(&e)
-	res, err := req.Execute(method, u)
-	if err != nil {
-		return nil, err
-	}
-	return res.Body(), nil
-}
-
-func (d *ChaoXing) request(pathname string, method string, callback base.ReqCallback, resp interface{}) ([]byte, error) {
-	u := d.conf.api + pathname
-	if strings.Contains(pathname, "getUploadConfig") {
-		u = pathname
-	}
-	req := base.RestyClient.R()
-	req.SetHeaders(map[string]string{
-		"Cookie":  d.Cookie,
-		"Accept":  "application/json, text/plain, */*",
-		"Referer": d.conf.referer,
-	})
-	if callback != nil {
-		callback(req)
-	}
-	if resp != nil {
-		req.SetResult(resp)
-	}
-	var e Resp
-	req.SetError(&e)
-	res, err := req.Execute(method, u)
-	if err != nil {
-		return nil, err
-	}
-	return res.Body(), nil
-}
-
-func (d *ChaoXing) GetFiles(parent string) ([]File, error) {
-	files := make([]File, 0)
-	query := map[string]string{
-		"bbsid":    d.Addition.Bbsid,
-		"folderId": parent,
-		"recType":  "1",
-	}
-	var resp ListFileResp
-	_, err := d.request("/pc/resource/getResourceList", http.MethodGet, func(req *resty.Request) {
-		req.SetQueryParams(query)
-	}, &resp)
-	if err != nil {
-		return nil, err
-	}
-	if resp.Result != 1 {
-		msg := fmt.Sprintf("error code is:%d", resp.Result)
-		return nil, errors.New(msg)
-	}
-	if len(resp.List) > 0 {
-		files = append(files, resp.List...)
-	}
-	querys := map[string]string{
-		"bbsid":    d.Addition.Bbsid,
-		"folderId": parent,
-		"recType":  "2",
-	}
-	var resps ListFileResp
-	_, err = d.request("/pc/resource/getResourceList", http.MethodGet, func(req *resty.Request) {
-		req.SetQueryParams(querys)
-	}, &resps)
-	if err != nil {
-		return nil, err
-	}
-	for _, file := range resps.List {
-		// 手机端超星上传的文件没有fileID字段，但ObjectID与fileID相同，可代替
-		if file.Content.FileID == "" {
-			file.Content.FileID = file.Content.ObjectID
-		}
-		files = append(files, file)
-	}
-	return files, nil
-}
-
-func EncryptByAES(message, key string) (string, error) {
-	aesKey := []byte(key)
-	plainText := []byte(message)
-	block, err := aes.NewCipher(aesKey)
-	if err != nil {
-		return "", err
-	}
-	iv := aesKey[:aes.BlockSize]
-	mode := cipher.NewCBCEncrypter(block, iv)
-	padding := aes.BlockSize - len(plainText)%aes.BlockSize
-	paddedText := append(plainText, byte(padding))
-	for i := 0; i < padding-1; i++ {
-		paddedText = append(paddedText, byte(padding))
-	}
-	ciphertext := make([]byte, len(paddedText))
-	mode.CryptBlocks(ciphertext, paddedText)
-	encrypted := base64.StdEncoding.EncodeToString(ciphertext)
-	return encrypted, nil
-}
-
-func CookiesToString(cookies []*http.Cookie) string {
-	var cookieStr string
-	for _, cookie := range cookies {
-		cookieStr += cookie.Name + "=" + cookie.Value + "; "
-	}
-	if len(cookieStr) > 2 {
-		cookieStr = cookieStr[:len(cookieStr)-2]
-	}
-	return cookieStr
-}
-
-func (d *ChaoXing) Login() (string, error) {
-	transferKey := "u2oh6Vu^HWe4_AES"
-	body := &bytes.Buffer{}
-	writer := multipart.NewWriter(body)
-	uname, err := EncryptByAES(d.Addition.UserName, transferKey)
-	if err != nil {
-		return "", err
-	}
-	password, err := EncryptByAES(d.Addition.Password, transferKey)
-	if err != nil {
-		return "", err
-	}
-	err = writer.WriteField("uname", uname)
-	if err != nil {
-		return "", err
-	}
-	err = writer.WriteField("password", password)
-	if err != nil {
-		return "", err
-	}
-	err = writer.WriteField("t", "true")
-	if err != nil {
-		return "", err
-	}
-	err = writer.Close()
-	if err != nil {
-		return "", err
-	}
-	// Create the request
-	req, err := http.NewRequest("POST", "https://passport2.chaoxing.com/fanyalogin", body)
-	if err != nil {
-		return "", err
-	}
-	req.Header.Set("Content-Type", writer.FormDataContentType())
-	req.Header.Set("Content-Length", fmt.Sprintf("%d", body.Len()))
-	resp, err := http.DefaultClient.Do(req)
-	if err != nil {
-		return "", err
-	}
-	defer resp.Body.Close()
-	return CookiesToString(resp.Cookies()), nil
-
-}

drivers/cloudreve/driver.go

@@ -49,19 +49,7 @@ func (d *Cloudreve) List(ctx context.Context, dir model.Obj, args model.ListArgs
 	}
 
 	return utils.SliceConvert(r.Objects, func(src Object) (model.Obj, error) {
-		thumb, err := d.GetThumb(src)
+		return objectToObj(src), nil
-		if err != nil {
-			return nil, err
-		}
-		if src.Type == "dir" && d.EnableThumbAndFolderSize {
-			var dprop DirectoryProp
-			err = d.request(http.MethodGet, "/object/property/"+src.Id+"?is_folder=true", nil, &dprop)
-			if err != nil {
-				return nil, err
-			}
-			src.Size = dprop.Size
-		}
-		return objectToObj(src, thumb), nil
 	})
 }
 
@@ -127,7 +115,7 @@ func (d *Cloudreve) Remove(ctx context.Context, obj model.Obj) error {
 }
 
 func (d *Cloudreve) Put(ctx context.Context, dstDir model.Obj, stream model.FileStreamer, up driver.UpdateProgress) error {
-	if io.ReadCloser(stream) == http.NoBody {
+	if stream.GetReadCloser() == http.NoBody {
 		return d.create(ctx, dstDir, stream)
 	}
 	var r DirectoryResp

drivers/cloudreve/meta.go

@@ -13,8 +13,6 @@ type Addition struct {
 	Username string `json:"username"`
 	Password string `json:"password"`
 	Cookie   string `json:"cookie"`
-	CustomUA                 string `json:"custom_ua"`
-	EnableThumbAndFolderSize bool   `json:"enable_thumb_and_folder_size"`
 }
 
 var config = driver.Config{

drivers/cloudreve/types.go

@@ -44,20 +44,13 @@ type Object struct {
 	SourceEnabled bool      `json:"source_enabled"`
 }
 
-type DirectoryProp struct {
+func objectToObj(f Object) *model.Object {
-	Size int `json:"size"`
+	return &model.Object{
-}
-
-func objectToObj(f Object, t model.Thumbnail) *model.ObjThumb {
-	return &model.ObjThumb{
-		Object: model.Object{
 		ID:       f.Id,
 		Name:     f.Name,
 		Size:     int64(f.Size),
 		Modified: f.Date,
 		IsFolder: f.Type == "dir",
-		},
-		Thumbnail: t,
 	}
 }
 

drivers/cloudreve/util.go

@@ -22,18 +22,15 @@ const loginPath = "/user/session"
 
 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": ua,
+		"User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36",
 	})
 
 	var r Resp
+
 	req.SetResult(&r)
 
 	if callback != nil {
@@ -149,26 +146,3 @@ func convertSrc(obj model.Obj) map[string]interface{} {
 	m["items"] = items
 	return m
 }
-
-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": ua,
-	})
-	resp, err := req.Execute(http.MethodGet, d.Address+"/api/v3/file/thumb/"+file.Id)
-	if err != nil {
-		return model.Thumbnail{}, err
-	}
-	return model.Thumbnail{
-		Thumbnail: resp.Header().Get("Location"),
-	}, nil
-}

drivers/crypt/driver.go

@@ -1,408 +0,0 @@
-package crypt
-
-import (
-	"context"
-	"fmt"
-	"github.com/alist-org/alist/v3/internal/stream"
-	"io"
-	stdpath "path"
-	"regexp"
-	"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/pkg/http_range"
-	"github.com/alist-org/alist/v3/pkg/utils"
-	"github.com/alist-org/alist/v3/server/common"
-	rcCrypt "github.com/rclone/rclone/backend/crypt"
-	"github.com/rclone/rclone/fs/config/configmap"
-	"github.com/rclone/rclone/fs/config/obscure"
-	log "github.com/sirupsen/logrus"
-)
-
-type Crypt struct {
-	model.Storage
-	Addition
-	cipher        *rcCrypt.Cipher
-	remoteStorage driver.Driver
-}
-
-const obfuscatedPrefix = "___Obfuscated___"
-
-func (d *Crypt) Config() driver.Config {
-	return config
-}
-
-func (d *Crypt) GetAddition() driver.Additional {
-	return &d.Addition
-}
-
-func (d *Crypt) Init(ctx context.Context) error {
-	//obfuscate credentials if it's updated or just created
-	err := d.updateObfusParm(&d.Password)
-	if err != nil {
-		return fmt.Errorf("failed to obfuscate password: %w", err)
-	}
-	err = d.updateObfusParm(&d.Salt)
-	if err != nil {
-		return fmt.Errorf("failed to obfuscate salt: %w", err)
-	}
-
-	isCryptExt := regexp.MustCompile(`^[.][A-Za-z0-9-_]{2,}$`).MatchString
-	if !isCryptExt(d.EncryptedSuffix) {
-		return fmt.Errorf("EncryptedSuffix is Illegal")
-	}
-	d.FileNameEncoding = utils.GetNoneEmpty(d.FileNameEncoding, "base64")
-	d.EncryptedSuffix = utils.GetNoneEmpty(d.EncryptedSuffix, ".bin")
-
-	op.MustSaveDriverStorage(d)
-
-	//need remote storage exist
-	storage, err := fs.GetStorage(d.RemotePath, &fs.GetStoragesArgs{})
-	if err != nil {
-		return fmt.Errorf("can't find remote storage: %w", err)
-	}
-	d.remoteStorage = storage
-
-	p, _ := strings.CutPrefix(d.Password, obfuscatedPrefix)
-	p2, _ := strings.CutPrefix(d.Salt, obfuscatedPrefix)
-	config := configmap.Simple{
-		"password":                  p,
-		"password2":                 p2,
-		"filename_encryption":       d.FileNameEnc,
-		"directory_name_encryption": d.DirNameEnc,
-		"filename_encoding":         d.FileNameEncoding,
-		"suffix":                    d.EncryptedSuffix,
-		"pass_bad_blocks":           "",
-	}
-	c, err := rcCrypt.NewCipher(config)
-	if err != nil {
-		return fmt.Errorf("failed to create Cipher: %w", err)
-	}
-	d.cipher = c
-
-	return nil
-}
-
-func (d *Crypt) updateObfusParm(str *string) error {
-	temp := *str
-	if !strings.HasPrefix(temp, obfuscatedPrefix) {
-		temp, err := obscure.Obscure(temp)
-		if err != nil {
-			return err
-		}
-		temp = obfuscatedPrefix + temp
-		*str = temp
-	}
-	return nil
-}
-
-func (d *Crypt) Drop(ctx context.Context) error {
-	return nil
-}
-
-func (d *Crypt) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([]model.Obj, error) {
-	path := dir.GetPath()
-	//return d.list(ctx, d.RemotePath, path)
-	//remoteFull
-
-	objs, err := fs.List(ctx, d.getPathForRemote(path, true), &fs.ListArgs{NoLog: true})
-	// the obj must implement the model.SetPath interface
-	// return objs, err
-	if err != nil {
-		return nil, err
-	}
-
-	var result []model.Obj
-	for _, obj := range objs {
-		if obj.IsDir() {
-			name, err := d.cipher.DecryptDirName(obj.GetName())
-			if err != nil {
-				//filter illegal files
-				continue
-			}
-			if !d.ShowHidden && strings.HasPrefix(name, ".") {
-				continue
-			}
-			objRes := model.Object{
-				Name:     name,
-				Size:     0,
-				Modified: obj.ModTime(),
-				IsFolder: obj.IsDir(),
-				Ctime:    obj.CreateTime(),
-				// discarding hash as it's encrypted
-			}
-			result = append(result, &objRes)
-		} else {
-			thumb, ok := model.GetThumb(obj)
-			size, err := d.cipher.DecryptedSize(obj.GetSize())
-			if err != nil {
-				//filter illegal files
-				continue
-			}
-			name, err := d.cipher.DecryptFileName(obj.GetName())
-			if err != nil {
-				//filter illegal files
-				continue
-			}
-			if !d.ShowHidden && strings.HasPrefix(name, ".") {
-				continue
-			}
-			objRes := model.Object{
-				Name:     name,
-				Size:     size,
-				Modified: obj.ModTime(),
-				IsFolder: obj.IsDir(),
-				Ctime:    obj.CreateTime(),
-				// discarding hash as it's encrypted
-			}
-			if d.Thumbnail && thumb == "" {
-				thumb = utils.EncodePath(common.GetApiUrl(nil) + stdpath.Join("/d", args.ReqPath, ".thumbnails", name+".webp"), true)
-			}
-			if !ok && !d.Thumbnail {
-				result = append(result, &objRes)
-			} else {
-				objWithThumb := model.ObjThumb{
-					Object: objRes,
-					Thumbnail: model.Thumbnail{
-						Thumbnail: thumb,
-					},
-				}
-				result = append(result, &objWithThumb)
-			}
-		}
-	}
-
-	return result, nil
-}
-
-func (d *Crypt) Get(ctx context.Context, path string) (model.Obj, error) {
-	if utils.PathEqual(path, "/") {
-		return &model.Object{
-			Name:     "Root",
-			IsFolder: true,
-			Path:     "/",
-		}, nil
-	}
-	remoteFullPath := ""
-	var remoteObj model.Obj
-	var err, err2 error
-	firstTryIsFolder, secondTry := guessPath(path)
-	remoteFullPath = d.getPathForRemote(path, firstTryIsFolder)
-	remoteObj, err = fs.Get(ctx, remoteFullPath, &fs.GetArgs{NoLog: true})
-	if err != nil {
-		if errs.IsObjectNotFound(err) && secondTry {
-			//try the opposite
-			remoteFullPath = d.getPathForRemote(path, !firstTryIsFolder)
-			remoteObj, err2 = fs.Get(ctx, remoteFullPath, &fs.GetArgs{NoLog: true})
-			if err2 != nil {
-				return nil, err2
-			}
-		} else {
-			return nil, err
-		}
-	}
-	var size int64 = 0
-	name := ""
-	if !remoteObj.IsDir() {
-		size, err = d.cipher.DecryptedSize(remoteObj.GetSize())
-		if err != nil {
-			log.Warnf("DecryptedSize failed for %s ,will use original size, err:%s", path, err)
-			size = remoteObj.GetSize()
-		}
-		name, err = d.cipher.DecryptFileName(remoteObj.GetName())
-		if err != nil {
-			log.Warnf("DecryptFileName failed for %s ,will use original name, err:%s", path, err)
-			name = remoteObj.GetName()
-		}
-	} else {
-		name, err = d.cipher.DecryptDirName(remoteObj.GetName())
-		if err != nil {
-			log.Warnf("DecryptDirName failed for %s ,will use original name, err:%s", path, err)
-			name = remoteObj.GetName()
-		}
-	}
-	obj := &model.Object{
-		Path:     path,
-		Name:     name,
-		Size:     size,
-		Modified: remoteObj.ModTime(),
-		IsFolder: remoteObj.IsDir(),
-	}
-	return obj, nil
-	//return nil, errs.ObjectNotFound
-}
-
-func (d *Crypt) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
-	dstDirActualPath, err := d.getActualPathForRemote(file.GetPath(), false)
-	if err != nil {
-		return nil, fmt.Errorf("failed to convert path to remote path: %w", err)
-	}
-	remoteLink, remoteFile, err := op.Link(ctx, d.remoteStorage, dstDirActualPath, args)
-	if err != nil {
-		return nil, err
-	}
-
-	if remoteLink.RangeReadCloser == nil && remoteLink.MFile == nil && len(remoteLink.URL) == 0 {
-		return nil, fmt.Errorf("the remote storage driver need to be enhanced to support encrytion")
-	}
-	remoteFileSize := remoteFile.GetSize()
-	remoteClosers := utils.EmptyClosers()
-	rangeReaderFunc := func(ctx context.Context, underlyingOffset, underlyingLength int64) (io.ReadCloser, error) {
-		length := underlyingLength
-		if underlyingLength >= 0 && underlyingOffset+underlyingLength >= remoteFileSize {
-			length = -1
-		}
-		rrc := remoteLink.RangeReadCloser
-		if len(remoteLink.URL) > 0 {
-
-			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 {
-				return nil, err
-			}
-			return remoteReader, nil
-		}
-		if remoteLink.MFile != nil {
-			_, err := remoteLink.MFile.Seek(underlyingOffset, io.SeekStart)
-			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
-		}
-
-		return nil, errs.NotSupport
-
-	}
-	resultRangeReader := func(ctx context.Context, httpRange http_range.Range) (io.ReadCloser, error) {
-		readSeeker, err := d.cipher.DecryptDataSeek(ctx, rangeReaderFunc, httpRange.Start, httpRange.Length)
-		if err != nil {
-			return nil, err
-		}
-		return readSeeker, nil
-	}
-
-	resultRangeReadCloser := &model.RangeReadCloser{RangeReader: resultRangeReader, Closers: remoteClosers}
-	resultLink := &model.Link{
-		Header:          remoteLink.Header,
-		RangeReadCloser: resultRangeReadCloser,
-		Expiration:      remoteLink.Expiration,
-	}
-
-	return resultLink, nil
-
-}
-
-func (d *Crypt) MakeDir(ctx context.Context, parentDir model.Obj, dirName string) error {
-	dstDirActualPath, err := d.getActualPathForRemote(parentDir.GetPath(), true)
-	if err != nil {
-		return fmt.Errorf("failed to convert path to remote path: %w", err)
-	}
-	dir := d.cipher.EncryptDirName(dirName)
-	return op.MakeDir(ctx, d.remoteStorage, stdpath.Join(dstDirActualPath, dir))
-}
-
-func (d *Crypt) Move(ctx context.Context, srcObj, dstDir model.Obj) error {
-	srcRemoteActualPath, err := d.getActualPathForRemote(srcObj.GetPath(), srcObj.IsDir())
-	if err != nil {
-		return fmt.Errorf("failed to convert path to remote path: %w", err)
-	}
-	dstRemoteActualPath, err := d.getActualPathForRemote(dstDir.GetPath(), dstDir.IsDir())
-	if err != nil {
-		return fmt.Errorf("failed to convert path to remote path: %w", err)
-	}
-	return op.Move(ctx, d.remoteStorage, srcRemoteActualPath, dstRemoteActualPath)
-}
-
-func (d *Crypt) Rename(ctx context.Context, srcObj model.Obj, newName string) error {
-	remoteActualPath, err := d.getActualPathForRemote(srcObj.GetPath(), srcObj.IsDir())
-	if err != nil {
-		return fmt.Errorf("failed to convert path to remote path: %w", err)
-	}
-	var newEncryptedName string
-	if srcObj.IsDir() {
-		newEncryptedName = d.cipher.EncryptDirName(newName)
-	} else {
-		newEncryptedName = d.cipher.EncryptFileName(newName)
-	}
-	return op.Rename(ctx, d.remoteStorage, remoteActualPath, newEncryptedName)
-}
-
-func (d *Crypt) Copy(ctx context.Context, srcObj, dstDir model.Obj) error {
-	srcRemoteActualPath, err := d.getActualPathForRemote(srcObj.GetPath(), srcObj.IsDir())
-	if err != nil {
-		return fmt.Errorf("failed to convert path to remote path: %w", err)
-	}
-	dstRemoteActualPath, err := d.getActualPathForRemote(dstDir.GetPath(), dstDir.IsDir())
-	if err != nil {
-		return fmt.Errorf("failed to convert path to remote path: %w", err)
-	}
-	return op.Copy(ctx, d.remoteStorage, srcRemoteActualPath, dstRemoteActualPath)
-
-}
-
-func (d *Crypt) Remove(ctx context.Context, obj model.Obj) error {
-	remoteActualPath, err := d.getActualPathForRemote(obj.GetPath(), obj.IsDir())
-	if err != nil {
-		return fmt.Errorf("failed to convert path to remote path: %w", err)
-	}
-	return op.Remove(ctx, d.remoteStorage, remoteActualPath)
-}
-
-func (d *Crypt) Put(ctx context.Context, dstDir model.Obj, streamer model.FileStreamer, up driver.UpdateProgress) error {
-	dstDirActualPath, err := d.getActualPathForRemote(dstDir.GetPath(), true)
-	if err != nil {
-		return fmt.Errorf("failed to convert path to remote path: %w", err)
-	}
-
-	// Encrypt the data into wrappedIn
-	wrappedIn, err := d.cipher.EncryptData(streamer)
-	if err != nil {
-		return fmt.Errorf("failed to EncryptData: %w", err)
-	}
-
-	// doesn't support seekableStream, since rapid-upload is not working for encrypted data
-	streamOut := &stream.FileStream{
-		Obj: &model.Object{
-			ID:       streamer.GetID(),
-			Path:     streamer.GetPath(),
-			Name:     d.cipher.EncryptFileName(streamer.GetName()),
-			Size:     d.cipher.EncryptedSize(streamer.GetSize()),
-			Modified: streamer.ModTime(),
-			IsFolder: streamer.IsDir(),
-		},
-		Reader:       wrappedIn,
-		Mimetype:     "application/octet-stream",
-		WebPutAsTask: streamer.NeedStore(),
-		Exist:        streamer.GetExist(),
-	}
-	err = op.Put(ctx, d.remoteStorage, dstDirActualPath, streamOut, up, false)
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-//func (d *Safe) Other(ctx context.Context, args model.OtherArgs) (interface{}, error) {
-//	return nil, errs.NotSupport
-//}
-
-var _ driver.Driver = (*Crypt)(nil)

drivers/crypt/meta.go

@@ -1,46 +0,0 @@
-package crypt
-
-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
-
-	FileNameEnc string `json:"filename_encryption" type:"select" required:"true" options:"off,standard,obfuscate" default:"off"`
-	DirNameEnc  string `json:"directory_name_encryption" type:"select" required:"true" options:"false,true" default:"false"`
-	RemotePath  string `json:"remote_path" required:"true" help:"This is where the encrypted data stores"`
-
-	Password         string `json:"password" required:"true" confidential:"true" help:"the main password"`
-	Salt             string `json:"salt" confidential:"true"  help:"If you don't know what is salt, treat it as a second password. Optional but recommended"`
-	EncryptedSuffix  string `json:"encrypted_suffix" required:"true" default:".bin" help:"for advanced user only! encrypted files will have this suffix"`
-	FileNameEncoding string `json:"filename_encoding" type:"select" required:"true" options:"base64,base32,base32768" default:"base64" help:"for advanced user only!"`
-
-	Thumbnail   bool   `json:"thumbnail" required:"true" default:"false" help:"enable thumbnail which pre-generated under .thumbnails folder"`
-
-	ShowHidden       bool   `json:"show_hidden"  default:"true" required:"false" help:"show hidden directories and files"`
-}
-
-var config = driver.Config{
-	Name:              "Crypt",
-	LocalSort:         true,
-	OnlyLocal:         false,
-	OnlyProxy:         true,
-	NoCache:           true,
-	NoUpload:          false,
-	NeedMs:            false,
-	DefaultRoot:       "/",
-	CheckStatus:       false,
-	Alert:             "",
-	NoOverwriteUpload: false,
-}
-
-func init() {
-	op.RegisterDriver(func() driver.Driver {
-		return &Crypt{}
-	})
-}

drivers/crypt/types.go

@@ -1 +0,0 @@
-package crypt

drivers/crypt/util.go

@@ -1,44 +0,0 @@
-package crypt
-
-import (
-	stdpath "path"
-	"path/filepath"
-	"strings"
-
-	"github.com/alist-org/alist/v3/internal/op"
-)
-
-// will give the best guessing based on the path
-func guessPath(path string) (isFolder, secondTry bool) {
-	if strings.HasSuffix(path, "/") {
-		//confirmed a folder
-		return true, false
-	}
-	lastSlash := strings.LastIndex(path, "/")
-	if strings.Index(path[lastSlash:], ".") < 0 {
-		//no dot, try folder then try file
-		return true, true
-	}
-	return false, true
-}
-
-func (d *Crypt) getPathForRemote(path string, isFolder bool) (remoteFullPath string) {
-	if isFolder && !strings.HasSuffix(path, "/") {
-		path = path + "/"
-	}
-	dir, fileName := filepath.Split(path)
-
-	remoteDir := d.cipher.EncryptDirName(dir)
-	remoteFileName := ""
-	if len(strings.TrimSpace(fileName)) > 0 {
-		remoteFileName = d.cipher.EncryptFileName(fileName)
-	}
-	return stdpath.Join(d.RemotePath, remoteDir, remoteFileName)
-
-}
-
-// actual path is used for internal only. any link for user should come from remoteFullPath
-func (d *Crypt) getActualPathForRemote(path string, isFolder bool) (string, error) {
-	_, remoteActualPath, err := op.GetStorageAndActualPath(d.getPathForRemote(path, isFolder))
-	return remoteActualPath, err
-}

drivers/dropbox/driver.go

@@ -1,26 +1,20 @@
-package dropbox
+package template
 
 import (
 	"context"
-	"fmt"
-	"io"
-	"math"
-	"net/http"
-	"time"
 
-	"github.com/alist-org/alist/v3/drivers/base"
 	"github.com/alist-org/alist/v3/internal/driver"
+	"github.com/alist-org/alist/v3/internal/errs"
 	"github.com/alist-org/alist/v3/internal/model"
-	"github.com/alist-org/alist/v3/pkg/utils"
+	"github.com/dropbox/dropbox-sdk-go-unofficial/v6/dropbox"
-	"github.com/go-resty/resty/v2"
+	"github.com/dropbox/dropbox-sdk-go-unofficial/v6/dropbox/files"
-	log "github.com/sirupsen/logrus"
 )
 
 type Dropbox struct {
 	model.Storage
 	Addition
-	base        string
+
-	contentBase string
+	dbx files.Client
 }
 
 func (d *Dropbox) Config() driver.Config {
@@ -32,38 +26,11 @@ func (d *Dropbox) GetAddition() driver.Additional {
 }
 
 func (d *Dropbox) Init(ctx context.Context) error {
-	query := "foo"
+	cfg := dropbox.Config{
-	res, err := d.request("/2/check/user", http.MethodPost, func(req *resty.Request) {
+		Token: d.AccessToken,
-		req.SetBody(base.Json{
-			"query": query,
-		})
-	})
-	if err != nil {
-		return err
 	}
-	result := utils.Json.Get(res, "result").ToString()
+	d.dbx = files.New(cfg)
-	if result != query {
+	return nil
-		return fmt.Errorf("failed to check user: %s", string(res))
-	}
-	d.RootNamespaceId, err = d.GetRootNamespaceId(ctx)
-
-	return err
-}
-
-func (d *Dropbox) GetRootNamespaceId(ctx context.Context) (string, error) {
-	res, err := d.request("/2/users/get_current_account", http.MethodPost, func(req *resty.Request) {
-		req.SetBody(nil)
-	})
-	if err != nil {
-		return "", err
-	}
-	var currentAccountResp CurrentAccountResp
-	err = utils.Json.Unmarshal(res, &currentAccountResp)
-	if err != nil {
-		return "", err
-	}
-	rootNamespaceId := currentAccountResp.RootInfo.RootNamespaceId
-	return rootNamespaceId, nil
 }
 
 func (d *Dropbox) Drop(ctx context.Context) error {
@@ -71,170 +38,47 @@ func (d *Dropbox) Drop(ctx context.Context) error {
 }
 
 func (d *Dropbox) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([]model.Obj, error) {
-	files, err := d.getFiles(ctx, dir.GetPath())
+	// TODO return the files list, required
-	if err != nil {
+	return nil, errs.NotImplement
-		return nil, err
-	}
-	return utils.SliceConvert(files, func(src File) (model.Obj, error) {
-		return fileToObj(src), nil
-	})
 }
 
 func (d *Dropbox) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
-	res, err := d.request("/2/files/get_temporary_link", http.MethodPost, func(req *resty.Request) {
+	// TODO return link of file, required
-		req.SetContext(ctx).SetBody(base.Json{
+	return nil, errs.NotImplement
-			"path": file.GetPath(),
-		})
-	})
-	if err != nil {
-		return nil, err
-	}
-	url := utils.Json.Get(res, "link").ToString()
-	exp := time.Hour
-	return &model.Link{
-		URL:        url,
-		Expiration: &exp,
-	}, nil
 }
 
 func (d *Dropbox) MakeDir(ctx context.Context, parentDir model.Obj, dirName string) error {
-	_, err := d.request("/2/files/create_folder_v2", http.MethodPost, func(req *resty.Request) {
+	// TODO create folder, optional
-		req.SetContext(ctx).SetBody(base.Json{
+	return errs.NotImplement
-			"autorename": false,
-			"path":       parentDir.GetPath() + "/" + dirName,
-		})
-	})
-	return err
 }
 
 func (d *Dropbox) Move(ctx context.Context, srcObj, dstDir model.Obj) error {
-	toPath := dstDir.GetPath() + "/" + srcObj.GetName()
+	// TODO move obj, optional
-
+	return errs.NotImplement
-	_, err := d.request("/2/files/move_v2", http.MethodPost, func(req *resty.Request) {
-		req.SetContext(ctx).SetBody(base.Json{
-			"allow_ownership_transfer": false,
-			"allow_shared_folder":      false,
-			"autorename":               false,
-			"from_path":                srcObj.GetID(),
-			"to_path":                  toPath,
-		})
-	})
-	return err
 }
 
 func (d *Dropbox) Rename(ctx context.Context, srcObj model.Obj, newName string) error {
-	path := srcObj.GetPath()
+	// TODO rename obj, optional
-	fileName := srcObj.GetName()
+	return errs.NotImplement
-	toPath := path[:len(path)-len(fileName)] + newName
-
-	_, err := d.request("/2/files/move_v2", http.MethodPost, func(req *resty.Request) {
-		req.SetContext(ctx).SetBody(base.Json{
-			"allow_ownership_transfer": false,
-			"allow_shared_folder":      false,
-			"autorename":               false,
-			"from_path":                srcObj.GetID(),
-			"to_path":                  toPath,
-		})
-	})
-	return err
 }
 
 func (d *Dropbox) Copy(ctx context.Context, srcObj, dstDir model.Obj) error {
-	toPath := dstDir.GetPath() + "/" + srcObj.GetName()
+	// TODO copy obj, optional
-	_, err := d.request("/2/files/copy_v2", http.MethodPost, func(req *resty.Request) {
+	return errs.NotImplement
-		req.SetContext(ctx).SetBody(base.Json{
-			"allow_ownership_transfer": false,
-			"allow_shared_folder":      false,
-			"autorename":               false,
-			"from_path":                srcObj.GetID(),
-			"to_path":                  toPath,
-		})
-	})
-	return err
 }
 
 func (d *Dropbox) Remove(ctx context.Context, obj model.Obj) error {
-	uri := "/2/files/delete_v2"
+	// TODO remove obj, optional
-	_, err := d.request(uri, http.MethodPost, func(req *resty.Request) {
+	return errs.NotImplement
-		req.SetContext(ctx).SetBody(base.Json{
-			"path": obj.GetID(),
-		})
-	})
-	return err
 }
 
 func (d *Dropbox) Put(ctx context.Context, dstDir model.Obj, stream model.FileStreamer, up driver.UpdateProgress) error {
-	// 1. start
+	// TODO upload file, optional
-	sessionId, err := d.startUploadSession(ctx)
+	return errs.NotImplement
-	if err != nil {
-		return err
 }
 
-	// 2.append
+//func (d *Dropbox) Other(ctx context.Context, args model.OtherArgs) (interface{}, error) {
-	// A single request should not upload more than 150 MB, and each call must be multiple of 4MB  (except for last call)
+//	return nil, errs.NotSupport
-	const PartSize = 20971520
+//}
-	count := 1
-	if stream.GetSize() > PartSize {
-		count = int(math.Ceil(float64(stream.GetSize()) / float64(PartSize)))
-	}
-	offset := int64(0)
-
-	for i := 0; i < count; i++ {
-		if utils.IsCanceled(ctx) {
-			return ctx.Err()
-		}
-
-		start := i * PartSize
-		byteSize := stream.GetSize() - int64(start)
-		if byteSize > PartSize {
-			byteSize = PartSize
-		}
-
-		url := d.contentBase + "/2/files/upload_session/append_v2"
-		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)
-			return err
-		}
-		req = req.WithContext(ctx)
-		req.Header.Set("Content-Type", "application/octet-stream")
-		req.Header.Set("Authorization", "Bearer "+d.AccessToken)
-
-		args := UploadAppendArgs{
-			Close: false,
-			Cursor: UploadCursor{
-				Offset:    offset,
-				SessionID: sessionId,
-			},
-		}
-		argsJson, err := utils.Json.MarshalToString(args)
-		if err != nil {
-			return err
-		}
-		req.Header.Set("Dropbox-API-Arg", argsJson)
-
-		res, err := base.HttpClient.Do(req)
-		if err != nil {
-			return err
-		}
-		_ = res.Body.Close()
-
-		if count > 0 {
-			up(float64(i+1) * 100 / float64(count))
-		}
-
-		offset += byteSize
-
-	}
-	// 3.finish
-	toPath := dstDir.GetPath() + "/" + stream.GetName()
-	err2 := d.finishUploadSession(ctx, toPath, offset, sessionId)
-	if err2 != nil {
-		return err2
-	}
-
-	return err
-}
 
 var _ driver.Driver = (*Dropbox)(nil)