ci: remove commit-hash in version

docs: add XZB-1248 as a contributor for code

.all-contributorsrc

@@ -51,11 +51,47 @@
       "contributions": [
         "doc"
       ]
+    },
+    {
+      "login": "Windman1320",
+      "name": "Windman",
+      "avatar_url": "https://avatars.githubusercontent.com/u/9999486?v=4",
+      "profile": "https://github.com/Windman1320",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "ericarena",
+      "name": "ericarena",
+      "avatar_url": "https://avatars.githubusercontent.com/u/4518927?v=4",
+      "profile": "https://github.com/ericarena",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "WntFlm",
+      "name": "WntFlm",
+      "avatar_url": "https://avatars.githubusercontent.com/u/34620278?v=4",
+      "profile": "https://github.com/WntFlm",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "XZB-1248",
+      "name": "XZB-1248",
+      "avatar_url": "https://avatars.githubusercontent.com/u/28593573?v=4",
+      "profile": "https://github.com/XZB-1248",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7,
   "projectName": "alist",
-  "projectOwner": "Xhofe",
+  "projectOwner": "alist-org",
   "repoType": "github",
   "repoHost": "https://github.com",
   "skipCi": true

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,12 +1,20 @@
 name: "Bug report"
 description: Bug report
-labels: [pending triage]
+labels: [bug]
 body:
   - type: markdown
     attributes:
       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: You may select more than one, even select all.
+      options:
+        - label: I have read the [documentation](https://alist-doc.nn.ci).
+        - label: I'm sure there are no duplicate issues or discussions.
+        - label: I'm sure it's due to `alist` and not something else(such as `Dependencies` or `Operational`).
   - type: input
     id: version
     attributes:
@@ -15,6 +23,14 @@ body:
       placeholder: v2.0.0
     validations:
       required: true
+  - type: input
+    id: driver
+    attributes:
+      label: Driver used / 使用的存储驱动
+      description: What storage driver are you using?
+      placeholder: "for example: Onedrive"
+    validations:
+      required: true
   - type: textarea
     id: bug-description
     attributes:

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -1,7 +1,16 @@
 name: "Feature request"
 description: Feature request
-labels: ["enhancement: pending triage"]
+labels: [enhancement]
 body:
+  - type: checkboxes
+    attributes:
+      label: Please make sure of the following things
+      description: You may select more than one, even select all.
+      options:
+        - label: I have read the [documentation](https://alist-doc.nn.ci).
+        - label: I'm sure there are no duplicate issues or discussions.
+        - label: I'm sure this feature is not implemented.
+        - label: I'm sure it's a reasonable and popular requirement.
   - type: textarea
     id: feature-description
     attributes:

.github/workflows/auto_lang.yml

@@ -0,0 +1,64 @@
+name: auto_lang
+
+on:
+  push:
+    branches:
+      - 'main'
+    paths:
+      - 'drivers/**'
+      - 'internal/bootstrap/data/setting.go'
+  workflow_dispatch:
+
+jobs:
+  auto_lang:
+    strategy:
+      matrix:
+        platform: [ ubuntu-latest ]
+        go-version: [ 1.19 ]
+    name: auto generate lang.json
+    runs-on: ${{ matrix.platform }}
+    steps:
+      - name: Setup go
+        uses: actions/setup-go@v2
+        with:
+          go-version: ${{ matrix.go-version }}
+
+      - name: Checkout alist
+        uses: actions/checkout@v2
+        with:
+          path: alist
+
+      - name: Checkout alist-web
+        uses: actions/checkout@v3
+        with:
+          repository: 'alist-org/alist-web'
+          ref: main
+          persist-credentials: false
+          fetch-depth: 0
+          path: alist-web
+
+      - name: Generate lang
+        run: |
+          cd alist
+          go run ./main.go lang
+          cd ..
+      - name: Copy lang file
+        run: |
+          cp -f ./alist/lang/*.json ./alist-web/src/lang/en/ 2>/dev/null || :
+
+      - name: Commit git
+        run: |
+          cd alist-web
+          git add .
+          git config --local user.email "i@nn.ci"
+          git config --local user.name "Noah Hsu"
+          git commit -m "chore: auto update i18n file" -a 2>/dev/null || :
+          cd ..
+
+      - name: Push lang files
+        uses: ad-m/github-push-action@master
+        with:
+          github_token: ${{ secrets.MY_TOKEN }}
+          branch: main
+          directory: alist-web
+          repository: alist-org/alist-web

.github/workflows/build.yml

@@ -11,7 +11,7 @@ jobs:
     strategy:
       matrix:
         platform: [ubuntu-latest]
-        go-version: [1.17]
+        go-version: [1.18]
     name: Build
     runs-on: ${{ matrix.platform }}
     steps:
@@ -20,17 +20,10 @@ jobs:
         with:
           go-version: ${{ matrix.go-version }}
 
-      - name: Set up Node
-        uses: actions/setup-node@v2
-        with:
-          node-version: '16'
-
       - name: Checkout
-        uses: actions/checkout@v2
-        with:
-          path: alist
+        uses: actions/checkout@v3
 
-      - name: Install upx
+      - name: Install dependencies
         run: |
           docker pull techknowlogick/xgo:latest
           go install src.techknowlogick.com/xgo@latest
@@ -38,13 +31,10 @@ jobs:
 
       - name: Build
         run: |
-          mv alist/build.sh .
-          bash build.sh web
-          mv dist/* alist/public
-          bash build.sh build
+          bash build.sh dev
 
       - name: Upload artifact
         uses: actions/upload-artifact@v2
         with:
-          name: artifact
-          path: alist/build
+          name: alist
+          path: dist

.github/workflows/build_docker.yml

@@ -2,7 +2,7 @@ name: build_docker
 
 on:
   push:
-    branches: [ v2 ]
+    branches: [ main ]
 
 jobs:
   build_docker:
@@ -16,14 +16,9 @@ jobs:
         uses: docker/metadata-action@v3
         with:
           images: xhofe/alist
-      - name: Set up Node
-        uses: actions/setup-node@v2
-        with:
-          node-version: '16'
-      - name: Build web
+      - name: Replace release with dev
         run: |
-          bash build.sh web
-          mv dist/* public
+          sed -i 's/release/dev/g' Dockerfile
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v1
       - name: Set up Docker Buildx
@@ -41,4 +36,4 @@ jobs:
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/386,linux/arm/v6,linux/s390x
+          platforms: linux/amd64,linux/arm64

.github/workflows/issue_check_inactive.yml

@@ -0,0 +1,16 @@
+name: Check inactive
+
+on:
+  schedule:
+    - cron: "0 0 1 * *"
+
+jobs:
+  check-inactive:
+    runs-on: ubuntu-latest
+    steps:
+      - name: check-inactive
+        uses: actions-cool/issues-helper@v3
+        with:
+          actions: 'check-inactive'
+          token: ${{ secrets.GITHUB_TOKEN }}
+          inactive-day: 30

.github/workflows/issue_check_question.yml

@@ -9,12 +9,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: close-issues
-        uses: actions-cool/issues-helper@v2
+        uses: actions-cool/issues-helper@v3
         with:
           actions: 'close-issues'
           token: ${{ secrets.GITHUB_TOKEN }}
           labels: 'question'
           inactive-day: 7
+          close-reason: 'not_planned'
           body: |
             Hello @${{ github.event.issue.user.login }}, this issue was closed due to no activities in 7 days.
             你好 @${{ github.event.issue.user.login }}，此issue因超过7天未回复被关闭。

.github/workflows/issue_duplicate.yml

@@ -19,7 +19,7 @@ jobs:
             Hello @${{ github.event.issue.user.login }}, your issue is a duplicate and will be closed.
             你好 @${{ github.event.issue.user.login }}，你的issue是重复的，将被关闭。
       - name: Close issue
-        uses: actions-cool/issues-helper@v2
+        uses: actions-cool/issues-helper@v3
         with:
           actions: 'close-issue'
           token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/issue_invalid.yml

@@ -19,7 +19,7 @@ jobs:
             Hello @${{ github.event.issue.user.login }}, your issue is invalid and will be closed.
             你好 @${{ github.event.issue.user.login }}，你的issue无效，将被关闭。
       - name: Close issue
-        uses: actions-cool/issues-helper@v2
+        uses: actions-cool/issues-helper@v3
         with:
           actions: 'close-issue'
           token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/issue_month_statistics.yml

@@ -1,16 +0,0 @@
-name: Issue Month Statistics
-
-on:
-  schedule:
-    - cron: "0 1 1 * *"
-
-jobs:
-  month-statistics:
-    runs-on: ubuntu-latest
-    steps:
-      - name: month-statistics
-        uses: actions-cool/issues-month-statistics@v1
-        with:
-          count-lables: true
-          count-comments: true
-          emoji: 'eyes'

.github/workflows/issue_similarity.yml

@@ -0,0 +1,18 @@
+name: Issues Similarity Analysis
+
+on:
+  issues:
+    types: [opened, edited]
+
+jobs:
+  similarity-analysis:
+    runs-on: ubuntu-latest
+    steps:
+      - name: analysis
+        uses: actions-cool/issues-similarity-analysis@v1
+        with:
+          filter-threshold: 0.5
+          comment-title: '### See'
+          comment-body: '${index}. ${similarity} #${number}'
+          show-footer: false
+          show-mentioned: true

.github/workflows/issue_translate.yml

@@ -0,0 +1,13 @@
+name: Translation Helper
+
+on:
+  pull_request_target:
+    types: [opened]
+  issues:
+    types: [opened]
+
+jobs:
+  translate:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions-cool/translation-helper@v1.2.0

.github/workflows/issue_wontfix.yml

@@ -19,7 +19,7 @@ jobs:
             Hello @${{ github.event.issue.user.login }}, this issue will not be worked on and will be closed.
             你好 @${{ github.event.issue.user.login }}，这不会被处理，将被关闭。
       - name: Close issue
-        uses: actions-cool/issues-helper@v2
+        uses: actions-cool/issues-helper@v3
         with:
           actions: 'close-issue'
           token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release.yml

@@ -6,11 +6,23 @@ on:
       - '*'
 
 jobs:
+  changelog:
+    name: Create Release
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - run: npx changelogithub # or changelogithub@0.12 if ensure the stable result
+        env:
+          GITHUB_TOKEN: ${{secrets.MY_TOKEN}}
   release:
+    needs: changelog
     strategy:
       matrix:
         platform: [ubuntu-latest]
-        go-version: [1.17]
+        go-version: [1.18]
     name: Release
     runs-on: ${{ matrix.platform }}
     steps:
@@ -22,12 +34,9 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
         with:
-          ref: v2
-          path: alist
-          persist-credentials: false
           fetch-depth: 0
 
-      - name: Install upx
+      - name: Install dependencies
         run: |
           docker pull techknowlogick/xgo:latest
           go install src.techknowlogick.com/xgo@latest
@@ -35,12 +44,9 @@ jobs:
 
       - name: Build
         run: |
-          mv alist/build.sh .
-          bash build.sh cdn
-          mv dist/* alist/public
           bash build.sh release
 
       - name: Release
         uses: softprops/action-gh-release@v1
         with:
-          files: alist/build/compress/*
+          files: build/compress/*

.github/workflows/release_docker.yml

@@ -6,34 +6,31 @@ on:
       - '*'
 
 jobs:
-  docker_release:
+  release_docker:
     name: Docker
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v2
+
       - name: Docker meta
         id: meta
         uses: docker/metadata-action@v3
         with:
           images: xhofe/alist
-      - name: Set up Node
-        uses: actions/setup-node@v2
-        with:
-          node-version: '16'
-      - name: Build web
-        run: |
-          bash build.sh cdn
-          mv dist/* public
+
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v1
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
+
       - name: Login to DockerHub
         uses: docker/login-action@v1
         with:
           username: xhofe
           password: ${{ secrets.DOCKERHUB_TOKEN }}
+
       - name: Build and push
         id: docker_build
         uses: docker/build-push-action@v2

.gitignore

@@ -1,7 +1,7 @@
 .idea/
 .DS_Store
 output/
-dist/
+/dist/
 
 # Binaries for programs and plugins
 *.exe
@@ -21,9 +21,9 @@ dist/
 # Dependency directories (remove the comment below to include it)
 # vendor/
 bin/*
-/alist
 *.json
-public/*.html
-public/assets/
-public/public/
 data/
+log/
+lang/
+public/dist/*
+!public/dist/README.md

CONTRIBUTING.md

@@ -7,28 +7,31 @@
 Prerequisites:
 
 - [git](https://nodejs.org/zh-cn/)
-- [Go 1.17+](https://golang.org/doc/install)
+- [Go 1.18+](https://golang.org/doc/install)
 - [gcc](https://gcc.gnu.org/)
 - [nodejs](https://nodejs.org/)
 
 Clone `alist` and `alist-web` anywhere:
 
 ```shell
-$ git clone https://github.com/Xhofe/alist.git
-$ git clone https://github.com/Xhofe/alist-web.git
+$ git clone https://github.com/alist-org/alist.git
+$ git clone --recurse-submodules https://github.com/alist-org/alist-web.git
 ```
-You should switch to the dev branch for development.
+You should switch to the `main` branch for development.
 
 ## Preview your change
 ### backend
 ```shell
-$ go run alist.go
+$ go run main.go
 ```
 ### frontend
 ```shell
-$ yarn dev
+$ pnpm dev
 ```
 
+## Add a new driver
+Copy `drivers/template` folder and rename it, and follow the comments in it.
+
 ## Create a commit
 
 Commit messages should be well formatted, and to make that "standardized".
@@ -73,7 +76,6 @@ Must be one of the following:
 * **chore**: Changes to the build process or auxiliary tools and libraries such as documentation
   generation
 * **release**: Release a new version
-* **workflow**: Workflow related file modification
 
 ### Scope
 The scope could be anything specifying place of the commit change. For example `$location`,
@@ -102,4 +104,4 @@ The rest of the commit message is then used for this.
 ## Submit a pull request
 
 Push your branch to your `alist` fork and open a pull request against the
-`dev` branch.
+`main` branch.

CONTRIBUTORS.md

@@ -1,5 +1,5 @@
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-[![All Contributors](https://img.shields.io/badge/all_contributors-5-orange.svg?style=flat-square)](#contributors-)
+[![All Contributors](https://img.shields.io/badge/all_contributors-9-orange.svg?style=flat-square)](#contributors-)
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 
 ## Contributors ✨
@@ -11,11 +11,17 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
 <!-- markdownlint-disable -->
 <table>
   <tr>
-    <td align="center"><a href="http://nn.ci"><img src="https://avatars.githubusercontent.com/u/36558727?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Xhofe</b></sub></a><br /><a href="https://github.com/Xhofe/alist/commits?author=Xhofe" title="Code">💻</a> <a href="#ideas-Xhofe" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/Xhofe/alist/commits?author=Xhofe" title="Documentation">📖</a></td>
-    <td align="center"><a href="https://github.com/foxxorcat"><img src="https://avatars.githubusercontent.com/u/95907542?v=4?s=100" width="100px;" alt=""/><br /><sub><b>foxxorcat</b></sub></a><br /><a href="https://github.com/Xhofe/alist/commits?author=foxxorcat" title="Code">💻</a></td>
-    <td align="center"><a href="https://www.iflu.cf/"><img src="https://avatars.githubusercontent.com/u/63903027?v=4?s=100" width="100px;" alt=""/><br /><sub><b>道辰</b></sub></a><br /><a href="https://github.com/Xhofe/alist/commits?author=DaoChen6" title="Documentation">📖</a></td>
-    <td align="center"><a href="https://vg-land.github.io/"><img src="https://avatars.githubusercontent.com/u/16739728?v=4?s=100" width="100px;" alt=""/><br /><sub><b>vg-land</b></sub></a><br /><a href="https://github.com/Xhofe/alist/commits?author=vg-land" title="Code">💻</a></td>
-    <td align="center"><a href="https://c5y.moe"><img src="https://avatars.githubusercontent.com/u/18461360?v=4?s=100" width="100px;" alt=""/><br /><sub><b>凌莞~(=^▽^=)</b></sub></a><br /><a href="https://github.com/Xhofe/alist/commits?author=Clansty" title="Documentation">📖</a></td>
+    <td align="center"><a href="http://nn.ci"><img src="https://avatars.githubusercontent.com/u/36558727?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Xhofe</b></sub></a><br /><a href="https://github.com/alist-org/alist/commits?author=Xhofe" title="Code">💻</a> <a href="#ideas-Xhofe" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/alist-org/alist/commits?author=Xhofe" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/foxxorcat"><img src="https://avatars.githubusercontent.com/u/95907542?v=4?s=100" width="100px;" alt=""/><br /><sub><b>foxxorcat</b></sub></a><br /><a href="https://github.com/alist-org/alist/commits?author=foxxorcat" title="Code">💻</a></td>
+    <td align="center"><a href="https://www.iflu.cf/"><img src="https://avatars.githubusercontent.com/u/63903027?v=4?s=100" width="100px;" alt=""/><br /><sub><b>道辰</b></sub></a><br /><a href="https://github.com/alist-org/alist/commits?author=DaoChen6" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://vg-land.github.io/"><img src="https://avatars.githubusercontent.com/u/16739728?v=4?s=100" width="100px;" alt=""/><br /><sub><b>vg-land</b></sub></a><br /><a href="https://github.com/alist-org/alist/commits?author=vg-land" title="Code">💻</a></td>
+    <td align="center"><a href="https://c5y.moe"><img src="https://avatars.githubusercontent.com/u/18461360?v=4?s=100" width="100px;" alt=""/><br /><sub><b>凌莞~(=^▽^=)</b></sub></a><br /><a href="https://github.com/alist-org/alist/commits?author=Clansty" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/Windman1320"><img src="https://avatars.githubusercontent.com/u/9999486?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Windman</b></sub></a><br /><a href="https://github.com/alist-org/alist/commits?author=Windman1320" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/ericarena"><img src="https://avatars.githubusercontent.com/u/4518927?v=4?s=100" width="100px;" alt=""/><br /><sub><b>ericarena</b></sub></a><br /><a href="https://github.com/alist-org/alist/commits?author=ericarena" title="Code">💻</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="https://github.com/WntFlm"><img src="https://avatars.githubusercontent.com/u/34620278?v=4?s=100" width="100px;" alt=""/><br /><sub><b>WntFlm</b></sub></a><br /><a href="https://github.com/alist-org/alist/commits?author=WntFlm" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/XZB-1248"><img src="https://avatars.githubusercontent.com/u/28593573?v=4?s=100" width="100px;" alt=""/><br /><sub><b>XZB-1248</b></sub></a><br /><a href="https://github.com/alist-org/alist/commits?author=XZB-1248" title="Code">💻</a></td>
   </tr>
 </table>
 

Dockerfile

@@ -2,8 +2,8 @@ FROM alpine:edge as builder
 LABEL stage=go-builder
 WORKDIR /app/
 COPY ./ ./
-RUN apk add --no-cache bash git go gcc musl-dev; \
-    bash build.sh docker
+RUN apk add --no-cache bash git go gcc musl-dev curl; \
+    bash build.sh release docker
 
 FROM alpine:edge
 LABEL MAINTAINER="i@nn.ci"
@@ -11,4 +11,4 @@ VOLUME /opt/alist/data/
 WORKDIR /opt/alist/
 COPY --from=builder /app/bin/alist ./
 EXPOSE 5244
-CMD [ "./alist", "-docker" ]
+CMD [ "./alist", "server", "--no-prefix" ]

README.md

@@ -1,13 +1,29 @@
 <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>🗂️Another file list program that supports multiple storage, powered by Gin and React.</em></p>
-  <a href="https://github.com/Xhofe/alist/releases"><img src="https://img.shields.io/github/release/Xhofe/alist?style=flat-square" alt="latest version"></a>
-  <a href="https://github.com/Xhofe/alist/discussions"><img src="https://img.shields.io/github/discussions/Xhofe/alist?color=%23ED8936&style=flat-square" alt="discussions"></a>
-  <a href="https://github.com/Xhofe/alist/actions?query=workflow%3ABuild"><img src="https://img.shields.io/github/workflow/status/Xhofe/alist/build?style=flat-square" alt="Build status"></a>
-  <a href="https://github.com/Xhofe/alist/releases"><img src="https://img.shields.io/github/downloads/Xhofe/alist/total?style=flat-square&color=%239F7AEA" alt="Downloads"></a>
-  <a href="https://github.com/Xhofe/alist/blob/v2/LICENSE"><img src="https://img.shields.io/github/license/Xhofe/alist?style=flat-square" alt="License"></a>
+  <p><em>🗂️A file list program that supports multiple storage, powered by Gin and Solidjs.</em></p>
+  <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/discussions">
+    <img src="https://img.shields.io/github/discussions/Xhofe/alist?color=%23ED8936" alt="discussions" />
+  </a>
+  <a href="https://github.com/Xhofe/alist/actions?query=workflow%3ABuild">
+    <img src="https://img.shields.io/github/workflow/status/Xhofe/alist/build" 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 href="https://github.com/Xhofe/alist/releases">
+    <img src="https://img.shields.io/github/downloads/Xhofe/alist/total?color=%239F7AEA" alt="Downloads" />
+  </a>
+  <a title="Crowdin" target="_blank" href="https://crwd.in/alist">
+    <img src="https://badges.crowdin.net/alist/localized.svg">
+  </a>
   <a href="https://pay.xhofe.top">
-    <img src="https://img.shields.io/badge/%24-donate-ff69b4.svg?style=flat-square" alt="donate">
+    <img src="https://img.shields.io/badge/%24-sponsor-ff69b4.svg" alt="sponsor" />
   </a>
 </div>
 
@@ -24,53 +40,50 @@ English | [中文](./README_cn.md) | [Contributors](./CONTRIBUTORS.md) | [Contri
     - [x] [189cloud](https://cloud.189.cn) (Personal, Family)
     - [x] [GoogleDrive](https://drive.google.com/)
     - [x] [123pan](https://www.123pan.com/)
-  - [x] [Lanzou](https://pc.woozooo.com/)
-  - [x] [Alist](https://github.com/Xhofe/alist)
-  - [x] FTP
+    - [x] FTP / SFTP
     - [x] [PikPak](https://www.mypikpak.com/)
-  - [x] [ShandianPan](https://shandianpan.com/)
     - [x] [S3](https://aws.amazon.com/s3/)
-  - [x] WebDav
+    - [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] [Yandex.Disk](https://disk.yandex.com/)
-  - [x] [Baidu Disk](http://pan.baidu.com/)
+    - [x] [YandexDisk](https://disk.yandex.com/)
+    - [x] [BaiduNetdisk](http://pan.baidu.com/)
     - [x] [Quark](https://pan.quark.cn)
-  - [x] [XunleiCloud](https://pan.xunlei.com/)
 - [x] Easy to deploy and out-of-the-box
 - [x] File preview (PDF, markdown, code, plain text, ...)
 - [x] Image preview in gallery mode
-- [x] Video and audio preview (mp4, mp3, ...)
+- [x] Video and audio preview, support lyrics and subtitles
 - [x] Office documents preview (docx, pptx, xlsx, ...)
 - [x] `README.md` preview rendering
 - [x] File permalink copy and direct file download
 - [x] Dark mode
 - [x] I18n
 - [x] Protected routes (password protection and authentication)
-- [x] WebDav (see https://alist-doc.nn.ci/en/docs/webdav for details)
+- [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] File/Folder package download
-- [x] Support video list playback and subtitles(ass,srt,vtt)
 - [x] Web upload(Can allow visitors to upload), delete, mkdir, rename, move and copy
+- [x] Offline download
+- [x] Copy files between two storage
+
+## Document
+
+<https://alist.nn.ci/>
+
+## Demo
+
+<https://pan.nn.ci>
 
 ## Discussion
 
 Please go to our [discussion forum](https://github.com/Xhofe/alist/discussions) for general questions, **issues are for bug reports and feature request only.**
 
-## Demo
-
-Available at: <https://alist.nn.ci>.
-
-![demo](https://store.heytapimage.com/cdo-portal/feedback/202202/20/b271627971e29f0c7c9d59935b6ef381.png)
-
-## Document
-
-<https://alist-doc.nn.ci/en/>
-
 ## Special sponsors
-- [Find Resources - Aliyundrive Resource Search Engine](https://zhaoziyuan.la/)
+- [找资源 - 阿里云盘资源搜索引擎](https://zhaoziyuan.la/)
+- [KinhDown 百度云盘不限速下载！永久免费！已稳定运行3年！非常可靠!](https://kinhdown.com/?Type=Tutorials)
 - [JetBrains: Essential tools for software developers and teams](https://www.jetbrains.com/)
 
 ## License
@@ -86,4 +99,4 @@ The `AList` is open-source software licensed under the AGPL-3.0 license.
 
 ---
 
-> [@Blog](https://nn.ci/) · [@GitHub](https://github.com/Xhofe) · [@TelegramGroup](https://t.me/alist_chat) · [@QQGroup](https://jq.qq.com/?_wv=1027&k=OVPJcv2b)
+> [@Blog](https://nn.ci/) · [@GitHub](https://github.com/Xhofe) · [@TelegramGroup](https://t.me/alist_chat) · [@QQGroup](https://jq.qq.com/?_wv=1027&k=YJJj2Gwb)

README_cn.md

@@ -1,13 +1,29 @@
 <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 和 React 。</em></p>
-  <a href="https://github.com/Xhofe/alist/releases"><img src="https://img.shields.io/github/release/Xhofe/alist?style=flat-square" alt="latest version"></a>
-  <a href="https://github.com/Xhofe/alist/discussions"><img src="https://img.shields.io/github/discussions/Xhofe/alist?color=%23ED8936&style=flat-square" alt="discussions"></a>
-  <a href="https://github.com/Xhofe/alist/actions?query=workflow%3ABuild"><img src="https://img.shields.io/github/workflow/status/Xhofe/alist/build?style=flat-square" alt="Build status"></a>
-  <a href="https://github.com/Xhofe/alist/releases"><img src="https://img.shields.io/github/downloads/Xhofe/alist/total?style=flat-square&color=%239F7AEA" alt="Downloads"></a>
-  <a href="https://github.com/Xhofe/alist/blob/v2/LICENSE"><img src="https://img.shields.io/github/license/Xhofe/alist?style=flat-square" alt="License"></a>
+  <p><em>🗂一个支持多存储的文件列表程序，使用 Gin 和 Solidjs。</em></p>
+  <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/discussions">
+    <img src="https://img.shields.io/github/discussions/Xhofe/alist?color=%23ED8936" alt="discussions" />
+  </a>
+  <a href="https://github.com/Xhofe/alist/actions?query=workflow%3ABuild">
+    <img src="https://img.shields.io/github/workflow/status/Xhofe/alist/build" 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 href="https://github.com/Xhofe/alist/releases">
+    <img src="https://img.shields.io/github/downloads/Xhofe/alist/total?color=%239F7AEA" alt="Downloads" />
+  </a>
+  <a title="Crowdin" target="_blank" href="https://crwd.in/alist">
+    <img src="https://badges.crowdin.net/alist/localized.svg">
+  </a>
   <a href="https://pay.xhofe.top">
-    <img src="https://img.shields.io/badge/%24-donate-ff69b4.svg?style=flat-square" alt="donate">
+    <img src="https://img.shields.io/badge/%24-sponsor-ff69b4.svg" alt="sponsor" />
   </a>
 </div>
 
@@ -15,7 +31,7 @@
 
 [English](./README.md) | 中文 | [Contributors](./CONTRIBUTORS.md) | [Contributing](./CONTRIBUTING.md)
 
-## 支持
+## Features
 
 - [x] 多种存储
     - [x] 本地存储
@@ -24,53 +40,50 @@
     - [x] [天翼云盘](https://cloud.189.cn) (个人云, 家庭云)
     - [x] [GoogleDrive](https://drive.google.com/)
     - [x] [123云盘](https://www.123pan.com/)
-  - [x] [蓝奏云](https://pc.woozooo.com/)
-  - [x] [Alist](https://github.com/Xhofe/alist)
-  - [x] FTP
+    - [x] FTP / SFTP
     - [x] [PikPak](https://www.mypikpak.com/)
-  - [x] [闪电盘](https://shandianpan.com/)
     - [x] [S3](https://aws.amazon.com/cn/s3/)
-  - [x] WebDav
+    - [x] [又拍云对象存储](https://www.upyun.com/products/file-storage)
+    - [x] WebDav(支持无API的OneDrive/SharePoint)
     - [x] Teambition（[中国](https://www.teambition.com/ )，[国际](https://us.teambition.com/ )）
     - [x] [分秒帧](https://www.mediatrack.cn/)
     - [x] [和彩云](https://yun.139.com/) (个人云, 家庭云)
     - [x] [Yandex.Disk](https://disk.yandex.com/)
     - [x] [百度网盘](http://pan.baidu.com/)
     - [x] [夸克网盘](https://pan.quark.cn)
-  - [x] [迅雷云盘](https://pan.xunlei.com/)
 - [x] 部署方便，开箱即用
 - [x] 文件预览（PDF、markdown、代码、纯文本……）
 - [x] 画廊模式下的图像预览
-- [x] 视频和音频预览（mp4、mp3 等）
+- [x] 视频和音频预览，支持歌词和字幕
 - [x] Office 文档预览（docx、pptx、xlsx、...）
 - [x] `README.md` 预览渲染
 - [x] 文件永久链接复制和直接文件下载
 - [x] 黑暗模式
 - [x] 国际化
 - [x] 受保护的路由（密码保护和身份验证）
-- [x] WebDav（具体见https://alist-doc.nn.ci/docs/webdav ）
+- [x] WebDav (具体见 https://alist.nn.ci/zh/guide/webdav.html)
 - [x] [Docker 部署](https://hub.docker.com/r/xhofe/alist)
 - [x] Cloudflare workers 中转
 - [x] 文件/文件夹打包下载
-- [x] 支持视频列表播放和字幕(ass,srt,vtt)
 - [x] 网页上传(可以允许访客上传)，删除，新建文件夹，重命名，移动，复制
+- [x] 离线下载
+- [x] 跨存储复制文件
 
-## 讨论
+## Document
+
+<https://alist.nn.ci/zh/>
+
+## Demo
+
+<https://pan.nn.ci>
+
+## Discussion
 
 一般问题请到[讨论论坛](https://github.com/Xhofe/alist/discussions) ，**issue仅针对错误报告和功能请求。**
 
-## 演示
-
-<https://alist.nn.ci>。
-
-![演示](https://store.heytapimage.com/cdo-portal/feedback/202202/20/b271627971e29f0c7c9d59935b6ef381.png)
-
-## 文档
-
-<https://alist-doc.nn.ci/>
-
-## 特别赞助
+## Special sponsors
 - [找资源 - 阿里云盘资源搜索引擎](https://zhaoziyuan.la/)
+- [KinhDown 百度云盘不限速下载！永久免费！已稳定运行3年！非常可靠!](https://kinhdown.com/?Type=Tutorials)
 - [JetBrains: Essential tools for software developers and teams](https://www.jetbrains.com/)
 
 ##  许可
@@ -86,4 +99,4 @@
 
 ---
 
-> [@Blog](https://nn.ci/) · [@GitHub](https://github.com/Xhofe) · [@TelegramGroup](https://t.me/alist_chat) · [@QQGroup](https://jq.qq.com/?_wv=1027&k=OVPJcv2b)
+> [@博客](https://nn.ci/) · [@GitHub](https://github.com/Xhofe) · [@Telegram群](https://t.me/alist_chat) · [@QQ群](https://jq.qq.com/?_wv=1027&k=YJJj2Gwb)

alist.go

@@ -1,60 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"github.com/Xhofe/alist/bootstrap"
-	"github.com/Xhofe/alist/conf"
-	_ "github.com/Xhofe/alist/drivers"
-	"github.com/Xhofe/alist/model"
-	"github.com/Xhofe/alist/server"
-	"github.com/gin-gonic/gin"
-	log "github.com/sirupsen/logrus"
-)
-
-func Init() bool {
-	//bootstrap.InitLog()
-	bootstrap.InitConf()
-	bootstrap.InitCron()
-	bootstrap.InitModel()
-	if conf.Password {
-		pass, err := model.GetSettingByKey("password")
-		if err != nil {
-			log.Errorf(err.Error())
-			return false
-		}
-		fmt.Printf("your password: %s\n", pass.Value)
-		return false
-	}
-	server.InitIndex()
-	bootstrap.InitSettings()
-	bootstrap.InitAccounts()
-	bootstrap.InitCache()
-	return true
-}
-
-func main() {
-	if conf.Version {
-		fmt.Printf("Built At: %s\nGo Version: %s\nAuthor: %s\nCommit ID: %s\nVersion: %s\nWebVersion: %s\n",
-			conf.BuiltAt, conf.GoVersion, conf.GitAuthor, conf.GitCommit, conf.GitTag, conf.WebTag)
-		return
-	}
-	if !Init() {
-		return
-	}
-	if !conf.Debug {
-		gin.SetMode(gin.ReleaseMode)
-	}
-	r := gin.Default()
-	server.InitApiRouter(r)
-	base := fmt.Sprintf("%s:%d", conf.Conf.Address, conf.Conf.Port)
-	log.Infof("start server @ %s", base)
-	var err error
-	if conf.Conf.Scheme.Https {
-		err = r.RunTLS(base, conf.Conf.Scheme.CertFile, conf.Conf.Scheme.KeyFile)
-	} else {
-		err = r.Run(base)
-	}
-	if err != nil {
-		log.Errorf("failed to start: %s", err.Error())
-	}
-}

alist_test.go

@@ -1,12 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"net/url"
-	"testing"
-)
-
-func TestUrl(t *testing.T) {
-	s,_ := url.QueryUnescape("/ali/%E7%8C%AA%E5%A4%B4%E7%9A%84%E6%96%87%E4%BB%B6%5B%E5%98%BF%E5%98%BF%5D/%E9%82%B9%E9%82%B9%E7%9A%84%E6%96%87%E4%BB%B6/%E6%A1%8C%E9%9D%A2%E5%A3%81%E7%BA%B8/v2-e8f266ba17ae387eefed1cb22b2b5e4e_r.jpg")
-	fmt.Print(s)
-}

bootstrap/account.go

@@ -1,33 +0,0 @@
-package bootstrap
-
-import (
-	"github.com/Xhofe/alist/conf"
-	"github.com/Xhofe/alist/drivers/base"
-	"github.com/Xhofe/alist/drivers/operate"
-	"github.com/Xhofe/alist/model"
-	log "github.com/sirupsen/logrus"
-)
-
-func InitAccounts() {
-	log.Infof("init accounts...")
-	var accounts []model.Account
-	if err := conf.DB.Find(&accounts).Error; err != nil {
-		log.Fatalf("failed sync init accounts")
-	}
-	for i, account := range accounts {
-		model.RegisterAccount(account)
-		driver, ok := base.GetDriver(account.Type)
-		if !ok {
-			log.Errorf("no [%s] driver", account.Type)
-		} else {
-			log.Infof("start init account: [%s], type: [%s]", account.Name, account.Type)
-			//err := driver.Save(&accounts[i], nil)
-			err := operate.Save(driver, &accounts[i], nil)
-			if err != nil {
-				log.Errorf("init account [%s] error:[%s]", account.Name, err.Error())
-			} else {
-				log.Infof("success init account: %s, type: %s", account.Name, account.Type)
-			}
-		}
-	}
-}

bootstrap/cache.go

@@ -1,22 +0,0 @@
-package bootstrap
-
-import (
-	"github.com/Xhofe/alist/conf"
-	"github.com/eko/gocache/v2/cache"
-	"github.com/eko/gocache/v2/store"
-	goCache "github.com/patrickmn/go-cache"
-	log "github.com/sirupsen/logrus"
-	"time"
-)
-
-// InitCache init cache
-func InitCache() {
-	log.Infof("init cache...")
-	c := conf.Conf.Cache
-	if c.Expiration == 0 {
-		c.Expiration, c.CleanupInterval = 60, 120
-	}
-	goCacheClient := goCache.New(time.Duration(c.Expiration)*time.Minute, time.Duration(c.CleanupInterval)*time.Minute)
-	goCacheStore := store.NewGoCache(goCacheClient, nil)
-	conf.Cache = cache.New(goCacheStore)
-}

bootstrap/conf.go

@@ -1,66 +0,0 @@
-package bootstrap
-
-import (
-	"github.com/Xhofe/alist/conf"
-	"github.com/Xhofe/alist/utils"
-	"github.com/caarlos0/env/v6"
-	log "github.com/sirupsen/logrus"
-	"io/ioutil"
-	"os"
-)
-
-// InitConf init config
-func InitConf() {
-	log.Infof("reading config file: %s", conf.ConfigFile)
-	if !utils.Exists(conf.ConfigFile) {
-		log.Infof("config file not exists, creating default config file")
-		_, err := utils.CreatNestedFile(conf.ConfigFile)
-		if err != nil {
-			log.Fatalf("failed to create config file")
-		}
-		conf.Conf = conf.DefaultConfig()
-		if !utils.WriteToJson(conf.ConfigFile, conf.Conf) {
-			log.Fatalf("failed to create default config file")
-		}
-	} else {
-		config, err := ioutil.ReadFile(conf.ConfigFile)
-		if err != nil {
-			log.Fatalf("reading config file error:%s", err.Error())
-		}
-		conf.Conf = conf.DefaultConfig()
-		err = utils.Json.Unmarshal(config, conf.Conf)
-		if err != nil {
-			log.Fatalf("load config error: %s", err.Error())
-		}
-		log.Debugf("config:%+v", conf.Conf)
-		// update config.json struct
-		confBody, err := utils.Json.MarshalIndent(conf.Conf, "", "  ")
-		if err != nil {
-			log.Fatalf("marshal config error:%s", err.Error())
-		}
-		err = ioutil.WriteFile(conf.ConfigFile, confBody, 0777)
-		if err != nil {
-			log.Fatalf("update config struct error: %s", err.Error())
-		}
-	}
-	if !conf.Conf.Force {
-		confFromEnv()
-	}
-	err := os.MkdirAll(conf.Conf.TempDir, 0700)
-	if err != nil {
-		log.Fatalf("create temp dir error: %s", err.Error())
-	}
-	log.Debugf("config: %+v", conf.Conf)
-}
-
-func confFromEnv() {
-	prefix := "ALIST_"
-	if conf.Docker {
-		prefix = ""
-	}
-	if err := env.Parse(conf.Conf, env.Options{
-		Prefix: prefix,
-	}); err != nil {
-		log.Fatalf("load config from env error: %s", err.Error())
-	}
-}

bootstrap/cron.go

@@ -1,14 +0,0 @@
-package bootstrap
-
-import (
-	"github.com/Xhofe/alist/conf"
-	"github.com/robfig/cron/v3"
-	log "github.com/sirupsen/logrus"
-)
-
-// InitCron init cron
-func InitCron() {
-	log.Infof("init cron...")
-	conf.Cron = cron.New()
-	conf.Cron.Start()
-}

bootstrap/log.go

@@ -1,36 +0,0 @@
-package bootstrap
-
-import (
-	"flag"
-	"github.com/Xhofe/alist/conf"
-	log "github.com/sirupsen/logrus"
-)
-
-// InitLog init log
-func InitLog() {
-	if conf.Debug {
-		log.SetLevel(log.DebugLevel)
-		log.SetReportCaller(true)
-	}
-	if conf.Password || conf.Version {
-		log.SetLevel(log.WarnLevel)
-	}
-	log.SetFormatter(&log.TextFormatter{
-		//DisableColors: true,
-		ForceColors:               true,
-		EnvironmentOverrideColors: true,
-		TimestampFormat:           "2006-01-02 15:04:05",
-		FullTimestamp:             true,
-	})
-	log.Infof("init log...")
-}
-
-func init() {
-	flag.StringVar(&conf.ConfigFile, "conf", "data/config.json", "config file")
-	flag.BoolVar(&conf.Debug, "debug", false, "start with debug mode")
-	flag.BoolVar(&conf.Version, "version", false, "print version info")
-	flag.BoolVar(&conf.Password, "password", false, "print current password")
-	flag.BoolVar(&conf.Docker, "docker", false, "is using docker")
-	flag.Parse()
-	InitLog()
-}

bootstrap/model.go

@@ -1,84 +0,0 @@
-package bootstrap
-
-import (
-	"fmt"
-	"github.com/Xhofe/alist/conf"
-	"github.com/Xhofe/alist/model"
-	log "github.com/sirupsen/logrus"
-	"gorm.io/driver/mysql"
-	"gorm.io/driver/postgres"
-	"gorm.io/driver/sqlite"
-	"gorm.io/gorm"
-	"gorm.io/gorm/logger"
-	"gorm.io/gorm/schema"
-	log2 "log"
-	"os"
-	"strings"
-	"time"
-)
-
-func InitModel() {
-	log.Infof("init model...")
-	var err error
-	databaseConfig := conf.Conf.Database
-	newLogger := logger.New(
-		log2.New(os.Stdout, "\r\n", log2.LstdFlags),
-		logger.Config{
-			SlowThreshold:             time.Second,
-			LogLevel:                  logger.Silent,
-			IgnoreRecordNotFoundError: true,
-			Colorful:                  true,
-		},
-	)
-	gormConfig := &gorm.Config{
-		NamingStrategy: schema.NamingStrategy{
-			TablePrefix: databaseConfig.TablePrefix,
-		},
-		Logger: newLogger,
-	}
-	switch databaseConfig.Type {
-	case "sqlite3":
-		{
-			if !(strings.HasSuffix(databaseConfig.DBFile, ".db") && len(databaseConfig.DBFile) > 3) {
-				log.Fatalf("db name error.")
-			}
-			db, err := gorm.Open(sqlite.Open(databaseConfig.DBFile), gormConfig)
-			if err != nil {
-				log.Fatalf("failed to connect database:%s", err.Error())
-			}
-			conf.DB = db
-		}
-	case "mysql":
-		{
-			dsn := fmt.Sprintf("%s:%s@tcp(%s:%d)/%s?charset=utf8mb4&parseTime=True&loc=Local&tls=%s",
-				databaseConfig.User, databaseConfig.Password, databaseConfig.Host, databaseConfig.Port, databaseConfig.Name, databaseConfig.SslMode)
-			db, err := gorm.Open(mysql.Open(dsn), gormConfig)
-			if err != nil {
-				log.Fatalf("failed to connect database:%s", err.Error())
-			}
-			conf.DB = db
-		}
-	case "postgres":
-		{
-			dsn := fmt.Sprintf("host=%s user=%s password=%s dbname=%s port=%d sslmode=%s TimeZone=Asia/Shanghai",
-				databaseConfig.Host, databaseConfig.User, databaseConfig.Password, databaseConfig.Name, databaseConfig.Port, databaseConfig.SslMode)
-			db, err := gorm.Open(postgres.Open(dsn), gormConfig)
-			if err != nil {
-				log.Errorf("failed to connect database:%s", err.Error())
-			}
-			conf.DB = db
-		}
-	default:
-		log.Fatalf("not supported database type: %s", databaseConfig.Type)
-	}
-	log.Infof("auto migrate model...")
-	if databaseConfig.Type == "mysql" {
-		err = conf.DB.Set("gorm:table_options", "ENGINE=InnoDB CHARSET=utf8mb4").
-			AutoMigrate(&model.SettingItem{}, &model.Account{}, &model.Meta{})
-	} else {
-		err = conf.DB.AutoMigrate(&model.SettingItem{}, &model.Account{}, &model.Meta{})
-	}
-	if err != nil {
-		log.Fatalf("failed to auto migrate: %s", err.Error())
-	}
-}

bootstrap/setting.go

@@ -1,292 +0,0 @@
-package bootstrap
-
-import (
-	"github.com/Xhofe/alist/conf"
-	"github.com/Xhofe/alist/model"
-	"github.com/Xhofe/alist/utils"
-	log "github.com/sirupsen/logrus"
-	"gorm.io/gorm"
-	"strings"
-)
-
-func InitSettings() {
-	log.Infof("init settings...")
-
-	err := model.SaveSetting(model.Version)
-	if err != nil {
-		log.Fatalf("failed write setting: %s", err.Error())
-	}
-
-	settings := []model.SettingItem{
-		{
-			Key:         "title",
-			Value:       "Alist",
-			Description: "title",
-			Type:        "string",
-			Access:      model.PUBLIC,
-			Group:       model.FRONT,
-		},
-		{
-			Key:         "password",
-			Value:       utils.RandomStr(8),
-			Description: "password",
-			Type:        "string",
-			Access:      model.PRIVATE,
-			Group:       model.BACK,
-		},
-		{
-			Key:         "logo",
-			Value:       "https://cdn.jsdelivr.net/gh/alist-org/logo@main/can_circle.svg",
-			Description: "logo",
-			Type:        "string",
-			Access:      model.PUBLIC,
-			Group:       model.FRONT,
-		},
-		{
-			Key:         "favicon",
-			Value:       "https://cdn.jsdelivr.net/gh/alist-org/logo@main/logo.svg",
-			Description: "favicon",
-			Type:        "string",
-			Access:      model.PUBLIC,
-			Group:       model.FRONT,
-		},
-		{
-			Key:         "icon color",
-			Value:       "#1890ff",
-			Description: "icon's color",
-			Type:        "string",
-			Access:      model.PUBLIC,
-			Group:       model.FRONT,
-		},
-		{
-			Key:         "announcement",
-			Value:       "This is a test announcement.",
-			Description: "announcement message (support markdown)",
-			Type:        "text",
-			Access:      model.PUBLIC,
-			Group:       model.FRONT,
-		},
-		{
-			Key:         "text types",
-			Value:       strings.Join(conf.TextTypes, ","),
-			Type:        "string",
-			Description: "text type extensions",
-			Group:       model.FRONT,
-		},
-		{
-			Key:         "audio types",
-			Value:       strings.Join(conf.AudioTypes, ","),
-			Type:        "string",
-			Description: "audio type extensions",
-			Group:       model.FRONT,
-		},
-		{
-			Key:         "video types",
-			Value:       strings.Join(conf.VideoTypes, ","),
-			Type:        "string",
-			Description: "video type extensions",
-			Group:       model.FRONT,
-		},
-		{
-			Key:         "d_proxy types",
-			Value:       strings.Join(conf.DProxyTypes, ","),
-			Type:        "string",
-			Description: "/d but proxy",
-			Access:      model.PRIVATE,
-			Group:       model.BACK,
-		},
-		{
-			Key:         "hide files",
-			Value:       "/\\/README.md/i",
-			Type:        "text",
-			Description: "hide files, support RegExp, one per line",
-			Group:       model.FRONT,
-		},
-		{
-			Key:         "music cover",
-			Value:       "https://cdn.jsdelivr.net/gh/alist-org/logo@main/circle_center.svg",
-			Description: "music cover image",
-			Type:        "string",
-			Access:      model.PUBLIC,
-			Group:       model.FRONT,
-		},
-		{
-			Key:         "site beian",
-			Description: "chinese beian info",
-			Type:        "string",
-			Access:      model.PUBLIC,
-			Group:       model.FRONT,
-		},
-		{
-			Key:         "home readme url",
-			Description: "when have multiple, the readme file to show",
-			Type:        "string",
-			Access:      model.PUBLIC,
-			Group:       model.FRONT,
-		},
-		{
-			Key:    "autoplay video",
-			Value:  "false",
-			Type:   "bool",
-			Access: model.PUBLIC,
-			Group:  model.FRONT,
-		},
-		{
-			Key:    "autoplay audio",
-			Value:  "false",
-			Type:   "bool",
-			Access: model.PUBLIC,
-			Group:  model.FRONT,
-		},
-		{
-			Key:         "check parent folder",
-			Value:       "false",
-			Type:        "bool",
-			Description: "check parent folder password",
-			Access:      model.PRIVATE,
-			Group:       model.BACK,
-		},
-		{
-			Key:         "customize head",
-			Value:       "",
-			Type:        "text",
-			Description: "Customize head, placed at the beginning of the head",
-			Access:      model.PRIVATE,
-			Group:       model.FRONT,
-		},
-		{
-			Key:         "customize body",
-			Value:       "",
-			Type:        "text",
-			Description: "Customize script, placed at the end of the body",
-			Access:      model.PRIVATE,
-			Group:       model.FRONT,
-		},
-		{
-			Key:         "home emoji",
-			Value:       "🏠",
-			Type:        "string",
-			Description: "emoji in front of home in nav",
-			Access:      model.PUBLIC,
-			Group:       model.FRONT,
-		},
-		{
-			Key:         "animation",
-			Value:       "true",
-			Type:        "bool",
-			Description: "when there are a lot of files, the animation will freeze when opening",
-			Access:      model.PUBLIC,
-			Group:       model.FRONT,
-		},
-		{
-			Key:         "check down link",
-			Value:       "false",
-			Type:        "bool",
-			Description: "check down link password, your link will be 'https://alist.com/d/filename?pw=xxx'",
-			Access:      model.PUBLIC,
-			Group:       model.BACK,
-		},
-		{
-			Key:         "WebDAV username",
-			Value:       "admin",
-			Description: "WebDAV username",
-			Type:        "string",
-			Access:      model.PRIVATE,
-			Group:       model.BACK,
-		},
-		{
-			Key:         "WebDAV password",
-			Value:       utils.RandomStr(8),
-			Description: "WebDAV password",
-			Type:        "string",
-			Access:      model.PRIVATE,
-			Group:       model.BACK,
-		},
-		{
-			Key:         "artplayer whitelist",
-			Value:       "*",
-			Description: "refer to https://artplayer.org/document/options#whitelist",
-			Type:        "string",
-			Access:      model.PUBLIC,
-			Group:       model.FRONT,
-		},
-		{
-			Key:         "artplayer autoSize",
-			Value:       "true",
-			Description: "refer to https://artplayer.org/document/options#autosize",
-			Type:        "bool",
-			Access:      model.PUBLIC,
-			Group:       model.FRONT,
-		},
-		{
-			Key:         "Visitor WebDAV username",
-			Value:       "guest",
-			Description: "Visitor WebDAV username",
-			Type:        "string",
-			Access:      model.PRIVATE,
-			Group:       model.BACK,
-		},
-		{
-			Key:         "Visitor WebDAV password",
-			Value:       "guest",
-			Description: "Visitor WebDAV password",
-			Type:        "string",
-			Access:      model.PRIVATE,
-			Group:       model.BACK,
-		},
-		{
-			Key:         "load type",
-			Value:       "all",
-			Type:        "select",
-			Values:      "all,load more,auto load more,pagination",
-			Description: "Not recommended to choose to auto load more, it has bugs now",
-			Access:      model.PUBLIC,
-			Group:       model.FRONT,
-		},
-		{
-			Key:    "default page size",
-			Value:  "30",
-			Type:   "number",
-			Access: model.PUBLIC,
-			Group:  model.FRONT,
-		},
-		{
-			Key:         "ocr api",
-			Value:       "https://api.xhofe.top/ocr/file/json",
-			Description: "Used to identify verification codes",
-			Type:        "string",
-			Access:      model.PRIVATE,
-			Group:       model.BACK,
-		},
-	}
-	for i, _ := range settings {
-		v := settings[i]
-		v.Version = conf.GitTag
-		o, err := model.GetSettingByKey(v.Key)
-		if err != nil {
-			if err == gorm.ErrRecordNotFound {
-				err = model.SaveSetting(v)
-				if v.Key == "password" {
-					log.Infof("Initial password: %s", conf.C.Sprintf(v.Value))
-				}
-				if err != nil {
-					log.Fatalf("failed write setting: %s", err.Error())
-				}
-			} else {
-				log.Fatalf("can't get setting: %s", err.Error())
-			}
-		} else {
-			//o.Version = conf.GitTag
-			//err = model.SaveSetting(*o)
-			v.Value = o.Value
-			err = model.SaveSetting(v)
-			if err != nil {
-				log.Fatalf("failed write setting: %s", err.Error())
-			}
-			if v.Key == "password" {
-				log.Infof("Your password: %s", conf.C.Sprintf(v.Value))
-			}
-		}
-	}
-	model.LoadSettings()
-}

build.sh

@@ -1,109 +1,72 @@
-#!/bin/bash
+appName="alist"
+builtAt="$(date +'%F %T %z')"
+goVersion=$(go version | sed 's/go version //')
+gitAuthor=$(git show -s --format='format:%aN <%ae>' HEAD)
+gitCommit=$(git log --pretty=format:"%h" -1)
 
-# 构建前端,在当前目录产生一个dist文件夹
-BUILD_WEB() {
-  git clone https://github.com/alist-org/alist-web.git
-  cd alist-web
-  yarn
-  yarn build
-  sed -i -e "s/\/CDN_URL\//\//g" dist/index.html
-  sed -i -e "s/assets/\/assets/g" dist/index.html
-  rm -f dist/index.html-e
-  mv dist ..
-  cd .. || exit
-  rm -rf alist-web
-}
+if [ "$1" = "dev" ]; then
+  version="dev"
+  webVersion="dev"
+else
+  version=$(git describe --abbrev=0 --tags)
+  webVersion=$(wget -qO- -t1 -T2 "https://api.github.com/repos/alist-org/alist-web/releases/latest" | grep "tag_name" | head -n 1 | awk -F ":" '{print $2}' | sed 's/\"//g;s/,//g;s/ //g')
+fi
 
-CDN_WEB() {
-  curl -L https://github.com/alist-org/alist-web/releases/latest/download/dist.tar.gz -o dist.tar.gz
-  tar -zxvf dist.tar.gz
-  rm -f dist.tar.gz
-}
+echo "build version: $gitTag"
 
-# 在DOCKER中构建
-BUILD_DOCKER() {
-  appName="alist"
-  builtAt="$(date +'%F %T %z')"
-  goVersion=$(go version | sed 's/go version //')
-  gitAuthor=$(git show -s --format='format:%aN <%ae>' HEAD)
-  gitCommit=$(git log --pretty=format:"%h" -1)
-  gitTag=$(git describe --long --tags --dirty --always)
-  webTag=$(wget -qO- -t1 -T2 "https://api.github.com/repos/alist-org/alist-web/releases/latest" | grep "tag_name" | head -n 1 | awk -F ":" '{print $2}' | sed 's/\"//g;s/,//g;s/ //g')
-  ldflags="\
+ldflags="\
 -w -s \
--X 'github.com/Xhofe/alist/conf.BuiltAt=$builtAt' \
--X 'github.com/Xhofe/alist/conf.GoVersion=$goVersion' \
--X 'github.com/Xhofe/alist/conf.GitAuthor=$gitAuthor' \
--X 'github.com/Xhofe/alist/conf.GitCommit=$gitCommit' \
--X 'github.com/Xhofe/alist/conf.GitTag=$gitTag' \
--X 'github.com/Xhofe/alist/conf.WebTag=$webTag' \
-  "
-  go build -o ./bin/alist -ldflags="$ldflags" -tags=jsoniter alist.go
-}
-
-BUILD() {
-  cd alist
-  appName="alist"
-  builtAt="$(date +'%F %T %z')"
-  goVersion=$(go version | sed 's/go version //')
-  gitAuthor=$(git show -s --format='format:%aN <%ae>' HEAD)
-  gitCommit=$(git log --pretty=format:"%h" -1)
-  gitTag=$(git describe --long --tags --dirty --always)
-  webTag=$(wget -qO- -t1 -T2 "https://api.github.com/repos/alist-org/alist-web/releases/latest" | grep "tag_name" | head -n 1 | awk -F ":" '{print $2}' | sed 's/\"//g;s/,//g;s/ //g')
-  echo "build version: $gitTag"
-  ldflags="\
--w -s \
--X 'github.com/Xhofe/alist/conf.BuiltAt=$builtAt' \
--X 'github.com/Xhofe/alist/conf.GoVersion=$goVersion' \
--X 'github.com/Xhofe/alist/conf.GitAuthor=$gitAuthor' \
--X 'github.com/Xhofe/alist/conf.GitCommit=$gitCommit' \
--X 'github.com/Xhofe/alist/conf.GitTag=$gitTag' \
--X 'github.com/Xhofe/alist/conf.WebTag=$webTag' \
+-X 'github.com/alist-org/alist/v3/internal/conf.BuiltAt=$builtAt' \
+-X 'github.com/alist-org/alist/v3/internal/conf.GoVersion=$goVersion' \
+-X 'github.com/alist-org/alist/v3/internal/conf.GitAuthor=$gitAuthor' \
+-X 'github.com/alist-org/alist/v3/internal/conf.GitCommit=$gitCommit' \
+-X 'github.com/alist-org/alist/v3/internal/conf.Version=$version' \
+-X 'github.com/alist-org/alist/v3/internal/conf.WebVersion=$webVersion' \
 "
 
-  if [ "$1" == "release" ]; then
-    xgo -out "$appName" -ldflags="$ldflags" -tags=jsoniter .
-  else
+FetchWebDev() {
+  curl -L https://codeload.github.com/alist-org/web-dist/tar.gz/refs/heads/main -o web-dist-main.tar.gz
+  tar -zxvf web-dist-main.tar.gz
+  rm -rf public/dist
+  mv -f web-dist-main/dist public
+  rm -rf web-dist-main web-dist-main.tar.gz
+}
+
+FetchWebRelease() {
+  curl -L https://github.com/alist-org/alist-web/releases/latest/download/dist.tar.gz -o dist.tar.gz
+  tar -zxvf dist.tar.gz
+  rm -rf public/dist
+  mv -f dist public
+  rm -rf dist.tar.gz
+}
+
+BuildDev() {
+  rm -rf .git/
   xgo -targets=linux/amd64,windows/amd64,darwin/amd64 -out "$appName" -ldflags="$ldflags" -tags=jsoniter .
-  fi
-  mkdir -p "build"
-  mv alist-* build
-  if [ "$1" != "release" ]; then
-      cd build
+  mkdir -p "dist"
+  mv alist-* dist
+  cd dist
   upx -9 ./alist-linux*
   upx -9 ./alist-windows*
   find . -type f -print0 | xargs -0 md5sum >md5.txt
   cat md5.txt
-      cd .. || exit
-  fi
-  cd .. || exit
 }
 
-BUILD_MUSL() {
-  BASE="https://musl.cc/"
+BuildDocker() {
+  go build -o ./bin/alist -ldflags="$ldflags" -tags=jsoniter .
+}
+
+BuildRelease() {
+  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 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
   done
-  cd alist
-  appName="alist"
-  builtAt="$(date +'%F %T %z')"
-  goVersion=$(go version | sed 's/go version //')
-  gitAuthor=$(git show -s --format='format:%aN <%ae>' HEAD)
-  gitCommit=$(git log --pretty=format:"%h" -1)
-  gitTag=$(git describe --long --tags --dirty --always)
-  webTag=$(wget -qO- -t1 -T2 "https://api.github.com/repos/alist-org/alist-web/releases/latest" | grep "tag_name" | head -n 1 | awk -F ":" '{print $2}' | sed 's/\"//g;s/,//g;s/ //g')
-  ldflags="\
--w -s \
--X 'github.com/Xhofe/alist/conf.BuiltAt=$builtAt' \
--X 'github.com/Xhofe/alist/conf.GoVersion=$goVersion' \
--X 'github.com/Xhofe/alist/conf.GitAuthor=$gitAuthor' \
--X 'github.com/Xhofe/alist/conf.GitCommit=$gitCommit' \
--X 'github.com/Xhofe/alist/conf.GitTag=$gitTag' \
--X 'github.com/Xhofe/alist/conf.WebTag=$webTag' \
-  "
   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 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
@@ -114,43 +77,54 @@ BUILD_MUSL() {
     export GOARCH=${os_arch##*-}
     export CC=${cgo_cc}
     export CGO_ENABLED=1
-      go build -o ./build/$appName-$os_arch -ldflags="$ldflags" -tags=jsoniter alist.go
+    go build -o ./build/$appName-$os_arch -ldflags="$muslflags" -tags=jsoniter .
   done
-  cd .. || exit
-}
-
-RELEASE() {
-  cd alist/build
+  xgo -out "$appName" -ldflags="$ldflags" -tags=jsoniter .
+  # why? Because some target platforms seem to have issues with upx compression
   upx -9 ./alist-linux-amd64
   upx -9 ./alist-windows*
-  find . -type f -print0 | xargs -0 md5sum >md5.txt
-  cat md5.txt
-  mkdir compress
-  mv md5.txt compress
-  for i in $(find . -type f -name "$appName-linux-*"); do
-    tar -czvf compress/"$i".tar.gz "$i"
-  done
-  for i in $(find . -type f -name "$appName-darwin-*"); do
-    tar -czvf compress/"$i".tar.gz "$i"
-  done
-  for i in $(find . -type f -name "$appName-windows-*"); do
-    zip compress/$(echo $i | sed 's/\.[^.]*$//').zip "$i"
-  done
-  cd ../.. || exit 
+  mv alist-* build
 }
 
-if [ "$1" = "web" ]; then
-  BUILD_WEB
-elif [ "$1" = "cdn" ]; then
-  CDN_WEB
-elif [ "$1" = "docker" ]; then
-  BUILD_DOCKER
-elif [ "$1" = "build" ]; then
-  BUILD build
+MakeRelease() {
+  cd build
+  mkdir compress
+  for i in $(find . -type f -name "$appName-linux-*"); do
+    cp "$i" alist
+    tar -czvf compress/"$i".tar.gz alist
+    rm -f alist
+  done
+  for i in $(find . -type f -name "$appName-darwin-*"); do
+    cp "$i" alist
+    tar -czvf compress/"$i".tar.gz alist
+    rm -f alist
+  done
+  for i in $(find . -type f -name "$appName-windows-*"); do
+    cp "$i" alist.exe
+    zip compress/$(echo $i | sed 's/\.[^.]*$//').zip alist.exe
+    rm -f alist.exe
+  done
+  cd compress
+  find . -type f -print0 | xargs -0 md5sum >md5.txt
+  cat md5.txt
+  cd ../..
+}
+
+if [ "$1" = "dev" ]; then
+  FetchWebDev
+  if [ "$2" = "docker" ]; then
+    BuildDocker
+  else
+    BuildDev
+  fi
 elif [ "$1" = "release" ]; then
-  BUILD release
-  BUILD_MUSL
-  RELEASE
+  FetchWebRelease
+  if [ "$2" = "docker" ]; then
+    BuildDocker
+  else
+    BuildRelease
+    MakeRelease
+  fi
 else
-  echo -e "${RED_COLOR} Parameter error ${RES}"
+  echo -e "Parameter error"
 fi

cmd/cancel2FA.go

@@ -0,0 +1,42 @@
+/*
+Copyright © 2022 NAME HERE <EMAIL ADDRESS>
+*/
+package cmd
+
+import (
+	"github.com/alist-org/alist/v3/internal/db"
+	"github.com/alist-org/alist/v3/pkg/utils"
+	"github.com/spf13/cobra"
+)
+
+// cancel2FACmd represents the delete2fa command
+var cancel2FACmd = &cobra.Command{
+	Use:   "cancel2fa",
+	Short: "Delete 2FA of admin user",
+	Run: func(cmd *cobra.Command, args []string) {
+		Init()
+		admin, err := db.GetAdmin()
+		if err != nil {
+			utils.Log.Errorf("failed to get admin user: %+v", err)
+		} else {
+			err := db.Cancel2FAByUser(admin)
+			if err != nil {
+				utils.Log.Errorf("failed to cancel 2FA: %+v", err)
+			}
+		}
+	},
+}
+
+func init() {
+	rootCmd.AddCommand(cancel2FACmd)
+
+	// Here you will define your flags and configuration settings.
+
+	// Cobra supports Persistent Flags which will work for this command
+	// and all subcommands, e.g.:
+	// cancel2FACmd.PersistentFlags().String("foo", "", "A help for foo")
+
+	// Cobra supports local flags which will only run when this command
+	// is called directly, e.g.:
+	// cancel2FACmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
+}

cmd/common.go

@@ -0,0 +1,13 @@
+package cmd
+
+import (
+	"github.com/alist-org/alist/v3/internal/bootstrap"
+	"github.com/alist-org/alist/v3/internal/bootstrap/data"
+)
+
+func Init() {
+	bootstrap.InitConfig()
+	bootstrap.Log()
+	bootstrap.InitDB()
+	data.InitData()
+}

cmd/flags/config.go

@@ -0,0 +1,8 @@
+package flags
+
+var (
+	Config   string // config file
+	Debug    bool
+	NoPrefix bool
+	Dev      bool
+)

cmd/lang.go

@@ -0,0 +1,152 @@
+/*
+Package cmd
+Copyright © 2022 Noah Hsu<i@nn.ci>
+*/
+package cmd
+
+import (
+	"fmt"
+	"io"
+	"os"
+	"reflect"
+	"strings"
+
+	_ "github.com/alist-org/alist/v3/drivers"
+	"github.com/alist-org/alist/v3/internal/bootstrap/data"
+	"github.com/alist-org/alist/v3/internal/conf"
+	"github.com/alist-org/alist/v3/internal/op"
+	"github.com/alist-org/alist/v3/pkg/utils"
+	log "github.com/sirupsen/logrus"
+	"github.com/spf13/cobra"
+)
+
+type KV[V any] map[string]V
+
+type Drivers KV[KV[interface{}]]
+
+func firstUpper(s string) string {
+	if s == "" {
+		return ""
+	}
+	return strings.ToUpper(s[:1]) + s[1:]
+}
+
+func convert(s string) string {
+	ss := strings.Split(s, "_")
+	ans := strings.Join(ss, " ")
+	return firstUpper(ans)
+}
+
+func writeFile(name string, data interface{}) {
+	f, err := os.Open(fmt.Sprintf("../alist-web/src/lang/en/%s.json", name))
+	if err != nil {
+		log.Errorf("failed to open %s.json: %+v", name, err)
+		return
+	}
+	defer f.Close()
+	content, err := io.ReadAll(f)
+	if err != nil {
+		log.Errorf("failed to read %s.json: %+v", name, err)
+		return
+	}
+	oldData := make(map[string]interface{})
+	newData := make(map[string]interface{})
+	err = utils.Json.Unmarshal(content, &oldData)
+	if err != nil {
+		log.Errorf("failed to unmarshal %s.json: %+v", name, err)
+		return
+	}
+	content, err = utils.Json.Marshal(data)
+	if err != nil {
+		log.Errorf("failed to marshal json: %+v", err)
+		return
+	}
+	err = utils.Json.Unmarshal(content, &newData)
+	if err != nil {
+		log.Errorf("failed to unmarshal json: %+v", err)
+		return
+	}
+	if reflect.DeepEqual(oldData, newData) {
+		log.Infof("%s.json no changed, skip", name)
+	} else {
+		log.Infof("%s.json changed, update file", name)
+		//log.Infof("old: %+v\nnew:%+v", oldData, data)
+		utils.WriteJsonToFile(fmt.Sprintf("lang/%s.json", name), data)
+	}
+}
+
+func generateDriversJson() {
+	drivers := make(Drivers)
+	drivers["drivers"] = make(KV[interface{}])
+	driverInfoMap := op.GetDriverInfoMap()
+	for k, v := range driverInfoMap {
+		drivers["drivers"][k] = convert(k)
+		items := make(KV[interface{}])
+		for i := range v.Additional {
+			item := v.Additional[i]
+			items[item.Name] = convert(item.Name)
+			if item.Help != "" {
+				items[fmt.Sprintf("%s-tips", item.Name)] = item.Help
+			}
+			if item.Type == conf.TypeSelect && len(item.Options) > 0 {
+				options := make(KV[string])
+				_options := strings.Split(item.Options, ",")
+				for _, o := range _options {
+					options[o] = convert(o)
+				}
+				items[fmt.Sprintf("%ss", item.Name)] = options
+			}
+		}
+		drivers[k] = items
+	}
+	writeFile("drivers", drivers)
+}
+
+func generateSettingsJson() {
+	settings := data.InitialSettings()
+	settingsLang := make(KV[any])
+	for _, setting := range settings {
+		settingsLang[setting.Key] = convert(setting.Key)
+		if setting.Help != "" {
+			settingsLang[fmt.Sprintf("%s-tips", setting.Key)] = setting.Help
+		}
+		if setting.Type == conf.TypeSelect && len(setting.Options) > 0 {
+			options := make(KV[string])
+			_options := strings.Split(setting.Options, ",")
+			for _, o := range _options {
+				options[o] = convert(o)
+			}
+			settingsLang[fmt.Sprintf("%ss", setting.Key)] = options
+		}
+	}
+	writeFile("settings", settingsLang)
+	//utils.WriteJsonToFile("lang/settings.json", settingsLang)
+}
+
+// langCmd represents the lang command
+var langCmd = &cobra.Command{
+	Use:   "lang",
+	Short: "Generate language json file",
+	Run: func(cmd *cobra.Command, args []string) {
+		err := os.MkdirAll("lang", 0777)
+		if err != nil {
+			utils.Log.Fatal("failed create folder: %s", err.Error())
+		}
+		generateDriversJson()
+		generateSettingsJson()
+	},
+}
+
+func init() {
+	rootCmd.AddCommand(langCmd)
+
+	// Here you will define your flags and configuration settings.
+
+	// Cobra supports Persistent Flags which will work for this command
+	// and all subcommands, e.g.:
+	// langCmd.PersistentFlags().String("foo", "", "A help for foo")
+
+	// Cobra supports local flags which will only run when this command
+	// is called directly, e.g.:
+	// langCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
+}

cmd/password.go

@@ -0,0 +1,39 @@
+/*
+Copyright © 2022 NAME HERE <EMAIL ADDRESS>
+*/
+package cmd
+
+import (
+	"github.com/alist-org/alist/v3/internal/db"
+	"github.com/alist-org/alist/v3/pkg/utils"
+	"github.com/spf13/cobra"
+)
+
+// passwordCmd represents the password command
+var passwordCmd = &cobra.Command{
+	Use:   "password",
+	Short: "Show admin user's password",
+	Run: func(cmd *cobra.Command, args []string) {
+		Init()
+		admin, err := db.GetAdmin()
+		if err != nil {
+			utils.Log.Errorf("failed get admin user: %+v", err)
+		} else {
+			utils.Log.Infof("admin user's password is: %s", admin.Password)
+		}
+	},
+}
+
+func init() {
+	rootCmd.AddCommand(passwordCmd)
+
+	// Here you will define your flags and configuration settings.
+
+	// Cobra supports Persistent Flags which will work for this command
+	// and all subcommands, e.g.:
+	// passwordCmd.PersistentFlags().String("foo", "", "A help for foo")
+
+	// Cobra supports local flags which will only run when this command
+	// is called directly, e.g.:
+	// passwordCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
+}

cmd/root.go

@@ -0,0 +1,31 @@
+package cmd
+
+import (
+	"fmt"
+	"os"
+
+	"github.com/alist-org/alist/v3/cmd/flags"
+	"github.com/spf13/cobra"
+)
+
+var rootCmd = &cobra.Command{
+	Use:   "alist",
+	Short: "A file list program that supports multiple storage.",
+	Long: `A file list program that supports multiple storage,
+built with love by Xhofe and friends in Go/Solid.js.
+Complete documentation is available at https://alist.nn.ci/`,
+}
+
+func Execute() {
+	if err := rootCmd.Execute(); err != nil {
+		fmt.Fprintln(os.Stderr, err)
+		os.Exit(1)
+	}
+}
+
+func init() {
+	rootCmd.PersistentFlags().StringVar(&flags.Config, "conf", "data/config.json", "config file")
+	rootCmd.PersistentFlags().BoolVar(&flags.Debug, "debug", false, "start with debug mode")
+	rootCmd.PersistentFlags().BoolVar(&flags.NoPrefix, "no-prefix", false, "disable env prefix")
+	rootCmd.PersistentFlags().BoolVar(&flags.Dev, "dev", false, "start with dev mode")
+}

cmd/server.go

@@ -0,0 +1,90 @@
+package cmd
+
+import (
+	"context"
+	"fmt"
+	"net/http"
+	"os"
+	"os/signal"
+	"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"
+	"github.com/alist-org/alist/v3/server"
+	"github.com/gin-gonic/gin"
+	log "github.com/sirupsen/logrus"
+	"github.com/spf13/cobra"
+)
+
+// serverCmd represents the server command
+var serverCmd = &cobra.Command{
+	Use:   "server",
+	Short: "Start the server at the specified address",
+	Long: `Start the server at the specified address
+the address is defined in config file`,
+	Run: func(cmd *cobra.Command, args []string) {
+		Init()
+		bootstrap.InitAria2()
+		bootstrap.LoadStorages()
+		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)
+		base := fmt.Sprintf("%s:%d", conf.Conf.Address, conf.Conf.Port)
+		utils.Log.Infof("start server @ %s", base)
+		srv := &http.Server{Addr: base, Handler: r}
+		go func() {
+			var err error
+			if conf.Conf.Scheme.Https {
+				//err = r.RunTLS(base, conf.Conf.Scheme.CertFile, conf.Conf.Scheme.KeyFile)
+				err = srv.ListenAndServeTLS(conf.Conf.Scheme.CertFile, conf.Conf.Scheme.KeyFile)
+			} else {
+				err = srv.ListenAndServe()
+			}
+			if err != nil && err != http.ErrServerClosed {
+				utils.Log.Fatalf("failed to start: %s", err.Error())
+			}
+		}()
+		// Wait for interrupt signal to gracefully shutdown the server with
+		// a timeout of 5 seconds.
+		quit := make(chan os.Signal)
+		// kill (no param) default send syscanll.SIGTERM
+		// kill -2 is syscall.SIGINT
+		// kill -9 is syscall. SIGKILL but can"t be catch, so don't need add it
+		signal.Notify(quit, syscall.SIGINT, syscall.SIGTERM)
+		<-quit
+		utils.Log.Println("Shutdown Server ...")
+
+		ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
+		defer cancel()
+		if err := srv.Shutdown(ctx); err != nil {
+			utils.Log.Fatal("Server Shutdown:", err)
+		}
+		// catching ctx.Done(). timeout of 3 seconds.
+		select {
+		case <-ctx.Done():
+			utils.Log.Println("timeout of 3 seconds.")
+		}
+		utils.Log.Println("Server exiting")
+	},
+}
+
+func init() {
+	rootCmd.AddCommand(serverCmd)
+
+	// Here you will define your flags and configuration settings.
+
+	// Cobra supports Persistent Flags which will work for this command
+	// and all subcommands, e.g.:
+	// serverCmd.PersistentFlags().String("foo", "", "A help for foo")
+
+	// Cobra supports local flags which will only run when this command
+	// is called directly, e.g.:
+	// serverCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
+}

cmd/version.go

@@ -0,0 +1,44 @@
+/*
+Copyright © 2022 NAME HERE <EMAIL ADDRESS>
+
+*/
+package cmd
+
+import (
+	"fmt"
+	"os"
+
+	"github.com/alist-org/alist/v3/internal/conf"
+	"github.com/spf13/cobra"
+)
+
+// versionCmd represents the version command
+var versionCmd = &cobra.Command{
+	Use:   "version",
+	Short: "Show current version of AList",
+	Run: func(cmd *cobra.Command, args []string) {
+		fmt.Printf(`Built At: %s
+Go Version: %s
+Author: %s
+Commit ID: %s
+Version: %s
+WebVersion: %s
+`,
+			conf.BuiltAt, conf.GoVersion, conf.GitAuthor, conf.GitCommit, conf.Version, conf.WebVersion)
+		os.Exit(0)
+	},
+}
+
+func init() {
+	rootCmd.AddCommand(versionCmd)
+
+	// Here you will define your flags and configuration settings.
+
+	// Cobra supports Persistent Flags which will work for this command
+	// and all subcommands, e.g.:
+	// versionCmd.PersistentFlags().String("foo", "", "A help for foo")
+
+	// Cobra supports local flags which will only run when this command
+	// is called directly, e.g.:
+	// versionCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
+}

conf/config.go

@@ -1,54 +0,0 @@
-package conf
-
-type Database struct {
-	Type        string `json:"type" env:"DB_TYPE"`
-	Host        string `json:"host" env:"DB_HOST"`
-	Port        int    `json:"port" env:"DB_PORT"`
-	User        string `json:"user" env:"DB_USER"`
-	Password    string `json:"password" env:"DB_PASS"`
-	Name        string `json:"name" env:"DB_NAME"`
-	DBFile      string `json:"db_file" env:"DB_FILE"`
-	TablePrefix string `json:"table_prefix" env:"DB_TABLE_PREFIX"`
-	SslMode     string `json:"ssl_mode" env:"DB_SLL_MODE"`
-}
-
-type Scheme struct {
-	Https    bool   `json:"https" env:"HTTPS"`
-	CertFile string `json:"cert_file" env:"CERT_FILE"`
-	KeyFile  string `json:"key_file" env:"KEY_FILE"`
-}
-
-type CacheConfig struct {
-	Expiration      int64 `json:"expiration" env:"CACHE_EXPIRATION"`
-	CleanupInterval int64 `json:"cleanup_interval" env:"CLEANUP_INTERVAL"`
-}
-
-type Config struct {
-	Force    bool        `json:"force"`
-	Address  string      `json:"address" env:"ADDR"`
-	Port     int         `json:"port" env:"PORT"`
-	Assets   string      `json:"assets" env:"ASSETS"`
-	Database Database    `json:"database"`
-	Scheme   Scheme      `json:"scheme"`
-	Cache    CacheConfig `json:"cache"`
-	TempDir  string      `json:"temp_dir" env:"TEMP_DIR"`
-}
-
-func DefaultConfig() *Config {
-	return &Config{
-		Address: "0.0.0.0",
-		Port:    5244,
-		Assets:  "https://npm.elemecdn.com/alist-web@$version/dist",
-		TempDir: "data/temp",
-		Database: Database{
-			Type:        "sqlite3",
-			Port:        0,
-			TablePrefix: "x_",
-			DBFile:      "data/data.db",
-		},
-		Cache: CacheConfig{
-			Expiration:      60,
-			CleanupInterval: 120,
-		},
-	}
-}

conf/const.go

@@ -1,11 +0,0 @@
-package conf
-
-const (
-	UNKNOWN = iota
-	FOLDER
-	OFFICE
-	VIDEO
-	AUDIO
-	TEXT
-	IMAGE
-)

conf/var.go

@@ -1,103 +0,0 @@
-package conf
-
-import (
-	"context"
-	"github.com/eko/gocache/v2/cache"
-	"github.com/fatih/color"
-	"github.com/robfig/cron/v3"
-	"gorm.io/gorm"
-	"strconv"
-)
-
-var (
-	BuiltAt   string
-	GoVersion string
-	GitAuthor string
-	GitCommit string
-	GitTag    string = "dev"
-	WebTag    string
-)
-
-var (
-	ConfigFile string // config file
-	Conf       *Config
-	Debug      bool
-	Version    bool
-	Password   bool
-	Docker     bool
-
-	DB    *gorm.DB
-	Cache *cache.Cache
-	Ctx   = context.TODO()
-	Cron  *cron.Cron
-
-	C = color.New(color.FgHiBlue, color.Bold, color.BgHiWhite, color.Underline)
-)
-
-var (
-	TextTypes = []string{"txt", "htm", "html", "xml", "java", "properties", "sql",
-		"js", "md", "json", "conf", "ini", "vue", "php", "py", "bat", "gitignore", "yml",
-		"go", "sh", "c", "cpp", "h", "hpp", "tsx", "vtt", "srt", "ass"}
-	DProxyTypes = []string{"m3u8"}
-	OfficeTypes = []string{"doc", "docx", "xls", "xlsx", "ppt", "pptx", "pdf"}
-	VideoTypes  = []string{"mp4", "mkv", "avi", "mov", "rmvb", "webm", "flv"}
-	AudioTypes  = []string{"mp3", "flac", "ogg", "m4a", "wav", "opus"}
-	ImageTypes  = []string{"jpg", "tiff", "jpeg", "png", "gif", "bmp", "svg", "ico", "swf", "webp"}
-)
-
-var settingsMap = make(map[string]string)
-
-func Set(key string, value string) {
-	settingsMap[key] = value
-}
-
-func GetStr(key string) string {
-	value, ok := settingsMap[key]
-	if !ok {
-		return ""
-	}
-	return value
-}
-
-func GetBool(key string) bool {
-	value, ok := settingsMap[key]
-	if !ok {
-		return false
-	}
-	return value == "true"
-}
-
-func GetInt(key string, defaultV int) int {
-	value, ok := settingsMap[key]
-	if !ok {
-		return defaultV
-	}
-	v, err := strconv.Atoi(value)
-	if err != nil {
-		return defaultV
-	}
-	return v
-}
-
-var (
-	LoadSettings = []string{
-		"check parent folder", "check down link", "WebDAV username", "WebDAV password",
-		"Visitor WebDAV username", "Visitor WebDAV password",
-		"default page size", "load type",
-		"ocr api", "favicon",
-	}
-)
-
-var (
-	RawIndexHtml string
-	ManageHtml   string
-	IndexHtml    string
-	Token        string
-
-	//CheckParent        bool
-	//CheckDown          bool
-	//DavUsername        string
-	//DavPassword        string
-	//VisitorDavUsername string
-	//VisitorDavPassword string
-)

drivers/123/123.go

@@ -1,230 +0,0 @@
-package _23
-
-import (
-	"errors"
-	"fmt"
-	"github.com/Xhofe/alist/conf"
-	"github.com/Xhofe/alist/drivers/base"
-	"github.com/Xhofe/alist/model"
-	"github.com/Xhofe/alist/utils"
-	"github.com/go-resty/resty/v2"
-	jsoniter "github.com/json-iterator/go"
-	log "github.com/sirupsen/logrus"
-	"path/filepath"
-	"strconv"
-	"time"
-)
-
-type BaseResp struct {
-	Code    int    `json:"code"`
-	Message string `json:"message"`
-}
-
-type Pan123TokenResp struct {
-	BaseResp
-	Data struct {
-		Token string `json:"token"`
-	} `json:"data"`
-}
-
-type Pan123File 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"`
-}
-
-type Pan123Files struct {
-	BaseResp
-	Data struct {
-		InfoList []Pan123File `json:"InfoList"`
-		Next     string       `json:"Next"`
-	} `json:"data"`
-}
-
-type Pan123DownResp struct {
-	BaseResp
-	Data struct {
-		DownloadUrl string `json:"DownloadUrl"`
-	} `json:"data"`
-}
-
-type UploadResp struct {
-	BaseResp
-	Data struct {
-		AccessKeyId     string `json:"AccessKeyId"`
-		Bucket          string `json:"Bucket"`
-		Key             string `json:"Key"`
-		SecretAccessKey string `json:"SecretAccessKey"`
-		SessionToken    string `json:"SessionToken"`
-		FileId          int64  `json:"FileId"`
-	} `json:"data"`
-}
-
-func (driver Pan123) Login(account *model.Account) error {
-	url := "https://www.123pan.com/api/user/sign_in"
-	if account.APIProxyUrl != "" {
-		url = fmt.Sprintf("%s/%s", account.APIProxyUrl, url)
-	}
-	var resp Pan123TokenResp
-	_, err := base.RestyClient.R().
-		SetResult(&resp).
-		SetBody(base.Json{
-			"passport": account.Username,
-			"password": account.Password,
-		}).Post(url)
-	if err != nil {
-		return err
-	}
-	if resp.Code != 200 {
-		err = fmt.Errorf(resp.Message)
-		account.Status = resp.Message
-	} else {
-		account.Status = "work"
-		account.AccessToken = resp.Data.Token
-	}
-	_ = model.SaveAccount(account)
-	return err
-}
-
-func (driver Pan123) FormatFile(file *Pan123File) *model.File {
-	f := &model.File{
-		Id:        strconv.FormatInt(file.FileId, 10),
-		Name:      file.FileName,
-		Size:      file.Size,
-		Driver:    driver.Config().Name,
-		UpdatedAt: file.UpdateAt,
-	}
-	if file.Type == 1 {
-		f.Type = conf.FOLDER
-	} else {
-		f.Type = utils.GetFileType(filepath.Ext(file.FileName))
-	}
-	return f
-}
-
-func (driver Pan123) GetFiles(parentId string, account *model.Account) ([]Pan123File, error) {
-	next := "0"
-	res := make([]Pan123File, 0)
-	for next != "-1" {
-		var resp Pan123Files
-		query := map[string]string{
-			"driveId":        "0",
-			"limit":          "100",
-			"next":           next,
-			"orderBy":        account.OrderBy,
-			"orderDirection": account.OrderDirection,
-			"parentFileId":   parentId,
-			"trashed":        "false",
-		}
-		_, err := driver.Request("https://www.123pan.com/api/file/list",
-			base.Get, nil, query, nil, &resp, false, account)
-		if err != nil {
-			return nil, err
-		}
-		next = resp.Data.Next
-		res = append(res, resp.Data.InfoList...)
-	}
-	return res, nil
-}
-
-func (driver Pan123) Request(url string, method int, headers, query map[string]string, data *base.Json, resp interface{}, proxy bool, account *model.Account) ([]byte, error) {
-	rawUrl := url
-	if account.APIProxyUrl != "" && proxy {
-		url = fmt.Sprintf("%s/%s", account.APIProxyUrl, url)
-	}
-	req := base.RestyClient.R()
-	req.SetHeader("Authorization", "Bearer "+account.AccessToken)
-	if headers != nil {
-		req.SetHeaders(headers)
-	}
-	if query != nil {
-		req.SetQueryParams(query)
-	}
-	if data != nil {
-		req.SetBody(data)
-	}
-	if resp != nil {
-		req.SetResult(resp)
-	}
-	var res *resty.Response
-	var err error
-	switch method {
-	case base.Get:
-		res, err = req.Get(url)
-	case base.Post:
-		res, err = req.Post(url)
-	default:
-		return nil, base.ErrNotSupport
-	}
-	if err != nil {
-		return nil, err
-	}
-	log.Debug(res.String())
-	body := res.Body()
-	code := jsoniter.Get(body, "code").ToInt()
-	if code != 0 {
-		if code == 401 {
-			err := driver.Login(account)
-			if err != nil {
-				return nil, err
-			}
-			return driver.Request(rawUrl, method, headers, query, data, resp, proxy, account)
-		}
-		return nil, errors.New(jsoniter.Get(body, "message").ToString())
-	}
-	return body, nil
-}
-
-//func (driver Pan123) Post(url string, data base.Json, account *model.Account) ([]byte, error) {
-//	res, err := pan123Client.R().
-//		SetHeader("authorization", "Bearer "+account.AccessToken).
-//		SetBody(data).Post(url)
-//	if err != nil {
-//		return nil, err
-//	}
-//	body := res.Body()
-//	if jsoniter.Get(body, "code").ToInt() != 0 {
-//		return nil, errors.New(jsoniter.Get(body, "message").ToString())
-//	}
-//	return body, nil
-//}
-
-func (driver Pan123) GetFile(path string, account *model.Account) (*Pan123File, error) {
-	dir, name := filepath.Split(path)
-	dir = utils.ParsePath(dir)
-	_, err := driver.Files(dir, account)
-	if err != nil {
-		return nil, err
-	}
-	parentFiles_, _ := base.GetCache(dir, account)
-	parentFiles, _ := parentFiles_.([]Pan123File)
-	for _, file := range parentFiles {
-		if file.FileName == name {
-			if file.Type != conf.FOLDER {
-				return &file, err
-			} else {
-				return nil, base.ErrNotFile
-			}
-		}
-	}
-	return nil, base.ErrPathNotFound
-}
-
-//func HMAC(message string, secret string) string {
-//	key := []byte(secret)
-//	h := hmac.New(sha256.New, key)
-//	h.Write([]byte(message))
-//	//	fmt.Println(h.Sum(nil))
-//	//sha := hex.EncodeToString(h.Sum(nil))
-//	//	fmt.Println(sha)
-//	//return sha
-//	return string(h.Sum(nil))
-//}
-
-func init() {
-	base.RegisterDriver(&Pan123{})
-}

drivers/123/driver.go

@@ -1,306 +1,159 @@
-package _23
+package _123
 
 import (
+	"bytes"
+	"context"
 	"crypto/md5"
+	"encoding/binary"
 	"encoding/hex"
 	"fmt"
-	"github.com/Xhofe/alist/conf"
-	"github.com/Xhofe/alist/drivers/base"
-	"github.com/Xhofe/alist/model"
-	"github.com/Xhofe/alist/utils"
+	"io"
+	"net/http"
+	"os"
+
+	"github.com/alist-org/alist/v3/drivers/base"
+	"github.com/alist-org/alist/v3/internal/conf"
+	"github.com/alist-org/alist/v3/internal/driver"
+	"github.com/alist-org/alist/v3/internal/errs"
+	"github.com/alist-org/alist/v3/internal/model"
+	"github.com/alist-org/alist/v3/pkg/utils"
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/credentials"
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/s3/s3manager"
-	log "github.com/sirupsen/logrus"
-	"io"
-	"io/ioutil"
-	"net/url"
-	"os"
-	"path/filepath"
-	"strconv"
+	"github.com/go-resty/resty/v2"
 )
 
-type Pan123 struct{}
-
-func (driver Pan123) Config() base.DriverConfig {
-	return base.DriverConfig{
-		Name: "123Pan",
-	}
+type Pan123 struct {
+	model.Storage
+	Addition
+	AccessToken string
 }
 
-func (driver Pan123) Items() []base.Item {
-	return []base.Item{
-		{
-			Name:        "username",
-			Label:       "username",
-			Type:        base.TypeString,
-			Required:    true,
-			Description: "account username/phone number",
-		},
-		{
-			Name:        "password",
-			Label:       "password",
-			Type:        base.TypeString,
-			Required:    true,
-			Description: "account password",
-		},
-		{
-			Name:     "root_folder",
-			Label:    "root folder file_id",
-			Type:     base.TypeString,
-			Required: false,
-		},
-		{
-			Name:     "order_by",
-			Label:    "order_by",
-			Type:     base.TypeSelect,
-			Values:   "name,fileId,updateAt,createAt",
-			Required: true,
-			Default:  "name",
-		},
-		{
-			Name:     "order_direction",
-			Label:    "order_direction",
-			Type:     base.TypeSelect,
-			Values:   "asc,desc",
-			Required: true,
-			Default:  "asc",
-		},
-	}
+func (d *Pan123) Config() driver.Config {
+	return config
 }
 
-func (driver Pan123) Save(account *model.Account, old *model.Account) error {
-	if account == nil {
-		return nil
-	}
-	if account.RootFolder == "" {
-		account.RootFolder = "0"
-	}
-	err := driver.Login(account)
+func (d *Pan123) GetAddition() driver.Additional {
+	return d.Addition
+}
+
+func (d *Pan123) Init(ctx context.Context, storage model.Storage) error {
+	d.Storage = storage
+	err := utils.Json.UnmarshalFromString(d.Storage.Addition, &d.Addition)
+	if err != nil {
 		return err
+	}
+	return d.login()
 }
 
-func (driver Pan123) File(path string, account *model.Account) (*model.File, error) {
-	path = utils.ParsePath(path)
-	if path == "/" {
-		return &model.File{
-			Id:        account.RootFolder,
-			Name:      account.Name,
-			Size:      0,
-			Type:      conf.FOLDER,
-			Driver:    driver.Config().Name,
-			UpdatedAt: account.UpdatedAt,
-		}, nil
-	}
-	dir, name := filepath.Split(path)
-	files, err := driver.Files(dir, account)
-	if err != nil {
-		return nil, err
-	}
-	for _, file := range files {
-		if file.Name == name {
-			return &file, nil
-		}
-	}
-	return nil, base.ErrPathNotFound
+func (d *Pan123) Drop(ctx context.Context) error {
+	return nil
 }
 
-func (driver Pan123) Files(path string, account *model.Account) ([]model.File, error) {
-	path = utils.ParsePath(path)
-	var rawFiles []Pan123File
-	cache, err := base.GetCache(path, account)
-	if err == nil {
-		rawFiles, _ = cache.([]Pan123File)
-	} else {
-		file, err := driver.File(path, account)
+func (d *Pan123) 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
 	}
-		rawFiles, err = driver.GetFiles(file.Id, account)
-		if err != nil {
-			return nil, err
-		}
-		if len(rawFiles) > 0 {
-			_ = base.SetCache(path, rawFiles, account)
-		}
-	}
-	files := make([]model.File, 0)
-	for _, file := range rawFiles {
-		files = append(files, *driver.FormatFile(&file))
-	}
-	return files, nil
+	return utils.SliceConvert(files, func(src File) (model.Obj, error) {
+		return src, nil
+	})
 }
 
-func (driver Pan123) Link(args base.Args, account *model.Account) (*base.Link, error) {
-	log.Debugf("%+v", args)
-	file, err := driver.GetFile(utils.ParsePath(args.Path), account)
-	if err != nil {
-		return nil, err
-	}
-	var resp Pan123DownResp
-	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{
-		"driveId":   0,
-		"etag":      file.Etag,
-		"fileId":    file.FileId,
-		"fileName":  file.FileName,
-		"s3keyFlag": file.S3KeyFlag,
-		"size":      file.Size,
-		"type":      file.Type,
-	}
-	_, err = driver.Request("https://www.123pan.com/api/file/download_info",
-		base.Post, headers, nil, &data, &resp, false, account)
-	//_, err = pan123Client.R().SetResult(&resp).SetHeader("authorization", "Bearer "+account.AccessToken).
-	//	SetBody().Post("https://www.123pan.com/api/file/download_info")
-	if err != nil {
-		return nil, err
-	}
-	u, err := url.Parse(resp.Data.DownloadUrl)
-	if err != nil {
-		return nil, err
-	}
-	u_ := fmt.Sprintf("https://%s%s", u.Host, u.Path)
-	res, err := base.NoRedirectClient.R().SetQueryParamsFromValues(u.Query()).Get(u_)
-	if err != nil {
-		return nil, err
-	}
-	log.Debug(res.String())
-	link := base.Link{
-		Url: resp.Data.DownloadUrl,
-	}
-	if res.StatusCode() == 302 {
-		link.Url = res.Header().Get("location")
-	}
-	return &link, nil
-}
-
-func (driver Pan123) Path(path string, account *model.Account) (*model.File, []model.File, error) {
-	path = utils.ParsePath(path)
-	log.Debugf("pan123 path: %s", path)
-	file, err := driver.File(path, account)
-	if err != nil {
-		return nil, nil, err
-	}
-	if !file.IsDir() {
-		return file, nil, nil
-	}
-	files, err := driver.Files(path, account)
-	if err != nil {
-		return nil, nil, err
-	}
-	return nil, files, nil
-}
-
-//func (driver Pan123) Proxy(r *http.Request, account *model.Account) {
-//	r.Header.Del("origin")
+//func (d *Pan123) Get(ctx context.Context, path string) (model.Obj, error) {
+//	// this is optional
+//	return nil, errs.NotImplement
 //}
 
-func (driver Pan123) Preview(path string, account *model.Account) (interface{}, error) {
-	return nil, base.ErrNotSupport
+func (d *Pan123) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
+	if f, ok := file.(File); ok {
+		return &model.Link{
+			URL: f.DownloadUrl,
+		}, nil
+	} else {
+		return nil, fmt.Errorf("can't convert obj")
+	}
 }
 
-func (driver Pan123) MakeDir(path string, account *model.Account) error {
-	dir, name := filepath.Split(path)
-	parentFile, err := driver.File(dir, account)
-	if err != nil {
-		return err
-	}
-	if !parentFile.IsDir() {
-		return base.ErrNotFolder
-	}
-	parentFileId, _ := strconv.Atoi(parentFile.Id)
+func (d *Pan123) MakeDir(ctx context.Context, parentDir model.Obj, dirName string) error {
 	data := base.Json{
 		"driveId":      0,
 		"etag":         "",
-		"fileName":     name,
-		"parentFileId": parentFileId,
+		"fileName":     dirName,
+		"parentFileId": parentDir.GetID(),
 		"size":         0,
 		"type":         1,
 	}
-	_, err = driver.Request("https://www.123pan.com/api/file/upload_request",
-		base.Post, nil, nil, &data, nil, false, account)
+	_, err := d.request("https://www.123pan.com/api/file/upload_request", http.MethodPost, func(req *resty.Request) {
+		req.SetBody(data)
+	}, nil)
 	return err
 }
 
-func (driver Pan123) Move(src string, dst string, account *model.Account) error {
-	dstDir, _ := filepath.Split(dst)
-	srcFile, err := driver.File(src, account)
-	if err != nil {
-		return err
-	}
-	fileId, _ := strconv.Atoi(srcFile.Id)
-
-	dstDirFile, err := driver.File(dstDir, account)
-	if err != nil {
-		return err
-	}
-	parentFileId, _ := strconv.Atoi(dstDirFile.Id)
+func (d *Pan123) Move(ctx context.Context, srcObj, dstDir model.Obj) error {
 	data := base.Json{
-		"fileIdList":   []base.Json{{"FileId": fileId}},
-		"parentFileId": parentFileId,
+		"fileIdList":   []base.Json{{"FileId": srcObj.GetID()}},
+		"parentFileId": dstDir.GetID(),
 	}
-	_, err = driver.Request("https://www.123pan.com/api/file/mod_pid",
-		base.Post, nil, nil, &data, nil, false, account)
+	_, err := d.request("https://www.123pan.com/api/file/mod_pid", http.MethodPost, func(req *resty.Request) {
+		req.SetBody(data)
+	}, nil)
 	return err
 }
 
-func (driver Pan123) Rename(src string, dst string, account *model.Account) error {
-	_, dstName := filepath.Split(dst)
-	srcFile, err := driver.File(src, account)
-	if err != nil {
-		return err
-	}
-	fileId, _ := strconv.Atoi(srcFile.Id)
-
+func (d *Pan123) Rename(ctx context.Context, srcObj model.Obj, newName string) error {
 	data := base.Json{
 		"driveId":  0,
-		"fileId":   fileId,
-		"fileName": dstName,
+		"fileId":   srcObj.GetID(),
+		"fileName": newName,
 	}
-	_, err = driver.Request("https://www.123pan.com/api/file/rename",
-		base.Post, nil, nil, &data, nil, false, account)
+	_, err := d.request("https://www.123pan.com/api/file/rename", http.MethodPost, func(req *resty.Request) {
+		req.SetBody(data)
+	}, nil)
 	return err
 }
 
-func (driver Pan123) Copy(src string, dst string, account *model.Account) error {
-	return base.ErrNotSupport
+func (d *Pan123) Copy(ctx context.Context, srcObj, dstDir model.Obj) error {
+	return errs.NotSupport
 }
 
-func (driver Pan123) Delete(path string, account *model.Account) error {
-	file, err := driver.GetFile(path, account)
-	if err != nil {
-		return err
-	}
+func (d *Pan123) Remove(ctx context.Context, obj model.Obj) error {
+	if f, ok := obj.(File); ok {
 		data := base.Json{
 			"driveId":           0,
 			"operation":         true,
-		"fileTrashInfoList": file,
+			"fileTrashInfoList": []File{f},
 		}
-	_, err = driver.Request("https://www.123pan.com/api/file/trash",
-		base.Post, nil, nil, &data, nil, false, account)
+		_, err := d.request("https://www.123pan.com/a/api/file/trash", http.MethodPost, func(req *resty.Request) {
+			req.SetBody(data)
+		}, nil)
 		return err
+	} else {
+		return fmt.Errorf("can't convert obj")
+	}
 }
 
-func (driver Pan123) Upload(file *model.FileStream, account *model.Account) error {
-	if file == nil {
-		return base.ErrEmptyFile
-	}
-	parentFile, err := driver.File(file.ParentPath, account)
-	if err != nil {
+func (d *Pan123) Put(ctx context.Context, dstDir model.Obj, stream model.FileStreamer, up driver.UpdateProgress) error {
+	const DEFAULT int64 = 10485760
+	var uploadFile io.Reader
+	h := md5.New()
+	if d.StreamUpload && stream.GetSize() > DEFAULT {
+		// 只计算前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
 		}
-	if !parentFile.IsDir() {
-		return base.ErrNotFolder
-	}
-	parentFileId, _ := strconv.Atoi(parentFile.Id)
-	tempFile, err := ioutil.TempFile(conf.Conf.TempDir, "file-*")
+		// 增加额外参数防止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 := os.CreateTemp(conf.Conf.TempDir, "file-*")
 		if err != nil {
 			return err
 		}
@@ -308,38 +161,31 @@ func (driver Pan123) Upload(file *model.FileStream, account *model.Account) erro
 			_ = tempFile.Close()
 			_ = os.Remove(tempFile.Name())
 		}()
-	_, err = io.Copy(tempFile, file)
-	if err != nil {
+
+		if _, err = io.Copy(io.MultiWriter(tempFile, h), stream); err != nil {
 			return err
 		}
+
 		_, err = tempFile.Seek(0, io.SeekStart)
 		if err != nil {
 			return err
 		}
-	h := md5.New()
-	_, err = io.Copy(h, tempFile)
-	if err != nil {
-		return err
+		uploadFile = tempFile
 	}
 	etag := hex.EncodeToString(h.Sum(nil))
-	log.Debugln("md5:", etag)
-	_, err = tempFile.Seek(0, io.SeekStart)
-	if err != nil {
-		return err
-	}
 	data := base.Json{
 		"driveId":      0,
-		"duplicate":    true,
+		"duplicate":    2, // 2->覆盖 1->重命名 0->默认
 		"etag":         etag,
-		"fileName":     file.GetFileName(),
-		"parentFileId": parentFileId,
-		"size":         file.GetSize(),
+		"fileName":     stream.GetName(),
+		"parentFileId": dstDir.GetID(),
+		"size":         stream.GetSize(),
 		"type":         0,
 	}
 	var resp UploadResp
-	_, err = driver.Request("https://www.123pan.com/api/file/upload_request",
-		base.Post, nil, nil, &data, &resp, false, account)
-	//res, err := driver.Post("https://www.123pan.com/api/file/upload_request", data, account)
+	_, err := d.request("https://www.123pan.com/api/file/upload_request", http.MethodPost, func(req *resty.Request) {
+		req.SetBody(data)
+	}, &resp)
 	if err != nil {
 		return err
 	}
@@ -360,80 +206,22 @@ func (driver Pan123) Upload(file *model.FileStream, account *model.Account) erro
 	input := &s3manager.UploadInput{
 		Bucket: &resp.Data.Bucket,
 		Key:    &resp.Data.Key,
-		Body:   tempFile,
+		Body:   uploadFile,
 	}
 	_, err = uploader.Upload(input)
 	if err != nil {
 		return err
 	}
-	_, err = driver.Request("https://www.123pan.com/api/file/upload_complete", base.Post, nil, nil, &base.Json{
+	_, err = d.request("https://www.123pan.com/api/file/upload_complete", http.MethodPost, func(req *resty.Request) {
+		req.SetBody(base.Json{
 			"fileId": resp.Data.FileId,
-	}, nil, false, account)
+		})
+	}, nil)
 	return err
 }
 
-//type UploadResp struct {
-//	XMLName  xml.Name `xml:"InitiateMultipartUploadResult"`
-//	Bucket   string   `xml:"Bucket"`
-//	Key      string   `xml:"Key"`
-//	UploadId string   `xml:"UploadId"`
-//}
+func (d *Pan123) Other(ctx context.Context, args model.OtherArgs) (interface{}, error) {
+	return nil, errs.NotSupport
+}
 
-// TODO unfinished
-//func (driver Pan123) Upload(file *model.FileStream, account *model.Account) error {
-//	return base.ErrNotImplement
-//	parentFile, err := driver.File(file.ParentPath, account)
-//	if err != nil {
-//		return err
-//	}
-//	if !parentFile.IsDir() {
-//		return base.ErrNotFolder
-//	}
-//	parentFileId, _ := strconv.Atoi(parentFile.Id)
-//	data := base.Json{
-//		"driveId":      0,
-//		"duplicate":    true,
-//		"etag":         RandStr(32), //maybe file's md5
-//		"fileName":     file.GetFileName(),
-//		"parentFileId": parentFileId,
-//		"size":         file.GetSize(),
-//		"type":         0,
-//	}
-//	res, err := driver.Request("https://www.123pan.com/api/file/upload_request",
-//		base.Post, nil, nil, &data, nil, false, account)
-//	//res, err := driver.Post("https://www.123pan.com/api/file/upload_request", data, account)
-//	if err != nil {
-//		return err
-//	}
-//	baseUrl := fmt.Sprintf("https://file.123pan.com/%s/%s", jsoniter.Get(res, "data.Bucket").ToString(), jsoniter.Get(res, "data.Key").ToString())
-//	var resp UploadResp
-//	kSecret := jsoniter.Get(res, "data.SecretAccessKey").ToString()
-//	nowTimeStr := time.Now().String()
-//	Date := strings.ReplaceAll(strings.Split(nowTimeStr, "T")[0], "-", "")
-//
-//	StringToSign := fmt.Sprintf("%s\n%s\n%s\n%s",
-//		"AWS4-HMAC-SHA256",
-//		nowTimeStr,
-//		fmt.Sprintf("%s/us-east-1/s3/aws4_request", Date),
-//	)
-//
-//	kDate := HMAC("AWS4"+kSecret, Date)
-//	kRegion := HMAC(kDate, "us-east-1")
-//	kService := HMAC(kRegion, "s3")
-//	kSigning := HMAC(kService, "aws4_request")
-//	_, err = base.RestyClient.R().SetResult(&resp).SetHeaders(map[string]string{
-//		"Authorization": fmt.Sprintf("AWS4-HMAC-SHA256 Credential=%s/%s/us-east-1/s3/aws4_request, SignedHeaders=host;x-amz-content-sha256;x-amz-date;x-amz-security-token;x-amz-user-agent, Signature=%s",
-//			jsoniter.Get(res, "data.AccessKeyId"),
-//			Date,
-//			hex.EncodeToString([]byte(HMAC(StringToSign, kSigning)))),
-//		"X-Amz-Content-Sha256": "UNSIGNED-PAYLOAD",
-//		"X-Amz-Date":           nowTimeStr,
-//		"x-amz-security-token": jsoniter.Get(res, "data.SessionToken").ToString(),
-//	}).Post(fmt.Sprintf("%s?uploads", baseUrl))
-//	if err != nil {
-//		return err
-//	}
-//	return base.ErrNotImplement
-//}
-
-var _ base.Driver = (*Pan123)(nil)
+var _ driver.Driver = (*Pan123)(nil)

drivers/123/meta.go

@@ -0,0 +1,30 @@
+package _123
+
+import (
+	"github.com/alist-org/alist/v3/internal/driver"
+	"github.com/alist-org/alist/v3/internal/op"
+)
+
+type Addition struct {
+	Username       string `json:"username" required:"true"`
+	Password       string `json:"password" required:"true"`
+	OrderBy        string `json:"order_by" type:"select" options:"name,fileId,updateAt,createAt" default:"name"`
+	OrderDirection string `json:"order_direction" type:"select" options:"asc,desc" default:"asc"`
+	driver.RootID
+	// define other
+	StreamUpload bool `json:"stream_upload"`
+	//Field string `json:"field" type:"select" required:"true" options:"a,b,c" default:"a"`
+}
+
+var config = driver.Config{
+	Name:        "123Pan",
+	DefaultRoot: "0",
+}
+
+func New() driver.Driver {
+	return &Pan123{}
+}
+
+func init() {
+	op.RegisterDriver(config, New)
+}

drivers/123/types.go

@@ -0,0 +1,89 @@
+package _123
+
+import (
+	"strconv"
+	"time"
+
+	"github.com/alist-org/alist/v3/internal/model"
+)
+
+type BaseResp struct {
+	Code    int    `json:"code"`
+	Message string `json:"message"`
+}
+
+type TokenResp struct {
+	BaseResp
+	Data struct {
+		Token string `json:"token"`
+	} `json:"data"`
+}
+
+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) 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) IsDir() bool {
+	return f.Type == 1
+}
+
+func (f File) GetID() string {
+	return strconv.FormatInt(f.FileId, 10)
+}
+
+var _ model.Obj = (*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"`
+}
+
+type UploadResp struct {
+	BaseResp
+	Data struct {
+		AccessKeyId     string `json:"AccessKeyId"`
+		Bucket          string `json:"Bucket"`
+		Key             string `json:"Key"`
+		SecretAccessKey string `json:"SecretAccessKey"`
+		SessionToken    string `json:"SessionToken"`
+		FileId          int64  `json:"FileId"`
+	} `json:"data"`
+}

drivers/123/util.go

@@ -0,0 +1,87 @@
+package _123
+
+import (
+	"errors"
+	"fmt"
+	"net/http"
+
+	"github.com/alist-org/alist/v3/drivers/base"
+	"github.com/go-resty/resty/v2"
+	jsoniter "github.com/json-iterator/go"
+)
+
+// do others that not defined in Driver interface
+
+func (d *Pan123) login() error {
+	url := "https://www.123pan.com/api/user/sign_in"
+	var resp TokenResp
+	_, err := base.RestyClient.R().
+		SetResult(&resp).
+		SetBody(base.Json{
+			"passport": d.Username,
+			"password": d.Password,
+		}).Post(url)
+	if err != nil {
+		return err
+	}
+	if resp.Code != 200 {
+		err = fmt.Errorf(resp.Message)
+	} else {
+		d.AccessToken = resp.Data.Token
+	}
+	return err
+}
+
+func (d *Pan123) request(url string, method string, callback base.ReqCallback, resp interface{}) ([]byte, error) {
+	req := base.RestyClient.R()
+	req.SetHeader("Authorization", "Bearer "+d.AccessToken)
+	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 := jsoniter.Get(body, "code").ToInt()
+	if code != 0 {
+		if code == 401 {
+			err := d.login()
+			if err != nil {
+				return nil, err
+			}
+			return d.request(url, method, callback, resp)
+		}
+		return nil, errors.New(jsoniter.Get(body, "message").ToString())
+	}
+	return body, nil
+}
+
+func (d *Pan123) getFiles(parentId string) ([]File, error) {
+	next := "0"
+	res := make([]File, 0)
+	for next != "-1" {
+		var resp Files
+		query := map[string]string{
+			"driveId":        "0",
+			"limit":          "100",
+			"next":           next,
+			"orderBy":        d.OrderBy,
+			"orderDirection": d.OrderDirection,
+			"parentFileId":   parentId,
+			"trashed":        "false",
+		}
+		_, err := d.request("https://www.123pan.com/api/file/list/new", http.MethodGet, func(req *resty.Request) {
+			req.SetQueryParams(query)
+		}, &resp)
+		if err != nil {
+			return nil, err
+		}
+		next = resp.Data.Next
+		res = append(res, resp.Data.InfoList...)
+	}
+	return res, nil
+}

drivers/139/139.go

@@ -1,175 +0,0 @@
-package _39
-
-import (
-	"errors"
-	"fmt"
-	"github.com/Xhofe/alist/conf"
-	"github.com/Xhofe/alist/drivers/base"
-	"github.com/Xhofe/alist/model"
-	"github.com/Xhofe/alist/utils"
-	"github.com/go-resty/resty/v2"
-	jsoniter "github.com/json-iterator/go"
-	log "github.com/sirupsen/logrus"
-	"path"
-	"time"
-)
-
-func (driver Cloud139) Request(pathname string, method int, headers, query, form map[string]string, data interface{}, resp interface{}, account *model.Account) ([]byte, error) {
-	url := "https://yun.139.com" + pathname
-	req := base.RestyClient.R()
-	randStr := utils.RandomStr(16)
-	ts := time.Now().Format("2006-01-02 15:04:05")
-	log.Debugf("%+v", data)
-	body, err := utils.Json.Marshal(data)
-	if err != nil {
-		return nil, err
-	}
-	sign := calSign(string(body), ts, randStr)
-	svcType := "1"
-	if isFamily(account) {
-		svcType = "2"
-	}
-	req.SetHeaders(map[string]string{
-		"Accept":         "application/json, text/plain, */*",
-		"CMS-DEVICE":     "default",
-		"Cookie":         account.AccessToken,
-		"mcloud-channel": "1000101",
-		"mcloud-client":  "10701",
-		//"mcloud-route": "001",
-		"mcloud-sign": fmt.Sprintf("%s,%s,%s", ts, randStr, sign),
-		//"mcloud-skey":"",
-		"mcloud-version":      "6.6.0",
-		"Origin":              "https://yun.139.com",
-		"Referer":             "https://yun.139.com/w/",
-		"x-DeviceInfo":        "||9|6.6.0|chrome|95.0.4638.69|uwIy75obnsRPIwlJSd7D9GhUvFwG96ce||macos 10.15.2||zh-CN|||",
-		"x-huawei-channelSrc": "10000034",
-		"x-inner-ntwk":        "2",
-		"x-m4c-caller":        "PC",
-		"x-m4c-src":           "10002",
-		"x-SvcType":           svcType,
-	})
-	if headers != nil {
-		req.SetHeaders(headers)
-	}
-	if query != nil {
-		req.SetQueryParams(query)
-	}
-	if form != nil {
-		req.SetFormData(form)
-	}
-	if data != nil {
-		req.SetBody(data)
-	}
-	var e BaseResp
-	//var err error
-	var res *resty.Response
-	req.SetResult(&e)
-	switch method {
-	case base.Get:
-		res, err = req.Get(url)
-	case base.Post:
-		res, err = req.Post(url)
-	case base.Delete:
-		res, err = req.Delete(url)
-	case base.Patch:
-		res, err = req.Patch(url)
-	case base.Put:
-		res, err = req.Put(url)
-	default:
-		return nil, base.ErrNotSupport
-	}
-	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 (driver Cloud139) Post(pathname string, data interface{}, resp interface{}, account *model.Account) ([]byte, error) {
-	return driver.Request(pathname, base.Post, nil, nil, nil, data, resp, account)
-}
-
-func (driver Cloud139) GetFiles(catalogID string, account *model.Account) ([]model.File, error) {
-	start := 0
-	limit := 100
-	files := make([]model.File, 0)
-	for {
-		data := base.Json{
-			"catalogID":       catalogID,
-			"sortDirection":   1,
-			"startNumber":     start + 1,
-			"endNumber":       start + limit,
-			"filterType":      0,
-			"catalogSortType": 0,
-			"contentSortType": 0,
-			"commonAccountInfo": base.Json{
-				"account":     account.Username,
-				"accountType": 1,
-			},
-		}
-		var resp GetDiskResp
-		_, err := driver.Post("/orchestration/personalCloud/catalog/v1.0/getDisk", data, &resp, account)
-		if err != nil {
-			return nil, err
-		}
-		for _, catalog := range resp.Data.GetDiskResult.CatalogList {
-			f := model.File{
-				Id:        catalog.CatalogID,
-				Name:      catalog.CatalogName,
-				Size:      0,
-				Type:      conf.FOLDER,
-				Driver:    driver.Config().Name,
-				UpdatedAt: getTime(catalog.UpdateTime),
-			}
-			files = append(files, f)
-		}
-		for _, content := range resp.Data.GetDiskResult.ContentList {
-			f := model.File{
-				Id:        content.ContentID,
-				Name:      content.ContentName,
-				Size:      content.ContentSize,
-				Type:      utils.GetFileType(path.Ext(content.ContentName)),
-				Driver:    driver.Config().Name,
-				UpdatedAt: getTime(content.UpdateTime),
-				Thumbnail: content.ThumbnailURL,
-				//Thumbnail: content.BigthumbnailURL,
-			}
-			files = append(files, f)
-		}
-		if start+limit >= resp.Data.GetDiskResult.NodeCount {
-			break
-		}
-		start += limit
-	}
-	return files, nil
-}
-
-func (driver Cloud139) GetLink(contentId string, account *model.Account) (string, error) {
-	data := base.Json{
-		"appName":   "",
-		"contentID": contentId,
-		"commonAccountInfo": base.Json{
-			"account":     account.Username,
-			"accountType": 1,
-		},
-	}
-	res, err := driver.Post("/orchestration/personalCloud/uploadAndDownload/v1.0/downloadRequest",
-		data, nil, account)
-	if err != nil {
-		return "", err
-	}
-	return jsoniter.Get(res, "data", "downloadURL").ToString(), nil
-}
-
-func init() {
-	base.RegisterDriver(&Cloud139{})
-}

drivers/139/driver.go

@@ -1,225 +1,115 @@
-package _39
+package _139
 
 import (
 	"bytes"
+	"context"
 	"fmt"
-	"github.com/Xhofe/alist/conf"
-	"github.com/Xhofe/alist/drivers/base"
-	"github.com/Xhofe/alist/model"
-	"github.com/Xhofe/alist/utils"
-	log "github.com/sirupsen/logrus"
 	"io"
 	"math"
 	"net/http"
-	"path/filepath"
 	"strconv"
+
+	"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"
+	log "github.com/sirupsen/logrus"
 )
 
-type Cloud139 struct{}
-
-func (driver Cloud139) Config() base.DriverConfig {
-	return base.DriverConfig{
-		Name:      "139Yun",
-		LocalSort: true,
-	}
+type Yun139 struct {
+	model.Storage
+	Addition
 }
 
-func (driver Cloud139) Items() []base.Item {
-	return []base.Item{
-		{
-			Name:        "username",
-			Label:       "phone",
-			Type:        base.TypeString,
-			Required:    true,
-			Description: "phone number",
-		},
-		{
-			Name:        "access_token",
-			Label:       "Cookie",
-			Type:        base.TypeString,
-			Required:    true,
-			Description: "Unknown expiration time",
-		},
-		{
-			Name:     "internal_type",
-			Label:    "139yun type",
-			Type:     base.TypeSelect,
-			Required: true,
-			Values:   "Personal,Family",
-		},
-		{
-			Name:     "root_folder",
-			Label:    "root folder file_id",
-			Type:     base.TypeString,
-			Required: true,
-		},
-		{
-			Name:     "site_id",
-			Label:    "cloud_id",
-			Type:     base.TypeString,
-			Required: false,
-		},
-	}
+func (d *Yun139) Config() driver.Config {
+	return config
 }
 
-func (driver Cloud139) Save(account *model.Account, old *model.Account) error {
-	if account == nil {
-		return nil
+func (d *Yun139) GetAddition() driver.Additional {
+	return d.Addition
+}
+
+func (d *Yun139) Init(ctx context.Context, storage model.Storage) error {
+	d.Storage = storage
+	err := utils.Json.UnmarshalFromString(d.Storage.Addition, &d.Addition)
+	if err != nil {
+		return err
 	}
-	_, err := driver.Request("/orchestration/personalCloud/user/v1.0/qryUserExternInfo", base.Post, nil, nil, nil, base.Json{
+	_, err = d.post("/orchestration/personalCloud/user/v1.0/qryUserExternInfo", base.Json{
 		"qryUserExternInfoReq": base.Json{
 			"commonAccountInfo": base.Json{
-				"account":     account.Username,
+				"account":     d.Account,
 				"accountType": 1,
 			},
 		},
-	}, nil, account)
+	}, nil)
 	return err
 }
 
-func (driver Cloud139) File(path string, account *model.Account) (*model.File, error) {
-	path = utils.ParsePath(path)
-	if path == "/" {
-		return &model.File{
-			Id:        account.RootFolder,
-			Name:      account.Name,
-			Size:      0,
-			Type:      conf.FOLDER,
-			Driver:    driver.Config().Name,
-			UpdatedAt: account.UpdatedAt,
-		}, nil
-	}
-	dir, name := filepath.Split(path)
-	files, err := driver.Files(dir, account)
-	if err != nil {
-		return nil, err
-	}
-	for _, file := range files {
-		if file.Name == name {
-			return &file, nil
-		}
-	}
-	return nil, base.ErrPathNotFound
+func (d *Yun139) Drop(ctx context.Context) error {
+	return nil
 }
 
-func (driver Cloud139) Files(path string, account *model.Account) ([]model.File, error) {
-	path = utils.ParsePath(path)
-	var files []model.File
-	cache, err := base.GetCache(path, account)
-	if err == nil {
-		files, _ = cache.([]model.File)
+func (d *Yun139) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([]model.Obj, error) {
+	if d.isFamily() {
+		return d.familyGetFiles(dir.GetID())
 	} else {
-		file, err := driver.File(path, account)
-		if err != nil {
-			return nil, err
+		return d.getFiles(dir.GetID())
 	}
-		if isFamily(account) {
-			files, err = driver.familyGetFiles(file.Id, account)
-		} else {
-			files, err = driver.GetFiles(file.Id, account)
-		}
-		if err != nil {
-			return nil, err
-		}
-		if len(files) > 0 {
-			_ = base.SetCache(path, files, account)
-		}
-	}
-	return files, nil
 }
 
-func (driver Cloud139) Link(args base.Args, account *model.Account) (*base.Link, error) {
-	file, err := driver.File(args.Path, account)
-	if err != nil {
-		return nil, err
-	}
-	var u string
-	//if isFamily(account) {
-	//	u, err = driver.familyLink(file.Id, account)
-	//} else {
-	u, err = driver.GetLink(file.Id, account)
-	//}
-	if err != nil {
-		return nil, err
-	}
-	return &base.Link{Url: u}, nil
-}
-
-func (driver Cloud139) Path(path string, account *model.Account) (*model.File, []model.File, error) {
-	path = utils.ParsePath(path)
-	log.Debugf("139 path: %s", path)
-	file, err := driver.File(path, account)
-	if err != nil {
-		return nil, nil, err
-	}
-	if !file.IsDir() {
-		return file, nil, nil
-	}
-	files, err := driver.Files(path, account)
-	if err != nil {
-		return nil, nil, err
-	}
-	return nil, files, nil
-}
-
-//func (driver Cloud139) Proxy(r *http.Request, account *model.Account) {
-//
+//func (d *Yun139) Get(ctx context.Context, path string) (model.Obj, error) {
+//	// this is optional
+//	return nil, errs.NotImplement
 //}
 
-func (driver Cloud139) Preview(path string, account *model.Account) (interface{}, error) {
-	return nil, base.ErrNotSupport
+func (d *Yun139) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
+	u, err := d.getLink(file.GetID())
+	if err != nil {
+		return nil, err
+	}
+	return &model.Link{URL: u}, nil
 }
 
-func (driver Cloud139) MakeDir(path string, account *model.Account) error {
-	parentFile, err := driver.File(utils.Dir(path), account)
-	if err != nil {
-		return err
-	}
+func (d *Yun139) MakeDir(ctx context.Context, parentDir model.Obj, dirName string) error {
 	data := base.Json{
 		"createCatalogExtReq": base.Json{
-			"parentCatalogID": parentFile.Id,
-			"newCatalogName":  utils.Base(path),
+			"parentCatalogID": parentDir.GetID(),
+			"newCatalogName":  dirName,
 			"commonAccountInfo": base.Json{
-				"account":     account.Username,
+				"account":     d.Account,
 				"accountType": 1,
 			},
 		},
 	}
 	pathname := "/orchestration/personalCloud/catalog/v1.0/createCatalogExt"
-	if isFamily(account) {
+	if d.isFamily() {
 		data = base.Json{
-			"cloudID": account.SiteId,
+			"cloudID": d.CloudID,
 			"commonAccountInfo": base.Json{
-				"account":     account.Username,
+				"account":     d.Account,
 				"accountType": 1,
 			},
-			"docLibName": utils.Base(path),
+			"docLibName": dirName,
 		}
 		pathname = "/orchestration/familyCloud/cloudCatalog/v1.0/createCloudDoc"
 	}
-	_, err = driver.Post(pathname,
-		data, nil, account)
+	_, err := d.post(pathname,
+		data, nil)
 	return err
 }
 
-func (driver Cloud139) Move(src string, dst string, account *model.Account) error {
-	if isFamily(account) {
-		return base.ErrNotSupport
-	}
-	srcFile, err := driver.File(src, account)
-	if err != nil {
-		return err
-	}
-	dstParentFile, err := driver.File(utils.Dir(dst), account)
-	if err != nil {
-		return err
+func (d *Yun139) Move(ctx context.Context, srcObj, dstDir model.Obj) error {
+	if d.isFamily() {
+		return errs.NotImplement
 	}
 	var contentInfoList []string
 	var catalogInfoList []string
-	if srcFile.IsDir() {
-		catalogInfoList = append(catalogInfoList, srcFile.Id)
+	if srcObj.IsDir() {
+		catalogInfoList = append(catalogInfoList, srcObj.GetID())
 	} else {
-		contentInfoList = append(contentInfoList, srcFile.Id)
+		contentInfoList = append(contentInfoList, srcObj.GetID())
 	}
 	data := base.Json{
 		"createBatchOprTaskReq": base.Json{
@@ -228,72 +118,60 @@ func (driver Cloud139) Move(src string, dst string, account *model.Account) erro
 			"taskInfo": base.Json{
 				"contentInfoList": contentInfoList,
 				"catalogInfoList": catalogInfoList,
-				"newCatalogID":    dstParentFile.Id,
+				"newCatalogID":    dstDir.GetID(),
 			},
 			"commonAccountInfo": base.Json{
-				"account":     account.Username,
+				"account":     d.Account,
 				"accountType": 1,
 			},
 		},
 	}
 	pathname := "/orchestration/personalCloud/batchOprTask/v1.0/createBatchOprTask"
-	_, err = driver.Post(pathname, data, nil, account)
+	_, err := d.post(pathname, data, nil)
 	return err
 }
 
-func (driver Cloud139) Rename(src string, dst string, account *model.Account) error {
-	if isFamily(account) {
-		return base.ErrNotSupport
-	}
-	srcFile, err := driver.File(src, account)
-	if err != nil {
-		return err
+func (d *Yun139) Rename(ctx context.Context, srcObj model.Obj, newName string) error {
+	if d.isFamily() {
+		return errs.NotImplement
 	}
 	var data base.Json
 	var pathname string
-	if srcFile.IsDir() {
+	if srcObj.IsDir() {
 		data = base.Json{
-			"catalogID":   srcFile.Id,
-			"catalogName": utils.Base(dst),
+			"catalogID":   srcObj.GetID(),
+			"catalogName": newName,
 			"commonAccountInfo": base.Json{
-				"account":     account.Username,
+				"account":     d.Account,
 				"accountType": 1,
 			},
 		}
 		pathname = "/orchestration/personalCloud/catalog/v1.0/updateCatalogInfo"
 	} else {
 		data = base.Json{
-			"contentID":   srcFile.Id,
-			"contentName": utils.Base(dst),
+			"contentID":   srcObj.GetID(),
+			"contentName": newName,
 			"commonAccountInfo": base.Json{
-				"account":     account.Username,
+				"account":     d.Account,
 				"accountType": 1,
 			},
 		}
-		pathname = "/orchestration/personalCloud/catalog/v1.0/updateContentInfo"
+		pathname = "/orchestration/personalCloud/content/v1.0/updateContentInfo"
 	}
-	_, err = driver.Post(pathname, data, nil, account)
+	_, err := d.post(pathname, data, nil)
 	return err
 }
 
-func (driver Cloud139) Copy(src string, dst string, account *model.Account) error {
-	if isFamily(account) {
-		return base.ErrNotSupport
-	}
-	srcFile, err := driver.File(src, account)
-	if err != nil {
-		return err
-	}
-	dstParentFile, err := driver.File(utils.Dir(dst), account)
-	if err != nil {
-		return err
+func (d *Yun139) Copy(ctx context.Context, srcObj, dstDir model.Obj) error {
+	if d.isFamily() {
+		return errs.NotImplement
 	}
 	var contentInfoList []string
 	var catalogInfoList []string
-	if srcFile.IsDir() {
-		catalogInfoList = append(catalogInfoList, srcFile.Id)
+	if srcObj.IsDir() {
+		catalogInfoList = append(catalogInfoList, srcObj.GetID())
 	} else {
-		contentInfoList = append(contentInfoList, srcFile.Id)
+		contentInfoList = append(contentInfoList, srcObj.GetID())
 	}
 	data := base.Json{
 		"createBatchOprTaskReq": base.Json{
@@ -302,30 +180,26 @@ func (driver Cloud139) Copy(src string, dst string, account *model.Account) erro
 			"taskInfo": base.Json{
 				"contentInfoList": contentInfoList,
 				"catalogInfoList": catalogInfoList,
-				"newCatalogID":    dstParentFile.Id,
+				"newCatalogID":    dstDir.GetID(),
 			},
 			"commonAccountInfo": base.Json{
-				"account":     account.Username,
+				"account":     d.Account,
 				"accountType": 1,
 			},
 		},
 	}
 	pathname := "/orchestration/personalCloud/batchOprTask/v1.0/createBatchOprTask"
-	_, err = driver.Post(pathname, data, nil, account)
+	_, err := d.post(pathname, data, nil)
 	return err
 }
 
-func (driver Cloud139) Delete(path string, account *model.Account) error {
-	file, err := driver.File(path, account)
-	if err != nil {
-		return err
-	}
+func (d *Yun139) Remove(ctx context.Context, obj model.Obj) error {
 	var contentInfoList []string
 	var catalogInfoList []string
-	if file.IsDir() {
-		catalogInfoList = append(catalogInfoList, file.Id)
+	if obj.IsDir() {
+		catalogInfoList = append(catalogInfoList, obj.GetID())
 	} else {
-		contentInfoList = append(contentInfoList, file.Id)
+		contentInfoList = append(contentInfoList, obj.GetID())
 	}
 	data := base.Json{
 		"createBatchOprTaskReq": base.Json{
@@ -337,18 +211,18 @@ func (driver Cloud139) Delete(path string, account *model.Account) error {
 				"catalogInfoList": catalogInfoList,
 			},
 			"commonAccountInfo": base.Json{
-				"account":     account.Username,
+				"account":     d.Account,
 				"accountType": 1,
 			},
 		},
 	}
 	pathname := "/orchestration/personalCloud/batchOprTask/v1.0/createBatchOprTask"
-	if isFamily(account) {
+	if d.isFamily() {
 		data = base.Json{
 			"catalogList": catalogInfoList,
 			"contentList": contentInfoList,
 			"commonAccountInfo": base.Json{
-				"account":     account.Username,
+				"account":     d.Account,
 				"accountType": 1,
 			},
 			"sourceCatalogType": 1002,
@@ -356,71 +230,61 @@ func (driver Cloud139) Delete(path string, account *model.Account) error {
 		}
 		pathname = "/orchestration/familyCloud/batchOprTask/v1.0/createBatchOprTask"
 	}
-	_, err = driver.Post(pathname, data, nil, account)
+	_, err := d.post(pathname, data, nil)
 	return err
 }
 
-func (driver Cloud139) Upload(file *model.FileStream, account *model.Account) error {
-	if file == nil {
-		return base.ErrEmptyFile
-	}
-	parentFile, err := driver.File(file.ParentPath, account)
-	if err != nil {
-		return err
-	}
-	if !parentFile.IsDir() {
-		return base.ErrNotFolder
-	}
+func (d *Yun139) Put(ctx context.Context, dstDir model.Obj, stream model.FileStreamer, up driver.UpdateProgress) error {
 	data := base.Json{
 		"manualRename": 2,
 		"operation":    0,
 		"fileCount":    1,
-		"totalSize":    file.Size,
+		"totalSize":    stream.GetSize(),
 		"uploadContentList": []base.Json{{
-			"contentName": file.Name,
-			"contentSize": file.Size,
+			"contentName": stream.GetName(),
+			"contentSize": stream.GetSize(),
 			// "digest": "5a3231986ce7a6b46e408612d385bafa"
 		}},
-		"parentCatalogID": parentFile.Id,
+		"parentCatalogID": dstDir.GetID(),
 		"newCatalogName":  "",
 		"commonAccountInfo": base.Json{
-			"account":     account.Username,
+			"account":     d.Account,
 			"accountType": 1,
 		},
 	}
 	pathname := "/orchestration/personalCloud/uploadAndDownload/v1.0/pcUploadFileRequest"
-	if isFamily(account) {
-		data = newJson(base.Json{
+	if d.isFamily() {
+		data = d.newJson(base.Json{
 			"fileCount":    1,
 			"manualRename": 2,
 			"operation":    0,
 			"path":         "",
 			"seqNo":        "",
-			"totalSize":    file.Size,
+			"totalSize":    stream.GetSize(),
 			"uploadContentList": []base.Json{{
-				"contentName": file.Name,
-				"contentSize": file.Size,
+				"contentName": stream.GetName(),
+				"contentSize": stream.GetSize(),
 				// "digest": "5a3231986ce7a6b46e408612d385bafa"
 			}},
-		}, account)
+		})
 		pathname = "/orchestration/familyCloud/content/v1.0/getFileUploadURL"
-		return base.ErrNotSupport
+		return errs.NotImplement
 	}
 	var resp UploadResp
-	_, err = driver.Post(pathname, data, &resp, account)
+	_, err := d.post(pathname, data, &resp)
 	if err != nil {
 		return err
 	}
-	var Default uint64 = 10485760
-	part := int(math.Ceil(float64(file.Size) / float64(Default)))
-	var start uint64 = 0
+	var Default int64 = 10485760
+	part := int(math.Ceil(float64(stream.GetSize()) / float64(Default)))
+	var start int64 = 0
 	for i := 0; i < part; i++ {
-		byteSize := file.Size - start
+		byteSize := stream.GetSize() - start
 		if byteSize > Default {
 			byteSize = Default
 		}
 		byteData := make([]byte, byteSize)
-		_, err = io.ReadFull(file, byteData)
+		_, err = io.ReadFull(stream, byteData)
 		if err != nil {
 			return err
 		}
@@ -430,10 +294,10 @@ func (driver Cloud139) Upload(file *model.FileStream, account *model.Account) er
 		}
 		headers := map[string]string{
 			"Accept":         "*/*",
-			"Content-Type":   "text/plain;name=" + unicode(file.Name),
-			"contentSize":    strconv.FormatUint(file.Size, 10),
+			"Content-Type":   "text/plain;name=" + unicode(stream.GetName()),
+			"contentSize":    strconv.FormatInt(stream.GetSize(), 10),
 			"range":          fmt.Sprintf("bytes=%d-%d", start, start+byteSize-1),
-			"content-length": strconv.FormatUint(byteSize, 10),
+			"content-length": strconv.FormatInt(byteSize, 10),
 			"uploadtaskID":   resp.Data.UploadResult.UploadTaskID,
 			"rangeType":      "0",
 			"Referer":        "https://yun.139.com/",
@@ -448,9 +312,15 @@ func (driver Cloud139) Upload(file *model.FileStream, account *model.Account) er
 			return err
 		}
 		log.Debugf("%+v", res)
+		res.Body.Close()
 		start += byteSize
+		up(i * 100 / part)
 	}
 	return nil
 }
 
-var _ base.Driver = (*Cloud139)(nil)
+func (d *Yun139) Other(ctx context.Context, args model.OtherArgs) (interface{}, error) {
+	return nil, errs.NotSupport
+}
+
+var _ driver.Driver = (*Yun139)(nil)

drivers/139/family.go

@@ -1,74 +0,0 @@
-package _39
-
-import (
-	"github.com/Xhofe/alist/conf"
-	"github.com/Xhofe/alist/drivers/base"
-	"github.com/Xhofe/alist/model"
-	"github.com/Xhofe/alist/utils"
-	jsoniter "github.com/json-iterator/go"
-	"path"
-)
-
-func (driver Cloud139) familyGetFiles(catalogID string, account *model.Account) ([]model.File, error) {
-	pageNum := 1
-	files := make([]model.File, 0)
-	for {
-		data := newJson(base.Json{
-			"catalogID":       catalogID,
-			"contentSortType": 0,
-			"pageInfo": base.Json{
-				"pageNum":  pageNum,
-				"pageSize": 100,
-			},
-			"sortDirection": 1,
-		}, account)
-
-		var resp QueryContentListResp
-		_, err := driver.Post("/orchestration/familyCloud/content/v1.0/queryContentList", data, &resp, account)
-		if err != nil {
-			return nil, err
-		}
-		for _, catalog := range resp.Data.CloudCatalogList {
-			f := model.File{
-				Id:        catalog.CatalogID,
-				Name:      catalog.CatalogName,
-				Size:      0,
-				Type:      conf.FOLDER,
-				Driver:    driver.Config().Name,
-				UpdatedAt: getTime(catalog.LastUpdateTime),
-			}
-			files = append(files, f)
-		}
-		for _, content := range resp.Data.CloudContentList {
-			f := model.File{
-				Id:        content.ContentID,
-				Name:      content.ContentName,
-				Size:      content.ContentSize,
-				Type:      utils.GetFileType(path.Ext(content.ContentName)),
-				Driver:    driver.Config().Name,
-				UpdatedAt: getTime(content.LastUpdateTime),
-				Thumbnail: content.ThumbnailURL,
-				//Thumbnail: content.BigthumbnailURL,
-			}
-			files = append(files, f)
-		}
-		if 100*pageNum > resp.Data.TotalCount {
-			break
-		}
-		pageNum++
-	}
-	return files, nil
-}
-
-func (driver Cloud139) familyLink(contentId string, account *model.Account) (string, error) {
-	data := newJson(base.Json{
-		"contentID": contentId,
-		//"path":"",
-	}, account)
-	res, err := driver.Post("/orchestration/familyCloud/content/v1.0/getFileDownLoadURL",
-		data, nil, account)
-	if err != nil {
-		return "", err
-	}
-	return jsoniter.Get(res, "data", "downloadURL").ToString(), nil
-}

drivers/139/meta.go

@@ -0,0 +1,25 @@
+package _139
+
+import (
+	"github.com/alist-org/alist/v3/internal/driver"
+	"github.com/alist-org/alist/v3/internal/op"
+)
+
+type Addition struct {
+	Account string `json:"account" required:"true"`
+	Cookie  string `json:"cookie" type:"text" required:"true"`
+	driver.RootID
+	Type    string `json:"type" type:"select" options:"personal,family" default:"personal"`
+	CloudID string `json:"cloud_id"`
+}
+
+var config = driver.Config{
+	Name:      "139Yun",
+	LocalSort: true,
+}
+
+func init() {
+	op.RegisterDriver(config, func() driver.Driver {
+		return &Yun139{}
+	})
+}

drivers/139/types.go

@@ -1,4 +1,4 @@
-package _39
+package _139
 
 type BaseResp struct {
 	Success bool   `json:"success"`

drivers/139/util.go

@@ -1,17 +1,30 @@
-package _39
+package _139
 
 import (
 	"encoding/base64"
-	"github.com/Xhofe/alist/drivers/base"
-	"github.com/Xhofe/alist/model"
-	"github.com/Xhofe/alist/utils"
+	"errors"
+	"fmt"
+	"net/http"
 	"net/url"
 	"sort"
 	"strconv"
 	"strings"
 	"time"
+
+	"github.com/alist-org/alist/v3/drivers/base"
+	"github.com/alist-org/alist/v3/internal/model"
+	"github.com/alist-org/alist/v3/pkg/utils"
+	"github.com/alist-org/alist/v3/pkg/utils/random"
+	"github.com/go-resty/resty/v2"
+	jsoniter "github.com/json-iterator/go"
+	log "github.com/sirupsen/logrus"
 )
 
+// do others that not defined in Driver interface
+func (d *Yun139) isFamily() bool {
+	return d.Type == "family"
+}
+
 func encodeURIComponent(str string) string {
 	r := url.QueryEscape(str)
 	r = strings.Replace(r, "+", "%20", -1)
@@ -31,13 +44,200 @@ func calSign(body, ts, randStr string) string {
 	return res
 }
 
-func getTime(t string) *time.Time {
+func getTime(t string) time.Time {
 	stamp, _ := time.ParseInLocation("20060102150405", t, time.Local)
-	return &stamp
+	return stamp
 }
 
-func isFamily(account *model.Account) bool {
-	return account.InternalType == "Family"
+func (d *Yun139) request(pathname string, method string, callback base.ReqCallback, resp interface{}) ([]byte, error) {
+	url := "https://yun.139.com" + pathname
+	req := base.RestyClient.R()
+	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, */*",
+		"CMS-DEVICE":     "default",
+		"Cookie":         d.Cookie,
+		"mcloud-channel": "1000101",
+		"mcloud-client":  "10701",
+		//"mcloud-route": "001",
+		"mcloud-sign": fmt.Sprintf("%s,%s,%s", ts, randStr, sign),
+		//"mcloud-skey":"",
+		"mcloud-version":      "6.6.0",
+		"Origin":              "https://yun.139.com",
+		"Referer":             "https://yun.139.com/w/",
+		"x-DeviceInfo":        "||9|6.6.0|chrome|95.0.4638.69|uwIy75obnsRPIwlJSd7D9GhUvFwG96ce||macos 10.15.2||zh-CN|||",
+		"x-huawei-channelSrc": "10000034",
+		"x-inner-ntwk":        "2",
+		"x-m4c-caller":        "PC",
+		"x-m4c-src":           "10002",
+		"x-SvcType":           svcType,
+	})
+
+	var e BaseResp
+	req.SetResult(&e)
+	res, err := req.Execute(method, url)
+	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) post(pathname string, data interface{}, resp interface{}) ([]byte, error) {
+	return d.request(pathname, http.MethodPost, func(req *resty.Request) {
+		req.SetBody(data)
+	}, resp)
+}
+
+func (d *Yun139) getFiles(catalogID string) ([]model.Obj, error) {
+	start := 0
+	limit := 100
+	files := make([]model.Obj, 0)
+	for {
+		data := base.Json{
+			"catalogID":       catalogID,
+			"sortDirection":   1,
+			"startNumber":     start + 1,
+			"endNumber":       start + limit,
+			"filterType":      0,
+			"catalogSortType": 0,
+			"contentSortType": 0,
+			"commonAccountInfo": base.Json{
+				"account":     d.Account,
+				"accountType": 1,
+			},
+		}
+		var resp GetDiskResp
+		_, err := d.post("/orchestration/personalCloud/catalog/v1.0/getDisk", data, &resp)
+		if err != nil {
+			return nil, err
+		}
+		for _, catalog := range resp.Data.GetDiskResult.CatalogList {
+			f := model.Object{
+				ID:       catalog.CatalogID,
+				Name:     catalog.CatalogName,
+				Size:     0,
+				Modified: getTime(catalog.UpdateTime),
+				IsFolder: true,
+			}
+			files = append(files, &f)
+		}
+		for _, content := range resp.Data.GetDiskResult.ContentList {
+			f := model.ObjThumb{
+				Object: model.Object{
+					ID:       content.ContentID,
+					Name:     content.ContentName,
+					Size:     content.ContentSize,
+					Modified: getTime(content.UpdateTime),
+				},
+				Thumbnail: model.Thumbnail{Thumbnail: content.ThumbnailURL},
+				//Thumbnail: content.BigthumbnailURL,
+			}
+			files = append(files, &f)
+		}
+		if start+limit >= resp.Data.GetDiskResult.NodeCount {
+			break
+		}
+		start += limit
+	}
+	return files, nil
+}
+
+func (d *Yun139) newJson(data map[string]interface{}) base.Json {
+	common := map[string]interface{}{
+		"catalogType": 3,
+		"cloudID":     d.CloudID,
+		"cloudType":   1,
+		"commonAccountInfo": base.Json{
+			"account":     d.Account,
+			"accountType": 1,
+		},
+	}
+	return utils.MergeMap(data, common)
+}
+
+func (d *Yun139) familyGetFiles(catalogID string) ([]model.Obj, error) {
+	pageNum := 1
+	files := make([]model.Obj, 0)
+	for {
+		data := d.newJson(base.Json{
+			"catalogID":       catalogID,
+			"contentSortType": 0,
+			"pageInfo": base.Json{
+				"pageNum":  pageNum,
+				"pageSize": 100,
+			},
+			"sortDirection": 1,
+		})
+		var resp QueryContentListResp
+		_, err := d.post("/orchestration/familyCloud/content/v1.0/queryContentList", data, &resp)
+		if err != nil {
+			return nil, err
+		}
+		for _, catalog := range resp.Data.CloudCatalogList {
+			f := model.Object{
+				ID:       catalog.CatalogID,
+				Name:     catalog.CatalogName,
+				Size:     0,
+				IsFolder: true,
+				Modified: getTime(catalog.LastUpdateTime),
+			}
+			files = append(files, &f)
+		}
+		for _, content := range resp.Data.CloudContentList {
+			f := model.ObjThumb{
+				Object: model.Object{
+					ID:       content.ContentID,
+					Name:     content.ContentName,
+					Size:     content.ContentSize,
+					Modified: getTime(content.LastUpdateTime),
+				},
+				Thumbnail: model.Thumbnail{Thumbnail: content.ThumbnailURL},
+				//Thumbnail: content.BigthumbnailURL,
+			}
+			files = append(files, &f)
+		}
+		if 100*pageNum > resp.Data.TotalCount {
+			break
+		}
+		pageNum++
+	}
+	return files, nil
+}
+
+func (d *Yun139) getLink(contentId string) (string, error) {
+	data := base.Json{
+		"appName":   "",
+		"contentID": contentId,
+		"commonAccountInfo": base.Json{
+			"account":     d.Account,
+			"accountType": 1,
+		},
+	}
+	res, err := d.post("/orchestration/personalCloud/uploadAndDownload/v1.0/downloadRequest",
+		data, nil)
+	if err != nil {
+		return "", err
+	}
+	return jsoniter.Get(res, "data", "downloadURL").ToString(), nil
 }
 
 func unicode(str string) string {
@@ -45,26 +245,3 @@ func unicode(str string) string {
 	textUnquoted := textQuoted[1 : len(textQuoted)-1]
 	return textUnquoted
 }
-
-func MergeMap(mObj ...map[string]interface{}) map[string]interface{} {
-	newObj := map[string]interface{}{}
-	for _, m := range mObj {
-		for k, v := range m {
-			newObj[k] = v
-		}
-	}
-	return newObj
-}
-
-func newJson(data map[string]interface{}, account *model.Account) map[string]interface{} {
-	common := map[string]interface{}{
-		"catalogType": 3,
-		"cloudID":     account.SiteId,
-		"cloudType":   1,
-		"commonAccountInfo": base.Json{
-			"account":     account.Username,
-			"accountType": 1,
-		},
-	}
-	return MergeMap(data, common)
-}

drivers/189/189.go

@@ -1,625 +0,0 @@
-package _89
-
-import (
-	"bytes"
-	"crypto/md5"
-	"encoding/base64"
-	"encoding/hex"
-	"errors"
-	"fmt"
-	"github.com/Xhofe/alist/conf"
-	"github.com/Xhofe/alist/drivers/base"
-	"github.com/Xhofe/alist/model"
-	"github.com/Xhofe/alist/utils"
-	"github.com/go-resty/resty/v2"
-	jsoniter "github.com/json-iterator/go"
-	log "github.com/sirupsen/logrus"
-	"io"
-	"math"
-	"net/http"
-	"net/http/cookiejar"
-	"path/filepath"
-	"regexp"
-	"strconv"
-	"strings"
-	"time"
-)
-
-var client189Map map[string]*resty.Client
-var infoMap = make(map[string]Rsa)
-
-func (driver Cloud189) getClient(account *model.Account) (*resty.Client, error) {
-	client, ok := client189Map[account.Name]
-	if ok {
-		return client, nil
-	}
-	err := driver.Login(account)
-	if err != nil {
-		return nil, err
-	}
-	client, ok = client189Map[account.Name]
-	if !ok {
-		return nil, fmt.Errorf("can't find [%s] client", account.Name)
-	}
-	return client, nil
-}
-
-func (driver Cloud189) FormatFile(file *Cloud189File) *model.File {
-	f := &model.File{
-		Id:        strconv.FormatInt(file.Id, 10),
-		Name:      file.Name,
-		Size:      file.Size,
-		Driver:    driver.Config().Name,
-		UpdatedAt: nil,
-		Thumbnail: file.Icon.SmallUrl,
-		Url:       file.Url,
-	}
-	loc, _ := time.LoadLocation("Local")
-	lastOpTime, err := time.ParseInLocation("2006-01-02 15:04:05", file.LastOpTime, loc)
-	if err == nil {
-		f.UpdatedAt = &lastOpTime
-	}
-	if file.Size == -1 {
-		f.Type = conf.FOLDER
-		f.Size = 0
-	} else {
-		f.Type = utils.GetFileType(filepath.Ext(file.Name))
-	}
-	return f
-}
-
-//func (c Cloud189) GetFile(path string, account *model.Account) (*Cloud189File, error) {
-//	dir, name := filepath.Split(path)
-//	dir = utils.ParsePath(dir)
-//	_, _, err := c.ParentPath(dir, account)
-//	if err != nil {
-//		return nil, err
-//	}
-//	parentFiles_, _ := conf.Cache.Get(conf.Ctx, fmt.Sprintf("%s%s", account.Name, dir))
-//	parentFiles, _ := parentFiles_.([]Cloud189File)
-//	for _, file := range parentFiles {
-//		if file.Name == name {
-//			if file.Size != -1 {
-//				return &file, err
-//			} else {
-//				return nil, ErrNotFile
-//			}
-//		}
-//	}
-//	return nil, ErrPathNotFound
-//}
-
-type LoginResp struct {
-	Msg    string `json:"msg"`
-	Result int    `json:"result"`
-	ToUrl  string `json:"toUrl"`
-}
-
-// Login refer to PanIndex
-func (driver Cloud189) Login(account *model.Account) error {
-	client, ok := client189Map[account.Name]
-	if !ok {
-		//cookieJar, _ := cookiejar.New(&cookiejar.Options{PublicSuffixList: publicsuffix.List})
-		client = resty.New()
-		//client.SetCookieJar(cookieJar)
-		client.SetTimeout(base.DefaultTimeout)
-		client.SetRetryCount(3)
-		client.SetHeader("Referer", "https://cloud.189.cn/")
-	}
-	// clear cookie
-	jar, _ := cookiejar.New(nil)
-	client.SetCookieJar(jar)
-	url := "https://cloud.189.cn/api/portal/loginUrl.action?redirectURL=https%3A%2F%2Fcloud.189.cn%2Fmain.action"
-	b := ""
-	lt := ""
-	ltText := regexp.MustCompile(`lt = "(.+?)"`)
-	for i := 0; i < 3; i++ {
-		res, err := client.R().Get(url)
-		if err != nil {
-			return err
-		}
-		// 已经登陆
-		if res.RawResponse.Request.URL.String() == "https://cloud.189.cn/web/main" {
-			return nil
-		}
-		b = res.String()
-		ltTextArr := ltText.FindStringSubmatch(b)
-		if len(ltTextArr) > 0 {
-			lt = ltTextArr[1]
-			break
-		} else {
-			<-time.After(time.Second)
-		}
-	}
-	if lt == "" {
-		return fmt.Errorf("get empty login page")
-	}
-	captchaToken := regexp.MustCompile(`captchaToken' value='(.+?)'`).FindStringSubmatch(b)[1]
-	returnUrl := regexp.MustCompile(`returnUrl = '(.+?)'`).FindStringSubmatch(b)[1]
-	paramId := regexp.MustCompile(`paramId = "(.+?)"`).FindStringSubmatch(b)[1]
-	//reqId := regexp.MustCompile(`reqId = "(.+?)"`).FindStringSubmatch(b)[1]
-	jRsakey := regexp.MustCompile(`j_rsaKey" value="(\S+)"`).FindStringSubmatch(b)[1]
-	vCodeID := regexp.MustCompile(`picCaptcha\.do\?token\=([A-Za-z0-9\&\=]+)`).FindStringSubmatch(b)[1]
-	vCodeRS := ""
-	if vCodeID != "" {
-		// need ValidateCode
-		log.Debugf("try to identify verification codes")
-		timeStamp := strconv.FormatInt(time.Now().UnixNano()/1e6, 10)
-		u := "https://open.e.189.cn/api/logbox/oauth2/picCaptcha.do?token=" + vCodeID + timeStamp
-		imgRes, err := client.R().SetHeaders(map[string]string{
-			"User-Agent":     "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:74.0) Gecko/20100101 Firefox/76.0",
-			"Referer":        "https://open.e.189.cn/api/logbox/oauth2/unifyAccountLogin.do",
-			"Sec-Fetch-Dest": "image",
-			"Sec-Fetch-Mode": "no-cors",
-			"Sec-Fetch-Site": "same-origin",
-		}).Get(u)
-		if err != nil {
-			return err
-		}
-		vRes, err := client.R().SetMultipartField(
-			"image", "validateCode.png", "image/png", bytes.NewReader(imgRes.Body())).
-			Post(conf.GetStr("ocr api"))
-		if err != nil {
-			return err
-		}
-		if jsoniter.Get(vRes.Body(), "status").ToInt() != 200 {
-			return errors.New("ocr error:" + jsoniter.Get(vRes.Body(), "msg").ToString())
-		}
-		vCodeRS = jsoniter.Get(vRes.Body(), "result").ToString()
-		log.Debugln("code: ", vCodeRS)
-	}
-	userRsa := RsaEncode([]byte(account.Username), jRsakey, true)
-	passwordRsa := RsaEncode([]byte(account.Password), jRsakey, true)
-	url = "https://open.e.189.cn/api/logbox/oauth2/loginSubmit.do"
-	var loginResp LoginResp
-	res, err := client.R().
-		SetHeaders(map[string]string{
-			"lt":         lt,
-			"User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36",
-			"Referer":    "https://open.e.189.cn/",
-			"accept":     "application/json;charset=UTF-8",
-		}).SetFormData(map[string]string{
-		"appKey":       "cloud",
-		"accountType":  "01",
-		"userName":     "{RSA}" + userRsa,
-		"password":     "{RSA}" + passwordRsa,
-		"validateCode": vCodeRS,
-		"captchaToken": captchaToken,
-		"returnUrl":    returnUrl,
-		"mailSuffix":   "@pan.cn",
-		"paramId":      paramId,
-		"clientType":   "10010",
-		"dynamicCheck": "FALSE",
-		"cb_SaveName":  "1",
-		"isOauth2":     "false",
-	}).Post(url)
-	if err != nil {
-		return err
-	}
-	err = utils.Json.Unmarshal(res.Body(), &loginResp)
-	if err != nil {
-		log.Error(err.Error())
-		return err
-	}
-	if loginResp.Result != 0 {
-		return fmt.Errorf(loginResp.Msg)
-	}
-	_, err = client.R().Get(loginResp.ToUrl)
-	if err != nil {
-		log.Errorf(err.Error())
-		return err
-	}
-	client189Map[account.Name] = client
-	return nil
-}
-
-func (driver Cloud189) isFamily(account *model.Account) bool {
-	return account.InternalType == "Family"
-}
-
-func (driver Cloud189) GetFiles(fileId string, account *model.Account) ([]Cloud189File, error) {
-	res := make([]Cloud189File, 0)
-	pageNum := 1
-
-	for {
-		var resp Cloud189Files
-		body, err := driver.Request("https://cloud.189.cn/api/open/file/listFiles.action", base.Get, map[string]string{
-			//"noCache":    random(),
-			"pageSize":   "60",
-			"pageNum":    strconv.Itoa(pageNum),
-			"mediaType":  "0",
-			"folderId":   fileId,
-			"iconOption": "5",
-			"orderBy":    "lastOpTime", //account.OrderBy
-			"descending": "true",       //account.OrderDirection
-		}, nil, nil, account)
-		if err != nil {
-			return nil, err
-		}
-		err = utils.Json.Unmarshal(body, &resp)
-		if err != nil {
-			return nil, err
-		}
-		if resp.ResCode != 0 {
-			return nil, fmt.Errorf(resp.ResMessage)
-		}
-		if resp.FileListAO.Count == 0 {
-			break
-		}
-		for _, folder := range resp.FileListAO.FolderList {
-			res = append(res, Cloud189File{
-				Id:         folder.Id,
-				LastOpTime: folder.LastOpTime,
-				Name:       folder.Name,
-				Size:       -1,
-			})
-		}
-		res = append(res, resp.FileListAO.FileList...)
-		pageNum++
-	}
-	return res, nil
-}
-
-func (driver Cloud189) Request(url string, method int, query, form map[string]string, headers map[string]string, account *model.Account) ([]byte, error) {
-	client, err := driver.getClient(account)
-	if err != nil {
-		return nil, err
-	}
-	//var resp base.Json
-	if driver.isFamily(account) {
-		url = strings.Replace(url, "/api/open", "/api/open/family", 1)
-		if query != nil {
-			query["familyId"] = account.SiteId
-		}
-		if form != nil {
-			form["familyId"] = account.SiteId
-		}
-	}
-	var e Cloud189Error
-	req := client.R().SetError(&e).
-		SetHeader("Accept", "application/json;charset=UTF-8").
-		SetQueryParams(map[string]string{
-			"noCache": random(),
-		})
-	if query != nil {
-		req = req.SetQueryParams(query)
-	}
-	if form != nil {
-		req = req.SetFormData(form)
-	}
-	if headers != nil {
-		req = req.SetHeaders(headers)
-	}
-	var res *resty.Response
-	switch method {
-	case base.Get:
-		res, err = req.Get(url)
-	case base.Post:
-		res, err = req.Post(url)
-	default:
-		return nil, base.ErrNotSupport
-	}
-	if err != nil {
-		return nil, err
-	}
-	//log.Debug(res.String())
-	if e.ErrorCode != "" {
-		if e.ErrorCode == "InvalidSessionKey" {
-			err = driver.Login(account)
-			if err != nil {
-				return nil, err
-			}
-			return driver.Request(url, method, query, form, nil, account)
-		}
-	}
-	if jsoniter.Get(res.Body(), "res_code").ToInt() != 0 {
-		err = errors.New(jsoniter.Get(res.Body(), "res_message").ToString())
-	}
-	return res.Body(), err
-}
-
-func (driver Cloud189) GetSessionKey(account *model.Account) (string, error) {
-	//info, ok := infoMap[account.Name]
-	//if !ok {
-	//	info = Info{}
-	//	infoMap[account.Name] = info
-	//} else {
-	//	log.Debugf("hit")
-	//}
-	//if info.SessionKey != "" {
-	//	return info.SessionKey, nil
-	//}
-	resp, err := driver.Request("https://cloud.189.cn/v2/getUserBriefInfo.action", base.Get, nil, nil, nil, account)
-	if err != nil {
-		return "", err
-	}
-	sessionKey := jsoniter.Get(resp, "sessionKey").ToString()
-	//info.SessionKey = sessionKey
-	return sessionKey, nil
-}
-
-func (driver Cloud189) GetResKey(account *model.Account) (string, string, error) {
-	rsa, ok := infoMap[account.Name]
-	if !ok {
-		rsa = Rsa{}
-		infoMap[account.Name] = rsa
-	}
-	now := time.Now().UnixMilli()
-	if rsa.Expire > now {
-		return rsa.PubKey, rsa.PkId, nil
-	}
-	resp, err := driver.Request("https://cloud.189.cn/api/security/generateRsaKey.action", base.Get, nil, nil, nil, account)
-	if err != nil {
-		return "", "", err
-	}
-	pubKey, pkId := jsoniter.Get(resp, "pubKey").ToString(), jsoniter.Get(resp, "pkId").ToString()
-	rsa.PubKey, rsa.PkId = pubKey, pkId
-	rsa.Expire = jsoniter.Get(resp, "expire").ToInt64()
-	return pubKey, pkId, nil
-}
-
-//func (driver Cloud189) UploadRequest1(uri string, form map[string]string, account *model.Account, resp interface{}) ([]byte, error) {
-//	//sessionKey, err := driver.GetSessionKey(account)
-//	//if err != nil {
-//	//	return nil, err
-//	//}
-//	sessionKey := account.DriveId
-//	pubKey, pkId, err := driver.GetResKey(account)
-//	log.Debugln(sessionKey, pubKey, pkId)
-//	if err != nil {
-//		return nil, err
-//	}
-//	xRId := Random("xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx")
-//	pkey := Random("xxxxxxxxxxxx4xxxyxxxxxxxxxxxxxxx")[0 : 16+int(16*mathRand.Float32())]
-//	params := hex.EncodeToString(AesEncrypt([]byte(qs(form)), []byte(pkey[0:16])))
-//	date := strconv.FormatInt(time.Now().Unix(), 10)
-//	a := make(url.Values)
-//	a.Set("SessionKey", sessionKey)
-//	a.Set("Operate", http.MethodGet)
-//	a.Set("RequestURI", uri)
-//	a.Set("Date", date)
-//	a.Set("params", params)
-//	signature := hex.EncodeToString(SHA1(EncodeParam(a), pkey))
-//	encryptionText := RsaEncode([]byte(pkey), pubKey, false)
-//	headers := map[string]string{
-//		"signature":      signature,
-//		"sessionKey":     sessionKey,
-//		"encryptionText": encryptionText,
-//		"pkId":           pkId,
-//		"x-request-id":   xRId,
-//		"x-request-date": date,
-//	}
-//	req := base.RestyClient.R().SetHeaders(headers).SetQueryParam("params", params)
-//	if resp != nil {
-//		req.SetResult(resp)
-//	}
-//	res, err := req.Get("https://upload.cloud.189.cn" + uri)
-//	if err != nil {
-//		return nil, err
-//	}
-//	//log.Debug(res.String())
-//	data := res.Body()
-//	if jsoniter.Get(data, "code").ToString() != "SUCCESS" {
-//		return nil, errors.New(uri + "---" + jsoniter.Get(data, "msg").ToString())
-//	}
-//	return data, nil
-//}
-//
-//func (driver Cloud189) UploadRequest2(uri string, form map[string]string, account *model.Account, resp interface{}) ([]byte, error) {
-//	c := strconv.FormatInt(time.Now().UnixMilli(), 10)
-//	r := Random("xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx")
-//	l := Random("xxxxxxxxxxxx4xxxyxxxxxxxxxxxxxxx")
-//	l = l[0 : 16+int(16*mathRand.Float32())]
-//
-//	e := qs(form)
-//	data := AesEncrypt([]byte(e), []byte(l[0:16]))
-//	h := hex.EncodeToString(data)
-//
-//	sessionKey := account.DriveId
-//	a := make(url.Values)
-//	a.Set("SessionKey", sessionKey)
-//	a.Set("Operate", http.MethodGet)
-//	a.Set("RequestURI", uri)
-//	a.Set("Date", c)
-//	a.Set("params", h)
-//	g := SHA1(EncodeParam(a), l)
-//
-//	pubKey, pkId, err := driver.GetResKey(account)
-//	if err != nil {
-//		return nil, err
-//	}
-//	b := RsaEncode([]byte(l), pubKey, false)
-//	client, err := driver.getClient(account)
-//	if err != nil {
-//		return nil, err
-//	}
-//	req := client.R()
-//	req.Header.Set("accept", "application/json;charset=UTF-8")
-//	req.Header.Set("SessionKey", sessionKey)
-//	req.Header.Set("Signature", hex.EncodeToString(g))
-//	req.Header.Set("X-Request-Date", c)
-//	req.Header.Set("X-Request-ID", r)
-//	req.Header.Set("EncryptionText", b)
-//	req.Header.Set("PkId", pkId)
-//	if resp != nil {
-//		req.SetResult(resp)
-//	}
-//	res, err := req.Get("https://upload.cloud.189.cn" + uri + "?params=" + h)
-//	if err != nil {
-//		return nil, err
-//	}
-//	//log.Debug(res.String())
-//	data = res.Body()
-//	if jsoniter.Get(data, "code").ToString() != "SUCCESS" {
-//		return nil, errors.New(uri + "---" + jsoniter.Get(data, "msg").ToString())
-//	}
-//	return data, nil
-//}
-
-func (driver Cloud189) UploadRequest(uri string, form map[string]string, account *model.Account, resp interface{}) ([]byte, error) {
-	c := strconv.FormatInt(time.Now().UnixMilli(), 10)
-	r := Random("xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx")
-	l := Random("xxxxxxxxxxxx4xxxyxxxxxxxxxxxxxxx")
-	l = l[0 : 16+int(16*utils.Rand.Float32())]
-
-	e := qs(form)
-	data := AesEncrypt([]byte(e), []byte(l[0:16]))
-	h := hex.EncodeToString(data)
-
-	sessionKey := account.DriveId
-	signature := hmacSha1(fmt.Sprintf("SessionKey=%s&Operate=GET&RequestURI=%s&Date=%s&params=%s", sessionKey, uri, c, h), l)
-
-	pubKey, pkId, err := driver.GetResKey(account)
-	if err != nil {
-		return nil, err
-	}
-	b := RsaEncode([]byte(l), pubKey, false)
-	client, err := driver.getClient(account)
-	if err != nil {
-		return nil, err
-	}
-	req := client.R()
-	req.Header.Set("accept", "application/json;charset=UTF-8")
-	req.Header.Set("SessionKey", sessionKey)
-	req.Header.Set("Signature", signature)
-	req.Header.Set("X-Request-Date", c)
-	req.Header.Set("X-Request-ID", r)
-	req.Header.Set("EncryptionText", b)
-	req.Header.Set("PkId", pkId)
-	if resp != nil {
-		req.SetResult(resp)
-	}
-	res, err := req.Get("https://upload.cloud.189.cn" + uri + "?params=" + h)
-	if err != nil {
-		return nil, err
-	}
-	//log.Debug(res.String())
-	data = res.Body()
-	if jsoniter.Get(data, "code").ToString() != "SUCCESS" {
-		return nil, errors.New(uri + "---" + jsoniter.Get(data, "msg").ToString())
-	}
-	return data, nil
-}
-
-// NewUpload Error: signature check false
-func (driver Cloud189) NewUpload(file *model.FileStream, account *model.Account) error {
-	sessionKey, err := driver.GetSessionKey(account)
-	if err != nil {
-		account.Status = err.Error()
-	} else {
-		account.Status = "work"
-		account.DriveId = sessionKey
-	}
-	_ = model.SaveAccount(account)
-	const DEFAULT uint64 = 10485760
-	var count = int64(math.Ceil(float64(file.GetSize()) / float64(DEFAULT)))
-	var finish uint64 = 0
-	parentFile, err := driver.File(file.ParentPath, account)
-	if err != nil {
-		return err
-	}
-	if !parentFile.IsDir() {
-		return base.ErrNotFolder
-	}
-	res, err := driver.UploadRequest("/person/initMultiUpload", map[string]string{
-		"parentFolderId": parentFile.Id,
-		"fileName":       encode(file.Name),
-		"fileSize":       strconv.FormatInt(int64(file.Size), 10),
-		"sliceSize":      strconv.FormatInt(int64(DEFAULT), 10),
-		"lazyCheck":      "1",
-	}, account, nil)
-	if err != nil {
-		return err
-	}
-	uploadFileId := jsoniter.Get(res, "data", "uploadFileId").ToString()
-	//_, err = driver.UploadRequest("/person/getUploadedPartsInfo", map[string]string{
-	//	"uploadFileId": uploadFileId,
-	//}, account, nil)
-	var i int64
-	var byteSize uint64
-	md5s := make([]string, 0)
-	md5Sum := md5.New()
-	for i = 1; i <= count; i++ {
-		byteSize = file.GetSize() - finish
-		if DEFAULT < byteSize {
-			byteSize = DEFAULT
-		}
-		//log.Debugf("%d,%d", byteSize, finish)
-		byteData := make([]byte, byteSize)
-		n, err := io.ReadFull(file, byteData)
-		//log.Debug(err, n)
-		if err != nil {
-			return err
-		}
-		finish += uint64(n)
-		md5Bytes := getMd5(byteData)
-		md5Hex := hex.EncodeToString(md5Bytes)
-		md5Base64 := base64.StdEncoding.EncodeToString(md5Bytes)
-		md5s = append(md5s, strings.ToUpper(md5Hex))
-		md5Sum.Write(byteData)
-		//log.Debugf("md5Bytes: %+v,md5Str:%s,md5Base64:%s", md5Bytes, md5Hex, md5Base64)
-		var resp UploadUrlsResp
-		res, err = driver.UploadRequest("/person/getMultiUploadUrls", map[string]string{
-			"partInfo":     fmt.Sprintf("%s-%s", strconv.FormatInt(i, 10), md5Base64),
-			"uploadFileId": uploadFileId,
-		}, account, &resp)
-		if err != nil {
-			return err
-		}
-		uploadData := resp.UploadUrls["partNumber_"+strconv.FormatInt(i, 10)]
-		log.Debugf("uploadData: %+v", uploadData)
-		requestURL := uploadData.RequestURL
-		uploadHeaders := strings.Split(decodeURIComponent(uploadData.RequestHeader), "&")
-		req, _ := http.NewRequest(http.MethodPut, requestURL, bytes.NewReader(byteData))
-		for _, v := range uploadHeaders {
-			i := strings.Index(v, "=")
-			req.Header.Set(v[0:i], v[i+1:])
-		}
-
-		r, err := base.HttpClient.Do(req)
-		log.Debugf("%+v %+v", r, r.Request.Header)
-		if err != nil {
-			return err
-		}
-	}
-	fileMd5 := hex.EncodeToString(md5Sum.Sum(nil))
-	sliceMd5 := fileMd5
-	if file.GetSize() > DEFAULT {
-		sliceMd5 = utils.GetMD5Encode(strings.Join(md5s, "\n"))
-	}
-	res, err = driver.UploadRequest("/person/commitMultiUploadFile", map[string]string{
-		"uploadFileId": uploadFileId,
-		"fileMd5":      fileMd5,
-		"sliceMd5":     sliceMd5,
-		"lazyCheck":    "1",
-	}, account, nil)
-	account.DriveId, _ = driver.GetSessionKey(account)
-	return err
-}
-
-func (driver Cloud189) OldUpload(file *model.FileStream, account *model.Account) error {
-	//return base.ErrNotImplement
-	client, err := driver.getClient(account)
-	if err != nil {
-		return err
-	}
-	parentFile, err := driver.File(file.ParentPath, account)
-	if err != nil {
-		return err
-	}
-	// api refer to PanIndex
-	res, err := client.R().SetMultipartFormData(map[string]string{
-		"parentId":   parentFile.Id,
-		"sessionKey": account.DriveId,
-		"opertype":   "1",
-		"fname":      file.GetFileName(),
-	}).SetMultipartField("Filedata", file.GetFileName(), file.GetMIMEType(), file).Post("https://hb02.upload.cloud.189.cn/v1/DCIWebUploadAction")
-	if err != nil {
-		return err
-	}
-	if jsoniter.Get(res.Body(), "MD5").ToString() != "" {
-		return nil
-	}
-	log.Debugf(res.String())
-	return errors.New(res.String())
-}

drivers/189/driver.go

@@ -1,268 +1,118 @@
-package _89
+package _189
 
 import (
-	"fmt"
-	"github.com/Xhofe/alist/conf"
-	"github.com/Xhofe/alist/drivers/base"
-	"github.com/Xhofe/alist/model"
-	"github.com/Xhofe/alist/utils"
+	"context"
+	"net/http"
+	"strings"
+
+	"github.com/alist-org/alist/v3/drivers/base"
+	"github.com/alist-org/alist/v3/internal/driver"
+	"github.com/alist-org/alist/v3/internal/errs"
+	"github.com/alist-org/alist/v3/internal/model"
+	"github.com/alist-org/alist/v3/pkg/utils"
 	"github.com/go-resty/resty/v2"
 	log "github.com/sirupsen/logrus"
-	"net/http"
-	"path/filepath"
-	"strings"
 )
 
-type Cloud189 struct{}
-
-func (driver Cloud189) Config() base.DriverConfig {
-	return base.DriverConfig{
-		Name:      "189Cloud",
-		LocalSort: true,
-	}
+type Cloud189 struct {
+	model.Storage
+	Addition
+	client     *resty.Client
+	rsa        Rsa
+	sessionKey string
 }
 
-func (driver Cloud189) Items() []base.Item {
-	return []base.Item{
-		{
-			Name:        "username",
-			Label:       "username",
-			Type:        base.TypeString,
-			Required:    true,
-			Description: "account username/phone number",
-		},
-		{
-			Name:        "password",
-			Label:       "password",
-			Type:        base.TypeString,
-			Required:    true,
-			Description: "account password",
-		},
-		{
-			Name:     "root_folder",
-			Label:    "root folder file_id",
-			Type:     base.TypeString,
-			Required: true,
-		},
-		//{
-		//	Name:     "internal_type",
-		//	Label:    "189cloud type",
-		//	Type:     base.TypeSelect,
-		//	Required: true,
-		//	Values:   "Personal,Family",
-		//},
-		//{
-		//	Name:  "site_id",
-		//	Label: "family id",
-		//	Type:  base.TypeString,
-		//},
-		//{
-		//	Name:     "order_by",
-		//	Label:    "order_by",
-		//	Type:     base.TypeSelect,
-		//	Values:   "name,size,lastOpTime,createdDate",
-		//	Required: true,
-		//},
-		//{
-		//	Name:     "order_direction",
-		//	Label:    "desc",
-		//	Type:     base.TypeSelect,
-		//	Values:   "true,false",
-		//	Required: true,
-		//},
-	}
+func (d *Cloud189) Config() driver.Config {
+	return config
 }
 
-func (driver Cloud189) Save(account *model.Account, old *model.Account) error {
-	if old != nil {
-		delete(client189Map, old.Name)
+func (d *Cloud189) GetAddition() driver.Additional {
+	return d.Addition
+}
+
+func (d *Cloud189) Init(ctx context.Context, storage model.Storage) error {
+	d.Storage = storage
+	err := utils.Json.UnmarshalFromString(d.Storage.Addition, &d.Addition)
+	if err != nil {
+		return err
 	}
-	if account == nil {
+	d.client = resty.New().
+		SetTimeout(base.DefaultTimeout).
+		SetRetryCount(3).
+		SetHeader("Referer", "https://cloud.189.cn/").
+		SetHeader("User-Agent", base.UserAgent)
+	return d.login()
+}
+
+func (d *Cloud189) Drop(ctx context.Context) error {
 	return nil
-	}
-	if err := driver.Login(account); err != nil {
-		account.Status = err.Error()
-		_ = model.SaveAccount(account)
-		return err
-	}
-	sessionKey, err := driver.GetSessionKey(account)
-	if err != nil {
-		account.Status = err.Error()
-	} else {
-		account.Status = "work"
-		account.DriveId = sessionKey
-	}
-	_ = model.SaveAccount(account)
-	return err
 }
 
-func (driver Cloud189) File(path string, account *model.Account) (*model.File, error) {
-	path = utils.ParsePath(path)
-	if path == "/" {
-		return &model.File{
-			Id:        account.RootFolder,
-			Name:      account.Name,
-			Size:      0,
-			Type:      conf.FOLDER,
-			Driver:    driver.Config().Name,
-			UpdatedAt: account.UpdatedAt,
-		}, nil
-	}
-	dir, name := filepath.Split(path)
-	files, err := driver.Files(dir, account)
-	if err != nil {
-		return nil, err
-	}
-	for _, file := range files {
-		if file.Name == name {
-			return &file, nil
-		}
-	}
-	return nil, base.ErrPathNotFound
+func (d *Cloud189) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([]model.Obj, error) {
+	return d.getFiles(dir.GetID())
 }
 
-func (driver Cloud189) Files(path string, account *model.Account) ([]model.File, error) {
-	path = utils.ParsePath(path)
-	var rawFiles []Cloud189File
-	cache, err := base.GetCache(path, account)
-	if err == nil {
-		rawFiles, _ = cache.([]Cloud189File)
-	} else {
-		file, err := driver.File(path, account)
-		if err != nil {
-			return nil, err
-		}
-		rawFiles, err = driver.GetFiles(file.Id, account)
-		if err != nil {
-			return nil, err
-		}
-		if len(rawFiles) > 0 {
-			_ = base.SetCache(path, rawFiles, account)
-		}
-	}
-	files := make([]model.File, 0)
-	for _, file := range rawFiles {
-		files = append(files, *driver.FormatFile(&file))
-	}
-	return files, nil
-}
+//func (d *Cloud189) Get(ctx context.Context, path string) (model.Obj, error) {
+//	// this is optional
+//	return nil, errs.NotImplement
+//}
 
-func (driver Cloud189) Link(args base.Args, account *model.Account) (*base.Link, error) {
-	file, err := driver.File(utils.ParsePath(args.Path), account)
-	if err != nil {
-		return nil, err
-	}
-	if file.Type == conf.FOLDER {
-		return nil, base.ErrNotFile
-	}
+func (d *Cloud189) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
 	var resp DownResp
 	u := "https://cloud.189.cn/api/portal/getFileInfo.action"
-	body, err := driver.Request(u, base.Get, map[string]string{
-		"fileId": file.Id,
-	}, nil, nil, account)
+	_, err := d.request(u, http.MethodGet, func(req *resty.Request) {
+		req.SetQueryParam("fileId", file.GetID())
+	}, &resp)
 	if err != nil {
 		return nil, err
 	}
-	log.Debugln(string(body))
-	err = utils.Json.Unmarshal(body, &resp)
-	if err != nil {
-		return nil, err
-	}
-	if resp.ResCode != 0 {
-		return nil, fmt.Errorf(resp.ResMessage)
-	}
-	client, err := driver.getClient(account)
-	if err != nil {
-		return nil, err
-	}
-	client = resty.NewWithClient(client.GetClient()).SetRedirectPolicy(
+	client := resty.NewWithClient(d.client.GetClient()).SetRedirectPolicy(
 		resty.RedirectPolicyFunc(func(req *http.Request, via []*http.Request) error {
 			return http.ErrUseLastResponse
 		}))
-	res, err := client.R().Get("https:" + resp.FileDownloadUrl)
+	res, err := client.R().SetHeader("User-Agent", base.UserAgent).Get("https:" + resp.FileDownloadUrl)
 	if err != nil {
 		return nil, err
 	}
 	log.Debugln(res.Status())
-	link := base.Link{
-		Headers: []base.Header{
-			{Name: "User-Agent", Value: base.UserAgent},
-			{Name: "Authorization", Value: ""},
-		},
-	}
+	log.Debugln(res.String())
+	link := model.Link{}
+	log.Debugln("first url:", resp.FileDownloadUrl)
 	if res.StatusCode() == 302 {
-		link.Url = res.Header().Get("location")
-		res, err = client.R().Get(link.Url)
+		link.URL = res.Header().Get("location")
+		log.Debugln("second url:", link.URL)
+		_, _ = client.R().Get(link.URL)
 		if res.StatusCode() == 302 {
-			link.Url = res.Header().Get("location")
+			link.URL = res.Header().Get("location")
 		}
+		log.Debugln("third url:", link.URL)
 	} else {
-		link.Url = resp.FileDownloadUrl
+		link.URL = resp.FileDownloadUrl
 	}
-	link.Url = strings.Replace(link.Url, "http://", "https://", 1)
+	link.URL = strings.Replace(link.URL, "http://", "https://", 1)
 	return &link, nil
 }
 
-func (driver Cloud189) Path(path string, account *model.Account) (*model.File, []model.File, error) {
-	path = utils.ParsePath(path)
-	log.Debugf("189 path: %s", path)
-	file, err := driver.File(path, account)
-	if err != nil {
-		return nil, nil, err
-	}
-	if !file.IsDir() {
-		return file, nil, nil
-	}
-	files, err := driver.Files(path, account)
-	if err != nil {
-		return nil, nil, err
-	}
-	return nil, files, nil
-}
-
-//func (driver Cloud189) Proxy(r *http.Request, account *model.Account) {
-//	r.Header.Del("Origin")
-//}
-
-func (driver Cloud189) Preview(path string, account *model.Account) (interface{}, error) {
-	return nil, base.ErrNotSupport
-}
-
-func (driver Cloud189) MakeDir(path string, account *model.Account) error {
-	dir, name := filepath.Split(path)
-	parent, err := driver.File(dir, account)
-	if err != nil {
-		return err
-	}
-	if !parent.IsDir() {
-		return base.ErrNotFolder
-	}
+func (d *Cloud189) MakeDir(ctx context.Context, parentDir model.Obj, dirName string) error {
 	form := map[string]string{
-		"parentFolderId": parent.Id,
-		"folderName":     name,
+		"parentFolderId": parentDir.GetID(),
+		"folderName":     dirName,
 	}
-	_, err = driver.Request("https://cloud.189.cn/api/open/file/createFolder.action", base.Post, nil, form, nil, account)
+	_, err := d.request("https://cloud.189.cn/api/open/file/createFolder.action", http.MethodPost, func(req *resty.Request) {
+		req.SetFormData(form)
+	}, nil)
 	return err
 }
 
-func (driver Cloud189) Move(src string, dst string, account *model.Account) error {
-	dstDir, dstName := filepath.Split(dst)
-	srcFile, err := driver.File(src, account)
-	if err != nil {
-		return err
-	}
-	dstDirFile, err := driver.File(dstDir, account)
-	if err != nil {
-		return err
-	}
+func (d *Cloud189) Move(ctx context.Context, srcObj, dstDir model.Obj) error {
 	isFolder := 0
-	if srcFile.IsDir() {
+	if srcObj.IsDir() {
 		isFolder = 1
 	}
 	taskInfos := []base.Json{
 		{
-			"fileId":   srcFile.Id,
-			"fileName": dstName,
+			"fileId":   srcObj.GetID(),
+			"fileName": srcObj.GetName(),
 			"isFolder": isFolder,
 		},
 	}
@@ -272,53 +122,43 @@ func (driver Cloud189) Move(src string, dst string, account *model.Account) erro
 	}
 	form := map[string]string{
 		"type":           "MOVE",
-		"targetFolderId": dstDirFile.Id,
+		"targetFolderId": dstDir.GetID(),
 		"taskInfos":      string(taskInfosBytes),
 	}
-	_, err = driver.Request("https://cloud.189.cn/api/open/batch/createBatchTask.action", base.Post, nil, form, nil, account)
+	_, err = d.request("https://cloud.189.cn/api/open/batch/createBatchTask.action", http.MethodPost, func(req *resty.Request) {
+		req.SetFormData(form)
+	}, nil)
 	return err
 }
 
-func (driver Cloud189) Rename(src string, dst string, account *model.Account) error {
-	_, dstName := filepath.Split(dst)
-	srcFile, err := driver.File(src, account)
-	if err != nil {
-		return err
-	}
+func (d *Cloud189) Rename(ctx context.Context, srcObj model.Obj, newName string) error {
 	url := "https://cloud.189.cn/api/open/file/renameFile.action"
 	idKey := "fileId"
 	nameKey := "destFileName"
-	if srcFile.IsDir() {
+	if srcObj.IsDir() {
 		url = "https://cloud.189.cn/api/open/file/renameFolder.action"
 		idKey = "folderId"
 		nameKey = "destFolderName"
 	}
 	form := map[string]string{
-		idKey:   srcFile.Id,
-		nameKey: dstName,
+		idKey:   srcObj.GetID(),
+		nameKey: newName,
 	}
-	_, err = driver.Request(url, base.Post, nil, form, nil, account)
+	_, err := d.request(url, http.MethodPost, func(req *resty.Request) {
+		req.SetFormData(form)
+	}, nil)
 	return err
 }
 
-func (driver Cloud189) Copy(src string, dst string, account *model.Account) error {
-	dstDir, dstName := filepath.Split(dst)
-	srcFile, err := driver.File(src, account)
-	if err != nil {
-		return err
-	}
-	dstDirFile, err := driver.File(dstDir, account)
-	if err != nil {
-		return err
-	}
+func (d *Cloud189) Copy(ctx context.Context, srcObj, dstDir model.Obj) error {
 	isFolder := 0
-	if srcFile.IsDir() {
+	if srcObj.IsDir() {
 		isFolder = 1
 	}
 	taskInfos := []base.Json{
 		{
-			"fileId":   srcFile.Id,
-			"fileName": dstName,
+			"fileId":   srcObj.GetID(),
+			"fileName": srcObj.GetName(),
 			"isFolder": isFolder,
 		},
 	}
@@ -328,27 +168,24 @@ func (driver Cloud189) Copy(src string, dst string, account *model.Account) erro
 	}
 	form := map[string]string{
 		"type":           "COPY",
-		"targetFolderId": dstDirFile.Id,
+		"targetFolderId": dstDir.GetID(),
 		"taskInfos":      string(taskInfosBytes),
 	}
-	_, err = driver.Request("https://cloud.189.cn/api/open/batch/createBatchTask.action", base.Post, nil, form, nil, account)
+	_, err = d.request("https://cloud.189.cn/api/open/batch/createBatchTask.action", http.MethodPost, func(req *resty.Request) {
+		req.SetFormData(form)
+	}, nil)
 	return err
 }
 
-func (driver Cloud189) Delete(path string, account *model.Account) error {
-	path = utils.ParsePath(path)
-	file, err := driver.File(path, account)
-	if err != nil {
-		return err
-	}
+func (d *Cloud189) Remove(ctx context.Context, obj model.Obj) error {
 	isFolder := 0
-	if file.IsDir() {
+	if obj.IsDir() {
 		isFolder = 1
 	}
 	taskInfos := []base.Json{
 		{
-			"fileId":   file.Id,
-			"fileName": file.Name,
+			"fileId":   obj.GetID(),
+			"fileName": obj.GetName(),
 			"isFolder": isFolder,
 		},
 	}
@@ -361,17 +198,18 @@ func (driver Cloud189) Delete(path string, account *model.Account) error {
 		"targetFolderId": "",
 		"taskInfos":      string(taskInfosBytes),
 	}
-	_, err = driver.Request("https://cloud.189.cn/api/open/batch/createBatchTask.action", base.Post, nil, form, nil, account)
+	_, err = d.request("https://cloud.189.cn/api/open/batch/createBatchTask.action", http.MethodPost, func(req *resty.Request) {
+		req.SetFormData(form)
+	}, nil)
 	return err
 }
 
-func (driver Cloud189) Upload(file *model.FileStream, account *model.Account) error {
-	//return base.ErrNotImplement
-	if file == nil {
-		return base.ErrEmptyFile
-	}
-	return driver.NewUpload(file, account)
-	//return driver.OldUpload(file, account)
+func (d *Cloud189) Put(ctx context.Context, dstDir model.Obj, stream model.FileStreamer, up driver.UpdateProgress) error {
+	return d.newUpload(dstDir, stream, up)
 }
 
-var _ base.Driver = (*Cloud189)(nil)
+func (d *Cloud189) Other(ctx context.Context, args model.OtherArgs) (interface{}, error) {
+	return nil, errs.NotSupport
+}
+
+var _ driver.Driver = (*Cloud189)(nil)

drivers/189/help.go

@@ -0,0 +1,186 @@
+package _189
+
+import (
+	"bytes"
+	"crypto/aes"
+	"crypto/hmac"
+	"crypto/md5"
+	"crypto/rand"
+	"crypto/rsa"
+	"crypto/sha1"
+	"crypto/x509"
+	"encoding/base64"
+	"encoding/hex"
+	"encoding/pem"
+	"fmt"
+	"net/url"
+	"regexp"
+	"strconv"
+	"strings"
+
+	myrand "github.com/alist-org/alist/v3/pkg/utils/random"
+	log "github.com/sirupsen/logrus"
+)
+
+func random() string {
+	return fmt.Sprintf("0.%17v", myrand.Rand.Int63n(100000000000000000))
+}
+
+func RsaEncode(origData []byte, j_rsakey string, hex bool) string {
+	publicKey := []byte("-----BEGIN PUBLIC KEY-----\n" + j_rsakey + "\n-----END PUBLIC KEY-----")
+	block, _ := pem.Decode(publicKey)
+	pubInterface, _ := x509.ParsePKIXPublicKey(block.Bytes)
+	pub := pubInterface.(*rsa.PublicKey)
+	b, err := rsa.EncryptPKCS1v15(rand.Reader, pub, origData)
+	if err != nil {
+		log.Errorf("err: %s", err.Error())
+	}
+	res := base64.StdEncoding.EncodeToString(b)
+	if hex {
+		return b64tohex(res)
+	}
+	return res
+}
+
+var b64map = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"
+
+var BI_RM = "0123456789abcdefghijklmnopqrstuvwxyz"
+
+func int2char(a int) string {
+	return strings.Split(BI_RM, "")[a]
+}
+
+func b64tohex(a string) string {
+	d := ""
+	e := 0
+	c := 0
+	for i := 0; i < len(a); i++ {
+		m := strings.Split(a, "")[i]
+		if m != "=" {
+			v := strings.Index(b64map, m)
+			if 0 == e {
+				e = 1
+				d += int2char(v >> 2)
+				c = 3 & v
+			} else if 1 == e {
+				e = 2
+				d += int2char(c<<2 | v>>4)
+				c = 15 & v
+			} else if 2 == e {
+				e = 3
+				d += int2char(c)
+				d += int2char(v >> 2)
+				c = 3 & v
+			} else {
+				e = 0
+				d += int2char(c<<2 | v>>4)
+				d += int2char(15 & v)
+			}
+		}
+	}
+	if e == 1 {
+		d += int2char(c << 2)
+	}
+	return d
+}
+
+func qs(form map[string]string) string {
+	f := make(url.Values)
+	for k, v := range form {
+		f.Set(k, v)
+	}
+	return EncodeParam(f)
+	//strList := make([]string, 0)
+	//for k, v := range form {
+	//	strList = append(strList, fmt.Sprintf("%s=%s", k, url.QueryEscape(v)))
+	//}
+	//return strings.Join(strList, "&")
+}
+
+func EncodeParam(v url.Values) string {
+	if v == nil {
+		return ""
+	}
+	var buf strings.Builder
+	keys := make([]string, 0, len(v))
+	for k := range v {
+		keys = append(keys, k)
+	}
+	for _, k := range keys {
+		vs := v[k]
+		for _, v := range vs {
+			if buf.Len() > 0 {
+				buf.WriteByte('&')
+			}
+			buf.WriteString(k)
+			buf.WriteByte('=')
+			//if k == "fileName" {
+			//	buf.WriteString(encode(v))
+			//} else {
+			buf.WriteString(v)
+			//}
+		}
+	}
+	return buf.String()
+}
+
+func encode(str string) string {
+	//str = strings.ReplaceAll(str, "%", "%25")
+	//str = strings.ReplaceAll(str, "&", "%26")
+	//str = strings.ReplaceAll(str, "+", "%2B")
+	//return str
+	return url.QueryEscape(str)
+}
+
+func AesEncrypt(data, key []byte) []byte {
+	block, _ := aes.NewCipher(key)
+	if block == nil {
+		return []byte{}
+	}
+	data = PKCS7Padding(data, block.BlockSize())
+	decrypted := make([]byte, len(data))
+	size := block.BlockSize()
+	for bs, be := 0, size; bs < len(data); bs, be = bs+size, be+size {
+		block.Encrypt(decrypted[bs:be], data[bs:be])
+	}
+	return decrypted
+}
+
+func PKCS7Padding(ciphertext []byte, blockSize int) []byte {
+	padding := blockSize - len(ciphertext)%blockSize
+	padtext := bytes.Repeat([]byte{byte(padding)}, padding)
+	return append(ciphertext, padtext...)
+}
+
+func hmacSha1(data string, secret string) string {
+	h := hmac.New(sha1.New, []byte(secret))
+	h.Write([]byte(data))
+	return hex.EncodeToString(h.Sum(nil))
+}
+
+func getMd5(data []byte) []byte {
+	h := md5.New()
+	h.Write(data)
+	return h.Sum(nil)
+}
+
+func decodeURIComponent(str string) string {
+	r, _ := url.PathUnescape(str)
+	//r = strings.ReplaceAll(r, " ", "+")
+	return r
+}
+
+func Random(v string) string {
+	reg := regexp.MustCompilePOSIX("[xy]")
+	data := reg.ReplaceAllFunc([]byte(v), func(msg []byte) []byte {
+		var i int64
+		t := int64(16 * myrand.Rand.Float32())
+		if msg[0] == 120 {
+			i = t
+		} else {
+			i = 3&t | 8
+		}
+		return []byte(strconv.FormatInt(i, 16))
+	})
+	return string(data)
+}

drivers/189/meta.go

@@ -0,0 +1,24 @@
+package _189
+
+import (
+	"github.com/alist-org/alist/v3/internal/driver"
+	"github.com/alist-org/alist/v3/internal/op"
+)
+
+type Addition struct {
+	Username string `json:"username" required:"true"`
+	Password string `json:"password" required:"true"`
+	driver.RootID
+}
+
+var config = driver.Config{
+	Name:        "189Cloud",
+	LocalSort:   true,
+	DefaultRoot: "-11",
+}
+
+func init() {
+	op.RegisterDriver(config, func() driver.Driver {
+		return &Cloud189{}
+	})
+}

drivers/189/types.go

@@ -1,11 +1,17 @@
-package _89
+package _189
 
-type Cloud189Error struct {
+type LoginResp struct {
+	Msg    string `json:"msg"`
+	Result int    `json:"result"`
+	ToUrl  string `json:"toUrl"`
+}
+
+type Error struct {
 	ErrorCode string `json:"errorCode"`
 	ErrorMsg  string `json:"errorMsg"`
 }
 
-type Cloud189File struct {
+type File struct {
 	Id         int64  `json:"id"`
 	LastOpTime string `json:"lastOpTime"`
 	Name       string `json:"name"`
@@ -17,19 +23,19 @@ type Cloud189File struct {
 	Url string `json:"url"`
 }
 
-type Cloud189Folder struct {
+type Folder struct {
 	Id         int64  `json:"id"`
 	LastOpTime string `json:"lastOpTime"`
 	Name       string `json:"name"`
 }
 
-type Cloud189Files struct {
+type Files struct {
 	ResCode    int    `json:"res_code"`
 	ResMessage string `json:"res_message"`
 	FileListAO struct {
 		Count      int      `json:"count"`
-		FileList   []Cloud189File   `json:"fileList"`
-		FolderList []Cloud189Folder `json:"folderList"`
+		FileList   []File   `json:"fileList"`
+		FolderList []Folder `json:"folderList"`
 	} `json:"fileListAO"`
 }
 
@@ -43,18 +49,13 @@ type Part struct {
 	RequestHeader string `json:"requestHeader"`
 }
 
-//type Info struct {
-//	SessionKey string
-//	Rsa        Rsa
-//}
-
 type Rsa struct {
 	Expire int64  `json:"expire"`
 	PkId   string `json:"pkId"`
 	PubKey string `json:"pubKey"`
 }
 
-type Cloud189Down struct {
+type Down struct {
 	ResCode         int    `json:"res_code"`
 	ResMessage      string `json:"res_message"`
 	FileDownloadUrl string `json:"fileDownloadUrl"`

drivers/189/util.go

@@ -1,199 +1,394 @@
-package _89
+package _189
 
 import (
 	"bytes"
-	"crypto/aes"
-	"crypto/hmac"
 	"crypto/md5"
-	"crypto/rand"
-	"crypto/rsa"
-	"crypto/sha1"
-	"crypto/x509"
 	"encoding/base64"
 	"encoding/hex"
-	"encoding/pem"
+	"errors"
 	"fmt"
-	"github.com/Xhofe/alist/drivers/base"
-	"github.com/Xhofe/alist/utils"
-	"github.com/go-resty/resty/v2"
-	log "github.com/sirupsen/logrus"
-	"net/url"
+	"io"
+	"math"
+	"net/http"
 	"regexp"
 	"strconv"
 	"strings"
+	"time"
+
+	"github.com/alist-org/alist/v3/drivers/base"
+	"github.com/alist-org/alist/v3/internal/conf"
+	"github.com/alist-org/alist/v3/internal/driver"
+	"github.com/alist-org/alist/v3/internal/model"
+	"github.com/alist-org/alist/v3/internal/setting"
+	"github.com/alist-org/alist/v3/pkg/utils"
+	myrand "github.com/alist-org/alist/v3/pkg/utils/random"
+	"github.com/go-resty/resty/v2"
+	jsoniter "github.com/json-iterator/go"
+	log "github.com/sirupsen/logrus"
 )
 
-func random() string {
-	return fmt.Sprintf("0.%17v", utils.Rand.Int63n(100000000000000000))
-}
+// do others that not defined in Driver interface
 
-func RsaEncode(origData []byte, j_rsakey string, hex bool) string {
-	publicKey := []byte("-----BEGIN PUBLIC KEY-----\n" + j_rsakey + "\n-----END PUBLIC KEY-----")
-	block, _ := pem.Decode(publicKey)
-	pubInterface, _ := x509.ParsePKIXPublicKey(block.Bytes)
-	pub := pubInterface.(*rsa.PublicKey)
-	b, err := rsa.EncryptPKCS1v15(rand.Reader, pub, origData)
+func (d *Cloud189) login() error {
+	url := "https://cloud.189.cn/api/portal/loginUrl.action?redirectURL=https%3A%2F%2Fcloud.189.cn%2Fmain.action"
+	b := ""
+	lt := ""
+	ltText := regexp.MustCompile(`lt = "(.+?)"`)
+	var res *resty.Response
+	var err error
+	for i := 0; i < 3; i++ {
+		res, err = d.client.R().Get(url)
 		if err != nil {
-		log.Errorf("err: %s", err.Error())
+			return err
 		}
-	res := base64.StdEncoding.EncodeToString(b)
-	if hex {
-		return b64tohex(res)
+		// 已经登陆
+		if res.RawResponse.Request.URL.String() == "https://cloud.189.cn/web/main" {
+			return nil
 		}
-	return res
-}
-
-var b64map = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"
-
-var BI_RM = "0123456789abcdefghijklmnopqrstuvwxyz"
-
-func int2char(a int) string {
-	return strings.Split(BI_RM, "")[a]
-}
-
-func b64tohex(a string) string {
-	d := ""
-	e := 0
-	c := 0
-	for i := 0; i < len(a); i++ {
-		m := strings.Split(a, "")[i]
-		if m != "=" {
-			v := strings.Index(b64map, m)
-			if 0 == e {
-				e = 1
-				d += int2char(v >> 2)
-				c = 3 & v
-			} else if 1 == e {
-				e = 2
-				d += int2char(c<<2 | v>>4)
-				c = 15 & v
-			} else if 2 == e {
-				e = 3
-				d += int2char(c)
-				d += int2char(v >> 2)
-				c = 3 & v
+		b = res.String()
+		ltTextArr := ltText.FindStringSubmatch(b)
+		if len(ltTextArr) > 0 {
+			lt = ltTextArr[1]
+			break
 		} else {
-				e = 0
-				d += int2char(c<<2 | v>>4)
-				d += int2char(15 & v)
+			<-time.After(time.Second)
 		}
 	}
+	if lt == "" {
+		return fmt.Errorf("get page: %s \nstatus: %d \nrequest url: %s\nredirect url: %s",
+			b, res.StatusCode(), res.RawResponse.Request.URL.String(), res.Header().Get("location"))
 	}
-	if e == 1 {
-		d += int2char(c << 2)
+	captchaToken := regexp.MustCompile(`captchaToken' value='(.+?)'`).FindStringSubmatch(b)[1]
+	returnUrl := regexp.MustCompile(`returnUrl = '(.+?)'`).FindStringSubmatch(b)[1]
+	paramId := regexp.MustCompile(`paramId = "(.+?)"`).FindStringSubmatch(b)[1]
+	//reqId := regexp.MustCompile(`reqId = "(.+?)"`).FindStringSubmatch(b)[1]
+	jRsakey := regexp.MustCompile(`j_rsaKey" value="(\S+)"`).FindStringSubmatch(b)[1]
+	vCodeID := regexp.MustCompile(`picCaptcha\.do\?token\=([A-Za-z0-9\&\=]+)`).FindStringSubmatch(b)[1]
+	vCodeRS := ""
+	if vCodeID != "" {
+		// need ValidateCode
+		log.Debugf("try to identify verification codes")
+		timeStamp := strconv.FormatInt(time.Now().UnixNano()/1e6, 10)
+		u := "https://open.e.189.cn/api/logbox/oauth2/picCaptcha.do?token=" + vCodeID + timeStamp
+		imgRes, err := d.client.R().SetHeaders(map[string]string{
+			"User-Agent":     "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:74.0) Gecko/20100101 Firefox/76.0",
+			"Referer":        "https://open.e.189.cn/api/logbox/oauth2/unifyAccountLogin.do",
+			"Sec-Fetch-Dest": "image",
+			"Sec-Fetch-Mode": "no-cors",
+			"Sec-Fetch-Site": "same-origin",
+		}).Get(u)
+		if err != nil {
+			return err
 		}
-	return d
-}
-
-func qs(form map[string]string) string {
-	f := make(url.Values)
-	for k, v := range form {
-		f.Set(k, v)
-	}
-	return EncodeParam(f)
-	//strList := make([]string, 0)
-	//for k, v := range form {
-	//	strList = append(strList, fmt.Sprintf("%s=%s", k, url.QueryEscape(v)))
+		// Enter the verification code manually
+		//err = message.GetMessenger().WaitSend(message.Message{
+		//	Type:    "image",
+		//	Content: "data:image/png;base64," + base64.StdEncoding.EncodeToString(imgRes.Body()),
+		//}, 10)
+		//if err != nil {
+		//	return err
 		//}
-	//return strings.Join(strList, "&")
-}
-
-func EncodeParam(v url.Values) string {
-	if v == nil {
-		return ""
+		//vCodeRS, err = message.GetMessenger().WaitReceive(30)
+		// use ocr api
+		vRes, err := base.RestyClient.R().SetMultipartField(
+			"image", "validateCode.png", "image/png", bytes.NewReader(imgRes.Body())).
+			Post(setting.GetStr(conf.OcrApi))
+		if err != nil {
+			return err
 		}
-	var buf strings.Builder
-	keys := make([]string, 0, len(v))
-	for k := range v {
-		keys = append(keys, k)
+		if jsoniter.Get(vRes.Body(), "status").ToInt() != 200 {
+			return errors.New("ocr error:" + jsoniter.Get(vRes.Body(), "msg").ToString())
 		}
-	for _, k := range keys {
-		vs := v[k]
-		for _, v := range vs {
-			if buf.Len() > 0 {
-				buf.WriteByte('&')
+		vCodeRS = jsoniter.Get(vRes.Body(), "result").ToString()
+		log.Debugln("code: ", vCodeRS)
 	}
-			buf.WriteString(k)
-			buf.WriteByte('=')
-			//if k == "fileName" {
-			//	buf.WriteString(encode(v))
-			//} else {
-			buf.WriteString(v)
-			//}
+	userRsa := RsaEncode([]byte(d.Username), jRsakey, true)
+	passwordRsa := RsaEncode([]byte(d.Password), jRsakey, true)
+	url = "https://open.e.189.cn/api/logbox/oauth2/loginSubmit.do"
+	var loginResp LoginResp
+	res, err = d.client.R().
+		SetHeaders(map[string]string{
+			"lt":         lt,
+			"User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36",
+			"Referer":    "https://open.e.189.cn/",
+			"accept":     "application/json;charset=UTF-8",
+		}).SetFormData(map[string]string{
+		"appKey":       "cloud",
+		"accountType":  "01",
+		"userName":     "{RSA}" + userRsa,
+		"password":     "{RSA}" + passwordRsa,
+		"validateCode": vCodeRS,
+		"captchaToken": captchaToken,
+		"returnUrl":    returnUrl,
+		"mailSuffix":   "@pan.cn",
+		"paramId":      paramId,
+		"clientType":   "10010",
+		"dynamicCheck": "FALSE",
+		"cb_SaveName":  "1",
+		"isOauth2":     "false",
+	}).Post(url)
+	if err != nil {
+		return err
 	}
+	err = utils.Json.Unmarshal(res.Body(), &loginResp)
+	if err != nil {
+		log.Error(err.Error())
+		return err
 	}
-	return buf.String()
-}
-
-func encode(str string) string {
-	//str = strings.ReplaceAll(str, "%", "%25")
-	//str = strings.ReplaceAll(str, "&", "%26")
-	//str = strings.ReplaceAll(str, "+", "%2B")
-	//return str
-	return url.QueryEscape(str)
-}
-
-func AesEncrypt(data, key []byte) []byte {
-	block, _ := aes.NewCipher(key)
-	if block == nil {
-		return []byte{}
+	if loginResp.Result != 0 {
+		return fmt.Errorf(loginResp.Msg)
 	}
-	data = PKCS7Padding(data, block.BlockSize())
-	decrypted := make([]byte, len(data))
-	size := block.BlockSize()
-	for bs, be := 0, size; bs < len(data); bs, be = bs+size, be+size {
-		block.Encrypt(decrypted[bs:be], data[bs:be])
-	}
-	return decrypted
+	_, err = d.client.R().Get(loginResp.ToUrl)
+	return err
 }
 
-func PKCS7Padding(ciphertext []byte, blockSize int) []byte {
-	padding := blockSize - len(ciphertext)%blockSize
-	padtext := bytes.Repeat([]byte{byte(padding)}, padding)
-	return append(ciphertext, padtext...)
-}
-
-func hmacSha1(data string, secret string) string {
-	h := hmac.New(sha1.New, []byte(secret))
-	h.Write([]byte(data))
-	return hex.EncodeToString(h.Sum(nil))
-}
-
-func getMd5(data []byte) []byte {
-	h := md5.New()
-	h.Write(data)
-	return h.Sum(nil)
-}
-
-func init() {
-	base.RegisterDriver(&Cloud189{})
-	client189Map = make(map[string]*resty.Client)
-}
-
-func decodeURIComponent(str string) string {
-	r, _ := url.PathUnescape(str)
-	//r = strings.ReplaceAll(r, " ", "+")
-	return r
-}
-
-func Random(v string) string {
-	reg := regexp.MustCompilePOSIX("[xy]")
-	data := reg.ReplaceAllFunc([]byte(v), func(msg []byte) []byte {
-		var i int64
-		t := int64(16 * utils.Rand.Float32())
-		if msg[0] == 120 {
-			i = t
-		} else {
-			i = 3&t | 8
-		}
-		return []byte(strconv.FormatInt(i, 16))
+func (d *Cloud189) request(url string, method string, callback base.ReqCallback, resp interface{}) ([]byte, error) {
+	var e Error
+	req := d.client.R().SetError(&e).
+		SetHeader("Accept", "application/json;charset=UTF-8").
+		SetQueryParams(map[string]string{
+			"noCache": random(),
 		})
-	return string(data)
+	if callback != nil {
+		callback(req)
+	}
+	if resp != nil {
+		req.SetResult(resp)
+	}
+	res, err := req.Execute(method, url)
+	if err != nil {
+		return nil, err
+	}
+	//log.Debug(res.String())
+	if e.ErrorCode != "" {
+		if e.ErrorCode == "InvalidSessionKey" {
+			err = d.login()
+			if err != nil {
+				return nil, err
+			}
+			return d.request(url, method, callback, resp)
+		}
+	}
+	if jsoniter.Get(res.Body(), "res_code").ToInt() != 0 {
+		err = errors.New(jsoniter.Get(res.Body(), "res_message").ToString())
+	}
+	return res.Body(), err
 }
 
-//func SHA1(v, l string) []byte {
-//	key := []byte(l)
-//	mac := hmac.New(sha1.New, key)
-//	mac.Write([]byte(v))
-//	return mac.Sum(nil)
-//}
+func (d *Cloud189) getFiles(fileId string) ([]model.Obj, error) {
+	res := make([]model.Obj, 0)
+	pageNum := 1
+	loc, _ := time.LoadLocation("Local")
+	for {
+		var resp Files
+		_, err := d.request("https://cloud.189.cn/api/open/file/listFiles.action", http.MethodGet, func(req *resty.Request) {
+			req.SetQueryParams(map[string]string{
+				//"noCache":    random(),
+				"pageSize":   "60",
+				"pageNum":    strconv.Itoa(pageNum),
+				"mediaType":  "0",
+				"folderId":   fileId,
+				"iconOption": "5",
+				"orderBy":    "lastOpTime", //account.OrderBy
+				"descending": "true",       //account.OrderDirection
+			})
+		}, &resp)
+		if err != nil {
+			return nil, err
+		}
+		if resp.FileListAO.Count == 0 {
+			break
+		}
+		for _, folder := range resp.FileListAO.FolderList {
+			lastOpTime, _ := time.ParseInLocation("2006-01-02 15:04:05", folder.LastOpTime, loc)
+			res = append(res, &model.Object{
+				ID:       strconv.FormatInt(folder.Id, 10),
+				Name:     folder.Name,
+				Modified: lastOpTime,
+				IsFolder: true,
+			})
+		}
+		for _, file := range resp.FileListAO.FileList {
+			lastOpTime, _ := time.ParseInLocation("2006-01-02 15:04:05", file.LastOpTime, loc)
+			res = append(res, &model.ObjThumb{
+				Object: model.Object{
+					ID:       strconv.FormatInt(file.Id, 10),
+					Name:     file.Name,
+					Modified: lastOpTime,
+				},
+				Thumbnail: model.Thumbnail{Thumbnail: file.Icon.SmallUrl},
+			})
+		}
+		pageNum++
+	}
+	return res, nil
+}
+
+func (d *Cloud189) oldUpload(dstDir model.Obj, file model.FileStreamer) error {
+	res, err := d.client.R().SetMultipartFormData(map[string]string{
+		"parentId":   dstDir.GetID(),
+		"sessionKey": "??",
+		"opertype":   "1",
+		"fname":      file.GetName(),
+	}).SetMultipartField("Filedata", file.GetName(), file.GetMimetype(), file).Post("https://hb02.upload.cloud.189.cn/v1/DCIWebUploadAction")
+	if err != nil {
+		return err
+	}
+	if utils.Json.Get(res.Body(), "MD5").ToString() != "" {
+		return nil
+	}
+	log.Debugf(res.String())
+	return errors.New(res.String())
+}
+
+func (d *Cloud189) getSessionKey() (string, error) {
+	resp, err := d.request("https://cloud.189.cn/v2/getUserBriefInfo.action", http.MethodGet, nil, nil)
+	if err != nil {
+		return "", err
+	}
+	sessionKey := utils.Json.Get(resp, "sessionKey").ToString()
+	return sessionKey, nil
+}
+
+func (d *Cloud189) getResKey() (string, string, error) {
+	now := time.Now().UnixMilli()
+	if d.rsa.Expire > now {
+		return d.rsa.PubKey, d.rsa.PkId, nil
+	}
+	resp, err := d.request("https://cloud.189.cn/api/security/generateRsaKey.action", http.MethodGet, nil, nil)
+	if err != nil {
+		return "", "", err
+	}
+	pubKey, pkId := utils.Json.Get(resp, "pubKey").ToString(), utils.Json.Get(resp, "pkId").ToString()
+	d.rsa.PubKey, d.rsa.PkId = pubKey, pkId
+	d.rsa.Expire = utils.Json.Get(resp, "expire").ToInt64()
+	return pubKey, pkId, nil
+}
+
+func (d *Cloud189) uploadRequest(uri string, form map[string]string, resp interface{}) ([]byte, error) {
+	c := strconv.FormatInt(time.Now().UnixMilli(), 10)
+	r := Random("xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx")
+	l := Random("xxxxxxxxxxxx4xxxyxxxxxxxxxxxxxxx")
+	l = l[0 : 16+int(16*myrand.Rand.Float32())]
+
+	e := qs(form)
+	data := AesEncrypt([]byte(e), []byte(l[0:16]))
+	h := hex.EncodeToString(data)
+
+	sessionKey := d.sessionKey
+	signature := hmacSha1(fmt.Sprintf("SessionKey=%s&Operate=GET&RequestURI=%s&Date=%s&params=%s", sessionKey, uri, c, h), l)
+
+	pubKey, pkId, err := d.getResKey()
+	if err != nil {
+		return nil, err
+	}
+	b := RsaEncode([]byte(l), pubKey, false)
+	req := d.client.R().SetHeaders(map[string]string{
+		"accept":         "application/json;charset=UTF-8",
+		"SessionKey":     sessionKey,
+		"Signature":      signature,
+		"X-Request-Date": c,
+		"X-Request-ID":   r,
+		"EncryptionText": b,
+		"PkId":           pkId,
+	})
+	if resp != nil {
+		req.SetResult(resp)
+	}
+	res, err := req.Get("https://upload.cloud.189.cn" + uri + "?params=" + h)
+	if err != nil {
+		return nil, err
+	}
+	data = res.Body()
+	if utils.Json.Get(data, "code").ToString() != "SUCCESS" {
+		return nil, errors.New(uri + "---" + jsoniter.Get(data, "msg").ToString())
+	}
+	return data, nil
+}
+
+func (d *Cloud189) newUpload(dstDir model.Obj, file model.FileStreamer, up driver.UpdateProgress) error {
+	sessionKey, err := d.getSessionKey()
+	if err != nil {
+		return err
+	}
+	d.sessionKey = sessionKey
+	const DEFAULT int64 = 10485760
+	var count = int64(math.Ceil(float64(file.GetSize()) / float64(DEFAULT)))
+
+	res, err := d.uploadRequest("/person/initMultiUpload", map[string]string{
+		"parentFolderId": dstDir.GetID(),
+		"fileName":       encode(file.GetName()),
+		"fileSize":       strconv.FormatInt(file.GetSize(), 10),
+		"sliceSize":      strconv.FormatInt(DEFAULT, 10),
+		"lazyCheck":      "1",
+	}, nil)
+	if err != nil {
+		return err
+	}
+	uploadFileId := jsoniter.Get(res, "data", "uploadFileId").ToString()
+	//_, err = d.uploadRequest("/person/getUploadedPartsInfo", map[string]string{
+	//	"uploadFileId": uploadFileId,
+	//}, nil)
+	var finish int64 = 0
+	var i int64
+	var byteSize int64
+	md5s := make([]string, 0)
+	md5Sum := md5.New()
+	for i = 1; i <= count; i++ {
+		byteSize = file.GetSize() - finish
+		if DEFAULT < byteSize {
+			byteSize = DEFAULT
+		}
+		//log.Debugf("%d,%d", byteSize, finish)
+		byteData := make([]byte, byteSize)
+		n, err := io.ReadFull(file, byteData)
+		//log.Debug(err, n)
+		if err != nil {
+			return err
+		}
+		finish += int64(n)
+		md5Bytes := getMd5(byteData)
+		md5Hex := hex.EncodeToString(md5Bytes)
+		md5Base64 := base64.StdEncoding.EncodeToString(md5Bytes)
+		md5s = append(md5s, strings.ToUpper(md5Hex))
+		md5Sum.Write(byteData)
+		var resp UploadUrlsResp
+		res, err = d.uploadRequest("/person/getMultiUploadUrls", map[string]string{
+			"partInfo":     fmt.Sprintf("%s-%s", strconv.FormatInt(i, 10), md5Base64),
+			"uploadFileId": uploadFileId,
+		}, &resp)
+		if err != nil {
+			return err
+		}
+		uploadData := resp.UploadUrls["partNumber_"+strconv.FormatInt(i, 10)]
+		log.Debugf("uploadData: %+v", uploadData)
+		requestURL := uploadData.RequestURL
+		uploadHeaders := strings.Split(decodeURIComponent(uploadData.RequestHeader), "&")
+		req, _ := http.NewRequest(http.MethodPut, requestURL, bytes.NewReader(byteData))
+		for _, v := range uploadHeaders {
+			i := strings.Index(v, "=")
+			req.Header.Set(v[0:i], v[i+1:])
+		}
+
+		r, err := base.HttpClient.Do(req)
+		log.Debugf("%+v %+v", r, r.Request.Header)
+		r.Body.Close()
+		if err != nil {
+			return err
+		}
+		up(int(i * 100 / count))
+	}
+	fileMd5 := hex.EncodeToString(md5Sum.Sum(nil))
+	sliceMd5 := fileMd5
+	if file.GetSize() > DEFAULT {
+		sliceMd5 = utils.GetMD5Encode(strings.Join(md5s, "\n"))
+	}
+	res, err = d.uploadRequest("/person/commitMultiUploadFile", map[string]string{
+		"uploadFileId": uploadFileId,
+		"fileMd5":      fileMd5,
+		"sliceMd5":     sliceMd5,
+		"lazyCheck":    "1",
+		"opertype":     "3",
+	}, nil)
+	return err
+}

drivers/189pc/189.go

@@ -1,330 +0,0 @@
-package _189
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"net/http"
-	"net/http/cookiejar"
-	"net/url"
-	"regexp"
-	"sync"
-
-	"github.com/Xhofe/alist/conf"
-	"github.com/Xhofe/alist/drivers/base"
-	"github.com/Xhofe/alist/model"
-	"github.com/Xhofe/alist/utils"
-	"github.com/go-resty/resty/v2"
-	"github.com/google/uuid"
-	log "github.com/sirupsen/logrus"
-)
-
-var userStateCache = struct {
-	sync.Mutex
-	States map[string]*State
-}{States: make(map[string]*State)}
-
-func GetState(account *model.Account) *State {
-	userStateCache.Lock()
-	defer userStateCache.Unlock()
-	if v, ok := userStateCache.States[account.Username]; ok && v != nil {
-		return v
-	}
-	state := &State{client: resty.New().
-		SetHeaders(map[string]string{
-			"Accept":     "application/json;charset=UTF-8",
-			"User-Agent": base.UserAgent,
-		}),
-	}
-	userStateCache.States[account.Username] = state
-	return state
-}
-
-type State struct {
-	sync.Mutex
-	client *resty.Client
-
-	RsaPublicKey string
-
-	SessionKey          string
-	SessionSecret       string
-	FamilySessionKey    string
-	FamilySessionSecret string
-
-	AccessToken string
-
-	//怎么刷新的???
-	RefreshToken string
-}
-
-func (s *State) login(account *model.Account) error {
-	// 清除cookie
-	jar, _ := cookiejar.New(nil)
-	s.client.SetCookieJar(jar)
-
-	var err error
-	var res *resty.Response
-	defer func() {
-		account.Status = "work"
-		if err != nil {
-			account.Status = err.Error()
-		}
-		model.SaveAccount(account)
-		if res != nil {
-			log.Debug(res.String())
-		}
-	}()
-
-	var param *LoginParam
-	param, err = s.getLoginParam()
-	if err != nil {
-		return err
-	}
-
-	// 提交登录
-	s.RsaPublicKey = fmt.Sprintf("-----BEGIN PUBLIC KEY-----\n%s\n-----END PUBLIC KEY-----", param.jRsaKey)
-	res, err = s.client.R().
-		SetHeaders(map[string]string{
-			"Referer": AUTH_URL,
-			"REQID":   param.ReqId,
-			"lt":      param.Lt,
-		}).
-		SetFormData(map[string]string{
-			"appKey":       APP_ID,
-			"accountType":  "02",
-			"userName":     "{RSA}" + rsaEncrypt(s.RsaPublicKey, account.Username),
-			"password":     "{RSA}" + rsaEncrypt(s.RsaPublicKey, account.Password),
-			"validateCode": param.vCodeRS,
-			"captchaToken": param.CaptchaToken,
-			"returnUrl":    RETURN_URL,
-			"mailSuffix":   "@189.cn",
-			"dynamicCheck": "FALSE",
-			"clientType":   CLIENT_TYPE,
-			"cb_SaveName":  "1",
-			"isOauth2":     "false",
-			"state":        "",
-			"paramId":      param.ParamId,
-		}).
-		Post(AUTH_URL + "/api/logbox/oauth2/loginSubmit.do")
-	if err != nil {
-		return err
-	}
-	toUrl := utils.Json.Get(res.Body(), "toUrl").ToString()
-	if toUrl == "" {
-		log.Error(res.String())
-		return fmt.Errorf(res.String())
-	}
-
-	// 获取Session
-	var erron Erron
-	var sessionResp appSessionResp
-	res, err = s.client.R().
-		SetResult(&sessionResp).SetError(&erron).
-		SetQueryParams(clientSuffix()).
-		SetQueryParam("redirectURL", url.QueryEscape(toUrl)).
-		Post(API_URL + "/getSessionForPC.action")
-	if err != nil {
-		return err
-	}
-
-	if erron.ResCode != "" {
-		err = fmt.Errorf(erron.ResMessage)
-		return err
-	}
-	if sessionResp.ResCode != 0 {
-		err = fmt.Errorf(sessionResp.ResMessage)
-		return err
-	}
-	s.SessionKey = sessionResp.SessionKey
-	s.SessionSecret = sessionResp.SessionSecret
-	s.FamilySessionKey = sessionResp.FamilySessionKey
-	s.FamilySessionSecret = sessionResp.FamilySessionSecret
-	s.AccessToken = sessionResp.AccessToken
-	s.RefreshToken = sessionResp.RefreshToken
-	return err
-}
-
-func (s *State) getLoginParam() (*LoginParam, error) {
-	res, err := s.client.R().
-		SetQueryParams(map[string]string{
-			"appId":      APP_ID,
-			"clientType": CLIENT_TYPE,
-			"returnURL":  RETURN_URL,
-			"timeStamp":  fmt.Sprint(timestamp()),
-		}).
-		Get(WEB_URL + "/api/portal/unifyLoginForPC.action")
-	if err != nil {
-		return nil, err
-	}
-	log.Debug(res.String())
-	param := &LoginParam{
-		CaptchaToken: regexp.MustCompile(`'captchaToken' value='(.+?)'`).FindStringSubmatch(res.String())[1],
-		Lt:           regexp.MustCompile(`lt = "(.+?)"`).FindStringSubmatch(res.String())[1],
-		ParamId:      regexp.MustCompile(`paramId = "(.+?)"`).FindStringSubmatch(res.String())[1],
-		ReqId:        regexp.MustCompile(`reqId = "(.+?)"`).FindStringSubmatch(res.String())[1],
-		jRsaKey:      regexp.MustCompile(`"j_rsaKey" value="(.+?)"`).FindStringSubmatch(res.String())[1],
-
-		vCodeID: regexp.MustCompile(`token=([A-Za-z0-9&=]+)`).FindStringSubmatch(res.String())[1],
-	}
-
-	imgRes, err := s.client.R().Get(fmt.Sprint(AUTH_URL, "/api/logbox/oauth2/picCaptcha.do?token=", param.vCodeID, timestamp()))
-	if err != nil {
-		return nil, err
-	}
-	if len(imgRes.Body()) > 0 {
-		vRes, err := resty.New().R().
-			SetMultipartField("image", "validateCode.png", "image/png", bytes.NewReader(imgRes.Body())).
-			Post(conf.GetStr("ocr api"))
-		if err != nil {
-			return nil, err
-		}
-		if utils.Json.Get(vRes.Body(), "status").ToInt() != 200 {
-			return nil, errors.New("ocr error:" + utils.Json.Get(vRes.Body(), "msg").ToString())
-		}
-		param.vCodeRS = utils.Json.Get(vRes.Body(), "result").ToString()
-		log.Debugln("code: ", param.vCodeRS)
-	}
-	return param, nil
-}
-
-func (s *State) refreshSession(account *model.Account) error {
-	var erron Erron
-	var userSessionResp UserSessionResp
-	res, err := s.client.R().
-		SetResult(&userSessionResp).SetError(&erron).
-		SetQueryParams(clientSuffix()).
-		SetQueryParams(map[string]string{
-			"appId":       APP_ID,
-			"accessToken": s.AccessToken,
-		}).
-		SetHeader("X-Request-ID", uuid.NewString()).
-		Get("https://api.cloud.189.cn/getSessionForPC.action")
-	if err != nil {
-		return err
-	}
-	log.Debug(res.String())
-	if erron.ResCode != "" {
-		return fmt.Errorf(erron.ResMessage)
-	}
-
-	switch userSessionResp.ResCode {
-	case 0:
-		s.SessionKey = userSessionResp.SessionKey
-		s.SessionSecret = userSessionResp.SessionSecret
-		s.FamilySessionKey = userSessionResp.FamilySessionKey
-		s.FamilySessionSecret = userSessionResp.FamilySessionSecret
-	case 11, 18:
-		return s.login(account)
-	default:
-		account.Status = userSessionResp.ResMessage
-		_ = model.SaveAccount(account)
-		return fmt.Errorf(userSessionResp.ResMessage)
-	}
-	return nil
-}
-
-func (s *State) IsLogin() bool {
-	_, err := s.Request("GET", API_URL+"/getUserInfo.action", nil, func(r *resty.Request) {
-		r.SetQueryParams(clientSuffix())
-	}, nil)
-	return err == nil
-}
-
-func (s *State) Login(account *model.Account) error {
-	s.Lock()
-	defer s.Unlock()
-	return s.login(account)
-}
-
-func (s *State) RefreshSession(account *model.Account) error {
-	s.Lock()
-	defer s.Unlock()
-	return s.refreshSession(account)
-}
-
-func (s *State) Request(method string, fullUrl string, params url.Values, callback func(*resty.Request), account *model.Account) (*resty.Response, error) {
-	s.Lock()
-	dateOfGmt := getHttpDateStr()
-	sessionKey := s.SessionKey
-	sessionSecret := s.SessionSecret
-	if account != nil && isFamily(account) {
-		sessionKey = s.FamilySessionKey
-		sessionSecret = s.FamilySessionSecret
-	}
-
-	req := s.client.R()
-	req.SetHeaders(map[string]string{
-		"Date":         dateOfGmt,
-		"SessionKey":   sessionKey,
-		"X-Request-ID": uuid.NewString(),
-	})
-
-	// 设置params
-	var paramsData string
-	if params != nil {
-		paramsData = AesECBEncrypt(params.Encode(), s.SessionSecret[:16])
-		req.SetQueryParam("params", paramsData)
-	}
-	req.SetHeader("Signature", signatureOfHmac(sessionSecret, sessionKey, method, fullUrl, dateOfGmt, paramsData))
-
-	callback(req)
-	s.Unlock()
-
-	var err error
-	var res *resty.Response
-	switch method {
-	case "GET":
-		res, err = req.Get(fullUrl)
-	case "POST":
-		res, err = req.Post(fullUrl)
-	case "DELETE":
-		res, err = req.Delete(fullUrl)
-	case "PATCH":
-		res, err = req.Patch(fullUrl)
-	case "PUT":
-		res, err = req.Put(fullUrl)
-	default:
-		return nil, base.ErrNotSupport
-	}
-	if err != nil {
-		return nil, err
-	}
-	log.Debug(res.String())
-
-	var erron Erron
-	utils.Json.Unmarshal(res.Body(), &erron)
-	if erron.ResCode != "" {
-		return nil, fmt.Errorf(erron.ResMessage)
-	}
-	if erron.Code != "" && erron.Code != "SUCCESS" {
-		if erron.Msg == "" {
-			return nil, fmt.Errorf(erron.Message)
-		}
-		return nil, fmt.Errorf(erron.Msg)
-	}
-	if erron.ErrorCode != "" {
-		return nil, fmt.Errorf(erron.ErrorMsg)
-	}
-
-	if account != nil {
-		switch utils.Json.Get(res.Body(), "res_code").ToInt64() {
-		case 11, 18:
-			if err := s.RefreshSession(account); err != nil {
-				return nil, err
-			}
-			return s.Request(method, fullUrl, params, callback, account)
-		case 0:
-			if res.StatusCode() == http.StatusOK {
-				return res, nil
-			}
-			fallthrough
-		default:
-			return nil, fmt.Errorf(res.String())
-		}
-	}
-
-	if utils.Json.Get(res.Body(), "res_code").ToInt64() != 0 {
-		return res, fmt.Errorf(utils.Json.Get(res.Body(), "res_message").ToString())
-	}
-	return res, nil
-}

drivers/189pc/help.go

@@ -1,4 +1,4 @@
-package _189
+package _189pc
 
 import (
 	"bytes"
@@ -8,51 +8,32 @@ import (
 	"crypto/rsa"
 	"crypto/sha1"
 	"crypto/x509"
-	"encoding/base64"
 	"encoding/hex"
 	"encoding/pem"
 	"fmt"
-	rand2 "math/rand"
 	"net/http"
-	"net/url"
+	"regexp"
 	"strings"
 	"time"
 
-	"github.com/Xhofe/alist/model"
-)
-
-const (
-	APP_ID      = "8025431004"
-	CLIENT_TYPE = "10020"
-	VERSION     = "6.2"
-
-	WEB_URL    = "https://cloud.189.cn"
-	AUTH_URL   = "https://open.e.189.cn"
-	API_URL    = "https://api.cloud.189.cn"
-	UPLOAD_URL = "https://upload.cloud.189.cn"
-
-	RETURN_URL = "https://m.cloud.189.cn/zhuanti/2020/loginErrorPc/index.html"
-
-	PC  = "TELEPC"
-	MAC = "TELEMAC"
-
-	CHANNEL_ID = "web_cloud.189.cn"
+	"github.com/alist-org/alist/v3/pkg/utils/random"
 )
 
 func clientSuffix() map[string]string {
+	rand := random.Rand
 	return map[string]string{
 		"clientType": PC,
 		"version":    VERSION,
 		"channelId":  CHANNEL_ID,
-		"rand":       fmt.Sprintf("%d_%d", rand2.Int63n(1e5), rand2.Int63n(1e10)),
+		"rand":       fmt.Sprintf("%d_%d", rand.Int63n(1e5), rand.Int63n(1e10)),
 	}
 }
 
 // 带params的SignatureOfHmac HMAC签名
 func signatureOfHmac(sessionSecret, sessionKey, operate, fullUrl, dateOfGmt, param string) string {
-	u, _ := url.Parse(fullUrl)
+	urlpath := regexp.MustCompile(`://[^/]+((/[^/\s?#]+)*)`).FindStringSubmatch(fullUrl)[1]
 	mac := hmac.New(sha1.New, []byte(sessionSecret))
-	data := fmt.Sprintf("SessionKey=%s&Operate=%s&RequestURI=%s&Date=%s", sessionKey, operate, u.Path, dateOfGmt)
+	data := fmt.Sprintf("SessionKey=%s&Operate=%s&RequestURI=%s&Date=%s", sessionKey, operate, urlpath, dateOfGmt)
 	if param != "" {
 		data += fmt.Sprintf("&params=%s", param)
 	}
@@ -60,17 +41,12 @@ func signatureOfHmac(sessionSecret, sessionKey, operate, fullUrl, dateOfGmt, par
 	return strings.ToUpper(hex.EncodeToString(mac.Sum(nil)))
 }
 
-// 获取http规范的时间
-func getHttpDateStr() string {
-	return time.Now().UTC().Format(http.TimeFormat)
-}
-
 // RAS 加密用户名密码
-func rsaEncrypt(publicKey, origData string) string {
+func RsaEncrypt(publicKey, origData string) string {
 	block, _ := pem.Decode([]byte(publicKey))
 	pubInterface, _ := x509.ParsePKIXPublicKey(block.Bytes)
 	data, _ := rsa.EncryptPKCS1v15(rand.Reader, pubInterface.(*rsa.PublicKey), []byte(origData))
-	return base64ToHex(base64.StdEncoding.EncodeToString(data))
+	return strings.ToUpper(hex.EncodeToString(data))
 }
 
 // aes 加密params
@@ -91,18 +67,20 @@ func PKCS7Padding(ciphertext []byte, blockSize int) []byte {
 	return append(ciphertext, padtext...)
 }
 
+// 获取http规范的时间
+func getHttpDateStr() string {
+	return time.Now().UTC().Format(http.TimeFormat)
+}
+
 // 时间戳
 func timestamp() int64 {
 	return time.Now().UTC().UnixNano() / 1e6
 }
 
-func base64ToHex(a string) string {
-	v, _ := base64.StdEncoding.DecodeString(a)
-	return strings.ToUpper(hex.EncodeToString(v))
-}
-
-func isFamily(account *model.Account) bool {
-	return account.InternalType == "Family"
+func MustParseTime(str string) *time.Time {
+	loc, _ := time.LoadLocation("Asia/Shanghai")
+	lastOpTime, _ := time.ParseInLocation("2006-01-02 15:04:05", str, loc)
+	return &lastOpTime
 }
 
 func toFamilyOrderBy(o string) string {
@@ -118,19 +96,28 @@ func toFamilyOrderBy(o string) string {
 	}
 }
 
-func MapToUrlValues(m map[string]interface{}) url.Values {
-	url := make(url.Values, len(m))
-	for k, v := range m {
-		url.Add(k, fmt.Sprint(v))
+func toDesc(o string) string {
+	switch o {
+	case "desc":
+		return "true"
+	case "asc":
+		fallthrough
+	default:
+		return "false"
 	}
-	return url
 }
 
-func decodeURIComponent(str string) string {
-	r, _ := url.QueryUnescape(str)
-	//r, _ := url.PathUnescape(str)
-	//r = strings.ReplaceAll(r, " ", "+")
-	return r
+func ParseHttpHeader(str string) map[string]string {
+	header := make(map[string]string)
+	for _, value := range strings.Split(str, "&") {
+		i := strings.Index(value, "=")
+		header[strings.TrimSpace(value[0:i])] = strings.TrimSpace(value[i+1:])
+	}
+	return header
+}
+
+func MustString(str string, err error) string {
+	return str
 }
 
 func MustToBytes(b []byte, err error) []byte {

drivers/189pc/meta.go

@@ -0,0 +1,33 @@
+package _189pc
+
+import (
+	"github.com/alist-org/alist/v3/internal/driver"
+	"github.com/alist-org/alist/v3/internal/op"
+)
+
+type Addition struct {
+	Username       string `json:"username" required:"true"`
+	Password       string `json:"password" required:"true"`
+	VCode          string `json:"validate_code"`
+	RootFolderID   string `json:"root_folder_id"`
+	OrderBy        string `json:"order_by" type:"select" options:"filename,filesize,lastOpTime" default:"filename"`
+	OrderDirection string `json:"order_direction" type:"select" options:"asc,desc" default:"asc"`
+	Type           string `json:"type" type:"select" options:"personal,family" default:"personal"`
+	FamilyID       string `json:"family_id"`
+	RapidUpload    bool   `json:"rapid_upload"`
+}
+
+func (a Addition) GetRootId() string {
+	return a.RootFolderID
+}
+
+var config = driver.Config{
+	Name:        "189CloudPC",
+	DefaultRoot: "-11",
+}
+
+func init() {
+	op.RegisterDriver(config, func() driver.Driver {
+		return &Yun189PC{}
+	})
+}

drivers/189pc/types.go

@@ -1,20 +1,15 @@
-package _189
+package _189pc
 
-import "encoding/xml"
-
-type LoginParam struct {
-	CaptchaToken string
-	Lt           string
-	ParamId      string
-	ReqId        string
-	jRsaKey      string
-
-	vCodeID string
-	vCodeRS string
-}
+import (
+	"encoding/xml"
+	"fmt"
+	"sort"
+	"strings"
+	"time"
+)
 
 // 居然有四种返回方式
-type Erron struct {
+type RespErr struct {
 	ResCode    string `json:"res_code"`
 	ResMessage string `json:"res_message"`
 
@@ -29,6 +24,43 @@ type Erron struct {
 	ErrorMsg  string `json:"errorMsg"`
 }
 
+// 登陆需要的参数
+type LoginParam struct {
+	// 加密后的用户名和密码
+	RsaUsername string
+	RsaPassword string
+
+	// rsa密钥
+	jRsaKey string
+
+	// 请求头参数
+	Lt    string
+	ReqId string
+
+	// 表单参数
+	ParamId string
+
+	// 验证码
+	CaptchaToken string
+}
+
+// 登陆加密相关
+type EncryptConfResp struct {
+	Result int `json:"result"`
+	Data   struct {
+		UpSmsOn   string `json:"upSmsOn"`
+		Pre       string `json:"pre"`
+		PreDomain string `json:"preDomain"`
+		PubKey    string `json:"pubKey"`
+	} `json:"data"`
+}
+
+type LoginResp struct {
+	Msg    string `json:"msg"`
+	Result int    `json:"result"`
+	ToUrl  string `json:"toUrl"`
+}
+
 // 刷新session返回
 type UserSessionResp struct {
 	ResCode    int    `json:"res_code"`
@@ -48,8 +80,8 @@ type UserSessionResp struct {
 	FamilySessionSecret string `json:"familySessionSecret"`
 }
 
-//登录返回
-type appSessionResp struct {
+// 登录返回
+type AppSessionResp struct {
 	UserSessionResp
 
 	IsSaveName string `json:"isSaveName"`
@@ -60,6 +92,7 @@ type appSessionResp struct {
 	RefreshToken string `json:"refreshToken"`
 }
 
+// 家庭云账户
 type FamilyInfoListResp struct {
 	FamilyInfoResp []FamilyInfoResp `json:"familyInfoResp"`
 }
@@ -96,8 +129,23 @@ type Cloud189File struct {
 	Rev         string `json:"rev"`
 	Size        int64  `json:"size"`
 	StarLabel   int64  `json:"starLabel"`
+
+	parseTime *time.Time
 }
 
+func (c *Cloud189File) GetSize() int64  { return c.Size }
+func (c *Cloud189File) GetName() string { return c.Name }
+func (c *Cloud189File) ModTime() time.Time {
+	if c.parseTime == nil {
+		c.parseTime = MustParseTime(c.LastOpTime)
+	}
+	return *c.parseTime
+}
+func (c *Cloud189File) IsDir() bool     { return false }
+func (c *Cloud189File) 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       int64  `json:"id"`
@@ -113,8 +161,22 @@ type Cloud189Folder struct {
 	FileListSize int64  `json:"fileListSize"`
 	Rev          string `json:"rev"`
 	StarLabel    int64  `json:"starLabel"`
+
+	parseTime *time.Time
 }
 
+func (c *Cloud189Folder) GetSize() int64  { return 0 }
+func (c *Cloud189Folder) GetName() string { return c.Name }
+func (c *Cloud189Folder) ModTime() time.Time {
+	if c.parseTime == nil {
+		c.parseTime = MustParseTime(c.LastOpTime)
+	}
+	return *c.parseTime
+}
+func (c *Cloud189Folder) IsDir() bool     { return true }
+func (c *Cloud189Folder) GetID() string   { return fmt.Sprint(c.ID) }
+func (c *Cloud189Folder) GetPath() string { return "" }
+
 type Cloud189FilesResp struct {
 	//ResCode    int    `json:"res_code"`
 	//ResMessage string `json:"res_message"`
@@ -137,28 +199,7 @@ type BatchTaskInfo struct {
 	//SrcParentId string `json:"srcParentId"`
 }
 
-type CreateUploadFileResult struct {
-	// UploadFileId 上传文件请求ID
-	UploadFileId int64 `json:"uploadFileId"`
-	// FileUploadUrl 上传文件数据的URL路径
-	FileUploadUrl string `json:"fileUploadUrl"`
-	// FileCommitUrl 上传文件完成后确认路径
-	FileCommitUrl string `json:"fileCommitUrl"`
-	// FileDataExists 文件是否已存在云盘中，0-未存在，1-已存在
-	FileDataExists int `json:"fileDataExists"`
-}
-
-type UploadFileStatusResult struct {
-	// 上传文件的ID
-	UploadFileId int64 `json:"uploadFileId"`
-	// 已上传的大小
-	DataSize       int64  `json:"dataSize"`
-	FileUploadUrl  string `json:"fileUploadUrl"`
-	FileCommitUrl  string `json:"fileCommitUrl"`
-	FileDataExists int    `json:"fileDataExists"`
-}
-
-/*
+/* 上传部分 */
 type InitMultiUploadResp struct {
 	//Code string `json:"code"`
 	Data struct {
@@ -172,9 +213,34 @@ type UploadUrlsResp struct {
 	Code       string          `json:"code"`
 	UploadUrls map[string]Part `json:"uploadUrls"`
 }
-
 type Part struct {
 	RequestURL    string `json:"requestURL"`
 	RequestHeader string `json:"requestHeader"`
 }
-*/
+
+type Params map[string]string
+
+func (p Params) Set(k, v string) {
+	p[k] = v
+}
+
+func (p Params) Encode() string {
+	if p == nil {
+		return ""
+	}
+	var buf strings.Builder
+	keys := make([]string, 0, len(p))
+	for k := range p {
+		keys = append(keys, k)
+	}
+	sort.Strings(keys)
+	for i := range keys {
+		if buf.Len() > 0 {
+			buf.WriteByte('&')
+		}
+		buf.WriteString(keys[i])
+		buf.WriteByte('=')
+		buf.WriteString(p[keys[i]])
+	}
+	return buf.String()
+}

drivers/189pc/utils.go

@@ -0,0 +1,663 @@
+package _189pc
+
+import (
+	"bytes"
+	"context"
+	"crypto/md5"
+	"encoding/base64"
+	"encoding/hex"
+	"fmt"
+	"io"
+	"math"
+	"net/http"
+	"net/http/cookiejar"
+	"net/url"
+	"os"
+	"regexp"
+	"strings"
+
+	"github.com/alist-org/alist/v3/drivers/base"
+	"github.com/alist-org/alist/v3/internal/conf"
+	"github.com/alist-org/alist/v3/internal/driver"
+	"github.com/alist-org/alist/v3/internal/model"
+	"github.com/alist-org/alist/v3/internal/op"
+	"github.com/alist-org/alist/v3/internal/setting"
+	"github.com/alist-org/alist/v3/pkg/utils"
+	"github.com/go-resty/resty/v2"
+	"github.com/google/uuid"
+	jsoniter "github.com/json-iterator/go"
+)
+
+const (
+	ACCOUNT_TYPE = "02"
+	APP_ID       = "8025431004"
+	CLIENT_TYPE  = "10020"
+	VERSION      = "6.2"
+
+	WEB_URL    = "https://cloud.189.cn"
+	AUTH_URL   = "https://open.e.189.cn"
+	API_URL    = "https://api.cloud.189.cn"
+	UPLOAD_URL = "https://upload.cloud.189.cn"
+
+	RETURN_URL = "https://m.cloud.189.cn/zhuanti/2020/loginErrorPc/index.html"
+
+	PC  = "TELEPC"
+	MAC = "TELEMAC"
+
+	CHANNEL_ID = "web_cloud.189.cn"
+)
+
+func (y *Yun189PC) request(url, method string, callback base.ReqCallback, params Params, resp interface{}) ([]byte, error) {
+	dateOfGmt := getHttpDateStr()
+	sessionKey := y.tokenInfo.SessionKey
+	sessionSecret := y.tokenInfo.SessionSecret
+	if y.isFamily() {
+		sessionKey = y.tokenInfo.FamilySessionKey
+		sessionSecret = y.tokenInfo.FamilySessionSecret
+	}
+
+	req := y.client.R().SetQueryParams(clientSuffix()).SetHeaders(map[string]string{
+		"Date":         dateOfGmt,
+		"SessionKey":   sessionKey,
+		"X-Request-ID": uuid.NewString(),
+	})
+
+	// 设置params
+	var paramsData string
+	if params != nil {
+		paramsData = AesECBEncrypt(params.Encode(), sessionSecret[:16])
+		req.SetQueryParam("params", paramsData)
+	}
+	req.SetHeader("Signature", signatureOfHmac(sessionSecret, sessionKey, method, url, dateOfGmt, paramsData))
+
+	if callback != nil {
+		callback(req)
+	}
+	if resp != nil {
+		req.SetResult(resp)
+	}
+	res, err := req.Execute(method, url)
+	if err != nil {
+		return nil, err
+	}
+	var erron RespErr
+	utils.Json.Unmarshal(res.Body(), &erron)
+
+	if erron.ResCode != "" {
+		return nil, fmt.Errorf("res_code: %s ,res_msg: %s", erron.ResCode, erron.ResMessage)
+	}
+	if erron.Code != "" && erron.Code != "SUCCESS" {
+		if erron.Msg != "" {
+			return nil, fmt.Errorf("code: %s ,msg: %s", erron.Code, erron.Msg)
+		}
+		if erron.Message != "" {
+			return nil, fmt.Errorf("code: %s ,msg: %s", erron.Code, erron.Message)
+		}
+		return nil, fmt.Errorf(res.String())
+	}
+	switch erron.ErrorCode {
+	case "":
+		break
+	case "InvalidSessionKey":
+		if err = y.refreshSession(); err != nil {
+			return nil, err
+		}
+		return y.request(url, method, callback, params, resp)
+	default:
+		return nil, fmt.Errorf("err_code: %s ,err_msg: %s", erron.ErrorCode, erron.ErrorMsg)
+	}
+
+	if strings.Contains(res.String(), "userSessionBO is null") {
+		if err = y.refreshSession(); err != nil {
+			return nil, err
+		}
+		return y.request(url, method, callback, params, resp)
+	}
+
+	resCode := utils.Json.Get(res.Body(), "res_code").ToInt64()
+	message := utils.Json.Get(res.Body(), "res_message").ToString()
+	switch resCode {
+	case 0:
+		return res.Body(), nil
+	default:
+		return nil, fmt.Errorf("res_code: %d ,res_msg: %s", resCode, message)
+	}
+}
+
+func (y *Yun189PC) get(url string, callback base.ReqCallback, resp interface{}) ([]byte, error) {
+	return y.request(url, http.MethodGet, callback, nil, resp)
+}
+
+func (y *Yun189PC) post(url string, callback base.ReqCallback, resp interface{}) ([]byte, error) {
+	return y.request(url, http.MethodPost, callback, nil, resp)
+}
+
+func (y *Yun189PC) getFiles(ctx context.Context, fileId string) ([]model.Obj, error) {
+	fullUrl := API_URL
+	if y.isFamily() {
+		fullUrl += "/family/file"
+	}
+	fullUrl += "/listFiles.action"
+
+	res := make([]model.Obj, 0, 130)
+	for pageNum := 1; pageNum < 100; pageNum++ {
+		select {
+		case <-ctx.Done():
+			return nil, ctx.Err()
+		default:
+		}
+
+		var resp Cloud189FilesResp
+		_, err := y.get(fullUrl, func(r *resty.Request) {
+			r.SetContext(ctx)
+			r.SetQueryParams(map[string]string{
+				"folderId":   fileId,
+				"fileType":   "0",
+				"mediaAttr":  "0",
+				"iconOption": "5",
+				"pageNum":    fmt.Sprint(pageNum),
+				"pageSize":   "130",
+			})
+			if y.isFamily() {
+				r.SetQueryParams(map[string]string{
+					"familyId":   y.FamilyID,
+					"orderBy":    toFamilyOrderBy(y.OrderBy),
+					"descending": toDesc(y.OrderDirection),
+				})
+			} else {
+				r.SetQueryParams(map[string]string{
+					"recursive":  "0",
+					"orderBy":    y.OrderBy,
+					"descending": toDesc(y.OrderDirection),
+				})
+			}
+		}, &resp)
+		if err != nil {
+			return nil, err
+		}
+		// 获取完毕跳出
+		if resp.FileListAO.Count == 0 {
+			break
+		}
+
+		for i := 0; i < len(resp.FileListAO.FolderList); i++ {
+			res = append(res, &resp.FileListAO.FolderList[i])
+		}
+		for i := 0; i < len(resp.FileListAO.FileList); i++ {
+			res = append(res, &resp.FileListAO.FileList[i])
+		}
+	}
+	return res, nil
+}
+
+func (y *Yun189PC) login() (err error) {
+	// 初始化登陆所需参数
+	if y.loginParam == nil {
+		if err = y.initLoginParam(); err != nil {
+			// 验证码也通过错误返回
+			return err
+		}
+	}
+
+	defer func() {
+		// 销毁验证码
+		y.VCode = ""
+		// 销毁登陆参数
+		y.loginParam = nil
+		// 遇到错误，重新加载登陆参数
+		if err != nil {
+			if err1 := y.initLoginParam(); err1 != nil {
+				err = fmt.Errorf("err1: %s \nerr2: %s", err, err1)
+			}
+		}
+	}()
+
+	param := y.loginParam
+	var loginresp LoginResp
+	_, err = y.client.R().
+		ForceContentType("application/json;charset=UTF-8").SetResult(&loginresp).
+		SetHeaders(map[string]string{
+			"REQID": param.ReqId,
+			"lt":    param.Lt,
+		}).
+		SetFormData(map[string]string{
+			"appKey":       APP_ID,
+			"accountType":  ACCOUNT_TYPE,
+			"userName":     param.RsaUsername,
+			"password":     param.RsaPassword,
+			"validateCode": y.VCode,
+			"captchaToken": param.CaptchaToken,
+			"returnUrl":    RETURN_URL,
+			"mailSuffix":   "@189.cn",
+			"dynamicCheck": "FALSE",
+			"clientType":   CLIENT_TYPE,
+			"cb_SaveName":  "1",
+			"isOauth2":     "false",
+			"state":        "",
+			"paramId":      param.ParamId,
+		}).
+		Post(AUTH_URL + "/api/logbox/oauth2/loginSubmit.do")
+	if err != nil {
+		return err
+	}
+	if loginresp.ToUrl == "" {
+		return fmt.Errorf("login failed,No toUrl obtained, msg: %s", loginresp.Msg)
+	}
+
+	// 获取Session
+	var erron RespErr
+	var tokenInfo AppSessionResp
+	_, err = y.client.R().
+		SetResult(&tokenInfo).SetError(&erron).
+		SetQueryParams(clientSuffix()).
+		SetQueryParam("redirectURL", url.QueryEscape(loginresp.ToUrl)).
+		Post(API_URL + "/getSessionForPC.action")
+	if err != nil {
+		return
+	}
+
+	if erron.ResCode != "" {
+		err = fmt.Errorf(erron.ResMessage)
+		return
+	}
+	if tokenInfo.ResCode != 0 {
+		err = fmt.Errorf(tokenInfo.ResMessage)
+		return
+	}
+	y.tokenInfo = &tokenInfo
+	return
+}
+
+/* 初始化登陆需要的参数
+*  如果遇到验证码返回错误
+ */
+func (y *Yun189PC) initLoginParam() error {
+	// 清除cookie
+	jar, _ := cookiejar.New(nil)
+	y.client.SetCookieJar(jar)
+
+	res, err := y.client.R().
+		SetQueryParams(map[string]string{
+			"appId":      APP_ID,
+			"clientType": CLIENT_TYPE,
+			"returnURL":  RETURN_URL,
+			"timeStamp":  fmt.Sprint(timestamp()),
+		}).
+		Get(WEB_URL + "/api/portal/unifyLoginForPC.action")
+	if err != nil {
+		return err
+	}
+
+	param := LoginParam{
+		CaptchaToken: regexp.MustCompile(`'captchaToken' value='(.+?)'`).FindStringSubmatch(res.String())[1],
+		Lt:           regexp.MustCompile(`lt = "(.+?)"`).FindStringSubmatch(res.String())[1],
+		ParamId:      regexp.MustCompile(`paramId = "(.+?)"`).FindStringSubmatch(res.String())[1],
+		ReqId:        regexp.MustCompile(`reqId = "(.+?)"`).FindStringSubmatch(res.String())[1],
+		// jRsaKey:      regexp.MustCompile(`"j_rsaKey" value="(.+?)"`).FindStringSubmatch(res.String())[1],
+	}
+
+	// 获取rsa公钥
+	var encryptConf EncryptConfResp
+	_, err = y.client.R().
+		ForceContentType("application/json;charset=UTF-8").SetResult(&encryptConf).
+		SetFormData(map[string]string{"appId": APP_ID}).
+		Post(AUTH_URL + "/api/logbox/config/encryptConf.do")
+	if err != nil {
+		return err
+	}
+
+	param.jRsaKey = fmt.Sprintf("-----BEGIN PUBLIC KEY-----\n%s\n-----END PUBLIC KEY-----", encryptConf.Data.PubKey)
+	param.RsaUsername = encryptConf.Data.Pre + RsaEncrypt(param.jRsaKey, y.Username)
+	param.RsaPassword = encryptConf.Data.Pre + RsaEncrypt(param.jRsaKey, y.Password)
+
+	// 判断是否需要验证码
+	res, err = y.client.R().
+		SetFormData(map[string]string{
+			"appKey":      APP_ID,
+			"accountType": ACCOUNT_TYPE,
+			"userName":    param.RsaUsername,
+		}).
+		Post(AUTH_URL + "/api/logbox/oauth2/needcaptcha.do")
+	if err != nil {
+		return err
+	}
+
+	y.loginParam = &param
+	if res.String() != "0" {
+		imgRes, err := y.client.R().
+			SetQueryParams(map[string]string{
+				"token": param.CaptchaToken,
+				"REQID": param.ReqId,
+				"rnd":   fmt.Sprint(timestamp()),
+			}).
+			Get(AUTH_URL + "/api/logbox/oauth2/picCaptcha.do")
+		if err != nil {
+			return fmt.Errorf("failed to obtain verification code")
+		}
+
+		// 尝试使用ocr
+		vRes, err := base.RestyClient.R().
+			SetMultipartField("image", "validateCode.png", "image/png", bytes.NewReader(imgRes.Body())).
+			Post(setting.GetStr(conf.OcrApi))
+		if err == nil && jsoniter.Get(vRes.Body(), "status").ToInt() == 200 {
+			y.VCode = jsoniter.Get(vRes.Body(), "result").ToString()
+		}
+
+		// ocr无法处理，返回验证码图片给前端
+		if len(y.VCode) != 4 {
+			return fmt.Errorf("need validate code: data:image/png;base64,%s", base64.StdEncoding.EncodeToString(res.Body()))
+		}
+	}
+	return nil
+}
+
+// 刷新会话
+func (y *Yun189PC) refreshSession() (err error) {
+	var erron RespErr
+	var userSessionResp UserSessionResp
+	_, err = y.client.R().
+		SetResult(&userSessionResp).SetError(&erron).
+		SetQueryParams(clientSuffix()).
+		SetQueryParams(map[string]string{
+			"appId":       APP_ID,
+			"accessToken": y.tokenInfo.AccessToken,
+		}).
+		SetHeader("X-Request-ID", uuid.NewString()).
+		Get(API_URL + "/getSessionForPC.action")
+	if err != nil {
+		return err
+	}
+
+	// 错误影响正常访问，下线该储存
+	defer func() {
+		if err != nil {
+			y.GetStorage().SetStatus(fmt.Sprintf("%+v", err.Error()))
+			op.MustSaveDriverStorage(y)
+		}
+	}()
+
+	switch erron.ResCode {
+	case "":
+		break
+	case "UserInvalidOpenToken":
+		if err = y.login(); err != nil {
+			return err
+		}
+	default:
+		err = fmt.Errorf("res_code: %s ,res_msg: %s", erron.ResCode, erron.ResMessage)
+		return
+	}
+
+	switch userSessionResp.ResCode {
+	case 0:
+		y.tokenInfo.UserSessionResp = userSessionResp
+	default:
+		err = fmt.Errorf("code: %d , msg: %s", userSessionResp.ResCode, userSessionResp.ResMessage)
+	}
+	return
+}
+
+// 普通上传
+func (y *Yun189PC) CommonUpload(ctx context.Context, dstDir model.Obj, file model.FileStreamer, up driver.UpdateProgress) (err error) {
+	const DEFAULT int64 = 10485760
+	var count = int64(math.Ceil(float64(file.GetSize()) / float64(DEFAULT)))
+
+	params := Params{
+		"parentFolderId": dstDir.GetID(),
+		"fileName":       url.QueryEscape(file.GetName()),
+		"fileSize":       fmt.Sprint(file.GetSize()),
+		"sliceSize":      fmt.Sprint(DEFAULT),
+		"lazyCheck":      "1",
+	}
+
+	fullUrl := UPLOAD_URL
+	if y.isFamily() {
+		params.Set("familyId", y.FamilyID)
+		fullUrl += "/family"
+	} else {
+		//params.Set("extend", `{"opScene":"1","relativepath":"","rootfolderid":""}`)
+		fullUrl += "/person"
+	}
+
+	// 初始化上传
+	var initMultiUpload InitMultiUploadResp
+	_, err = y.request(fullUrl+"/initMultiUpload", http.MethodGet, func(req *resty.Request) {
+		req.SetContext(ctx)
+	}, params, &initMultiUpload)
+	if err != nil {
+		return err
+	}
+
+	fileMd5 := md5.New()
+	silceMd5 := md5.New()
+	silceMd5Hexs := make([]string, 0, count)
+	byteData := bytes.NewBuffer(make([]byte, DEFAULT))
+	for i := int64(1); i <= count; i++ {
+		select {
+		case <-ctx.Done():
+			return ctx.Err()
+		default:
+		}
+
+		// 读取块
+		byteData.Reset()
+		silceMd5.Reset()
+		_, err := io.CopyN(io.MultiWriter(fileMd5, silceMd5, byteData), file, DEFAULT)
+		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)))
+		silceMd5Base64 := base64.StdEncoding.EncodeToString(md5Bytes)
+
+		// 获取上传链接
+		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
+		}
+
+		// 开始上传
+		uploadData := uploadUrl.UploadUrls[fmt.Sprint("partNumber_", i)]
+		res, err := y.putClient.R().
+			SetContext(ctx).
+			SetQueryParams(clientSuffix()).
+			SetHeaders(ParseHttpHeader(uploadData.RequestHeader)).
+			SetBody(byteData).
+			Put(uploadData.RequestURL)
+		if err != nil {
+			return err
+		}
+		if res.StatusCode() != http.StatusOK {
+			return fmt.Errorf("updload fail,msg: %s", res.String())
+		}
+		up(int(i * 100 / count))
+	}
+
+	fileMd5Hex := strings.ToUpper(hex.EncodeToString(fileMd5.Sum(nil)))
+	sliceMd5Hex := fileMd5Hex
+	if file.GetSize() > DEFAULT {
+		sliceMd5Hex = strings.ToUpper(utils.GetMD5Encode(strings.Join(silceMd5Hexs, "\n")))
+	}
+
+	// 提交上传
+	_, err = y.request(fullUrl+"/commitMultiUploadFile", http.MethodGet,
+		func(req *resty.Request) {
+			req.SetContext(ctx)
+		}, Params{
+			"uploadFileId": initMultiUpload.Data.UploadFileID,
+			"fileMd5":      fileMd5Hex,
+			"sliceMd5":     sliceMd5Hex,
+			"lazyCheck":    "1",
+			"isLog":        "0",
+			"opertype":     "3",
+		}, nil)
+	return err
+}
+
+// 快传
+func (y *Yun189PC) FastUpload(ctx context.Context, dstDir model.Obj, file model.FileStreamer, up driver.UpdateProgress) (err error) {
+	// 需要获取完整文件md5,必须支持 io.Seek
+	if _, ok := file.GetReadCloser().(*os.File); !ok {
+		r, err := utils.CreateTempFile(file)
+		if err != nil {
+			return err
+		}
+		file.Close()
+		file.SetReadCloser(r)
+	}
+
+	const DEFAULT int64 = 10485760
+	count := int(math.Ceil(float64(file.GetSize()) / float64(DEFAULT)))
+
+	// 优先计算所需信息
+	fileMd5 := md5.New()
+	silceMd5 := md5.New()
+	silceMd5Hexs := make([]string, 0, count)
+	silceMd5Base64s := make([]string, 0, count)
+	for i := 1; i <= count; i++ {
+		select {
+		case <-ctx.Done():
+			return ctx.Err()
+		default:
+		}
+
+		silceMd5.Reset()
+		if _, err := io.CopyN(io.MultiWriter(fileMd5, silceMd5), file, DEFAULT); err != nil && err != io.EOF && err != io.ErrUnexpectedEOF {
+			return err
+		}
+		md5Byte := silceMd5.Sum(nil)
+		silceMd5Hexs = append(silceMd5Hexs, strings.ToUpper(hex.EncodeToString(md5Byte)))
+		silceMd5Base64s = append(silceMd5Base64s, fmt.Sprint(i, "-", base64.StdEncoding.EncodeToString(md5Byte)))
+	}
+	file.GetReadCloser().(*os.File).Seek(0, io.SeekStart)
+
+	fileMd5Hex := strings.ToUpper(hex.EncodeToString(fileMd5.Sum(nil)))
+	sliceMd5Hex := fileMd5Hex
+	if file.GetSize() > DEFAULT {
+		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"
+	}
+
+	var uploadInfo InitMultiUploadResp
+	_, err = y.request(fullUrl+"/initMultiUpload", http.MethodGet, func(req *resty.Request) {
+		req.SetContext(ctx)
+	}, params, &uploadInfo)
+	if err != nil {
+		return err
+	}
+
+	// 网盘中不存在该文件，开始上传
+	if uploadInfo.Data.FileDataExists != 1 {
+		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
+		}
+
+		for i := 1; i <= count; i++ {
+			select {
+			case <-ctx.Done():
+				return ctx.Err()
+			default:
+			}
+
+			uploadData := uploadUrls.UploadUrls[fmt.Sprint("partNumber_", i)]
+			res, err := y.putClient.R().
+				SetContext(ctx).
+				SetQueryParams(clientSuffix()).
+				SetHeaders(ParseHttpHeader(uploadData.RequestHeader)).
+				SetBody(io.LimitReader(file, DEFAULT)).
+				Put(uploadData.RequestURL)
+			if err != nil {
+				return err
+			}
+			if res.StatusCode() != http.StatusOK {
+				return fmt.Errorf("updload fail,msg: %s", res.String())
+			}
+			up(int(i * 100 / count))
+		}
+	}
+
+	// 提交
+	_, err = y.request(fullUrl+"/commitMultiUploadFile", http.MethodGet,
+		func(req *resty.Request) {
+			req.SetContext(ctx)
+		}, Params{
+			"uploadFileId": uploadInfo.Data.UploadFileID,
+			"isLog":        "0",
+			"opertype":     "3",
+		}, nil)
+	return err
+}
+
+func (y *Yun189PC) isFamily() bool {
+	return y.Type == "family"
+}
+
+func (y *Yun189PC) isLogin() bool {
+	if y.tokenInfo == nil {
+		return false
+	}
+	_, err := y.get(API_URL+"/getUserInfo.action", nil, nil)
+	return err == nil
+}
+
+// 获取家庭云所有用户信息
+func (y *Yun189PC) getFamilyInfoList() ([]FamilyInfoResp, error) {
+	var resp FamilyInfoListResp
+	_, err := y.get(API_URL+"/family/manage/getFamilyList.action", nil, &resp)
+	if err != nil {
+		return nil, err
+	}
+	return resp.FamilyInfoResp, nil
+}
+
+// 抽取家庭云ID
+func (y *Yun189PC) getFamilyID() (string, error) {
+	infos, err := y.getFamilyInfoList()
+	if err != nil {
+		return "", err
+	}
+	if len(infos) == 0 {
+		return "", fmt.Errorf("cannot get automatically,please input family_id")
+	}
+	for _, info := range infos {
+		if strings.Contains(y.tokenInfo.LoginName, info.RemarkName) {
+			return fmt.Sprint(info.FamilyID), nil
+		}
+	}
+	return fmt.Sprint(infos[0].FamilyID), nil
+}

drivers/alidrive/alidrive.go

@@ -1,246 +0,0 @@
-package alidrive
-
-import (
-	"errors"
-	"fmt"
-	"github.com/Xhofe/alist/conf"
-	"github.com/Xhofe/alist/drivers/base"
-	"github.com/Xhofe/alist/model"
-	"github.com/Xhofe/alist/utils"
-	"github.com/go-resty/resty/v2"
-	jsoniter "github.com/json-iterator/go"
-	log "github.com/sirupsen/logrus"
-	"path/filepath"
-	"time"
-)
-
-var aliClient = resty.New()
-
-type AliRespError struct {
-	Code    string `json:"code"`
-	Message string `json:"message"`
-}
-
-type AliFiles struct {
-	Items      []AliFile `json:"items"`
-	NextMarker string    `json:"next_marker"`
-}
-
-type AliFile struct {
-	DriveId       string     `json:"drive_id"`
-	CreatedAt     *time.Time `json:"created_at"`
-	FileExtension string     `json:"file_extension"`
-	FileId        string     `json:"file_id"`
-	Type          string     `json:"type"`
-	Name          string     `json:"name"`
-	Category      string     `json:"category"`
-	ParentFileId  string     `json:"parent_file_id"`
-	UpdatedAt     *time.Time `json:"updated_at"`
-	Size          int64      `json:"size"`
-	Thumbnail     string     `json:"thumbnail"`
-	Url           string     `json:"url"`
-}
-
-func (driver AliDrive) FormatFile(file *AliFile) *model.File {
-	f := &model.File{
-		Id:        file.FileId,
-		Name:      file.Name,
-		Size:      file.Size,
-		UpdatedAt: file.UpdatedAt,
-		Thumbnail: file.Thumbnail,
-		Driver:    driver.Config().Name,
-		Url:       file.Url,
-	}
-	if file.Type == "folder" {
-		f.Type = conf.FOLDER
-	} else {
-		f.Type = utils.GetFileType(file.FileExtension)
-	}
-	if file.Category == "video" {
-		f.Type = conf.VIDEO
-	}
-	if file.Category == "image" {
-		f.Type = conf.IMAGE
-	}
-	return f
-}
-
-func (driver AliDrive) GetFiles(fileId string, account *model.Account) ([]AliFile, error) {
-	marker := "first"
-	res := make([]AliFile, 0)
-	for marker != "" {
-		if marker == "first" {
-			marker = ""
-		}
-		var resp AliFiles
-		var e AliRespError
-		_, err := aliClient.R().
-			SetResult(&resp).
-			SetError(&e).
-			SetHeader("authorization", "Bearer\t"+account.AccessToken).
-			SetBody(base.Json{
-				"drive_id":                account.DriveId,
-				"fields":                  "*",
-				"image_thumbnail_process": "image/resize,w_400/format,jpeg",
-				"image_url_process":       "image/resize,w_1920/format,jpeg",
-				"limit":                   account.Limit,
-				"marker":                  marker,
-				"order_by":                account.OrderBy,
-				"order_direction":         account.OrderDirection,
-				"parent_file_id":          fileId,
-				"video_thumbnail_process": "video/snapshot,t_0,f_jpg,ar_auto,w_300",
-				"url_expire_sec":          14400,
-			}).Post("https://api.aliyundrive.com/v2/file/list")
-		if err != nil {
-			return nil, err
-		}
-		if e.Code != "" {
-			if e.Code == "AccessTokenInvalid" {
-				err = driver.RefreshToken(account)
-				if err != nil {
-					return nil, err
-				} else {
-					_ = model.SaveAccount(account)
-					return driver.GetFiles(fileId, account)
-				}
-			}
-			return nil, fmt.Errorf("%s", e.Message)
-		}
-		marker = resp.NextMarker
-		res = append(res, resp.Items...)
-	}
-	return res, nil
-}
-
-func (driver AliDrive) GetFile(path string, account *model.Account) (*AliFile, error) {
-	dir, name := filepath.Split(path)
-	dir = utils.ParsePath(dir)
-	_, err := driver.Files(dir, account)
-	if err != nil {
-		return nil, err
-	}
-	parentFiles_, _ := base.GetCache(dir, account)
-	parentFiles, _ := parentFiles_.([]AliFile)
-	for _, file := range parentFiles {
-		if file.Name == name {
-			if file.Type == "file" {
-				return &file, err
-			} else {
-				return nil, fmt.Errorf("not file")
-			}
-		}
-	}
-	return nil, base.ErrPathNotFound
-}
-
-func (driver AliDrive) RefreshToken(account *model.Account) error {
-	url := "https://auth.aliyundrive.com/v2/account/token"
-	var resp base.TokenResp
-	var e AliRespError
-	_, err := aliClient.R().
-		//ForceContentType("application/json").
-		SetBody(base.Json{"refresh_token": account.RefreshToken, "grant_type": "refresh_token"}).
-		SetResult(&resp).
-		SetError(&e).
-		Post(url)
-	if err != nil {
-		account.Status = err.Error()
-		return err
-	}
-	log.Debugf("%+v,%+v", resp, e)
-	if e.Code != "" {
-		account.Status = e.Message
-		return fmt.Errorf("failed to refresh token: %s", e.Message)
-	} else {
-		account.Status = "work"
-	}
-	account.RefreshToken, account.AccessToken = resp.RefreshToken, resp.AccessToken
-	return nil
-}
-
-func (driver AliDrive) rename(fileId, name string, account *model.Account) error {
-	var resp base.Json
-	var e AliRespError
-	_, err := aliClient.R().SetResult(&resp).SetError(&e).
-		SetHeader("authorization", "Bearer\t"+account.AccessToken).
-		SetBody(base.Json{
-			"check_name_mode": "refuse",
-			"drive_id":        account.DriveId,
-			"file_id":         fileId,
-			"name":            name,
-		}).Post("https://api.aliyundrive.com/v3/file/update")
-	if err != nil {
-		return err
-	}
-	if e.Code != "" {
-		if e.Code == "AccessTokenInvalid" {
-			err = driver.RefreshToken(account)
-			if err != nil {
-				return err
-			} else {
-				_ = model.SaveAccount(account)
-				return driver.rename(fileId, name, account)
-			}
-		}
-		return fmt.Errorf("%s", e.Message)
-	}
-	if resp["name"] == name {
-		return nil
-	}
-	return fmt.Errorf("%+v", resp)
-}
-
-func (driver AliDrive) batch(srcId, dstId string, url string, account *model.Account) error {
-	var e AliRespError
-	res, err := aliClient.R().SetError(&e).
-		SetHeader("authorization", "Bearer\t"+account.AccessToken).
-		SetBody(base.Json{
-			"requests": []base.Json{
-				{
-					"headers": base.Json{
-						"Content-Type": "application/json",
-					},
-					"method": "POST",
-					"id":     srcId,
-					"body": base.Json{
-						"drive_id":          account.DriveId,
-						"file_id":           srcId,
-						"to_drive_id":       account.DriveId,
-						"to_parent_file_id": dstId,
-					},
-					"url": url,
-				},
-			},
-			"resource": "file",
-		}).Post("https://api.aliyundrive.com/v3/batch")
-	if err != nil {
-		return err
-	}
-	if e.Code != "" {
-		if e.Code == "AccessTokenInvalid" {
-			err = driver.RefreshToken(account)
-			if err != nil {
-				return err
-			} else {
-				_ = model.SaveAccount(account)
-				return driver.batch(srcId, dstId, url, account)
-			}
-		}
-		return fmt.Errorf("%s", e.Message)
-	}
-	status := jsoniter.Get(res.Body(), "responses", 0, "status").ToInt()
-	if status < 400 && status >= 100 {
-		return nil
-	}
-	return errors.New(res.String())
-}
-
-func init() {
-	base.RegisterDriver(&AliDrive{})
-	aliClient.
-		SetTimeout(base.DefaultTimeout).
-		SetRetryCount(3).
-		SetHeader("user-agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36").
-		SetHeader("content-type", "application/json").
-		SetHeader("origin", "https://www.aliyundrive.com")
-}

drivers/alidrive/driver.go

@@ -1,544 +0,0 @@
-package alidrive
-
-import (
-	"bytes"
-	"crypto/sha1"
-	"encoding/base64"
-	"encoding/hex"
-	"errors"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"math"
-	"math/big"
-	"net/http"
-	"os"
-	"path/filepath"
-
-	"github.com/Xhofe/alist/conf"
-	"github.com/Xhofe/alist/drivers/base"
-	"github.com/Xhofe/alist/model"
-	"github.com/Xhofe/alist/utils"
-	"github.com/robfig/cron/v3"
-	log "github.com/sirupsen/logrus"
-)
-
-type AliDrive struct{}
-
-func (driver AliDrive) Config() base.DriverConfig {
-	return base.DriverConfig{
-		Name: "AliDrive",
-	}
-}
-
-func (driver AliDrive) Items() []base.Item {
-	return []base.Item{
-		{
-			Name:     "refresh_token",
-			Label:    "refresh token",
-			Type:     base.TypeString,
-			Required: true,
-		},
-		{
-			Name:     "root_folder",
-			Label:    "root folder file_id",
-			Type:     base.TypeString,
-			Required: false,
-		},
-		{
-			Name:     "order_by",
-			Label:    "order_by",
-			Type:     base.TypeSelect,
-			Values:   "name,size,updated_at,created_at",
-			Required: false,
-		},
-		{
-			Name:     "order_direction",
-			Label:    "order_direction",
-			Type:     base.TypeSelect,
-			Values:   "ASC,DESC",
-			Required: false,
-		},
-		{
-			Name:        "limit",
-			Label:       "limit",
-			Type:        base.TypeNumber,
-			Required:    false,
-			Description: ">0 and <=200",
-		},
-	}
-}
-
-func (driver AliDrive) Save(account *model.Account, old *model.Account) error {
-	if old != nil {
-		conf.Cron.Remove(cron.EntryID(old.CronId))
-	}
-	if account == nil {
-		return nil
-	}
-	if account.RootFolder == "" {
-		account.RootFolder = "root"
-	}
-	if account.Limit == 0 {
-		account.Limit = 200
-	}
-	err := driver.RefreshToken(account)
-	if err != nil {
-		return err
-	}
-	var resp base.Json
-	_, _ = aliClient.R().SetResult(&resp).
-		SetBody("{}").
-		SetHeader("authorization", "Bearer\t"+account.AccessToken).
-		Post("https://api.aliyundrive.com/v2/user/get")
-	log.Debugf("user info: %+v", resp)
-	account.DriveId = resp["default_drive_id"].(string)
-	cronId, err := conf.Cron.AddFunc("@every 2h", func() {
-		id := account.ID
-		log.Debugf("ali account id: %d", id)
-		newAccount, err := model.GetAccountById(id)
-		log.Debugf("ali account: %+v", newAccount)
-		if err != nil {
-			return
-		}
-		err = driver.RefreshToken(newAccount)
-		_ = model.SaveAccount(newAccount)
-	})
-	if err != nil {
-		return err
-	}
-	account.CronId = int(cronId)
-	err = model.SaveAccount(account)
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-func (driver AliDrive) File(path string, account *model.Account) (*model.File, error) {
-	path = utils.ParsePath(path)
-	if path == "/" {
-		return &model.File{
-			Id:        account.RootFolder,
-			Name:      account.Name,
-			Size:      0,
-			Type:      conf.FOLDER,
-			Driver:    driver.Config().Name,
-			UpdatedAt: account.UpdatedAt,
-		}, nil
-	}
-	dir, name := filepath.Split(path)
-	files, err := driver.Files(dir, account)
-	if err != nil {
-		return nil, err
-	}
-	for _, file := range files {
-		if file.Name == name {
-			return &file, nil
-		}
-	}
-	return nil, base.ErrPathNotFound
-}
-
-func (driver AliDrive) Files(path string, account *model.Account) ([]model.File, error) {
-	path = utils.ParsePath(path)
-	var rawFiles []AliFile
-	cache, err := base.GetCache(path, account)
-	if err == nil {
-		rawFiles, _ = cache.([]AliFile)
-	} else {
-		file, err := driver.File(path, account)
-		if err != nil {
-			return nil, err
-		}
-		rawFiles, err = driver.GetFiles(file.Id, account)
-		if err != nil {
-			return nil, err
-		}
-		if len(rawFiles) > 0 {
-			_ = base.SetCache(path, rawFiles, account)
-		}
-	}
-	files := make([]model.File, 0)
-	for _, file := range rawFiles {
-		files = append(files, *driver.FormatFile(&file))
-	}
-	return files, nil
-}
-
-func (driver AliDrive) Link(args base.Args, account *model.Account) (*base.Link, error) {
-	file, err := driver.File(args.Path, account)
-	if err != nil {
-		return nil, err
-	}
-	var resp base.Json
-	var e AliRespError
-	_, err = aliClient.R().SetResult(&resp).
-		SetError(&e).
-		SetHeader("authorization", "Bearer\t"+account.AccessToken).
-		SetBody(base.Json{
-			"drive_id":   account.DriveId,
-			"file_id":    file.Id,
-			"expire_sec": 14400,
-		}).Post("https://api.aliyundrive.com/v2/file/get_download_url")
-	if err != nil {
-		return nil, err
-	}
-	if e.Code != "" {
-		if e.Code == "AccessTokenInvalid" {
-			err = driver.RefreshToken(account)
-			if err != nil {
-				return nil, err
-			} else {
-				_ = model.SaveAccount(account)
-				return driver.Link(args, account)
-			}
-		}
-		return nil, fmt.Errorf("%s", e.Message)
-	}
-	return &base.Link{
-		Headers: []base.Header{
-			{
-				Name:  "Referer",
-				Value: "https://www.aliyundrive.com/",
-			},
-		},
-		Url: resp["url"].(string),
-	}, nil
-}
-
-func (driver AliDrive) Path(path string, account *model.Account) (*model.File, []model.File, error) {
-	path = utils.ParsePath(path)
-	log.Debugf("ali path: %s", path)
-	file, err := driver.File(path, account)
-	if err != nil {
-		return nil, nil, err
-	}
-	if !file.IsDir() {
-		return file, nil, nil
-	}
-	files, err := driver.Files(path, account)
-	if err != nil {
-		return nil, nil, err
-	}
-	return nil, files, nil
-}
-
-//func (driver AliDrive) Proxy(r *http.Request, account *model.Account) {
-//	r.Header.Del("Origin")
-//	r.Header.Set("Referer", "https://www.aliyundrive.com/")
-//}
-
-func (driver AliDrive) Preview(path string, account *model.Account) (interface{}, error) {
-	file, err := driver.GetFile(path, account)
-	if err != nil {
-		return nil, err
-	}
-	// office
-	var resp base.Json
-	var e AliRespError
-	var url string
-	req := base.Json{
-		"drive_id": account.DriveId,
-		"file_id":  file.FileId,
-	}
-	switch file.Category {
-	case "doc":
-		{
-			url = "https://api.aliyundrive.com/v2/file/get_office_preview_url"
-			req["access_token"] = account.AccessToken
-		}
-	case "video":
-		{
-			url = "https://api.aliyundrive.com/v2/file/get_video_preview_play_info"
-			req["category"] = "live_transcoding"
-		}
-	default:
-		return nil, base.ErrNotSupport
-	}
-	_, err = aliClient.R().SetResult(&resp).SetError(&e).
-		SetHeader("authorization", "Bearer\t"+account.AccessToken).
-		SetBody(req).Post(url)
-	if err != nil {
-		return nil, err
-	}
-	if e.Code != "" {
-		return nil, fmt.Errorf("%s", e.Message)
-	}
-	return resp, nil
-}
-
-func (driver AliDrive) MakeDir(path string, account *model.Account) error {
-	dir, name := filepath.Split(path)
-	parentFile, err := driver.File(dir, account)
-	if err != nil {
-		return err
-	}
-	if !parentFile.IsDir() {
-		return base.ErrNotFolder
-	}
-	var resp base.Json
-	var e AliRespError
-	_, err = aliClient.R().SetResult(&resp).SetError(&e).
-		SetHeader("authorization", "Bearer\t"+account.AccessToken).
-		SetBody(base.Json{
-			"check_name_mode": "refuse",
-			"drive_id":        account.DriveId,
-			"name":            name,
-			"parent_file_id":  parentFile.Id,
-			"type":            "folder",
-		}).Post("https://api.aliyundrive.com/adrive/v2/file/createWithFolders")
-	if e.Code != "" {
-		if e.Code == "AccessTokenInvalid" {
-			err = driver.RefreshToken(account)
-			if err != nil {
-				return err
-			} else {
-				_ = model.SaveAccount(account)
-				return driver.MakeDir(path, account)
-			}
-		}
-		return fmt.Errorf("%s", e.Message)
-	}
-	if resp["file_name"] == name {
-		return nil
-	}
-	return fmt.Errorf("%+v", resp)
-}
-
-func (driver AliDrive) Move(src string, dst string, account *model.Account) error {
-	dstDir, _ := filepath.Split(dst)
-	srcFile, err := driver.File(src, account)
-	if err != nil {
-		return err
-	}
-	dstDirFile, err := driver.File(dstDir, account)
-	if err != nil {
-		return err
-	}
-	err = driver.batch(srcFile.Id, dstDirFile.Id, "/file/move", account)
-	return err
-}
-
-func (driver AliDrive) Rename(src string, dst string, account *model.Account) error {
-	_, dstName := filepath.Split(dst)
-	srcFile, err := driver.File(src, account)
-	if err != nil {
-		return err
-	}
-	err = driver.rename(srcFile.Id, dstName, account)
-	return err
-}
-
-func (driver AliDrive) Copy(src string, dst string, account *model.Account) error {
-	dstDir, _ := filepath.Split(dst)
-	srcFile, err := driver.File(src, account)
-	if err != nil {
-		return err
-	}
-	dstDirFile, err := driver.File(dstDir, account)
-	if err != nil {
-		return err
-	}
-	err = driver.batch(srcFile.Id, dstDirFile.Id, "/file/copy", account)
-	return err
-}
-
-func (driver AliDrive) Delete(path string, account *model.Account) error {
-	file, err := driver.File(path, account)
-	if err != nil {
-		return err
-	}
-	var e AliRespError
-	res, err := aliClient.R().SetError(&e).
-		SetHeader("authorization", "Bearer\t"+account.AccessToken).
-		SetBody(base.Json{
-			"drive_id": account.DriveId,
-			"file_id":  file.Id,
-		}).Post("https://api.aliyundrive.com/v2/recyclebin/trash")
-	if err != nil {
-		return err
-	}
-	if e.Code != "" {
-		if e.Code == "AccessTokenInvalid" {
-			err = driver.RefreshToken(account)
-			if err != nil {
-				return err
-			} else {
-				_ = model.SaveAccount(account)
-				return driver.Delete(path, account)
-			}
-		}
-		return fmt.Errorf("%s", e.Message)
-	}
-	if res.StatusCode() == 204 {
-		return nil
-	}
-	return errors.New(res.String())
-}
-
-type UploadResp struct {
-	FileId       string `json:"file_id"`
-	UploadId     string `json:"upload_id"`
-	PartInfoList []struct {
-		UploadUrl string `json:"upload_url"`
-	} `json:"part_info_list"`
-
-	RapidUpload bool `json:"rapid_upload"`
-}
-
-func (driver AliDrive) Upload(file *model.FileStream, account *model.Account) error {
-	if file == nil {
-		return base.ErrEmptyFile
-	}
-	const DEFAULT int64 = 10485760
-	var count = int64(math.Ceil(float64(file.GetSize()) / float64(DEFAULT)))
-	parentFile, err := driver.File(file.ParentPath, account)
-	if err != nil {
-		return err
-	}
-	if !parentFile.IsDir() {
-		return base.ErrNotFolder
-	}
-
-	partInfoList := make([]base.Json, 0, count)
-	var i int64
-	for i = 0; i < count; i++ {
-		partInfoList = append(partInfoList, base.Json{
-			"part_number": i + 1,
-		})
-	}
-
-	buf := make([]byte, 1024)
-	n, _ := file.Read(buf[:])
-	reqBody := base.Json{
-		"check_name_mode": "overwrite",
-		"drive_id":        account.DriveId,
-		"name":            file.GetFileName(),
-		"parent_file_id":  parentFile.Id,
-		"part_info_list":  partInfoList,
-		"size":            file.GetSize(),
-		"type":            "file",
-		"pre_hash":        utils.GetSHA1Encode(string(buf[:n])),
-	}
-	fileReader := io.MultiReader(bytes.NewReader(buf[:n]), file.File)
-
-	var resp UploadResp
-	var e AliRespError
-	client := aliClient.R().SetResult(&resp).SetError(&e).SetHeader("authorization", "Bearer\t"+account.AccessToken).SetBody(reqBody)
-
-	_, err = client.Post("https://api.aliyundrive.com/adrive/v2/file/createWithFolders")
-	if err != nil {
-		return err
-	}
-	if e.Code != "" && e.Code != "PreHashMatched" {
-		if e.Code == "AccessTokenInvalid" {
-			err = driver.RefreshToken(account)
-			if err != nil {
-				return err
-			} else {
-				_ = model.SaveAccount(account)
-				return driver.Upload(file, account)
-			}
-		}
-		return fmt.Errorf("%s", e.Message)
-	}
-
-	if e.Code == "PreHashMatched" {
-		tempFile, err := ioutil.TempFile(conf.Conf.TempDir, "file-*")
-		if err != nil {
-			return err
-		}
-
-		defer tempFile.Close()
-		defer os.Remove(tempFile.Name())
-
-		delete(reqBody, "pre_hash")
-		h := sha1.New()
-		if _, err = io.Copy(tempFile, io.TeeReader(fileReader, h)); err != nil {
-			return err
-		}
-		reqBody["content_hash"] = hex.EncodeToString(h.Sum(nil))
-		reqBody["content_hash_name"] = "sha1"
-		reqBody["proof_version"] = "v1"
-
-		/*
-			js 隐性转换太坑不知道有没有bug
-			var n = e.access_token，
-			r = new BigNumber('0x'.concat(md5(n).slice(0, 16)))，
-			i = new BigNumber(t.file.size)，
-			o = i ? r.mod(i) : new gt.BigNumber(0);
-			(t.file.slice(o.toNumber(), Math.min(o.plus(8).toNumber(), t.file.size)))
-		*/
-		r, _ := new(big.Int).SetString(utils.GetMD5Encode(account.AccessToken)[:16], 16)
-		i := new(big.Int).SetUint64(file.Size)
-		o := r.Mod(r, i)
-		n, _ = io.NewSectionReader(tempFile, o.Int64(), 8).Read(buf[:8])
-		reqBody["proof_code"] = base64.StdEncoding.EncodeToString(buf[:n])
-
-		_, err = client.Post("https://api.aliyundrive.com/adrive/v2/file/createWithFolders")
-		if err != nil {
-			return err
-		}
-		if e.Code != "" && e.Code != "PreHashMatched" {
-			return fmt.Errorf("%s", e.Message)
-		}
-
-		if resp.RapidUpload {
-			return nil
-		}
-
-		if _, err = tempFile.Seek(0, io.SeekStart); err != nil {
-			return err
-		}
-		fileReader = tempFile
-	}
-
-	for i = 0; i < count; i++ {
-		req, err := http.NewRequest("PUT", resp.PartInfoList[i].UploadUrl, io.LimitReader(fileReader, DEFAULT))
-		if err != nil {
-			return err
-		}
-		res, err := base.HttpClient.Do(req)
-		if err != nil {
-			return err
-		}
-		log.Debugf("%+v", res)
-		//res, err := base.BaseClient.R().
-		//	SetHeader("Content-Type","").
-		//	SetBody(byteData).Put(resp.PartInfoList[i].UploadUrl)
-		//if err != nil {
-		//	return err
-		//}
-		//log.Debugf("put to %s : %d,%s", resp.PartInfoList[i].UploadUrl, res.StatusCode(),res.String())
-	}
-	var resp2 base.Json
-	_, err = aliClient.R().SetResult(&resp2).SetError(&e).
-		SetHeader("authorization", "Bearer\t"+account.AccessToken).
-		SetBody(base.Json{
-			"drive_id":  account.DriveId,
-			"file_id":   resp.FileId,
-			"upload_id": resp.UploadId,
-		}).Post("https://api.aliyundrive.com/v2/file/complete")
-	if err != nil {
-		return err
-	}
-	if e.Code != "" {
-		//if e.Code == "AccessTokenInvalid" {
-		//	err = driver.RefreshToken(account)
-		//	if err != nil {
-		//		return err
-		//	} else {
-		//		_ = model.SaveAccount(account)
-		//		return driver.Upload(file, account)
-		//	}
-		//}
-		return fmt.Errorf("%s", e.Message)
-	}
-	if resp2["file_id"] == resp.FileId {
-		return nil
-	}
-	return fmt.Errorf("%+v", resp2)
-}
-
-var _ base.Driver = (*AliDrive)(nil)

drivers/alist/alist.go

@@ -1,44 +0,0 @@
-package alist
-
-import (
-	"errors"
-	"github.com/Xhofe/alist/drivers/base"
-	"github.com/Xhofe/alist/model"
-)
-
-type BaseResp struct {
-	Code    int    `json:"code"`
-	Message string `json:"message"`
-}
-
-type PathResp struct {
-	BaseResp
-	Data struct {
-		Type string `json:"type"`
-		//Meta  Meta         `json:"meta"`
-		Files []model.File `json:"files"`
-	} `json:"data"`
-}
-
-type PreviewResp struct {
-	BaseResp
-	Data interface{} `json:"data"`
-}
-
-func (driver *Alist) Login(account *model.Account) error {
-	var resp BaseResp
-	_, err := base.RestyClient.R().SetResult(&resp).
-		SetHeader("Authorization", account.AccessToken).
-		Get(account.SiteUrl + "/api/admin/login")
-	if err != nil {
-		return err
-	}
-	if resp.Code != 200 {
-		return errors.New(resp.Message)
-	}
-	return nil
-}
-
-func init() {
-	base.RegisterDriver(&Alist{})
-}

drivers/alist/driver.go

@@ -1,192 +0,0 @@
-package alist
-
-import (
-	"errors"
-	"fmt"
-	"github.com/Xhofe/alist/conf"
-	"github.com/Xhofe/alist/drivers/base"
-	"github.com/Xhofe/alist/model"
-	"github.com/Xhofe/alist/utils"
-	"path/filepath"
-	"strings"
-	"time"
-)
-
-type Alist struct{}
-
-func (driver Alist) Config() base.DriverConfig {
-	return base.DriverConfig{
-		Name:          "Alist",
-		NoNeedSetLink: true,
-		NoCors:        true,
-	}
-}
-
-func (driver Alist) Items() []base.Item {
-	return []base.Item{
-		{
-			Name:     "site_url",
-			Label:    "alist site url",
-			Type:     base.TypeString,
-			Required: true,
-		},
-		{
-			Name:        "access_token",
-			Label:       "token",
-			Type:        base.TypeString,
-			Description: "admin token",
-			Required:    true,
-		},
-		{
-			Name:     "root_folder",
-			Label:    "root folder path",
-			Type:     base.TypeString,
-			Required: false,
-		},
-	}
-}
-
-func (driver Alist) Save(account *model.Account, old *model.Account) error {
-	if account == nil {
-		return nil
-	}
-	account.SiteUrl = strings.TrimRight(account.SiteUrl, "/")
-	if account.RootFolder == "" {
-		account.RootFolder = "/"
-	}
-	err := driver.Login(account)
-	if err == nil {
-		account.Status = "work"
-	} else {
-		account.Status = err.Error()
-	}
-	_ = model.SaveAccount(account)
-	return err
-}
-
-func (driver Alist) File(path string, account *model.Account) (*model.File, error) {
-	now := time.Now()
-	if path == "/" {
-		return &model.File{
-			Id:        "root",
-			Name:      "root",
-			Size:      0,
-			Type:      conf.FOLDER,
-			Driver:    driver.Config().Name,
-			UpdatedAt: &now,
-		}, nil
-	}
-	_, files, err := driver.Path(utils.Dir(path), account)
-	if err != nil {
-		return nil, err
-	}
-	if files == nil {
-		return nil, base.ErrPathNotFound
-	}
-	name := utils.Base(path)
-	for _, file := range files {
-		if file.Name == name {
-			return &file, nil
-		}
-	}
-	return nil, base.ErrPathNotFound
-}
-
-func (driver Alist) Files(path string, account *model.Account) ([]model.File, error) {
-	//return nil, base.ErrNotImplement
-	_, files, err := driver.Path(path, account)
-	if err != nil {
-		return nil, err
-	}
-	if files == nil {
-		return nil, base.ErrNotFolder
-	}
-	return files, nil
-}
-
-func (driver Alist) Link(args base.Args, account *model.Account) (*base.Link, error) {
-	path := args.Path
-	path = utils.ParsePath(path)
-	name := utils.Base(path)
-	flag := "d"
-	if utils.GetFileType(filepath.Ext(path)) == conf.TEXT {
-		flag = "p"
-	}
-	link := base.Link{}
-	link.Url = fmt.Sprintf("%s/%s%s?sign=%s", account.SiteUrl, flag, path, utils.SignWithToken(name, conf.Token))
-	return &link, nil
-}
-
-func (driver Alist) Path(path string, account *model.Account) (*model.File, []model.File, error) {
-	path = utils.ParsePath(path)
-	path = filepath.Join(account.RootFolder, path)
-	path = strings.ReplaceAll(path, "\\", "/")
-	cache, err := base.GetCache(path, account)
-	if err == nil {
-		files := cache.([]model.File)
-		return nil, files, nil
-	}
-	var resp PathResp
-	_, err = base.RestyClient.R().SetResult(&resp).
-		SetHeader("Authorization", account.AccessToken).
-		SetBody(base.Json{
-			"path": path,
-		}).Post(account.SiteUrl + "/api/public/path")
-	if err != nil {
-		return nil, nil, err
-	}
-	if resp.Code != 200 {
-		return nil, nil, errors.New(resp.Message)
-	}
-	if resp.Data.Type == "file" {
-		return &resp.Data.Files[0], nil, nil
-	}
-	if len(resp.Data.Files) > 0 {
-		_ = base.SetCache(path, resp.Data.Files, account)
-	}
-	return nil, resp.Data.Files, nil
-}
-
-//func (driver Alist) Proxy(r *http.Request, account *model.Account) {}
-
-func (driver Alist) Preview(path string, account *model.Account) (interface{}, error) {
-	var resp PathResp
-	_, err := base.RestyClient.R().SetResult(&resp).
-		SetHeader("Authorization", account.AccessToken).
-		SetBody(base.Json{
-			"path": path,
-		}).Post(account.SiteUrl + "/api/public/preview")
-	if err != nil {
-		return nil, err
-	}
-	if resp.Code != 200 {
-		return nil, errors.New(resp.Message)
-	}
-	return resp.Data, nil
-}
-
-func (driver Alist) MakeDir(path string, account *model.Account) error {
-	return base.ErrNotImplement
-}
-
-func (driver Alist) Move(src string, dst string, account *model.Account) error {
-	return base.ErrNotImplement
-}
-
-func (driver Alist) Rename(src string, dst string, account *model.Account) error {
-	return base.ErrNotImplement
-}
-
-func (driver Alist) Copy(src string, dst string, account *model.Account) error {
-	return base.ErrNotImplement
-}
-
-func (driver Alist) Delete(path string, account *model.Account) error {
-	return base.ErrNotImplement
-}
-
-func (driver Alist) Upload(file *model.FileStream, account *model.Account) error {
-	return base.ErrNotImplement
-}
-
-var _ base.Driver = (*Alist)(nil)

drivers/aliyundrive/driver.go

@@ -0,0 +1,290 @@
+package aliyundrive
+
+import (
+	"bytes"
+	"context"
+	"crypto/sha1"
+	"encoding/base64"
+	"encoding/hex"
+	"fmt"
+	"io"
+	"math"
+	"math/big"
+	"net/http"
+	"os"
+	"time"
+
+	"github.com/alist-org/alist/v3/drivers/base"
+	"github.com/alist-org/alist/v3/internal/conf"
+	"github.com/alist-org/alist/v3/internal/driver"
+	"github.com/alist-org/alist/v3/internal/errs"
+	"github.com/alist-org/alist/v3/internal/model"
+	"github.com/alist-org/alist/v3/pkg/cron"
+	"github.com/alist-org/alist/v3/pkg/utils"
+	"github.com/go-resty/resty/v2"
+	log "github.com/sirupsen/logrus"
+)
+
+type AliDrive struct {
+	model.Storage
+	Addition
+	AccessToken string
+	cron        *cron.Cron
+	DriveId     string
+}
+
+func (d *AliDrive) Config() driver.Config {
+	return config
+}
+
+func (d *AliDrive) GetAddition() driver.Additional {
+	return d.Addition
+}
+
+func (d *AliDrive) Init(ctx context.Context, storage model.Storage) error {
+	d.Storage = storage
+	err := utils.Json.UnmarshalFromString(d.Storage.Addition, &d.Addition)
+	if err != nil {
+		return err
+	}
+	// TODO login / refresh token
+	//op.MustSaveDriverStorage(d)
+	err = d.refreshToken()
+	if err != nil {
+		return err
+	}
+	// get driver id
+	res, err, _ := d.request("https://api.aliyundrive.com/v2/user/get", http.MethodPost, nil, nil)
+	if err != nil {
+		return err
+	}
+	d.DriveId = utils.Json.Get(res, "default_drive_id").ToString()
+	d.cron = cron.NewCron(time.Hour * 2)
+	d.cron.Do(func() {
+		err := d.refreshToken()
+		if err != nil {
+			log.Errorf("%+v", err)
+		}
+	})
+	return err
+}
+
+func (d *AliDrive) Drop(ctx context.Context) error {
+	if d.cron != nil {
+		d.cron.Stop()
+	}
+	return nil
+}
+
+func (d *AliDrive) 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 *AliDrive) Get(ctx context.Context, path string) (model.Obj, error) {
+//	// TODO this is optional
+//	return nil, errs.NotImplement
+//}
+
+func (d *AliDrive) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
+	data := base.Json{
+		"drive_id":   d.DriveId,
+		"file_id":    file.GetID(),
+		"expire_sec": 14400,
+	}
+	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 {
+		return nil, err
+	}
+	return &model.Link{
+		Header: http.Header{
+			"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.aliyundrive.com/adrive/v2/file/createWithFolders", http.MethodPost, func(req *resty.Request) {
+		req.SetBody(base.Json{
+			"check_name_mode": "refuse",
+			"drive_id":        d.DriveId,
+			"name":            dirName,
+			"parent_file_id":  parentDir.GetID(),
+			"type":            "folder",
+		})
+	}, nil)
+	return err
+}
+
+func (d *AliDrive) Move(ctx context.Context, srcObj, dstDir model.Obj) error {
+	err := d.batch(srcObj.GetID(), dstDir.GetID(), "/file/move")
+	return err
+}
+
+func (d *AliDrive) Rename(ctx context.Context, srcObj model.Obj, newName string) error {
+	_, 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,
+			"file_id":         srcObj.GetID(),
+			"name":            newName,
+		})
+	}, nil)
+	return err
+}
+
+func (d *AliDrive) Copy(ctx context.Context, srcObj, dstDir model.Obj) error {
+	err := d.batch(srcObj.GetID(), dstDir.GetID(), "/file/copy")
+	return err
+}
+
+func (d *AliDrive) Remove(ctx context.Context, obj model.Obj) error {
+	_, 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(),
+		})
+	}, nil)
+	return err
+}
+
+func (d *AliDrive) Put(ctx context.Context, dstDir model.Obj, stream model.FileStreamer, up driver.UpdateProgress) error {
+	file := model.FileStream{
+		Obj:        stream,
+		ReadCloser: stream,
+		Mimetype:   stream.GetMimetype(),
+	}
+	const DEFAULT int64 = 10485760
+	var count = int(math.Ceil(float64(stream.GetSize()) / float64(DEFAULT)))
+
+	partInfoList := make([]base.Json, 0, count)
+	for i := 1; i <= count; i++ {
+		partInfoList = append(partInfoList, base.Json{"part_number": i})
+	}
+	reqBody := base.Json{
+		"check_name_mode": "overwrite",
+		"drive_id":        d.DriveId,
+		"name":            file.GetName(),
+		"parent_file_id":  dstDir.GetID(),
+		"part_info_list":  partInfoList,
+		"size":            file.GetSize(),
+		"type":            "file",
+	}
+
+	if d.RapidUpload {
+		buf := bytes.NewBuffer(make([]byte, 0, 1024))
+		io.CopyN(buf, file, 1024)
+		reqBody["pre_hash"] = utils.GetSHA1Encode(buf.String())
+		// 把头部拼接回去
+		file.ReadCloser = struct {
+			io.Reader
+			io.Closer
+		}{
+			Reader: io.MultiReader(buf, file),
+			Closer: file,
+		}
+	} else {
+		reqBody["content_hash_name"] = "none"
+		reqBody["proof_version"] = "v1"
+	}
+
+	var resp UploadResp
+	_, 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" {
+		return err
+	}
+
+	if d.RapidUpload && e.Code == "PreHashMatched" {
+		tempFile, err := os.CreateTemp(conf.Conf.TempDir, "file-*")
+		if err != nil {
+			return err
+		}
+		defer func() {
+			_ = tempFile.Close()
+			_ = os.Remove(tempFile.Name())
+		}()
+		delete(reqBody, "pre_hash")
+		h := sha1.New()
+		if _, err = io.Copy(io.MultiWriter(tempFile, h), file); err != nil {
+			return err
+		}
+		reqBody["content_hash"] = hex.EncodeToString(h.Sum(nil))
+		reqBody["content_hash_name"] = "sha1"
+		reqBody["proof_version"] = "v1"
+
+		/*
+			js 隐性转换太坑不知道有没有bug
+			var n = e.access_token，
+			r = new BigNumber('0x'.concat(md5(n).slice(0, 16)))，
+			i = new BigNumber(t.file.size)，
+			o = i ? r.mod(i) : new gt.BigNumber(0);
+			(t.file.slice(o.toNumber(), Math.min(o.plus(8).toNumber(), t.file.size)))
+		*/
+		buf := make([]byte, 8)
+		r, _ := new(big.Int).SetString(utils.GetMD5Encode(d.AccessToken)[:16], 16)
+		i := new(big.Int).SetInt64(file.GetSize())
+		o := r.Mod(r, i)
+		n, _ := io.NewSectionReader(tempFile, o.Int64(), 8).Read(buf[:8])
+		reqBody["proof_code"] = base64.StdEncoding.EncodeToString(buf[:n])
+
+		_, 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" {
+			return err
+		}
+		if resp.RapidUpload {
+			return nil
+		}
+		// 秒传失败
+		if _, err = tempFile.Seek(0, io.SeekStart); err != nil {
+			return err
+		}
+		file.ReadCloser = tempFile
+	}
+
+	for i, partInfo := range resp.PartInfoList {
+		req, err := http.NewRequest("PUT", partInfo.UploadUrl, io.LimitReader(file, DEFAULT))
+		if err != nil {
+			return err
+		}
+		res, err := base.HttpClient.Do(req)
+		if err != nil {
+			return err
+		}
+		res.Body.Close()
+		up(i * 100 / count)
+	}
+	var resp2 base.Json
+	_, 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,
+			"upload_id": resp.UploadId,
+		})
+	}, &resp2)
+	if err != nil && e.Code != "PreHashMatched" {
+		return err
+	}
+	if resp2["file_id"] == resp.FileId {
+		return nil
+	}
+	return fmt.Errorf("%+v", resp2)
+}
+
+func (d *AliDrive) Other(ctx context.Context, args model.OtherArgs) (interface{}, error) {
+	return nil, errs.NotSupport
+}
+
+var _ driver.Driver = (*AliDrive)(nil)

drivers/aliyundrive/meta.go

@@ -0,0 +1,27 @@
+package aliyundrive
+
+import (
+	"github.com/alist-org/alist/v3/internal/driver"
+	"github.com/alist-org/alist/v3/internal/op"
+)
+
+type Addition struct {
+	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"`
+	RapidUpload    bool   `json:"rapid_upload"`
+}
+
+var config = driver.Config{
+	Name:        "Aliyundrive",
+	DefaultRoot: "root",
+}
+
+func New() driver.Driver {
+	return &AliDrive{}
+}
+
+func init() {
+	op.RegisterDriver(config, New)
+}

drivers/aliyundrive/types.go

@@ -0,0 +1,54 @@
+package aliyundrive
+
+import (
+	"time"
+
+	"github.com/alist-org/alist/v3/internal/model"
+)
+
+type RespErr struct {
+	Code    string `json:"code"`
+	Message string `json:"message"`
+}
+
+type Files struct {
+	Items      []File `json:"items"`
+	NextMarker string `json:"next_marker"`
+}
+
+type File struct {
+	DriveId       string     `json:"drive_id"`
+	CreatedAt     *time.Time `json:"created_at"`
+	FileExtension string     `json:"file_extension"`
+	FileId        string     `json:"file_id"`
+	Type          string     `json:"type"`
+	Name          string     `json:"name"`
+	Category      string     `json:"category"`
+	ParentFileId  string     `json:"parent_file_id"`
+	UpdatedAt     time.Time  `json:"updated_at"`
+	Size          int64      `json:"size"`
+	Thumbnail     string     `json:"thumbnail"`
+	Url           string     `json:"url"`
+}
+
+func fileToObj(f File) *model.ObjThumb {
+	return &model.ObjThumb{
+		Object: model.Object{
+			ID:       f.FileId,
+			Name:     f.Name,
+			Size:     f.Size,
+			Modified: f.UpdatedAt,
+			IsFolder: f.Type == "folder",
+		},
+	}
+}
+
+type UploadResp struct {
+	FileId       string `json:"file_id"`
+	UploadId     string `json:"upload_id"`
+	PartInfoList []struct {
+		UploadUrl string `json:"upload_url"`
+	} `json:"part_info_list"`
+
+	RapidUpload bool `json:"rapid_upload"`
+}

drivers/aliyundrive/util.go

@@ -0,0 +1,133 @@
+package aliyundrive
+
+import (
+	"errors"
+	"fmt"
+	"net/http"
+
+	"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"
+)
+
+// do others that not defined in Driver interface
+
+func (d *AliDrive) refreshToken() error {
+	url := "https://auth.aliyundrive.com/v2/account/token"
+	var resp base.TokenResp
+	var e RespErr
+	_, err := base.RestyClient.R().
+		//ForceContentType("application/json").
+		SetBody(base.Json{"refresh_token": d.RefreshToken, "grant_type": "refresh_token"}).
+		SetResult(&resp).
+		SetError(&e).
+		Post(url)
+	if err != nil {
+		return err
+	}
+	if e.Code != "" {
+		return fmt.Errorf("failed to refresh token: %s", e.Message)
+	}
+	d.RefreshToken, d.AccessToken = resp.RefreshToken, resp.AccessToken
+	op.MustSaveDriverStorage(d)
+	return nil
+}
+
+func (d *AliDrive) request(url, method string, callback base.ReqCallback, resp interface{}) ([]byte, error, RespErr) {
+	req := base.RestyClient.R()
+	req.SetHeader("Authorization", "Bearer\t"+d.AccessToken)
+	req.SetHeader("content-type", "application/json")
+	req.SetHeader("origin", "https://www.aliyundrive.com")
+	if callback != nil {
+		callback(req)
+	} else {
+		req.SetBody("{}")
+	}
+	if resp != nil {
+		req.SetResult(resp)
+	}
+	var e RespErr
+	req.SetError(&e)
+	res, err := req.Execute(method, url)
+	if err != nil {
+		return nil, err, e
+	}
+	if e.Code != "" {
+		if e.Code == "AccessTokenInvalid" {
+			err = d.refreshToken()
+			if err != nil {
+				return nil, err, e
+			}
+			return d.request(url, method, callback, resp)
+		}
+		return nil, errors.New(e.Message), e
+	}
+	return res.Body(), nil, e
+}
+
+func (d *AliDrive) getFiles(fileId string) ([]File, error) {
+	marker := "first"
+	res := make([]File, 0)
+	for marker != "" {
+		if marker == "first" {
+			marker = ""
+		}
+		var resp Files
+		data := base.Json{
+			"drive_id":                d.DriveId,
+			"fields":                  "*",
+			"image_thumbnail_process": "image/resize,w_400/format,jpeg",
+			"image_url_process":       "image/resize,w_1920/format,jpeg",
+			"limit":                   200,
+			"marker":                  marker,
+			"order_by":                d.OrderBy,
+			"order_direction":         d.OrderDirection,
+			"parent_file_id":          fileId,
+			"video_thumbnail_process": "video/snapshot,t_0,f_jpg,ar_auto,w_300",
+			"url_expire_sec":          14400,
+		}
+		_, err, _ := d.request("https://api.aliyundrive.com/v2/file/list", http.MethodPost, func(req *resty.Request) {
+			req.SetBody(data)
+		}, &resp)
+
+		if err != nil {
+			return nil, err
+		}
+		marker = resp.NextMarker
+		res = append(res, resp.Items...)
+	}
+	return res, nil
+}
+
+func (d *AliDrive) batch(srcId, dstId string, url string) error {
+	res, err, _ := d.request("https://api.aliyundrive.com/v3/batch", http.MethodPost, func(req *resty.Request) {
+		req.SetBody(base.Json{
+			"requests": []base.Json{
+				{
+					"headers": base.Json{
+						"Content-Type": "application/json",
+					},
+					"method": "POST",
+					"id":     srcId,
+					"body": base.Json{
+						"drive_id":          d.DriveId,
+						"file_id":           srcId,
+						"to_drive_id":       d.DriveId,
+						"to_parent_file_id": dstId,
+					},
+					"url": url,
+				},
+			},
+			"resource": "file",
+		})
+	}, nil)
+	if err != nil {
+		return err
+	}
+	status := utils.Json.Get(res, "responses", 0, "status").ToInt()
+	if status < 400 && status >= 100 {
+		return nil
+	}
+	return errors.New(string(res))
+}

drivers/all.go

@@ -1,50 +1,30 @@
 package drivers
 
 import (
-	_ "github.com/Xhofe/alist/drivers/123"
-	_ "github.com/Xhofe/alist/drivers/139"
-	_ "github.com/Xhofe/alist/drivers/189"
-	_ "github.com/Xhofe/alist/drivers/189pc"
-	_ "github.com/Xhofe/alist/drivers/alidrive"
-	_ "github.com/Xhofe/alist/drivers/alist"
-	_ "github.com/Xhofe/alist/drivers/baidu"
-	"github.com/Xhofe/alist/drivers/base"
-	_ "github.com/Xhofe/alist/drivers/ftp"
-	_ "github.com/Xhofe/alist/drivers/google"
-	_ "github.com/Xhofe/alist/drivers/lanzou"
-	_ "github.com/Xhofe/alist/drivers/mediatrack"
-	_ "github.com/Xhofe/alist/drivers/native"
-	_ "github.com/Xhofe/alist/drivers/onedrive"
-	_ "github.com/Xhofe/alist/drivers/pikpak"
-	_ "github.com/Xhofe/alist/drivers/quark"
-	_ "github.com/Xhofe/alist/drivers/s3"
-	_ "github.com/Xhofe/alist/drivers/shandian"
-	_ "github.com/Xhofe/alist/drivers/teambition"
-	_ "github.com/Xhofe/alist/drivers/uss"
-	_ "github.com/Xhofe/alist/drivers/webdav"
-	_ "github.com/Xhofe/alist/drivers/xunlei"
-	_ "github.com/Xhofe/alist/drivers/yandex"
-	log "github.com/sirupsen/logrus"
-	"strings"
+	_ "github.com/alist-org/alist/v3/drivers/123"
+	_ "github.com/alist-org/alist/v3/drivers/139"
+	_ "github.com/alist-org/alist/v3/drivers/189"
+	_ "github.com/alist-org/alist/v3/drivers/189pc"
+	_ "github.com/alist-org/alist/v3/drivers/aliyundrive"
+	_ "github.com/alist-org/alist/v3/drivers/baidu_netdisk"
+	_ "github.com/alist-org/alist/v3/drivers/ftp"
+	_ "github.com/alist-org/alist/v3/drivers/google_drive"
+	_ "github.com/alist-org/alist/v3/drivers/local"
+	_ "github.com/alist-org/alist/v3/drivers/mediatrack"
+	_ "github.com/alist-org/alist/v3/drivers/onedrive"
+	_ "github.com/alist-org/alist/v3/drivers/pikpak"
+	_ "github.com/alist-org/alist/v3/drivers/quark"
+	_ "github.com/alist-org/alist/v3/drivers/s3"
+	_ "github.com/alist-org/alist/v3/drivers/sftp"
+	_ "github.com/alist-org/alist/v3/drivers/teambition"
+	_ "github.com/alist-org/alist/v3/drivers/uss"
+	_ "github.com/alist-org/alist/v3/drivers/virtual"
+	_ "github.com/alist-org/alist/v3/drivers/webdav"
+	_ "github.com/alist-org/alist/v3/drivers/yandex_disk"
 )
 
-var NoCors string
-var NoUpload string
+// All do nothing,just for import
+// same as _ import
+func All() {
 
-func GetConfig() {
-	for k, v := range base.GetDriversMap() {
-		if v.Config().NoCors {
-			NoCors += k + ","
-		}
-		if v.Upload(nil, nil) != base.ErrEmptyFile {
-			NoUpload += k + ","
-		}
-	}
-	NoCors = strings.Trim(NoCors, ",")
-	NoUpload += "root"
-}
-
-func init() {
-	log.Debug("all init")
-	GetConfig()
 }

drivers/baidu/baidu.go

@@ -1,186 +0,0 @@
-package baidu
-
-import (
-	"fmt"
-	"github.com/Xhofe/alist/conf"
-	"github.com/Xhofe/alist/drivers/base"
-	"github.com/Xhofe/alist/model"
-	"github.com/Xhofe/alist/utils"
-	"github.com/go-resty/resty/v2"
-	jsoniter "github.com/json-iterator/go"
-	"path"
-	"strconv"
-)
-
-func (driver Baidu) RefreshToken(account *model.Account) error {
-	err := driver.refreshToken(account)
-	if err != nil && err == base.ErrEmptyToken {
-		err = driver.refreshToken(account)
-	}
-	if err != nil {
-		account.Status = err.Error()
-	}
-	_ = model.SaveAccount(account)
-	return err
-}
-
-func (driver Baidu) refreshToken(account *model.Account) error {
-	u := "https://openapi.baidu.com/oauth/2.0/token"
-	var resp base.TokenResp
-	var e TokenErrResp
-	_, err := base.RestyClient.R().SetResult(&resp).SetError(&e).SetQueryParams(map[string]string{
-		"grant_type":    "refresh_token",
-		"refresh_token": account.RefreshToken,
-		"client_id":     account.ClientId,
-		"client_secret": account.ClientSecret,
-	}).Get(u)
-	if err != nil {
-		return err
-	}
-	if e.Error != "" {
-		return fmt.Errorf("%s : %s", e.Error, e.ErrorDescription)
-	}
-	if resp.RefreshToken == "" {
-		return base.ErrEmptyToken
-	}
-	account.Status = "work"
-	account.AccessToken, account.RefreshToken = resp.AccessToken, resp.RefreshToken
-	return nil
-}
-
-func (driver Baidu) Request(pathname string, method int, headers, query, form map[string]string, data interface{}, resp interface{}, account *model.Account) ([]byte, error) {
-	u := "https://pan.baidu.com/rest/2.0" + pathname
-	req := base.RestyClient.R()
-	req.SetQueryParam("access_token", account.AccessToken)
-	if headers != nil {
-		req.SetHeaders(headers)
-	}
-	if query != nil {
-		req.SetQueryParams(query)
-	}
-	if form != nil {
-		req.SetFormData(form)
-	}
-	if data != nil {
-		req.SetBody(data)
-	}
-	if resp != nil {
-		req.SetResult(resp)
-	}
-	var res *resty.Response
-	var err error
-	switch method {
-	case base.Get:
-		res, err = req.Get(u)
-	case base.Post:
-		res, err = req.Post(u)
-	case base.Patch:
-		res, err = req.Patch(u)
-	case base.Delete:
-		res, err = req.Delete(u)
-	case base.Put:
-		res, err = req.Put(u)
-	default:
-		return nil, base.ErrNotSupport
-	}
-	if err != nil {
-		return nil, err
-	}
-	//log.Debug(res.String())
-	errno := jsoniter.Get(res.Body(), "errno").ToInt()
-	if errno != 0 {
-		if errno == -6 {
-			err = driver.RefreshToken(account)
-			if err != nil {
-				return nil, err
-			}
-			return driver.Request(pathname, method, headers, query, form, data, resp, account)
-		}
-		return nil, fmt.Errorf("errno: %d, refer to https://pan.baidu.com/union/doc/", errno)
-	}
-	return res.Body(), nil
-}
-
-func (driver Baidu) Get(pathname string, params map[string]string, resp interface{}, account *model.Account) ([]byte, error) {
-	return driver.Request(pathname, base.Get, nil, params, nil, nil, resp, account)
-}
-
-func (driver Baidu) Post(pathname string, params map[string]string, data interface{}, resp interface{}, account *model.Account) ([]byte, error) {
-	return driver.Request(pathname, base.Post, nil, params, nil, data, resp, account)
-}
-
-func (driver Baidu) manage(opera string, filelist interface{}, account *model.Account) ([]byte, error) {
-	params := map[string]string{
-		"method": "filemanager",
-		"opera":  opera,
-	}
-	marshal, err := utils.Json.Marshal(filelist)
-	if err != nil {
-		return nil, err
-	}
-	data := fmt.Sprintf("async=0&filelist=%s&ondup=newcopy", string(marshal))
-	return driver.Post("/xpan/file", params, data, nil, account)
-}
-
-func (driver Baidu) GetFiles(dir string, account *model.Account) ([]model.File, error) {
-	dir = utils.Join(account.RootFolder, dir)
-	start := 0
-	limit := 200
-	params := map[string]string{
-		"method": "list",
-		"dir":    dir,
-		"web":    "web",
-	}
-	if account.OrderBy != "" {
-		params["order"] = account.OrderBy
-		if account.OrderDirection == "desc" {
-			params["desc"] = "1"
-		}
-	}
-	res := make([]model.File, 0)
-	for {
-		params["start"] = strconv.Itoa(start)
-		params["limit"] = strconv.Itoa(limit)
-		start += limit
-		var resp ListResp
-		_, err := driver.Get("/xpan/file", params, &resp, account)
-		if err != nil {
-			return nil, err
-		}
-		if len(resp.List) == 0 {
-			break
-		}
-		for _, f := range resp.List {
-			file := model.File{
-				Id:        strconv.FormatInt(f.FsId, 10),
-				Name:      f.ServerFilename,
-				Size:      f.Size,
-				Driver:    driver.Config().Name,
-				UpdatedAt: getTime(f.ServerMtime),
-				Thumbnail: f.Thumbs.Url3,
-			}
-			if f.Isdir == 1 {
-				file.Type = conf.FOLDER
-			} else {
-				file.Type = utils.GetFileType(path.Ext(f.ServerFilename))
-			}
-			res = append(res, file)
-		}
-	}
-	return res, nil
-}
-
-func (driver Baidu) create(path string, size uint64, isdir int, uploadid, block_list string, account *model.Account) ([]byte, error) {
-	params := map[string]string{
-		"method": "create",
-	}
-	data := fmt.Sprintf("path=%s&size=%d&isdir=%d", path, size, isdir)
-	if uploadid != "" {
-		data += fmt.Sprintf("&uploadid=%s&block_list=%s", uploadid, block_list)
-	}
-	return driver.Post("/xpan/file", params, data, nil, account)
-}
-
-func init() {
-	base.RegisterDriver(&Baidu{})
-}

drivers/baidu/driver.go

@@ -1,358 +0,0 @@
-package baidu
-
-import (
-	"bytes"
-	"crypto/md5"
-	"encoding/hex"
-	"fmt"
-	"github.com/Xhofe/alist/conf"
-	"github.com/Xhofe/alist/drivers/base"
-	"github.com/Xhofe/alist/model"
-	"github.com/Xhofe/alist/utils"
-	log "github.com/sirupsen/logrus"
-	"io"
-	"io/ioutil"
-	"math"
-	"os"
-	"path/filepath"
-	"strconv"
-	"strings"
-)
-
-type Baidu struct{}
-
-func (driver Baidu) Config() base.DriverConfig {
-	return base.DriverConfig{
-		Name: "Baidu.Disk",
-	}
-}
-
-func (driver Baidu) Items() []base.Item {
-	return []base.Item{
-		{
-			Name:     "refresh_token",
-			Label:    "refresh token",
-			Type:     base.TypeString,
-			Required: true,
-		},
-		{
-			Name:     "root_folder",
-			Label:    "root folder path",
-			Type:     base.TypeString,
-			Default:  "/",
-			Required: true,
-		},
-		{
-			Name:     "order_by",
-			Label:    "order_by",
-			Type:     base.TypeSelect,
-			Default:  "name",
-			Values:   "name,time,size",
-			Required: false,
-		},
-		{
-			Name:     "order_direction",
-			Label:    "order_direction",
-			Type:     base.TypeSelect,
-			Values:   "asc,desc",
-			Default:  "asc",
-			Required: false,
-		},
-		{
-			Name:     "client_id",
-			Label:    "client id",
-			Default:  "iYCeC9g08h5vuP9UqvPHKKSVrKFXGa1v",
-			Type:     base.TypeString,
-			Required: true,
-		},
-		{
-			Name:     "client_secret",
-			Label:    "client secret",
-			Default:  "jXiFMOPVPCWlO2M5CwWQzffpNPaGTRBG",
-			Type:     base.TypeString,
-			Required: true,
-		},
-	}
-}
-
-func (driver Baidu) Save(account *model.Account, old *model.Account) error {
-	if account == nil {
-		return nil
-	}
-	return driver.RefreshToken(account)
-}
-
-func (driver Baidu) File(path string, account *model.Account) (*model.File, error) {
-	path = utils.ParsePath(path)
-	if path == "/" {
-		return &model.File{
-			Id:        account.RootFolder,
-			Name:      account.Name,
-			Size:      0,
-			Type:      conf.FOLDER,
-			Driver:    driver.Config().Name,
-			UpdatedAt: account.UpdatedAt,
-		}, nil
-	}
-	dir, name := filepath.Split(path)
-	files, err := driver.Files(dir, account)
-	if err != nil {
-		return nil, err
-	}
-	for _, file := range files {
-		if file.Name == name {
-			return &file, nil
-		}
-	}
-	return nil, base.ErrPathNotFound
-}
-
-func (driver Baidu) Files(path string, account *model.Account) ([]model.File, error) {
-	path = utils.ParsePath(path)
-	cache, err := base.GetCache(path, account)
-	if err == nil {
-		files, _ := cache.([]model.File)
-		return files, nil
-	}
-	files, err := driver.GetFiles(path, account)
-	if err != nil {
-		return nil, err
-	}
-	if len(files) > 0 {
-		_ = base.SetCache(path, files, account)
-	}
-	return files, nil
-}
-
-func (driver Baidu) Link(args base.Args, account *model.Account) (*base.Link, error) {
-	file, err := driver.File(args.Path, account)
-	if err != nil {
-		return nil, err
-	}
-	if file.IsDir() {
-		return nil, base.ErrNotFile
-	}
-	var resp DownloadResp
-	params := map[string]string{
-		"method": "filemetas",
-		"fsids":  fmt.Sprintf("[%s]", file.Id),
-		"dlink":  "1",
-	}
-	_, err = driver.Get("/xpan/multimedia", params, &resp, account)
-	if err != nil {
-		return nil, err
-	}
-	u := fmt.Sprintf("%s&access_token=%s", resp.List[0].Dlink, account.AccessToken)
-	res, err := base.NoRedirectClient.R().SetHeader("User-Agent", "pan.baidu.com").Head(u)
-	if err != nil {
-		return nil, err
-	}
-	//if res.StatusCode() == 302 {
-	u = res.Header().Get("location")
-	//}
-	return &base.Link{
-		Url: u,
-		Headers: []base.Header{
-			{Name: "User-Agent", Value: "pan.baidu.com"},
-		}}, nil
-}
-
-func (driver Baidu) Path(path string, account *model.Account) (*model.File, []model.File, error) {
-	file, err := driver.File(path, account)
-	if err != nil {
-		return nil, nil, err
-	}
-	if !file.IsDir() {
-		return file, nil, nil
-	}
-	files, err := driver.Files(path, account)
-	if err != nil {
-		return nil, nil, err
-	}
-	return nil, files, nil
-}
-
-//func (driver Baidu) Proxy(r *http.Request, account *model.Account) {
-//	r.Header.Set("User-Agent", "pan.baidu.com")
-//}
-
-func (driver Baidu) Preview(path string, account *model.Account) (interface{}, error) {
-	return nil, base.ErrNotSupport
-}
-
-func (driver Baidu) MakeDir(path string, account *model.Account) error {
-	_, err := driver.create(utils.Join(account.RootFolder, path), 0, 1, "", "", account)
-	return err
-}
-
-func (driver Baidu) Move(src string, dst string, account *model.Account) error {
-	path := utils.Join(account.RootFolder, src)
-	dest, newname := utils.Split(utils.Join(account.RootFolder, dst))
-	data := []base.Json{
-		{
-			"path":    path,
-			"dest":    dest,
-			"newname": newname,
-		},
-	}
-	_, err := driver.manage("move", data, account)
-	return err
-}
-
-func (driver Baidu) Rename(src string, dst string, account *model.Account) error {
-	path := utils.Join(account.RootFolder, src)
-	newname := utils.Base(dst)
-	data := []base.Json{
-		{
-			"path":    path,
-			"newname": newname,
-		},
-	}
-	_, err := driver.manage("rename", data, account)
-	return err
-}
-
-func (driver Baidu) Copy(src string, dst string, account *model.Account) error {
-	path := utils.Join(account.RootFolder, src)
-	dest, newname := utils.Split(utils.Join(account.RootFolder, dst))
-	data := []base.Json{
-		{
-			"path":    path,
-			"dest":    dest,
-			"newname": newname,
-		},
-	}
-	_, err := driver.manage("copy", data, account)
-	return err
-}
-
-func (driver Baidu) Delete(path string, account *model.Account) error {
-	path = utils.Join(account.RootFolder, path)
-	data := []string{path}
-	_, err := driver.manage("delete", data, account)
-	return err
-}
-
-func (driver Baidu) Upload(file *model.FileStream, account *model.Account) error {
-	if file == nil {
-		return base.ErrEmptyFile
-	}
-	tempFile, err := ioutil.TempFile(conf.Conf.TempDir, "file-*")
-	if err != nil {
-		return err
-	}
-	defer func() {
-		_ = tempFile.Close()
-		_ = os.Remove(tempFile.Name())
-	}()
-	_, err = io.Copy(tempFile, file)
-	if err != nil {
-		return err
-	}
-	_, err = tempFile.Seek(0, io.SeekStart)
-	if err != nil {
-		return err
-	}
-	var Default uint64 = 4 * 1024 * 1024
-	defaultByteData := make([]byte, Default)
-	count := int(math.Ceil(float64(file.GetSize()) / float64(Default)))
-	var SliceSize uint64 = 256 * 1024
-	// cal md5
-	h1 := md5.New()
-	h2 := md5.New()
-	block_list := make([]string, 0)
-	content_md5 := ""
-	slice_md5 := ""
-	left := file.GetSize()
-	for i := 0; i < count; i++ {
-		byteSize := Default
-		var byteData []byte
-		if left < Default {
-			byteSize = left
-			byteData = make([]byte, byteSize)
-		} else {
-			byteData = defaultByteData
-		}
-		left -= byteSize
-		_, err = io.ReadFull(tempFile, byteData)
-		if err != nil {
-			return err
-		}
-		h1.Write(byteData)
-		h2.Write(byteData)
-		block_list = append(block_list, fmt.Sprintf("\"%s\"", hex.EncodeToString(h2.Sum(nil))))
-		h2.Reset()
-	}
-	content_md5 = hex.EncodeToString(h1.Sum(nil))
-	_, err = tempFile.Seek(0, io.SeekStart)
-	if err != nil {
-		return err
-	}
-	if file.GetSize() <= SliceSize {
-		slice_md5 = content_md5
-	} else {
-		sliceData := make([]byte, SliceSize)
-		_, err = io.ReadFull(tempFile, sliceData)
-		if err != nil {
-			return err
-		}
-		h2.Write(sliceData)
-		slice_md5 = hex.EncodeToString(h2.Sum(nil))
-		_, err = tempFile.Seek(0, io.SeekStart)
-		if err != nil {
-			return err
-		}
-	}
-	path := encodeURIComponent(utils.Join(account.RootFolder, file.ParentPath, file.Name))
-	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, file.GetSize(),
-		block_list_str,
-		content_md5, slice_md5)
-	params := map[string]string{
-		"method": "precreate",
-	}
-	var precreateResp PrecreateResp
-	_, err = driver.Post("/xpan/file", params, data, &precreateResp, account)
-	if err != nil {
-		return err
-	}
-	log.Debugf("%+v", precreateResp)
-	if precreateResp.ReturnType == 2 {
-		return nil
-	}
-	params = map[string]string{
-		"method":       "upload",
-		"access_token": account.AccessToken,
-		"type":         "tmpfile",
-		"path":         path,
-		"uploadid":     precreateResp.Uploadid,
-	}
-	left = file.GetSize()
-	for _, partseq := range precreateResp.BlockList {
-		byteSize := Default
-		var byteData []byte
-		if left < Default {
-			byteSize = left
-			byteData = make([]byte, byteSize)
-		} else {
-			byteData = defaultByteData
-		}
-		left -= byteSize
-		_, err = io.ReadFull(tempFile, byteData)
-		if err != nil {
-			return err
-		}
-		u := "https://d.pcs.baidu.com/rest/2.0/pcs/superfile2"
-		params["partseq"] = strconv.Itoa(partseq)
-		res, err := base.RestyClient.R().SetQueryParams(params).SetFileReader("file", file.Name, bytes.NewReader(byteData)).Post(u)
-		if err != nil {
-			return err
-		}
-		log.Debugln(res.String())
-	}
-	_, err = driver.create(path, file.GetSize(), 0, precreateResp.Uploadid, block_list_str, account)
-	return err
-}
-
-var _ base.Driver = (*Baidu)(nil)

drivers/baidu/util.go

@@ -1,18 +0,0 @@
-package baidu
-
-import (
-	"net/url"
-	"strings"
-	"time"
-)
-
-func getTime(t int64) *time.Time {
-	tm := time.Unix(t, 0)
-	return &tm
-}
-
-func encodeURIComponent(str string) string {
-	r := url.QueryEscape(str)
-	r = strings.ReplaceAll(r, "+", "%20")
-	return r
-}

drivers/baidu_netdisk/driver.go

@@ -0,0 +1,250 @@
+package baidu_netdisk
+
+import (
+	"bytes"
+	"context"
+	"crypto/md5"
+	"encoding/hex"
+	"fmt"
+	"io"
+	"math"
+	"os"
+	stdpath "path"
+	"strconv"
+	"strings"
+
+	"github.com/alist-org/alist/v3/drivers/base"
+	"github.com/alist-org/alist/v3/internal/conf"
+	"github.com/alist-org/alist/v3/internal/driver"
+	"github.com/alist-org/alist/v3/internal/errs"
+	"github.com/alist-org/alist/v3/internal/model"
+	"github.com/alist-org/alist/v3/pkg/utils"
+	log "github.com/sirupsen/logrus"
+)
+
+type BaiduNetdisk struct {
+	model.Storage
+	Addition
+	AccessToken string
+}
+
+func (d *BaiduNetdisk) Config() driver.Config {
+	return config
+}
+
+func (d *BaiduNetdisk) GetAddition() driver.Additional {
+	return d.Addition
+}
+
+func (d *BaiduNetdisk) Init(ctx context.Context, storage model.Storage) error {
+	d.Storage = storage
+	err := utils.Json.UnmarshalFromString(d.Storage.Addition, &d.Addition)
+	if err != nil {
+		return err
+	}
+	return d.refreshToken()
+}
+
+func (d *BaiduNetdisk) Drop(ctx context.Context) error {
+	return nil
+}
+
+func (d *BaiduNetdisk) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([]model.Obj, error) {
+	files, err := d.getFiles(dir.GetPath())
+	if err != nil {
+		return nil, err
+	}
+	return utils.SliceConvert(files, func(src File) (model.Obj, error) {
+		return fileToObj(src), nil
+	})
+}
+
+//func (d *BaiduNetdisk) Get(ctx context.Context, path string) (model.Obj, error) {
+//	// this is optional
+//	return nil, errs.NotImplement
+//}
+
+func (d *BaiduNetdisk) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
+	if d.DownloadAPI == "crack" {
+		return d.linkCrack(file, args)
+	}
+	return d.linkOfficial(file, args)
+}
+
+func (d *BaiduNetdisk) MakeDir(ctx context.Context, parentDir model.Obj, dirName string) error {
+	_, err := d.create(stdpath.Join(parentDir.GetPath(), dirName), 0, 1, "", "")
+	return err
+}
+
+func (d *BaiduNetdisk) Move(ctx context.Context, srcObj, dstDir model.Obj) error {
+	data := []base.Json{
+		{
+			"path":    srcObj.GetPath(),
+			"dest":    dstDir.GetPath(),
+			"newname": srcObj.GetName(),
+		},
+	}
+	_, err := d.manage("move", data)
+	return err
+}
+
+func (d *BaiduNetdisk) Rename(ctx context.Context, srcObj model.Obj, newName string) error {
+	data := []base.Json{
+		{
+			"path":    srcObj.GetPath(),
+			"newname": newName,
+		},
+	}
+	_, err := d.manage("rename", data)
+	return err
+}
+
+func (d *BaiduNetdisk) Copy(ctx context.Context, srcObj, dstDir model.Obj) error {
+	dest, newname := stdpath.Split(dstDir.GetPath())
+	data := []base.Json{
+		{
+			"path":    srcObj.GetPath(),
+			"dest":    dest,
+			"newname": newname,
+		},
+	}
+	_, err := d.manage("copy", data)
+	return err
+}
+
+func (d *BaiduNetdisk) Remove(ctx context.Context, obj model.Obj) error {
+	data := []string{obj.GetPath()}
+	_, err := d.manage("delete", data)
+	return err
+}
+
+func (d *BaiduNetdisk) Put(ctx context.Context, dstDir model.Obj, stream model.FileStreamer, up driver.UpdateProgress) error {
+	var tempFile *os.File
+	var err error
+	if f, ok := stream.GetReadCloser().(*os.File); ok {
+		tempFile = f
+	} else {
+		tempFile, err = os.CreateTemp(conf.Conf.TempDir, "file-*")
+		if err != nil {
+			return err
+		}
+		defer func() {
+			_ = tempFile.Close()
+			_ = os.Remove(tempFile.Name())
+		}()
+		_, err = io.Copy(tempFile, stream)
+		if err != nil {
+			return err
+		}
+		_, err = tempFile.Seek(0, io.SeekStart)
+		if err != nil {
+			return err
+		}
+	}
+	var Default int64 = 4 * 1024 * 1024
+	defaultByteData := make([]byte, Default)
+	count := int(math.Ceil(float64(stream.GetSize()) / float64(Default)))
+	var SliceSize int64 = 256 * 1024
+	// cal md5
+	h1 := md5.New()
+	h2 := md5.New()
+	block_list := make([]string, 0)
+	content_md5 := ""
+	slice_md5 := ""
+	left := stream.GetSize()
+	for i := 0; i < count; i++ {
+		byteSize := Default
+		var byteData []byte
+		if left < Default {
+			byteSize = left
+			byteData = make([]byte, byteSize)
+		} else {
+			byteData = defaultByteData
+		}
+		left -= byteSize
+		_, err = io.ReadFull(tempFile, byteData)
+		if err != nil {
+			return err
+		}
+		h1.Write(byteData)
+		h2.Write(byteData)
+		block_list = append(block_list, fmt.Sprintf("\"%s\"", hex.EncodeToString(h2.Sum(nil))))
+		h2.Reset()
+	}
+	content_md5 = hex.EncodeToString(h1.Sum(nil))
+	_, err = tempFile.Seek(0, io.SeekStart)
+	if err != nil {
+		return err
+	}
+	if stream.GetSize() <= SliceSize {
+		slice_md5 = content_md5
+	} else {
+		sliceData := make([]byte, SliceSize)
+		_, err = io.ReadFull(tempFile, sliceData)
+		if err != nil {
+			return err
+		}
+		h2.Write(sliceData)
+		slice_md5 = hex.EncodeToString(h2.Sum(nil))
+		_, err = tempFile.Seek(0, io.SeekStart)
+		if err != nil {
+			return err
+		}
+	}
+	path := encodeURIComponent(stdpath.Join(dstDir.GetPath(), stream.GetName()))
+	block_list_str := fmt.Sprintf("[%s]", strings.Join(block_list, ","))
+	data := fmt.Sprintf("path=%s&size=%d&isdir=0&autoinit=1&block_list=%s&content-md5=%s&slice-md5=%s",
+		path, stream.GetSize(),
+		block_list_str,
+		content_md5, slice_md5)
+	params := map[string]string{
+		"method": "precreate",
+	}
+	var precreateResp PrecreateResp
+	_, err = d.post("/xpan/file", params, data, &precreateResp)
+	if err != nil {
+		return err
+	}
+	log.Debugf("%+v", precreateResp)
+	if precreateResp.ReturnType == 2 {
+		return nil
+	}
+	params = map[string]string{
+		"method":       "upload",
+		"access_token": d.AccessToken,
+		"type":         "tmpfile",
+		"path":         path,
+		"uploadid":     precreateResp.Uploadid,
+	}
+	left = stream.GetSize()
+	for _, partseq := range precreateResp.BlockList {
+		byteSize := Default
+		var byteData []byte
+		if left < Default {
+			byteSize = left
+			byteData = make([]byte, byteSize)
+		} else {
+			byteData = defaultByteData
+		}
+		left -= byteSize
+		_, err = io.ReadFull(tempFile, byteData)
+		if err != nil {
+			return err
+		}
+		u := "https://d.pcs.baidu.com/rest/2.0/pcs/superfile2"
+		params["partseq"] = strconv.Itoa(partseq)
+		res, err := base.RestyClient.R().SetQueryParams(params).SetFileReader("file", stream.GetName(), bytes.NewReader(byteData)).Post(u)
+		if err != nil {
+			return err
+		}
+		log.Debugln(res.String())
+	}
+	_, err = d.create(path, stream.GetSize(), 0, precreateResp.Uploadid, block_list_str)
+	return err
+}
+
+func (d *BaiduNetdisk) Other(ctx context.Context, args model.OtherArgs) (interface{}, error) {
+	return nil, errs.NotSupport
+}
+
+var _ driver.Driver = (*BaiduNetdisk)(nil)

drivers/baidu_netdisk/meta.go

@@ -0,0 +1,29 @@
+package baidu_netdisk
+
+import (
+	"github.com/alist-org/alist/v3/internal/driver"
+	"github.com/alist-org/alist/v3/internal/op"
+)
+
+type Addition struct {
+	RefreshToken string `json:"refresh_token" required:"true"`
+	driver.RootPath
+	OrderBy        string `json:"order_by" type:"select" options:"name,time,size" default:"name"`
+	OrderDirection string `json:"order_direction" type:"select" options:"asc,desc" default:"asc"`
+	DownloadAPI    string `json:"download_api" type:"select" options:"official,crack" default:"official"`
+	ClientID       string `json:"client_id" required:"true" default:"iYCeC9g08h5vuP9UqvPHKKSVrKFXGa1v"`
+	ClientSecret   string `json:"client_secret" required:"true" default:"jXiFMOPVPCWlO2M5CwWQzffpNPaGTRBG"`
+}
+
+var config = driver.Config{
+	Name:        "BaiduNetdisk",
+	DefaultRoot: "/",
+}
+
+func New() driver.Driver {
+	return &BaiduNetdisk{}
+}
+
+func init() {
+	op.RegisterDriver(config, New)
+}

drivers/baidu_netdisk/types.go

@@ -1,4 +1,11 @@
-package baidu
+package baidu_netdisk
+
+import (
+	"strconv"
+	"time"
+
+	"github.com/alist-org/alist/v3/internal/model"
+)
 
 type TokenErrResp struct {
 	ErrorDescription string `json:"error_description"`
@@ -36,6 +43,19 @@ type File struct {
 	Isdir int `json:"isdir"`
 }
 
+func fileToObj(f File) *model.ObjThumb {
+	return &model.ObjThumb{
+		Object: model.Object{
+			ID:       strconv.FormatInt(f.FsId, 10),
+			Name:     f.ServerFilename,
+			Size:     f.Size,
+			Modified: time.Unix(f.ServerMtime, 0),
+			IsFolder: f.Isdir == 1,
+		},
+		Thumbnail: model.Thumbnail{Thumbnail: f.Thumbs.Url3},
+	}
+}
+
 type ListResp struct {
 	Errno     int    `json:"errno"`
 	GuidInfo  string `json:"guid_info"`
@@ -74,6 +94,65 @@ type DownloadResp struct {
 	RequestId string `json:"request_id"`
 }
 
+type DownloadResp2 struct {
+	Errno int `json:"errno"`
+	Info  []struct {
+		//ExtentTinyint4 int `json:"extent_tinyint4"`
+		//ExtentTinyint1 int `json:"extent_tinyint1"`
+		//Bitmap string `json:"bitmap"`
+		//Category int `json:"category"`
+		//Isdir int `json:"isdir"`
+		//Videotag int `json:"videotag"`
+		Dlink string `json:"dlink"`
+		//OperID int64 `json:"oper_id"`
+		//PathMd5 int `json:"path_md5"`
+		//Wpfile int `json:"wpfile"`
+		//LocalMtime int `json:"local_mtime"`
+		/*Thumbs struct {
+			Icon string `json:"icon"`
+			URL3 string `json:"url3"`
+			URL2 string `json:"url2"`
+			URL1 string `json:"url1"`
+		} `json:"thumbs"`*/
+		//PlaySource int `json:"play_source"`
+		//Share int `json:"share"`
+		//FileKey string `json:"file_key"`
+		//Errno int `json:"errno"`
+		//LocalCtime int `json:"local_ctime"`
+		//Rotate int `json:"rotate"`
+		//Metadata time.Time `json:"metadata"`
+		//Height int `json:"height"`
+		//SampleRate int `json:"sample_rate"`
+		//Width int `json:"width"`
+		//OwnerType int `json:"owner_type"`
+		//Privacy int `json:"privacy"`
+		//ExtentInt3 int64 `json:"extent_int3"`
+		//RealCategory string `json:"real_category"`
+		//SrcLocation string `json:"src_location"`
+		//MetaInfo string `json:"meta_info"`
+		//ID string `json:"id"`
+		//Duration int `json:"duration"`
+		//FileSize string `json:"file_size"`
+		//Channels int `json:"channels"`
+		//UseSegment int `json:"use_segment"`
+		//ServerCtime int `json:"server_ctime"`
+		//Resolution string `json:"resolution"`
+		//OwnerID int `json:"owner_id"`
+		//ExtraInfo string `json:"extra_info"`
+		//Size int `json:"size"`
+		//FsID int64 `json:"fs_id"`
+		//ExtentTinyint3 int `json:"extent_tinyint3"`
+		//Md5 string `json:"md5"`
+		//Path string `json:"path"`
+		//FrameRate int `json:"frame_rate"`
+		//ExtentTinyint2 int `json:"extent_tinyint2"`
+		//ServerFilename string `json:"server_filename"`
+		//ServerMtime int `json:"server_mtime"`
+		//TkbindID int `json:"tkbind_id"`
+	} `json:"info"`
+	RequestID int64 `json:"request_id"`
+}
+
 type PrecreateResp struct {
 	Path       string `json:"path"`
 	Uploadid   string `json:"uploadid"`

drivers/baidu_netdisk/util.go

@@ -0,0 +1,201 @@
+package baidu_netdisk
+
+import (
+	"fmt"
+	"net/http"
+	"net/url"
+	"strconv"
+	"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/go-resty/resty/v2"
+)
+
+// do others that not defined in Driver interface
+
+func (d *BaiduNetdisk) refreshToken() error {
+	err := d._refreshToken()
+	if err != nil && err == errs.EmptyToken {
+		err = d._refreshToken()
+	}
+	return err
+}
+
+func (d *BaiduNetdisk) _refreshToken() error {
+	u := "https://openapi.baidu.com/oauth/2.0/token"
+	var resp base.TokenResp
+	var e TokenErrResp
+	_, err := base.RestyClient.R().SetResult(&resp).SetError(&e).SetQueryParams(map[string]string{
+		"grant_type":    "refresh_token",
+		"refresh_token": d.RefreshToken,
+		"client_id":     d.ClientID,
+		"client_secret": d.ClientSecret,
+	}).Get(u)
+	if err != nil {
+		return err
+	}
+	if e.Error != "" {
+		return fmt.Errorf("%s : %s", e.Error, e.ErrorDescription)
+	}
+	if resp.RefreshToken == "" {
+		return errs.EmptyToken
+	}
+	d.AccessToken, d.RefreshToken = resp.AccessToken, resp.RefreshToken
+	op.MustSaveDriverStorage(d)
+	return nil
+}
+
+func (d *BaiduNetdisk) request(furl string, method string, callback base.ReqCallback, resp interface{}) ([]byte, error) {
+	req := base.RestyClient.R()
+	req.SetQueryParam("access_token", d.AccessToken)
+	if callback != nil {
+		callback(req)
+	}
+	if resp != nil {
+		req.SetResult(resp)
+	}
+	res, err := req.Execute(method, furl)
+	if err != nil {
+		return nil, err
+	}
+	errno := utils.Json.Get(res.Body(), "errno").ToInt()
+	if errno != 0 {
+		if errno == -6 {
+			err = d.refreshToken()
+			if err != nil {
+				return nil, err
+			}
+			return d.request(furl, method, callback, resp)
+		}
+		return nil, fmt.Errorf("errno: %d, refer to https://pan.baidu.com/union/doc/", errno)
+	}
+	return res.Body(), nil
+}
+
+func (d *BaiduNetdisk) get(pathname string, params map[string]string, resp interface{}) ([]byte, error) {
+	return d.request("https://pan.baidu.com/rest/2.0"+pathname, http.MethodGet, func(req *resty.Request) {
+		req.SetQueryParams(params)
+	}, resp)
+}
+
+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.SetBody(data)
+	}, resp)
+}
+
+func (d *BaiduNetdisk) getFiles(dir string) ([]File, error) {
+	start := 0
+	limit := 200
+	params := map[string]string{
+		"method": "list",
+		"dir":    dir,
+		"web":    "web",
+	}
+	if d.OrderBy != "" {
+		params["order"] = d.OrderBy
+		if d.OrderDirection == "desc" {
+			params["desc"] = "1"
+		}
+	}
+	res := make([]File, 0)
+	for {
+		params["start"] = strconv.Itoa(start)
+		params["limit"] = strconv.Itoa(limit)
+		start += limit
+		var resp ListResp
+		_, err := d.get("/xpan/file", params, &resp)
+		if err != nil {
+			return nil, err
+		}
+		if len(resp.List) == 0 {
+			break
+		}
+		res = append(res, resp.List...)
+	}
+	return res, nil
+}
+
+func (d *BaiduNetdisk) linkOfficial(file model.Obj, args model.LinkArgs) (*model.Link, error) {
+	var resp DownloadResp
+	params := map[string]string{
+		"method": "filemetas",
+		"fsids":  fmt.Sprintf("[%s]", file.GetID()),
+		"dlink":  "1",
+	}
+	_, err := d.get("/xpan/multimedia", params, &resp)
+	if err != nil {
+		return nil, err
+	}
+	u := fmt.Sprintf("%s&access_token=%s", resp.List[0].Dlink, d.AccessToken)
+	res, err := base.NoRedirectClient.R().SetHeader("User-Agent", "pan.baidu.com").Head(u)
+	if err != nil {
+		return nil, err
+	}
+	//if res.StatusCode() == 302 {
+	u = res.Header().Get("location")
+	//}
+	return &model.Link{
+		URL: u,
+		Header: http.Header{
+			"User-Agent": []string{"pan.baidu.com"},
+		},
+	}, nil
+}
+
+func (d *BaiduNetdisk) linkCrack(file model.Obj, args model.LinkArgs) (*model.Link, error) {
+	var resp DownloadResp2
+	param := map[string]string{
+		"target": fmt.Sprintf("[\"%s\"]", file.GetPath()),
+		"dlink":  "1",
+		"web":    "5",
+		"origin": "dlna",
+	}
+	_, err := d.request("https://pan.baidu.com/api/filemetas", http.MethodGet, func(req *resty.Request) {
+		req.SetQueryParams(param)
+	}, &resp)
+	if err != nil {
+		return nil, err
+	}
+	return &model.Link{
+		URL: resp.Info[0].Dlink,
+		Header: http.Header{
+			"User-Agent": []string{"pan.baidu.com"},
+		},
+	}, nil
+}
+
+func (d *BaiduNetdisk) manage(opera string, filelist interface{}) ([]byte, error) {
+	params := map[string]string{
+		"method": "filemanager",
+		"opera":  opera,
+	}
+	marshal, err := utils.Json.Marshal(filelist)
+	if err != nil {
+		return nil, err
+	}
+	data := fmt.Sprintf("async=0&filelist=%s&ondup=newcopy", string(marshal))
+	return d.post("/xpan/file", params, data, nil)
+}
+
+func (d *BaiduNetdisk) create(path string, size int64, isdir int, uploadid, block_list string) ([]byte, error) {
+	params := map[string]string{
+		"method": "create",
+	}
+	data := fmt.Sprintf("path=%s&size=%d&isdir=%d", path, size, isdir)
+	if uploadid != "" {
+		data += fmt.Sprintf("&uploadid=%s&block_list=%s", uploadid, block_list)
+	}
+	return d.post("/xpan/file", params, data, nil)
+}
+
+func encodeURIComponent(str string) string {
+	r := url.QueryEscape(str)
+	r = strings.ReplaceAll(r, "+", "%20")
+	return r
+}

drivers/base/cache.go

@@ -1,28 +0,0 @@
-package base
-
-import (
-	"fmt"
-	"github.com/Xhofe/alist/conf"
-	"github.com/Xhofe/alist/model"
-	"github.com/Xhofe/alist/utils"
-	log "github.com/sirupsen/logrus"
-)
-
-func KeyCache(path string, account *model.Account) string {
-	path = utils.ParsePath(path)
-	return fmt.Sprintf("%s%s", account.Name, path)
-}
-
-func SetCache(path string, obj interface{}, account *model.Account) error {
-	return conf.Cache.Set(conf.Ctx, KeyCache(path, account), obj, nil)
-}
-
-func GetCache(path string, account *model.Account) (interface{}, error) {
-	return conf.Cache.Get(conf.Ctx, KeyCache(path, account))
-}
-
-func DeleteCache(path string, account *model.Account) error {
-	err := conf.Cache.Delete(conf.Ctx, KeyCache(path, account))
-	log.Debugf("delete cache %s: %+v", path, err)
-	return err
-}

drivers/base/client.go

@@ -0,0 +1,30 @@
+package base
+
+import (
+	"net/http"
+	"time"
+
+	"github.com/go-resty/resty/v2"
+)
+
+var NoRedirectClient *resty.Client
+var RestyClient = NewRestyClient()
+var HttpClient = &http.Client{}
+var UserAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36"
+var DefaultTimeout = time.Second * 10
+
+func init() {
+	NoRedirectClient = resty.New().SetRedirectPolicy(
+		resty.RedirectPolicyFunc(func(req *http.Request, via []*http.Request) error {
+			return http.ErrUseLastResponse
+		}),
+	)
+	NoRedirectClient.SetHeader("user-agent", UserAgent)
+}
+
+func NewRestyClient() *resty.Client {
+	return resty.New().
+		SetHeader("user-agent", UserAgent).
+		SetRetryCount(3).
+		SetTimeout(DefaultTimeout)
+}

drivers/base/driver.go

@@ -1,180 +0,0 @@
-package base
-
-import (
-	"github.com/Xhofe/alist/model"
-	"github.com/go-resty/resty/v2"
-	log "github.com/sirupsen/logrus"
-	"net/http"
-	"time"
-)
-
-type DriverConfig struct {
-	Name          string
-	OnlyProxy     bool // 必须使用代理（本机或者其他机器）
-	OnlyLocal     bool // 必须本机返回的
-	ApiProxy      bool // 使用API中转的
-	NoNeedSetLink bool // 不需要设置链接的
-	NoCors        bool // 不可以跨域
-	LocalSort     bool // 本地排序
-}
-
-type Args struct {
-	Path string
-	IP   string
-}
-
-type Driver interface {
-	// Config 配置
-	Config() DriverConfig
-	// Items 账号所需参数
-	Items() []Item
-	// Save 保存时处理
-	Save(account *model.Account, old *model.Account) error
-	// File 取文件
-	File(path string, account *model.Account) (*model.File, error)
-	// Files 取文件夹
-	Files(path string, account *model.Account) ([]model.File, error)
-	// Link 取链接
-	Link(args Args, account *model.Account) (*Link, error)
-	// Path 取路径（文件或文件夹）
-	Path(path string, account *model.Account) (*model.File, []model.File, error)
-	// Deprecated Proxy 代理处理
-	//Proxy(r *http.Request, account *model.Account)
-	// Preview 预览
-	Preview(path string, account *model.Account) (interface{}, error)
-	// MakeDir 创建文件夹
-	MakeDir(path string, account *model.Account) error
-	// Move 移动/改名
-	Move(src string, dst string, account *model.Account) error
-	// Rename 改名
-	Rename(src string, dst string, account *model.Account) error
-	// Copy 拷贝
-	Copy(src string, dst string, account *model.Account) error
-	// Delete 删除
-	Delete(path string, account *model.Account) error
-	// Upload 上传
-	Upload(file *model.FileStream, account *model.Account) error
-	// TODO
-	//Search(path string, keyword string, account *model.Account) ([]*model.File, error)
-}
-
-type Item struct {
-	Name        string `json:"name"`
-	Label       string `json:"label"`
-	Type        string `json:"type"`
-	Default     string `json:"default"`
-	Values      string `json:"values"`
-	Required    bool   `json:"required"`
-	Description string `json:"description"`
-}
-
-var driversMap = map[string]Driver{}
-
-func RegisterDriver(driver Driver) {
-	log.Infof("register driver: [%s]", driver.Config().Name)
-	driversMap[driver.Config().Name] = driver
-}
-
-func GetDriver(name string) (driver Driver, ok bool) {
-	driver, ok = driversMap[name]
-	return
-}
-
-func GetDriversMap() map[string]Driver {
-	return driversMap
-}
-
-func GetDrivers() map[string][]Item {
-	res := make(map[string][]Item)
-	for k, v := range driversMap {
-		webdavDirect := Item{
-			Name:        "webdav_direct",
-			Label:       "webdav direct",
-			Type:        TypeBool,
-			Required:    true,
-			Description: "Transfer the WebDAV of this account through the native",
-		}
-		if v.Config().OnlyProxy {
-			res[k] = append([]Item{
-				webdavDirect,
-			}, v.Items()...)
-		} else {
-			res[k] = append([]Item{
-				{
-					Name:        "proxy",
-					Label:       "proxy",
-					Type:        TypeBool,
-					Required:    true,
-					Description: "web proxy",
-				},
-				{
-					Name:        "webdav_proxy",
-					Label:       "webdav proxy",
-					Type:        TypeBool,
-					Required:    true,
-					Description: "Transfer the WebDAV of this account through the server",
-				},
-				webdavDirect,
-			}, v.Items()...)
-		}
-		res[k] = append([]Item{
-			{
-				Name:  "down_proxy_url",
-				Label: "down_proxy_url",
-				Type:  TypeText,
-			},
-			{
-				Name:   "extract_folder",
-				Label:  "extract_folder",
-				Values: "front,back",
-				Type:   TypeSelect,
-			},
-		}, res[k]...)
-		if v.Config().ApiProxy {
-			res[k] = append([]Item{
-				{
-					Name:  "api_proxy_url",
-					Label: "api_proxy_url",
-					Type:  TypeString,
-				},
-			}, res[k]...)
-		}
-		if v.Config().LocalSort {
-			res[k] = append(res[k], []Item{
-				{
-					Name:     "order_by",
-					Label:    "order_by",
-					Type:     TypeSelect,
-					Values:   "name,size,updated_at",
-					Required: false,
-				},
-				{
-					Name:     "order_direction",
-					Label:    "order_direction",
-					Type:     TypeSelect,
-					Values:   "ASC,DESC",
-					Required: false,
-				},
-			}...)
-		}
-	}
-	return res
-}
-
-var NoRedirectClient *resty.Client
-var RestyClient = resty.New()
-var HttpClient = &http.Client{}
-var UserAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36"
-var DefaultTimeout = time.Second * 20
-
-func init() {
-	NoRedirectClient = resty.New().SetRedirectPolicy(
-		resty.RedirectPolicyFunc(func(req *http.Request, via []*http.Request) error {
-			return http.ErrUseLastResponse
-		}),
-	)
-	NoRedirectClient.SetHeader("user-agent", UserAgent)
-	RestyClient.SetHeader("user-agent", UserAgent)
-	RestyClient.SetRetryCount(3)
-	RestyClient.SetTimeout(DefaultTimeout)
-}

drivers/base/types.go

@@ -1,36 +1,6 @@
 package base
 
-import (
-	"errors"
-	"io"
-)
-
-var (
-	ErrPathNotFound = errors.New("path not found")
-	ErrNotFile      = errors.New("not file")
-	ErrNotImplement = errors.New("not implement")
-	ErrNotSupport   = errors.New("not support")
-	ErrNotFolder    = errors.New("not a folder")
-	ErrEmptyFile    = errors.New("empty file")
-	ErrRelativePath = errors.New("access using relative path is not allowed")
-	ErrEmptyToken   = errors.New("empty token")
-)
-
-const (
-	TypeString = "string"
-	TypeSelect = "select"
-	TypeBool   = "bool"
-	TypeNumber = "number"
-	TypeText   = "text"
-)
-
-const (
-	Get = iota
-	Post
-	Put
-	Delete
-	Patch
-)
+import "github.com/go-resty/resty/v2"
 
 type Json map[string]interface{}
 
@@ -39,14 +9,4 @@ type TokenResp struct {
 	RefreshToken string `json:"refresh_token"`
 }
 
-type Header struct {
-	Name  string `json:"name"`
-	Value string `json:"value"`
-}
-
-type Link struct {
-	Url      string   `json:"url"`
-	Headers  []Header `json:"headers"`
-	Data     io.ReadCloser
-	FilePath string `json:"path"` // for native
-}
+type ReqCallback func(req *resty.Request)

drivers/ftp/driver.go

@@ -1,254 +1,134 @@
 package ftp
 
 import (
-	"github.com/Xhofe/alist/conf"
-	"github.com/Xhofe/alist/drivers/base"
-	"github.com/Xhofe/alist/model"
-	"github.com/Xhofe/alist/utils"
+	"context"
+	stdpath "path"
+
+	"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/jlaffaye/ftp"
-	log "github.com/sirupsen/logrus"
-	"path/filepath"
 )
 
-type FTP struct{}
-
-func (driver FTP) Config() base.DriverConfig {
-	return base.DriverConfig{
-		Name:          "FTP",
-		OnlyProxy:     true,
-		OnlyLocal:     true,
-		NoNeedSetLink: true,
-		LocalSort:     true,
-	}
+type FTP struct {
+	model.Storage
+	Addition
+	conn *ftp.ServerConn
 }
 
-func (driver FTP) Items() []base.Item {
-	return []base.Item{
-		{
-			Name:     "site_url",
-			Label:    "ftp host url",
-			Type:     base.TypeString,
-			Required: true,
-		},
-		{
-			Name:     "username",
-			Label:    "username",
-			Type:     base.TypeString,
-			Required: true,
-		},
-		{
-			Name:     "password",
-			Label:    "password",
-			Type:     base.TypeString,
-			Required: true,
-		},
-		{
-			Name:     "root_folder",
-			Label:    "root folder path",
-			Type:     base.TypeString,
-			Required: false,
-		},
-	}
+func (d *FTP) Config() driver.Config {
+	return config
 }
 
-func (driver FTP) Save(account *model.Account, old *model.Account) error {
-	if old != nil {
-		conn, ok := connMap[old.Name]
-		if ok {
-			err := conn.Quit()
-			log.Error("ftp:", err)
-			delete(connMap, old.Name)
-		}
-	}
-	if account == nil {
-		return nil
-	}
-	if account.RootFolder == "" {
-		account.RootFolder = "/"
-	}
-	_, err := driver.Login(account)
+func (d *FTP) GetAddition() driver.Additional {
+	return d.Addition
+}
+
+func (d *FTP) Init(ctx context.Context, storage model.Storage) error {
+	d.Storage = storage
+	err := utils.Json.UnmarshalFromString(d.Storage.Addition, &d.Addition)
 	if err != nil {
-		account.Status = err.Error()
-	} else {
-		account.Status = "work"
-	}
-	_ = model.SaveAccount(account)
 		return err
+	}
+	return d.login()
 }
 
-func (driver FTP) File(path string, account *model.Account) (*model.File, error) {
-	log.Debugf("file: %s", path)
-	path = utils.ParsePath(path)
-	if path == "/" {
-		return &model.File{
-			Id:        account.RootFolder,
-			Name:      account.Name,
-			Size:      0,
-			Type:      conf.FOLDER,
-			Driver:    driver.Config().Name,
-			UpdatedAt: account.UpdatedAt,
-		}, nil
+func (d *FTP) Drop(ctx context.Context) error {
+	if d.conn != nil {
+		_ = d.conn.Logout()
 	}
-	dir, name := filepath.Split(path)
-	files, err := driver.Files(dir, account)
-	if err != nil {
-		return nil, err
-	}
-	for _, file := range files {
-		if file.Name == name {
-			return &file, nil
-		}
-	}
-	return nil, base.ErrPathNotFound
+	return nil
 }
 
-func (driver FTP) Files(path string, account *model.Account) ([]model.File, error) {
-	log.Debugf("files: %s", path)
-	path = utils.ParsePath(path)
-	cache, err := base.GetCache(path, account)
-	if err == nil {
-		files, _ := cache.([]model.File)
-		return files, nil
+func (d *FTP) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([]model.Obj, error) {
+	if err := d.login(); err != nil {
+		return nil, err
 	}
-	realPath := utils.Join(account.RootFolder, path)
-	conn, err := driver.Login(account)
+	entries, err := d.conn.List(dir.GetPath())
 	if err != nil {
 		return nil, err
 	}
-	//defer func() { _ = conn.Quit() }()
-	entries, err := conn.List(realPath)
-	if err != nil {
-		return nil, err
-	}
-	res := make([]model.File, 0)
+	res := make([]model.Obj, 0)
 	for i, _ := range entries {
 		entry := entries[i]
 		if entry.Name == "." || entry.Name == ".." {
 			continue
 		}
-		f := model.File{
+		f := model.Object{
 			Name:     entry.Name,
 			Size:     int64(entry.Size),
-			UpdatedAt: &entry.Time,
-			Driver:    driver.Config().Name,
+			Modified: entry.Time,
+			IsFolder: entry.Type == ftp.EntryTypeFolder,
 		}
-		if entry.Type == ftp.EntryTypeFolder {
-			f.Type = conf.FOLDER
-		} else {
-			f.Type = utils.GetFileType(filepath.Ext(entry.Name))
-		}
-		res = append(res, f)
-	}
-	if len(res) > 0 {
-		_ = base.SetCache(path, res, account)
+		res = append(res, &f)
 	}
 	return res, nil
 }
 
-func (driver FTP) Link(args base.Args, account *model.Account) (*base.Link, error) {
-	path := args.Path
-	path = utils.ParsePath(path)
-	realPath := utils.Join(account.RootFolder, path)
-	conn, err := driver.Login(account)
+//func (d *FTP) Get(ctx context.Context, path string) (model.Obj, error) {
+//	// this is optional
+//	return nil, errs.NotImplement
+//}
+
+func (d *FTP) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
+	if err := d.login(); err != nil {
+		return nil, err
+	}
+	resp, err := d.conn.Retr(file.GetPath())
 	if err != nil {
 		return nil, err
 	}
-	//defer func() { _ = conn.Quit() }()
-	resp, err := conn.Retr(realPath)
-	if err != nil {
-		return nil, err
-	}
-	//defer func() { _ = resp.Close() }()
-	//data, err := ioutil.ReadAll(resp)
-	//if err != nil {
-	//	return nil, err
-	//}
-	return &base.Link{
+	return &model.Link{
 		Data: resp,
 	}, nil
 }
 
-func (driver FTP) Path(path string, account *model.Account) (*model.File, []model.File, error) {
-	log.Debugf("ftp path: %s", path)
-	file, err := driver.File(path, account)
-	if err != nil {
-		return nil, nil, err
-	}
-	if !file.IsDir() {
-		//file.Url, _ = driver.Link(path, account)
-		return file, nil, nil
-	}
-	files, err := driver.Files(path, account)
-	if err != nil {
-		return nil, nil, err
-	}
-	return nil, files, nil
-}
-
-//func (driver FTP) Proxy(r *http.Request, account *model.Account) {
-//
-//}
-
-func (driver FTP) Preview(path string, account *model.Account) (interface{}, error) {
-	return nil, base.ErrNotSupport
-}
-
-func (driver FTP) MakeDir(path string, account *model.Account) error {
-	path = utils.ParsePath(path)
-	realPath := utils.Join(account.RootFolder, path)
-	conn, err := driver.Login(account)
-	if err != nil {
+func (d *FTP) MakeDir(ctx context.Context, parentDir model.Obj, dirName string) error {
+	if err := d.login(); err != nil {
 		return err
 	}
-	//defer func() { _ = conn.Quit() }()
-	err = conn.MakeDir(realPath)
-	return err
+	return d.conn.MakeDir(stdpath.Join(parentDir.GetPath(), dirName))
 }
 
-func (driver FTP) Move(src string, dst string, account *model.Account) error {
-	realSrc := utils.Join(account.RootFolder, src)
-	realDst := utils.Join(account.RootFolder, dst)
-	conn, err := driver.Login(account)
-	if err != nil {
+func (d *FTP) Move(ctx context.Context, srcObj, dstDir model.Obj) error {
+	if err := d.login(); err != nil {
 		return err
 	}
-	//defer func() { _ = conn.Quit() }()
-	err = conn.Rename(realSrc, realDst)
-	return err
+	return d.conn.Rename(srcObj.GetPath(), stdpath.Join(dstDir.GetPath(), srcObj.GetName()))
 }
 
-func (driver FTP) Rename(src string, dst string, account *model.Account) error {
-	return driver.Move(src, dst, account)
-}
-
-func (driver FTP) Copy(src string, dst string, account *model.Account) error {
-	return base.ErrNotSupport
-}
-
-func (driver FTP) Delete(path string, account *model.Account) error {
-	path = utils.ParsePath(path)
-	realPath := utils.Join(account.RootFolder, path)
-	conn, err := driver.Login(account)
-	if err != nil {
+func (d *FTP) Rename(ctx context.Context, srcObj model.Obj, newName string) error {
+	if err := d.login(); err != nil {
 		return err
 	}
-	//defer func() { _ = conn.Quit() }()
-	err = conn.Delete(realPath)
-	return err
+	return d.conn.Rename(srcObj.GetPath(), stdpath.Join(stdpath.Dir(srcObj.GetPath()), newName))
 }
 
-func (driver FTP) Upload(file *model.FileStream, account *model.Account) error {
-	if file == nil {
-		return base.ErrEmptyFile
-	}
-	realPath := utils.Join(account.RootFolder, file.ParentPath, file.Name)
-	conn, err := driver.Login(account)
-	if err != nil {
-		return err
-	}
-	//defer func() { _ = conn.Quit() }()
-	err = conn.Stor(realPath, file)
-	return err
+func (d *FTP) Copy(ctx context.Context, srcObj, dstDir model.Obj) error {
+	return errs.NotSupport
 }
 
-var _ base.Driver = (*FTP)(nil)
+func (d *FTP) Remove(ctx context.Context, obj model.Obj) error {
+	if err := d.login(); err != nil {
+		return err
+	}
+	if obj.IsDir() {
+		return d.conn.RemoveDirRecur(obj.GetPath())
+	} else {
+		return d.conn.Delete(obj.GetPath())
+	}
+}
+
+func (d *FTP) Put(ctx context.Context, dstDir model.Obj, stream model.FileStreamer, up driver.UpdateProgress) error {
+	if err := d.login(); err != nil {
+		return err
+	}
+	return d.conn.Stor(stdpath.Join(dstDir.GetPath(), stream.GetName()), stream)
+}
+
+func (d *FTP) Other(ctx context.Context, args model.OtherArgs) (interface{}, error) {
+	return nil, errs.NotSupport
+}
+
+var _ driver.Driver = (*FTP)(nil)

drivers/ftp/ftp.go

@@ -1,36 +0,0 @@
-package ftp
-
-import (
-	"github.com/Xhofe/alist/drivers/base"
-	"github.com/Xhofe/alist/model"
-	"github.com/jlaffaye/ftp"
-)
-
-var connMap map[string]*ftp.ServerConn
-
-func (driver FTP) Login(account *model.Account) (*ftp.ServerConn, error) {
-	conn, ok := connMap[account.Name]
-	if ok {
-		_, err := conn.CurrentDir()
-		if err == nil {
-			return conn, nil
-		} else {
-			delete(connMap, account.Name)
-		}
-	}
-	conn, err := ftp.Connect(account.SiteUrl)
-	if err != nil {
-		return nil, err
-	}
-	err = conn.Login(account.Username, account.Password)
-	if err != nil {
-		return nil, err
-	}
-	connMap[account.Name] = conn
-	return conn, nil
-}
-
-func init() {
-	base.RegisterDriver(&FTP{})
-	connMap = make(map[string]*ftp.ServerConn)
-}

drivers/ftp/meta.go

@@ -0,0 +1,28 @@
+package ftp
+
+import (
+	"github.com/alist-org/alist/v3/internal/driver"
+	"github.com/alist-org/alist/v3/internal/op"
+)
+
+type Addition struct {
+	Address  string `json:"address" required:"true"`
+	Username string `json:"username" required:"true"`
+	Password string `json:"password" required:"true"`
+	driver.RootPath
+}
+
+var config = driver.Config{
+	Name:        "FTP",
+	LocalSort:   true,
+	OnlyLocal:   true,
+	DefaultRoot: "/",
+}
+
+func New() driver.Driver {
+	return &FTP{}
+}
+
+func init() {
+	op.RegisterDriver(config, New)
+}

drivers/ftp/types.go

@@ -0,0 +1 @@
+package ftp

drivers/ftp/util.go

@@ -0,0 +1,23 @@
+package ftp
+
+import "github.com/jlaffaye/ftp"
+
+// do others that not defined in Driver interface
+
+func (d *FTP) login() error {
+	if d.conn != nil {
+		_, err := d.conn.CurrentDir()
+		if err == nil {
+			return nil
+		}
+	}
+	conn, err := ftp.Dial(d.Address)
+	if err != nil {
+		return err
+	}
+	err = conn.Login(d.Username, d.Password)
+	if err != nil {
+		return err
+	}
+	return nil
+}

drivers/google/driver.go

@@ -1,289 +0,0 @@
-package google
-
-import (
-	"fmt"
-	"github.com/Xhofe/alist/conf"
-	"github.com/Xhofe/alist/drivers/base"
-	"github.com/Xhofe/alist/model"
-	"github.com/Xhofe/alist/utils"
-	log "github.com/sirupsen/logrus"
-	"io/ioutil"
-	"path/filepath"
-)
-
-type GoogleDrive struct{}
-
-func (driver GoogleDrive) Config() base.DriverConfig {
-	return base.DriverConfig{
-		Name:          "GoogleDrive",
-		OnlyProxy:     true,
-		ApiProxy:      true,
-		NoNeedSetLink: true,
-	}
-}
-
-func (driver GoogleDrive) Items() []base.Item {
-	return []base.Item{
-		{
-			Name:     "client_id",
-			Label:    "client id",
-			Type:     base.TypeString,
-			Required: true,
-			Default:  "202264815644.apps.googleusercontent.com",
-		},
-		{
-			Name:     "client_secret",
-			Label:    "client secret",
-			Type:     base.TypeString,
-			Required: true,
-			Default:  "X4Z3ca8xfWDb1Voo-F9a7ZxJ",
-		},
-		{
-			Name:     "refresh_token",
-			Label:    "refresh token",
-			Type:     base.TypeString,
-			Required: true,
-		},
-		{
-			Name:     "root_folder",
-			Label:    "root folder file_id",
-			Type:     base.TypeString,
-			Required: false,
-		},
-		{
-			Name:        "order_by",
-			Label:       "order_by",
-			Type:        base.TypeString,
-			Required:    false,
-			Description: "such as: folder,name,modifiedTime",
-		},
-		{
-			Name:     "order_direction",
-			Label:    "order_direction",
-			Type:     base.TypeSelect,
-			Values:   "asc,desc",
-			Required: false,
-		},
-	}
-}
-
-func (driver GoogleDrive) Save(account *model.Account, old *model.Account) error {
-	if account == nil {
-		return nil
-	}
-	account.Proxy = true
-	err := driver.RefreshToken(account)
-	if err != nil {
-		account.Status = err.Error()
-		_ = model.SaveAccount(account)
-		return err
-	}
-	if account.RootFolder == "" {
-		account.RootFolder = "root"
-	}
-	account.Status = "work"
-	_ = model.SaveAccount(account)
-	return nil
-}
-
-func (driver GoogleDrive) File(path string, account *model.Account) (*model.File, error) {
-	path = utils.ParsePath(path)
-	if path == "/" {
-		return &model.File{
-			Id:        account.RootFolder,
-			Name:      account.Name,
-			Size:      0,
-			Type:      conf.FOLDER,
-			Driver:    driver.Config().Name,
-			UpdatedAt: account.UpdatedAt,
-		}, nil
-	}
-	dir, name := filepath.Split(path)
-	files, err := driver.Files(dir, account)
-	if err != nil {
-		return nil, err
-	}
-	for _, file := range files {
-		if file.Name == name {
-			return &file, nil
-		}
-	}
-	return nil, base.ErrPathNotFound
-}
-
-func (driver GoogleDrive) Files(path string, account *model.Account) ([]model.File, error) {
-	path = utils.ParsePath(path)
-	var rawFiles []File
-	cache, err := base.GetCache(path, account)
-	if err == nil {
-		rawFiles, _ = cache.([]File)
-	} else {
-		file, err := driver.File(path, account)
-		if err != nil {
-			return nil, err
-		}
-		rawFiles, err = driver.GetFiles(file.Id, account)
-		if err != nil {
-			return nil, err
-		}
-		if len(rawFiles) > 0 {
-			_ = base.SetCache(path, rawFiles, account)
-		}
-	}
-	files := make([]model.File, 0)
-	for _, file := range rawFiles {
-		files = append(files, *driver.FormatFile(&file, account))
-	}
-	return files, nil
-}
-
-func (driver GoogleDrive) Link(args base.Args, account *model.Account) (*base.Link, error) {
-	file, err := driver.File(args.Path, account)
-	if err != nil {
-		return nil, err
-	}
-	if file.Type == conf.FOLDER {
-		return nil, base.ErrNotFile
-	}
-	url := fmt.Sprintf("https://www.googleapis.com/drive/v3/files/%s?includeItemsFromAllDrives=true&supportsAllDrives=true", file.Id)
-	_, err = driver.Request(url, base.Get, nil, nil, nil, nil, nil, account)
-	if err != nil {
-		return nil, err
-	}
-	link := base.Link{
-		Url: url + "&alt=media",
-		Headers: []base.Header{
-			{
-				Name:  "Authorization",
-				Value: "Bearer " + account.AccessToken,
-			},
-		},
-	}
-	return &link, nil
-}
-
-func (driver GoogleDrive) Path(path string, account *model.Account) (*model.File, []model.File, error) {
-	path = utils.ParsePath(path)
-	log.Debugf("google path: %s", path)
-	file, err := driver.File(path, account)
-	if err != nil {
-		return nil, nil, err
-	}
-	if !file.IsDir() {
-		return file, nil, nil
-	}
-	files, err := driver.Files(path, account)
-	if err != nil {
-		return nil, nil, err
-	}
-	return nil, files, nil
-}
-
-//func (driver GoogleDrive) Proxy(r *http.Request, account *model.Account) {
-//	r.Header.Add("Authorization", "Bearer "+account.AccessToken)
-//}
-
-func (driver GoogleDrive) Preview(path string, account *model.Account) (interface{}, error) {
-	return nil, base.ErrNotSupport
-}
-
-func (driver GoogleDrive) MakeDir(path string, account *model.Account) error {
-	parentFile, err := driver.File(utils.Dir(path), account)
-	if err != nil {
-		return err
-	}
-	data := base.Json{
-		"name":     utils.Base(path),
-		"parents":  []string{parentFile.Id},
-		"mimeType": "application/vnd.google-apps.folder",
-	}
-	_, err = driver.Request("https://www.googleapis.com/drive/v3/files", base.Post, nil, nil, nil, &data, nil, account)
-	return err
-}
-
-func (driver GoogleDrive) Move(src string, dst string, account *model.Account) error {
-	srcFile, err := driver.File(src, account)
-	url := "https://www.googleapis.com/drive/v3/files/" + srcFile.Id
-	if err != nil {
-		return err
-	}
-	dstParentFile, err := driver.File(utils.Dir(dst), account)
-	if err != nil {
-		return err
-	}
-	query := map[string]string{
-		"addParents":    dstParentFile.Id,
-		"removeParents": "root",
-	}
-	_, err = driver.Request(url, base.Patch, nil, query, nil, nil, nil, account)
-	return err
-}
-
-func (driver GoogleDrive) Rename(src string, dst string, account *model.Account) error {
-	srcFile, err := driver.File(src, account)
-	url := "https://www.googleapis.com/drive/v3/files/" + srcFile.Id
-	if err != nil {
-		return err
-	}
-	data := base.Json{
-		"name": utils.Base(dst),
-	}
-	_, err = driver.Request(url, base.Patch, nil, nil, nil, &data, nil, account)
-	return err
-}
-
-func (driver GoogleDrive) Copy(src string, dst string, account *model.Account) error {
-	return base.ErrNotSupport
-}
-
-func (driver GoogleDrive) Delete(path string, account *model.Account) error {
-	file, err := driver.File(path, account)
-	url := "https://www.googleapis.com/drive/v3/files/" + file.Id
-	if err != nil {
-		return err
-	}
-	_, err = driver.Request(url, base.Delete, nil, nil, nil, nil, nil, account)
-	return err
-}
-
-func (driver GoogleDrive) Upload(file *model.FileStream, account *model.Account) error {
-	if file == nil {
-		return base.ErrEmptyFile
-	}
-	parentFile, err := driver.File(file.ParentPath, account)
-	if err != nil {
-		return err
-	}
-	data := base.Json{
-		"name":    file.Name,
-		"parents": []string{parentFile.Id},
-	}
-	var e Error
-	url := "https://www.googleapis.com/upload/drive/v3/files?uploadType=resumable&supportsAllDrives=true"
-	if account.APIProxyUrl != "" {
-		url = fmt.Sprintf("%s/%s", account.APIProxyUrl, url)
-	}
-	res, err := base.NoRedirectClient.R().SetHeader("Authorization", "Bearer "+account.AccessToken).
-		SetError(&e).SetBody(data).
-		Post(url)
-	if err != nil {
-		return err
-	}
-	if e.Error.Code != 0 {
-		if e.Error.Code == 401 {
-			err = driver.RefreshToken(account)
-			if err != nil {
-				_ = model.SaveAccount(account)
-				return err
-			}
-			return driver.Upload(file, account)
-		}
-		return fmt.Errorf("%s: %v", e.Error.Message, e.Error.Errors)
-	}
-	putUrl := res.Header().Get("location")
-	byteData, _ := ioutil.ReadAll(file)
-	_, err = driver.Request(putUrl, base.Put, nil, nil, nil, byteData, nil, account)
-	return err
-}
-
-var _ base.Driver = (*GoogleDrive)(nil)

drivers/google/googledrive.go

@@ -1,198 +0,0 @@
-package google
-
-import (
-	"fmt"
-	"github.com/Xhofe/alist/conf"
-	"github.com/Xhofe/alist/drivers/base"
-	"github.com/Xhofe/alist/model"
-	"github.com/Xhofe/alist/utils"
-	"github.com/go-resty/resty/v2"
-	log "github.com/sirupsen/logrus"
-	"path/filepath"
-	"strconv"
-	"time"
-)
-
-type TokenError struct {
-	Error            string `json:"error"`
-	ErrorDescription string `json:"error_description"`
-}
-
-func (driver GoogleDrive) RefreshToken(account *model.Account) error {
-	url := "https://www.googleapis.com/oauth2/v4/token"
-	if account.APIProxyUrl != "" {
-		url = fmt.Sprintf("%s/%s", account.APIProxyUrl, url)
-	}
-	var resp base.TokenResp
-	var e TokenError
-	res, err := base.RestyClient.R().SetResult(&resp).SetError(&e).
-		SetFormData(map[string]string{
-			"client_id":     account.ClientId,
-			"client_secret": account.ClientSecret,
-			"refresh_token": account.RefreshToken,
-			"grant_type":    "refresh_token",
-		}).Post(url)
-	if err != nil {
-		return err
-	}
-	log.Debug(res.String())
-	if e.Error != "" {
-		return fmt.Errorf(e.Error)
-	}
-	account.AccessToken = resp.AccessToken
-	account.Status = "work"
-	return nil
-}
-
-type File struct {
-	Id            string     `json:"id"`
-	Name          string     `json:"name"`
-	MimeType      string     `json:"mimeType"`
-	ModifiedTime  *time.Time `json:"modifiedTime"`
-	Size          string     `json:"size"`
-	ThumbnailLink string     `json:"thumbnailLink"`
-}
-
-func (driver GoogleDrive) IsDir(mimeType string) bool {
-	return mimeType == "application/vnd.google-apps.folder" || mimeType == "application/vnd.google-apps.shortcut"
-}
-
-func (driver GoogleDrive) FormatFile(file *File, account *model.Account) *model.File {
-	f := &model.File{
-		Id:        file.Id,
-		Name:      file.Name,
-		Driver:    driver.Config().Name,
-		UpdatedAt: file.ModifiedTime,
-		Url:       "",
-	}
-	if driver.IsDir(file.MimeType) {
-		f.Type = conf.FOLDER
-	} else {
-		size, _ := strconv.ParseInt(file.Size, 10, 64)
-		f.Size = size
-		f.Type = utils.GetFileType(filepath.Ext(file.Name))
-	}
-	if file.ThumbnailLink != "" {
-		if account.APIProxyUrl != "" {
-			f.Thumbnail = fmt.Sprintf("%s/%s", account.APIProxyUrl, file.ThumbnailLink)
-		} else {
-			f.Thumbnail = file.ThumbnailLink
-		}
-	}
-	return f
-}
-
-type Files struct {
-	NextPageToken string `json:"nextPageToken"`
-	Files         []File `json:"files"`
-}
-
-type Error struct {
-	Error struct {
-		Errors []struct {
-			Domain       string `json:"domain"`
-			Reason       string `json:"reason"`
-			Message      string `json:"message"`
-			LocationType string `json:"location_type"`
-			Location     string `json:"location"`
-		}
-		Code    int    `json:"code"`
-		Message string `json:"message"`
-	} `json:"error"`
-}
-
-func (driver GoogleDrive) GetFiles(id string, account *model.Account) ([]File, error) {
-	pageToken := "first"
-	res := make([]File, 0)
-	for pageToken != "" {
-		if pageToken == "first" {
-			pageToken = ""
-		}
-		var resp Files
-		orderBy := "folder,name,modifiedTime desc"
-		if account.OrderBy != "" {
-			orderBy = account.OrderBy + " " + account.OrderDirection
-		}
-		query := map[string]string{
-			"orderBy":  orderBy,
-			"fields":   "files(id,name,mimeType,size,modifiedTime,thumbnailLink),nextPageToken",
-			"pageSize": "1000",
-			"q":        fmt.Sprintf("'%s' in parents and trashed = false", id),
-			//"includeItemsFromAllDrives": "true",
-			//"supportsAllDrives":         "true",
-			"pageToken": pageToken,
-		}
-		_, err := driver.Request("https://www.googleapis.com/drive/v3/files",
-			base.Get, nil, query, nil, nil, &resp, account)
-		if err != nil {
-			return nil, err
-		}
-		pageToken = resp.NextPageToken
-		res = append(res, resp.Files...)
-	}
-	return res, nil
-}
-
-func (driver GoogleDrive) Request(url string, method int, headers, query, form map[string]string, data interface{}, resp interface{}, account *model.Account) ([]byte, error) {
-	rawUrl := url
-	if account.APIProxyUrl != "" {
-		url = fmt.Sprintf("%s/%s", account.APIProxyUrl, url)
-	}
-	req := base.RestyClient.R()
-	req.SetHeader("Authorization", "Bearer "+account.AccessToken)
-	req.SetQueryParam("includeItemsFromAllDrives", "true")
-	req.SetQueryParam("supportsAllDrives", "true")
-	if headers != nil {
-		req.SetHeaders(headers)
-	}
-	if query != nil {
-		req.SetQueryParams(query)
-	}
-	if form != nil {
-		req.SetFormData(form)
-	}
-	if data != nil {
-		req.SetBody(data)
-	}
-	if resp != nil {
-		req.SetResult(resp)
-	}
-	var res *resty.Response
-	var err error
-	var e Error
-	req.SetError(&e)
-	switch method {
-	case base.Get:
-		res, err = req.Get(url)
-	case base.Post:
-		res, err = req.Post(url)
-	case base.Delete:
-		res, err = req.Delete(url)
-	case base.Patch:
-		res, err = req.Patch(url)
-	case base.Put:
-		res, err = req.Put(url)
-	default:
-		return nil, base.ErrNotSupport
-	}
-	if err != nil {
-		return nil, err
-	}
-	log.Debug(res.String())
-	if e.Error.Code != 0 {
-		if e.Error.Code == 401 {
-			err = driver.RefreshToken(account)
-			if err != nil {
-				_ = model.SaveAccount(account)
-				return nil, err
-			}
-			return driver.Request(rawUrl, method, headers, query, form, data, resp, account)
-		}
-		return nil, fmt.Errorf("%s: %v", e.Error.Message, e.Error.Errors)
-	}
-	return res.Body(), nil
-}
-
-func init() {
-	base.RegisterDriver(&GoogleDrive{})
-}

drivers/google_drive/driver.go

@@ -0,0 +1,148 @@
+package google_drive
+
+import (
+	"context"
+	"fmt"
+	"net/http"
+
+	"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"
+)
+
+type GoogleDrive struct {
+	model.Storage
+	Addition
+	AccessToken string
+}
+
+func (d *GoogleDrive) Config() driver.Config {
+	return config
+}
+
+func (d *GoogleDrive) GetAddition() driver.Additional {
+	return d.Addition
+}
+
+func (d *GoogleDrive) Init(ctx context.Context, storage model.Storage) error {
+	d.Storage = storage
+	err := utils.Json.UnmarshalFromString(d.Storage.Addition, &d.Addition)
+	if err != nil {
+		return err
+	}
+	return d.refreshToken()
+}
+
+func (d *GoogleDrive) Drop(ctx context.Context) error {
+	return nil
+}
+
+func (d *GoogleDrive) 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 *GoogleDrive) Get(ctx context.Context, path string) (model.Obj, error) {
+//	// this is optional
+//	return nil, errs.NotImplement
+//}
+
+func (d *GoogleDrive) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
+	url := fmt.Sprintf("https://www.googleapis.com/drive/v3/files/%s?includeItemsFromAllDrives=true&supportsAllDrives=true", file.GetID())
+	link := model.Link{
+		URL: url + "&alt=media",
+		Header: http.Header{
+			"Authorization": []string{"Bearer " + d.AccessToken},
+		},
+	}
+	return &link, nil
+}
+
+func (d *GoogleDrive) MakeDir(ctx context.Context, parentDir model.Obj, dirName string) error {
+	data := base.Json{
+		"name":     dirName,
+		"parents":  []string{parentDir.GetID()},
+		"mimeType": "application/vnd.google-apps.folder",
+	}
+	_, err := d.request("https://www.googleapis.com/drive/v3/files", http.MethodPost, func(req *resty.Request) {
+		req.SetBody(data)
+	}, nil)
+	return err
+}
+
+func (d *GoogleDrive) Move(ctx context.Context, srcObj, dstDir model.Obj) error {
+	query := map[string]string{
+		"addParents":    dstDir.GetID(),
+		"removeParents": "root",
+	}
+	url := "https://www.googleapis.com/drive/v3/files/" + srcObj.GetID()
+	_, err := d.request(url, http.MethodPatch, func(req *resty.Request) {
+		req.SetQueryParams(query)
+	}, nil)
+	return err
+}
+
+func (d *GoogleDrive) Rename(ctx context.Context, srcObj model.Obj, newName string) error {
+	data := base.Json{
+		"name": newName,
+	}
+	url := "https://www.googleapis.com/drive/v3/files/" + srcObj.GetID()
+	_, err := d.request(url, http.MethodPatch, func(req *resty.Request) {
+		req.SetBody(data)
+	}, nil)
+	return err
+}
+
+func (d *GoogleDrive) Copy(ctx context.Context, srcObj, dstDir model.Obj) error {
+	return errs.NotSupport
+}
+
+func (d *GoogleDrive) Remove(ctx context.Context, obj model.Obj) error {
+	url := "https://www.googleapis.com/drive/v3/files/" + obj.GetID()
+	_, err := d.request(url, http.MethodDelete, nil, nil)
+	return err
+}
+
+func (d *GoogleDrive) Put(ctx context.Context, dstDir model.Obj, stream model.FileStreamer, up driver.UpdateProgress) error {
+	data := base.Json{
+		"name":    stream.GetName(),
+		"parents": []string{dstDir.GetID()},
+	}
+	var e Error
+	url := "https://www.googleapis.com/upload/drive/v3/files?uploadType=resumable&supportsAllDrives=true"
+	res, err := base.NoRedirectClient.R().SetHeader("Authorization", "Bearer "+d.AccessToken).
+		SetError(&e).SetBody(data).
+		Post(url)
+	if err != nil {
+		return err
+	}
+	if e.Error.Code != 0 {
+		if e.Error.Code == 401 {
+			err = d.refreshToken()
+			if err != nil {
+				return err
+			}
+			return d.Put(ctx, dstDir, stream, up)
+		}
+		return fmt.Errorf("%s: %v", e.Error.Message, e.Error.Errors)
+	}
+	putUrl := res.Header().Get("location")
+	_, err = d.request(putUrl, http.MethodPut, func(req *resty.Request) {
+		req.SetBody(stream.GetReadCloser())
+	}, nil)
+	return err
+}
+
+func (d *GoogleDrive) Other(ctx context.Context, args model.OtherArgs) (interface{}, error) {
+	return nil, errs.NotSupport
+}
+
+var _ driver.Driver = (*GoogleDrive)(nil)

drivers/google_drive/meta.go

@@ -0,0 +1,29 @@
+package google_drive
+
+import (
+	"github.com/alist-org/alist/v3/internal/driver"
+	"github.com/alist-org/alist/v3/internal/op"
+)
+
+type Addition struct {
+	driver.RootID
+	RefreshToken   string `json:"refresh_token" required:"true"`
+	OrderBy        string `json:"order_by" type:"string" help:"such as: folder,name,modifiedTime"`
+	OrderDirection string `json:"order_direction" type:"select" options:"asc,desc"`
+	ClientID       string `json:"client_id" required:"true" default:"202264815644.apps.googleusercontent.com"`
+	ClientSecret   string `json:"client_secret" required:"true" default:"X4Z3ca8xfWDb1Voo-F9a7ZxJ"`
+}
+
+var config = driver.Config{
+	Name:        "GoogleDrive",
+	OnlyProxy:   true,
+	DefaultRoot: "root",
+}
+
+func New() driver.Driver {
+	return &GoogleDrive{}
+}
+
+func init() {
+	op.RegisterDriver(config, New)
+}

drivers/google_drive/types.go

@@ -0,0 +1,55 @@
+package google_drive
+
+import (
+	"strconv"
+	"time"
+
+	"github.com/alist-org/alist/v3/internal/model"
+)
+
+type TokenError struct {
+	Error            string `json:"error"`
+	ErrorDescription string `json:"error_description"`
+}
+
+type Files struct {
+	NextPageToken string `json:"nextPageToken"`
+	Files         []File `json:"files"`
+}
+
+type File struct {
+	Id            string    `json:"id"`
+	Name          string    `json:"name"`
+	MimeType      string    `json:"mimeType"`
+	ModifiedTime  time.Time `json:"modifiedTime"`
+	Size          string    `json:"size"`
+	ThumbnailLink string    `json:"thumbnailLink"`
+}
+
+func fileToObj(f File) *model.ObjThumb {
+	size, _ := strconv.ParseInt(f.Size, 10, 64)
+	return &model.ObjThumb{
+		Object: model.Object{
+			ID:       f.Id,
+			Name:     f.Name,
+			Size:     size,
+			Modified: time.Time{},
+			IsFolder: false,
+		},
+		Thumbnail: model.Thumbnail{},
+	}
+}
+
+type Error struct {
+	Error struct {
+		Errors []struct {
+			Domain       string `json:"domain"`
+			Reason       string `json:"reason"`
+			Message      string `json:"message"`
+			LocationType string `json:"location_type"`
+			Location     string `json:"location"`
+		}
+		Code    int    `json:"code"`
+		Message string `json:"message"`
+	} `json:"error"`
+}

drivers/google_drive/util.go

@@ -0,0 +1,97 @@
+package google_drive
+
+import (
+	"fmt"
+	"net/http"
+
+	"github.com/alist-org/alist/v3/drivers/base"
+	"github.com/go-resty/resty/v2"
+	log "github.com/sirupsen/logrus"
+)
+
+// do others that not defined in Driver interface
+
+func (d *GoogleDrive) refreshToken() error {
+	url := "https://www.googleapis.com/oauth2/v4/token"
+	var resp base.TokenResp
+	var e TokenError
+	res, err := base.RestyClient.R().SetResult(&resp).SetError(&e).
+		SetFormData(map[string]string{
+			"client_id":     d.ClientID,
+			"client_secret": d.ClientSecret,
+			"refresh_token": d.RefreshToken,
+			"grant_type":    "refresh_token",
+		}).Post(url)
+	if err != nil {
+		return err
+	}
+	log.Debug(res.String())
+	if e.Error != "" {
+		return fmt.Errorf(e.Error)
+	}
+	d.AccessToken = resp.AccessToken
+	return nil
+}
+
+func (d *GoogleDrive) request(url string, method string, callback base.ReqCallback, resp interface{}) ([]byte, error) {
+	req := base.RestyClient.R()
+	req.SetHeader("Authorization", "Bearer "+d.AccessToken)
+	req.SetQueryParam("includeItemsFromAllDrives", "true")
+	req.SetQueryParam("supportsAllDrives", "true")
+	if callback != nil {
+		callback(req)
+	}
+	if resp != nil {
+		req.SetResult(resp)
+	}
+	var e Error
+	req.SetError(&e)
+	res, err := req.Execute(method, url)
+	if err != nil {
+		return nil, err
+	}
+	if e.Error.Code != 0 {
+		if e.Error.Code == 401 {
+			err = d.refreshToken()
+			if err != nil {
+				return nil, err
+			}
+			return d.request(url, method, callback, resp)
+		}
+		return nil, fmt.Errorf("%s: %v", e.Error.Message, e.Error.Errors)
+	}
+	return res.Body(), nil
+}
+
+func (d *GoogleDrive) getFiles(id string) ([]File, error) {
+	pageToken := "first"
+	res := make([]File, 0)
+	for pageToken != "" {
+		if pageToken == "first" {
+			pageToken = ""
+		}
+		var resp Files
+		orderBy := "folder,name,modifiedTime desc"
+		if d.OrderBy != "" {
+			orderBy = d.OrderBy + " " + d.OrderDirection
+		}
+		query := map[string]string{
+			"orderBy":  orderBy,
+			"fields":   "files(id,name,mimeType,size,modifiedTime,thumbnailLink),nextPageToken",
+			"pageSize": "1000",
+			"q":        fmt.Sprintf("'%s' in parents and trashed = false", id),
+			//"includeItemsFromAllDrives": "true",
+			//"supportsAllDrives":         "true",
+			"pageToken": pageToken,
+		}
+		_, err := d.request("https://www.googleapis.com/drive/v3/files", http.MethodGet, func(req *resty.Request) {
+			req.SetQueryParams(query)
+		}, &resp)
+		if err != nil {
+			return nil, err
+		}
+		pageToken = resp.NextPageToken
+		res = append(res, resp.Files...)
+	}
+	return res, nil
+}

drivers/lanzou/driver.go

@@ -1,202 +0,0 @@
-package lanzou
-
-import (
-	"github.com/Xhofe/alist/conf"
-	"github.com/Xhofe/alist/drivers/base"
-	"github.com/Xhofe/alist/model"
-	"github.com/Xhofe/alist/utils"
-	log "github.com/sirupsen/logrus"
-	"path/filepath"
-)
-
-type Lanzou struct{}
-
-func (driver Lanzou) Config() base.DriverConfig {
-	return base.DriverConfig{
-		Name:   "Lanzou",
-		NoCors: true,
-	}
-}
-
-func (driver Lanzou) Items() []base.Item {
-	return []base.Item{
-		{
-			Name:     "internal_type",
-			Label:    "lanzou type",
-			Type:     base.TypeSelect,
-			Required: true,
-			Values:   "cookie,url",
-		},
-		{
-			Name:        "access_token",
-			Label:       "cookie",
-			Type:        base.TypeString,
-			Description: "about 15 days valid",
-			Required:    true,
-		},
-		{
-			Name:     "site_url",
-			Label:    "share url",
-			Type:     base.TypeString,
-			Required: true,
-		},
-		{
-			Name:  "root_folder",
-			Label: "root folder file_id",
-			Type:  base.TypeString,
-		},
-		{
-			Name:  "password",
-			Label: "share password",
-			Type:  base.TypeString,
-		},
-	}
-}
-
-func (driver Lanzou) Save(account *model.Account, old *model.Account) error {
-	if account == nil {
-		return nil
-	}
-	if account.InternalType == "cookie" {
-		if account.RootFolder == "" {
-			account.RootFolder = "-1"
-		}
-	}
-	account.Status = "work"
-	_ = model.SaveAccount(account)
-	return nil
-}
-
-func (driver Lanzou) File(path string, account *model.Account) (*model.File, error) {
-	path = utils.ParsePath(path)
-	if path == "/" {
-		return &model.File{
-			Id:        account.RootFolder,
-			Name:      account.Name,
-			Size:      0,
-			Type:      conf.FOLDER,
-			Driver:    driver.Config().Name,
-			UpdatedAt: account.UpdatedAt,
-		}, nil
-	}
-	dir, name := filepath.Split(path)
-	files, err := driver.Files(dir, account)
-	if err != nil {
-		return nil, err
-	}
-	for _, file := range files {
-		if file.Name == name {
-			return &file, nil
-		}
-	}
-	return nil, base.ErrPathNotFound
-}
-
-func (driver Lanzou) Files(path string, account *model.Account) ([]model.File, error) {
-	path = utils.ParsePath(path)
-	var rawFiles []LanZouFile
-	cache, err := base.GetCache(path, account)
-	if err == nil {
-		rawFiles, _ = cache.([]LanZouFile)
-	} else {
-		file, err := driver.File(path, account)
-		if err != nil {
-			return nil, err
-		}
-		rawFiles, err = driver.GetFiles(file.Id, account)
-		if err != nil {
-			return nil, err
-		}
-		if len(rawFiles) > 0 {
-			_ = base.SetCache(path, rawFiles, account)
-		}
-	}
-	files := make([]model.File, 0)
-	for _, file := range rawFiles {
-		files = append(files, *driver.FormatFile(&file))
-	}
-	return files, nil
-}
-
-func (driver Lanzou) Link(args base.Args, account *model.Account) (*base.Link, error) {
-	file, err := driver.File(args.Path, account)
-	if err != nil {
-		return nil, err
-	}
-	log.Debugf("down file: %+v", file)
-	downId := file.Id
-	pwd := ""
-	if account.InternalType == "cookie" {
-		downId, pwd, err = driver.GetDownPageId(file.Id, account)
-		if err != nil {
-			return nil, err
-		}
-	}
-	var url string
-	//if pwd != "" {
-	//url, err = driver.GetLinkWithPassword(downId, pwd, account)
-	//} else {
-	url, err = driver.GetLink(downId, pwd, account)
-	//}
-	if err != nil {
-		return nil, err
-	}
-	link := base.Link{
-		Url: url,
-		Headers: []base.Header{
-			{Name: "User-Agent", Value: base.UserAgent},
-		},
-	}
-	return &link, nil
-}
-
-func (driver Lanzou) Path(path string, account *model.Account) (*model.File, []model.File, error) {
-	path = utils.ParsePath(path)
-	log.Debugf("lanzou path: %s", path)
-	file, err := driver.File(path, account)
-	if err != nil {
-		return nil, nil, err
-	}
-	if !file.IsDir() {
-		return file, nil, nil
-	}
-	files, err := driver.Files(path, account)
-	if err != nil {
-		return nil, nil, err
-	}
-	return nil, files, nil
-}
-
-//func (driver Lanzou) Proxy(r *http.Request, account *model.Account) {
-//	r.Header.Del("Origin")
-//}
-
-func (driver Lanzou) Preview(path string, account *model.Account) (interface{}, error) {
-	return nil, base.ErrNotSupport
-}
-
-func (driver *Lanzou) MakeDir(path string, account *model.Account) error {
-	return base.ErrNotImplement
-}
-
-func (driver *Lanzou) Move(src string, dst string, account *model.Account) error {
-	return base.ErrNotImplement
-}
-
-func (driver *Lanzou) Rename(src string, dst string, account *model.Account) error {
-	return base.ErrNotImplement
-}
-
-func (driver *Lanzou) Copy(src string, dst string, account *model.Account) error {
-	return base.ErrNotImplement
-}
-
-func (driver *Lanzou) Delete(path string, account *model.Account) error {
-	return base.ErrNotImplement
-}
-
-func (driver *Lanzou) Upload(file *model.FileStream, account *model.Account) error {
-	return base.ErrNotImplement
-}
-
-var _ base.Driver = (*Lanzou)(nil)

drivers/lanzou/lanzou.go

@@ -1,285 +0,0 @@
-package lanzou
-
-import (
-	"fmt"
-	"github.com/Xhofe/alist/conf"
-	"github.com/Xhofe/alist/drivers/base"
-	"github.com/Xhofe/alist/model"
-	"github.com/Xhofe/alist/utils"
-	log "github.com/sirupsen/logrus"
-	"net/url"
-	"path/filepath"
-	"regexp"
-	"strconv"
-	"time"
-)
-
-type LanZouFile struct {
-	Name    string `json:"name"`
-	NameAll string `json:"name_all"`
-	Id      string `json:"id"`
-	FolId   string `json:"fol_id"`
-	Size    string `json:"size"`
-	Time    string `json:"time"`
-	Folder  bool
-}
-
-func (driver *Lanzou) FormatFile(file *LanZouFile) *model.File {
-	now := time.Now()
-	f := &model.File{
-		Id:        file.Id,
-		Name:      file.Name,
-		Driver:    driver.Config().Name,
-		SizeStr:   file.Size,
-		TimeStr:   file.Time,
-		UpdatedAt: &now,
-	}
-	if file.Folder {
-		f.Type = conf.FOLDER
-		f.Id = file.FolId
-	} else {
-		f.Name = file.NameAll
-		f.Type = utils.GetFileType(filepath.Ext(file.NameAll))
-	}
-	return f
-}
-
-type LanZouFilesResp struct {
-	Zt   int          `json:"zt"`
-	Info interface{}  `json:"info"`
-	Text []LanZouFile `json:"text"`
-}
-
-func (driver *Lanzou) GetFiles(folderId string, account *model.Account) ([]LanZouFile, error) {
-	if account.InternalType == "cookie" {
-		files := make([]LanZouFile, 0)
-		var resp LanZouFilesResp
-		// folders
-		res, err := base.RestyClient.R().SetResult(&resp).SetHeader("Cookie", account.AccessToken).
-			SetFormData(map[string]string{
-				"task":      "47",
-				"folder_id": folderId,
-			}).Post("https://pc.woozooo.com/doupload.php")
-		if err != nil {
-			return nil, err
-		}
-		log.Debug(res.String())
-		if resp.Zt != 1 && resp.Zt != 2 {
-			return nil, fmt.Errorf("%v", resp.Info)
-		}
-		for _, file := range resp.Text {
-			file.Folder = true
-			files = append(files, file)
-		}
-		// files
-		pg := 1
-		for {
-			_, err = base.RestyClient.R().SetResult(&resp).SetHeader("Cookie", account.AccessToken).
-				SetFormData(map[string]string{
-					"task":      "5",
-					"folder_id": folderId,
-					"pg":        strconv.Itoa(pg),
-				}).Post("https://pc.woozooo.com/doupload.php")
-			if err != nil {
-				return nil, err
-			}
-			if resp.Zt != 1 {
-				return nil, fmt.Errorf("%v", resp.Info)
-			}
-			if len(resp.Text) == 0 {
-				break
-			}
-			files = append(files, resp.Text...)
-			pg++
-		}
-		return files, nil
-	} else {
-		return driver.GetFilesByUrl(account)
-	}
-}
-
-func (driver *Lanzou) GetFilesByUrl(account *model.Account) ([]LanZouFile, error) {
-	files := make([]LanZouFile, 0)
-	shareUrl := account.SiteUrl
-	u, err := url.Parse(shareUrl)
-	if err != nil {
-		return nil, err
-	}
-	res, err := base.RestyClient.R().Get(shareUrl)
-	if err != nil {
-		return nil, err
-	}
-	lxArr := regexp.MustCompile(`'lx':(.+?),`).FindStringSubmatch(res.String())
-	if len(lxArr) == 0 {
-		return nil, fmt.Errorf("get empty page")
-	}
-	lx := lxArr[1]
-	fid := regexp.MustCompile(`'fid':(.+?),`).FindStringSubmatch(res.String())[1]
-	uid := regexp.MustCompile(`'uid':'(.+?)',`).FindStringSubmatch(res.String())[1]
-	rep := regexp.MustCompile(`'rep':'(.+?)',`).FindStringSubmatch(res.String())[1]
-	up := regexp.MustCompile(`'up':(.+?),`).FindStringSubmatch(res.String())[1]
-	ls := ""
-	if account.Password != "" {
-		ls = regexp.MustCompile(`'ls':(.+?),`).FindStringSubmatch(res.String())[1]
-	}
-	tName := regexp.MustCompile(`'t':(.+?),`).FindStringSubmatch(res.String())[1]
-	kName := regexp.MustCompile(`'k':(.+?),`).FindStringSubmatch(res.String())[1]
-	t := regexp.MustCompile(`var ` + tName + ` = '(.+?)';`).FindStringSubmatch(res.String())[1]
-	k := regexp.MustCompile(`var ` + kName + ` = '(.+?)';`).FindStringSubmatch(res.String())[1]
-	pg := 1
-	for {
-		var resp LanZouFilesResp
-		res, err = base.RestyClient.R().SetResult(&resp).SetFormData(map[string]string{
-			"lx":  lx,
-			"fid": fid,
-			"uid": uid,
-			"pg":  strconv.Itoa(pg),
-			"rep": rep,
-			"t":   t,
-			"k":   k,
-			"up":  up,
-			"ls":  ls,
-			"pwd": account.Password,
-		}).Post(fmt.Sprintf("https://%s/filemoreajax.php", u.Host))
-		if err != nil {
-			log.Debug(err)
-			break
-		}
-		log.Debug(res.String())
-		if resp.Zt != 1 {
-			return nil, fmt.Errorf("%v", resp.Info)
-		}
-		if len(resp.Text) == 0 {
-			break
-		}
-		pg++
-		time.Sleep(time.Second)
-		files = append(files, resp.Text...)
-	}
-	return files, nil
-}
-
-//type LanzouDownInfo struct {
-//	FId    string `json:"f_id"`
-//	IsNewd string `json:"is_newd"`
-//}
-
-// GetDownPageId 获取下载页面的ID
-func (driver *Lanzou) GetDownPageId(fileId string, account *model.Account) (string, string, error) {
-	var resp DownPageResp
-	res, err := base.RestyClient.R().SetResult(&resp).SetHeader("Cookie", account.AccessToken).
-		SetFormData(map[string]string{
-			"task":    "22",
-			"file_id": fileId,
-		}).Post("https://pc.woozooo.com/doupload.php")
-	if err != nil {
-		return "", "", err
-	}
-	log.Debug(res.String())
-	if resp.Zt != 1 {
-		return "", "", fmt.Errorf("%v", resp.Info)
-	}
-	return resp.Info.FId, resp.Info.Pwd, nil
-}
-
-type LanzouLinkResp struct {
-	Dom string `json:"dom"`
-	Url string `json:"url"`
-	Zt  int    `json:"zt"`
-}
-
-func (driver *Lanzou) GetLink(downId string, pwd string, account *model.Account) (string, error) {
-	shareUrl := account.SiteUrl
-	u, err := url.Parse(shareUrl)
-	if err != nil {
-		return "", err
-	}
-	log.Debugln(fmt.Sprintf("https://%s/%s", u.Host, downId))
-	res, err := base.RestyClient.R().Get(fmt.Sprintf("https://%s/%s", u.Host, downId))
-	if err != nil {
-		return "", err
-	}
-	iframe := regexp.MustCompile(`<iframe class="ifr2" name=".{2,20}" src="(.+?)"`).FindStringSubmatch(res.String())
-	if len(iframe) == 0 {
-		return driver.GetLinkWithPassword(downId, pwd, res.String(), account)
-	}
-	iframeUrl := fmt.Sprintf("https://%s%s", u.Host, iframe[1])
-	res, err = base.RestyClient.R().Get(iframeUrl)
-	if err != nil {
-		return "", err
-	}
-	log.Debugln(res.String())
-	ajaxdata := regexp.MustCompile(`var ajaxdata = '(.+?)'`).FindStringSubmatch(res.String())
-	if len(ajaxdata) == 0 {
-		return "", fmt.Errorf("get iframe empty page")
-	}
-	signs := ajaxdata[1]
-	//sign := regexp.MustCompile(`var ispostdowns = '(.+?)';`).FindStringSubmatch(res.String())[1]
-	sign := regexp.MustCompile(`'sign':'(.+?)',`).FindStringSubmatch(res.String())[1]
-	//websign := regexp.MustCompile(`'websign':'(.+?)'`).FindStringSubmatch(res.String())[1]
-	websign := ""
-	websignR := regexp.MustCompile(`var websign = '(.+?)'`).FindStringSubmatch(res.String())
-	if len(websignR) > 1 {
-		websign = websignR[1]
-	}
-	//websign := ""
-	//websignkey := regexp.MustCompile(`'websignkey':'(.+?)'`).FindStringSubmatch(res.String())[1]
-	websignkey := regexp.MustCompile(`var websignkey = '(.+?)';`).FindStringSubmatch(res.String())[1]
-	var resp LanzouLinkResp
-	form := map[string]string{
-		"action":     "downprocess",
-		"signs":      signs,
-		"sign":       sign,
-		"ves":        "1",
-		"websign":    websign,
-		"websignkey": websignkey,
-	}
-	log.Debugf("form: %+v", form)
-	res, err = base.RestyClient.R().SetResult(&resp).
-		SetHeader("origin", "https://"+u.Host).
-		SetHeader("referer", iframeUrl).
-		SetFormData(form).Post(fmt.Sprintf("https://%s/ajaxm.php", u.Host))
-	log.Debug(res.String())
-	if err != nil {
-		return "", err
-	}
-	if resp.Zt == 1 {
-		return resp.Dom + "/file/" + resp.Url, nil
-	}
-	return "", fmt.Errorf("failed get link")
-}
-
-func (driver *Lanzou) GetLinkWithPassword(downId string, pwd string, html string, account *model.Account) (string, error) {
-	shareUrl := account.SiteUrl
-	u, err := url.Parse(shareUrl)
-	if err != nil {
-		return "", err
-	}
-	if html == "" {
-		log.Debugln(fmt.Sprintf("https://%s/%s", u.Host, downId))
-		res, err := base.RestyClient.R().Get(fmt.Sprintf("https://%s/%s", u.Host, downId))
-		if err != nil {
-			return "", err
-		}
-		html = res.String()
-	}
-
-	data := regexp.MustCompile(`data : '(.+?)'\+pwd,`).FindStringSubmatch(html)[1] + pwd
-	var resp LanzouLinkResp
-	_, err = base.RestyClient.R().SetResult(&resp).SetHeaders(map[string]string{
-		"Referer":      fmt.Sprintf("https://%s/%s", u.Host, downId),
-		"Origin":       "https://" + u.Host,
-		"content-type": "application/x-www-form-urlencoded",
-	}).SetBody(data).Post(fmt.Sprintf("https://%s/ajaxm.php", u.Host))
-	if err != nil {
-		return "", err
-	}
-	if resp.Zt == 1 {
-		return resp.Dom + "/file/" + resp.Url, nil
-	}
-	return "", fmt.Errorf("failed get link with password")
-}
-
-func init() {
-	base.RegisterDriver(&Lanzou{})
-}

drivers/lanzou/types.go

@@ -1,13 +0,0 @@
-package lanzou
-
-type DownPageResp struct {
-	Zt   int `json:"zt"`
-	Info struct {
-		Pwd    string `json:"pwd"`
-		Onof   string `json:"onof"`
-		FId    string `json:"f_id"`
-		Taoc   string `json:"taoc"`
-		IsNewd string `json:"is_newd"`
-	} `json:"info"`
-	Text interface{} `json:"text"`
-}