Compare commits
287 Commits
Author | SHA1 | Date | |
---|---|---|---|
f7baec2e65 | |||
378bab32f1 | |||
6cd8151cad | |||
541449e10f | |||
ca5a53fc24 | |||
f646d2a699 | |||
363e036bf0 | |||
e23f00f349 | |||
9600267bda | |||
a66b0e0151 | |||
3bfa00d5d2 | |||
6cbd2532cc | |||
47976af0d3 | |||
4dca52be85 | |||
62bb09300d | |||
f9e067abec | |||
1e62666406 | |||
0e0cdf15ef | |||
b124fdc092 | |||
5141b3c165 | |||
881d6e271e | |||
bd2418c438 | |||
8421c72c5c | |||
a80e21997c | |||
4369cbbac3 | |||
89f76d7899 | |||
ef68f84787 | |||
2c1f70fbe9 | |||
b2f5757f8d | |||
6b97b4eb20 | |||
645c10c11f | |||
571bcf07b0 | |||
63de65be45 | |||
a3446720a2 | |||
3c4c2ad4e0 | |||
077a525961 | |||
5be79eb26e | |||
ddc19ab699 | |||
ddfca5a29b | |||
c19166be1c | |||
daad61443c | |||
4b0c01158d | |||
f97f1d532e | |||
e15755fef0 | |||
ea88998325 | |||
74d971aa8a | |||
d41d868a8d | |||
555cc26cbf | |||
ab4215080b | |||
9502f5acd7 | |||
b03879403f | |||
ee4ac81677 | |||
b69fc8c306 | |||
ee6c31332d | |||
9fa16bd5fc | |||
c77ed5fcb0 | |||
822be17fb9 | |||
7e3b13ea2d | |||
f8fb48fb32 | |||
4bf46268da | |||
b7ea73b3c2 | |||
9fbc54314d | |||
cf8ab29a17 | |||
51cadd2d49 | |||
2bae8e129e | |||
9d55ad3af6 | |||
36cd504783 | |||
49f13b9b90 | |||
adb0739dfe | |||
340cb940e3 | |||
8711f2a1c5 | |||
7f35aab071 | |||
ecd167d2f9 | |||
220fd30830 | |||
5cba10446e | |||
a9bdb15205 | |||
c5f6a90f54 | |||
46f9aefb04 | |||
fdcad9c154 | |||
027025361a | |||
f1245153b9 | |||
570b8be022 | |||
86a773674a | |||
75fd0ee185 | |||
cc43238bd1 | |||
c0a6beecea | |||
c77eebb035 | |||
b1efb86b28 | |||
0707449c8f | |||
0f8a84f67e | |||
a475783b00 | |||
67413015e8 | |||
3a311a47af | |||
9ccd802126 | |||
0acba7cd22 | |||
3cdb8e7a81 | |||
d3efee2ea1 | |||
4ec274e748 | |||
3b07c72f88 | |||
0c5820a98f | |||
86beadc0ed | |||
be62d64dba | |||
112363031a | |||
48dc3552a6 | |||
663814c9ef | |||
bd892e6a63 | |||
4fd2c09845 | |||
0eab31bdf5 | |||
c6af22b97e | |||
b2a5110672 | |||
c628992ea6 | |||
c65d868e09 | |||
aeb48b2ecc | |||
cefec1a663 | |||
e7ad830aa8 | |||
b27eed265a | |||
3abe26473c | |||
023107226c | |||
8b109cfe40 | |||
b48e97d406 | |||
6c91cfeb90 | |||
bfd1f25972 | |||
8c0defce09 | |||
a1e88cfa05 | |||
443f5ffbcc | |||
b8bc94306d | |||
d9795ff22f | |||
c4108007cd | |||
f3db23a41e | |||
4741a75c92 | |||
301756ba03 | |||
3b2703a5e5 | |||
2a601f06cb | |||
adc3a56552 | |||
4d9a29bddd | |||
666e02f0c3 | |||
6aaec19c1c | |||
1091e1b740 | |||
d06c605421 | |||
43de823058 | |||
02d0aef611 | |||
5596661ce8 | |||
2379cb8d67 | |||
8c0ebe0841 | |||
fd868bac84 | |||
ebcbb29a0f | |||
00ff0a43a7 | |||
3d3f23ec9e | |||
d484219c48 | |||
dd4c97393e | |||
07b8ff25a7 | |||
0d5c3c5080 | |||
75b4429f73 | |||
34ef6bd18d | |||
c915313ec9 | |||
12a095a1d6 | |||
dc000f640a | |||
aa1c5b2be3 | |||
1d4ec3c50d | |||
ebfeef52f4 | |||
c595fd7f94 | |||
421052f88a | |||
603681fbe6 | |||
f442185aa5 | |||
ca9e739465 | |||
53a1c4283b | |||
93dd768234 | |||
c9c4d6bc7e | |||
81e10f8939 | |||
4dd753de52 | |||
79df63d319 | |||
ec54831162 | |||
c8f3e8ab4d | |||
4be8524d80 | |||
0d3146b51d | |||
f95d843969 | |||
28aee8c493 | |||
de3ea82eb9 | |||
268ba3d069 | |||
309d6558fb | |||
c08fdfc868 | |||
1b28e6af3e | |||
8655e33e60 | |||
50579fef84 | |||
e39299bfe2 | |||
d1ab2443f1 | |||
658cf368bb | |||
fd36ce59f6 | |||
95b3b87672 | |||
0d07d81802 | |||
923937b530 | |||
09492193c4 | |||
40b26a81a0 | |||
4293a0ba8c | |||
6c2f3486fc | |||
3c7512f64a | |||
84219d3d70 | |||
05d3727335 | |||
ee77c3b113 | |||
fcaf485e0b | |||
bd83469bb1 | |||
90f111b24f | |||
7d1034c569 | |||
236c17176c | |||
6ee4c10e8f | |||
3798634028 | |||
567ba5ccd4 | |||
ae2ee1821a | |||
805b1e4fa3 | |||
d92c10da56 | |||
6659f6d367 | |||
fe416ba15c | |||
de66708b24 | |||
2ca3e0b8bc | |||
ae04a0a760 | |||
c28168c970 | |||
46b2ed2507 | |||
22843ffc70 | |||
e1b6368343 | |||
62dae50d70 | |||
43a8ed472b | |||
d87878c232 | |||
ab7dee49b0 | |||
dca115506d | |||
be17fba0c6 | |||
cd58aa5efe | |||
946833d2cc | |||
eb42d09849 | |||
9d00492750 | |||
b6711d6ab9 | |||
7bc46de8aa | |||
a4f4fb2d73 | |||
a181b56ea7 | |||
d0b743d955 | |||
a985b748e9 | |||
44cb8aaafe | |||
51f5d1b3c4 | |||
36e0d6f787 | |||
3d0065bdcf | |||
7bf8071095 | |||
30d39f8e10 | |||
20d3ef7de6 | |||
86e5dae4d1 | |||
d89b1d4871 | |||
080e6fb22a | |||
e1cd71616d | |||
c92e11dad5 | |||
b52e8747fa | |||
14305748f0 | |||
44f8112e53 | |||
6a90b1d40a | |||
b42ec3e810 | |||
28875ce304 | |||
9b99e8ab70 | |||
98872a8fdb | |||
ce4a295008 | |||
bc1babb5b5 | |||
d61242d85d | |||
99d7105357 | |||
be8a9c5f07 | |||
530e74c70b | |||
0a337756ba | |||
26fe0a7684 | |||
9c7e451c03 | |||
8df1455f25 | |||
9d9377f65d | |||
8b523fab8b | |||
6453ae0968 | |||
1cfd47a258 | |||
8e2069c554 | |||
6b8778a63c | |||
aaa8c440fe | |||
2dc5dec83c | |||
1eca2b83ed | |||
48e6f3bb23 | |||
0ad9e17196 | |||
9398cdaac1 | |||
2f19d4a834 | |||
99a186d01b | |||
40ef233d24 | |||
7c3ea193ff | |||
7902b646ff | |||
1c453ae147 | |||
cf5714ba73 | |||
d655340634 | |||
8d4ac031c3 | |||
a1ded3a339 |
4
.github/ISSUE_TEMPLATE/bug_report.yml
vendored
4
.github/ISSUE_TEMPLATE/bug_report.yml
vendored
@ -43,8 +43,8 @@ body:
|
|||||||
attributes:
|
attributes:
|
||||||
label: Reproduction / 复现链接
|
label: Reproduction / 复现链接
|
||||||
description: |
|
description: |
|
||||||
Please provide a link to a repo that can reproduce the problem you ran into.
|
Please provide a link to a repo that can reproduce the problem you ran into. Please be aware that your issue may be closed directly if you don't provide it.
|
||||||
请提供能复现此问题的链接
|
请提供能复现此问题的链接,请知悉如果不提供它你的issue可能会被直接关闭。
|
||||||
validations:
|
validations:
|
||||||
required: true
|
required: true
|
||||||
- type: textarea
|
- type: textarea
|
||||||
|
19
.github/stale.yml
vendored
Normal file
19
.github/stale.yml
vendored
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
# Number of days of inactivity before an issue becomes stale
|
||||||
|
daysUntilStale: 44
|
||||||
|
# Number of days of inactivity before a stale issue is closed
|
||||||
|
daysUntilClose: 20
|
||||||
|
# Issues with these labels will never be considered stale
|
||||||
|
exemptLabels:
|
||||||
|
- accepted
|
||||||
|
- security
|
||||||
|
# Label to use when marking an issue as stale
|
||||||
|
staleLabel: stale
|
||||||
|
# Comment to post when marking an issue as stale. Set to `false` to disable
|
||||||
|
markComment: >
|
||||||
|
This issue has been automatically marked as stale because it has not had
|
||||||
|
recent activity. It will be closed if no further activity occurs. Thank you
|
||||||
|
for your contributions.
|
||||||
|
# Comment to post when closing a stale issue. Set to `false` to disable
|
||||||
|
closeComment: >
|
||||||
|
This issue was closed due to inactive more than 52 days. You can reopen or
|
||||||
|
recreate it if you think it should continue. Thank you for your contributions again.
|
6
.github/workflows/auto_lang.yml
vendored
6
.github/workflows/auto_lang.yml
vendored
@ -16,12 +16,12 @@ jobs:
|
|||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
platform: [ ubuntu-latest ]
|
platform: [ ubuntu-latest ]
|
||||||
go-version: [ 1.19 ]
|
go-version: [ '1.20' ]
|
||||||
name: auto generate lang.json
|
name: auto generate lang.json
|
||||||
runs-on: ${{ matrix.platform }}
|
runs-on: ${{ matrix.platform }}
|
||||||
steps:
|
steps:
|
||||||
- name: Setup go
|
- name: Setup go
|
||||||
uses: actions/setup-go@v3
|
uses: actions/setup-go@v4
|
||||||
with:
|
with:
|
||||||
go-version: ${{ matrix.go-version }}
|
go-version: ${{ matrix.go-version }}
|
||||||
|
|
||||||
@ -54,7 +54,7 @@ jobs:
|
|||||||
cd alist-web
|
cd alist-web
|
||||||
git add .
|
git add .
|
||||||
git config --local user.email "i@nn.ci"
|
git config --local user.email "i@nn.ci"
|
||||||
git config --local user.name "Noah Hsu"
|
git config --local user.name "Andy Hsu"
|
||||||
git commit -m "chore: auto update i18n file" -a 2>/dev/null || :
|
git commit -m "chore: auto update i18n file" -a 2>/dev/null || :
|
||||||
cd ..
|
cd ..
|
||||||
|
|
||||||
|
5
.github/workflows/build.yml
vendored
5
.github/workflows/build.yml
vendored
@ -11,12 +11,12 @@ jobs:
|
|||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
platform: [ubuntu-latest]
|
platform: [ubuntu-latest]
|
||||||
go-version: [1.19]
|
go-version: [ '1.20' ]
|
||||||
name: Build
|
name: Build
|
||||||
runs-on: ${{ matrix.platform }}
|
runs-on: ${{ matrix.platform }}
|
||||||
steps:
|
steps:
|
||||||
- name: Setup Go
|
- name: Setup Go
|
||||||
uses: actions/setup-go@v3
|
uses: actions/setup-go@v4
|
||||||
with:
|
with:
|
||||||
go-version: ${{ matrix.go-version }}
|
go-version: ${{ matrix.go-version }}
|
||||||
|
|
||||||
@ -25,6 +25,7 @@ jobs:
|
|||||||
|
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
run: |
|
run: |
|
||||||
|
sudo snap install zig --classic --beta
|
||||||
docker pull crazymax/xgo:latest
|
docker pull crazymax/xgo:latest
|
||||||
go install github.com/crazy-max/xgo@latest
|
go install github.com/crazy-max/xgo@latest
|
||||||
sudo apt install upx
|
sudo apt install upx
|
||||||
|
32
.github/workflows/build_docker.yml
vendored
32
.github/workflows/build_docker.yml
vendored
@ -6,7 +6,7 @@ on:
|
|||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build_docker:
|
build_docker:
|
||||||
name: Docker
|
name: Build docker
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
@ -30,10 +30,36 @@ jobs:
|
|||||||
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||||
- name: Build and push
|
- name: Build and push
|
||||||
id: docker_build
|
id: docker_build
|
||||||
uses: docker/build-push-action@v3
|
uses: docker/build-push-action@v4
|
||||||
with:
|
with:
|
||||||
context: .
|
context: .
|
||||||
push: true
|
push: true
|
||||||
tags: ${{ steps.meta.outputs.tags }}
|
tags: ${{ steps.meta.outputs.tags }}
|
||||||
labels: ${{ steps.meta.outputs.labels }}
|
labels: ${{ steps.meta.outputs.labels }}
|
||||||
platforms: linux/amd64,linux/arm64
|
platforms: linux/amd64,linux/arm64
|
||||||
|
|
||||||
|
build_docker_with_aria2:
|
||||||
|
needs: build_docker
|
||||||
|
name: Build docker with aria2
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- name: Checkout repo
|
||||||
|
uses: actions/checkout@v3
|
||||||
|
with:
|
||||||
|
repository: alist-org/with_aria2
|
||||||
|
ref: main
|
||||||
|
persist-credentials: false
|
||||||
|
fetch-depth: 0
|
||||||
|
|
||||||
|
- name: Commit
|
||||||
|
run: |
|
||||||
|
git config --local user.email "i@nn.ci"
|
||||||
|
git config --local user.name "Noah Hsu"
|
||||||
|
git commit --allow-empty -m "Trigger build for ${{ github.sha }}"
|
||||||
|
|
||||||
|
- name: Push commit
|
||||||
|
uses: ad-m/github-push-action@master
|
||||||
|
with:
|
||||||
|
github_token: ${{ secrets.MY_TOKEN }}
|
||||||
|
branch: main
|
||||||
|
repository: alist-org/with_aria2
|
19
.github/workflows/changelog.yml
vendored
Normal file
19
.github/workflows/changelog.yml
vendored
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
name: auto changelog
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
tags:
|
||||||
|
- '*'
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
changelog:
|
||||||
|
name: Create Release
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- name: Checkout code
|
||||||
|
uses: actions/checkout@v3
|
||||||
|
with:
|
||||||
|
fetch-depth: 0
|
||||||
|
- run: npx changelogithub # or changelogithub@0.12 if ensure the stable result
|
||||||
|
env:
|
||||||
|
GITHUB_TOKEN: ${{secrets.MY_TOKEN}}
|
17
.github/workflows/issue_check_inactive.yml
vendored
17
.github/workflows/issue_check_inactive.yml
vendored
@ -1,17 +0,0 @@
|
|||||||
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
|
|
||||||
body: Hello, this issue has been inactive for more than 30 days and will be closed if inactive for another 30 days.
|
|
8
.github/workflows/issue_close_question.yml
vendored
8
.github/workflows/issue_close_question.yml
vendored
@ -2,7 +2,7 @@ name: Close need info
|
|||||||
|
|
||||||
on:
|
on:
|
||||||
schedule:
|
schedule:
|
||||||
- cron: "0 0 */7 * *"
|
- cron: "0 0 */1 * *"
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
@ -15,8 +15,8 @@ jobs:
|
|||||||
actions: 'close-issues'
|
actions: 'close-issues'
|
||||||
token: ${{ secrets.GITHUB_TOKEN }}
|
token: ${{ secrets.GITHUB_TOKEN }}
|
||||||
labels: 'question'
|
labels: 'question'
|
||||||
inactive-day: 7
|
inactive-day: 3
|
||||||
close-reason: 'not_planned'
|
close-reason: 'not_planned'
|
||||||
body: |
|
body: |
|
||||||
Hello @${{ github.event.issue.user.login }}, this issue was closed due to no activities in 7 days.
|
Hello @${{ github.event.issue.user.login }}, this issue was closed due to no activities in 3 days.
|
||||||
你好 @${{ github.event.issue.user.login }},此issue因超过7天未回复被关闭。
|
你好 @${{ github.event.issue.user.login }},此issue因超过3天未回复被关闭。
|
@ -14,8 +14,8 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
actions: 'close-issues'
|
actions: 'close-issues'
|
||||||
token: ${{ secrets.GITHUB_TOKEN }}
|
token: ${{ secrets.GITHUB_TOKEN }}
|
||||||
labels: 'inactive'
|
labels: 'stale'
|
||||||
inactive-day: 30
|
inactive-day: 8
|
||||||
close-reason: 'not_planned'
|
close-reason: 'not_planned'
|
||||||
body: |
|
body: |
|
||||||
Hello @${{ github.event.issue.user.login }}, this issue was closed due to inactive more than 60 days. You can reopen or recreate it if you think it should continue.
|
Hello @${{ github.event.issue.user.login }}, this issue was closed due to inactive more than 52 days. You can reopen or recreate it if you think it should continue. Thank you for your contributions again.
|
6
.github/workflows/issue_question.yml
vendored
6
.github/workflows/issue_question.yml
vendored
@ -10,11 +10,11 @@ jobs:
|
|||||||
if: github.event.label.name == 'question'
|
if: github.event.label.name == 'question'
|
||||||
steps:
|
steps:
|
||||||
- name: Create comment
|
- name: Create comment
|
||||||
uses: actions-cool/issues-helper@v3.3.3
|
uses: actions-cool/issues-helper@v3.4.0
|
||||||
with:
|
with:
|
||||||
actions: 'create-comment'
|
actions: 'create-comment'
|
||||||
token: ${{ secrets.GITHUB_TOKEN }}
|
token: ${{ secrets.GITHUB_TOKEN }}
|
||||||
issue-number: ${{ github.event.issue.number }}
|
issue-number: ${{ github.event.issue.number }}
|
||||||
body: |
|
body: |
|
||||||
Hello @${{ github.event.issue.user.login }}, please input issue by template and add detail. Issues labeled by `question` will be closed if no activities in 7 days.
|
Hello @${{ github.event.issue.user.login }}, please input issue by template and add detail. Issues labeled by `question` will be closed if no activities in 3 days.
|
||||||
你好 @${{ github.event.issue.user.login }},请按照issue模板填写, 并详细说明问题/复现步骤/复现链接/实现思路或提供更多信息等, 7天内未回复issue自动关闭。
|
你好 @${{ github.event.issue.user.login }},请按照issue模板填写, 并详细说明问题/日志记录/复现步骤/复现链接/实现思路或提供更多信息等, 3天内未回复issue自动关闭。
|
69
.github/workflows/release.yml
vendored
69
.github/workflows/release.yml
vendored
@ -1,33 +1,27 @@
|
|||||||
name: release
|
name: release
|
||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
release:
|
||||||
tags:
|
types: [ published ]
|
||||||
- '*'
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
changelog:
|
|
||||||
name: Create Release
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- name: Checkout code
|
|
||||||
uses: actions/checkout@v3
|
|
||||||
with:
|
|
||||||
fetch-depth: 0
|
|
||||||
- run: npx changelogithub # or changelogithub@0.12 if ensure the stable result
|
|
||||||
env:
|
|
||||||
GITHUB_TOKEN: ${{secrets.MY_TOKEN}}
|
|
||||||
release:
|
release:
|
||||||
needs: changelog
|
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
platform: [ubuntu-latest]
|
platform: [ ubuntu-latest ]
|
||||||
go-version: [1.19]
|
go-version: [ '1.20' ]
|
||||||
name: Release
|
name: Release
|
||||||
runs-on: ${{ matrix.platform }}
|
runs-on: ${{ matrix.platform }}
|
||||||
steps:
|
steps:
|
||||||
|
- name: Prerelease
|
||||||
|
uses: irongut/EditRelease@v1.2.0
|
||||||
|
with:
|
||||||
|
token: ${{ secrets.MY_TOKEN }}
|
||||||
|
id: ${{ github.event.release.id }}
|
||||||
|
prerelease: true
|
||||||
|
|
||||||
- name: Setup Go
|
- name: Setup Go
|
||||||
uses: actions/setup-go@v3
|
uses: actions/setup-go@v4
|
||||||
with:
|
with:
|
||||||
go-version: ${{ matrix.go-version }}
|
go-version: ${{ matrix.go-version }}
|
||||||
|
|
||||||
@ -38,6 +32,7 @@ jobs:
|
|||||||
|
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
run: |
|
run: |
|
||||||
|
sudo snap install zig --classic --beta
|
||||||
docker pull crazymax/xgo:latest
|
docker pull crazymax/xgo:latest
|
||||||
go install github.com/crazy-max/xgo@latest
|
go install github.com/crazy-max/xgo@latest
|
||||||
sudo apt install upx
|
sudo apt install upx
|
||||||
@ -46,7 +41,41 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
bash build.sh release
|
bash build.sh release
|
||||||
|
|
||||||
- name: Release
|
- name: Release latest
|
||||||
|
uses: irongut/EditRelease@v1.2.0
|
||||||
|
with:
|
||||||
|
token: ${{ secrets.MY_TOKEN }}
|
||||||
|
id: ${{ github.event.release.id }}
|
||||||
|
prerelease: false
|
||||||
|
|
||||||
|
- name: Upload assets
|
||||||
uses: softprops/action-gh-release@v1
|
uses: softprops/action-gh-release@v1
|
||||||
with:
|
with:
|
||||||
files: build/compress/*
|
files: build/compress/*
|
||||||
|
|
||||||
|
release_desktop:
|
||||||
|
needs: release
|
||||||
|
name: Release desktop
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- name: Checkout repo
|
||||||
|
uses: actions/checkout@v3
|
||||||
|
with:
|
||||||
|
repository: alist-org/desktop-release
|
||||||
|
ref: main
|
||||||
|
persist-credentials: false
|
||||||
|
fetch-depth: 0
|
||||||
|
|
||||||
|
- name: Add tag
|
||||||
|
run: |
|
||||||
|
git config --local user.email "i@nn.ci"
|
||||||
|
git config --local user.name "Andy Hsu"
|
||||||
|
version=$(wget -qO- -t1 -T2 "https://api.github.com/repos/alist-org/alist/releases/latest" | grep "tag_name" | head -n 1 | awk -F ":" '{print $2}' | sed 's/\"//g;s/,//g;s/ //g')
|
||||||
|
git tag -a $version -m "release $version"
|
||||||
|
|
||||||
|
- name: Push tags
|
||||||
|
uses: ad-m/github-push-action@master
|
||||||
|
with:
|
||||||
|
github_token: ${{ secrets.MY_TOKEN }}
|
||||||
|
branch: main
|
||||||
|
repository: alist-org/desktop-release
|
32
.github/workflows/release_docker.yml
vendored
32
.github/workflows/release_docker.yml
vendored
@ -7,7 +7,7 @@ on:
|
|||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
release_docker:
|
release_docker:
|
||||||
name: Docker
|
name: Release Docker
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
@ -33,10 +33,36 @@ jobs:
|
|||||||
|
|
||||||
- name: Build and push
|
- name: Build and push
|
||||||
id: docker_build
|
id: docker_build
|
||||||
uses: docker/build-push-action@v3
|
uses: docker/build-push-action@v4
|
||||||
with:
|
with:
|
||||||
context: .
|
context: .
|
||||||
push: true
|
push: true
|
||||||
tags: ${{ steps.meta.outputs.tags }}
|
tags: ${{ steps.meta.outputs.tags }}
|
||||||
labels: ${{ steps.meta.outputs.labels }}
|
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,linux/arm/v7,linux/386,linux/arm/v6,linux/s390x
|
||||||
|
|
||||||
|
release_docker_with_aria2:
|
||||||
|
needs: release_docker
|
||||||
|
name: Release docker with aria2
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- name: Checkout repo
|
||||||
|
uses: actions/checkout@v3
|
||||||
|
with:
|
||||||
|
repository: alist-org/with_aria2
|
||||||
|
ref: main
|
||||||
|
persist-credentials: false
|
||||||
|
fetch-depth: 0
|
||||||
|
|
||||||
|
- name: Add tag
|
||||||
|
run: |
|
||||||
|
git config --local user.email "i@nn.ci"
|
||||||
|
git config --local user.name "Andy Hsu"
|
||||||
|
git tag -a ${{ github.ref_name }} -m "release ${{ github.ref_name }}"
|
||||||
|
|
||||||
|
- name: Push tags
|
||||||
|
uses: ad-m/github-push-action@master
|
||||||
|
with:
|
||||||
|
github_token: ${{ secrets.MY_TOKEN }}
|
||||||
|
branch: main
|
||||||
|
repository: alist-org/with_aria2
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
|
|
||||||
Prerequisites:
|
Prerequisites:
|
||||||
|
|
||||||
- [git](https://nodejs.org/zh-cn/)
|
- [git](https://git-scm.com)
|
||||||
- [Go 1.19+](https://golang.org/doc/install)
|
- [Go 1.19+](https://golang.org/doc/install)
|
||||||
- [gcc](https://gcc.gnu.org/)
|
- [gcc](https://gcc.gnu.org/)
|
||||||
- [nodejs](https://nodejs.org/)
|
- [nodejs](https://nodejs.org/)
|
||||||
|
12
Dockerfile
12
Dockerfile
@ -1,18 +1,18 @@
|
|||||||
FROM alpine:edge as builder
|
FROM alpine:3.18 as builder
|
||||||
LABEL stage=go-builder
|
LABEL stage=go-builder
|
||||||
WORKDIR /app/
|
WORKDIR /app/
|
||||||
COPY ./ ./
|
COPY ./ ./
|
||||||
RUN apk add --no-cache bash git go gcc musl-dev curl; \
|
RUN apk add --no-cache bash curl gcc git go musl-dev; \
|
||||||
bash build.sh release docker
|
bash build.sh release docker
|
||||||
|
|
||||||
FROM alpine:edge
|
FROM alpine:3.18
|
||||||
LABEL MAINTAINER="i@nn.ci"
|
LABEL MAINTAINER="i@nn.ci"
|
||||||
VOLUME /opt/alist/data/
|
VOLUME /opt/alist/data/
|
||||||
WORKDIR /opt/alist/
|
WORKDIR /opt/alist/
|
||||||
COPY --from=builder /app/bin/alist ./
|
COPY --from=builder /app/bin/alist ./
|
||||||
COPY entrypoint.sh /entrypoint.sh
|
COPY entrypoint.sh /entrypoint.sh
|
||||||
RUN apk add ca-certificates bash su-exec; \
|
RUN apk add --no-cache bash ca-certificates su-exec tzdata; \
|
||||||
chmod +x /entrypoint.sh
|
chmod +x /entrypoint.sh
|
||||||
ENV PUID=0 PGID=0 UMASK=022
|
ENV PUID=0 PGID=0 UMASK=022
|
||||||
EXPOSE 5244
|
EXPOSE 5244 5245
|
||||||
ENTRYPOINT [ "/entrypoint.sh" ]
|
CMD [ "/entrypoint.sh" ]
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
<div align="center">
|
<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>
|
<a href="https://alist.nn.ci"><img height="100px" alt="logo" src="https://cdn.jsdelivr.net/gh/alist-org/logo@main/logo.svg"/></a>
|
||||||
<p><em>🗂️A file list program that supports multiple storage, powered by Gin and Solidjs.</em></p>
|
<p><em>🗂️A file list program that supports multiple storages, powered by Gin and Solidjs.</em></p>
|
||||||
<div>
|
<div>
|
||||||
<a href="https://goreportcard.com/report/github.com/alist-org/alist/v3">
|
<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" />
|
<img src="https://goreportcard.com/badge/github.com/alist-org/alist/v3" alt="latest version" />
|
||||||
@ -53,6 +53,7 @@ English | [中文](./README_cn.md) | [Contributing](./CONTRIBUTING.md) | [CODE_O
|
|||||||
- [x] FTP / SFTP
|
- [x] FTP / SFTP
|
||||||
- [x] [PikPak](https://www.mypikpak.com/)
|
- [x] [PikPak](https://www.mypikpak.com/)
|
||||||
- [x] [S3](https://aws.amazon.com/s3/)
|
- [x] [S3](https://aws.amazon.com/s3/)
|
||||||
|
- [x] [Seafile](https://seafile.com/)
|
||||||
- [x] [UPYUN Storage Service](https://www.upyun.com/products/file-storage)
|
- [x] [UPYUN Storage Service](https://www.upyun.com/products/file-storage)
|
||||||
- [x] WebDav(Support OneDrive/SharePoint without API)
|
- [x] WebDav(Support OneDrive/SharePoint without API)
|
||||||
- [x] Teambition([China](https://www.teambition.com/ ),[International](https://us.teambition.com/ ))
|
- [x] Teambition([China](https://www.teambition.com/ ),[International](https://us.teambition.com/ ))
|
||||||
@ -60,6 +61,8 @@ English | [中文](./README_cn.md) | [Contributing](./CONTRIBUTING.md) | [CODE_O
|
|||||||
- [x] [139yun](https://yun.139.com/) (Personal, Family)
|
- [x] [139yun](https://yun.139.com/) (Personal, Family)
|
||||||
- [x] [YandexDisk](https://disk.yandex.com/)
|
- [x] [YandexDisk](https://disk.yandex.com/)
|
||||||
- [x] [BaiduNetdisk](http://pan.baidu.com/)
|
- [x] [BaiduNetdisk](http://pan.baidu.com/)
|
||||||
|
- [x] [Terabox](https://www.terabox.com/main)
|
||||||
|
- [x] [UC](https://drive.uc.cn)
|
||||||
- [x] [Quark](https://pan.quark.cn)
|
- [x] [Quark](https://pan.quark.cn)
|
||||||
- [x] [Thunder](https://pan.xunlei.com)
|
- [x] [Thunder](https://pan.xunlei.com)
|
||||||
- [x] [Lanzou](https://www.lanzou.com/)
|
- [x] [Lanzou](https://www.lanzou.com/)
|
||||||
@ -69,6 +72,7 @@ English | [中文](./README_cn.md) | [Contributing](./CONTRIBUTING.md) | [CODE_O
|
|||||||
- [x] [Baidu photo](https://photo.baidu.com/)
|
- [x] [Baidu photo](https://photo.baidu.com/)
|
||||||
- [x] SMB
|
- [x] SMB
|
||||||
- [x] [115](https://115.com/)
|
- [x] [115](https://115.com/)
|
||||||
|
- [X] Cloudreve
|
||||||
- [x] Easy to deploy and out-of-the-box
|
- [x] Easy to deploy and out-of-the-box
|
||||||
- [x] File preview (PDF, markdown, code, plain text, ...)
|
- [x] File preview (PDF, markdown, code, plain text, ...)
|
||||||
- [x] Image preview in gallery mode
|
- [x] Image preview in gallery mode
|
||||||
@ -106,6 +110,7 @@ https://alist.nn.ci/guide/sponsor.html
|
|||||||
|
|
||||||
### Special sponsors
|
### Special sponsors
|
||||||
|
|
||||||
|
- [亚洲云 - 高防服务器|服务器租用|福州高防|广东电信|香港服务器|美国服务器|海外服务器 - 国内靠谱的企业级云计算服务提供商](https://www.asiayun.com/aff/QQCOOQKZ) (sponsored Chinese API server)
|
||||||
- [找资源 - 阿里云盘资源搜索引擎](https://zhaoziyuan.la/)
|
- [找资源 - 阿里云盘资源搜索引擎](https://zhaoziyuan.la/)
|
||||||
- [KinhDown 百度云盘不限速下载!永久免费!已稳定运行3年!非常可靠!Q群 -> 786799372](https://kinhdown.com)
|
- [KinhDown 百度云盘不限速下载!永久免费!已稳定运行3年!非常可靠!Q群 -> 786799372](https://kinhdown.com)
|
||||||
- [JetBrains: Essential tools for software developers and teams](https://www.jetbrains.com/)
|
- [JetBrains: Essential tools for software developers and teams](https://www.jetbrains.com/)
|
||||||
|
18
README_cn.md
18
README_cn.md
@ -41,7 +41,7 @@
|
|||||||
|
|
||||||
[English](./README.md) | 中文 | [Contributing](./CONTRIBUTING.md) | [CODE_OF_CONDUCT](./CODE_OF_CONDUCT.md)
|
[English](./README.md) | 中文 | [Contributing](./CONTRIBUTING.md) | [CODE_OF_CONDUCT](./CODE_OF_CONDUCT.md)
|
||||||
|
|
||||||
## Features
|
## 功能
|
||||||
|
|
||||||
- [x] 多种存储
|
- [x] 多种存储
|
||||||
- [x] 本地存储
|
- [x] 本地存储
|
||||||
@ -53,6 +53,7 @@
|
|||||||
- [x] FTP / SFTP
|
- [x] FTP / SFTP
|
||||||
- [x] [PikPak](https://www.mypikpak.com/)
|
- [x] [PikPak](https://www.mypikpak.com/)
|
||||||
- [x] [S3](https://aws.amazon.com/cn/s3/)
|
- [x] [S3](https://aws.amazon.com/cn/s3/)
|
||||||
|
- [x] [Seafile](https://seafile.com/)
|
||||||
- [x] [又拍云对象存储](https://www.upyun.com/products/file-storage)
|
- [x] [又拍云对象存储](https://www.upyun.com/products/file-storage)
|
||||||
- [x] WebDav(支持无API的OneDrive/SharePoint)
|
- [x] WebDav(支持无API的OneDrive/SharePoint)
|
||||||
- [x] Teambition([中国](https://www.teambition.com/ ),[国际](https://us.teambition.com/ ))
|
- [x] Teambition([中国](https://www.teambition.com/ ),[国际](https://us.teambition.com/ ))
|
||||||
@ -60,6 +61,7 @@
|
|||||||
- [x] [和彩云](https://yun.139.com/) (个人云, 家庭云)
|
- [x] [和彩云](https://yun.139.com/) (个人云, 家庭云)
|
||||||
- [x] [Yandex.Disk](https://disk.yandex.com/)
|
- [x] [Yandex.Disk](https://disk.yandex.com/)
|
||||||
- [x] [百度网盘](http://pan.baidu.com/)
|
- [x] [百度网盘](http://pan.baidu.com/)
|
||||||
|
- [x] [UC网盘](https://drive.uc.cn)
|
||||||
- [x] [夸克网盘](https://pan.quark.cn)
|
- [x] [夸克网盘](https://pan.quark.cn)
|
||||||
- [x] [迅雷网盘](https://pan.xunlei.com)
|
- [x] [迅雷网盘](https://pan.xunlei.com)
|
||||||
- [x] [蓝奏云](https://www.lanzou.com/)
|
- [x] [蓝奏云](https://www.lanzou.com/)
|
||||||
@ -69,6 +71,7 @@
|
|||||||
- [x] [一刻相册](https://photo.baidu.com/)
|
- [x] [一刻相册](https://photo.baidu.com/)
|
||||||
- [x] SMB
|
- [x] SMB
|
||||||
- [x] [115](https://115.com/)
|
- [x] [115](https://115.com/)
|
||||||
|
- [X] Cloudreve
|
||||||
- [x] 部署方便,开箱即用
|
- [x] 部署方便,开箱即用
|
||||||
- [x] 文件预览(PDF、markdown、代码、纯文本……)
|
- [x] 文件预览(PDF、markdown、代码、纯文本……)
|
||||||
- [x] 画廊模式下的图像预览
|
- [x] 画廊模式下的图像预览
|
||||||
@ -87,7 +90,7 @@
|
|||||||
- [x] 离线下载
|
- [x] 离线下载
|
||||||
- [x] 跨存储复制文件
|
- [x] 跨存储复制文件
|
||||||
|
|
||||||
## Document
|
## 文档
|
||||||
|
|
||||||
<https://alist.nn.ci/zh/>
|
<https://alist.nn.ci/zh/>
|
||||||
|
|
||||||
@ -95,21 +98,22 @@
|
|||||||
|
|
||||||
<https://al.nn.ci>
|
<https://al.nn.ci>
|
||||||
|
|
||||||
## Discussion
|
## 讨论
|
||||||
|
|
||||||
一般问题请到[讨论论坛](https://github.com/Xhofe/alist/discussions) ,**issue仅针对错误报告和功能请求。**
|
一般问题请到[讨论论坛](https://github.com/Xhofe/alist/discussions) ,**issue仅针对错误报告和功能请求。**
|
||||||
|
|
||||||
## Sponsor
|
## 赞助
|
||||||
|
|
||||||
AList 是一个开源软件,如果你碰巧喜欢这个项目,并希望我继续下去,请考虑赞助我或提供一个单一的捐款!感谢所有的爱和支持:https://alist.nn.ci/zh/guide/sponsor.html
|
AList 是一个开源软件,如果你碰巧喜欢这个项目,并希望我继续下去,请考虑赞助我或提供一个单一的捐款!感谢所有的爱和支持:https://alist.nn.ci/zh/guide/sponsor.html
|
||||||
|
|
||||||
### Special sponsors
|
### 特别赞助
|
||||||
|
|
||||||
|
- [亚洲云 - 高防服务器|服务器租用|福州高防|广东电信|香港服务器|美国服务器|海外服务器 - 国内靠谱的企业级云计算服务提供商](https://www.asiayun.com/aff/QQCOOQKZ) (国内API服务器赞助)
|
||||||
- [找资源 - 阿里云盘资源搜索引擎](https://zhaoziyuan.la/)
|
- [找资源 - 阿里云盘资源搜索引擎](https://zhaoziyuan.la/)
|
||||||
- [KinhDown 百度云盘不限速下载!永久免费!已稳定运行3年!非常可靠!Q群 -> 786799372](https://kinhdown.com)
|
- [KinhDown 百度云盘不限速下载!永久免费!已稳定运行3年!非常可靠!Q群 -> 786799372](https://kinhdown.com)
|
||||||
- [JetBrains: Essential tools for software developers and teams](https://www.jetbrains.com/)
|
- [JetBrains: Essential tools for software developers and teams](https://www.jetbrains.com/)
|
||||||
|
|
||||||
## Contributors
|
## 贡献者
|
||||||
|
|
||||||
Thanks goes to these wonderful people:
|
Thanks goes to these wonderful people:
|
||||||
|
|
||||||
@ -128,4 +132,4 @@ Thanks goes to these wonderful people:
|
|||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
> [@博客](https://nn.ci/) · [@GitHub](https://github.com/Xhofe) · [@Telegram群](https://t.me/alist_chat) · [@Discord](https://discord.gg/F4ymsH4xv2)
|
> [@博客](https://nn.ci/) · [@GitHub](https://github.com/Xhofe) · [@Telegram群](https://t.me/alist_chat) · [@Discord](https://discord.gg/F4ymsH4xv2)
|
||||||
|
43
build.sh
43
build.sh
@ -1,7 +1,7 @@
|
|||||||
appName="alist"
|
appName="alist"
|
||||||
builtAt="$(date +'%F %T %z')"
|
builtAt="$(date +'%F %T %z')"
|
||||||
goVersion=$(go version | sed 's/go version //')
|
goVersion=$(go version | sed 's/go version //')
|
||||||
gitAuthor=$(git show -s --format='format:%aN <%ae>' HEAD)
|
gitAuthor="Xhofe <i@nn.ci>"
|
||||||
gitCommit=$(git log --pretty=format:"%h" -1)
|
gitCommit=$(git log --pretty=format:"%h" -1)
|
||||||
|
|
||||||
if [ "$1" = "dev" ]; then
|
if [ "$1" = "dev" ]; then
|
||||||
@ -41,14 +41,45 @@ FetchWebRelease() {
|
|||||||
rm -rf dist.tar.gz
|
rm -rf dist.tar.gz
|
||||||
}
|
}
|
||||||
|
|
||||||
|
BuildWinArm64() {
|
||||||
|
echo building for windows-arm64
|
||||||
|
chmod +x ./wrapper/zcc-arm64
|
||||||
|
chmod +x ./wrapper/zcxx-arm64
|
||||||
|
export GOOS=windows
|
||||||
|
export GOARCH=arm64
|
||||||
|
export CC=$(pwd)/wrapper/zcc-arm64
|
||||||
|
export CXX=$(pwd)/wrapper/zcxx-arm64
|
||||||
|
go build -o "$1" -ldflags="$ldflags" -tags=jsoniter .
|
||||||
|
}
|
||||||
|
|
||||||
BuildDev() {
|
BuildDev() {
|
||||||
rm -rf .git/
|
rm -rf .git/
|
||||||
xgo -targets=linux/amd64,windows/amd64,darwin/amd64 -out "$appName" -ldflags="$ldflags" -tags=jsoniter .
|
|
||||||
mkdir -p "dist"
|
mkdir -p "dist"
|
||||||
|
muslflags="--extldflags '-static -fpic' $ldflags"
|
||||||
|
BASE="https://musl.nn.ci/"
|
||||||
|
FILES=(x86_64-linux-musl-cross aarch64-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
|
||||||
|
OS_ARCHES=(linux-musl-amd64 linux-musl-arm64)
|
||||||
|
CGO_ARGS=(x86_64-linux-musl-gcc aarch64-linux-musl-gcc)
|
||||||
|
for i in "${!OS_ARCHES[@]}"; do
|
||||||
|
os_arch=${OS_ARCHES[$i]}
|
||||||
|
cgo_cc=${CGO_ARGS[$i]}
|
||||||
|
echo building for ${os_arch}
|
||||||
|
export GOOS=${os_arch%%-*}
|
||||||
|
export GOARCH=${os_arch##*-}
|
||||||
|
export CC=${cgo_cc}
|
||||||
|
export CGO_ENABLED=1
|
||||||
|
go build -o ./dist/$appName-$os_arch -ldflags="$muslflags" -tags=jsoniter .
|
||||||
|
done
|
||||||
|
xgo -targets=windows/amd64,darwin/amd64 -out "$appName" -ldflags="$ldflags" -tags=jsoniter .
|
||||||
mv alist-* dist
|
mv alist-* dist
|
||||||
cd dist
|
cd dist
|
||||||
upx -9 ./alist-linux*
|
cp ./alist-windows-amd64.exe ./alist-windows-amd64-upx.exe
|
||||||
upx -9 ./alist-windows*
|
upx -9 ./alist-windows-amd64-upx.exe
|
||||||
find . -type f -print0 | xargs -0 md5sum >md5.txt
|
find . -type f -print0 | xargs -0 md5sum >md5.txt
|
||||||
cat md5.txt
|
cat md5.txt
|
||||||
}
|
}
|
||||||
@ -80,10 +111,12 @@ BuildRelease() {
|
|||||||
export CGO_ENABLED=1
|
export CGO_ENABLED=1
|
||||||
go build -o ./build/$appName-$os_arch -ldflags="$muslflags" -tags=jsoniter .
|
go build -o ./build/$appName-$os_arch -ldflags="$muslflags" -tags=jsoniter .
|
||||||
done
|
done
|
||||||
|
BuildWinArm64 ./build/alist-windows-arm64.exe
|
||||||
xgo -out "$appName" -ldflags="$ldflags" -tags=jsoniter .
|
xgo -out "$appName" -ldflags="$ldflags" -tags=jsoniter .
|
||||||
# why? Because some target platforms seem to have issues with upx compression
|
# why? Because some target platforms seem to have issues with upx compression
|
||||||
upx -9 ./alist-linux-amd64
|
upx -9 ./alist-linux-amd64
|
||||||
upx -9 ./alist-windows*
|
cp ./alist-windows-amd64.exe ./alist-windows-amd64-upx.exe
|
||||||
|
upx -9 ./alist-windows-amd64-upx.exe
|
||||||
mv alist-* build
|
mv alist-* build
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -22,6 +22,8 @@ var Cancel2FACmd = &cobra.Command{
|
|||||||
err := op.Cancel2FAByUser(admin)
|
err := op.Cancel2FAByUser(admin)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
utils.Log.Errorf("failed to cancel 2FA: %+v", err)
|
utils.Log.Errorf("failed to cancel 2FA: %+v", err)
|
||||||
|
} else {
|
||||||
|
utils.Log.Info("2FA canceled")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
@ -6,4 +6,5 @@ var (
|
|||||||
NoPrefix bool
|
NoPrefix bool
|
||||||
Dev bool
|
Dev bool
|
||||||
ForceBinDir bool
|
ForceBinDir bool
|
||||||
|
LogStd bool
|
||||||
)
|
)
|
||||||
|
@ -78,10 +78,19 @@ func writeFile(name string, data interface{}) {
|
|||||||
func generateDriversJson() {
|
func generateDriversJson() {
|
||||||
drivers := make(Drivers)
|
drivers := make(Drivers)
|
||||||
drivers["drivers"] = make(KV[interface{}])
|
drivers["drivers"] = make(KV[interface{}])
|
||||||
|
drivers["config"] = make(KV[interface{}])
|
||||||
driverInfoMap := op.GetDriverInfoMap()
|
driverInfoMap := op.GetDriverInfoMap()
|
||||||
for k, v := range driverInfoMap {
|
for k, v := range driverInfoMap {
|
||||||
drivers["drivers"][k] = convert(k)
|
drivers["drivers"][k] = convert(k)
|
||||||
items := make(KV[interface{}])
|
items := make(KV[interface{}])
|
||||||
|
config := map[string]string{}
|
||||||
|
if v.Config.Alert != "" {
|
||||||
|
alert := strings.SplitN(v.Config.Alert, "|", 2)
|
||||||
|
if len(alert) > 1 {
|
||||||
|
config["alert"] = alert[1]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
drivers["config"][k] = config
|
||||||
for i := range v.Additional {
|
for i := range v.Additional {
|
||||||
item := v.Additional[i]
|
item := v.Additional[i]
|
||||||
items[item.Name] = convert(item.Name)
|
items[item.Name] = convert(item.Name)
|
||||||
|
@ -24,9 +24,10 @@ func Execute() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
RootCmd.PersistentFlags().StringVar(&flags.DataDir, "data", "data", "config file")
|
RootCmd.PersistentFlags().StringVar(&flags.DataDir, "data", "data", "data folder")
|
||||||
RootCmd.PersistentFlags().BoolVar(&flags.Debug, "debug", false, "start with debug mode")
|
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.NoPrefix, "no-prefix", false, "disable env prefix")
|
||||||
RootCmd.PersistentFlags().BoolVar(&flags.Dev, "dev", false, "start with dev mode")
|
RootCmd.PersistentFlags().BoolVar(&flags.Dev, "dev", false, "start with dev mode")
|
||||||
RootCmd.PersistentFlags().BoolVar(&flags.ForceBinDir, "force-bin-dir", false, "Force to use the directory where the binary file is located as data directory")
|
RootCmd.PersistentFlags().BoolVar(&flags.ForceBinDir, "force-bin-dir", false, "Force to use the directory where the binary file is located as data directory")
|
||||||
|
RootCmd.PersistentFlags().BoolVar(&flags.LogStd, "log-std", false, "Force to log to std")
|
||||||
}
|
}
|
||||||
|
@ -6,6 +6,7 @@ import (
|
|||||||
"net/http"
|
"net/http"
|
||||||
"os"
|
"os"
|
||||||
"os/signal"
|
"os/signal"
|
||||||
|
"sync"
|
||||||
"syscall"
|
"syscall"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
@ -28,7 +29,12 @@ var ServerCmd = &cobra.Command{
|
|||||||
the address is defined in config file`,
|
the address is defined in config file`,
|
||||||
Run: func(cmd *cobra.Command, args []string) {
|
Run: func(cmd *cobra.Command, args []string) {
|
||||||
Init()
|
Init()
|
||||||
|
if conf.Conf.DelayedStart != 0 {
|
||||||
|
utils.Log.Infof("delayed start for %d seconds", conf.Conf.DelayedStart)
|
||||||
|
time.Sleep(time.Duration(conf.Conf.DelayedStart) * time.Second)
|
||||||
|
}
|
||||||
bootstrap.InitAria2()
|
bootstrap.InitAria2()
|
||||||
|
bootstrap.InitQbittorrent()
|
||||||
bootstrap.LoadStorages()
|
bootstrap.LoadStorages()
|
||||||
if !flags.Debug && !flags.Dev {
|
if !flags.Debug && !flags.Dev {
|
||||||
gin.SetMode(gin.ReleaseMode)
|
gin.SetMode(gin.ReleaseMode)
|
||||||
@ -36,42 +42,62 @@ the address is defined in config file`,
|
|||||||
r := gin.New()
|
r := gin.New()
|
||||||
r.Use(gin.LoggerWithWriter(log.StandardLogger().Out), gin.RecoveryWithWriter(log.StandardLogger().Out))
|
r.Use(gin.LoggerWithWriter(log.StandardLogger().Out), gin.RecoveryWithWriter(log.StandardLogger().Out))
|
||||||
server.Init(r)
|
server.Init(r)
|
||||||
base := fmt.Sprintf("%s:%d", conf.Conf.Address, conf.Conf.Port)
|
var httpSrv, httpsSrv *http.Server
|
||||||
utils.Log.Infof("start server @ %s", base)
|
if !conf.Conf.Scheme.DisableHttp {
|
||||||
srv := &http.Server{Addr: base, Handler: r}
|
httpBase := fmt.Sprintf("%s:%d", conf.Conf.Address, conf.Conf.Port)
|
||||||
go func() {
|
utils.Log.Infof("start HTTP server @ %s", httpBase)
|
||||||
var err error
|
httpSrv = &http.Server{Addr: httpBase, Handler: r}
|
||||||
if conf.Conf.Scheme.Https {
|
go func() {
|
||||||
//err = r.RunTLS(base, conf.Conf.Scheme.CertFile, conf.Conf.Scheme.KeyFile)
|
err := httpSrv.ListenAndServe()
|
||||||
err = srv.ListenAndServeTLS(conf.Conf.Scheme.CertFile, conf.Conf.Scheme.KeyFile)
|
if err != nil && err != http.ErrServerClosed {
|
||||||
} else {
|
utils.Log.Fatalf("failed to start: %s", err.Error())
|
||||||
err = srv.ListenAndServe()
|
}
|
||||||
}
|
}()
|
||||||
if err != nil && err != http.ErrServerClosed {
|
}
|
||||||
utils.Log.Fatalf("failed to start: %s", err.Error())
|
if conf.Conf.Scheme.Https {
|
||||||
}
|
httpsBase := fmt.Sprintf("%s:%d", conf.Conf.Address, conf.Conf.HttpsPort)
|
||||||
}()
|
utils.Log.Infof("start HTTPS server @ %s", httpsBase)
|
||||||
|
httpsSrv = &http.Server{Addr: httpsBase, Handler: r}
|
||||||
|
go func() {
|
||||||
|
err := httpsSrv.ListenAndServeTLS(conf.Conf.Scheme.CertFile, conf.Conf.Scheme.KeyFile)
|
||||||
|
if err != nil && err != http.ErrServerClosed {
|
||||||
|
utils.Log.Fatalf("failed to start: %s", err.Error())
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
}
|
||||||
// Wait for interrupt signal to gracefully shutdown the server with
|
// Wait for interrupt signal to gracefully shutdown the server with
|
||||||
// a timeout of 5 seconds.
|
// a timeout of 1 second.
|
||||||
quit := make(chan os.Signal)
|
quit := make(chan os.Signal, 1)
|
||||||
// kill (no param) default send syscanll.SIGTERM
|
// kill (no param) default send syscanll.SIGTERM
|
||||||
// kill -2 is syscall.SIGINT
|
// kill -2 is syscall.SIGINT
|
||||||
// kill -9 is syscall. SIGKILL but can"t be catch, so don't need add it
|
// kill -9 is syscall. SIGKILL but can"t be catch, so don't need add it
|
||||||
signal.Notify(quit, syscall.SIGINT, syscall.SIGTERM)
|
signal.Notify(quit, syscall.SIGINT, syscall.SIGTERM)
|
||||||
<-quit
|
<-quit
|
||||||
utils.Log.Println("Shutdown Server ...")
|
utils.Log.Println("Shutdown server...")
|
||||||
|
|
||||||
ctx, cancel := context.WithTimeout(context.Background(), 1*time.Second)
|
ctx, cancel := context.WithTimeout(context.Background(), 1*time.Second)
|
||||||
defer cancel()
|
defer cancel()
|
||||||
if err := srv.Shutdown(ctx); err != nil {
|
var wg sync.WaitGroup
|
||||||
utils.Log.Fatal("Server Shutdown:", err)
|
if !conf.Conf.Scheme.DisableHttp {
|
||||||
|
wg.Add(1)
|
||||||
|
go func() {
|
||||||
|
defer wg.Done()
|
||||||
|
if err := httpSrv.Shutdown(ctx); err != nil {
|
||||||
|
utils.Log.Fatal("HTTP server shutdown:", err)
|
||||||
|
}
|
||||||
|
}()
|
||||||
}
|
}
|
||||||
// catching ctx.Done(). timeout of 3 seconds.
|
if conf.Conf.Scheme.Https {
|
||||||
select {
|
wg.Add(1)
|
||||||
case <-ctx.Done():
|
go func() {
|
||||||
utils.Log.Println("timeout of 1 seconds.")
|
defer wg.Done()
|
||||||
|
if err := httpsSrv.Shutdown(ctx); err != nil {
|
||||||
|
utils.Log.Fatal("HTTPS server shutdown:", err)
|
||||||
|
}
|
||||||
|
}()
|
||||||
}
|
}
|
||||||
utils.Log.Println("Server exiting")
|
wg.Wait()
|
||||||
|
utils.Log.Println("Server exit")
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
52
cmd/storage.go
Normal file
52
cmd/storage.go
Normal file
@ -0,0 +1,52 @@
|
|||||||
|
/*
|
||||||
|
Copyright © 2023 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"
|
||||||
|
)
|
||||||
|
|
||||||
|
// storageCmd represents the storage command
|
||||||
|
var storageCmd = &cobra.Command{
|
||||||
|
Use: "storage",
|
||||||
|
Short: "Manage storage",
|
||||||
|
}
|
||||||
|
|
||||||
|
func init() {
|
||||||
|
var mountPath string
|
||||||
|
var disable = &cobra.Command{
|
||||||
|
Use: "disable",
|
||||||
|
Short: "Disable a storage",
|
||||||
|
Run: func(cmd *cobra.Command, args []string) {
|
||||||
|
Init()
|
||||||
|
storage, err := db.GetStorageByMountPath(mountPath)
|
||||||
|
if err != nil {
|
||||||
|
utils.Log.Errorf("failed to query storage: %+v", err)
|
||||||
|
} else {
|
||||||
|
storage.Disabled = true
|
||||||
|
err = db.UpdateStorage(storage)
|
||||||
|
if err != nil {
|
||||||
|
utils.Log.Errorf("failed to update storage: %+v", err)
|
||||||
|
} else {
|
||||||
|
utils.Log.Infof("Storage with mount path [%s] have been disabled", mountPath)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
}
|
||||||
|
disable.Flags().StringVarP(&mountPath, "mount-path", "m", "", "The mountPath of storage")
|
||||||
|
RootCmd.AddCommand(storageCmd)
|
||||||
|
storageCmd.AddCommand(disable)
|
||||||
|
|
||||||
|
// Here you will define your flags and configuration settings.
|
||||||
|
|
||||||
|
// Cobra supports Persistent Flags which will work for this command
|
||||||
|
// and all subcommands, e.g.:
|
||||||
|
// storageCmd.PersistentFlags().String("foo", "", "A help for foo")
|
||||||
|
|
||||||
|
// Cobra supports local flags which will only run when this command
|
||||||
|
// is called directly, e.g.:
|
||||||
|
// storageCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
|
||||||
|
}
|
@ -6,9 +6,11 @@ services:
|
|||||||
- '/etc/alist:/opt/alist/data'
|
- '/etc/alist:/opt/alist/data'
|
||||||
ports:
|
ports:
|
||||||
- '5244:5244'
|
- '5244:5244'
|
||||||
|
- '5245:5245'
|
||||||
environment:
|
environment:
|
||||||
- PUID=0
|
- PUID=0
|
||||||
- PGID=0
|
- PGID=0
|
||||||
- UMASK=022
|
- UMASK=022
|
||||||
|
- TZ=UTC
|
||||||
container_name: alist
|
container_name: alist
|
||||||
image: 'xhofe/alist:latest'
|
image: 'xhofe/alist:latest'
|
||||||
|
@ -44,7 +44,11 @@ func (d *Pan115) List(ctx context.Context, dir model.Obj, args model.ListArgs) (
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (d *Pan115) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
|
func (d *Pan115) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
|
||||||
downloadInfo, err := d.client.Download(file.(driver115.File).PickCode)
|
downloadInfo, err := d.client.
|
||||||
|
SetUserAgent(driver115.UA115Browser).
|
||||||
|
Download(file.(driver115.File).PickCode)
|
||||||
|
// recover for upload
|
||||||
|
d.client.SetUserAgent(driver115.UA115Desktop)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
@ -6,16 +6,18 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
type Addition struct {
|
type Addition struct {
|
||||||
Cookie string `json:"cookie"`
|
Cookie string `json:"cookie" type:"text" help:"one of QR code token and cookie required"`
|
||||||
QRCodeToken string `json:"qrcode_token"`
|
QRCodeToken string `json:"qrcode_token" type:"text" help:"one of QR code token and cookie required"`
|
||||||
|
PageSize int64 `json:"page_size" type:"number" default:"56" help:"list api per page size of 115 driver"`
|
||||||
driver.RootID
|
driver.RootID
|
||||||
}
|
}
|
||||||
|
|
||||||
var config = driver.Config{
|
var config = driver.Config{
|
||||||
Name: "115 Cloud",
|
Name: "115 Cloud",
|
||||||
DefaultRoot: "0",
|
DefaultRoot: "0",
|
||||||
OnlyProxy: true,
|
OnlyProxy: true,
|
||||||
OnlyLocal: true,
|
OnlyLocal: true,
|
||||||
|
NoOverwriteUpload: true,
|
||||||
}
|
}
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
|
@ -4,10 +4,11 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
"github.com/SheltonZhu/115driver/pkg/driver"
|
"github.com/SheltonZhu/115driver/pkg/driver"
|
||||||
|
"github.com/alist-org/alist/v3/drivers/base"
|
||||||
"github.com/pkg/errors"
|
"github.com/pkg/errors"
|
||||||
)
|
)
|
||||||
|
|
||||||
var UserAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/106.0.0.0 Safari/537.36 115Browser/23.9.3.2 115disk/30.1.0"
|
var UserAgent = driver.UA115Desktop
|
||||||
|
|
||||||
func (d *Pan115) login() error {
|
func (d *Pan115) login() error {
|
||||||
var err error
|
var err error
|
||||||
@ -15,6 +16,7 @@ func (d *Pan115) login() error {
|
|||||||
driver.UA(UserAgent),
|
driver.UA(UserAgent),
|
||||||
}
|
}
|
||||||
d.client = driver.New(opts...)
|
d.client = driver.New(opts...)
|
||||||
|
d.client.SetHttpClient(base.HttpClient)
|
||||||
cr := &driver.Credential{}
|
cr := &driver.Credential{}
|
||||||
if d.Addition.QRCodeToken != "" {
|
if d.Addition.QRCodeToken != "" {
|
||||||
s := &driver.QRCodeSession{
|
s := &driver.QRCodeSession{
|
||||||
@ -38,7 +40,10 @@ func (d *Pan115) login() error {
|
|||||||
|
|
||||||
func (d *Pan115) getFiles(fileId string) ([]driver.File, error) {
|
func (d *Pan115) getFiles(fileId string) ([]driver.File, error) {
|
||||||
res := make([]driver.File, 0)
|
res := make([]driver.File, 0)
|
||||||
files, err := d.client.List(fileId)
|
if d.PageSize <= 0 {
|
||||||
|
d.PageSize = driver.FileListLimit
|
||||||
|
}
|
||||||
|
files, err := d.client.ListWithLimit(fileId, d.PageSize)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
@ -29,7 +29,6 @@ import (
|
|||||||
type Pan123 struct {
|
type Pan123 struct {
|
||||||
model.Storage
|
model.Storage
|
||||||
Addition
|
Addition
|
||||||
AccessToken string
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (d *Pan123) Config() driver.Config {
|
func (d *Pan123) Config() driver.Config {
|
||||||
@ -41,7 +40,8 @@ func (d *Pan123) GetAddition() driver.Additional {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (d *Pan123) Init(ctx context.Context) error {
|
func (d *Pan123) Init(ctx context.Context) error {
|
||||||
return d.login()
|
_, err := d.request(UserInfo, http.MethodGet, nil, nil)
|
||||||
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
func (d *Pan123) Drop(ctx context.Context) error {
|
func (d *Pan123) Drop(ctx context.Context) error {
|
||||||
@ -77,7 +77,7 @@ func (d *Pan123) Link(ctx context.Context, file model.Obj, args model.LinkArgs)
|
|||||||
"size": f.Size,
|
"size": f.Size,
|
||||||
"type": f.Type,
|
"type": f.Type,
|
||||||
}
|
}
|
||||||
resp, err := d.request("https://www.123pan.com/api/file/download_info", http.MethodPost, func(req *resty.Request) {
|
resp, err := d.request(DownloadInfo, http.MethodPost, func(req *resty.Request) {
|
||||||
req.SetBody(data).SetHeaders(headers)
|
req.SetBody(data).SetHeaders(headers)
|
||||||
}, nil)
|
}, nil)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -96,18 +96,21 @@ func (d *Pan123) Link(ctx context.Context, file model.Obj, args model.LinkArgs)
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
u_ := fmt.Sprintf("https://%s%s", u.Host, u.Path)
|
u_ := u.String()
|
||||||
res, err := base.NoRedirectClient.R().SetQueryParamsFromValues(u.Query()).Head(u_)
|
log.Debug("download url: ", u_)
|
||||||
|
res, err := base.NoRedirectClient.R().Get(u_)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
log.Debug(res.String())
|
log.Debug(res.String())
|
||||||
link := model.Link{
|
link := model.Link{
|
||||||
URL: downloadUrl,
|
URL: u_,
|
||||||
}
|
}
|
||||||
log.Debugln("res code: ", res.StatusCode())
|
log.Debugln("res code: ", res.StatusCode())
|
||||||
if res.StatusCode() == 302 {
|
if res.StatusCode() == 302 {
|
||||||
link.URL = res.Header().Get("location")
|
link.URL = res.Header().Get("location")
|
||||||
|
} else if res.StatusCode() == 200 {
|
||||||
|
link.URL = utils.Json.Get(res.Body(), "data", "redirect_url").ToString()
|
||||||
}
|
}
|
||||||
return &link, nil
|
return &link, nil
|
||||||
} else {
|
} else {
|
||||||
@ -124,7 +127,7 @@ func (d *Pan123) MakeDir(ctx context.Context, parentDir model.Obj, dirName strin
|
|||||||
"size": 0,
|
"size": 0,
|
||||||
"type": 1,
|
"type": 1,
|
||||||
}
|
}
|
||||||
_, err := d.request("https://www.123pan.com/api/file/upload_request", http.MethodPost, func(req *resty.Request) {
|
_, err := d.request(Mkdir, http.MethodPost, func(req *resty.Request) {
|
||||||
req.SetBody(data)
|
req.SetBody(data)
|
||||||
}, nil)
|
}, nil)
|
||||||
return err
|
return err
|
||||||
@ -135,7 +138,7 @@ func (d *Pan123) Move(ctx context.Context, srcObj, dstDir model.Obj) error {
|
|||||||
"fileIdList": []base.Json{{"FileId": srcObj.GetID()}},
|
"fileIdList": []base.Json{{"FileId": srcObj.GetID()}},
|
||||||
"parentFileId": dstDir.GetID(),
|
"parentFileId": dstDir.GetID(),
|
||||||
}
|
}
|
||||||
_, err := d.request("https://www.123pan.com/api/file/mod_pid", http.MethodPost, func(req *resty.Request) {
|
_, err := d.request(Move, http.MethodPost, func(req *resty.Request) {
|
||||||
req.SetBody(data)
|
req.SetBody(data)
|
||||||
}, nil)
|
}, nil)
|
||||||
return err
|
return err
|
||||||
@ -147,7 +150,7 @@ func (d *Pan123) Rename(ctx context.Context, srcObj model.Obj, newName string) e
|
|||||||
"fileId": srcObj.GetID(),
|
"fileId": srcObj.GetID(),
|
||||||
"fileName": newName,
|
"fileName": newName,
|
||||||
}
|
}
|
||||||
_, err := d.request("https://www.123pan.com/api/file/rename", http.MethodPost, func(req *resty.Request) {
|
_, err := d.request(Rename, http.MethodPost, func(req *resty.Request) {
|
||||||
req.SetBody(data)
|
req.SetBody(data)
|
||||||
}, nil)
|
}, nil)
|
||||||
return err
|
return err
|
||||||
@ -164,7 +167,7 @@ func (d *Pan123) Remove(ctx context.Context, obj model.Obj) error {
|
|||||||
"operation": true,
|
"operation": true,
|
||||||
"fileTrashInfoList": []File{f},
|
"fileTrashInfoList": []File{f},
|
||||||
}
|
}
|
||||||
_, err := d.request("https://www.123pan.com/b/api/file/trash", http.MethodPost, func(req *resty.Request) {
|
_, err := d.request(Trash, http.MethodPost, func(req *resty.Request) {
|
||||||
req.SetBody(data)
|
req.SetBody(data)
|
||||||
}, nil)
|
}, nil)
|
||||||
return err
|
return err
|
||||||
@ -220,36 +223,41 @@ func (d *Pan123) Put(ctx context.Context, dstDir model.Obj, stream model.FileStr
|
|||||||
"type": 0,
|
"type": 0,
|
||||||
}
|
}
|
||||||
var resp UploadResp
|
var resp UploadResp
|
||||||
_, err := d.request("https://www.123pan.com/a/api/file/upload_request", http.MethodPost, func(req *resty.Request) {
|
res, err := d.request(UploadRequest, http.MethodPost, func(req *resty.Request) {
|
||||||
req.SetBody(data).SetContext(ctx)
|
req.SetBody(data).SetContext(ctx)
|
||||||
}, &resp)
|
}, &resp)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
log.Debugln("upload request res: ", string(res))
|
||||||
if resp.Data.Reuse || resp.Data.Key == "" {
|
if resp.Data.Reuse || resp.Data.Key == "" {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
cfg := &aws.Config{
|
if resp.Data.AccessKeyId == "" || resp.Data.SecretAccessKey == "" || resp.Data.SessionToken == "" {
|
||||||
Credentials: credentials.NewStaticCredentials(resp.Data.AccessKeyId, resp.Data.SecretAccessKey, resp.Data.SessionToken),
|
err = d.newUpload(ctx, &resp, stream, uploadFile, up)
|
||||||
Region: aws.String("123pan"),
|
} else {
|
||||||
Endpoint: aws.String("file.123pan.com"),
|
cfg := &aws.Config{
|
||||||
S3ForcePathStyle: aws.Bool(true),
|
Credentials: credentials.NewStaticCredentials(resp.Data.AccessKeyId, resp.Data.SecretAccessKey, resp.Data.SessionToken),
|
||||||
|
Region: aws.String("123pan"),
|
||||||
|
Endpoint: aws.String(resp.Data.EndPoint),
|
||||||
|
S3ForcePathStyle: aws.Bool(true),
|
||||||
|
}
|
||||||
|
s, err := session.NewSession(cfg)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
uploader := s3manager.NewUploader(s)
|
||||||
|
input := &s3manager.UploadInput{
|
||||||
|
Bucket: &resp.Data.Bucket,
|
||||||
|
Key: &resp.Data.Key,
|
||||||
|
Body: uploadFile,
|
||||||
|
}
|
||||||
|
_, err = uploader.UploadWithContext(ctx, input)
|
||||||
}
|
}
|
||||||
s, err := session.NewSession(cfg)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
uploader := s3manager.NewUploader(s)
|
_, err = d.request(UploadComplete, http.MethodPost, func(req *resty.Request) {
|
||||||
input := &s3manager.UploadInput{
|
|
||||||
Bucket: &resp.Data.Bucket,
|
|
||||||
Key: &resp.Data.Key,
|
|
||||||
Body: uploadFile,
|
|
||||||
}
|
|
||||||
_, err = uploader.UploadWithContext(ctx, input)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
_, err = d.request("https://www.123pan.com/api/file/upload_complete", http.MethodPost, func(req *resty.Request) {
|
|
||||||
req.SetBody(base.Json{
|
req.SetBody(base.Json{
|
||||||
"fileId": resp.Data.FileId,
|
"fileId": resp.Data.FileId,
|
||||||
}).SetContext(ctx)
|
}).SetContext(ctx)
|
||||||
|
@ -6,14 +6,13 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
type Addition struct {
|
type Addition struct {
|
||||||
Username string `json:"username" required:"true"`
|
Username string `json:"username" required:"true"`
|
||||||
Password string `json:"password" required:"true"`
|
Password string `json:"password" required:"true"`
|
||||||
|
driver.RootID
|
||||||
OrderBy string `json:"order_by" type:"select" options:"file_name,size,update_at" default:"file_name"`
|
OrderBy string `json:"order_by" type:"select" options:"file_name,size,update_at" default:"file_name"`
|
||||||
OrderDirection string `json:"order_direction" type:"select" options:"asc,desc" default:"asc"`
|
OrderDirection string `json:"order_direction" type:"select" options:"asc,desc" default:"asc"`
|
||||||
driver.RootID
|
StreamUpload bool `json:"stream_upload"`
|
||||||
// define other
|
AccessToken string
|
||||||
StreamUpload bool `json:"stream_upload"`
|
|
||||||
//Field string `json:"field" type:"select" required:"true" options:"a,b,c" default:"a"`
|
|
||||||
}
|
}
|
||||||
|
|
||||||
var config = driver.Config{
|
var config = driver.Config{
|
||||||
|
@ -7,18 +7,6 @@ import (
|
|||||||
"github.com/alist-org/alist/v3/internal/model"
|
"github.com/alist-org/alist/v3/internal/model"
|
||||||
)
|
)
|
||||||
|
|
||||||
//type BaseResp struct {
|
|
||||||
// Code interface{} `json:"code"`
|
|
||||||
// Message string `json:"message"`
|
|
||||||
//}
|
|
||||||
|
|
||||||
type TokenResp struct {
|
|
||||||
//BaseResp
|
|
||||||
Data struct {
|
|
||||||
Token string `json:"token"`
|
|
||||||
} `json:"data"`
|
|
||||||
}
|
|
||||||
|
|
||||||
type File struct {
|
type File struct {
|
||||||
FileName string `json:"FileName"`
|
FileName string `json:"FileName"`
|
||||||
Size int64 `json:"Size"`
|
Size int64 `json:"Size"`
|
||||||
@ -86,5 +74,14 @@ type UploadResp struct {
|
|||||||
SessionToken string `json:"SessionToken"`
|
SessionToken string `json:"SessionToken"`
|
||||||
FileId int64 `json:"FileId"`
|
FileId int64 `json:"FileId"`
|
||||||
Reuse bool `json:"Reuse"`
|
Reuse bool `json:"Reuse"`
|
||||||
|
EndPoint string `json:"EndPoint"`
|
||||||
|
StorageNode string `json:"StorageNode"`
|
||||||
|
UploadId string `json:"UploadId"`
|
||||||
|
} `json:"data"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type S3PreSignedURLs struct {
|
||||||
|
Data struct {
|
||||||
|
PreSignedUrls map[string]string `json:"presignedUrls"`
|
||||||
} `json:"data"`
|
} `json:"data"`
|
||||||
}
|
}
|
||||||
|
127
drivers/123/upload.go
Normal file
127
drivers/123/upload.go
Normal file
@ -0,0 +1,127 @@
|
|||||||
|
package _123
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"fmt"
|
||||||
|
"io"
|
||||||
|
"math"
|
||||||
|
"net/http"
|
||||||
|
"strconv"
|
||||||
|
|
||||||
|
"github.com/alist-org/alist/v3/drivers/base"
|
||||||
|
"github.com/alist-org/alist/v3/internal/driver"
|
||||||
|
"github.com/alist-org/alist/v3/internal/model"
|
||||||
|
"github.com/alist-org/alist/v3/pkg/utils"
|
||||||
|
"github.com/go-resty/resty/v2"
|
||||||
|
)
|
||||||
|
|
||||||
|
func (d *Pan123) getS3PreSignedUrls(ctx context.Context, upReq *UploadResp, start, end int) (*S3PreSignedURLs, error) {
|
||||||
|
data := base.Json{
|
||||||
|
"bucket": upReq.Data.Bucket,
|
||||||
|
"key": upReq.Data.Key,
|
||||||
|
"partNumberEnd": end,
|
||||||
|
"partNumberStart": start,
|
||||||
|
"uploadId": upReq.Data.UploadId,
|
||||||
|
"StorageNode": upReq.Data.StorageNode,
|
||||||
|
}
|
||||||
|
var s3PreSignedUrls S3PreSignedURLs
|
||||||
|
_, err := d.request(S3PreSignedUrls, http.MethodPost, func(req *resty.Request) {
|
||||||
|
req.SetBody(data).SetContext(ctx)
|
||||||
|
}, &s3PreSignedUrls)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return &s3PreSignedUrls, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *Pan123) completeS3(ctx context.Context, upReq *UploadResp) error {
|
||||||
|
data := base.Json{
|
||||||
|
"bucket": upReq.Data.Bucket,
|
||||||
|
"key": upReq.Data.Key,
|
||||||
|
"uploadId": upReq.Data.UploadId,
|
||||||
|
"StorageNode": upReq.Data.StorageNode,
|
||||||
|
}
|
||||||
|
_, err := d.request(S3Complete, http.MethodPost, func(req *resty.Request) {
|
||||||
|
req.SetBody(data).SetContext(ctx)
|
||||||
|
}, nil)
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *Pan123) newUpload(ctx context.Context, upReq *UploadResp, file model.FileStreamer, reader io.Reader, up driver.UpdateProgress) error {
|
||||||
|
chunkSize := int64(1024 * 1024 * 5)
|
||||||
|
// fetch s3 pre signed urls
|
||||||
|
chunkCount := int(math.Ceil(float64(file.GetSize()) / float64(chunkSize)))
|
||||||
|
// upload 10 chunks each batch
|
||||||
|
batchSize := 10
|
||||||
|
for i := 1; i <= chunkCount; i += batchSize {
|
||||||
|
if utils.IsCanceled(ctx) {
|
||||||
|
return ctx.Err()
|
||||||
|
}
|
||||||
|
start := i
|
||||||
|
end := i + batchSize
|
||||||
|
if end > chunkCount+1 {
|
||||||
|
end = chunkCount + 1
|
||||||
|
}
|
||||||
|
s3PreSignedUrls, err := d.getS3PreSignedUrls(ctx, upReq, start, end)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
// upload each chunk
|
||||||
|
for j := start; j < end; j++ {
|
||||||
|
if utils.IsCanceled(ctx) {
|
||||||
|
return ctx.Err()
|
||||||
|
}
|
||||||
|
curSize := chunkSize
|
||||||
|
if j == chunkCount {
|
||||||
|
curSize = file.GetSize() - (int64(chunkCount)-1)*chunkSize
|
||||||
|
}
|
||||||
|
err = d.uploadS3Chunk(ctx, upReq, s3PreSignedUrls, j, end, io.LimitReader(reader, chunkSize), curSize, false)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
up(j * 100 / chunkCount)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// complete s3 upload
|
||||||
|
return d.completeS3(ctx, upReq)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *Pan123) uploadS3Chunk(ctx context.Context, upReq *UploadResp, s3PreSignedUrls *S3PreSignedURLs, cur, end int, reader io.Reader, curSize int64, retry bool) error {
|
||||||
|
uploadUrl := s3PreSignedUrls.Data.PreSignedUrls[strconv.Itoa(cur)]
|
||||||
|
if uploadUrl == "" {
|
||||||
|
return fmt.Errorf("upload url is empty, s3PreSignedUrls: %+v", s3PreSignedUrls)
|
||||||
|
}
|
||||||
|
req, err := http.NewRequest("PUT", uploadUrl, reader)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
req = req.WithContext(ctx)
|
||||||
|
req.ContentLength = curSize
|
||||||
|
//req.Header.Set("Content-Length", strconv.FormatInt(curSize, 10))
|
||||||
|
res, err := base.HttpClient.Do(req)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
defer res.Body.Close()
|
||||||
|
if res.StatusCode == http.StatusForbidden {
|
||||||
|
if retry {
|
||||||
|
return fmt.Errorf("upload s3 chunk %d failed, status code: %d", cur, res.StatusCode)
|
||||||
|
}
|
||||||
|
// refresh s3 pre signed urls
|
||||||
|
newS3PreSignedUrls, err := d.getS3PreSignedUrls(ctx, upReq, cur, end)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
s3PreSignedUrls.Data.PreSignedUrls = newS3PreSignedUrls.Data.PreSignedUrls
|
||||||
|
// retry
|
||||||
|
return d.uploadS3Chunk(ctx, upReq, s3PreSignedUrls, cur, end, reader, curSize, true)
|
||||||
|
}
|
||||||
|
if res.StatusCode != http.StatusOK {
|
||||||
|
body, err := io.ReadAll(res.Body)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return fmt.Errorf("upload s3 chunk %d failed, status code: %d, body: %s", cur, res.StatusCode, body)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
@ -4,6 +4,7 @@ import (
|
|||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"net/http"
|
"net/http"
|
||||||
|
"strconv"
|
||||||
|
|
||||||
"github.com/alist-org/alist/v3/drivers/base"
|
"github.com/alist-org/alist/v3/drivers/base"
|
||||||
"github.com/alist-org/alist/v3/pkg/utils"
|
"github.com/alist-org/alist/v3/pkg/utils"
|
||||||
@ -13,9 +14,24 @@ import (
|
|||||||
|
|
||||||
// do others that not defined in Driver interface
|
// do others that not defined in Driver interface
|
||||||
|
|
||||||
|
const (
|
||||||
|
API = "https://www.123pan.com/b/api"
|
||||||
|
SignIn = API + "/user/sign_in"
|
||||||
|
UserInfo = API + "/user/info"
|
||||||
|
FileList = API + "/file/list/new"
|
||||||
|
DownloadInfo = "https://www.123pan.com/a/api/file/download_info"
|
||||||
|
Mkdir = API + "/file/upload_request"
|
||||||
|
Move = API + "/file/mod_pid"
|
||||||
|
Rename = API + "/file/rename"
|
||||||
|
Trash = API + "/file/trash"
|
||||||
|
UploadRequest = API + "/file/upload_request"
|
||||||
|
UploadComplete = API + "/file/upload_complete"
|
||||||
|
S3PreSignedUrls = API + "/file/s3_repare_upload_parts_batch"
|
||||||
|
S3Complete = API + "/file/s3_complete_multipart_upload"
|
||||||
|
)
|
||||||
|
|
||||||
func (d *Pan123) login() error {
|
func (d *Pan123) login() error {
|
||||||
var body base.Json
|
var body base.Json
|
||||||
url := "https://www.123pan.com/a/api/user/sign_in"
|
|
||||||
if utils.IsEmailFormat(d.Username) {
|
if utils.IsEmailFormat(d.Username) {
|
||||||
body = base.Json{
|
body = base.Json{
|
||||||
"mail": d.Username,
|
"mail": d.Username,
|
||||||
@ -28,17 +44,15 @@ func (d *Pan123) login() error {
|
|||||||
"password": d.Password,
|
"password": d.Password,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
var resp TokenResp
|
|
||||||
res, err := base.RestyClient.R().
|
res, err := base.RestyClient.R().
|
||||||
SetResult(&resp).
|
SetBody(body).Post(SignIn)
|
||||||
SetBody(body).Post(url)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
if utils.Json.Get(res.Body(), "code").ToInt() != 200 {
|
if utils.Json.Get(res.Body(), "code").ToInt() != 200 {
|
||||||
err = fmt.Errorf(utils.Json.Get(res.Body(), "message").ToString())
|
err = fmt.Errorf(utils.Json.Get(res.Body(), "message").ToString())
|
||||||
} else {
|
} else {
|
||||||
d.AccessToken = resp.Data.Token
|
d.AccessToken = utils.Json.Get(res.Body(), "data", "token").ToString()
|
||||||
}
|
}
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@ -77,27 +91,31 @@ func (d *Pan123) request(url string, method string, callback base.ReqCallback, r
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (d *Pan123) getFiles(parentId string) ([]File, error) {
|
func (d *Pan123) getFiles(parentId string) ([]File, error) {
|
||||||
next := "0"
|
page := 1
|
||||||
res := make([]File, 0)
|
res := make([]File, 0)
|
||||||
for next != "-1" {
|
for {
|
||||||
var resp Files
|
var resp Files
|
||||||
query := map[string]string{
|
query := map[string]string{
|
||||||
"driveId": "0",
|
"driveId": "0",
|
||||||
"limit": "100",
|
"limit": "100",
|
||||||
"next": next,
|
"next": "0",
|
||||||
"orderBy": d.OrderBy,
|
"orderBy": d.OrderBy,
|
||||||
"orderDirection": d.OrderDirection,
|
"orderDirection": d.OrderDirection,
|
||||||
"parentFileId": parentId,
|
"parentFileId": parentId,
|
||||||
"trashed": "false",
|
"trashed": "false",
|
||||||
|
"Page": strconv.Itoa(page),
|
||||||
}
|
}
|
||||||
_, err := d.request("https://www.123pan.com/api/file/list/new", http.MethodGet, func(req *resty.Request) {
|
_, err := d.request(FileList, http.MethodGet, func(req *resty.Request) {
|
||||||
req.SetQueryParams(query)
|
req.SetQueryParams(query)
|
||||||
}, &resp)
|
}, &resp)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
next = resp.Data.Next
|
page++
|
||||||
res = append(res, resp.Data.InfoList...)
|
res = append(res, resp.Data.InfoList...)
|
||||||
|
if len(resp.Data.InfoList) == 0 || resp.Data.Next == "-1" {
|
||||||
|
break
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return res, nil
|
return res, nil
|
||||||
}
|
}
|
||||||
|
@ -1,13 +1,13 @@
|
|||||||
package _139
|
package _139
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"bytes"
|
|
||||||
"context"
|
"context"
|
||||||
|
"encoding/base64"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
"math"
|
|
||||||
"net/http"
|
"net/http"
|
||||||
"strconv"
|
"strconv"
|
||||||
|
"strings"
|
||||||
|
|
||||||
"github.com/alist-org/alist/v3/drivers/base"
|
"github.com/alist-org/alist/v3/drivers/base"
|
||||||
"github.com/alist-org/alist/v3/internal/driver"
|
"github.com/alist-org/alist/v3/internal/driver"
|
||||||
@ -20,6 +20,7 @@ import (
|
|||||||
type Yun139 struct {
|
type Yun139 struct {
|
||||||
model.Storage
|
model.Storage
|
||||||
Addition
|
Addition
|
||||||
|
Account string
|
||||||
}
|
}
|
||||||
|
|
||||||
func (d *Yun139) Config() driver.Config {
|
func (d *Yun139) Config() driver.Config {
|
||||||
@ -31,7 +32,20 @@ func (d *Yun139) GetAddition() driver.Additional {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (d *Yun139) Init(ctx context.Context) error {
|
func (d *Yun139) Init(ctx context.Context) error {
|
||||||
_, err := d.post("/orchestration/personalCloud/user/v1.0/qryUserExternInfo", base.Json{
|
if d.Authorization == "" {
|
||||||
|
return fmt.Errorf("authorization is empty")
|
||||||
|
}
|
||||||
|
decode, err := base64.StdEncoding.DecodeString(d.Authorization)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
decodeStr := string(decode)
|
||||||
|
splits := strings.Split(decodeStr, ":")
|
||||||
|
if len(splits) < 2 {
|
||||||
|
return fmt.Errorf("authorization is invalid, splits < 2")
|
||||||
|
}
|
||||||
|
d.Account = splits[1]
|
||||||
|
_, err = d.post("/orchestration/personalCloud/user/v1.0/qryUserExternInfo", base.Json{
|
||||||
"qryUserExternInfoReq": base.Json{
|
"qryUserExternInfoReq": base.Json{
|
||||||
"commonAccountInfo": base.Json{
|
"commonAccountInfo": base.Json{
|
||||||
"account": d.Account,
|
"account": d.Account,
|
||||||
@ -85,8 +99,7 @@ func (d *Yun139) MakeDir(ctx context.Context, parentDir model.Obj, dirName strin
|
|||||||
}
|
}
|
||||||
pathname = "/orchestration/familyCloud/cloudCatalog/v1.0/createCloudDoc"
|
pathname = "/orchestration/familyCloud/cloudCatalog/v1.0/createCloudDoc"
|
||||||
}
|
}
|
||||||
_, err := d.post(pathname,
|
_, err := d.post(pathname, data, nil)
|
||||||
data, nil)
|
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -224,15 +237,31 @@ func (d *Yun139) Remove(ctx context.Context, obj model.Obj) error {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const (
|
||||||
|
_ = iota //ignore first value by assigning to blank identifier
|
||||||
|
KB = 1 << (10 * iota)
|
||||||
|
MB
|
||||||
|
GB
|
||||||
|
TB
|
||||||
|
)
|
||||||
|
|
||||||
|
func getPartSize(size int64) int64 {
|
||||||
|
// 网盘对于分片数量存在上限
|
||||||
|
if size/GB > 30 {
|
||||||
|
return 512 * MB
|
||||||
|
}
|
||||||
|
return 100 * MB
|
||||||
|
}
|
||||||
|
|
||||||
func (d *Yun139) Put(ctx context.Context, dstDir model.Obj, stream model.FileStreamer, up driver.UpdateProgress) error {
|
func (d *Yun139) Put(ctx context.Context, dstDir model.Obj, stream model.FileStreamer, up driver.UpdateProgress) error {
|
||||||
data := base.Json{
|
data := base.Json{
|
||||||
"manualRename": 2,
|
"manualRename": 2,
|
||||||
"operation": 0,
|
"operation": 0,
|
||||||
"fileCount": 1,
|
"fileCount": 1,
|
||||||
"totalSize": stream.GetSize(),
|
"totalSize": 0, // 去除上传大小限制
|
||||||
"uploadContentList": []base.Json{{
|
"uploadContentList": []base.Json{{
|
||||||
"contentName": stream.GetName(),
|
"contentName": stream.GetName(),
|
||||||
"contentSize": stream.GetSize(),
|
"contentSize": 0, // 去除上传大小限制
|
||||||
// "digest": "5a3231986ce7a6b46e408612d385bafa"
|
// "digest": "5a3231986ce7a6b46e408612d385bafa"
|
||||||
}},
|
}},
|
||||||
"parentCatalogID": dstDir.GetID(),
|
"parentCatalogID": dstDir.GetID(),
|
||||||
@ -250,10 +279,10 @@ func (d *Yun139) Put(ctx context.Context, dstDir model.Obj, stream model.FileStr
|
|||||||
"operation": 0,
|
"operation": 0,
|
||||||
"path": "",
|
"path": "",
|
||||||
"seqNo": "",
|
"seqNo": "",
|
||||||
"totalSize": stream.GetSize(),
|
"totalSize": 0,
|
||||||
"uploadContentList": []base.Json{{
|
"uploadContentList": []base.Json{{
|
||||||
"contentName": stream.GetName(),
|
"contentName": stream.GetName(),
|
||||||
"contentSize": stream.GetSize(),
|
"contentSize": 0,
|
||||||
// "digest": "5a3231986ce7a6b46e408612d385bafa"
|
// "digest": "5a3231986ce7a6b46e408612d385bafa"
|
||||||
}},
|
}},
|
||||||
})
|
})
|
||||||
@ -265,51 +294,52 @@ func (d *Yun139) Put(ctx context.Context, dstDir model.Obj, stream model.FileStr
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
var Default int64 = 104857600
|
|
||||||
part := int(math.Ceil(float64(stream.GetSize()) / float64(Default)))
|
// Progress
|
||||||
var start int64 = 0
|
p := driver.NewProgress(stream.GetSize(), up)
|
||||||
for i := 0; i < part; i++ {
|
|
||||||
|
var partSize = getPartSize(stream.GetSize())
|
||||||
|
part := (stream.GetSize() + partSize - 1) / partSize
|
||||||
|
for i := int64(0); i < part; i++ {
|
||||||
if utils.IsCanceled(ctx) {
|
if utils.IsCanceled(ctx) {
|
||||||
return ctx.Err()
|
return ctx.Err()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
start := i * partSize
|
||||||
byteSize := stream.GetSize() - start
|
byteSize := stream.GetSize() - start
|
||||||
if byteSize > Default {
|
if byteSize > partSize {
|
||||||
byteSize = Default
|
byteSize = partSize
|
||||||
}
|
}
|
||||||
byteData := make([]byte, byteSize)
|
|
||||||
_, err = io.ReadFull(stream, byteData)
|
limitReader := io.LimitReader(stream, byteSize)
|
||||||
if err != nil {
|
// Update Progress
|
||||||
return err
|
r := io.TeeReader(limitReader, p)
|
||||||
}
|
req, err := http.NewRequest("POST", resp.Data.UploadResult.RedirectionURL, r)
|
||||||
req, err := http.NewRequest("POST", resp.Data.UploadResult.RedirectionURL, bytes.NewBuffer(byteData))
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
req = req.WithContext(ctx)
|
req = req.WithContext(ctx)
|
||||||
headers := map[string]string{
|
req.Header.Set("Content-Type", "text/plain;name="+unicode(stream.GetName()))
|
||||||
"Accept": "*/*",
|
req.Header.Set("contentSize", strconv.FormatInt(stream.GetSize(), 10))
|
||||||
"Content-Type": "text/plain;name=" + unicode(stream.GetName()),
|
req.Header.Set("range", fmt.Sprintf("bytes=%d-%d", start, start+byteSize-1))
|
||||||
"contentSize": strconv.FormatInt(stream.GetSize(), 10),
|
req.Header.Set("uploadtaskID", resp.Data.UploadResult.UploadTaskID)
|
||||||
"range": fmt.Sprintf("bytes=%d-%d", start, start+byteSize-1),
|
req.Header.Set("rangeType", "0")
|
||||||
"content-length": strconv.FormatInt(byteSize, 10),
|
req.ContentLength = byteSize
|
||||||
"uploadtaskID": resp.Data.UploadResult.UploadTaskID,
|
|
||||||
"rangeType": "0",
|
|
||||||
"Referer": "https://yun.139.com/",
|
|
||||||
"User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/95.0.4638.69 Safari/537.36 Edg/95.0.1020.44",
|
|
||||||
"x-SvcType": "1",
|
|
||||||
}
|
|
||||||
for k, v := range headers {
|
|
||||||
req.Header.Set(k, v)
|
|
||||||
}
|
|
||||||
res, err := base.HttpClient.Do(req)
|
res, err := base.HttpClient.Do(req)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
log.Debugf("%+v", res)
|
log.Debugf("%+v", res)
|
||||||
|
|
||||||
|
if res.StatusCode != http.StatusOK {
|
||||||
|
return fmt.Errorf("unexpected status code: %d", res.StatusCode)
|
||||||
|
}
|
||||||
|
|
||||||
res.Body.Close()
|
res.Body.Close()
|
||||||
start += byteSize
|
|
||||||
up(i * 100 / part)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -6,8 +6,8 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
type Addition struct {
|
type Addition struct {
|
||||||
Account string `json:"account" required:"true"`
|
//Account string `json:"account" required:"true"`
|
||||||
Cookie string `json:"cookie" type:"text" required:"true"`
|
Authorization string `json:"authorization" type:"text" required:"true"`
|
||||||
driver.RootID
|
driver.RootID
|
||||||
Type string `json:"type" type:"select" options:"personal,family" default:"personal"`
|
Type string `json:"type" type:"select" options:"personal,family" default:"personal"`
|
||||||
CloudID string `json:"cloud_id"`
|
CloudID string `json:"cloud_id"`
|
||||||
|
@ -28,12 +28,15 @@ func (d *Yun139) isFamily() bool {
|
|||||||
func encodeURIComponent(str string) string {
|
func encodeURIComponent(str string) string {
|
||||||
r := url.QueryEscape(str)
|
r := url.QueryEscape(str)
|
||||||
r = strings.Replace(r, "+", "%20", -1)
|
r = strings.Replace(r, "+", "%20", -1)
|
||||||
|
r = strings.Replace(r, "%21", "!", -1)
|
||||||
|
r = strings.Replace(r, "%27", "'", -1)
|
||||||
|
r = strings.Replace(r, "%28", "(", -1)
|
||||||
|
r = strings.Replace(r, "%29", ")", -1)
|
||||||
|
r = strings.Replace(r, "%2A", "*", -1)
|
||||||
return r
|
return r
|
||||||
}
|
}
|
||||||
|
|
||||||
func calSign(body, ts, randStr string) string {
|
func calSign(body, ts, randStr string) string {
|
||||||
body = strings.ReplaceAll(body, "\n", "")
|
|
||||||
body = strings.ReplaceAll(body, " ", "")
|
|
||||||
body = encodeURIComponent(body)
|
body = encodeURIComponent(body)
|
||||||
strs := strings.Split(body, "")
|
strs := strings.Split(body, "")
|
||||||
sort.Strings(strs)
|
sort.Strings(strs)
|
||||||
@ -69,7 +72,7 @@ func (d *Yun139) request(pathname string, method string, callback base.ReqCallba
|
|||||||
req.SetHeaders(map[string]string{
|
req.SetHeaders(map[string]string{
|
||||||
"Accept": "application/json, text/plain, */*",
|
"Accept": "application/json, text/plain, */*",
|
||||||
"CMS-DEVICE": "default",
|
"CMS-DEVICE": "default",
|
||||||
"Cookie": d.Cookie,
|
"Authorization": "Basic " + d.Authorization,
|
||||||
"mcloud-channel": "1000101",
|
"mcloud-channel": "1000101",
|
||||||
"mcloud-client": "10701",
|
"mcloud-client": "10701",
|
||||||
//"mcloud-route": "001",
|
//"mcloud-route": "001",
|
||||||
|
@ -30,12 +30,9 @@ func (d *Cloud189) GetAddition() driver.Additional {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (d *Cloud189) Init(ctx context.Context) error {
|
func (d *Cloud189) Init(ctx context.Context) error {
|
||||||
d.client = resty.New().
|
d.client = base.NewRestyClient().
|
||||||
SetTimeout(base.DefaultTimeout).
|
SetHeader("Referer", "https://cloud.189.cn/")
|
||||||
SetRetryCount(3).
|
return d.newLogin()
|
||||||
SetHeader("Referer", "https://cloud.189.cn/").
|
|
||||||
SetHeader("User-Agent", base.UserAgent)
|
|
||||||
return d.login()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (d *Cloud189) Drop(ctx context.Context) error {
|
func (d *Cloud189) Drop(ctx context.Context) error {
|
||||||
|
126
drivers/189/login.go
Normal file
126
drivers/189/login.go
Normal file
@ -0,0 +1,126 @@
|
|||||||
|
package _189
|
||||||
|
|
||||||
|
import (
|
||||||
|
"errors"
|
||||||
|
"strconv"
|
||||||
|
|
||||||
|
"github.com/alist-org/alist/v3/pkg/utils"
|
||||||
|
log "github.com/sirupsen/logrus"
|
||||||
|
)
|
||||||
|
|
||||||
|
type AppConf struct {
|
||||||
|
Data struct {
|
||||||
|
AccountType string `json:"accountType"`
|
||||||
|
AgreementCheck string `json:"agreementCheck"`
|
||||||
|
AppKey string `json:"appKey"`
|
||||||
|
ClientType int `json:"clientType"`
|
||||||
|
IsOauth2 bool `json:"isOauth2"`
|
||||||
|
LoginSort string `json:"loginSort"`
|
||||||
|
MailSuffix string `json:"mailSuffix"`
|
||||||
|
PageKey string `json:"pageKey"`
|
||||||
|
ParamId string `json:"paramId"`
|
||||||
|
RegReturnUrl string `json:"regReturnUrl"`
|
||||||
|
ReqId string `json:"reqId"`
|
||||||
|
ReturnUrl string `json:"returnUrl"`
|
||||||
|
ShowFeedback string `json:"showFeedback"`
|
||||||
|
ShowPwSaveName string `json:"showPwSaveName"`
|
||||||
|
ShowQrSaveName string `json:"showQrSaveName"`
|
||||||
|
ShowSmsSaveName string `json:"showSmsSaveName"`
|
||||||
|
Sso string `json:"sso"`
|
||||||
|
} `json:"data"`
|
||||||
|
Msg string `json:"msg"`
|
||||||
|
Result string `json:"result"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type EncryptConf 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"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *Cloud189) newLogin() error {
|
||||||
|
url := "https://cloud.189.cn/api/portal/loginUrl.action?redirectURL=https%3A%2F%2Fcloud.189.cn%2Fmain.action"
|
||||||
|
res, err := d.client.R().Get(url)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
// Is logged in
|
||||||
|
redirectURL := res.RawResponse.Request.URL
|
||||||
|
if redirectURL.String() == "https://cloud.189.cn/web/main" {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
lt := redirectURL.Query().Get("lt")
|
||||||
|
reqId := redirectURL.Query().Get("reqId")
|
||||||
|
appId := redirectURL.Query().Get("appId")
|
||||||
|
headers := map[string]string{
|
||||||
|
"lt": lt,
|
||||||
|
"reqid": reqId,
|
||||||
|
"referer": redirectURL.String(),
|
||||||
|
"origin": "https://open.e.189.cn",
|
||||||
|
}
|
||||||
|
// get app Conf
|
||||||
|
var appConf AppConf
|
||||||
|
res, err = d.client.R().SetHeaders(headers).SetFormData(map[string]string{
|
||||||
|
"version": "2.0",
|
||||||
|
"appKey": appId,
|
||||||
|
}).SetResult(&appConf).Post("https://open.e.189.cn/api/logbox/oauth2/appConf.do")
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
log.Debugf("189 AppConf resp body: %s", res.String())
|
||||||
|
if appConf.Result != "0" {
|
||||||
|
return errors.New(appConf.Msg)
|
||||||
|
}
|
||||||
|
// get encrypt conf
|
||||||
|
var encryptConf EncryptConf
|
||||||
|
res, err = d.client.R().SetHeaders(headers).SetFormData(map[string]string{
|
||||||
|
"appId": appId,
|
||||||
|
}).Post("https://open.e.189.cn/api/logbox/config/encryptConf.do")
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
err = utils.Json.Unmarshal(res.Body(), &encryptConf)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
log.Debugf("189 EncryptConf resp body: %s\n%+v", res.String(), encryptConf)
|
||||||
|
if encryptConf.Result != 0 {
|
||||||
|
return errors.New("get EncryptConf error:" + res.String())
|
||||||
|
}
|
||||||
|
// TODO: getUUID? needcaptcha
|
||||||
|
// login
|
||||||
|
loginData := map[string]string{
|
||||||
|
"version": "v2.0",
|
||||||
|
"apToken": "",
|
||||||
|
"appKey": appId,
|
||||||
|
"accountType": appConf.Data.AccountType,
|
||||||
|
"userName": encryptConf.Data.Pre + RsaEncode([]byte(d.Username), encryptConf.Data.PubKey, true),
|
||||||
|
"epd": encryptConf.Data.Pre + RsaEncode([]byte(d.Password), encryptConf.Data.PubKey, true),
|
||||||
|
"captchaType": "",
|
||||||
|
"validateCode": "",
|
||||||
|
"smsValidateCode": "",
|
||||||
|
"captchaToken": "",
|
||||||
|
"returnUrl": appConf.Data.ReturnUrl,
|
||||||
|
"mailSuffix": appConf.Data.MailSuffix,
|
||||||
|
"dynamicCheck": "FALSE",
|
||||||
|
"clientType": strconv.Itoa(appConf.Data.ClientType),
|
||||||
|
"cb_SaveName": "3",
|
||||||
|
"isOauth2": strconv.FormatBool(appConf.Data.IsOauth2),
|
||||||
|
"state": "",
|
||||||
|
"paramId": appConf.Data.ParamId,
|
||||||
|
}
|
||||||
|
res, err = d.client.R().SetHeaders(headers).SetFormData(loginData).Post("https://open.e.189.cn/api/logbox/oauth2/loginSubmit.do")
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
log.Debugf("189 login resp body: %s", res.String())
|
||||||
|
loginResult := utils.Json.Get(res.Body(), "result").ToInt()
|
||||||
|
if loginResult != 0 {
|
||||||
|
return errors.New(utils.Json.Get(res.Body(), "msg").ToString())
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
@ -8,6 +8,7 @@ import (
|
|||||||
type Addition struct {
|
type Addition struct {
|
||||||
Username string `json:"username" required:"true"`
|
Username string `json:"username" required:"true"`
|
||||||
Password string `json:"password" required:"true"`
|
Password string `json:"password" required:"true"`
|
||||||
|
Cookie string `json:"cookie" help:"Fill in the cookie if need captcha"`
|
||||||
driver.RootID
|
driver.RootID
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -15,6 +16,7 @@ var config = driver.Config{
|
|||||||
Name: "189Cloud",
|
Name: "189Cloud",
|
||||||
LocalSort: true,
|
LocalSort: true,
|
||||||
DefaultRoot: "-11",
|
DefaultRoot: "-11",
|
||||||
|
Alert: `info|You can try to use 189PC driver if this driver does not work.`,
|
||||||
}
|
}
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
|
@ -11,16 +11,13 @@ import (
|
|||||||
"io"
|
"io"
|
||||||
"math"
|
"math"
|
||||||
"net/http"
|
"net/http"
|
||||||
"regexp"
|
|
||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/alist-org/alist/v3/drivers/base"
|
"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/driver"
|
||||||
"github.com/alist-org/alist/v3/internal/model"
|
"github.com/alist-org/alist/v3/internal/model"
|
||||||
"github.com/alist-org/alist/v3/internal/setting"
|
|
||||||
"github.com/alist-org/alist/v3/pkg/utils"
|
"github.com/alist-org/alist/v3/pkg/utils"
|
||||||
myrand "github.com/alist-org/alist/v3/pkg/utils/random"
|
myrand "github.com/alist-org/alist/v3/pkg/utils/random"
|
||||||
"github.com/go-resty/resty/v2"
|
"github.com/go-resty/resty/v2"
|
||||||
@ -30,118 +27,118 @@ import (
|
|||||||
|
|
||||||
// do others that not defined in Driver interface
|
// do others that not defined in Driver interface
|
||||||
|
|
||||||
func (d *Cloud189) login() error {
|
//func (d *Cloud189) login() error {
|
||||||
url := "https://cloud.189.cn/api/portal/loginUrl.action?redirectURL=https%3A%2F%2Fcloud.189.cn%2Fmain.action"
|
// url := "https://cloud.189.cn/api/portal/loginUrl.action?redirectURL=https%3A%2F%2Fcloud.189.cn%2Fmain.action"
|
||||||
b := ""
|
// b := ""
|
||||||
lt := ""
|
// lt := ""
|
||||||
ltText := regexp.MustCompile(`lt = "(.+?)"`)
|
// ltText := regexp.MustCompile(`lt = "(.+?)"`)
|
||||||
var res *resty.Response
|
// var res *resty.Response
|
||||||
var err error
|
// var err error
|
||||||
for i := 0; i < 3; i++ {
|
// for i := 0; i < 3; i++ {
|
||||||
res, err = d.client.R().Get(url)
|
// res, err = d.client.R().Get(url)
|
||||||
if err != nil {
|
// if err != nil {
|
||||||
return err
|
// return err
|
||||||
}
|
// }
|
||||||
// 已经登陆
|
// // 已经登陆
|
||||||
if res.RawResponse.Request.URL.String() == "https://cloud.189.cn/web/main" {
|
// if res.RawResponse.Request.URL.String() == "https://cloud.189.cn/web/main" {
|
||||||
return nil
|
// return nil
|
||||||
}
|
// }
|
||||||
b = res.String()
|
// b = res.String()
|
||||||
ltTextArr := ltText.FindStringSubmatch(b)
|
// ltTextArr := ltText.FindStringSubmatch(b)
|
||||||
if len(ltTextArr) > 0 {
|
// if len(ltTextArr) > 0 {
|
||||||
lt = ltTextArr[1]
|
// lt = ltTextArr[1]
|
||||||
break
|
// break
|
||||||
} else {
|
// } else {
|
||||||
<-time.After(time.Second)
|
// <-time.After(time.Second)
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
if lt == "" {
|
// if lt == "" {
|
||||||
return fmt.Errorf("get page: %s \nstatus: %d \nrequest url: %s\nredirect url: %s",
|
// 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"))
|
// b, res.StatusCode(), res.RawResponse.Request.URL.String(), res.Header().Get("location"))
|
||||||
}
|
// }
|
||||||
captchaToken := regexp.MustCompile(`captchaToken' value='(.+?)'`).FindStringSubmatch(b)[1]
|
// captchaToken := regexp.MustCompile(`captchaToken' value='(.+?)'`).FindStringSubmatch(b)[1]
|
||||||
returnUrl := regexp.MustCompile(`returnUrl = '(.+?)'`).FindStringSubmatch(b)[1]
|
// returnUrl := regexp.MustCompile(`returnUrl = '(.+?)'`).FindStringSubmatch(b)[1]
|
||||||
paramId := regexp.MustCompile(`paramId = "(.+?)"`).FindStringSubmatch(b)[1]
|
// paramId := regexp.MustCompile(`paramId = "(.+?)"`).FindStringSubmatch(b)[1]
|
||||||
//reqId := regexp.MustCompile(`reqId = "(.+?)"`).FindStringSubmatch(b)[1]
|
// //reqId := regexp.MustCompile(`reqId = "(.+?)"`).FindStringSubmatch(b)[1]
|
||||||
jRsakey := regexp.MustCompile(`j_rsaKey" value="(\S+)"`).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]
|
// vCodeID := regexp.MustCompile(`picCaptcha\.do\?token\=([A-Za-z0-9\&\=]+)`).FindStringSubmatch(b)[1]
|
||||||
vCodeRS := ""
|
// vCodeRS := ""
|
||||||
if vCodeID != "" {
|
// if vCodeID != "" {
|
||||||
// need ValidateCode
|
// // need ValidateCode
|
||||||
log.Debugf("try to identify verification codes")
|
// log.Debugf("try to identify verification codes")
|
||||||
timeStamp := strconv.FormatInt(time.Now().UnixNano()/1e6, 10)
|
// timeStamp := strconv.FormatInt(time.Now().UnixNano()/1e6, 10)
|
||||||
u := "https://open.e.189.cn/api/logbox/oauth2/picCaptcha.do?token=" + vCodeID + timeStamp
|
// u := "https://open.e.189.cn/api/logbox/oauth2/picCaptcha.do?token=" + vCodeID + timeStamp
|
||||||
imgRes, err := d.client.R().SetHeaders(map[string]string{
|
// 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",
|
// "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",
|
// "Referer": "https://open.e.189.cn/api/logbox/oauth2/unifyAccountLogin.do",
|
||||||
"Sec-Fetch-Dest": "image",
|
// "Sec-Fetch-Dest": "image",
|
||||||
"Sec-Fetch-Mode": "no-cors",
|
// "Sec-Fetch-Mode": "no-cors",
|
||||||
"Sec-Fetch-Site": "same-origin",
|
// "Sec-Fetch-Site": "same-origin",
|
||||||
}).Get(u)
|
// }).Get(u)
|
||||||
if err != nil {
|
// if err != nil {
|
||||||
return err
|
// return err
|
||||||
}
|
// }
|
||||||
// Enter the verification code manually
|
// // Enter the verification code manually
|
||||||
//err = message.GetMessenger().WaitSend(message.Message{
|
// //err = message.GetMessenger().WaitSend(message.Message{
|
||||||
// Type: "image",
|
// // Type: "image",
|
||||||
// Content: "data:image/png;base64," + base64.StdEncoding.EncodeToString(imgRes.Body()),
|
// // Content: "data:image/png;base64," + base64.StdEncoding.EncodeToString(imgRes.Body()),
|
||||||
//}, 10)
|
// //}, 10)
|
||||||
//if err != nil {
|
// //if err != nil {
|
||||||
// return err
|
// // return err
|
||||||
//}
|
// //}
|
||||||
//vCodeRS, err = message.GetMessenger().WaitReceive(30)
|
// //vCodeRS, err = message.GetMessenger().WaitReceive(30)
|
||||||
// use ocr api
|
// // use ocr api
|
||||||
vRes, err := base.RestyClient.R().SetMultipartField(
|
// vRes, err := base.RestyClient.R().SetMultipartField(
|
||||||
"image", "validateCode.png", "image/png", bytes.NewReader(imgRes.Body())).
|
// "image", "validateCode.png", "image/png", bytes.NewReader(imgRes.Body())).
|
||||||
Post(setting.GetStr(conf.OcrApi))
|
// Post(setting.GetStr(conf.OcrApi))
|
||||||
if err != nil {
|
// if err != nil {
|
||||||
return err
|
// return err
|
||||||
}
|
// }
|
||||||
if jsoniter.Get(vRes.Body(), "status").ToInt() != 200 {
|
// if jsoniter.Get(vRes.Body(), "status").ToInt() != 200 {
|
||||||
return errors.New("ocr error:" + jsoniter.Get(vRes.Body(), "msg").ToString())
|
// return errors.New("ocr error:" + jsoniter.Get(vRes.Body(), "msg").ToString())
|
||||||
}
|
// }
|
||||||
vCodeRS = jsoniter.Get(vRes.Body(), "result").ToString()
|
// vCodeRS = jsoniter.Get(vRes.Body(), "result").ToString()
|
||||||
log.Debugln("code: ", vCodeRS)
|
// log.Debugln("code: ", vCodeRS)
|
||||||
}
|
// }
|
||||||
userRsa := RsaEncode([]byte(d.Username), jRsakey, true)
|
// userRsa := RsaEncode([]byte(d.Username), jRsakey, true)
|
||||||
passwordRsa := RsaEncode([]byte(d.Password), jRsakey, true)
|
// passwordRsa := RsaEncode([]byte(d.Password), jRsakey, true)
|
||||||
url = "https://open.e.189.cn/api/logbox/oauth2/loginSubmit.do"
|
// url = "https://open.e.189.cn/api/logbox/oauth2/loginSubmit.do"
|
||||||
var loginResp LoginResp
|
// var loginResp LoginResp
|
||||||
res, err = d.client.R().
|
// res, err = d.client.R().
|
||||||
SetHeaders(map[string]string{
|
// SetHeaders(map[string]string{
|
||||||
"lt": lt,
|
// "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",
|
// "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/",
|
// "Referer": "https://open.e.189.cn/",
|
||||||
"accept": "application/json;charset=UTF-8",
|
// "accept": "application/json;charset=UTF-8",
|
||||||
}).SetFormData(map[string]string{
|
// }).SetFormData(map[string]string{
|
||||||
"appKey": "cloud",
|
// "appKey": "cloud",
|
||||||
"accountType": "01",
|
// "accountType": "01",
|
||||||
"userName": "{RSA}" + userRsa,
|
// "userName": "{RSA}" + userRsa,
|
||||||
"password": "{RSA}" + passwordRsa,
|
// "password": "{RSA}" + passwordRsa,
|
||||||
"validateCode": vCodeRS,
|
// "validateCode": vCodeRS,
|
||||||
"captchaToken": captchaToken,
|
// "captchaToken": captchaToken,
|
||||||
"returnUrl": returnUrl,
|
// "returnUrl": returnUrl,
|
||||||
"mailSuffix": "@pan.cn",
|
// "mailSuffix": "@pan.cn",
|
||||||
"paramId": paramId,
|
// "paramId": paramId,
|
||||||
"clientType": "10010",
|
// "clientType": "10010",
|
||||||
"dynamicCheck": "FALSE",
|
// "dynamicCheck": "FALSE",
|
||||||
"cb_SaveName": "1",
|
// "cb_SaveName": "1",
|
||||||
"isOauth2": "false",
|
// "isOauth2": "false",
|
||||||
}).Post(url)
|
// }).Post(url)
|
||||||
if err != nil {
|
// if err != nil {
|
||||||
return err
|
// return err
|
||||||
}
|
// }
|
||||||
err = utils.Json.Unmarshal(res.Body(), &loginResp)
|
// err = utils.Json.Unmarshal(res.Body(), &loginResp)
|
||||||
if err != nil {
|
// if err != nil {
|
||||||
log.Error(err.Error())
|
// log.Error(err.Error())
|
||||||
return err
|
// return err
|
||||||
}
|
// }
|
||||||
if loginResp.Result != 0 {
|
// if loginResp.Result != 0 {
|
||||||
return fmt.Errorf(loginResp.Msg)
|
// return fmt.Errorf(loginResp.Msg)
|
||||||
}
|
// }
|
||||||
_, err = d.client.R().Get(loginResp.ToUrl)
|
// _, err = d.client.R().Get(loginResp.ToUrl)
|
||||||
return err
|
// return err
|
||||||
}
|
//}
|
||||||
|
|
||||||
func (d *Cloud189) request(url string, method string, callback base.ReqCallback, resp interface{}) ([]byte, error) {
|
func (d *Cloud189) request(url string, method string, callback base.ReqCallback, resp interface{}) ([]byte, error) {
|
||||||
var e Error
|
var e Error
|
||||||
@ -163,7 +160,7 @@ func (d *Cloud189) request(url string, method string, callback base.ReqCallback,
|
|||||||
//log.Debug(res.String())
|
//log.Debug(res.String())
|
||||||
if e.ErrorCode != "" {
|
if e.ErrorCode != "" {
|
||||||
if e.ErrorCode == "InvalidSessionKey" {
|
if e.ErrorCode == "InvalidSessionKey" {
|
||||||
err = d.login()
|
err = d.newLogin()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
@ -4,7 +4,6 @@ import (
|
|||||||
"context"
|
"context"
|
||||||
"net/http"
|
"net/http"
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
|
||||||
|
|
||||||
"github.com/alist-org/alist/v3/drivers/base"
|
"github.com/alist-org/alist/v3/drivers/base"
|
||||||
"github.com/alist-org/alist/v3/internal/driver"
|
"github.com/alist-org/alist/v3/internal/driver"
|
||||||
@ -19,8 +18,7 @@ type Cloud189PC struct {
|
|||||||
|
|
||||||
identity string
|
identity string
|
||||||
|
|
||||||
client *resty.Client
|
client *resty.Client
|
||||||
putClient *resty.Client
|
|
||||||
|
|
||||||
loginParam *LoginParam
|
loginParam *LoginParam
|
||||||
tokenInfo *AppSessionResp
|
tokenInfo *AppSessionResp
|
||||||
@ -51,9 +49,6 @@ func (y *Cloud189PC) Init(ctx context.Context) (err error) {
|
|||||||
"Referer": WEB_URL,
|
"Referer": WEB_URL,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
if y.putClient == nil {
|
|
||||||
y.putClient = base.NewRestyClient().SetTimeout(120 * time.Second)
|
|
||||||
}
|
|
||||||
|
|
||||||
// 避免重复登陆
|
// 避免重复登陆
|
||||||
identity := utils.GetMD5Encode(y.Username + y.Password)
|
identity := utils.GetMD5Encode(y.Username + y.Password)
|
||||||
@ -266,8 +261,14 @@ func (y *Cloud189PC) Remove(ctx context.Context, obj model.Obj) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (y *Cloud189PC) Put(ctx context.Context, dstDir model.Obj, stream model.FileStreamer, up driver.UpdateProgress) error {
|
func (y *Cloud189PC) Put(ctx context.Context, dstDir model.Obj, stream model.FileStreamer, up driver.UpdateProgress) error {
|
||||||
if y.RapidUpload {
|
switch y.UploadMethod {
|
||||||
|
case "stream":
|
||||||
|
return y.CommonUpload(ctx, dstDir, stream, up)
|
||||||
|
case "old":
|
||||||
|
return y.OldUpload(ctx, dstDir, stream, up)
|
||||||
|
case "rapid":
|
||||||
return y.FastUpload(ctx, dstDir, stream, up)
|
return y.FastUpload(ctx, dstDir, stream, up)
|
||||||
|
default:
|
||||||
|
return y.CommonUpload(ctx, dstDir, stream, up)
|
||||||
}
|
}
|
||||||
return y.CommonUpload(ctx, dstDir, stream, up)
|
|
||||||
}
|
}
|
||||||
|
@ -11,6 +11,7 @@ import (
|
|||||||
"encoding/hex"
|
"encoding/hex"
|
||||||
"encoding/pem"
|
"encoding/pem"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"math"
|
||||||
"net/http"
|
"net/http"
|
||||||
"regexp"
|
"regexp"
|
||||||
"strings"
|
"strings"
|
||||||
@ -131,3 +132,18 @@ func BoolToNumber(b bool) int {
|
|||||||
}
|
}
|
||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 计算分片大小
|
||||||
|
// 对分片数量有限制
|
||||||
|
// 10MIB 20 MIB 999片
|
||||||
|
// 50MIB 60MIB 70MIB 80MIB ∞MIB 1999片
|
||||||
|
func partSize(size int64) int64 {
|
||||||
|
const DEFAULT = 1024 * 1024 * 10 // 10MIB
|
||||||
|
if size > DEFAULT*2*999 {
|
||||||
|
return int64(math.Max(math.Ceil((float64(size)/1999) /*=单个切片大小*/ /float64(DEFAULT)) /*=倍率*/, 5) * DEFAULT)
|
||||||
|
}
|
||||||
|
if size > DEFAULT*999 {
|
||||||
|
return DEFAULT * 2 // 20MIB
|
||||||
|
}
|
||||||
|
return DEFAULT
|
||||||
|
}
|
||||||
|
@ -14,13 +14,14 @@ type Addition struct {
|
|||||||
OrderDirection string `json:"order_direction" type:"select" options:"asc,desc" default:"asc"`
|
OrderDirection string `json:"order_direction" type:"select" options:"asc,desc" default:"asc"`
|
||||||
Type string `json:"type" type:"select" options:"personal,family" default:"personal"`
|
Type string `json:"type" type:"select" options:"personal,family" default:"personal"`
|
||||||
FamilyID string `json:"family_id"`
|
FamilyID string `json:"family_id"`
|
||||||
RapidUpload bool `json:"rapid_upload"`
|
UploadMethod string `json:"upload_method" type:"select" options:"stream,rapid,old" default:"stream"`
|
||||||
NoUseOcr bool `json:"no_use_ocr"`
|
NoUseOcr bool `json:"no_use_ocr"`
|
||||||
}
|
}
|
||||||
|
|
||||||
var config = driver.Config{
|
var config = driver.Config{
|
||||||
Name: "189CloudPC",
|
Name: "189CloudPC",
|
||||||
DefaultRoot: "-11",
|
DefaultRoot: "-11",
|
||||||
|
CheckStatus: true,
|
||||||
}
|
}
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
|
@ -10,20 +10,62 @@ import (
|
|||||||
|
|
||||||
// 居然有四种返回方式
|
// 居然有四种返回方式
|
||||||
type RespErr struct {
|
type RespErr struct {
|
||||||
ResCode string `json:"res_code"`
|
ResCode any `json:"res_code"` // int or string
|
||||||
ResMessage string `json:"res_message"`
|
ResMessage string `json:"res_message"`
|
||||||
|
|
||||||
|
Error_ string `json:"error"`
|
||||||
|
|
||||||
XMLName xml.Name `xml:"error"`
|
XMLName xml.Name `xml:"error"`
|
||||||
Code string `json:"code" xml:"code"`
|
Code string `json:"code" xml:"code"`
|
||||||
Message string `json:"message" xml:"message"`
|
Message string `json:"message" xml:"message"`
|
||||||
|
Msg string `json:"msg"`
|
||||||
// Code string `json:"code"`
|
|
||||||
Msg string `json:"msg"`
|
|
||||||
|
|
||||||
ErrorCode string `json:"errorCode"`
|
ErrorCode string `json:"errorCode"`
|
||||||
ErrorMsg string `json:"errorMsg"`
|
ErrorMsg string `json:"errorMsg"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (e *RespErr) HasError() bool {
|
||||||
|
switch v := e.ResCode.(type) {
|
||||||
|
case int, int64, int32:
|
||||||
|
return v != 0
|
||||||
|
case string:
|
||||||
|
return e.ResCode != ""
|
||||||
|
}
|
||||||
|
return (e.Code != "" && e.Code != "SUCCESS") || e.ErrorCode != "" || e.Error_ != ""
|
||||||
|
}
|
||||||
|
|
||||||
|
func (e *RespErr) Error() string {
|
||||||
|
switch v := e.ResCode.(type) {
|
||||||
|
case int, int64, int32:
|
||||||
|
if v != 0 {
|
||||||
|
return fmt.Sprintf("res_code: %d ,res_msg: %s", v, e.ResMessage)
|
||||||
|
}
|
||||||
|
case string:
|
||||||
|
if e.ResCode != "" {
|
||||||
|
return fmt.Sprintf("res_code: %s ,res_msg: %s", e.ResCode, e.ResMessage)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if e.Code != "" && e.Code != "SUCCESS" {
|
||||||
|
if e.Msg != "" {
|
||||||
|
return fmt.Sprintf("code: %s ,msg: %s", e.Code, e.Msg)
|
||||||
|
}
|
||||||
|
if e.Message != "" {
|
||||||
|
return fmt.Sprintf("code: %s ,msg: %s", e.Code, e.Message)
|
||||||
|
}
|
||||||
|
return "code: " + e.Code
|
||||||
|
}
|
||||||
|
|
||||||
|
if e.ErrorCode != "" {
|
||||||
|
return fmt.Sprintf("err_code: %s ,err_msg: %s", e.ErrorCode, e.ErrorMsg)
|
||||||
|
}
|
||||||
|
|
||||||
|
if e.Error_ != "" {
|
||||||
|
return fmt.Sprintf("error: %s ,message: %s", e.ErrorCode, e.Message)
|
||||||
|
}
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
// 登陆需要的参数
|
// 登陆需要的参数
|
||||||
type LoginParam struct {
|
type LoginParam struct {
|
||||||
// 加密后的用户名和密码
|
// 加密后的用户名和密码
|
||||||
@ -218,6 +260,42 @@ type Part struct {
|
|||||||
RequestHeader string `json:"requestHeader"`
|
RequestHeader string `json:"requestHeader"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* 第二种上传方式 */
|
||||||
|
type CreateUploadFileResp struct {
|
||||||
|
// 上传文件请求ID
|
||||||
|
UploadFileId int64 `json:"uploadFileId"`
|
||||||
|
// 上传文件数据的URL路径
|
||||||
|
FileUploadUrl string `json:"fileUploadUrl"`
|
||||||
|
// 上传文件完成后确认路径
|
||||||
|
FileCommitUrl string `json:"fileCommitUrl"`
|
||||||
|
// 文件是否已存在云盘中,0-未存在,1-已存在
|
||||||
|
FileDataExists int `json:"fileDataExists"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type GetUploadFileStatusResp struct {
|
||||||
|
CreateUploadFileResp
|
||||||
|
|
||||||
|
// 已上传的大小
|
||||||
|
DataSize int64 `json:"dataSize"`
|
||||||
|
Size int64 `json:"size"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r *GetUploadFileStatusResp) GetSize() int64 {
|
||||||
|
return r.DataSize + r.Size
|
||||||
|
}
|
||||||
|
|
||||||
|
type CommitUploadFileResp struct {
|
||||||
|
XMLName xml.Name `xml:"file"`
|
||||||
|
Id string `xml:"id"`
|
||||||
|
Name string `xml:"name"`
|
||||||
|
Size string `xml:"size"`
|
||||||
|
Md5 string `xml:"md5"`
|
||||||
|
CreateDate string `xml:"createDate"`
|
||||||
|
Rev string `xml:"rev"`
|
||||||
|
UserId string `xml:"userId"`
|
||||||
|
}
|
||||||
|
|
||||||
|
/* query 加密参数*/
|
||||||
type Params map[string]string
|
type Params map[string]string
|
||||||
|
|
||||||
func (p Params) Set(k, v string) {
|
func (p Params) Set(k, v string) {
|
||||||
|
@ -6,6 +6,7 @@ import (
|
|||||||
"crypto/md5"
|
"crypto/md5"
|
||||||
"encoding/base64"
|
"encoding/base64"
|
||||||
"encoding/hex"
|
"encoding/hex"
|
||||||
|
"encoding/xml"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
"math"
|
"math"
|
||||||
@ -15,6 +16,7 @@ import (
|
|||||||
"os"
|
"os"
|
||||||
"regexp"
|
"regexp"
|
||||||
"strings"
|
"strings"
|
||||||
|
"time"
|
||||||
|
|
||||||
"github.com/alist-org/alist/v3/drivers/base"
|
"github.com/alist-org/alist/v3/drivers/base"
|
||||||
"github.com/alist-org/alist/v3/internal/conf"
|
"github.com/alist-org/alist/v3/internal/conf"
|
||||||
@ -23,9 +25,12 @@ import (
|
|||||||
"github.com/alist-org/alist/v3/internal/op"
|
"github.com/alist-org/alist/v3/internal/op"
|
||||||
"github.com/alist-org/alist/v3/internal/setting"
|
"github.com/alist-org/alist/v3/internal/setting"
|
||||||
"github.com/alist-org/alist/v3/pkg/utils"
|
"github.com/alist-org/alist/v3/pkg/utils"
|
||||||
|
|
||||||
|
"github.com/avast/retry-go"
|
||||||
"github.com/go-resty/resty/v2"
|
"github.com/go-resty/resty/v2"
|
||||||
"github.com/google/uuid"
|
"github.com/google/uuid"
|
||||||
jsoniter "github.com/json-iterator/go"
|
jsoniter "github.com/json-iterator/go"
|
||||||
|
"github.com/pkg/errors"
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
@ -47,7 +52,7 @@ const (
|
|||||||
CHANNEL_ID = "web_cloud.189.cn"
|
CHANNEL_ID = "web_cloud.189.cn"
|
||||||
)
|
)
|
||||||
|
|
||||||
func (y *Cloud189PC) request(url, method string, callback base.ReqCallback, params Params, resp interface{}) ([]byte, error) {
|
func (y *Cloud189PC) SignatureHeader(url, method, params string) map[string]string {
|
||||||
dateOfGmt := getHttpDateStr()
|
dateOfGmt := getHttpDateStr()
|
||||||
sessionKey := y.tokenInfo.SessionKey
|
sessionKey := y.tokenInfo.SessionKey
|
||||||
sessionSecret := y.tokenInfo.SessionSecret
|
sessionSecret := y.tokenInfo.SessionSecret
|
||||||
@ -56,19 +61,40 @@ func (y *Cloud189PC) request(url, method string, callback base.ReqCallback, para
|
|||||||
sessionSecret = y.tokenInfo.FamilySessionSecret
|
sessionSecret = y.tokenInfo.FamilySessionSecret
|
||||||
}
|
}
|
||||||
|
|
||||||
req := y.client.R().SetQueryParams(clientSuffix()).SetHeaders(map[string]string{
|
header := map[string]string{
|
||||||
"Date": dateOfGmt,
|
"Date": dateOfGmt,
|
||||||
"SessionKey": sessionKey,
|
"SessionKey": sessionKey,
|
||||||
"X-Request-ID": uuid.NewString(),
|
"X-Request-ID": uuid.NewString(),
|
||||||
})
|
"Signature": signatureOfHmac(sessionSecret, sessionKey, method, url, dateOfGmt, params),
|
||||||
|
}
|
||||||
|
return header
|
||||||
|
}
|
||||||
|
|
||||||
|
func (y *Cloud189PC) EncryptParams(params Params) string {
|
||||||
|
sessionSecret := y.tokenInfo.SessionSecret
|
||||||
|
if y.isFamily() {
|
||||||
|
sessionSecret = y.tokenInfo.FamilySessionSecret
|
||||||
|
}
|
||||||
|
if params != nil {
|
||||||
|
return AesECBEncrypt(params.Encode(), sessionSecret[:16])
|
||||||
|
}
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
|
func (y *Cloud189PC) request(url, method string, callback base.ReqCallback, params Params, resp interface{}) ([]byte, error) {
|
||||||
|
req := y.client.R().SetQueryParams(clientSuffix())
|
||||||
|
|
||||||
// 设置params
|
// 设置params
|
||||||
var paramsData string
|
paramsData := y.EncryptParams(params)
|
||||||
if params != nil {
|
if paramsData != "" {
|
||||||
paramsData = AesECBEncrypt(params.Encode(), sessionSecret[:16])
|
|
||||||
req.SetQueryParam("params", paramsData)
|
req.SetQueryParam("params", paramsData)
|
||||||
}
|
}
|
||||||
req.SetHeader("Signature", signatureOfHmac(sessionSecret, sessionKey, method, url, dateOfGmt, paramsData))
|
|
||||||
|
// Signature
|
||||||
|
req.SetHeaders(y.SignatureHeader(url, method, paramsData))
|
||||||
|
|
||||||
|
var erron RespErr
|
||||||
|
req.SetError(&erron)
|
||||||
|
|
||||||
if callback != nil {
|
if callback != nil {
|
||||||
callback(req)
|
callback(req)
|
||||||
@ -80,32 +106,6 @@ func (y *Cloud189PC) request(url, method string, callback base.ReqCallback, para
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
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 strings.Contains(res.String(), "userSessionBO is null") {
|
||||||
if err = y.refreshSession(); err != nil {
|
if err = y.refreshSession(); err != nil {
|
||||||
@ -114,14 +114,17 @@ func (y *Cloud189PC) request(url, method string, callback base.ReqCallback, para
|
|||||||
return y.request(url, method, callback, params, resp)
|
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()
|
if erron.HasError() {
|
||||||
switch resCode {
|
if erron.ErrorCode == "InvalidSessionKey" {
|
||||||
case 0:
|
if err = y.refreshSession(); err != nil {
|
||||||
return res.Body(), nil
|
return nil, err
|
||||||
default:
|
}
|
||||||
return nil, fmt.Errorf("res_code: %d ,res_msg: %s", resCode, message)
|
return y.request(url, method, callback, params, resp)
|
||||||
|
}
|
||||||
|
return nil, &erron
|
||||||
}
|
}
|
||||||
|
return res.Body(), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (y *Cloud189PC) get(url string, callback base.ReqCallback, resp interface{}) ([]byte, error) {
|
func (y *Cloud189PC) get(url string, callback base.ReqCallback, resp interface{}) ([]byte, error) {
|
||||||
@ -132,6 +135,50 @@ func (y *Cloud189PC) post(url string, callback base.ReqCallback, resp interface{
|
|||||||
return y.request(url, http.MethodPost, callback, nil, resp)
|
return y.request(url, http.MethodPost, callback, nil, resp)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (y *Cloud189PC) put(ctx context.Context, url string, headers map[string]string, sign bool, file io.Reader) ([]byte, error) {
|
||||||
|
req, err := http.NewRequestWithContext(ctx, http.MethodPut, url, file)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
query := req.URL.Query()
|
||||||
|
for key, value := range clientSuffix() {
|
||||||
|
query.Add(key, value)
|
||||||
|
}
|
||||||
|
req.URL.RawQuery = query.Encode()
|
||||||
|
|
||||||
|
for key, value := range headers {
|
||||||
|
req.Header.Add(key, value)
|
||||||
|
}
|
||||||
|
|
||||||
|
if sign {
|
||||||
|
for key, value := range y.SignatureHeader(url, http.MethodPut, "") {
|
||||||
|
req.Header.Add(key, value)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
resp, err := base.HttpClient.Do(req)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
defer resp.Body.Close()
|
||||||
|
|
||||||
|
body, err := io.ReadAll(resp.Body)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
var erron RespErr
|
||||||
|
jsoniter.Unmarshal(body, &erron)
|
||||||
|
xml.Unmarshal(body, &erron)
|
||||||
|
if erron.HasError() {
|
||||||
|
return nil, &erron
|
||||||
|
}
|
||||||
|
if resp.StatusCode != http.StatusOK {
|
||||||
|
return nil, errors.Errorf("put fail,err:%s", string(body))
|
||||||
|
}
|
||||||
|
return body, nil
|
||||||
|
}
|
||||||
func (y *Cloud189PC) getFiles(ctx context.Context, fileId string) ([]model.Obj, error) {
|
func (y *Cloud189PC) getFiles(ctx context.Context, fileId string) ([]model.Obj, error) {
|
||||||
fullUrl := API_URL
|
fullUrl := API_URL
|
||||||
if y.isFamily() {
|
if y.isFamily() {
|
||||||
@ -186,7 +233,7 @@ func (y *Cloud189PC) getFiles(ctx context.Context, fileId string) ([]model.Obj,
|
|||||||
|
|
||||||
func (y *Cloud189PC) login() (err error) {
|
func (y *Cloud189PC) login() (err error) {
|
||||||
// 初始化登陆所需参数
|
// 初始化登陆所需参数
|
||||||
if y.loginParam == nil || !y.NoUseOcr {
|
if y.loginParam == nil {
|
||||||
if err = y.initLoginParam(); err != nil {
|
if err = y.initLoginParam(); err != nil {
|
||||||
// 验证码也通过错误返回
|
// 验证码也通过错误返回
|
||||||
return err
|
return err
|
||||||
@ -197,7 +244,7 @@ func (y *Cloud189PC) login() (err error) {
|
|||||||
y.VCode = ""
|
y.VCode = ""
|
||||||
// 销毁登陆参数
|
// 销毁登陆参数
|
||||||
y.loginParam = nil
|
y.loginParam = nil
|
||||||
// 遇到错误,重新加载登陆参数
|
// 遇到错误,重新加载登陆参数(刷新验证码)
|
||||||
if err != nil && y.NoUseOcr {
|
if err != nil && y.NoUseOcr {
|
||||||
if err1 := y.initLoginParam(); err1 != nil {
|
if err1 := y.initLoginParam(); err1 != nil {
|
||||||
err = fmt.Errorf("err1: %s \nerr2: %s", err, err1)
|
err = fmt.Errorf("err1: %s \nerr2: %s", err, err1)
|
||||||
@ -249,9 +296,8 @@ func (y *Cloud189PC) login() (err error) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if erron.ResCode != "" {
|
if erron.HasError() {
|
||||||
err = fmt.Errorf(erron.ResMessage)
|
return &erron
|
||||||
return
|
|
||||||
}
|
}
|
||||||
if tokenInfo.ResCode != 0 {
|
if tokenInfo.ResCode != 0 {
|
||||||
err = fmt.Errorf(tokenInfo.ResMessage)
|
err = fmt.Errorf(tokenInfo.ResMessage)
|
||||||
@ -304,6 +350,22 @@ func (y *Cloud189PC) initLoginParam() error {
|
|||||||
param.RsaPassword = encryptConf.Data.Pre + RsaEncrypt(param.jRsaKey, y.Password)
|
param.RsaPassword = encryptConf.Data.Pre + RsaEncrypt(param.jRsaKey, y.Password)
|
||||||
y.loginParam = ¶m
|
y.loginParam = ¶m
|
||||||
|
|
||||||
|
// 判断是否需要验证码
|
||||||
|
resp, err := y.client.R().
|
||||||
|
SetHeader("REQID", param.ReqId).
|
||||||
|
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
|
||||||
|
}
|
||||||
|
if resp.String() == "0" {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// 拉取验证码
|
||||||
imgRes, err := y.client.R().
|
imgRes, err := y.client.R().
|
||||||
SetQueryParams(map[string]string{
|
SetQueryParams(map[string]string{
|
||||||
"token": param.CaptchaToken,
|
"token": param.CaptchaToken,
|
||||||
@ -359,33 +421,23 @@ func (y *Cloud189PC) refreshSession() (err error) {
|
|||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
|
|
||||||
switch erron.ResCode {
|
if erron.HasError() {
|
||||||
case "":
|
if erron.ResCode == "UserInvalidOpenToken" {
|
||||||
break
|
if err = y.login(); err != nil {
|
||||||
case "UserInvalidOpenToken":
|
return err
|
||||||
if err = y.login(); err != nil {
|
}
|
||||||
return err
|
|
||||||
}
|
}
|
||||||
default:
|
return &erron
|
||||||
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)
|
|
||||||
}
|
}
|
||||||
|
y.tokenInfo.UserSessionResp = userSessionResp
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// 普通上传
|
// 普通上传
|
||||||
func (y *Cloud189PC) CommonUpload(ctx context.Context, dstDir model.Obj, file model.FileStreamer, up driver.UpdateProgress) (err error) {
|
func (y *Cloud189PC) CommonUpload(ctx context.Context, dstDir model.Obj, file model.FileStreamer, up driver.UpdateProgress) (err error) {
|
||||||
const DEFAULT int64 = 10485760
|
var DEFAULT = partSize(file.GetSize())
|
||||||
var count = int64(math.Ceil(float64(file.GetSize()) / float64(DEFAULT)))
|
var count = int(math.Ceil(float64(file.GetSize()) / float64(DEFAULT)))
|
||||||
|
|
||||||
requestID := uuid.NewString()
|
|
||||||
params := Params{
|
params := Params{
|
||||||
"parentFolderId": dstDir.GetID(),
|
"parentFolderId": dstDir.GetID(),
|
||||||
"fileName": url.QueryEscape(file.GetName()),
|
"fileName": url.QueryEscape(file.GetName()),
|
||||||
@ -407,7 +459,6 @@ func (y *Cloud189PC) CommonUpload(ctx context.Context, dstDir model.Obj, file mo
|
|||||||
var initMultiUpload InitMultiUploadResp
|
var initMultiUpload InitMultiUploadResp
|
||||||
_, err = y.request(fullUrl+"/initMultiUpload", http.MethodGet, func(req *resty.Request) {
|
_, err = y.request(fullUrl+"/initMultiUpload", http.MethodGet, func(req *resty.Request) {
|
||||||
req.SetContext(ctx)
|
req.SetContext(ctx)
|
||||||
req.SetHeader("X-Request-ID", requestID)
|
|
||||||
}, params, &initMultiUpload)
|
}, params, &initMultiUpload)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
@ -417,7 +468,7 @@ func (y *Cloud189PC) CommonUpload(ctx context.Context, dstDir model.Obj, file mo
|
|||||||
silceMd5 := md5.New()
|
silceMd5 := md5.New()
|
||||||
silceMd5Hexs := make([]string, 0, count)
|
silceMd5Hexs := make([]string, 0, count)
|
||||||
byteData := bytes.NewBuffer(make([]byte, DEFAULT))
|
byteData := bytes.NewBuffer(make([]byte, DEFAULT))
|
||||||
for i := int64(1); i <= count; i++ {
|
for i := 1; i <= count; i++ {
|
||||||
if utils.IsCanceled(ctx) {
|
if utils.IsCanceled(ctx) {
|
||||||
return ctx.Err()
|
return ctx.Err()
|
||||||
}
|
}
|
||||||
@ -440,7 +491,6 @@ func (y *Cloud189PC) CommonUpload(ctx context.Context, dstDir model.Obj, file mo
|
|||||||
_, err = y.request(fullUrl+"/getMultiUploadUrls", http.MethodGet,
|
_, err = y.request(fullUrl+"/getMultiUploadUrls", http.MethodGet,
|
||||||
func(req *resty.Request) {
|
func(req *resty.Request) {
|
||||||
req.SetContext(ctx)
|
req.SetContext(ctx)
|
||||||
req.SetHeader("X-Request-ID", requestID)
|
|
||||||
}, Params{
|
}, Params{
|
||||||
"partInfo": fmt.Sprintf("%d-%s", i, silceMd5Base64),
|
"partInfo": fmt.Sprintf("%d-%s", i, silceMd5Base64),
|
||||||
"uploadFileId": initMultiUpload.Data.UploadFileID,
|
"uploadFileId": initMultiUpload.Data.UploadFileID,
|
||||||
@ -451,18 +501,18 @@ func (y *Cloud189PC) CommonUpload(ctx context.Context, dstDir model.Obj, file mo
|
|||||||
|
|
||||||
// 开始上传
|
// 开始上传
|
||||||
uploadData := uploadUrl.UploadUrls[fmt.Sprint("partNumber_", i)]
|
uploadData := uploadUrl.UploadUrls[fmt.Sprint("partNumber_", i)]
|
||||||
res, err := y.putClient.R().
|
|
||||||
SetContext(ctx).
|
err = retry.Do(func() error {
|
||||||
SetQueryParams(clientSuffix()).
|
_, err := y.put(ctx, uploadData.RequestURL, ParseHttpHeader(uploadData.RequestHeader), false, bytes.NewReader(byteData.Bytes()))
|
||||||
SetHeaders(ParseHttpHeader(uploadData.RequestHeader)).
|
return err
|
||||||
SetBody(byteData).
|
},
|
||||||
Put(uploadData.RequestURL)
|
retry.Context(ctx),
|
||||||
|
retry.Attempts(3),
|
||||||
|
retry.Delay(time.Second),
|
||||||
|
retry.MaxDelay(5*time.Second))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
if res.StatusCode() != http.StatusOK {
|
|
||||||
return fmt.Errorf("updload fail,msg: %s", res.String())
|
|
||||||
}
|
|
||||||
up(int(i * 100 / count))
|
up(int(i * 100 / count))
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -476,7 +526,6 @@ func (y *Cloud189PC) CommonUpload(ctx context.Context, dstDir model.Obj, file mo
|
|||||||
_, err = y.request(fullUrl+"/commitMultiUploadFile", http.MethodGet,
|
_, err = y.request(fullUrl+"/commitMultiUploadFile", http.MethodGet,
|
||||||
func(req *resty.Request) {
|
func(req *resty.Request) {
|
||||||
req.SetContext(ctx)
|
req.SetContext(ctx)
|
||||||
req.SetHeader("X-Request-ID", requestID)
|
|
||||||
}, Params{
|
}, Params{
|
||||||
"uploadFileId": initMultiUpload.Data.UploadFileID,
|
"uploadFileId": initMultiUpload.Data.UploadFileID,
|
||||||
"fileMd5": fileMd5Hex,
|
"fileMd5": fileMd5Hex,
|
||||||
@ -500,7 +549,7 @@ func (y *Cloud189PC) FastUpload(ctx context.Context, dstDir model.Obj, file mode
|
|||||||
_ = os.Remove(tempFile.Name())
|
_ = os.Remove(tempFile.Name())
|
||||||
}()
|
}()
|
||||||
|
|
||||||
const DEFAULT int64 = 10485760
|
var DEFAULT = partSize(file.GetSize())
|
||||||
count := int(math.Ceil(float64(file.GetSize()) / float64(DEFAULT)))
|
count := int(math.Ceil(float64(file.GetSize()) / float64(DEFAULT)))
|
||||||
|
|
||||||
// 优先计算所需信息
|
// 优先计算所需信息
|
||||||
@ -531,7 +580,6 @@ func (y *Cloud189PC) FastUpload(ctx context.Context, dstDir model.Obj, file mode
|
|||||||
sliceMd5Hex = strings.ToUpper(utils.GetMD5Encode(strings.Join(silceMd5Hexs, "\n")))
|
sliceMd5Hex = strings.ToUpper(utils.GetMD5Encode(strings.Join(silceMd5Hexs, "\n")))
|
||||||
}
|
}
|
||||||
|
|
||||||
requestID := uuid.NewString()
|
|
||||||
// 检测是否支持快传
|
// 检测是否支持快传
|
||||||
params := Params{
|
params := Params{
|
||||||
"parentFolderId": dstDir.GetID(),
|
"parentFolderId": dstDir.GetID(),
|
||||||
@ -554,7 +602,6 @@ func (y *Cloud189PC) FastUpload(ctx context.Context, dstDir model.Obj, file mode
|
|||||||
var uploadInfo InitMultiUploadResp
|
var uploadInfo InitMultiUploadResp
|
||||||
_, err = y.request(fullUrl+"/initMultiUpload", http.MethodGet, func(req *resty.Request) {
|
_, err = y.request(fullUrl+"/initMultiUpload", http.MethodGet, func(req *resty.Request) {
|
||||||
req.SetContext(ctx)
|
req.SetContext(ctx)
|
||||||
req.SetHeader("X-Request-ID", requestID)
|
|
||||||
}, params, &uploadInfo)
|
}, params, &uploadInfo)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
@ -566,7 +613,6 @@ func (y *Cloud189PC) FastUpload(ctx context.Context, dstDir model.Obj, file mode
|
|||||||
_, err = y.request(fullUrl+"/getMultiUploadUrls", http.MethodGet,
|
_, err = y.request(fullUrl+"/getMultiUploadUrls", http.MethodGet,
|
||||||
func(req *resty.Request) {
|
func(req *resty.Request) {
|
||||||
req.SetContext(ctx)
|
req.SetContext(ctx)
|
||||||
req.SetHeader("X-Request-ID", requestID)
|
|
||||||
}, Params{
|
}, Params{
|
||||||
"uploadFileId": uploadInfo.Data.UploadFileID,
|
"uploadFileId": uploadInfo.Data.UploadFileID,
|
||||||
"partInfo": strings.Join(silceMd5Base64s, ","),
|
"partInfo": strings.Join(silceMd5Base64s, ","),
|
||||||
@ -575,26 +621,29 @@ func (y *Cloud189PC) FastUpload(ctx context.Context, dstDir model.Obj, file mode
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
buf := make([]byte, DEFAULT)
|
||||||
for i := 1; i <= count; i++ {
|
for i := 1; i <= count; i++ {
|
||||||
select {
|
if utils.IsCanceled(ctx) {
|
||||||
case <-ctx.Done():
|
|
||||||
return ctx.Err()
|
return ctx.Err()
|
||||||
default:
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
n, err := io.ReadFull(tempFile, buf)
|
||||||
|
if err != nil && err != io.EOF && err != io.ErrUnexpectedEOF {
|
||||||
|
return err
|
||||||
|
}
|
||||||
uploadData := uploadUrls.UploadUrls[fmt.Sprint("partNumber_", i)]
|
uploadData := uploadUrls.UploadUrls[fmt.Sprint("partNumber_", i)]
|
||||||
res, err := y.putClient.R().
|
err = retry.Do(func() error {
|
||||||
SetContext(ctx).
|
_, err := y.put(ctx, uploadData.RequestURL, ParseHttpHeader(uploadData.RequestHeader), false, bytes.NewReader(buf[:n]))
|
||||||
SetQueryParams(clientSuffix()).
|
return err
|
||||||
SetHeaders(ParseHttpHeader(uploadData.RequestHeader)).
|
},
|
||||||
SetBody(io.LimitReader(tempFile, DEFAULT)).
|
retry.Context(ctx),
|
||||||
Put(uploadData.RequestURL)
|
retry.Attempts(3),
|
||||||
|
retry.Delay(time.Second),
|
||||||
|
retry.MaxDelay(5*time.Second))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
if res.StatusCode() != http.StatusOK {
|
|
||||||
return fmt.Errorf("updload fail,msg: %s", res.String())
|
|
||||||
}
|
|
||||||
up(int(i * 100 / count))
|
up(int(i * 100 / count))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -603,7 +652,6 @@ func (y *Cloud189PC) FastUpload(ctx context.Context, dstDir model.Obj, file mode
|
|||||||
_, err = y.request(fullUrl+"/commitMultiUploadFile", http.MethodGet,
|
_, err = y.request(fullUrl+"/commitMultiUploadFile", http.MethodGet,
|
||||||
func(req *resty.Request) {
|
func(req *resty.Request) {
|
||||||
req.SetContext(ctx)
|
req.SetContext(ctx)
|
||||||
req.SetHeader("X-Request-ID", requestID)
|
|
||||||
}, Params{
|
}, Params{
|
||||||
"uploadFileId": uploadInfo.Data.UploadFileID,
|
"uploadFileId": uploadInfo.Data.UploadFileID,
|
||||||
"isLog": "0",
|
"isLog": "0",
|
||||||
@ -612,6 +660,137 @@ func (y *Cloud189PC) FastUpload(ctx context.Context, dstDir model.Obj, file mode
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (y *Cloud189PC) OldUpload(ctx context.Context, dstDir model.Obj, file model.FileStreamer, up driver.UpdateProgress) (err error) {
|
||||||
|
// 需要获取完整文件md5,必须支持 io.Seek
|
||||||
|
tempFile, err := utils.CreateTempFile(file.GetReadCloser())
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
defer func() {
|
||||||
|
_ = tempFile.Close()
|
||||||
|
_ = os.Remove(tempFile.Name())
|
||||||
|
}()
|
||||||
|
|
||||||
|
// 计算md5
|
||||||
|
fileMd5 := md5.New()
|
||||||
|
if _, err := io.Copy(fileMd5, tempFile); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if _, err = tempFile.Seek(0, io.SeekStart); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
fileMd5Hex := strings.ToUpper(hex.EncodeToString(fileMd5.Sum(nil)))
|
||||||
|
|
||||||
|
// 创建上传会话
|
||||||
|
var uploadInfo CreateUploadFileResp
|
||||||
|
|
||||||
|
fullUrl := API_URL + "/createUploadFile.action"
|
||||||
|
if y.isFamily() {
|
||||||
|
fullUrl = API_URL + "/family/file/createFamilyFile.action"
|
||||||
|
}
|
||||||
|
_, err = y.post(fullUrl, func(req *resty.Request) {
|
||||||
|
req.SetContext(ctx)
|
||||||
|
if y.isFamily() {
|
||||||
|
req.SetQueryParams(map[string]string{
|
||||||
|
"familyId": y.FamilyID,
|
||||||
|
"fileMd5": fileMd5Hex,
|
||||||
|
"fileName": file.GetName(),
|
||||||
|
"fileSize": fmt.Sprint(file.GetSize()),
|
||||||
|
"parentId": dstDir.GetID(),
|
||||||
|
"resumePolicy": "1",
|
||||||
|
})
|
||||||
|
} else {
|
||||||
|
req.SetFormData(map[string]string{
|
||||||
|
"parentFolderId": dstDir.GetID(),
|
||||||
|
"fileName": file.GetName(),
|
||||||
|
"size": fmt.Sprint(file.GetSize()),
|
||||||
|
"md5": fileMd5Hex,
|
||||||
|
"opertype": "3",
|
||||||
|
"flag": "1",
|
||||||
|
"resumePolicy": "1",
|
||||||
|
"isLog": "0",
|
||||||
|
// "baseFileId": "",
|
||||||
|
// "lastWrite":"",
|
||||||
|
// "localPath": strings.ReplaceAll(param.LocalPath, "\\", "/"),
|
||||||
|
// "fileExt": "",
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}, &uploadInfo)
|
||||||
|
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
// 网盘中不存在该文件,开始上传
|
||||||
|
status := GetUploadFileStatusResp{CreateUploadFileResp: uploadInfo}
|
||||||
|
for status.Size < file.GetSize() && status.FileDataExists != 1 {
|
||||||
|
if utils.IsCanceled(ctx) {
|
||||||
|
return ctx.Err()
|
||||||
|
}
|
||||||
|
|
||||||
|
header := map[string]string{
|
||||||
|
"ResumePolicy": "1",
|
||||||
|
"Expect": "100-continue",
|
||||||
|
}
|
||||||
|
|
||||||
|
if y.isFamily() {
|
||||||
|
header["FamilyId"] = fmt.Sprint(y.FamilyID)
|
||||||
|
header["UploadFileId"] = fmt.Sprint(status.UploadFileId)
|
||||||
|
} else {
|
||||||
|
header["Edrive-UploadFileId"] = fmt.Sprint(status.UploadFileId)
|
||||||
|
}
|
||||||
|
|
||||||
|
_, err := y.put(ctx, status.FileUploadUrl, header, true, io.NopCloser(tempFile))
|
||||||
|
if err, ok := err.(*RespErr); ok && err.Code != "InputStreamReadError" {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
// 获取断点状态
|
||||||
|
fullUrl := API_URL + "/getUploadFileStatus.action"
|
||||||
|
if y.isFamily() {
|
||||||
|
fullUrl = API_URL + "/family/file/getFamilyFileStatus.action"
|
||||||
|
}
|
||||||
|
_, err = y.get(fullUrl, func(req *resty.Request) {
|
||||||
|
req.SetContext(ctx).SetQueryParams(map[string]string{
|
||||||
|
"uploadFileId": fmt.Sprint(status.UploadFileId),
|
||||||
|
"resumePolicy": "1",
|
||||||
|
})
|
||||||
|
if y.isFamily() {
|
||||||
|
req.SetQueryParam("familyId", fmt.Sprint(y.FamilyID))
|
||||||
|
}
|
||||||
|
}, &status)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
if _, err := tempFile.Seek(status.GetSize(), io.SeekStart); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
up(int(status.Size / file.GetSize()))
|
||||||
|
}
|
||||||
|
|
||||||
|
// 提交
|
||||||
|
var resp CommitUploadFileResp
|
||||||
|
_, err = y.post(status.FileCommitUrl, func(req *resty.Request) {
|
||||||
|
req.SetContext(ctx)
|
||||||
|
if y.isFamily() {
|
||||||
|
req.SetHeaders(map[string]string{
|
||||||
|
"ResumePolicy": "1",
|
||||||
|
"UploadFileId": fmt.Sprint(status.UploadFileId),
|
||||||
|
"FamilyId": fmt.Sprint(y.FamilyID),
|
||||||
|
})
|
||||||
|
} else {
|
||||||
|
req.SetFormData(map[string]string{
|
||||||
|
"opertype": "3",
|
||||||
|
"resumePolicy": "1",
|
||||||
|
"uploadFileId": fmt.Sprint(status.UploadFileId),
|
||||||
|
"isLog": "0",
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}, &resp)
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
func (y *Cloud189PC) isFamily() bool {
|
func (y *Cloud189PC) isFamily() bool {
|
||||||
return y.Type == "family"
|
return y.Type == "family"
|
||||||
}
|
}
|
||||||
|
114
drivers/alias/driver.go
Normal file
114
drivers/alias/driver.go
Normal file
@ -0,0 +1,114 @@
|
|||||||
|
package alias
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"errors"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"github.com/alist-org/alist/v3/internal/driver"
|
||||||
|
"github.com/alist-org/alist/v3/internal/errs"
|
||||||
|
"github.com/alist-org/alist/v3/internal/model"
|
||||||
|
"github.com/alist-org/alist/v3/pkg/utils"
|
||||||
|
)
|
||||||
|
|
||||||
|
type Alias struct {
|
||||||
|
model.Storage
|
||||||
|
Addition
|
||||||
|
pathMap map[string][]string
|
||||||
|
autoFlatten bool
|
||||||
|
oneKey string
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *Alias) Config() driver.Config {
|
||||||
|
return config
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *Alias) GetAddition() driver.Additional {
|
||||||
|
return &d.Addition
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *Alias) Init(ctx context.Context) error {
|
||||||
|
if d.Paths == "" {
|
||||||
|
return errors.New("paths is required")
|
||||||
|
}
|
||||||
|
d.pathMap = make(map[string][]string)
|
||||||
|
for _, path := range strings.Split(d.Paths, "\n") {
|
||||||
|
path = strings.TrimSpace(path)
|
||||||
|
if path == "" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
k, v := getPair(path)
|
||||||
|
d.pathMap[k] = append(d.pathMap[k], v)
|
||||||
|
}
|
||||||
|
if len(d.pathMap) == 1 {
|
||||||
|
for k := range d.pathMap {
|
||||||
|
d.oneKey = k
|
||||||
|
}
|
||||||
|
d.autoFlatten = true
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *Alias) Drop(ctx context.Context) error {
|
||||||
|
d.pathMap = nil
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *Alias) Get(ctx context.Context, path string) (model.Obj, error) {
|
||||||
|
if utils.PathEqual(path, "/") {
|
||||||
|
return &model.Object{
|
||||||
|
Name: "Root",
|
||||||
|
IsFolder: true,
|
||||||
|
Path: "/",
|
||||||
|
}, nil
|
||||||
|
}
|
||||||
|
root, sub := d.getRootAndPath(path)
|
||||||
|
dsts, ok := d.pathMap[root]
|
||||||
|
if !ok {
|
||||||
|
return nil, errs.ObjectNotFound
|
||||||
|
}
|
||||||
|
for _, dst := range dsts {
|
||||||
|
obj, err := d.get(ctx, path, dst, sub)
|
||||||
|
if err == nil {
|
||||||
|
return obj, nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil, errs.ObjectNotFound
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *Alias) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([]model.Obj, error) {
|
||||||
|
path := dir.GetPath()
|
||||||
|
if utils.PathEqual(path, "/") && !d.autoFlatten {
|
||||||
|
return d.listRoot(), nil
|
||||||
|
}
|
||||||
|
root, sub := d.getRootAndPath(path)
|
||||||
|
dsts, ok := d.pathMap[root]
|
||||||
|
if !ok {
|
||||||
|
return nil, errs.ObjectNotFound
|
||||||
|
}
|
||||||
|
var objs []model.Obj
|
||||||
|
for _, dst := range dsts {
|
||||||
|
tmp, err := d.list(ctx, dst, sub)
|
||||||
|
if err == nil {
|
||||||
|
objs = append(objs, tmp...)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return objs, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *Alias) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
|
||||||
|
root, sub := d.getRootAndPath(file.GetPath())
|
||||||
|
dsts, ok := d.pathMap[root]
|
||||||
|
if !ok {
|
||||||
|
return nil, errs.ObjectNotFound
|
||||||
|
}
|
||||||
|
for _, dst := range dsts {
|
||||||
|
link, err := d.link(ctx, dst, sub, args)
|
||||||
|
if err == nil {
|
||||||
|
return link, nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil, errs.ObjectNotFound
|
||||||
|
}
|
||||||
|
|
||||||
|
var _ driver.Driver = (*Alias)(nil)
|
27
drivers/alias/meta.go
Normal file
27
drivers/alias/meta.go
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
package alias
|
||||||
|
|
||||||
|
import (
|
||||||
|
"github.com/alist-org/alist/v3/internal/driver"
|
||||||
|
"github.com/alist-org/alist/v3/internal/op"
|
||||||
|
)
|
||||||
|
|
||||||
|
type Addition struct {
|
||||||
|
// Usually one of two
|
||||||
|
// driver.RootPath
|
||||||
|
// define other
|
||||||
|
Paths string `json:"paths" required:"true" type:"text"`
|
||||||
|
}
|
||||||
|
|
||||||
|
var config = driver.Config{
|
||||||
|
Name: "Alias",
|
||||||
|
LocalSort: true,
|
||||||
|
NoCache: true,
|
||||||
|
NoUpload: true,
|
||||||
|
DefaultRoot: "/",
|
||||||
|
}
|
||||||
|
|
||||||
|
func init() {
|
||||||
|
op.RegisterDriver(func() driver.Driver {
|
||||||
|
return &Alias{}
|
||||||
|
})
|
||||||
|
}
|
1
drivers/alias/types.go
Normal file
1
drivers/alias/types.go
Normal file
@ -0,0 +1 @@
|
|||||||
|
package alias
|
114
drivers/alias/util.go
Normal file
114
drivers/alias/util.go
Normal file
@ -0,0 +1,114 @@
|
|||||||
|
package alias
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"fmt"
|
||||||
|
stdpath "path"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"github.com/alist-org/alist/v3/internal/fs"
|
||||||
|
"github.com/alist-org/alist/v3/internal/model"
|
||||||
|
"github.com/alist-org/alist/v3/internal/sign"
|
||||||
|
"github.com/alist-org/alist/v3/pkg/utils"
|
||||||
|
"github.com/alist-org/alist/v3/server/common"
|
||||||
|
)
|
||||||
|
|
||||||
|
func (d *Alias) listRoot() []model.Obj {
|
||||||
|
var objs []model.Obj
|
||||||
|
for k, _ := range d.pathMap {
|
||||||
|
obj := model.Object{
|
||||||
|
Name: k,
|
||||||
|
IsFolder: true,
|
||||||
|
Modified: d.Modified,
|
||||||
|
}
|
||||||
|
objs = append(objs, &obj)
|
||||||
|
}
|
||||||
|
return objs
|
||||||
|
}
|
||||||
|
|
||||||
|
// do others that not defined in Driver interface
|
||||||
|
func getPair(path string) (string, string) {
|
||||||
|
//path = strings.TrimSpace(path)
|
||||||
|
if strings.Contains(path, ":") {
|
||||||
|
pair := strings.SplitN(path, ":", 2)
|
||||||
|
if !strings.Contains(pair[0], "/") {
|
||||||
|
return pair[0], pair[1]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return stdpath.Base(path), path
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *Alias) getRootAndPath(path string) (string, string) {
|
||||||
|
if d.autoFlatten {
|
||||||
|
return d.oneKey, path
|
||||||
|
}
|
||||||
|
path = strings.TrimPrefix(path, "/")
|
||||||
|
parts := strings.SplitN(path, "/", 2)
|
||||||
|
if len(parts) == 1 {
|
||||||
|
return parts[0], ""
|
||||||
|
}
|
||||||
|
return parts[0], parts[1]
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *Alias) get(ctx context.Context, path string, dst, sub string) (model.Obj, error) {
|
||||||
|
obj, err := fs.Get(ctx, stdpath.Join(dst, sub), &fs.GetArgs{NoLog: true})
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return &model.Object{
|
||||||
|
Path: path,
|
||||||
|
Name: obj.GetName(),
|
||||||
|
Size: obj.GetSize(),
|
||||||
|
Modified: obj.ModTime(),
|
||||||
|
IsFolder: obj.IsDir(),
|
||||||
|
}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *Alias) list(ctx context.Context, dst, sub string) ([]model.Obj, error) {
|
||||||
|
objs, err := fs.List(ctx, stdpath.Join(dst, sub), &fs.ListArgs{NoLog: true})
|
||||||
|
// the obj must implement the model.SetPath interface
|
||||||
|
// return objs, err
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return utils.SliceConvert(objs, func(obj model.Obj) (model.Obj, error) {
|
||||||
|
thumb, ok := model.GetThumb(obj)
|
||||||
|
objRes := model.Object{
|
||||||
|
Name: obj.GetName(),
|
||||||
|
Size: obj.GetSize(),
|
||||||
|
Modified: obj.ModTime(),
|
||||||
|
IsFolder: obj.IsDir(),
|
||||||
|
}
|
||||||
|
if !ok {
|
||||||
|
return &objRes, nil
|
||||||
|
}
|
||||||
|
return &model.ObjThumb{
|
||||||
|
Object: objRes,
|
||||||
|
Thumbnail: model.Thumbnail{
|
||||||
|
Thumbnail: thumb,
|
||||||
|
},
|
||||||
|
}, nil
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *Alias) link(ctx context.Context, dst, sub string, args model.LinkArgs) (*model.Link, error) {
|
||||||
|
reqPath := stdpath.Join(dst, sub)
|
||||||
|
storage, err := fs.GetStorage(reqPath, &fs.GetStoragesArgs{})
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
_, err = fs.Get(ctx, reqPath, &fs.GetArgs{NoLog: true})
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if common.ShouldProxy(storage, stdpath.Base(sub)) {
|
||||||
|
return &model.Link{
|
||||||
|
URL: fmt.Sprintf("%s/p%s?sign=%s",
|
||||||
|
common.GetApiUrl(args.HttpReq),
|
||||||
|
utils.EncodePath(reqPath, true),
|
||||||
|
sign.Sign(reqPath)),
|
||||||
|
}, nil
|
||||||
|
}
|
||||||
|
link, _, err := fs.Link(ctx, reqPath, args)
|
||||||
|
return link, err
|
||||||
|
}
|
@ -2,15 +2,19 @@ package alist_v3
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"io"
|
"fmt"
|
||||||
|
"net/http"
|
||||||
"path"
|
"path"
|
||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/alist-org/alist/v3/drivers/base"
|
"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/driver"
|
||||||
"github.com/alist-org/alist/v3/internal/model"
|
"github.com/alist-org/alist/v3/internal/model"
|
||||||
|
"github.com/alist-org/alist/v3/pkg/utils"
|
||||||
"github.com/alist-org/alist/v3/server/common"
|
"github.com/alist-org/alist/v3/server/common"
|
||||||
|
"github.com/go-resty/resty/v2"
|
||||||
)
|
)
|
||||||
|
|
||||||
type AListV3 struct {
|
type AListV3 struct {
|
||||||
@ -28,9 +32,39 @@ func (d *AListV3) GetAddition() driver.Additional {
|
|||||||
|
|
||||||
func (d *AListV3) Init(ctx context.Context) error {
|
func (d *AListV3) Init(ctx context.Context) error {
|
||||||
d.Addition.Address = strings.TrimSuffix(d.Addition.Address, "/")
|
d.Addition.Address = strings.TrimSuffix(d.Addition.Address, "/")
|
||||||
// TODO login / refresh token
|
var resp common.Resp[MeResp]
|
||||||
//op.MustSaveDriverStorage(d)
|
_, err := d.request("/me", http.MethodGet, func(req *resty.Request) {
|
||||||
return nil
|
req.SetResult(&resp)
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
// if the username is not empty and the username is not the same as the current username, then login again
|
||||||
|
if d.Username != "" && d.Username != resp.Data.Username {
|
||||||
|
err = d.login()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// re-get the user info
|
||||||
|
_, err = d.request("/me", http.MethodGet, func(req *resty.Request) {
|
||||||
|
req.SetResult(&resp)
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if resp.Data.Role == model.GUEST {
|
||||||
|
url := d.Address + "/api/public/settings"
|
||||||
|
res, err := base.RestyClient.R().Get(url)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
allowMounted := utils.Json.Get(res.Body(), "data", conf.AllowMounted).ToString() == "true"
|
||||||
|
if !allowMounted {
|
||||||
|
return fmt.Errorf("the site does not allow mounted")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
func (d *AListV3) Drop(ctx context.Context) error {
|
func (d *AListV3) Drop(ctx context.Context) error {
|
||||||
@ -38,20 +72,18 @@ func (d *AListV3) Drop(ctx context.Context) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (d *AListV3) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([]model.Obj, error) {
|
func (d *AListV3) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([]model.Obj, error) {
|
||||||
url := d.Address + "/api/fs/list"
|
|
||||||
var resp common.Resp[FsListResp]
|
var resp common.Resp[FsListResp]
|
||||||
_, err := base.RestyClient.R().
|
_, err := d.request("/fs/list", http.MethodPost, func(req *resty.Request) {
|
||||||
SetResult(&resp).
|
req.SetResult(&resp).SetBody(ListReq{
|
||||||
SetHeader("Authorization", d.AccessToken).
|
|
||||||
SetBody(ListReq{
|
|
||||||
PageReq: model.PageReq{
|
PageReq: model.PageReq{
|
||||||
Page: 1,
|
Page: 1,
|
||||||
PerPage: 0,
|
PerPage: 0,
|
||||||
},
|
},
|
||||||
Path: dir.GetPath(),
|
Path: dir.GetPath(),
|
||||||
Password: d.Password,
|
Password: d.MetaPassword,
|
||||||
Refresh: false,
|
Refresh: false,
|
||||||
}).Post(url)
|
})
|
||||||
|
})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
@ -72,15 +104,13 @@ func (d *AListV3) List(ctx context.Context, dir model.Obj, args model.ListArgs)
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (d *AListV3) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
|
func (d *AListV3) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
|
||||||
url := d.Address + "/api/fs/get"
|
|
||||||
var resp common.Resp[FsGetResp]
|
var resp common.Resp[FsGetResp]
|
||||||
_, err := base.RestyClient.R().
|
_, err := d.request("/fs/get", http.MethodPost, func(req *resty.Request) {
|
||||||
SetResult(&resp).
|
req.SetResult(&resp).SetBody(FsGetReq{
|
||||||
SetHeader("Authorization", d.AccessToken).
|
|
||||||
SetBody(FsGetReq{
|
|
||||||
Path: file.GetPath(),
|
Path: file.GetPath(),
|
||||||
Password: d.Password,
|
Password: d.MetaPassword,
|
||||||
}).Post(url)
|
})
|
||||||
|
})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
@ -90,86 +120,65 @@ func (d *AListV3) Link(ctx context.Context, file model.Obj, args model.LinkArgs)
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (d *AListV3) MakeDir(ctx context.Context, parentDir model.Obj, dirName string) error {
|
func (d *AListV3) MakeDir(ctx context.Context, parentDir model.Obj, dirName string) error {
|
||||||
url := d.Address + "/api/fs/mkdir"
|
_, err := d.request("/fs/mkdir", http.MethodPost, func(req *resty.Request) {
|
||||||
var resp common.Resp[interface{}]
|
req.SetBody(MkdirOrLinkReq{
|
||||||
_, err := base.RestyClient.R().
|
|
||||||
SetResult(&resp).
|
|
||||||
SetHeader("Authorization", d.AccessToken).
|
|
||||||
SetBody(MkdirOrLinkReq{
|
|
||||||
Path: path.Join(parentDir.GetPath(), dirName),
|
Path: path.Join(parentDir.GetPath(), dirName),
|
||||||
}).Post(url)
|
})
|
||||||
return checkResp(resp, err)
|
})
|
||||||
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
func (d *AListV3) Move(ctx context.Context, srcObj, dstDir model.Obj) error {
|
func (d *AListV3) Move(ctx context.Context, srcObj, dstDir model.Obj) error {
|
||||||
url := d.Address + "/api/fs/move"
|
_, err := d.request("/fs/move", http.MethodPost, func(req *resty.Request) {
|
||||||
var resp common.Resp[interface{}]
|
req.SetBody(MoveCopyReq{
|
||||||
_, err := base.RestyClient.R().
|
SrcDir: path.Dir(srcObj.GetPath()),
|
||||||
SetResult(&resp).
|
|
||||||
SetHeader("Authorization", d.AccessToken).
|
|
||||||
SetBody(MoveCopyReq{
|
|
||||||
SrcDir: srcObj.GetPath(),
|
|
||||||
DstDir: dstDir.GetPath(),
|
DstDir: dstDir.GetPath(),
|
||||||
Names: []string{srcObj.GetName()},
|
Names: []string{srcObj.GetName()},
|
||||||
}).Post(url)
|
})
|
||||||
return checkResp(resp, err)
|
})
|
||||||
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
func (d *AListV3) Rename(ctx context.Context, srcObj model.Obj, newName string) error {
|
func (d *AListV3) Rename(ctx context.Context, srcObj model.Obj, newName string) error {
|
||||||
url := d.Address + "/api/fs/rename"
|
_, err := d.request("/fs/rename", http.MethodPost, func(req *resty.Request) {
|
||||||
var resp common.Resp[interface{}]
|
req.SetBody(RenameReq{
|
||||||
_, err := base.RestyClient.R().
|
|
||||||
SetResult(&resp).
|
|
||||||
SetHeader("Authorization", d.AccessToken).
|
|
||||||
SetBody(RenameReq{
|
|
||||||
Path: srcObj.GetPath(),
|
Path: srcObj.GetPath(),
|
||||||
Name: newName,
|
Name: newName,
|
||||||
}).Post(url)
|
})
|
||||||
return checkResp(resp, err)
|
})
|
||||||
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
func (d *AListV3) Copy(ctx context.Context, srcObj, dstDir model.Obj) error {
|
func (d *AListV3) Copy(ctx context.Context, srcObj, dstDir model.Obj) error {
|
||||||
url := d.Address + "/api/fs/copy"
|
_, err := d.request("/fs/copy", http.MethodPost, func(req *resty.Request) {
|
||||||
var resp common.Resp[interface{}]
|
req.SetBody(MoveCopyReq{
|
||||||
_, err := base.RestyClient.R().
|
SrcDir: path.Dir(srcObj.GetPath()),
|
||||||
SetResult(&resp).
|
|
||||||
SetHeader("Authorization", d.AccessToken).
|
|
||||||
SetBody(MoveCopyReq{
|
|
||||||
SrcDir: srcObj.GetPath(),
|
|
||||||
DstDir: dstDir.GetPath(),
|
DstDir: dstDir.GetPath(),
|
||||||
Names: []string{srcObj.GetName()},
|
Names: []string{srcObj.GetName()},
|
||||||
}).Post(url)
|
})
|
||||||
return checkResp(resp, err)
|
})
|
||||||
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
func (d *AListV3) Remove(ctx context.Context, obj model.Obj) error {
|
func (d *AListV3) Remove(ctx context.Context, obj model.Obj) error {
|
||||||
url := d.Address + "/api/fs/remove"
|
_, err := d.request("/fs/remove", http.MethodPost, func(req *resty.Request) {
|
||||||
var resp common.Resp[interface{}]
|
req.SetBody(RemoveReq{
|
||||||
_, err := base.RestyClient.R().
|
Dir: path.Dir(obj.GetPath()),
|
||||||
SetResult(&resp).
|
|
||||||
SetHeader("Authorization", d.AccessToken).
|
|
||||||
SetBody(RemoveReq{
|
|
||||||
Dir: obj.GetPath(),
|
|
||||||
Names: []string{obj.GetName()},
|
Names: []string{obj.GetName()},
|
||||||
}).Post(url)
|
})
|
||||||
return checkResp(resp, err)
|
})
|
||||||
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
func (d *AListV3) Put(ctx context.Context, dstDir model.Obj, stream model.FileStreamer, up driver.UpdateProgress) error {
|
func (d *AListV3) Put(ctx context.Context, dstDir model.Obj, stream model.FileStreamer, up driver.UpdateProgress) error {
|
||||||
url := d.Address + "/api/fs/put"
|
_, err := d.request("/fs/put", http.MethodPut, func(req *resty.Request) {
|
||||||
var resp common.Resp[interface{}]
|
req.SetHeader("File-Path", path.Join(dstDir.GetPath(), stream.GetName())).
|
||||||
fileBytes, err := io.ReadAll(stream.GetReadCloser())
|
SetHeader("Password", d.MetaPassword).
|
||||||
if err != nil {
|
SetHeader("Content-Length", strconv.FormatInt(stream.GetSize(), 10)).
|
||||||
return nil
|
SetContentLength(true).
|
||||||
}
|
SetBody(stream.GetReadCloser())
|
||||||
_, err = base.RestyClient.R().SetContext(ctx).
|
})
|
||||||
SetResult(&resp).
|
return err
|
||||||
SetHeader("Authorization", d.AccessToken).
|
|
||||||
SetHeader("File-Path", path.Join(dstDir.GetPath(), stream.GetName())).
|
|
||||||
SetHeader("Password", d.Password).
|
|
||||||
SetHeader("Content-Length", strconv.FormatInt(stream.GetSize(), 10)).
|
|
||||||
SetBody(fileBytes).Put(url)
|
|
||||||
return checkResp(resp, err)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//func (d *AList) Other(ctx context.Context, args model.OtherArgs) (interface{}, error) {
|
//func (d *AList) Other(ctx context.Context, args model.OtherArgs) (interface{}, error) {
|
||||||
|
@ -7,15 +7,18 @@ import (
|
|||||||
|
|
||||||
type Addition struct {
|
type Addition struct {
|
||||||
driver.RootPath
|
driver.RootPath
|
||||||
Address string `json:"url" required:"true"`
|
Address string `json:"url" required:"true"`
|
||||||
Password string `json:"password"`
|
MetaPassword string `json:"meta_password"`
|
||||||
AccessToken string `json:"access_token"`
|
Username string `json:"username"`
|
||||||
|
Password string `json:"password"`
|
||||||
|
Token string `json:"token"`
|
||||||
}
|
}
|
||||||
|
|
||||||
var config = driver.Config{
|
var config = driver.Config{
|
||||||
Name: "AList V3",
|
Name: "AList V3",
|
||||||
LocalSort: true,
|
LocalSort: true,
|
||||||
DefaultRoot: "/",
|
DefaultRoot: "/",
|
||||||
|
CheckStatus: true,
|
||||||
}
|
}
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
|
@ -63,3 +63,19 @@ type RemoveReq struct {
|
|||||||
Dir string `json:"dir"`
|
Dir string `json:"dir"`
|
||||||
Names []string `json:"names"`
|
Names []string `json:"names"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type LoginResp struct {
|
||||||
|
Token string `json:"token"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type MeResp struct {
|
||||||
|
Id int `json:"id"`
|
||||||
|
Username string `json:"username"`
|
||||||
|
Password string `json:"password"`
|
||||||
|
BasePath string `json:"base_path"`
|
||||||
|
Role int `json:"role"`
|
||||||
|
Disabled bool `json:"disabled"`
|
||||||
|
Permission int `json:"permission"`
|
||||||
|
SsoId string `json:"sso_id"`
|
||||||
|
Otp bool `json:"otp"`
|
||||||
|
}
|
||||||
|
@ -1,17 +1,58 @@
|
|||||||
package alist_v3
|
package alist_v3
|
||||||
|
|
||||||
import (
|
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/alist-org/alist/v3/server/common"
|
"github.com/alist-org/alist/v3/server/common"
|
||||||
|
"github.com/go-resty/resty/v2"
|
||||||
|
log "github.com/sirupsen/logrus"
|
||||||
)
|
)
|
||||||
|
|
||||||
func checkResp(resp common.Resp[interface{}], err error) error {
|
func (d *AListV3) login() error {
|
||||||
|
var resp common.Resp[LoginResp]
|
||||||
|
_, err := d.request("/auth/login", http.MethodPost, func(req *resty.Request) {
|
||||||
|
req.SetResult(&resp).SetBody(base.Json{
|
||||||
|
"username": d.Username,
|
||||||
|
"password": d.Password,
|
||||||
|
})
|
||||||
|
})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
if resp.Message == "success" {
|
d.Token = resp.Data.Token
|
||||||
return nil
|
op.MustSaveDriverStorage(d)
|
||||||
}
|
return nil
|
||||||
return errors.New(resp.Message)
|
}
|
||||||
|
|
||||||
|
func (d *AListV3) request(api, method string, callback base.ReqCallback, retry ...bool) ([]byte, error) {
|
||||||
|
url := d.Address + "/api" + api
|
||||||
|
req := base.RestyClient.R()
|
||||||
|
req.SetHeader("Authorization", d.Token)
|
||||||
|
if callback != nil {
|
||||||
|
callback(req)
|
||||||
|
}
|
||||||
|
res, err := req.Execute(method, url)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
log.Debugf("[alist_v3] response body: %s", res.String())
|
||||||
|
if res.StatusCode() >= 400 {
|
||||||
|
return nil, fmt.Errorf("request failed, status: %s", res.Status())
|
||||||
|
}
|
||||||
|
code := utils.Json.Get(res.Body(), "code").ToInt()
|
||||||
|
if code != 200 {
|
||||||
|
if (code == 401 || code == 403) && !utils.IsBool(retry...) {
|
||||||
|
err = d.login()
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return d.request(api, method, callback, true)
|
||||||
|
}
|
||||||
|
return nil, fmt.Errorf("request failed,code: %d, message: %s", code, utils.Json.Get(res.Body(), "message").ToString())
|
||||||
|
}
|
||||||
|
return res.Body(), nil
|
||||||
}
|
}
|
||||||
|
@ -31,6 +31,7 @@ type AliDrive struct {
|
|||||||
AccessToken string
|
AccessToken string
|
||||||
cron *cron.Cron
|
cron *cron.Cron
|
||||||
DriveId string
|
DriveId string
|
||||||
|
UserID string
|
||||||
}
|
}
|
||||||
|
|
||||||
func (d *AliDrive) Config() driver.Config {
|
func (d *AliDrive) Config() driver.Config {
|
||||||
@ -54,6 +55,7 @@ func (d *AliDrive) Init(ctx context.Context) error {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
d.DriveId = utils.Json.Get(res, "default_drive_id").ToString()
|
d.DriveId = utils.Json.Get(res, "default_drive_id").ToString()
|
||||||
|
d.UserID = utils.Json.Get(res, "user_id").ToString()
|
||||||
d.cron = cron.NewCron(time.Hour * 2)
|
d.cron = cron.NewCron(time.Hour * 2)
|
||||||
d.cron.Do(func() {
|
d.cron.Do(func() {
|
||||||
err := d.refreshToken()
|
err := d.refreshToken()
|
||||||
@ -61,7 +63,22 @@ func (d *AliDrive) Init(ctx context.Context) error {
|
|||||||
log.Errorf("%+v", err)
|
log.Errorf("%+v", err)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
return err
|
if global.Has(d.UserID) {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
// init deviceID
|
||||||
|
deviceID := utils.GetSHA256Encode(d.UserID)
|
||||||
|
// init privateKey
|
||||||
|
privateKey, _ := NewPrivateKeyFromHex(deviceID)
|
||||||
|
state := State{
|
||||||
|
privateKey: privateKey,
|
||||||
|
deviceID: deviceID,
|
||||||
|
}
|
||||||
|
// store state
|
||||||
|
global.Store(d.UserID, &state)
|
||||||
|
// init signature
|
||||||
|
d.sign()
|
||||||
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (d *AliDrive) Drop(ctx context.Context) error {
|
func (d *AliDrive) Drop(ctx context.Context) error {
|
||||||
@ -169,17 +186,27 @@ func (d *AliDrive) Put(ctx context.Context, dstDir model.Obj, stream model.FileS
|
|||||||
"type": "file",
|
"type": "file",
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var localFile *os.File
|
||||||
|
if fileStream, ok := file.ReadCloser.(*model.FileStream); ok {
|
||||||
|
localFile, _ = fileStream.ReadCloser.(*os.File)
|
||||||
|
}
|
||||||
if d.RapidUpload {
|
if d.RapidUpload {
|
||||||
buf := bytes.NewBuffer(make([]byte, 0, 1024))
|
buf := bytes.NewBuffer(make([]byte, 0, 1024))
|
||||||
io.CopyN(buf, file, 1024)
|
io.CopyN(buf, file, 1024)
|
||||||
reqBody["pre_hash"] = utils.GetSHA1Encode(buf.String())
|
reqBody["pre_hash"] = utils.GetSHA1Encode(buf.String())
|
||||||
// 把头部拼接回去
|
if localFile != nil {
|
||||||
file.ReadCloser = struct {
|
if _, err := localFile.Seek(0, io.SeekStart); err != nil {
|
||||||
io.Reader
|
return err
|
||||||
io.Closer
|
}
|
||||||
}{
|
} else {
|
||||||
Reader: io.MultiReader(buf, file),
|
// 把头部拼接回去
|
||||||
Closer: file,
|
file.ReadCloser = struct {
|
||||||
|
io.Reader
|
||||||
|
io.Closer
|
||||||
|
}{
|
||||||
|
Reader: io.MultiReader(buf, file),
|
||||||
|
Closer: file,
|
||||||
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
reqBody["content_hash_name"] = "none"
|
reqBody["content_hash_name"] = "none"
|
||||||
@ -196,18 +223,28 @@ func (d *AliDrive) Put(ctx context.Context, dstDir model.Obj, stream model.FileS
|
|||||||
}
|
}
|
||||||
|
|
||||||
if d.RapidUpload && e.Code == "PreHashMatched" {
|
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")
|
delete(reqBody, "pre_hash")
|
||||||
h := sha1.New()
|
h := sha1.New()
|
||||||
if _, err = io.Copy(io.MultiWriter(tempFile, h), file); err != nil {
|
if localFile != nil {
|
||||||
return err
|
if err = utils.CopyWithCtx(ctx, h, localFile, 0, nil); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if _, err = localFile.Seek(0, io.SeekStart); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
tempFile, err := os.CreateTemp(conf.Conf.TempDir, "file-*")
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
defer func() {
|
||||||
|
_ = tempFile.Close()
|
||||||
|
_ = os.Remove(tempFile.Name())
|
||||||
|
}()
|
||||||
|
if err = utils.CopyWithCtx(ctx, io.MultiWriter(tempFile, h), file, 0, nil); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
localFile = tempFile
|
||||||
}
|
}
|
||||||
reqBody["content_hash"] = hex.EncodeToString(h.Sum(nil))
|
reqBody["content_hash"] = hex.EncodeToString(h.Sum(nil))
|
||||||
reqBody["content_hash_name"] = "sha1"
|
reqBody["content_hash_name"] = "sha1"
|
||||||
@ -228,7 +265,7 @@ func (d *AliDrive) Put(ctx context.Context, dstDir model.Obj, stream model.FileS
|
|||||||
if file.GetSize() > 0 {
|
if file.GetSize() > 0 {
|
||||||
o = r.Mod(r, i)
|
o = r.Mod(r, i)
|
||||||
}
|
}
|
||||||
n, _ := io.NewSectionReader(tempFile, o.Int64(), 8).Read(buf[:8])
|
n, _ := io.NewSectionReader(localFile, o.Int64(), 8).Read(buf[:8])
|
||||||
reqBody["proof_code"] = base64.StdEncoding.EncodeToString(buf[:n])
|
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) {
|
_, err, e := d.request("https://api.aliyundrive.com/adrive/v2/file/createWithFolders", http.MethodPost, func(req *resty.Request) {
|
||||||
@ -241,17 +278,21 @@ func (d *AliDrive) Put(ctx context.Context, dstDir model.Obj, stream model.FileS
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
// 秒传失败
|
// 秒传失败
|
||||||
if _, err = tempFile.Seek(0, io.SeekStart); err != nil {
|
if _, err = localFile.Seek(0, io.SeekStart); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
file.ReadCloser = tempFile
|
file.ReadCloser = localFile
|
||||||
}
|
}
|
||||||
|
|
||||||
for i, partInfo := range resp.PartInfoList {
|
for i, partInfo := range resp.PartInfoList {
|
||||||
if utils.IsCanceled(ctx) {
|
if utils.IsCanceled(ctx) {
|
||||||
return ctx.Err()
|
return ctx.Err()
|
||||||
}
|
}
|
||||||
req, err := http.NewRequest("PUT", partInfo.UploadUrl, io.LimitReader(file, DEFAULT))
|
url := partInfo.UploadUrl
|
||||||
|
if d.InternalUpload {
|
||||||
|
url = partInfo.InternalUploadUrl
|
||||||
|
}
|
||||||
|
req, err := http.NewRequest("PUT", url, io.LimitReader(file, DEFAULT))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@ -296,6 +337,7 @@ func (d *AliDrive) Other(ctx context.Context, args model.OtherArgs) (interface{}
|
|||||||
case "video_preview":
|
case "video_preview":
|
||||||
url = "https://api.aliyundrive.com/v2/file/get_video_preview_play_info"
|
url = "https://api.aliyundrive.com/v2/file/get_video_preview_play_info"
|
||||||
data["category"] = "live_transcoding"
|
data["category"] = "live_transcoding"
|
||||||
|
data["url_expire_sec"] = 14400
|
||||||
default:
|
default:
|
||||||
return nil, errs.NotSupport
|
return nil, errs.NotSupport
|
||||||
}
|
}
|
||||||
|
16
drivers/aliyundrive/global.go
Normal file
16
drivers/aliyundrive/global.go
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
package aliyundrive
|
||||||
|
|
||||||
|
import (
|
||||||
|
"crypto/ecdsa"
|
||||||
|
|
||||||
|
"github.com/alist-org/alist/v3/pkg/generic_sync"
|
||||||
|
)
|
||||||
|
|
||||||
|
type State struct {
|
||||||
|
deviceID string
|
||||||
|
signature string
|
||||||
|
retry int
|
||||||
|
privateKey *ecdsa.PrivateKey
|
||||||
|
}
|
||||||
|
|
||||||
|
var global = generic_sync.MapOf[string, *State]{}
|
66
drivers/aliyundrive/help.go
Normal file
66
drivers/aliyundrive/help.go
Normal file
@ -0,0 +1,66 @@
|
|||||||
|
package aliyundrive
|
||||||
|
|
||||||
|
import (
|
||||||
|
"crypto/ecdsa"
|
||||||
|
"crypto/rand"
|
||||||
|
"encoding/hex"
|
||||||
|
"math/big"
|
||||||
|
|
||||||
|
"github.com/dustinxie/ecc"
|
||||||
|
)
|
||||||
|
|
||||||
|
func NewPrivateKey() (*ecdsa.PrivateKey, error) {
|
||||||
|
p256k1 := ecc.P256k1()
|
||||||
|
return ecdsa.GenerateKey(p256k1, rand.Reader)
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewPrivateKeyFromHex(hex_ string) (*ecdsa.PrivateKey, error) {
|
||||||
|
data, err := hex.DecodeString(hex_)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return NewPrivateKeyFromBytes(data), nil
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewPrivateKeyFromBytes(priv []byte) *ecdsa.PrivateKey {
|
||||||
|
p256k1 := ecc.P256k1()
|
||||||
|
x, y := p256k1.ScalarBaseMult(priv)
|
||||||
|
return &ecdsa.PrivateKey{
|
||||||
|
PublicKey: ecdsa.PublicKey{
|
||||||
|
Curve: p256k1,
|
||||||
|
X: x,
|
||||||
|
Y: y,
|
||||||
|
},
|
||||||
|
D: new(big.Int).SetBytes(priv),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func PrivateKeyToHex(private *ecdsa.PrivateKey) string {
|
||||||
|
return hex.EncodeToString(PrivateKeyToBytes(private))
|
||||||
|
}
|
||||||
|
|
||||||
|
func PrivateKeyToBytes(private *ecdsa.PrivateKey) []byte {
|
||||||
|
return private.D.Bytes()
|
||||||
|
}
|
||||||
|
|
||||||
|
func PublicKeyToHex(public *ecdsa.PublicKey) string {
|
||||||
|
return hex.EncodeToString(PublicKeyToBytes(public))
|
||||||
|
}
|
||||||
|
|
||||||
|
func PublicKeyToBytes(public *ecdsa.PublicKey) []byte {
|
||||||
|
x := public.X.Bytes()
|
||||||
|
if len(x) < 32 {
|
||||||
|
for i := 0; i < 32-len(x); i++ {
|
||||||
|
x = append([]byte{0}, x...)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
y := public.Y.Bytes()
|
||||||
|
if len(y) < 32 {
|
||||||
|
for i := 0; i < 32-len(y); i++ {
|
||||||
|
y = append([]byte{0}, y...)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return append(x, y...)
|
||||||
|
}
|
@ -7,15 +7,20 @@ import (
|
|||||||
|
|
||||||
type Addition struct {
|
type Addition struct {
|
||||||
driver.RootID
|
driver.RootID
|
||||||
RefreshToken string `json:"refresh_token" required:"true"`
|
RefreshToken string `json:"refresh_token" required:"true"`
|
||||||
|
//DeviceID string `json:"device_id" required:"true"`
|
||||||
OrderBy string `json:"order_by" type:"select" options:"name,size,updated_at,created_at"`
|
OrderBy string `json:"order_by" type:"select" options:"name,size,updated_at,created_at"`
|
||||||
OrderDirection string `json:"order_direction" type:"select" options:"ASC,DESC"`
|
OrderDirection string `json:"order_direction" type:"select" options:"ASC,DESC"`
|
||||||
RapidUpload bool `json:"rapid_upload"`
|
RapidUpload bool `json:"rapid_upload"`
|
||||||
|
InternalUpload bool `json:"internal_upload"`
|
||||||
}
|
}
|
||||||
|
|
||||||
var config = driver.Config{
|
var config = driver.Config{
|
||||||
Name: "Aliyundrive",
|
Name: "Aliyundrive",
|
||||||
DefaultRoot: "root",
|
DefaultRoot: "root",
|
||||||
|
Alert: `warning|There may be an infinite loop bug in this driver.
|
||||||
|
Deprecated, no longer maintained and will be removed in a future version.
|
||||||
|
We recommend using the official driver AliyundriveOpen.`,
|
||||||
}
|
}
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
|
@ -48,7 +48,8 @@ type UploadResp struct {
|
|||||||
FileId string `json:"file_id"`
|
FileId string `json:"file_id"`
|
||||||
UploadId string `json:"upload_id"`
|
UploadId string `json:"upload_id"`
|
||||||
PartInfoList []struct {
|
PartInfoList []struct {
|
||||||
UploadUrl string `json:"upload_url"`
|
UploadUrl string `json:"upload_url"`
|
||||||
|
InternalUploadUrl string `json:"internal_upload_url"`
|
||||||
} `json:"part_info_list"`
|
} `json:"part_info_list"`
|
||||||
|
|
||||||
RapidUpload bool `json:"rapid_upload"`
|
RapidUpload bool `json:"rapid_upload"`
|
||||||
|
@ -1,6 +1,8 @@
|
|||||||
package aliyundrive
|
package aliyundrive
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"crypto/sha256"
|
||||||
|
"encoding/hex"
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"net/http"
|
"net/http"
|
||||||
@ -8,9 +10,51 @@ import (
|
|||||||
"github.com/alist-org/alist/v3/drivers/base"
|
"github.com/alist-org/alist/v3/drivers/base"
|
||||||
"github.com/alist-org/alist/v3/internal/op"
|
"github.com/alist-org/alist/v3/internal/op"
|
||||||
"github.com/alist-org/alist/v3/pkg/utils"
|
"github.com/alist-org/alist/v3/pkg/utils"
|
||||||
|
"github.com/dustinxie/ecc"
|
||||||
"github.com/go-resty/resty/v2"
|
"github.com/go-resty/resty/v2"
|
||||||
|
"github.com/google/uuid"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
func (d *AliDrive) createSession() error {
|
||||||
|
state, ok := global.Load(d.UserID)
|
||||||
|
if !ok {
|
||||||
|
return fmt.Errorf("can't load user state, user_id: %s", d.UserID)
|
||||||
|
}
|
||||||
|
d.sign()
|
||||||
|
state.retry++
|
||||||
|
if state.retry > 3 {
|
||||||
|
state.retry = 0
|
||||||
|
return fmt.Errorf("createSession failed after three retries")
|
||||||
|
}
|
||||||
|
_, err, _ := d.request("https://api.aliyundrive.com/users/v1/users/device/create_session", http.MethodPost, func(req *resty.Request) {
|
||||||
|
req.SetBody(base.Json{
|
||||||
|
"deviceName": "samsung",
|
||||||
|
"modelName": "SM-G9810",
|
||||||
|
"nonce": 0,
|
||||||
|
"pubKey": PublicKeyToHex(&state.privateKey.PublicKey),
|
||||||
|
"refreshToken": d.RefreshToken,
|
||||||
|
})
|
||||||
|
}, nil)
|
||||||
|
if err == nil{
|
||||||
|
state.retry = 0
|
||||||
|
}
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
// func (d *AliDrive) renewSession() error {
|
||||||
|
// _, err, _ := d.request("https://api.aliyundrive.com/users/v1/users/device/renew_session", http.MethodPost, nil, nil)
|
||||||
|
// return err
|
||||||
|
// }
|
||||||
|
|
||||||
|
func (d *AliDrive) sign() {
|
||||||
|
state, _ := global.Load(d.UserID)
|
||||||
|
secpAppID := "5dde4e1bdf9e4966b387ba58f4b3fdc3"
|
||||||
|
singdata := fmt.Sprintf("%s:%s:%s:%d", secpAppID, state.deviceID, d.UserID, 0)
|
||||||
|
hash := sha256.Sum256([]byte(singdata))
|
||||||
|
data, _ := ecc.SignBytes(state.privateKey, hash[:], ecc.RecID|ecc.LowerS)
|
||||||
|
state.signature = hex.EncodeToString(data) //strconv.Itoa(state.nonce)
|
||||||
|
}
|
||||||
|
|
||||||
// do others that not defined in Driver interface
|
// do others that not defined in Driver interface
|
||||||
|
|
||||||
func (d *AliDrive) refreshToken() error {
|
func (d *AliDrive) refreshToken() error {
|
||||||
@ -29,6 +73,9 @@ func (d *AliDrive) refreshToken() error {
|
|||||||
if e.Code != "" {
|
if e.Code != "" {
|
||||||
return fmt.Errorf("failed to refresh token: %s", e.Message)
|
return fmt.Errorf("failed to refresh token: %s", e.Message)
|
||||||
}
|
}
|
||||||
|
if resp.RefreshToken == "" {
|
||||||
|
return errors.New("failed to refresh token: refresh token is empty")
|
||||||
|
}
|
||||||
d.RefreshToken, d.AccessToken = resp.RefreshToken, resp.AccessToken
|
d.RefreshToken, d.AccessToken = resp.RefreshToken, resp.AccessToken
|
||||||
op.MustSaveDriverStorage(d)
|
op.MustSaveDriverStorage(d)
|
||||||
return nil
|
return nil
|
||||||
@ -36,9 +83,24 @@ func (d *AliDrive) refreshToken() error {
|
|||||||
|
|
||||||
func (d *AliDrive) request(url, method string, callback base.ReqCallback, resp interface{}) ([]byte, error, RespErr) {
|
func (d *AliDrive) request(url, method string, callback base.ReqCallback, resp interface{}) ([]byte, error, RespErr) {
|
||||||
req := base.RestyClient.R()
|
req := base.RestyClient.R()
|
||||||
req.SetHeader("Authorization", "Bearer\t"+d.AccessToken)
|
state, ok := global.Load(d.UserID)
|
||||||
req.SetHeader("content-type", "application/json")
|
if !ok {
|
||||||
req.SetHeader("origin", "https://www.aliyundrive.com")
|
if url == "https://api.aliyundrive.com/v2/user/get" {
|
||||||
|
state = &State{}
|
||||||
|
} else {
|
||||||
|
return nil, fmt.Errorf("can't load user state, user_id: %s", d.UserID), RespErr{}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
req.SetHeaders(map[string]string{
|
||||||
|
"Authorization": "Bearer\t" + d.AccessToken,
|
||||||
|
"content-type": "application/json",
|
||||||
|
"origin": "https://www.aliyundrive.com",
|
||||||
|
"Referer": "https://aliyundrive.com/",
|
||||||
|
"X-Signature": state.signature,
|
||||||
|
"x-request-id": uuid.NewString(),
|
||||||
|
"X-Canary": "client=Android,app=adrive,version=v4.1.0",
|
||||||
|
"X-Device-Id": state.deviceID,
|
||||||
|
})
|
||||||
if callback != nil {
|
if callback != nil {
|
||||||
callback(req)
|
callback(req)
|
||||||
} else {
|
} else {
|
||||||
@ -54,14 +116,21 @@ func (d *AliDrive) request(url, method string, callback base.ReqCallback, resp i
|
|||||||
return nil, err, e
|
return nil, err, e
|
||||||
}
|
}
|
||||||
if e.Code != "" {
|
if e.Code != "" {
|
||||||
if e.Code == "AccessTokenInvalid" {
|
switch e.Code {
|
||||||
|
case "AccessTokenInvalid":
|
||||||
err = d.refreshToken()
|
err = d.refreshToken()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err, e
|
return nil, err, e
|
||||||
}
|
}
|
||||||
return d.request(url, method, callback, resp)
|
case "DeviceSessionSignatureInvalid":
|
||||||
|
err = d.createSession()
|
||||||
|
if err != nil {
|
||||||
|
return nil, err, e
|
||||||
|
}
|
||||||
|
default:
|
||||||
|
return nil, errors.New(e.Message), e
|
||||||
}
|
}
|
||||||
return nil, errors.New(e.Message), e
|
return d.request(url, method, callback, resp)
|
||||||
} else if res.IsError() {
|
} else if res.IsError() {
|
||||||
return nil, errors.New("bad status code " + res.Status()), e
|
return nil, errors.New("bad status code " + res.Status()), e
|
||||||
}
|
}
|
||||||
|
228
drivers/aliyundrive_open/driver.go
Normal file
228
drivers/aliyundrive_open/driver.go
Normal file
@ -0,0 +1,228 @@
|
|||||||
|
package aliyundrive_open
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"io"
|
||||||
|
"math"
|
||||||
|
"net/http"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/alist-org/alist/v3/drivers/base"
|
||||||
|
"github.com/alist-org/alist/v3/internal/driver"
|
||||||
|
"github.com/alist-org/alist/v3/internal/errs"
|
||||||
|
"github.com/alist-org/alist/v3/internal/model"
|
||||||
|
"github.com/alist-org/alist/v3/pkg/utils"
|
||||||
|
"github.com/go-resty/resty/v2"
|
||||||
|
)
|
||||||
|
|
||||||
|
type AliyundriveOpen struct {
|
||||||
|
model.Storage
|
||||||
|
Addition
|
||||||
|
base string
|
||||||
|
|
||||||
|
DriveId string
|
||||||
|
|
||||||
|
limitList func(ctx context.Context, data base.Json) (*Files, error)
|
||||||
|
limitLink func(ctx context.Context, file model.Obj) (*model.Link, error)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *AliyundriveOpen) Config() driver.Config {
|
||||||
|
return config
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *AliyundriveOpen) GetAddition() driver.Additional {
|
||||||
|
return &d.Addition
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *AliyundriveOpen) Init(ctx context.Context) error {
|
||||||
|
res, err := d.request("/adrive/v1.0/user/getDriveInfo", http.MethodPost, nil)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
d.DriveId = utils.Json.Get(res, "default_drive_id").ToString()
|
||||||
|
d.limitList = utils.LimitRateCtx(d.list, time.Second/4)
|
||||||
|
d.limitLink = utils.LimitRateCtx(d.link, time.Second)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *AliyundriveOpen) Drop(ctx context.Context) error {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *AliyundriveOpen) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([]model.Obj, error) {
|
||||||
|
files, err := d.getFiles(ctx, dir.GetID())
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return utils.SliceConvert(files, func(src File) (model.Obj, error) {
|
||||||
|
return fileToObj(src), nil
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *AliyundriveOpen) link(ctx context.Context, file model.Obj) (*model.Link, error) {
|
||||||
|
res, err := d.request("/adrive/v1.0/openFile/getDownloadUrl", http.MethodPost, func(req *resty.Request) {
|
||||||
|
req.SetBody(base.Json{
|
||||||
|
"drive_id": d.DriveId,
|
||||||
|
"file_id": file.GetID(),
|
||||||
|
"expire_sec": 14400,
|
||||||
|
})
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
url := utils.Json.Get(res, "url").ToString()
|
||||||
|
exp := time.Hour
|
||||||
|
return &model.Link{
|
||||||
|
URL: url,
|
||||||
|
Expiration: &exp,
|
||||||
|
}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *AliyundriveOpen) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
|
||||||
|
return d.limitLink(ctx, file)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *AliyundriveOpen) MakeDir(ctx context.Context, parentDir model.Obj, dirName string) error {
|
||||||
|
_, err := d.request("/adrive/v1.0/openFile/create", http.MethodPost, func(req *resty.Request) {
|
||||||
|
req.SetBody(base.Json{
|
||||||
|
"drive_id": d.DriveId,
|
||||||
|
"parent_file_id": parentDir.GetID(),
|
||||||
|
"name": dirName,
|
||||||
|
"type": "folder",
|
||||||
|
"check_name_mode": "refuse",
|
||||||
|
})
|
||||||
|
})
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *AliyundriveOpen) Move(ctx context.Context, srcObj, dstDir model.Obj) error {
|
||||||
|
_, err := d.request("/adrive/v1.0/openFile/move", http.MethodPost, func(req *resty.Request) {
|
||||||
|
req.SetBody(base.Json{
|
||||||
|
"drive_id": d.DriveId,
|
||||||
|
"file_id": srcObj.GetID(),
|
||||||
|
"to_parent_file_id": dstDir.GetID(),
|
||||||
|
"check_name_mode": "refuse", // optional:ignore,auto_rename,refuse
|
||||||
|
//"new_name": "newName", // The new name to use when a file of the same name exists
|
||||||
|
})
|
||||||
|
})
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *AliyundriveOpen) Rename(ctx context.Context, srcObj model.Obj, newName string) error {
|
||||||
|
_, err := d.request("/adrive/v1.0/openFile/update", http.MethodPost, func(req *resty.Request) {
|
||||||
|
req.SetBody(base.Json{
|
||||||
|
"drive_id": d.DriveId,
|
||||||
|
"file_id": srcObj.GetID(),
|
||||||
|
"name": newName,
|
||||||
|
})
|
||||||
|
})
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *AliyundriveOpen) Copy(ctx context.Context, srcObj, dstDir model.Obj) error {
|
||||||
|
_, err := d.request("/adrive/v1.0/openFile/copy", http.MethodPost, func(req *resty.Request) {
|
||||||
|
req.SetBody(base.Json{
|
||||||
|
"drive_id": d.DriveId,
|
||||||
|
"file_id": srcObj.GetID(),
|
||||||
|
"to_parent_file_id": dstDir.GetID(),
|
||||||
|
"auto_rename": true,
|
||||||
|
})
|
||||||
|
})
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *AliyundriveOpen) Remove(ctx context.Context, obj model.Obj) error {
|
||||||
|
uri := "/adrive/v1.0/openFile/recyclebin/trash"
|
||||||
|
if d.RemoveWay == "delete" {
|
||||||
|
uri = "/adrive/v1.0/openFile/delete"
|
||||||
|
}
|
||||||
|
_, err := d.request(uri, http.MethodPost, func(req *resty.Request) {
|
||||||
|
req.SetBody(base.Json{
|
||||||
|
"drive_id": d.DriveId,
|
||||||
|
"file_id": obj.GetID(),
|
||||||
|
})
|
||||||
|
})
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *AliyundriveOpen) Put(ctx context.Context, dstDir model.Obj, stream model.FileStreamer, up driver.UpdateProgress) error {
|
||||||
|
// rapid_upload is not currently supported
|
||||||
|
// 1. create
|
||||||
|
const DEFAULT int64 = 20971520
|
||||||
|
createData := base.Json{
|
||||||
|
"drive_id": d.DriveId,
|
||||||
|
"parent_file_id": dstDir.GetID(),
|
||||||
|
"name": stream.GetName(),
|
||||||
|
"type": "file",
|
||||||
|
"check_name_mode": "ignore",
|
||||||
|
}
|
||||||
|
count := 1
|
||||||
|
if stream.GetSize() > DEFAULT {
|
||||||
|
count = int(math.Ceil(float64(stream.GetSize()) / float64(DEFAULT)))
|
||||||
|
createData["part_info_list"] = makePartInfos(count)
|
||||||
|
}
|
||||||
|
var createResp CreateResp
|
||||||
|
_, err := d.request("/adrive/v1.0/openFile/create", http.MethodPost, func(req *resty.Request) {
|
||||||
|
req.SetBody(createData).SetResult(&createResp)
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
// 2. upload
|
||||||
|
preTime := time.Now()
|
||||||
|
for i := 1; i <= len(createResp.PartInfoList); i++ {
|
||||||
|
if utils.IsCanceled(ctx) {
|
||||||
|
return ctx.Err()
|
||||||
|
}
|
||||||
|
err = d.uploadPart(ctx, i, count, utils.NewMultiReadable(io.LimitReader(stream, DEFAULT)), &createResp, true)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if count > 0 {
|
||||||
|
up(i * 100 / count)
|
||||||
|
}
|
||||||
|
// refresh upload url if 50 minutes passed
|
||||||
|
if time.Since(preTime) > 50*time.Minute {
|
||||||
|
createResp.PartInfoList, err = d.getUploadUrl(count, createResp.FileId, createResp.UploadId)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
preTime = time.Now()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// 3. complete
|
||||||
|
_, err = d.request("/adrive/v1.0/openFile/complete", http.MethodPost, func(req *resty.Request) {
|
||||||
|
req.SetBody(base.Json{
|
||||||
|
"drive_id": d.DriveId,
|
||||||
|
"file_id": createResp.FileId,
|
||||||
|
"upload_id": createResp.UploadId,
|
||||||
|
})
|
||||||
|
})
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *AliyundriveOpen) Other(ctx context.Context, args model.OtherArgs) (interface{}, error) {
|
||||||
|
var resp base.Json
|
||||||
|
var uri string
|
||||||
|
data := base.Json{
|
||||||
|
"drive_id": d.DriveId,
|
||||||
|
"file_id": args.Obj.GetID(),
|
||||||
|
}
|
||||||
|
switch args.Method {
|
||||||
|
case "video_preview":
|
||||||
|
uri = "/adrive/v1.0/openFile/getVideoPreviewPlayInfo"
|
||||||
|
data["category"] = "live_transcoding"
|
||||||
|
data["url_expire_sec"] = 14400
|
||||||
|
default:
|
||||||
|
return nil, errs.NotSupport
|
||||||
|
}
|
||||||
|
_, err := d.request(uri, http.MethodPost, func(req *resty.Request) {
|
||||||
|
req.SetBody(data).SetResult(&resp)
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return resp, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
var _ driver.Driver = (*AliyundriveOpen)(nil)
|
39
drivers/aliyundrive_open/meta.go
Normal file
39
drivers/aliyundrive_open/meta.go
Normal file
@ -0,0 +1,39 @@
|
|||||||
|
package aliyundrive_open
|
||||||
|
|
||||||
|
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"`
|
||||||
|
OauthTokenURL string `json:"oauth_token_url" default:"https://api.xhofe.top/alist/ali_open/token"`
|
||||||
|
ClientID string `json:"client_id" required:"false" help:"Keep it empty if you don't have one"`
|
||||||
|
ClientSecret string `json:"client_secret" required:"false" help:"Keep it empty if you don't have one"`
|
||||||
|
RemoveWay string `json:"remove_way" required:"true" type:"select" options:"trash,delete"`
|
||||||
|
InternalUpload bool `json:"internal_upload" help:"If you are using Aliyun ECS is located in Beijing, you can turn it on to boost the upload speed"`
|
||||||
|
AccessToken string
|
||||||
|
}
|
||||||
|
|
||||||
|
var config = driver.Config{
|
||||||
|
Name: "AliyundriveOpen",
|
||||||
|
LocalSort: false,
|
||||||
|
OnlyLocal: false,
|
||||||
|
OnlyProxy: false,
|
||||||
|
NoCache: false,
|
||||||
|
NoUpload: false,
|
||||||
|
NeedMs: false,
|
||||||
|
DefaultRoot: "root",
|
||||||
|
NoOverwriteUpload: true,
|
||||||
|
}
|
||||||
|
|
||||||
|
func init() {
|
||||||
|
op.RegisterDriver(func() driver.Driver {
|
||||||
|
return &AliyundriveOpen{
|
||||||
|
base: "https://openapi.aliyundrive.com",
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
69
drivers/aliyundrive_open/types.go
Normal file
69
drivers/aliyundrive_open/types.go
Normal file
@ -0,0 +1,69 @@
|
|||||||
|
package aliyundrive_open
|
||||||
|
|
||||||
|
import (
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/alist-org/alist/v3/internal/model"
|
||||||
|
)
|
||||||
|
|
||||||
|
type ErrResp 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"`
|
||||||
|
FileId string `json:"file_id"`
|
||||||
|
ParentFileId string `json:"parent_file_id"`
|
||||||
|
Name string `json:"name"`
|
||||||
|
Size int64 `json:"size"`
|
||||||
|
FileExtension string `json:"file_extension"`
|
||||||
|
ContentHash string `json:"content_hash"`
|
||||||
|
Category string `json:"category"`
|
||||||
|
Type string `json:"type"`
|
||||||
|
Thumbnail string `json:"thumbnail"`
|
||||||
|
Url string `json:"url"`
|
||||||
|
CreatedAt *time.Time `json:"created_at"`
|
||||||
|
UpdatedAt time.Time `json:"updated_at"`
|
||||||
|
}
|
||||||
|
|
||||||
|
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",
|
||||||
|
},
|
||||||
|
Thumbnail: model.Thumbnail{Thumbnail: f.Thumbnail},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
type PartInfo struct {
|
||||||
|
Etag interface{} `json:"etag"`
|
||||||
|
PartNumber int `json:"part_number"`
|
||||||
|
PartSize interface{} `json:"part_size"`
|
||||||
|
UploadUrl string `json:"upload_url"`
|
||||||
|
ContentType string `json:"content_type"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type CreateResp struct {
|
||||||
|
//Type string `json:"type"`
|
||||||
|
//ParentFileId string `json:"parent_file_id"`
|
||||||
|
//DriveId string `json:"drive_id"`
|
||||||
|
FileId string `json:"file_id"`
|
||||||
|
//RevisionId string `json:"revision_id"`
|
||||||
|
//EncryptMode string `json:"encrypt_mode"`
|
||||||
|
//DomainId string `json:"domain_id"`
|
||||||
|
//FileName string `json:"file_name"`
|
||||||
|
UploadId string `json:"upload_id"`
|
||||||
|
//Location string `json:"location"`
|
||||||
|
RapidUpload bool `json:"rapid_upload"`
|
||||||
|
PartInfoList []PartInfo `json:"part_info_list"`
|
||||||
|
}
|
175
drivers/aliyundrive_open/util.go
Normal file
175
drivers/aliyundrive_open/util.go
Normal file
@ -0,0 +1,175 @@
|
|||||||
|
package aliyundrive_open
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
"net/http"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"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 *AliyundriveOpen) refreshToken() error {
|
||||||
|
url := d.base + "/oauth/access_token"
|
||||||
|
if d.OauthTokenURL != "" && d.ClientID == "" {
|
||||||
|
url = d.OauthTokenURL
|
||||||
|
}
|
||||||
|
var resp base.TokenResp
|
||||||
|
var e ErrResp
|
||||||
|
_, err := base.RestyClient.R().
|
||||||
|
ForceContentType("application/json").
|
||||||
|
SetBody(base.Json{
|
||||||
|
"client_id": d.ClientID,
|
||||||
|
"client_secret": d.ClientSecret,
|
||||||
|
"grant_type": "refresh_token",
|
||||||
|
"refresh_token": d.RefreshToken,
|
||||||
|
}).
|
||||||
|
SetResult(&resp).
|
||||||
|
SetError(&e).
|
||||||
|
Post(url)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if e.Code != "" {
|
||||||
|
return fmt.Errorf("failed to refresh token: %s", e.Message)
|
||||||
|
}
|
||||||
|
if resp.RefreshToken == "" {
|
||||||
|
return errors.New("failed to refresh token: refresh token is empty")
|
||||||
|
}
|
||||||
|
d.RefreshToken, d.AccessToken = resp.RefreshToken, resp.AccessToken
|
||||||
|
op.MustSaveDriverStorage(d)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *AliyundriveOpen) request(uri, method string, callback base.ReqCallback, retry ...bool) ([]byte, error) {
|
||||||
|
req := base.RestyClient.R()
|
||||||
|
// TODO check whether access_token is expired
|
||||||
|
req.SetHeader("Authorization", "Bearer "+d.AccessToken)
|
||||||
|
if method == http.MethodPost {
|
||||||
|
req.SetHeader("Content-Type", "application/json")
|
||||||
|
}
|
||||||
|
if callback != nil {
|
||||||
|
callback(req)
|
||||||
|
}
|
||||||
|
var e ErrResp
|
||||||
|
req.SetError(&e)
|
||||||
|
res, err := req.Execute(method, d.base+uri)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
isRetry := len(retry) > 0 && retry[0]
|
||||||
|
if e.Code != "" {
|
||||||
|
if !isRetry && (utils.SliceContains([]string{"AccessTokenInvalid", "AccessTokenExpired", "I400JD"}, e.Code) || d.AccessToken == "") {
|
||||||
|
err = d.refreshToken()
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return d.request(uri, method, callback, true)
|
||||||
|
}
|
||||||
|
return nil, fmt.Errorf("%s:%s", e.Code, e.Message)
|
||||||
|
}
|
||||||
|
return res.Body(), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *AliyundriveOpen) list(ctx context.Context, data base.Json) (*Files, error) {
|
||||||
|
var resp Files
|
||||||
|
_, err := d.request("/adrive/v1.0/openFile/list", http.MethodPost, func(req *resty.Request) {
|
||||||
|
req.SetBody(data).SetResult(&resp)
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return &resp, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *AliyundriveOpen) getFiles(ctx context.Context, fileId string) ([]File, error) {
|
||||||
|
marker := "first"
|
||||||
|
res := make([]File, 0)
|
||||||
|
for marker != "" {
|
||||||
|
if marker == "first" {
|
||||||
|
marker = ""
|
||||||
|
}
|
||||||
|
data := base.Json{
|
||||||
|
"drive_id": d.DriveId,
|
||||||
|
"limit": 200,
|
||||||
|
"marker": marker,
|
||||||
|
"order_by": d.OrderBy,
|
||||||
|
"order_direction": d.OrderDirection,
|
||||||
|
"parent_file_id": fileId,
|
||||||
|
//"category": "",
|
||||||
|
//"type": "",
|
||||||
|
//"video_thumbnail_time": 120000,
|
||||||
|
//"video_thumbnail_width": 480,
|
||||||
|
//"image_thumbnail_width": 480,
|
||||||
|
}
|
||||||
|
resp, err := d.limitList(ctx, data)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
marker = resp.NextMarker
|
||||||
|
res = append(res, resp.Items...)
|
||||||
|
}
|
||||||
|
return res, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func makePartInfos(size int) []base.Json {
|
||||||
|
partInfoList := make([]base.Json, size)
|
||||||
|
for i := 0; i < size; i++ {
|
||||||
|
partInfoList[i] = base.Json{"part_number": 1 + i}
|
||||||
|
}
|
||||||
|
return partInfoList
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *AliyundriveOpen) getUploadUrl(count int, fileId, uploadId string) ([]PartInfo, error) {
|
||||||
|
partInfoList := makePartInfos(count)
|
||||||
|
var resp CreateResp
|
||||||
|
_, err := d.request("/adrive/v1.0/openFile/getUploadUrl", http.MethodPost, func(req *resty.Request) {
|
||||||
|
req.SetBody(base.Json{
|
||||||
|
"drive_id": d.DriveId,
|
||||||
|
"file_id": fileId,
|
||||||
|
"part_info_list": partInfoList,
|
||||||
|
"upload_id": uploadId,
|
||||||
|
}).SetResult(&resp)
|
||||||
|
})
|
||||||
|
return resp.PartInfoList, err
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *AliyundriveOpen) uploadPart(ctx context.Context, i, count int, reader *utils.MultiReadable, resp *CreateResp, retry bool) error {
|
||||||
|
partInfo := resp.PartInfoList[i-1]
|
||||||
|
uploadUrl := partInfo.UploadUrl
|
||||||
|
if d.InternalUpload {
|
||||||
|
uploadUrl = strings.ReplaceAll(uploadUrl, "https://cn-beijing-data.aliyundrive.net/", "http://ccp-bj29-bj-1592982087.oss-cn-beijing-internal.aliyuncs.com/")
|
||||||
|
}
|
||||||
|
req, err := http.NewRequest("PUT", uploadUrl, reader)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
req = req.WithContext(ctx)
|
||||||
|
res, err := base.HttpClient.Do(req)
|
||||||
|
if err != nil {
|
||||||
|
if retry {
|
||||||
|
reader.Reset()
|
||||||
|
return d.uploadPart(ctx, i, count, reader, resp, false)
|
||||||
|
}
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
res.Body.Close()
|
||||||
|
if retry && res.StatusCode == http.StatusForbidden {
|
||||||
|
resp.PartInfoList, err = d.getUploadUrl(count, resp.FileId, resp.UploadId)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
reader.Reset()
|
||||||
|
return d.uploadPart(ctx, i, count, reader, resp, false)
|
||||||
|
}
|
||||||
|
if res.StatusCode != http.StatusOK && res.StatusCode != http.StatusConflict {
|
||||||
|
return fmt.Errorf("upload status: %d", res.StatusCode)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
@ -2,15 +2,16 @@ package aliyundrive_share
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"errors"
|
|
||||||
"net/http"
|
"net/http"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/alist-org/alist/v3/drivers/base"
|
"github.com/alist-org/alist/v3/drivers/base"
|
||||||
"github.com/alist-org/alist/v3/internal/driver"
|
"github.com/alist-org/alist/v3/internal/driver"
|
||||||
|
"github.com/alist-org/alist/v3/internal/errs"
|
||||||
"github.com/alist-org/alist/v3/internal/model"
|
"github.com/alist-org/alist/v3/internal/model"
|
||||||
"github.com/alist-org/alist/v3/pkg/cron"
|
"github.com/alist-org/alist/v3/pkg/cron"
|
||||||
"github.com/alist-org/alist/v3/pkg/utils"
|
"github.com/alist-org/alist/v3/pkg/utils"
|
||||||
|
"github.com/go-resty/resty/v2"
|
||||||
log "github.com/sirupsen/logrus"
|
log "github.com/sirupsen/logrus"
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -54,6 +55,7 @@ func (d *AliyundriveShare) Drop(ctx context.Context) error {
|
|||||||
if d.cron != nil {
|
if d.cron != nil {
|
||||||
d.cron.Stop()
|
d.cron.Stop()
|
||||||
}
|
}
|
||||||
|
d.DriveId = ""
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -76,40 +78,43 @@ func (d *AliyundriveShare) Link(ctx context.Context, file model.Obj, args model.
|
|||||||
"share_id": d.ShareId,
|
"share_id": d.ShareId,
|
||||||
}
|
}
|
||||||
var resp ShareLinkResp
|
var resp ShareLinkResp
|
||||||
var e ErrorResp
|
_, err := d.request("https://api.aliyundrive.com/v2/file/get_share_link_download_url", http.MethodPost, func(req *resty.Request) {
|
||||||
_, err := base.RestyClient.R().
|
req.SetBody(data).SetResult(&resp)
|
||||||
SetError(&e).SetBody(data).SetResult(&resp).
|
})
|
||||||
SetHeader("content-type", "application/json").
|
|
||||||
SetHeader("Authorization", "Bearer\t"+d.AccessToken).
|
|
||||||
SetHeader("x-share-token", d.ShareToken).
|
|
||||||
Post("https://api.aliyundrive.com/v2/file/get_share_link_download_url")
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
var u string
|
|
||||||
if e.Code != "" {
|
|
||||||
if e.Code == "AccessTokenInvalid" || e.Code == "ShareLinkTokenInvalid" {
|
|
||||||
if e.Code == "AccessTokenInvalid" {
|
|
||||||
err = d.refreshToken()
|
|
||||||
} else {
|
|
||||||
err = d.getShareToken()
|
|
||||||
}
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return d.Link(ctx, file, args)
|
|
||||||
} else {
|
|
||||||
return nil, errors.New(e.Code + ": " + e.Message)
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
u = resp.DownloadUrl
|
|
||||||
}
|
|
||||||
return &model.Link{
|
return &model.Link{
|
||||||
Header: http.Header{
|
Header: http.Header{
|
||||||
"Referer": []string{"https://www.aliyundrive.com/"},
|
"Referer": []string{"https://www.aliyundrive.com/"},
|
||||||
},
|
},
|
||||||
URL: u,
|
URL: resp.DownloadUrl,
|
||||||
}, nil
|
}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (d *AliyundriveShare) Other(ctx context.Context, args model.OtherArgs) (interface{}, error) {
|
||||||
|
var resp base.Json
|
||||||
|
var url string
|
||||||
|
data := base.Json{
|
||||||
|
"share_id": d.ShareId,
|
||||||
|
"file_id": args.Obj.GetID(),
|
||||||
|
}
|
||||||
|
switch args.Method {
|
||||||
|
case "doc_preview":
|
||||||
|
url = "https://api.aliyundrive.com/v2/file/get_office_preview_url"
|
||||||
|
case "video_preview":
|
||||||
|
url = "https://api.aliyundrive.com/v2/file/get_video_preview_play_info"
|
||||||
|
data["category"] = "live_transcoding"
|
||||||
|
default:
|
||||||
|
return nil, errs.NotSupport
|
||||||
|
}
|
||||||
|
_, err := d.request(url, http.MethodPost, func(req *resty.Request) {
|
||||||
|
req.SetBody(data).SetResult(&resp)
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return resp, nil
|
||||||
|
}
|
||||||
|
|
||||||
var _ driver.Driver = (*AliyundriveShare)(nil)
|
var _ driver.Driver = (*AliyundriveShare)(nil)
|
||||||
|
@ -52,12 +52,46 @@ func (d *AliyundriveShare) getShareToken() error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (d *AliyundriveShare) request(url, method string, callback base.ReqCallback) ([]byte, error) {
|
||||||
|
var e ErrorResp
|
||||||
|
req := base.RestyClient.R().
|
||||||
|
SetError(&e).
|
||||||
|
SetHeader("content-type", "application/json").
|
||||||
|
SetHeader("Authorization", "Bearer\t"+d.AccessToken).
|
||||||
|
SetHeader("x-share-token", d.ShareToken)
|
||||||
|
if callback != nil {
|
||||||
|
callback(req)
|
||||||
|
} else {
|
||||||
|
req.SetBody("{}")
|
||||||
|
}
|
||||||
|
resp, err := req.Execute(method, url)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if e.Code != "" {
|
||||||
|
if e.Code == "AccessTokenInvalid" || e.Code == "ShareLinkTokenInvalid" {
|
||||||
|
if e.Code == "AccessTokenInvalid" {
|
||||||
|
err = d.refreshToken()
|
||||||
|
} else {
|
||||||
|
err = d.getShareToken()
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return d.request(url, method, callback)
|
||||||
|
} else {
|
||||||
|
return nil, errors.New(e.Code + ": " + e.Message)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return resp.Body(), nil
|
||||||
|
}
|
||||||
|
|
||||||
func (d *AliyundriveShare) getFiles(fileId string) ([]File, error) {
|
func (d *AliyundriveShare) getFiles(fileId string) ([]File, error) {
|
||||||
files := make([]File, 0)
|
files := make([]File, 0)
|
||||||
data := base.Json{
|
data := base.Json{
|
||||||
"image_thumbnail_process": "image/resize,w_160/format,jpeg",
|
"image_thumbnail_process": "image/resize,w_160/format,jpeg",
|
||||||
"image_url_process": "image/resize,w_1920/format,jpeg",
|
"image_url_process": "image/resize,w_1920/format,jpeg",
|
||||||
"limit": 100,
|
"limit": 200,
|
||||||
"order_by": d.OrderBy,
|
"order_by": d.OrderBy,
|
||||||
"order_direction": d.OrderDirection,
|
"order_direction": d.OrderDirection,
|
||||||
"parent_file_id": fileId,
|
"parent_file_id": fileId,
|
||||||
|
@ -6,32 +6,42 @@ import (
|
|||||||
_ "github.com/alist-org/alist/v3/drivers/139"
|
_ "github.com/alist-org/alist/v3/drivers/139"
|
||||||
_ "github.com/alist-org/alist/v3/drivers/189"
|
_ "github.com/alist-org/alist/v3/drivers/189"
|
||||||
_ "github.com/alist-org/alist/v3/drivers/189pc"
|
_ "github.com/alist-org/alist/v3/drivers/189pc"
|
||||||
|
_ "github.com/alist-org/alist/v3/drivers/alias"
|
||||||
_ "github.com/alist-org/alist/v3/drivers/alist_v2"
|
_ "github.com/alist-org/alist/v3/drivers/alist_v2"
|
||||||
_ "github.com/alist-org/alist/v3/drivers/alist_v3"
|
_ "github.com/alist-org/alist/v3/drivers/alist_v3"
|
||||||
_ "github.com/alist-org/alist/v3/drivers/aliyundrive"
|
_ "github.com/alist-org/alist/v3/drivers/aliyundrive"
|
||||||
|
_ "github.com/alist-org/alist/v3/drivers/aliyundrive_open"
|
||||||
_ "github.com/alist-org/alist/v3/drivers/aliyundrive_share"
|
_ "github.com/alist-org/alist/v3/drivers/aliyundrive_share"
|
||||||
_ "github.com/alist-org/alist/v3/drivers/baidu_netdisk"
|
_ "github.com/alist-org/alist/v3/drivers/baidu_netdisk"
|
||||||
_ "github.com/alist-org/alist/v3/drivers/baidu_photo"
|
_ "github.com/alist-org/alist/v3/drivers/baidu_photo"
|
||||||
|
_ "github.com/alist-org/alist/v3/drivers/baidu_share"
|
||||||
|
_ "github.com/alist-org/alist/v3/drivers/cloudreve"
|
||||||
_ "github.com/alist-org/alist/v3/drivers/ftp"
|
_ "github.com/alist-org/alist/v3/drivers/ftp"
|
||||||
_ "github.com/alist-org/alist/v3/drivers/google_drive"
|
_ "github.com/alist-org/alist/v3/drivers/google_drive"
|
||||||
_ "github.com/alist-org/alist/v3/drivers/google_photo"
|
_ "github.com/alist-org/alist/v3/drivers/google_photo"
|
||||||
|
_ "github.com/alist-org/alist/v3/drivers/ipfs_api"
|
||||||
_ "github.com/alist-org/alist/v3/drivers/lanzou"
|
_ "github.com/alist-org/alist/v3/drivers/lanzou"
|
||||||
_ "github.com/alist-org/alist/v3/drivers/local"
|
_ "github.com/alist-org/alist/v3/drivers/local"
|
||||||
_ "github.com/alist-org/alist/v3/drivers/mediatrack"
|
_ "github.com/alist-org/alist/v3/drivers/mediatrack"
|
||||||
_ "github.com/alist-org/alist/v3/drivers/mega"
|
_ "github.com/alist-org/alist/v3/drivers/mega"
|
||||||
_ "github.com/alist-org/alist/v3/drivers/onedrive"
|
_ "github.com/alist-org/alist/v3/drivers/onedrive"
|
||||||
|
_ "github.com/alist-org/alist/v3/drivers/onedrive_app"
|
||||||
_ "github.com/alist-org/alist/v3/drivers/pikpak"
|
_ "github.com/alist-org/alist/v3/drivers/pikpak"
|
||||||
_ "github.com/alist-org/alist/v3/drivers/pikpak_share"
|
_ "github.com/alist-org/alist/v3/drivers/pikpak_share"
|
||||||
_ "github.com/alist-org/alist/v3/drivers/quark"
|
_ "github.com/alist-org/alist/v3/drivers/quark_uc"
|
||||||
_ "github.com/alist-org/alist/v3/drivers/s3"
|
_ "github.com/alist-org/alist/v3/drivers/s3"
|
||||||
|
_ "github.com/alist-org/alist/v3/drivers/seafile"
|
||||||
_ "github.com/alist-org/alist/v3/drivers/sftp"
|
_ "github.com/alist-org/alist/v3/drivers/sftp"
|
||||||
_ "github.com/alist-org/alist/v3/drivers/smb"
|
_ "github.com/alist-org/alist/v3/drivers/smb"
|
||||||
_ "github.com/alist-org/alist/v3/drivers/teambition"
|
_ "github.com/alist-org/alist/v3/drivers/teambition"
|
||||||
_ "github.com/alist-org/alist/v3/drivers/terabox"
|
_ "github.com/alist-org/alist/v3/drivers/terabox"
|
||||||
_ "github.com/alist-org/alist/v3/drivers/thunder"
|
_ "github.com/alist-org/alist/v3/drivers/thunder"
|
||||||
|
_ "github.com/alist-org/alist/v3/drivers/trainbit"
|
||||||
|
_ "github.com/alist-org/alist/v3/drivers/url_tree"
|
||||||
_ "github.com/alist-org/alist/v3/drivers/uss"
|
_ "github.com/alist-org/alist/v3/drivers/uss"
|
||||||
_ "github.com/alist-org/alist/v3/drivers/virtual"
|
_ "github.com/alist-org/alist/v3/drivers/virtual"
|
||||||
_ "github.com/alist-org/alist/v3/drivers/webdav"
|
_ "github.com/alist-org/alist/v3/drivers/webdav"
|
||||||
|
_ "github.com/alist-org/alist/v3/drivers/wopan"
|
||||||
_ "github.com/alist-org/alist/v3/drivers/yandex_disk"
|
_ "github.com/alist-org/alist/v3/drivers/yandex_disk"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -23,7 +23,6 @@ import (
|
|||||||
type BaiduNetdisk struct {
|
type BaiduNetdisk struct {
|
||||||
model.Storage
|
model.Storage
|
||||||
Addition
|
Addition
|
||||||
AccessToken string
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (d *BaiduNetdisk) Config() driver.Config {
|
func (d *BaiduNetdisk) Config() driver.Config {
|
||||||
@ -35,7 +34,11 @@ func (d *BaiduNetdisk) GetAddition() driver.Additional {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (d *BaiduNetdisk) Init(ctx context.Context) error {
|
func (d *BaiduNetdisk) Init(ctx context.Context) error {
|
||||||
return d.refreshToken()
|
res, err := d.get("/xpan/nas", map[string]string{
|
||||||
|
"method": "uinfo",
|
||||||
|
}, nil)
|
||||||
|
log.Debugf("[baidu] get uinfo: %s", string(res))
|
||||||
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
func (d *BaiduNetdisk) Drop(ctx context.Context) error {
|
func (d *BaiduNetdisk) Drop(ctx context.Context) error {
|
||||||
|
@ -13,6 +13,8 @@ type Addition struct {
|
|||||||
DownloadAPI string `json:"download_api" type:"select" options:"official,crack" default:"official"`
|
DownloadAPI string `json:"download_api" type:"select" options:"official,crack" default:"official"`
|
||||||
ClientID string `json:"client_id" required:"true" default:"iYCeC9g08h5vuP9UqvPHKKSVrKFXGa1v"`
|
ClientID string `json:"client_id" required:"true" default:"iYCeC9g08h5vuP9UqvPHKKSVrKFXGa1v"`
|
||||||
ClientSecret string `json:"client_secret" required:"true" default:"jXiFMOPVPCWlO2M5CwWQzffpNPaGTRBG"`
|
ClientSecret string `json:"client_secret" required:"true" default:"jXiFMOPVPCWlO2M5CwWQzffpNPaGTRBG"`
|
||||||
|
CustomCrackUA string `json:"custom_crack_ua" required:"true" default:"netdisk"`
|
||||||
|
AccessToken string
|
||||||
}
|
}
|
||||||
|
|
||||||
var config = driver.Config{
|
var config = driver.Config{
|
||||||
|
@ -154,7 +154,7 @@ func (d *BaiduNetdisk) linkCrack(file model.Obj, args model.LinkArgs) (*model.Li
|
|||||||
"target": fmt.Sprintf("[\"%s\"]", file.GetPath()),
|
"target": fmt.Sprintf("[\"%s\"]", file.GetPath()),
|
||||||
"dlink": "1",
|
"dlink": "1",
|
||||||
"web": "5",
|
"web": "5",
|
||||||
"origin": "dlna",
|
//"origin": "dlna",
|
||||||
}
|
}
|
||||||
_, err := d.request("https://pan.baidu.com/api/filemetas", http.MethodGet, func(req *resty.Request) {
|
_, err := d.request("https://pan.baidu.com/api/filemetas", http.MethodGet, func(req *resty.Request) {
|
||||||
req.SetQueryParams(param)
|
req.SetQueryParams(param)
|
||||||
@ -165,7 +165,7 @@ func (d *BaiduNetdisk) linkCrack(file model.Obj, args model.LinkArgs) (*model.Li
|
|||||||
return &model.Link{
|
return &model.Link{
|
||||||
URL: resp.Info[0].Dlink,
|
URL: resp.Info[0].Dlink,
|
||||||
Header: http.Header{
|
Header: http.Header{
|
||||||
"User-Agent": []string{"pan.baidu.com"},
|
"User-Agent": []string{d.CustomCrackUA},
|
||||||
},
|
},
|
||||||
}, nil
|
}, nil
|
||||||
}
|
}
|
||||||
@ -187,7 +187,7 @@ func (d *BaiduNetdisk) create(path string, size int64, isdir int, uploadid, bloc
|
|||||||
params := map[string]string{
|
params := map[string]string{
|
||||||
"method": "create",
|
"method": "create",
|
||||||
}
|
}
|
||||||
data := fmt.Sprintf("path=%s&size=%d&isdir=%d", encodeURIComponent(path), size, isdir)
|
data := fmt.Sprintf("path=%s&size=%d&isdir=%d&rtype=3", encodeURIComponent(path), size, isdir)
|
||||||
if uploadid != "" {
|
if uploadid != "" {
|
||||||
data += fmt.Sprintf("&uploadid=%s&block_list=%s", uploadid, block_list)
|
data += fmt.Sprintf("&uploadid=%s&block_list=%s", uploadid, block_list)
|
||||||
}
|
}
|
||||||
|
@ -9,6 +9,8 @@ import (
|
|||||||
"math"
|
"math"
|
||||||
"os"
|
"os"
|
||||||
"regexp"
|
"regexp"
|
||||||
|
"strconv"
|
||||||
|
"strings"
|
||||||
|
|
||||||
"github.com/alist-org/alist/v3/internal/driver"
|
"github.com/alist-org/alist/v3/internal/driver"
|
||||||
"github.com/alist-org/alist/v3/internal/errs"
|
"github.com/alist-org/alist/v3/internal/errs"
|
||||||
@ -22,6 +24,8 @@ type BaiduPhoto struct {
|
|||||||
Addition
|
Addition
|
||||||
|
|
||||||
AccessToken string
|
AccessToken string
|
||||||
|
Uk int64
|
||||||
|
root model.Obj
|
||||||
}
|
}
|
||||||
|
|
||||||
func (d *BaiduPhoto) Config() driver.Config {
|
func (d *BaiduPhoto) Config() driver.Config {
|
||||||
@ -33,146 +37,178 @@ func (d *BaiduPhoto) GetAddition() driver.Additional {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (d *BaiduPhoto) Init(ctx context.Context) error {
|
func (d *BaiduPhoto) Init(ctx context.Context) error {
|
||||||
return d.refreshToken()
|
if err := d.refreshToken(); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
// root
|
||||||
|
if d.AlbumID != "" {
|
||||||
|
albumID := strings.Split(d.AlbumID, "|")[0]
|
||||||
|
album, err := d.GetAlbumDetail(ctx, albumID)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
d.root = album
|
||||||
|
} else {
|
||||||
|
d.root = &Root{
|
||||||
|
Name: "root",
|
||||||
|
Modified: d.Modified,
|
||||||
|
IsFolder: true,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// uk
|
||||||
|
info, err := d.uInfo()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
d.Uk, err = strconv.ParseInt(info.YouaID, 10, 64)
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *BaiduPhoto) GetRoot(ctx context.Context) (model.Obj, error) {
|
||||||
|
return d.root, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (d *BaiduPhoto) Drop(ctx context.Context) error {
|
func (d *BaiduPhoto) Drop(ctx context.Context) error {
|
||||||
|
d.AccessToken = ""
|
||||||
|
d.Uk = 0
|
||||||
|
d.root = nil
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (d *BaiduPhoto) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([]model.Obj, error) {
|
func (d *BaiduPhoto) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([]model.Obj, error) {
|
||||||
var objs []model.Obj
|
|
||||||
var err error
|
var err error
|
||||||
if IsRoot(dir) {
|
|
||||||
var albums []Album
|
|
||||||
if d.ShowType != "root_only_file" {
|
|
||||||
albums, err = d.GetAllAlbum(ctx)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
var files []File
|
/* album */
|
||||||
if d.ShowType != "root_only_album" {
|
if album, ok := dir.(*Album); ok {
|
||||||
files, err = d.GetAllFile(ctx)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
alubmName := make(map[string]int)
|
|
||||||
objs, _ = utils.SliceConvert(albums, func(album Album) (model.Obj, error) {
|
|
||||||
i := alubmName[album.GetName()]
|
|
||||||
if i != 0 {
|
|
||||||
alubmName[album.GetName()]++
|
|
||||||
album.Title = fmt.Sprintf("%s(%d)", album.Title, i)
|
|
||||||
}
|
|
||||||
alubmName[album.GetName()]++
|
|
||||||
return &album, nil
|
|
||||||
})
|
|
||||||
for i := 0; i < len(files); i++ {
|
|
||||||
objs = append(objs, &files[i])
|
|
||||||
}
|
|
||||||
} else if IsAlbum(dir) || IsAlbumRoot(dir) {
|
|
||||||
var files []AlbumFile
|
var files []AlbumFile
|
||||||
files, err = d.GetAllAlbumFile(ctx, splitID(dir.GetID())[0], "")
|
files, err = d.GetAllAlbumFile(ctx, album, "")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
objs = make([]model.Obj, 0, len(files))
|
|
||||||
for i := 0; i < len(files); i++ {
|
return utils.MustSliceConvert(files, func(file AlbumFile) model.Obj {
|
||||||
objs = append(objs, &files[i])
|
return &file
|
||||||
|
}), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
/* root */
|
||||||
|
var albums []Album
|
||||||
|
if d.ShowType != "root_only_file" {
|
||||||
|
albums, err = d.GetAllAlbum(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return objs, nil
|
|
||||||
|
var files []File
|
||||||
|
if d.ShowType != "root_only_album" {
|
||||||
|
files, err = d.GetAllFile(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return append(
|
||||||
|
utils.MustSliceConvert(albums, func(album Album) model.Obj {
|
||||||
|
return &album
|
||||||
|
}),
|
||||||
|
utils.MustSliceConvert(files, func(album File) model.Obj {
|
||||||
|
return &album
|
||||||
|
})...,
|
||||||
|
), nil
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (d *BaiduPhoto) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
|
func (d *BaiduPhoto) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
|
||||||
if IsAlbumFile(file) {
|
switch file := file.(type) {
|
||||||
return d.linkAlbum(ctx, file, args)
|
case *File:
|
||||||
} else if IsFile(file) {
|
|
||||||
return d.linkFile(ctx, file, args)
|
return d.linkFile(ctx, file, args)
|
||||||
|
case *AlbumFile:
|
||||||
|
return d.linkAlbum(ctx, file, args)
|
||||||
}
|
}
|
||||||
return nil, errs.NotFile
|
return nil, errs.NotFile
|
||||||
}
|
}
|
||||||
|
|
||||||
func (d *BaiduPhoto) MakeDir(ctx context.Context, parentDir model.Obj, dirName string) error {
|
var joinReg = regexp.MustCompile(`(?i)join:([\S]*)`)
|
||||||
if IsRoot(parentDir) {
|
|
||||||
code := regexp.MustCompile(`(?i)join:([\S]*)`).FindStringSubmatch(dirName)
|
func (d *BaiduPhoto) MakeDir(ctx context.Context, parentDir model.Obj, dirName string) (model.Obj, error) {
|
||||||
|
if _, ok := parentDir.(*Root); ok {
|
||||||
|
code := joinReg.FindStringSubmatch(dirName)
|
||||||
if len(code) > 1 {
|
if len(code) > 1 {
|
||||||
return d.JoinAlbum(ctx, code[1])
|
return d.JoinAlbum(ctx, code[1])
|
||||||
}
|
}
|
||||||
return d.CreateAlbum(ctx, dirName)
|
return d.CreateAlbum(ctx, dirName)
|
||||||
}
|
}
|
||||||
return errs.NotSupport
|
return nil, errs.NotSupport
|
||||||
}
|
}
|
||||||
|
|
||||||
func (d *BaiduPhoto) Copy(ctx context.Context, srcObj, dstDir model.Obj) error {
|
func (d *BaiduPhoto) Copy(ctx context.Context, srcObj, dstDir model.Obj) (model.Obj, error) {
|
||||||
if IsFile(srcObj) {
|
switch file := srcObj.(type) {
|
||||||
if IsAlbum(dstDir) {
|
case *File:
|
||||||
|
if album, ok := dstDir.(*Album); ok {
|
||||||
//rootfile -> album
|
//rootfile -> album
|
||||||
e := splitID(dstDir.GetID())
|
return d.AddAlbumFile(ctx, album, file)
|
||||||
return d.AddAlbumFile(ctx, e[0], e[1], srcObj.GetID())
|
|
||||||
}
|
}
|
||||||
} else if IsAlbumFile(srcObj) {
|
case *AlbumFile:
|
||||||
if IsRoot(dstDir) {
|
switch album := dstDir.(type) {
|
||||||
|
case *Root:
|
||||||
//albumfile -> root
|
//albumfile -> root
|
||||||
e := splitID(srcObj.GetID())
|
return d.CopyAlbumFile(ctx, file)
|
||||||
_, err := d.CopyAlbumFile(ctx, e[1], e[2], e[3], srcObj.GetID())
|
case *Album:
|
||||||
return err
|
|
||||||
} else if IsAlbum(dstDir) {
|
|
||||||
// albumfile -> root -> album
|
// albumfile -> root -> album
|
||||||
e := splitID(srcObj.GetID())
|
rootfile, err := d.CopyAlbumFile(ctx, file)
|
||||||
file, err := d.CopyAlbumFile(ctx, e[1], e[2], e[3], srcObj.GetID())
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return nil, err
|
||||||
}
|
}
|
||||||
e = splitID(dstDir.GetID())
|
return d.AddAlbumFile(ctx, album, rootfile)
|
||||||
return d.AddAlbumFile(ctx, e[0], e[1], fmt.Sprint(file.Fsid))
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return errs.NotSupport
|
return nil, errs.NotSupport
|
||||||
}
|
}
|
||||||
|
|
||||||
func (d *BaiduPhoto) Move(ctx context.Context, srcObj, dstDir model.Obj) error {
|
func (d *BaiduPhoto) Move(ctx context.Context, srcObj, dstDir model.Obj) (model.Obj, error) {
|
||||||
// 仅支持相册之间移动
|
// 仅支持相册之间移动
|
||||||
if IsAlbumFile(srcObj) && IsAlbum(dstDir) {
|
if file, ok := srcObj.(*AlbumFile); ok {
|
||||||
err := d.Copy(ctx, srcObj, dstDir)
|
if _, ok := dstDir.(*Album); ok {
|
||||||
if err != nil {
|
newObj, err := d.Copy(ctx, srcObj, dstDir)
|
||||||
return err
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
// 删除原相册文件
|
||||||
|
_ = d.DeleteAlbumFile(ctx, file)
|
||||||
|
return newObj, nil
|
||||||
}
|
}
|
||||||
e := splitID(srcObj.GetID())
|
|
||||||
return d.DeleteAlbumFile(ctx, e[1], e[2], srcObj.GetID())
|
|
||||||
}
|
}
|
||||||
return errs.NotSupport
|
return nil, errs.NotSupport
|
||||||
}
|
}
|
||||||
|
|
||||||
func (d *BaiduPhoto) Rename(ctx context.Context, srcObj model.Obj, newName string) error {
|
func (d *BaiduPhoto) Rename(ctx context.Context, srcObj model.Obj, newName string) (model.Obj, error) {
|
||||||
// 仅支持相册改名
|
// 仅支持相册改名
|
||||||
if IsAlbum(srcObj) {
|
if album, ok := srcObj.(*Album); ok {
|
||||||
e := splitID(srcObj.GetID())
|
return d.SetAlbumName(ctx, album, newName)
|
||||||
return d.SetAlbumName(ctx, e[0], e[1], newName)
|
|
||||||
}
|
}
|
||||||
return errs.NotSupport
|
return nil, errs.NotSupport
|
||||||
}
|
}
|
||||||
|
|
||||||
func (d *BaiduPhoto) Remove(ctx context.Context, obj model.Obj) error {
|
func (d *BaiduPhoto) Remove(ctx context.Context, obj model.Obj) error {
|
||||||
e := splitID(obj.GetID())
|
switch obj := obj.(type) {
|
||||||
if IsFile(obj) {
|
case *File:
|
||||||
return d.DeleteFile(ctx, e[0])
|
return d.DeleteFile(ctx, obj)
|
||||||
} else if IsAlbum(obj) {
|
case *AlbumFile:
|
||||||
return d.DeleteAlbum(ctx, e[0], e[1])
|
return d.DeleteAlbumFile(ctx, obj)
|
||||||
} else if IsAlbumFile(obj) {
|
case *Album:
|
||||||
return d.DeleteAlbumFile(ctx, e[1], e[2], obj.GetID())
|
return d.DeleteAlbum(ctx, obj)
|
||||||
}
|
}
|
||||||
return errs.NotSupport
|
return errs.NotSupport
|
||||||
}
|
}
|
||||||
|
|
||||||
func (d *BaiduPhoto) Put(ctx context.Context, dstDir model.Obj, stream model.FileStreamer, up driver.UpdateProgress) error {
|
func (d *BaiduPhoto) Put(ctx context.Context, dstDir model.Obj, stream model.FileStreamer, up driver.UpdateProgress) (model.Obj, error) {
|
||||||
// 需要获取完整文件md5,必须支持 io.Seek
|
// 需要获取完整文件md5,必须支持 io.Seek
|
||||||
tempFile, err := utils.CreateTempFile(stream.GetReadCloser())
|
tempFile, err := utils.CreateTempFile(stream.GetReadCloser())
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return nil, err
|
||||||
}
|
}
|
||||||
defer func() {
|
defer func() {
|
||||||
_ = tempFile.Close()
|
_ = tempFile.Close()
|
||||||
@ -190,20 +226,19 @@ func (d *BaiduPhoto) Put(ctx context.Context, dstDir model.Obj, stream model.Fil
|
|||||||
sliceMd52 := md5.New()
|
sliceMd52 := md5.New()
|
||||||
slicemd52Write := utils.LimitWriter(sliceMd52, SliceSize)
|
slicemd52Write := utils.LimitWriter(sliceMd52, SliceSize)
|
||||||
for i := 1; i <= count; i++ {
|
for i := 1; i <= count; i++ {
|
||||||
select {
|
if utils.IsCanceled(ctx) {
|
||||||
case <-ctx.Done():
|
return nil, ctx.Err()
|
||||||
return ctx.Err()
|
|
||||||
default:
|
|
||||||
}
|
}
|
||||||
|
|
||||||
_, err := io.CopyN(io.MultiWriter(fileMd5, sliceMd5, slicemd52Write), tempFile, DEFAULT)
|
_, err := io.CopyN(io.MultiWriter(fileMd5, sliceMd5, slicemd52Write), tempFile, DEFAULT)
|
||||||
if err != nil && err != io.EOF && err != io.ErrUnexpectedEOF {
|
if err != nil && err != io.EOF && err != io.ErrUnexpectedEOF {
|
||||||
return err
|
return nil, err
|
||||||
}
|
}
|
||||||
sliceMD5List = append(sliceMD5List, hex.EncodeToString(sliceMd5.Sum(nil)))
|
sliceMD5List = append(sliceMD5List, hex.EncodeToString(sliceMd5.Sum(nil)))
|
||||||
sliceMd5.Reset()
|
sliceMd5.Reset()
|
||||||
}
|
}
|
||||||
if _, err = tempFile.Seek(0, io.SeekStart); err != nil {
|
if _, err = tempFile.Seek(0, io.SeekStart); err != nil {
|
||||||
return err
|
return nil, err
|
||||||
}
|
}
|
||||||
content_md5 := hex.EncodeToString(fileMd5.Sum(nil))
|
content_md5 := hex.EncodeToString(fileMd5.Sum(nil))
|
||||||
slice_md5 := hex.EncodeToString(sliceMd52.Sum(nil))
|
slice_md5 := hex.EncodeToString(sliceMd52.Sum(nil))
|
||||||
@ -214,7 +249,7 @@ func (d *BaiduPhoto) Put(ctx context.Context, dstDir model.Obj, stream model.Fil
|
|||||||
"isdir": "0",
|
"isdir": "0",
|
||||||
"rtype": "1",
|
"rtype": "1",
|
||||||
"ctype": "11",
|
"ctype": "11",
|
||||||
"path": stream.GetName(),
|
"path": fmt.Sprintf("/%s", stream.GetName()),
|
||||||
"size": fmt.Sprint(stream.GetSize()),
|
"size": fmt.Sprint(stream.GetSize()),
|
||||||
"slice-md5": slice_md5,
|
"slice-md5": slice_md5,
|
||||||
"content-md5": content_md5,
|
"content-md5": content_md5,
|
||||||
@ -228,7 +263,7 @@ func (d *BaiduPhoto) Put(ctx context.Context, dstDir model.Obj, stream model.Fil
|
|||||||
r.SetFormData(params)
|
r.SetFormData(params)
|
||||||
}, &precreateResp)
|
}, &precreateResp)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
switch precreateResp.ReturnType {
|
switch precreateResp.ReturnType {
|
||||||
@ -241,7 +276,7 @@ func (d *BaiduPhoto) Put(ctx context.Context, dstDir model.Obj, stream model.Fil
|
|||||||
|
|
||||||
for i := 0; i < count; i++ {
|
for i := 0; i < count; i++ {
|
||||||
if utils.IsCanceled(ctx) {
|
if utils.IsCanceled(ctx) {
|
||||||
return ctx.Err()
|
return nil, ctx.Err()
|
||||||
}
|
}
|
||||||
uploadParams["partseq"] = fmt.Sprint(i)
|
uploadParams["partseq"] = fmt.Sprint(i)
|
||||||
_, err = d.Post("https://c3.pcs.baidu.com/rest/2.0/pcs/superfile2", func(r *resty.Request) {
|
_, err = d.Post("https://c3.pcs.baidu.com/rest/2.0/pcs/superfile2", func(r *resty.Request) {
|
||||||
@ -250,7 +285,7 @@ func (d *BaiduPhoto) Put(ctx context.Context, dstDir model.Obj, stream model.Fil
|
|||||||
r.SetFileReader("file", stream.GetName(), io.LimitReader(tempFile, DEFAULT))
|
r.SetFileReader("file", stream.GetName(), io.LimitReader(tempFile, DEFAULT))
|
||||||
}, nil)
|
}, nil)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return nil, err
|
||||||
}
|
}
|
||||||
up(i * 100 / count)
|
up(i * 100 / count)
|
||||||
}
|
}
|
||||||
@ -262,19 +297,24 @@ func (d *BaiduPhoto) Put(ctx context.Context, dstDir model.Obj, stream model.Fil
|
|||||||
r.SetFormData(params)
|
r.SetFormData(params)
|
||||||
}, &precreateResp)
|
}, &precreateResp)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return nil, err
|
||||||
}
|
}
|
||||||
fallthrough
|
fallthrough
|
||||||
case 3: // 增加到相册
|
case 3: // 增加到相册
|
||||||
if IsAlbum(dstDir) || IsAlbumRoot(dstDir) {
|
rootfile := precreateResp.Data.toFile()
|
||||||
e := splitID(dstDir.GetID())
|
if album, ok := dstDir.(*Album); ok {
|
||||||
err = d.AddAlbumFile(ctx, e[0], e[1], fmt.Sprint(precreateResp.Data.FsID))
|
return d.AddAlbumFile(ctx, album, rootfile)
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
return rootfile, nil
|
||||||
}
|
}
|
||||||
return nil
|
return nil, errs.NotSupport
|
||||||
}
|
}
|
||||||
|
|
||||||
var _ driver.Driver = (*BaiduPhoto)(nil)
|
var _ driver.Driver = (*BaiduPhoto)(nil)
|
||||||
|
var _ driver.GetRooter = (*BaiduPhoto)(nil)
|
||||||
|
var _ driver.MkdirResult = (*BaiduPhoto)(nil)
|
||||||
|
var _ driver.CopyResult = (*BaiduPhoto)(nil)
|
||||||
|
var _ driver.MoveResult = (*BaiduPhoto)(nil)
|
||||||
|
var _ driver.Remove = (*BaiduPhoto)(nil)
|
||||||
|
var _ driver.PutResult = (*BaiduPhoto)(nil)
|
||||||
|
var _ driver.RenameResult = (*BaiduPhoto)(nil)
|
||||||
|
@ -4,104 +4,68 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
"math"
|
"math"
|
||||||
"math/rand"
|
"math/rand"
|
||||||
"regexp"
|
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/alist-org/alist/v3/internal/model"
|
"github.com/alist-org/alist/v3/pkg/utils"
|
||||||
)
|
)
|
||||||
|
|
||||||
//Tid生成
|
// Tid生成
|
||||||
func getTid() string {
|
func getTid() string {
|
||||||
return fmt.Sprintf("3%d%.0f", time.Now().Unix(), math.Floor(9000000*rand.Float64()+1000000))
|
return fmt.Sprintf("3%d%.0f", time.Now().Unix(), math.Floor(9000000*rand.Float64()+1000000))
|
||||||
}
|
}
|
||||||
|
|
||||||
// 检查名称
|
|
||||||
func checkName(name string) bool {
|
|
||||||
return len(name) <= 20 && regexp.MustCompile("[\u4e00-\u9fa5A-Za-z0-9_-]").MatchString(name)
|
|
||||||
}
|
|
||||||
|
|
||||||
func toTime(t int64) *time.Time {
|
func toTime(t int64) *time.Time {
|
||||||
tm := time.Unix(t, 0)
|
tm := time.Unix(t, 0)
|
||||||
return &tm
|
return &tm
|
||||||
}
|
}
|
||||||
|
|
||||||
func fsidsFormat(ids ...string) string {
|
func fsidsFormatNotUk(ids ...int64) string {
|
||||||
var buf []string
|
buf := utils.MustSliceConvert(ids, func(id int64) string {
|
||||||
for _, id := range ids {
|
return fmt.Sprintf(`{"fsid":%d}`, id)
|
||||||
e := splitID(id)
|
})
|
||||||
buf = append(buf, fmt.Sprintf(`{"fsid":%s,"uk":%s}`, e[0], e[3]))
|
|
||||||
}
|
|
||||||
return fmt.Sprintf("[%s]", strings.Join(buf, ","))
|
return fmt.Sprintf("[%s]", strings.Join(buf, ","))
|
||||||
}
|
}
|
||||||
|
|
||||||
func fsidsFormatNotUk(ids ...string) string {
|
|
||||||
var buf []string
|
|
||||||
for _, id := range ids {
|
|
||||||
buf = append(buf, fmt.Sprintf(`{"fsid":%s}`, splitID(id)[0]))
|
|
||||||
}
|
|
||||||
return fmt.Sprintf("[%s]", strings.Join(buf, ","))
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
结构
|
|
||||||
|
|
||||||
{fsid} 文件
|
|
||||||
|
|
||||||
{album_id}|{tid} 相册
|
|
||||||
|
|
||||||
{fsid}|{album_id}|{tid}|{uk} 相册文件
|
|
||||||
*/
|
|
||||||
func splitID(id string) []string {
|
|
||||||
return strings.SplitN(id, "|", 4)[:4]
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
结构
|
|
||||||
|
|
||||||
{fsid} 文件
|
|
||||||
|
|
||||||
{album_id}|{tid} 相册
|
|
||||||
|
|
||||||
{fsid}|{album_id}|{tid}|{uk} 相册文件
|
|
||||||
*/
|
|
||||||
func joinID(ids ...interface{}) string {
|
|
||||||
idsStr := make([]string, 0, len(ids))
|
|
||||||
for _, id := range ids {
|
|
||||||
idsStr = append(idsStr, fmt.Sprint(id))
|
|
||||||
}
|
|
||||||
return strings.Join(idsStr, "|")
|
|
||||||
}
|
|
||||||
|
|
||||||
func getFileName(path string) string {
|
func getFileName(path string) string {
|
||||||
return path[strings.LastIndex(path, "/")+1:]
|
return path[strings.LastIndex(path, "/")+1:]
|
||||||
}
|
}
|
||||||
|
|
||||||
// 相册
|
|
||||||
func IsAlbum(obj model.Obj) bool {
|
|
||||||
return obj.IsDir() && obj.GetPath() == "album"
|
|
||||||
}
|
|
||||||
|
|
||||||
// 根目录
|
|
||||||
func IsRoot(obj model.Obj) bool {
|
|
||||||
return obj.IsDir() && obj.GetPath() == "" && obj.GetID() == ""
|
|
||||||
}
|
|
||||||
|
|
||||||
// 以相册为根目录
|
|
||||||
func IsAlbumRoot(obj model.Obj) bool {
|
|
||||||
return obj.IsDir() && obj.GetPath() == "" && obj.GetID() != ""
|
|
||||||
}
|
|
||||||
|
|
||||||
// 根文件
|
|
||||||
func IsFile(obj model.Obj) bool {
|
|
||||||
return !obj.IsDir() && obj.GetPath() == "file"
|
|
||||||
}
|
|
||||||
|
|
||||||
// 相册文件
|
|
||||||
func IsAlbumFile(obj model.Obj) bool {
|
|
||||||
return !obj.IsDir() && obj.GetPath() == "albumfile"
|
|
||||||
}
|
|
||||||
|
|
||||||
func MustString(str string, err error) string {
|
func MustString(str string, err error) string {
|
||||||
return str
|
return str
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* 处理文件变化
|
||||||
|
* 最大程度利用重复数据
|
||||||
|
**/
|
||||||
|
func copyFile(file *AlbumFile, cf *CopyFile) *File {
|
||||||
|
return &File{
|
||||||
|
Fsid: cf.Fsid,
|
||||||
|
Path: cf.Path,
|
||||||
|
Ctime: cf.Ctime,
|
||||||
|
Mtime: cf.Ctime,
|
||||||
|
Size: file.Size,
|
||||||
|
Thumburl: file.Thumburl,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func moveFileToAlbumFile(file *File, album *Album, uk int64) *AlbumFile {
|
||||||
|
return &AlbumFile{
|
||||||
|
File: *file,
|
||||||
|
AlbumID: album.AlbumID,
|
||||||
|
Tid: album.Tid,
|
||||||
|
Uk: uk,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func renameAlbum(album *Album, newName string) *Album {
|
||||||
|
return &Album{
|
||||||
|
AlbumID: album.AlbumID,
|
||||||
|
Tid: album.Tid,
|
||||||
|
JoinTime: album.JoinTime,
|
||||||
|
CreateTime: album.CreateTime,
|
||||||
|
Title: newName,
|
||||||
|
Mtime: time.Now().Unix(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@ -14,10 +14,6 @@ type Addition struct {
|
|||||||
ClientSecret string `json:"client_secret" required:"true" default:"jXiFMOPVPCWlO2M5CwWQzffpNPaGTRBG"`
|
ClientSecret string `json:"client_secret" required:"true" default:"jXiFMOPVPCWlO2M5CwWQzffpNPaGTRBG"`
|
||||||
}
|
}
|
||||||
|
|
||||||
func (a Addition) GetRootId() string {
|
|
||||||
return a.AlbumID
|
|
||||||
}
|
|
||||||
|
|
||||||
var config = driver.Config{
|
var config = driver.Config{
|
||||||
Name: "BaiduPhoto",
|
Name: "BaiduPhoto",
|
||||||
LocalSort: true,
|
LocalSort: true,
|
||||||
|
@ -3,6 +3,8 @@ package baiduphoto
|
|||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
|
"github.com/alist-org/alist/v3/internal/model"
|
||||||
)
|
)
|
||||||
|
|
||||||
type TokenErrResp struct {
|
type TokenErrResp struct {
|
||||||
@ -19,6 +21,12 @@ type Erron struct {
|
|||||||
RequestID int `json:"request_id"`
|
RequestID int `json:"request_id"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 用户信息
|
||||||
|
type UInfo struct {
|
||||||
|
// uk
|
||||||
|
YouaID string `json:"youa_id"`
|
||||||
|
}
|
||||||
|
|
||||||
type Page struct {
|
type Page struct {
|
||||||
HasMore int `json:"has_more"`
|
HasMore int `json:"has_more"`
|
||||||
Cursor string `json:"cursor"`
|
Cursor string `json:"cursor"`
|
||||||
@ -28,6 +36,8 @@ func (p Page) HasNextPage() bool {
|
|||||||
return p.HasMore == 1
|
return p.HasMore == 1
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type Root = model.Object
|
||||||
|
|
||||||
type (
|
type (
|
||||||
FileListResp struct {
|
FileListResp struct {
|
||||||
Page
|
Page
|
||||||
@ -55,8 +65,8 @@ func (c *File) ModTime() time.Time {
|
|||||||
return *c.parseTime
|
return *c.parseTime
|
||||||
}
|
}
|
||||||
func (c *File) IsDir() bool { return false }
|
func (c *File) IsDir() bool { return false }
|
||||||
func (c *File) GetID() string { return joinID(c.Fsid) }
|
func (c *File) GetID() string { return "" }
|
||||||
func (c *File) GetPath() string { return "file" }
|
func (c *File) GetPath() string { return "" }
|
||||||
func (c *File) Thumb() string {
|
func (c *File) Thumb() string {
|
||||||
if len(c.Thumburl) > 0 {
|
if len(c.Thumburl) > 0 {
|
||||||
return c.Thumburl[0]
|
return c.Thumburl[0]
|
||||||
@ -108,11 +118,8 @@ func (a *Album) ModTime() time.Time {
|
|||||||
return *a.parseTime
|
return *a.parseTime
|
||||||
}
|
}
|
||||||
func (a *Album) IsDir() bool { return true }
|
func (a *Album) IsDir() bool { return true }
|
||||||
func (a *Album) GetID() string { return joinID(a.AlbumID, a.Tid) }
|
func (a *Album) GetID() string { return "" }
|
||||||
func (a *Album) GetPath() string { return "album" }
|
func (a *Album) GetPath() string { return "" }
|
||||||
|
|
||||||
func (af *AlbumFile) GetID() string { return joinID(af.Fsid, af.AlbumID, af.Tid, af.Uk) }
|
|
||||||
func (c *AlbumFile) GetPath() string { return "albumfile" }
|
|
||||||
|
|
||||||
type (
|
type (
|
||||||
CopyFileResp struct {
|
CopyFileResp struct {
|
||||||
@ -120,7 +127,8 @@ type (
|
|||||||
}
|
}
|
||||||
CopyFile struct {
|
CopyFile struct {
|
||||||
FromFsid int64 `json:"from_fsid"` // 源ID
|
FromFsid int64 `json:"from_fsid"` // 源ID
|
||||||
Fsid int64 `json:"fsid"` // 目标ID
|
Ctime int64 `json:"ctime"`
|
||||||
|
Fsid int64 `json:"fsid"` // 目标ID
|
||||||
Path string `json:"path"`
|
Path string `json:"path"`
|
||||||
ShootTime int `json:"shoot_time"`
|
ShootTime int `json:"shoot_time"`
|
||||||
}
|
}
|
||||||
@ -134,8 +142,8 @@ type (
|
|||||||
Md5 string `json:"md5"`
|
Md5 string `json:"md5"`
|
||||||
ServerFilename string `json:"server_filename"`
|
ServerFilename string `json:"server_filename"`
|
||||||
Path string `json:"path"`
|
Path string `json:"path"`
|
||||||
Ctime int `json:"ctime"`
|
Ctime int64 `json:"ctime"`
|
||||||
Mtime int `json:"mtime"`
|
Mtime int64 `json:"mtime"`
|
||||||
Isdir int `json:"isdir"`
|
Isdir int `json:"isdir"`
|
||||||
Category int `json:"category"`
|
Category int `json:"category"`
|
||||||
ServerMd5 string `json:"server_md5"`
|
ServerMd5 string `json:"server_md5"`
|
||||||
@ -158,6 +166,18 @@ type (
|
|||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
func (f *UploadFile) toFile() *File {
|
||||||
|
return &File{
|
||||||
|
Fsid: f.FsID,
|
||||||
|
Path: f.Path,
|
||||||
|
Size: f.Size,
|
||||||
|
Ctime: f.Ctime,
|
||||||
|
Mtime: f.Mtime,
|
||||||
|
Thumburl: nil,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* 共享相册部分 */
|
||||||
type InviteResp struct {
|
type InviteResp struct {
|
||||||
Pdata struct {
|
Pdata struct {
|
||||||
// 邀请码
|
// 邀请码
|
||||||
@ -167,3 +187,9 @@ type InviteResp struct {
|
|||||||
ShareID string `json:"share_id"`
|
ShareID string `json:"share_id"`
|
||||||
} `json:"pdata"`
|
} `json:"pdata"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* 加入相册部分 */
|
||||||
|
type JoinOrCreateAlbumResp struct {
|
||||||
|
AlbumID string `json:"album_id"`
|
||||||
|
AlreadyExists int `json:"already_exists"`
|
||||||
|
}
|
||||||
|
@ -2,10 +2,8 @@ package baiduphoto
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"errors"
|
|
||||||
"fmt"
|
"fmt"
|
||||||
"net/http"
|
"net/http"
|
||||||
"strings"
|
|
||||||
|
|
||||||
"github.com/alist-org/alist/v3/drivers/base"
|
"github.com/alist-org/alist/v3/drivers/base"
|
||||||
"github.com/alist-org/alist/v3/internal/errs"
|
"github.com/alist-org/alist/v3/internal/errs"
|
||||||
@ -17,18 +15,15 @@ import (
|
|||||||
|
|
||||||
const (
|
const (
|
||||||
API_URL = "https://photo.baidu.com/youai"
|
API_URL = "https://photo.baidu.com/youai"
|
||||||
|
USER_API_URL = API_URL + "/user/v1"
|
||||||
ALBUM_API_URL = API_URL + "/album/v1"
|
ALBUM_API_URL = API_URL + "/album/v1"
|
||||||
FILE_API_URL_V1 = API_URL + "/file/v1"
|
FILE_API_URL_V1 = API_URL + "/file/v1"
|
||||||
FILE_API_URL_V2 = API_URL + "/file/v2"
|
FILE_API_URL_V2 = API_URL + "/file/v2"
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
func (d *BaiduPhoto) Request(furl string, method string, callback base.ReqCallback, resp interface{}) ([]byte, error) {
|
||||||
ErrNotSupportName = errors.New("only chinese and english, numbers and underscores are supported, and the length is no more than 20")
|
|
||||||
)
|
|
||||||
|
|
||||||
func (p *BaiduPhoto) Request(furl string, method string, callback base.ReqCallback, resp interface{}) ([]byte, error) {
|
|
||||||
req := base.RestyClient.R().
|
req := base.RestyClient.R().
|
||||||
SetQueryParam("access_token", p.AccessToken)
|
SetQueryParam("access_token", d.AccessToken)
|
||||||
if callback != nil {
|
if callback != nil {
|
||||||
callback(req)
|
callback(req)
|
||||||
}
|
}
|
||||||
@ -48,8 +43,10 @@ func (p *BaiduPhoto) Request(furl string, method string, callback base.ReqCallba
|
|||||||
return nil, fmt.Errorf("you have joined album")
|
return nil, fmt.Errorf("you have joined album")
|
||||||
case 50820:
|
case 50820:
|
||||||
return nil, fmt.Errorf("no shared albums found")
|
return nil, fmt.Errorf("no shared albums found")
|
||||||
|
case 50100:
|
||||||
|
return nil, fmt.Errorf("illegal title, only supports 50 characters")
|
||||||
case -6:
|
case -6:
|
||||||
if err = p.refreshToken(); err != nil {
|
if err = d.refreshToken(); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
default:
|
default:
|
||||||
@ -58,15 +55,15 @@ func (p *BaiduPhoto) Request(furl string, method string, callback base.ReqCallba
|
|||||||
return res.Body(), nil
|
return res.Body(), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (p *BaiduPhoto) refreshToken() error {
|
func (d *BaiduPhoto) refreshToken() error {
|
||||||
u := "https://openapi.baidu.com/oauth/2.0/token"
|
u := "https://openapi.baidu.com/oauth/2.0/token"
|
||||||
var resp base.TokenResp
|
var resp base.TokenResp
|
||||||
var e TokenErrResp
|
var e TokenErrResp
|
||||||
_, err := base.RestyClient.R().SetResult(&resp).SetError(&e).SetQueryParams(map[string]string{
|
_, err := base.RestyClient.R().SetResult(&resp).SetError(&e).SetQueryParams(map[string]string{
|
||||||
"grant_type": "refresh_token",
|
"grant_type": "refresh_token",
|
||||||
"refresh_token": p.RefreshToken,
|
"refresh_token": d.RefreshToken,
|
||||||
"client_id": p.ClientID,
|
"client_id": d.ClientID,
|
||||||
"client_secret": p.ClientSecret,
|
"client_secret": d.ClientSecret,
|
||||||
}).Get(u)
|
}).Get(u)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
@ -77,25 +74,25 @@ func (p *BaiduPhoto) refreshToken() error {
|
|||||||
if resp.RefreshToken == "" {
|
if resp.RefreshToken == "" {
|
||||||
return errs.EmptyToken
|
return errs.EmptyToken
|
||||||
}
|
}
|
||||||
p.AccessToken, p.RefreshToken = resp.AccessToken, resp.RefreshToken
|
d.AccessToken, d.RefreshToken = resp.AccessToken, resp.RefreshToken
|
||||||
op.MustSaveDriverStorage(p)
|
op.MustSaveDriverStorage(d)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (p *BaiduPhoto) Get(furl string, callback base.ReqCallback, resp interface{}) ([]byte, error) {
|
func (d *BaiduPhoto) Get(furl string, callback base.ReqCallback, resp interface{}) ([]byte, error) {
|
||||||
return p.Request(furl, http.MethodGet, callback, resp)
|
return d.Request(furl, http.MethodGet, callback, resp)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (p *BaiduPhoto) Post(furl string, callback base.ReqCallback, resp interface{}) ([]byte, error) {
|
func (d *BaiduPhoto) Post(furl string, callback base.ReqCallback, resp interface{}) ([]byte, error) {
|
||||||
return p.Request(furl, http.MethodPost, callback, resp)
|
return d.Request(furl, http.MethodPost, callback, resp)
|
||||||
}
|
}
|
||||||
|
|
||||||
// 获取所有文件
|
// 获取所有文件
|
||||||
func (p *BaiduPhoto) GetAllFile(ctx context.Context) (files []File, err error) {
|
func (d *BaiduPhoto) GetAllFile(ctx context.Context) (files []File, err error) {
|
||||||
var cursor string
|
var cursor string
|
||||||
for {
|
for {
|
||||||
var resp FileListResp
|
var resp FileListResp
|
||||||
_, err = p.Get(FILE_API_URL_V1+"/list", func(r *resty.Request) {
|
_, err = d.Get(FILE_API_URL_V1+"/list", func(r *resty.Request) {
|
||||||
r.SetContext(ctx)
|
r.SetContext(ctx)
|
||||||
r.SetQueryParams(map[string]string{
|
r.SetQueryParams(map[string]string{
|
||||||
"need_thumbnail": "1",
|
"need_thumbnail": "1",
|
||||||
@ -116,22 +113,22 @@ func (p *BaiduPhoto) GetAllFile(ctx context.Context) (files []File, err error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 删除根文件
|
// 删除根文件
|
||||||
func (p *BaiduPhoto) DeleteFile(ctx context.Context, fileIDs ...string) error {
|
func (d *BaiduPhoto) DeleteFile(ctx context.Context, file *File) error {
|
||||||
_, err := p.Get(FILE_API_URL_V1+"/delete", func(req *resty.Request) {
|
_, err := d.Get(FILE_API_URL_V1+"/delete", func(req *resty.Request) {
|
||||||
req.SetContext(ctx)
|
req.SetContext(ctx)
|
||||||
req.SetQueryParams(map[string]string{
|
req.SetQueryParams(map[string]string{
|
||||||
"fsid_list": fmt.Sprintf("[%s]", strings.Join(fileIDs, ",")),
|
"fsid_list": fmt.Sprintf("[%d]", file.Fsid),
|
||||||
})
|
})
|
||||||
}, nil)
|
}, nil)
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
// 获取所有相册
|
// 获取所有相册
|
||||||
func (p *BaiduPhoto) GetAllAlbum(ctx context.Context) (albums []Album, err error) {
|
func (d *BaiduPhoto) GetAllAlbum(ctx context.Context) (albums []Album, err error) {
|
||||||
var cursor string
|
var cursor string
|
||||||
for {
|
for {
|
||||||
var resp AlbumListResp
|
var resp AlbumListResp
|
||||||
_, err = p.Get(ALBUM_API_URL+"/list", func(r *resty.Request) {
|
_, err = d.Get(ALBUM_API_URL+"/list", func(r *resty.Request) {
|
||||||
r.SetContext(ctx)
|
r.SetContext(ctx)
|
||||||
r.SetQueryParams(map[string]string{
|
r.SetQueryParams(map[string]string{
|
||||||
"need_amount": "1",
|
"need_amount": "1",
|
||||||
@ -156,14 +153,14 @@ func (p *BaiduPhoto) GetAllAlbum(ctx context.Context) (albums []Album, err error
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 获取相册中所有文件
|
// 获取相册中所有文件
|
||||||
func (p *BaiduPhoto) GetAllAlbumFile(ctx context.Context, albumID, passwd string) (files []AlbumFile, err error) {
|
func (d *BaiduPhoto) GetAllAlbumFile(ctx context.Context, album *Album, passwd string) (files []AlbumFile, err error) {
|
||||||
var cursor string
|
var cursor string
|
||||||
for {
|
for {
|
||||||
var resp AlbumFileListResp
|
var resp AlbumFileListResp
|
||||||
_, err = p.Get(ALBUM_API_URL+"/listfile", func(r *resty.Request) {
|
_, err = d.Get(ALBUM_API_URL+"/listfile", func(r *resty.Request) {
|
||||||
r.SetContext(ctx)
|
r.SetContext(ctx)
|
||||||
r.SetQueryParams(map[string]string{
|
r.SetQueryParams(map[string]string{
|
||||||
"album_id": albumID,
|
"album_id": album.AlbumID,
|
||||||
"need_amount": "1",
|
"need_amount": "1",
|
||||||
"limit": "1000",
|
"limit": "1000",
|
||||||
"passwd": passwd,
|
"passwd": passwd,
|
||||||
@ -187,45 +184,45 @@ func (p *BaiduPhoto) GetAllAlbumFile(ctx context.Context, albumID, passwd string
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 创建相册
|
// 创建相册
|
||||||
func (p *BaiduPhoto) CreateAlbum(ctx context.Context, name string) error {
|
func (d *BaiduPhoto) CreateAlbum(ctx context.Context, name string) (*Album, error) {
|
||||||
if !checkName(name) {
|
var resp JoinOrCreateAlbumResp
|
||||||
return ErrNotSupportName
|
_, err := d.Post(ALBUM_API_URL+"/create", func(r *resty.Request) {
|
||||||
}
|
r.SetContext(ctx).SetResult(&resp)
|
||||||
_, err := p.Post(ALBUM_API_URL+"/create", func(r *resty.Request) {
|
|
||||||
r.SetContext(ctx)
|
|
||||||
r.SetQueryParams(map[string]string{
|
r.SetQueryParams(map[string]string{
|
||||||
"title": name,
|
"title": name,
|
||||||
"tid": getTid(),
|
"tid": getTid(),
|
||||||
"source": "0",
|
"source": "0",
|
||||||
})
|
})
|
||||||
}, nil)
|
}, nil)
|
||||||
return err
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return d.GetAlbumDetail(ctx, resp.AlbumID)
|
||||||
}
|
}
|
||||||
|
|
||||||
// 相册改名
|
// 相册改名
|
||||||
func (p *BaiduPhoto) SetAlbumName(ctx context.Context, albumID, tID, name string) error {
|
func (d *BaiduPhoto) SetAlbumName(ctx context.Context, album *Album, name string) (*Album, error) {
|
||||||
if !checkName(name) {
|
_, err := d.Post(ALBUM_API_URL+"/settitle", func(r *resty.Request) {
|
||||||
return ErrNotSupportName
|
|
||||||
}
|
|
||||||
|
|
||||||
_, err := p.Post(ALBUM_API_URL+"/settitle", func(r *resty.Request) {
|
|
||||||
r.SetContext(ctx)
|
r.SetContext(ctx)
|
||||||
r.SetFormData(map[string]string{
|
r.SetFormData(map[string]string{
|
||||||
"title": name,
|
"title": name,
|
||||||
"album_id": albumID,
|
"album_id": album.AlbumID,
|
||||||
"tid": tID,
|
"tid": fmt.Sprint(album.Tid),
|
||||||
})
|
})
|
||||||
}, nil)
|
}, nil)
|
||||||
return err
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return renameAlbum(album, name), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// 删除相册
|
// 删除相册
|
||||||
func (p *BaiduPhoto) DeleteAlbum(ctx context.Context, albumID, tID string) error {
|
func (d *BaiduPhoto) DeleteAlbum(ctx context.Context, album *Album) error {
|
||||||
_, err := p.Post(ALBUM_API_URL+"/delete", func(r *resty.Request) {
|
_, err := d.Post(ALBUM_API_URL+"/delete", func(r *resty.Request) {
|
||||||
r.SetContext(ctx)
|
r.SetContext(ctx)
|
||||||
r.SetFormData(map[string]string{
|
r.SetFormData(map[string]string{
|
||||||
"album_id": albumID,
|
"album_id": album.AlbumID,
|
||||||
"tid": tID,
|
"tid": fmt.Sprint(album.Tid),
|
||||||
"delete_origin_image": "0", // 是否删除原图 0 不删除 1 删除
|
"delete_origin_image": "0", // 是否删除原图 0 不删除 1 删除
|
||||||
})
|
})
|
||||||
}, nil)
|
}, nil)
|
||||||
@ -233,13 +230,13 @@ func (p *BaiduPhoto) DeleteAlbum(ctx context.Context, albumID, tID string) error
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 删除相册文件
|
// 删除相册文件
|
||||||
func (p *BaiduPhoto) DeleteAlbumFile(ctx context.Context, albumID, tID string, fileIDs ...string) error {
|
func (d *BaiduPhoto) DeleteAlbumFile(ctx context.Context, file *AlbumFile) error {
|
||||||
_, err := p.Post(ALBUM_API_URL+"/delfile", func(r *resty.Request) {
|
_, err := d.Post(ALBUM_API_URL+"/delfile", func(r *resty.Request) {
|
||||||
r.SetContext(ctx)
|
r.SetContext(ctx)
|
||||||
r.SetFormData(map[string]string{
|
r.SetFormData(map[string]string{
|
||||||
"album_id": albumID,
|
"album_id": fmt.Sprint(file.AlbumID),
|
||||||
"tid": tID,
|
"tid": fmt.Sprint(file.Tid),
|
||||||
"list": fsidsFormat(fileIDs...),
|
"list": fmt.Sprintf(`[{"fsid":%d,"uk":%d}]`, file.Fsid, file.Uk),
|
||||||
"del_origin": "0", // 是否删除原图 0 不删除 1 删除
|
"del_origin": "0", // 是否删除原图 0 不删除 1 删除
|
||||||
})
|
})
|
||||||
}, nil)
|
}, nil)
|
||||||
@ -247,41 +244,44 @@ func (p *BaiduPhoto) DeleteAlbumFile(ctx context.Context, albumID, tID string, f
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 增加相册文件
|
// 增加相册文件
|
||||||
func (p *BaiduPhoto) AddAlbumFile(ctx context.Context, albumID, tID string, fileIDs ...string) error {
|
func (d *BaiduPhoto) AddAlbumFile(ctx context.Context, album *Album, file *File) (*AlbumFile, error) {
|
||||||
_, err := p.Get(ALBUM_API_URL+"/addfile", func(r *resty.Request) {
|
_, err := d.Get(ALBUM_API_URL+"/addfile", func(r *resty.Request) {
|
||||||
r.SetContext(ctx)
|
r.SetContext(ctx)
|
||||||
r.SetQueryParams(map[string]string{
|
r.SetQueryParams(map[string]string{
|
||||||
"album_id": albumID,
|
"album_id": fmt.Sprint(album.AlbumID),
|
||||||
"tid": tID,
|
"tid": fmt.Sprint(album.Tid),
|
||||||
"list": fsidsFormatNotUk(fileIDs...),
|
"list": fsidsFormatNotUk(file.Fsid),
|
||||||
})
|
})
|
||||||
}, nil)
|
}, nil)
|
||||||
return err
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return moveFileToAlbumFile(file, album, d.Uk), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// 保存相册文件为根文件
|
// 保存相册文件为根文件
|
||||||
func (p *BaiduPhoto) CopyAlbumFile(ctx context.Context, albumID, tID, uk string, fileID ...string) (*CopyFile, error) {
|
func (d *BaiduPhoto) CopyAlbumFile(ctx context.Context, file *AlbumFile) (*File, error) {
|
||||||
var resp CopyFileResp
|
var resp CopyFileResp
|
||||||
_, err := p.Post(ALBUM_API_URL+"/copyfile", func(r *resty.Request) {
|
_, err := d.Post(ALBUM_API_URL+"/copyfile", func(r *resty.Request) {
|
||||||
r.SetContext(ctx)
|
r.SetContext(ctx)
|
||||||
r.SetFormData(map[string]string{
|
r.SetFormData(map[string]string{
|
||||||
"album_id": albumID,
|
"album_id": file.AlbumID,
|
||||||
"tid": tID,
|
"tid": fmt.Sprint(file.Tid),
|
||||||
"uk": uk,
|
"uk": fmt.Sprint(file.Uk),
|
||||||
"list": fsidsFormatNotUk(fileID...),
|
"list": fsidsFormatNotUk(file.Fsid),
|
||||||
})
|
})
|
||||||
r.SetResult(&resp)
|
r.SetResult(&resp)
|
||||||
}, nil)
|
}, nil)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
return &resp.List[0], nil
|
return copyFile(file, &resp.List[0]), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// 加入相册
|
// 加入相册
|
||||||
func (p *BaiduPhoto) JoinAlbum(ctx context.Context, code string) error {
|
func (d *BaiduPhoto) JoinAlbum(ctx context.Context, code string) (*Album, error) {
|
||||||
var resp InviteResp
|
var resp InviteResp
|
||||||
_, err := p.Get(ALBUM_API_URL+"/querypcode", func(req *resty.Request) {
|
_, err := d.Get(ALBUM_API_URL+"/querypcode", func(req *resty.Request) {
|
||||||
req.SetContext(ctx)
|
req.SetContext(ctx)
|
||||||
req.SetQueryParams(map[string]string{
|
req.SetQueryParams(map[string]string{
|
||||||
"pcode": code,
|
"pcode": code,
|
||||||
@ -289,18 +289,37 @@ func (p *BaiduPhoto) JoinAlbum(ctx context.Context, code string) error {
|
|||||||
})
|
})
|
||||||
}, &resp)
|
}, &resp)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return nil, err
|
||||||
}
|
}
|
||||||
_, err = p.Get(ALBUM_API_URL+"/join", func(req *resty.Request) {
|
var resp2 JoinOrCreateAlbumResp
|
||||||
|
_, err = d.Get(ALBUM_API_URL+"/join", func(req *resty.Request) {
|
||||||
req.SetContext(ctx)
|
req.SetContext(ctx)
|
||||||
req.SetQueryParams(map[string]string{
|
req.SetQueryParams(map[string]string{
|
||||||
"invite_code": resp.Pdata.InviteCode,
|
"invite_code": resp.Pdata.InviteCode,
|
||||||
})
|
})
|
||||||
}, nil)
|
}, &resp2)
|
||||||
return err
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return d.GetAlbumDetail(ctx, resp2.AlbumID)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (d *BaiduPhoto) linkAlbum(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
|
// 获取相册详细信息
|
||||||
|
func (d *BaiduPhoto) GetAlbumDetail(ctx context.Context, albumID string) (*Album, error) {
|
||||||
|
var album Album
|
||||||
|
_, err := d.Get(ALBUM_API_URL+"/detail", func(req *resty.Request) {
|
||||||
|
req.SetContext(ctx).SetResult(&album)
|
||||||
|
req.SetQueryParams(map[string]string{
|
||||||
|
"album_id": albumID,
|
||||||
|
})
|
||||||
|
}, &album)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return &album, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *BaiduPhoto) linkAlbum(ctx context.Context, file *AlbumFile, args model.LinkArgs) (*model.Link, error) {
|
||||||
headers := map[string]string{
|
headers := map[string]string{
|
||||||
"User-Agent": base.UserAgent,
|
"User-Agent": base.UserAgent,
|
||||||
}
|
}
|
||||||
@ -311,16 +330,15 @@ func (d *BaiduPhoto) linkAlbum(ctx context.Context, file model.Obj, args model.L
|
|||||||
headers["X-Forwarded-For"] = args.IP
|
headers["X-Forwarded-For"] = args.IP
|
||||||
}
|
}
|
||||||
|
|
||||||
e := splitID(file.GetID())
|
|
||||||
res, err := base.NoRedirectClient.R().
|
res, err := base.NoRedirectClient.R().
|
||||||
SetContext(ctx).
|
SetContext(ctx).
|
||||||
SetHeaders(headers).
|
SetHeaders(headers).
|
||||||
SetQueryParams(map[string]string{
|
SetQueryParams(map[string]string{
|
||||||
"access_token": d.AccessToken,
|
"access_token": d.AccessToken,
|
||||||
"fsid": e[0],
|
"fsid": fmt.Sprint(file.Fsid),
|
||||||
"album_id": e[1],
|
"album_id": file.AlbumID,
|
||||||
"tid": e[2],
|
"tid": fmt.Sprint(file.Tid),
|
||||||
"uk": e[3],
|
"uk": fmt.Sprint(file.Uk),
|
||||||
}).
|
}).
|
||||||
Head(ALBUM_API_URL + "/download")
|
Head(ALBUM_API_URL + "/download")
|
||||||
|
|
||||||
@ -328,19 +346,17 @@ func (d *BaiduPhoto) linkAlbum(ctx context.Context, file model.Obj, args model.L
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
//exp := 8 * time.Hour
|
|
||||||
link := &model.Link{
|
link := &model.Link{
|
||||||
URL: res.Header().Get("location"),
|
URL: res.Header().Get("location"),
|
||||||
Header: http.Header{
|
Header: http.Header{
|
||||||
"User-Agent": []string{headers["User-Agent"]},
|
"User-Agent": []string{headers["User-Agent"]},
|
||||||
"Referer": []string{"https://photo.baidu.com/"},
|
"Referer": []string{"https://photo.baidu.com/"},
|
||||||
},
|
},
|
||||||
//Expiration: &exp,
|
|
||||||
}
|
}
|
||||||
return link, nil
|
return link, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (d *BaiduPhoto) linkFile(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
|
func (d *BaiduPhoto) linkFile(ctx context.Context, file *File, args model.LinkArgs) (*model.Link, error) {
|
||||||
headers := map[string]string{
|
headers := map[string]string{
|
||||||
"User-Agent": base.UserAgent,
|
"User-Agent": base.UserAgent,
|
||||||
}
|
}
|
||||||
@ -358,21 +374,31 @@ func (d *BaiduPhoto) linkFile(ctx context.Context, file model.Obj, args model.Li
|
|||||||
r.SetContext(ctx)
|
r.SetContext(ctx)
|
||||||
r.SetHeaders(headers)
|
r.SetHeaders(headers)
|
||||||
r.SetQueryParams(map[string]string{
|
r.SetQueryParams(map[string]string{
|
||||||
"fsid": splitID(file.GetID())[0],
|
"fsid": fmt.Sprint(file.Fsid),
|
||||||
})
|
})
|
||||||
}, &downloadUrl)
|
}, &downloadUrl)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
//exp := 8 * time.Hour
|
|
||||||
link := &model.Link{
|
link := &model.Link{
|
||||||
URL: downloadUrl.Dlink,
|
URL: downloadUrl.Dlink,
|
||||||
Header: http.Header{
|
Header: http.Header{
|
||||||
"User-Agent": []string{headers["User-Agent"]},
|
"User-Agent": []string{headers["User-Agent"]},
|
||||||
"Referer": []string{"https://photo.baidu.com/"},
|
"Referer": []string{"https://photo.baidu.com/"},
|
||||||
},
|
},
|
||||||
//Expiration: &exp,
|
|
||||||
}
|
}
|
||||||
return link, nil
|
return link, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 获取uk
|
||||||
|
func (d *BaiduPhoto) uInfo() (*UInfo, error) {
|
||||||
|
var info UInfo
|
||||||
|
_, err := d.Get(USER_API_URL+"/getuinfo", func(req *resty.Request) {
|
||||||
|
|
||||||
|
}, &info)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return &info, nil
|
||||||
|
}
|
||||||
|
251
drivers/baidu_share/driver.go
Normal file
251
drivers/baidu_share/driver.go
Normal file
@ -0,0 +1,251 @@
|
|||||||
|
package baidu_share
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
|
"io"
|
||||||
|
"net/http"
|
||||||
|
"net/url"
|
||||||
|
"path"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/alist-org/alist/v3/internal/driver"
|
||||||
|
"github.com/alist-org/alist/v3/internal/errs"
|
||||||
|
"github.com/alist-org/alist/v3/internal/model"
|
||||||
|
"github.com/go-resty/resty/v2"
|
||||||
|
)
|
||||||
|
|
||||||
|
type BaiduShare struct {
|
||||||
|
model.Storage
|
||||||
|
Addition
|
||||||
|
client *resty.Client
|
||||||
|
info struct {
|
||||||
|
Root string
|
||||||
|
Seckey string
|
||||||
|
Shareid string
|
||||||
|
Uk string
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *BaiduShare) Config() driver.Config {
|
||||||
|
return config
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *BaiduShare) GetAddition() driver.Additional {
|
||||||
|
return &d.Addition
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *BaiduShare) Init(ctx context.Context) error {
|
||||||
|
// TODO login / refresh token
|
||||||
|
//op.MustSaveDriverStorage(d)
|
||||||
|
d.client = resty.New().
|
||||||
|
SetBaseURL("https://pan.baidu.com").
|
||||||
|
SetHeader("User-Agent", "netdisk").
|
||||||
|
SetCookie(&http.Cookie{Name: "BDUSS", Value: d.BDUSS}).
|
||||||
|
SetCookie(&http.Cookie{Name: "ndut_fmt"})
|
||||||
|
respJson := struct {
|
||||||
|
Errno int64 `json:"errno"`
|
||||||
|
Data struct {
|
||||||
|
List [1]struct {
|
||||||
|
Path string `json:"path"`
|
||||||
|
} `json:"list"`
|
||||||
|
Uk json.Number `json:"uk"`
|
||||||
|
Shareid json.Number `json:"shareid"`
|
||||||
|
Seckey string `json:"seckey"`
|
||||||
|
} `json:"data"`
|
||||||
|
}{}
|
||||||
|
resp, err := d.client.R().
|
||||||
|
SetBody(url.Values{
|
||||||
|
"pwd": {d.Pwd},
|
||||||
|
"root": {"1"},
|
||||||
|
"shorturl": {d.Surl},
|
||||||
|
}.Encode()).
|
||||||
|
SetResult(&respJson).
|
||||||
|
Post("share/wxlist?channel=weixin&version=2.2.2&clienttype=25&web=1")
|
||||||
|
if err == nil {
|
||||||
|
if resp.IsSuccess() && respJson.Errno == 0 {
|
||||||
|
d.info.Root = path.Dir(respJson.Data.List[0].Path)
|
||||||
|
d.info.Seckey = respJson.Data.Seckey
|
||||||
|
d.info.Shareid = respJson.Data.Shareid.String()
|
||||||
|
d.info.Uk = respJson.Data.Uk.String()
|
||||||
|
} else {
|
||||||
|
err = fmt.Errorf(" %s; %s; ", resp.Status(), resp.Body())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *BaiduShare) Drop(ctx context.Context) error {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *BaiduShare) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([]model.Obj, error) {
|
||||||
|
// TODO return the files list, required
|
||||||
|
reqDir := dir.GetPath()
|
||||||
|
isRoot := "0"
|
||||||
|
if reqDir == d.RootFolderPath {
|
||||||
|
reqDir = path.Join(d.info.Root, reqDir)
|
||||||
|
}
|
||||||
|
if reqDir == d.info.Root {
|
||||||
|
isRoot = "1"
|
||||||
|
}
|
||||||
|
objs := []model.Obj{}
|
||||||
|
var err error
|
||||||
|
var page uint64 = 1
|
||||||
|
more := true
|
||||||
|
for more && err == nil {
|
||||||
|
respJson := struct {
|
||||||
|
Errno int64 `json:"errno"`
|
||||||
|
Data struct {
|
||||||
|
More bool `json:"has_more"`
|
||||||
|
List []struct {
|
||||||
|
Fsid json.Number `json:"fs_id"`
|
||||||
|
Isdir json.Number `json:"isdir"`
|
||||||
|
Path string `json:"path"`
|
||||||
|
Name string `json:"server_filename"`
|
||||||
|
Mtime json.Number `json:"server_mtime"`
|
||||||
|
Size json.Number `json:"size"`
|
||||||
|
} `json:"list"`
|
||||||
|
} `json:"data"`
|
||||||
|
}{}
|
||||||
|
resp, e := d.client.R().
|
||||||
|
SetBody(url.Values{
|
||||||
|
"dir": {reqDir},
|
||||||
|
"num": {"1000"},
|
||||||
|
"order": {"time"},
|
||||||
|
"page": {fmt.Sprint(page)},
|
||||||
|
"pwd": {d.Pwd},
|
||||||
|
"root": {isRoot},
|
||||||
|
"shorturl": {d.Surl},
|
||||||
|
}.Encode()).
|
||||||
|
SetResult(&respJson).
|
||||||
|
Post("share/wxlist?channel=weixin&version=2.2.2&clienttype=25&web=1")
|
||||||
|
err = e
|
||||||
|
if err == nil {
|
||||||
|
if resp.IsSuccess() && respJson.Errno == 0 {
|
||||||
|
page++
|
||||||
|
more = respJson.Data.More
|
||||||
|
for _, v := range respJson.Data.List {
|
||||||
|
size, _ := v.Size.Int64()
|
||||||
|
mtime, _ := v.Mtime.Int64()
|
||||||
|
objs = append(objs, &model.Object{
|
||||||
|
ID: v.Fsid.String(),
|
||||||
|
Path: v.Path,
|
||||||
|
Name: v.Name,
|
||||||
|
Size: size,
|
||||||
|
Modified: time.Unix(mtime, 0),
|
||||||
|
IsFolder: v.Isdir.String() == "1",
|
||||||
|
})
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
err = fmt.Errorf(" %s; %s; ", resp.Status(), resp.Body())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return objs, err
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *BaiduShare) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
|
||||||
|
// TODO return link of file, required
|
||||||
|
link := model.Link{Header: d.client.Header}
|
||||||
|
sign := ""
|
||||||
|
stamp := ""
|
||||||
|
signJson := struct {
|
||||||
|
Errno int64 `json:"errno"`
|
||||||
|
Data struct {
|
||||||
|
Stamp json.Number `json:"timestamp"`
|
||||||
|
Sign string `json:"sign"`
|
||||||
|
} `json:"data"`
|
||||||
|
}{}
|
||||||
|
resp, err := d.client.R().
|
||||||
|
SetQueryParam("surl", d.Surl).
|
||||||
|
SetResult(&signJson).
|
||||||
|
Get("share/tplconfig?fields=sign,timestamp&channel=chunlei&web=1&app_id=250528&clienttype=0")
|
||||||
|
if err == nil {
|
||||||
|
if resp.IsSuccess() && signJson.Errno == 0 {
|
||||||
|
stamp = signJson.Data.Stamp.String()
|
||||||
|
sign = signJson.Data.Sign
|
||||||
|
} else {
|
||||||
|
err = fmt.Errorf(" %s; %s; ", resp.Status(), resp.Body())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if err == nil {
|
||||||
|
respJson := struct {
|
||||||
|
Errno int64 `json:"errno"`
|
||||||
|
List [1]struct {
|
||||||
|
Dlink string `json:"dlink"`
|
||||||
|
} `json:"list"`
|
||||||
|
}{}
|
||||||
|
resp, err = d.client.R().
|
||||||
|
SetQueryParam("sign", sign).
|
||||||
|
SetQueryParam("timestamp", stamp).
|
||||||
|
SetBody(url.Values{
|
||||||
|
"encrypt": {"0"},
|
||||||
|
"extra": {fmt.Sprintf(`{"sekey":"%s"}`, d.info.Seckey)},
|
||||||
|
"fid_list": {fmt.Sprintf("[%s]", file.GetID())},
|
||||||
|
"primaryid": {d.info.Shareid},
|
||||||
|
"product": {"share"},
|
||||||
|
"type": {"nolimit"},
|
||||||
|
"uk": {d.info.Uk},
|
||||||
|
}.Encode()).
|
||||||
|
SetResult(&respJson).
|
||||||
|
Post("api/sharedownload?app_id=250528&channel=chunlei&clienttype=12&web=1")
|
||||||
|
if err == nil {
|
||||||
|
if resp.IsSuccess() && respJson.Errno == 0 && respJson.List[0].Dlink != "" {
|
||||||
|
link.URL = respJson.List[0].Dlink
|
||||||
|
} else {
|
||||||
|
err = fmt.Errorf(" %s; %s; ", resp.Status(), resp.Body())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if err == nil {
|
||||||
|
resp, err = d.client.R().
|
||||||
|
SetDoNotParseResponse(true).
|
||||||
|
Get(link.URL)
|
||||||
|
if err == nil {
|
||||||
|
defer resp.RawBody().Close()
|
||||||
|
if resp.IsError() {
|
||||||
|
byt, _ := io.ReadAll(resp.RawBody())
|
||||||
|
err = fmt.Errorf(" %s; %s; ", resp.Status(), byt)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return &link, err
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *BaiduShare) MakeDir(ctx context.Context, parentDir model.Obj, dirName string) error {
|
||||||
|
// TODO create folder, optional
|
||||||
|
return errs.NotSupport
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *BaiduShare) Move(ctx context.Context, srcObj, dstDir model.Obj) error {
|
||||||
|
// TODO move obj, optional
|
||||||
|
return errs.NotSupport
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *BaiduShare) Rename(ctx context.Context, srcObj model.Obj, newName string) error {
|
||||||
|
// TODO rename obj, optional
|
||||||
|
return errs.NotSupport
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *BaiduShare) Copy(ctx context.Context, srcObj, dstDir model.Obj) error {
|
||||||
|
// TODO copy obj, optional
|
||||||
|
return errs.NotSupport
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *BaiduShare) Remove(ctx context.Context, obj model.Obj) error {
|
||||||
|
// TODO remove obj, optional
|
||||||
|
return errs.NotSupport
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *BaiduShare) Put(ctx context.Context, dstDir model.Obj, stream model.FileStreamer, up driver.UpdateProgress) error {
|
||||||
|
// TODO upload file, optional
|
||||||
|
return errs.NotSupport
|
||||||
|
}
|
||||||
|
|
||||||
|
//func (d *Template) Other(ctx context.Context, args model.OtherArgs) (interface{}, error) {
|
||||||
|
// return nil, errs.NotSupport
|
||||||
|
//}
|
||||||
|
|
||||||
|
var _ driver.Driver = (*BaiduShare)(nil)
|
37
drivers/baidu_share/meta.go
Normal file
37
drivers/baidu_share/meta.go
Normal file
@ -0,0 +1,37 @@
|
|||||||
|
package baidu_share
|
||||||
|
|
||||||
|
import (
|
||||||
|
"github.com/alist-org/alist/v3/internal/driver"
|
||||||
|
"github.com/alist-org/alist/v3/internal/op"
|
||||||
|
)
|
||||||
|
|
||||||
|
type Addition struct {
|
||||||
|
// Usually one of two
|
||||||
|
driver.RootPath
|
||||||
|
// driver.RootID
|
||||||
|
// define other
|
||||||
|
// Field string `json:"field" type:"select" required:"true" options:"a,b,c" default:"a"`
|
||||||
|
Surl string `json:"surl"`
|
||||||
|
Pwd string `json:"pwd"`
|
||||||
|
BDUSS string `json:"BDUSS"`
|
||||||
|
}
|
||||||
|
|
||||||
|
var config = driver.Config{
|
||||||
|
Name: "BaiduShare",
|
||||||
|
LocalSort: true,
|
||||||
|
OnlyLocal: false,
|
||||||
|
OnlyProxy: false,
|
||||||
|
NoCache: false,
|
||||||
|
NoUpload: true,
|
||||||
|
NeedMs: false,
|
||||||
|
DefaultRoot: "/",
|
||||||
|
CheckStatus: false,
|
||||||
|
Alert: "",
|
||||||
|
NoOverwriteUpload: false,
|
||||||
|
}
|
||||||
|
|
||||||
|
func init() {
|
||||||
|
op.RegisterDriver(func() driver.Driver {
|
||||||
|
return &BaiduShare{}
|
||||||
|
})
|
||||||
|
}
|
1
drivers/baidu_share/types.go
Normal file
1
drivers/baidu_share/types.go
Normal file
@ -0,0 +1 @@
|
|||||||
|
package baidu_share
|
3
drivers/baidu_share/util.go
Normal file
3
drivers/baidu_share/util.go
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
package baidu_share
|
||||||
|
|
||||||
|
// do others that not defined in Driver interface
|
@ -1,30 +1,49 @@
|
|||||||
package base
|
package base
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"crypto/tls"
|
||||||
"net/http"
|
"net/http"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
|
"github.com/alist-org/alist/v3/internal/conf"
|
||||||
"github.com/go-resty/resty/v2"
|
"github.com/go-resty/resty/v2"
|
||||||
)
|
)
|
||||||
|
|
||||||
var NoRedirectClient *resty.Client
|
var (
|
||||||
var RestyClient = NewRestyClient()
|
NoRedirectClient *resty.Client
|
||||||
var HttpClient = &http.Client{}
|
RestyClient *resty.Client
|
||||||
|
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 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 * 30
|
var DefaultTimeout = time.Second * 30
|
||||||
|
|
||||||
func init() {
|
func InitClient() {
|
||||||
NoRedirectClient = resty.New().SetRedirectPolicy(
|
NoRedirectClient = resty.New().SetRedirectPolicy(
|
||||||
resty.RedirectPolicyFunc(func(req *http.Request, via []*http.Request) error {
|
resty.RedirectPolicyFunc(func(req *http.Request, via []*http.Request) error {
|
||||||
return http.ErrUseLastResponse
|
return http.ErrUseLastResponse
|
||||||
}),
|
}),
|
||||||
)
|
).SetTLSClientConfig(&tls.Config{InsecureSkipVerify: conf.Conf.TlsInsecureSkipVerify})
|
||||||
NoRedirectClient.SetHeader("user-agent", UserAgent)
|
NoRedirectClient.SetHeader("user-agent", UserAgent)
|
||||||
|
|
||||||
|
RestyClient = NewRestyClient()
|
||||||
|
HttpClient = NewHttpClient()
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewRestyClient() *resty.Client {
|
func NewRestyClient() *resty.Client {
|
||||||
return resty.New().
|
client := resty.New().
|
||||||
SetHeader("user-agent", UserAgent).
|
SetHeader("user-agent", UserAgent).
|
||||||
SetRetryCount(3).
|
SetRetryCount(3).
|
||||||
SetTimeout(DefaultTimeout)
|
SetTimeout(DefaultTimeout).
|
||||||
|
SetTLSClientConfig(&tls.Config{InsecureSkipVerify: conf.Conf.TlsInsecureSkipVerify})
|
||||||
|
return client
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewHttpClient() *http.Client {
|
||||||
|
return &http.Client{
|
||||||
|
Timeout: time.Hour * 48,
|
||||||
|
Transport: &http.Transport{
|
||||||
|
Proxy: http.ProxyFromEnvironment,
|
||||||
|
TLSClientConfig: &tls.Config{InsecureSkipVerify: conf.Conf.TlsInsecureSkipVerify},
|
||||||
|
},
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
30
drivers/base/util.go
Normal file
30
drivers/base/util.go
Normal file
@ -0,0 +1,30 @@
|
|||||||
|
package base
|
||||||
|
|
||||||
|
import (
|
||||||
|
"io"
|
||||||
|
"net/http"
|
||||||
|
"strconv"
|
||||||
|
|
||||||
|
"github.com/alist-org/alist/v3/internal/model"
|
||||||
|
"github.com/alist-org/alist/v3/pkg/http_range"
|
||||||
|
"github.com/alist-org/alist/v3/pkg/utils"
|
||||||
|
)
|
||||||
|
|
||||||
|
func HandleRange(link *model.Link, file io.ReadSeekCloser, header http.Header, size int64) {
|
||||||
|
if header.Get("Range") != "" {
|
||||||
|
r, err := http_range.ParseRange(header.Get("Range"), size)
|
||||||
|
if err == nil && len(r) > 0 {
|
||||||
|
_, err := file.Seek(r[0].Start, io.SeekStart)
|
||||||
|
if err == nil {
|
||||||
|
link.Data = utils.NewLimitReadCloser(file, func() error {
|
||||||
|
return file.Close()
|
||||||
|
}, r[0].Length)
|
||||||
|
link.Status = http.StatusPartialContent
|
||||||
|
link.Header = http.Header{
|
||||||
|
"Content-Range": []string{r[0].ContentRange(size)},
|
||||||
|
"Content-Length": []string{strconv.FormatInt(r[0].Length, 10)},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
189
drivers/cloudreve/driver.go
Normal file
189
drivers/cloudreve/driver.go
Normal file
@ -0,0 +1,189 @@
|
|||||||
|
package cloudreve
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"io"
|
||||||
|
"net/http"
|
||||||
|
"strconv"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"github.com/alist-org/alist/v3/drivers/base"
|
||||||
|
"github.com/alist-org/alist/v3/internal/driver"
|
||||||
|
"github.com/alist-org/alist/v3/internal/model"
|
||||||
|
"github.com/alist-org/alist/v3/pkg/utils"
|
||||||
|
"github.com/go-resty/resty/v2"
|
||||||
|
)
|
||||||
|
|
||||||
|
type Cloudreve struct {
|
||||||
|
model.Storage
|
||||||
|
Addition
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *Cloudreve) Config() driver.Config {
|
||||||
|
return config
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *Cloudreve) GetAddition() driver.Additional {
|
||||||
|
return &d.Addition
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *Cloudreve) Init(ctx context.Context) error {
|
||||||
|
if d.Cookie != "" {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
// removing trailing slash
|
||||||
|
d.Address = strings.TrimSuffix(d.Address, "/")
|
||||||
|
return d.login()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *Cloudreve) Drop(ctx context.Context) error {
|
||||||
|
d.Cookie = ""
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *Cloudreve) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([]model.Obj, error) {
|
||||||
|
var r DirectoryResp
|
||||||
|
err := d.request(http.MethodGet, "/directory"+dir.GetPath(), nil, &r)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return utils.SliceConvert(r.Objects, func(src Object) (model.Obj, error) {
|
||||||
|
return objectToObj(src), nil
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *Cloudreve) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
|
||||||
|
var dUrl string
|
||||||
|
err := d.request(http.MethodPut, "/file/download/"+file.GetID(), nil, &dUrl)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return &model.Link{
|
||||||
|
URL: dUrl,
|
||||||
|
}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *Cloudreve) MakeDir(ctx context.Context, parentDir model.Obj, dirName string) error {
|
||||||
|
return d.request(http.MethodPut, "/directory", func(req *resty.Request) {
|
||||||
|
req.SetBody(base.Json{
|
||||||
|
"path": parentDir.GetPath() + "/" + dirName,
|
||||||
|
})
|
||||||
|
}, nil)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *Cloudreve) Move(ctx context.Context, srcObj, dstDir model.Obj) error {
|
||||||
|
body := base.Json{
|
||||||
|
"action": "move",
|
||||||
|
"src_dir": srcObj.GetPath(),
|
||||||
|
"dst": dstDir.GetPath(),
|
||||||
|
"src": convertSrc(srcObj),
|
||||||
|
}
|
||||||
|
return d.request(http.MethodPatch, "/object", func(req *resty.Request) {
|
||||||
|
req.SetBody(body)
|
||||||
|
}, nil)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *Cloudreve) Rename(ctx context.Context, srcObj model.Obj, newName string) error {
|
||||||
|
body := base.Json{
|
||||||
|
"action": "rename",
|
||||||
|
"new_name": newName,
|
||||||
|
"src": convertSrc(srcObj),
|
||||||
|
}
|
||||||
|
return d.request(http.MethodPatch, "/object/rename", func(req *resty.Request) {
|
||||||
|
req.SetBody(body)
|
||||||
|
}, nil)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *Cloudreve) Copy(ctx context.Context, srcObj, dstDir model.Obj) error {
|
||||||
|
body := base.Json{
|
||||||
|
"src_dir": srcObj.GetPath(),
|
||||||
|
"dst": dstDir.GetPath(),
|
||||||
|
"src": convertSrc(srcObj),
|
||||||
|
}
|
||||||
|
return d.request(http.MethodPost, "/object/copy", func(req *resty.Request) {
|
||||||
|
req.SetBody(body)
|
||||||
|
}, nil)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *Cloudreve) Remove(ctx context.Context, obj model.Obj) error {
|
||||||
|
body := convertSrc(obj)
|
||||||
|
err := d.request(http.MethodDelete, "/object", func(req *resty.Request) {
|
||||||
|
req.SetBody(body)
|
||||||
|
}, nil)
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *Cloudreve) Put(ctx context.Context, dstDir model.Obj, stream model.FileStreamer, up driver.UpdateProgress) error {
|
||||||
|
if stream.GetReadCloser() == http.NoBody {
|
||||||
|
return d.create(ctx, dstDir, stream)
|
||||||
|
}
|
||||||
|
var r DirectoryResp
|
||||||
|
err := d.request(http.MethodGet, "/directory"+dstDir.GetPath(), nil, &r)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
uploadBody := base.Json{
|
||||||
|
"path": dstDir.GetPath(),
|
||||||
|
"size": stream.GetSize(),
|
||||||
|
"name": stream.GetName(),
|
||||||
|
"policy_id": r.Policy.Id,
|
||||||
|
"last_modified": stream.ModTime().Unix(),
|
||||||
|
}
|
||||||
|
var u UploadInfo
|
||||||
|
err = d.request(http.MethodPut, "/file/upload", func(req *resty.Request) {
|
||||||
|
req.SetBody(uploadBody)
|
||||||
|
}, &u)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
var chunkSize = u.ChunkSize
|
||||||
|
var buf []byte
|
||||||
|
var chunk int
|
||||||
|
for {
|
||||||
|
var n int
|
||||||
|
buf = make([]byte, chunkSize)
|
||||||
|
n, err = io.ReadAtLeast(stream, buf, chunkSize)
|
||||||
|
if err != nil && err != io.ErrUnexpectedEOF {
|
||||||
|
if err == io.EOF {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
if n == 0 {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
buf = buf[:n]
|
||||||
|
err = d.request(http.MethodPost, "/file/upload/"+u.SessionID+"/"+strconv.Itoa(chunk), func(req *resty.Request) {
|
||||||
|
req.SetHeader("Content-Type", "application/octet-stream")
|
||||||
|
req.SetHeader("Content-Length", strconv.Itoa(n))
|
||||||
|
req.SetBody(buf)
|
||||||
|
}, nil)
|
||||||
|
if err != nil {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
chunk++
|
||||||
|
|
||||||
|
}
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *Cloudreve) create(ctx context.Context, dir model.Obj, file model.Obj) error {
|
||||||
|
body := base.Json{"path": dir.GetPath() + "/" + file.GetName()}
|
||||||
|
if file.IsDir() {
|
||||||
|
err := d.request(http.MethodPut, "directory", func(req *resty.Request) {
|
||||||
|
req.SetBody(body)
|
||||||
|
}, nil)
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return d.request(http.MethodPost, "/file/create", func(req *resty.Request) {
|
||||||
|
req.SetBody(body)
|
||||||
|
}, nil)
|
||||||
|
}
|
||||||
|
|
||||||
|
//func (d *Cloudreve) Other(ctx context.Context, args model.OtherArgs) (interface{}, error) {
|
||||||
|
// return nil, errs.NotSupport
|
||||||
|
//}
|
||||||
|
|
||||||
|
var _ driver.Driver = (*Cloudreve)(nil)
|
27
drivers/cloudreve/meta.go
Normal file
27
drivers/cloudreve/meta.go
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
package cloudreve
|
||||||
|
|
||||||
|
import (
|
||||||
|
"github.com/alist-org/alist/v3/internal/driver"
|
||||||
|
"github.com/alist-org/alist/v3/internal/op"
|
||||||
|
)
|
||||||
|
|
||||||
|
type Addition struct {
|
||||||
|
// Usually one of two
|
||||||
|
driver.RootPath
|
||||||
|
// define other
|
||||||
|
Address string `json:"address" required:"true"`
|
||||||
|
Username string `json:"username"`
|
||||||
|
Password string `json:"password"`
|
||||||
|
Cookie string `json:"cookie"`
|
||||||
|
}
|
||||||
|
|
||||||
|
var config = driver.Config{
|
||||||
|
Name: "Cloudreve",
|
||||||
|
DefaultRoot: "/",
|
||||||
|
}
|
||||||
|
|
||||||
|
func init() {
|
||||||
|
op.RegisterDriver(func() driver.Driver {
|
||||||
|
return &Cloudreve{}
|
||||||
|
})
|
||||||
|
}
|
60
drivers/cloudreve/types.go
Normal file
60
drivers/cloudreve/types.go
Normal file
@ -0,0 +1,60 @@
|
|||||||
|
package cloudreve
|
||||||
|
|
||||||
|
import (
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/alist-org/alist/v3/internal/model"
|
||||||
|
)
|
||||||
|
|
||||||
|
type Resp struct {
|
||||||
|
Code int `json:"code"`
|
||||||
|
Msg string `json:"msg"`
|
||||||
|
Data interface{} `json:"data"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type Policy struct {
|
||||||
|
Id string `json:"id"`
|
||||||
|
Name string `json:"name"`
|
||||||
|
Type string `json:"type"`
|
||||||
|
MaxSize int `json:"max_size"`
|
||||||
|
FileType []string `json:"file_type"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type UploadInfo struct {
|
||||||
|
SessionID string `json:"sessionID"`
|
||||||
|
ChunkSize int `json:"chunkSize"`
|
||||||
|
Expires int `json:"expires"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type DirectoryResp struct {
|
||||||
|
Parent string `json:"parent"`
|
||||||
|
Objects []Object `json:"objects"`
|
||||||
|
Policy Policy `json:"policy"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type Object struct {
|
||||||
|
Id string `json:"id"`
|
||||||
|
Name string `json:"name"`
|
||||||
|
Path string `json:"path"`
|
||||||
|
Pic string `json:"pic"`
|
||||||
|
Size int `json:"size"`
|
||||||
|
Type string `json:"type"`
|
||||||
|
Date time.Time `json:"date"`
|
||||||
|
CreateDate time.Time `json:"create_date"`
|
||||||
|
SourceEnabled bool `json:"source_enabled"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func objectToObj(f Object) *model.Object {
|
||||||
|
return &model.Object{
|
||||||
|
ID: f.Id,
|
||||||
|
Name: f.Name,
|
||||||
|
Size: int64(f.Size),
|
||||||
|
Modified: f.Date,
|
||||||
|
IsFolder: f.Type == "dir",
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
type Config struct {
|
||||||
|
LoginCaptcha bool `json:"loginCaptcha"`
|
||||||
|
CaptchaType string `json:"captcha_type"`
|
||||||
|
}
|
148
drivers/cloudreve/util.go
Normal file
148
drivers/cloudreve/util.go
Normal file
@ -0,0 +1,148 @@
|
|||||||
|
package cloudreve
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/base64"
|
||||||
|
"errors"
|
||||||
|
"net/http"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"github.com/alist-org/alist/v3/drivers/base"
|
||||||
|
"github.com/alist-org/alist/v3/internal/conf"
|
||||||
|
"github.com/alist-org/alist/v3/internal/model"
|
||||||
|
"github.com/alist-org/alist/v3/internal/setting"
|
||||||
|
"github.com/alist-org/alist/v3/pkg/cookie"
|
||||||
|
"github.com/go-resty/resty/v2"
|
||||||
|
json "github.com/json-iterator/go"
|
||||||
|
jsoniter "github.com/json-iterator/go"
|
||||||
|
)
|
||||||
|
|
||||||
|
// do others that not defined in Driver interface
|
||||||
|
|
||||||
|
const loginPath = "/user/session"
|
||||||
|
|
||||||
|
func (d *Cloudreve) request(method string, path string, callback base.ReqCallback, out interface{}) error {
|
||||||
|
u := d.Address + "/api/v3" + path
|
||||||
|
req := base.RestyClient.R()
|
||||||
|
req.SetHeaders(map[string]string{
|
||||||
|
"Cookie": "cloudreve-session=" + d.Cookie,
|
||||||
|
"Accept": "application/json, text/plain, */*",
|
||||||
|
"User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36",
|
||||||
|
})
|
||||||
|
|
||||||
|
var r Resp
|
||||||
|
|
||||||
|
req.SetResult(&r)
|
||||||
|
|
||||||
|
if callback != nil {
|
||||||
|
callback(req)
|
||||||
|
}
|
||||||
|
|
||||||
|
resp, err := req.Execute(method, u)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if !resp.IsSuccess() {
|
||||||
|
return errors.New(resp.String())
|
||||||
|
}
|
||||||
|
|
||||||
|
if r.Code != 0 {
|
||||||
|
|
||||||
|
// 刷新 cookie
|
||||||
|
if r.Code == http.StatusUnauthorized && path != loginPath {
|
||||||
|
if d.Username != "" && d.Password != "" {
|
||||||
|
err = d.login()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return d.request(method, path, callback, out)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return errors.New(r.Msg)
|
||||||
|
}
|
||||||
|
sess := cookie.GetCookie(resp.Cookies(), "cloudreve-session")
|
||||||
|
if sess != nil {
|
||||||
|
d.Cookie = sess.Value
|
||||||
|
}
|
||||||
|
if out != nil && r.Data != nil {
|
||||||
|
var marshal []byte
|
||||||
|
marshal, err = json.Marshal(r.Data)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
err = json.Unmarshal(marshal, out)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *Cloudreve) login() error {
|
||||||
|
var siteConfig Config
|
||||||
|
err := d.request(http.MethodGet, "/site/config", nil, &siteConfig)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
for i := 0; i < 5; i++ {
|
||||||
|
err = d.doLogin(siteConfig.LoginCaptcha)
|
||||||
|
if err == nil {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
if err != nil && err.Error() != "CAPTCHA not match." {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *Cloudreve) doLogin(needCaptcha bool) error {
|
||||||
|
var captchaCode string
|
||||||
|
var err error
|
||||||
|
if needCaptcha {
|
||||||
|
var captcha string
|
||||||
|
err = d.request(http.MethodGet, "/site/captcha", nil, &captcha)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if len(captcha) == 0 {
|
||||||
|
return errors.New("can not get captcha")
|
||||||
|
}
|
||||||
|
i := strings.Index(captcha, ",")
|
||||||
|
dec := base64.NewDecoder(base64.StdEncoding, strings.NewReader(captcha[i+1:]))
|
||||||
|
vRes, err := base.RestyClient.R().SetMultipartField(
|
||||||
|
"image", "validateCode.png", "image/png", dec).
|
||||||
|
Post(setting.GetStr(conf.OcrApi))
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if jsoniter.Get(vRes.Body(), "status").ToInt() != 200 {
|
||||||
|
return errors.New("ocr error:" + jsoniter.Get(vRes.Body(), "msg").ToString())
|
||||||
|
}
|
||||||
|
captchaCode = jsoniter.Get(vRes.Body(), "result").ToString()
|
||||||
|
}
|
||||||
|
var resp Resp
|
||||||
|
err = d.request(http.MethodPost, loginPath, func(req *resty.Request) {
|
||||||
|
req.SetBody(base.Json{
|
||||||
|
"username": d.Addition.Username,
|
||||||
|
"Password": d.Addition.Password,
|
||||||
|
"captchaCode": captchaCode,
|
||||||
|
})
|
||||||
|
}, &resp)
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
func convertSrc(obj model.Obj) map[string]interface{} {
|
||||||
|
m := make(map[string]interface{})
|
||||||
|
var dirs []string
|
||||||
|
var items []string
|
||||||
|
if obj.IsDir() {
|
||||||
|
dirs = append(dirs, obj.GetID())
|
||||||
|
} else {
|
||||||
|
items = append(items, obj.GetID())
|
||||||
|
}
|
||||||
|
m["dirs"] = dirs
|
||||||
|
m["items"] = items
|
||||||
|
return m
|
||||||
|
}
|
@ -4,6 +4,7 @@ import (
|
|||||||
"context"
|
"context"
|
||||||
stdpath "path"
|
stdpath "path"
|
||||||
|
|
||||||
|
"github.com/alist-org/alist/v3/drivers/base"
|
||||||
"github.com/alist-org/alist/v3/internal/driver"
|
"github.com/alist-org/alist/v3/internal/driver"
|
||||||
"github.com/alist-org/alist/v3/internal/errs"
|
"github.com/alist-org/alist/v3/internal/errs"
|
||||||
"github.com/alist-org/alist/v3/internal/model"
|
"github.com/alist-org/alist/v3/internal/model"
|
||||||
@ -44,8 +45,7 @@ func (d *FTP) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([]m
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
res := make([]model.Obj, 0)
|
res := make([]model.Obj, 0)
|
||||||
for i, _ := range entries {
|
for _, entry := range entries {
|
||||||
entry := entries[i]
|
|
||||||
if entry.Name == "." || entry.Name == ".." {
|
if entry.Name == "." || entry.Name == ".." {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
@ -64,13 +64,13 @@ func (d *FTP) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*m
|
|||||||
if err := d.login(); err != nil {
|
if err := d.login(); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
resp, err := d.conn.Retr(file.GetPath())
|
|
||||||
if err != nil {
|
r := NewFTPFileReader(d.conn, file.GetPath())
|
||||||
return nil, err
|
link := &model.Link{
|
||||||
|
Data: r,
|
||||||
}
|
}
|
||||||
return &model.Link{
|
base.HandleRange(link, r, args.Header, file.GetSize())
|
||||||
Data: resp,
|
return link, nil
|
||||||
}, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (d *FTP) MakeDir(ctx context.Context, parentDir model.Obj, dirName string) error {
|
func (d *FTP) MakeDir(ctx context.Context, parentDir model.Obj, dirName string) error {
|
||||||
|
@ -1,6 +1,13 @@
|
|||||||
package ftp
|
package ftp
|
||||||
|
|
||||||
import "github.com/jlaffaye/ftp"
|
import (
|
||||||
|
"io"
|
||||||
|
"os"
|
||||||
|
"sync"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/jlaffaye/ftp"
|
||||||
|
)
|
||||||
|
|
||||||
// do others that not defined in Driver interface
|
// do others that not defined in Driver interface
|
||||||
|
|
||||||
@ -11,7 +18,7 @@ func (d *FTP) login() error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
conn, err := ftp.Dial(d.Address)
|
conn, err := ftp.Dial(d.Address, ftp.DialWithShutTimeout(10*time.Second))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@ -22,3 +29,81 @@ func (d *FTP) login() error {
|
|||||||
d.conn = conn
|
d.conn = conn
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// An FTP file reader that implements io.ReadSeekCloser for seeking.
|
||||||
|
type FTPFileReader struct {
|
||||||
|
conn *ftp.ServerConn
|
||||||
|
resp *ftp.Response
|
||||||
|
offset int64
|
||||||
|
mu sync.Mutex
|
||||||
|
path string
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewFTPFileReader(conn *ftp.ServerConn, path string) *FTPFileReader {
|
||||||
|
return &FTPFileReader{
|
||||||
|
conn: conn,
|
||||||
|
path: path,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r *FTPFileReader) Read(buf []byte) (n int, err error) {
|
||||||
|
r.mu.Lock()
|
||||||
|
defer r.mu.Unlock()
|
||||||
|
|
||||||
|
if r.resp == nil {
|
||||||
|
r.resp, err = r.conn.RetrFrom(r.path, uint64(r.offset))
|
||||||
|
if err != nil {
|
||||||
|
return 0, err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
n, err = r.resp.Read(buf)
|
||||||
|
r.offset += int64(n)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r *FTPFileReader) Seek(offset int64, whence int) (int64, error) {
|
||||||
|
r.mu.Lock()
|
||||||
|
defer r.mu.Unlock()
|
||||||
|
|
||||||
|
oldOffset := r.offset
|
||||||
|
var newOffset int64
|
||||||
|
switch whence {
|
||||||
|
case io.SeekStart:
|
||||||
|
newOffset = offset
|
||||||
|
case io.SeekCurrent:
|
||||||
|
newOffset = oldOffset + offset
|
||||||
|
case io.SeekEnd:
|
||||||
|
size, err := r.conn.FileSize(r.path)
|
||||||
|
if err != nil {
|
||||||
|
return oldOffset, err
|
||||||
|
}
|
||||||
|
newOffset = offset + int64(size)
|
||||||
|
default:
|
||||||
|
return -1, os.ErrInvalid
|
||||||
|
}
|
||||||
|
|
||||||
|
if newOffset < 0 {
|
||||||
|
// offset out of range
|
||||||
|
return oldOffset, os.ErrInvalid
|
||||||
|
}
|
||||||
|
if newOffset == oldOffset {
|
||||||
|
// offset not changed, so return directly
|
||||||
|
return oldOffset, nil
|
||||||
|
}
|
||||||
|
r.offset = newOffset
|
||||||
|
|
||||||
|
if r.resp != nil {
|
||||||
|
// close the existing ftp data connection, otherwise the next read will be blocked
|
||||||
|
_ = r.resp.Close() // we do not care about whether it returns an error
|
||||||
|
r.resp = nil
|
||||||
|
}
|
||||||
|
return newOffset, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r *FTPFileReader) Close() error {
|
||||||
|
if r.resp != nil {
|
||||||
|
return r.resp.Close()
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
@ -17,7 +17,9 @@ import (
|
|||||||
type GoogleDrive struct {
|
type GoogleDrive struct {
|
||||||
model.Storage
|
model.Storage
|
||||||
Addition
|
Addition
|
||||||
AccessToken string
|
AccessToken string
|
||||||
|
ServiceAccountFile int
|
||||||
|
ServiceAccountFileList []string
|
||||||
}
|
}
|
||||||
|
|
||||||
func (d *GoogleDrive) Config() driver.Config {
|
func (d *GoogleDrive) Config() driver.Config {
|
||||||
@ -56,7 +58,7 @@ func (d *GoogleDrive) Link(ctx context.Context, file model.Obj, args model.LinkA
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
link := model.Link{
|
link := model.Link{
|
||||||
URL: url + "&alt=media",
|
URL: url + "&alt=media&acknowledgeAbuse=true",
|
||||||
Header: http.Header{
|
Header: http.Header{
|
||||||
"Authorization": []string{"Bearer " + d.AccessToken},
|
"Authorization": []string{"Bearer " + d.AccessToken},
|
||||||
},
|
},
|
||||||
|
@ -2,21 +2,134 @@ package google_drive
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
|
"crypto/x509"
|
||||||
|
"encoding/pem"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
|
"io/ioutil"
|
||||||
"net/http"
|
"net/http"
|
||||||
|
"os"
|
||||||
|
"regexp"
|
||||||
"strconv"
|
"strconv"
|
||||||
|
"time"
|
||||||
|
|
||||||
"github.com/alist-org/alist/v3/drivers/base"
|
"github.com/alist-org/alist/v3/drivers/base"
|
||||||
"github.com/alist-org/alist/v3/internal/model"
|
"github.com/alist-org/alist/v3/internal/model"
|
||||||
"github.com/alist-org/alist/v3/pkg/utils"
|
"github.com/alist-org/alist/v3/pkg/utils"
|
||||||
"github.com/go-resty/resty/v2"
|
"github.com/go-resty/resty/v2"
|
||||||
|
"github.com/golang-jwt/jwt/v4"
|
||||||
log "github.com/sirupsen/logrus"
|
log "github.com/sirupsen/logrus"
|
||||||
)
|
)
|
||||||
|
|
||||||
// do others that not defined in Driver interface
|
// do others that not defined in Driver interface
|
||||||
|
|
||||||
|
type googleDriveServiceAccount struct {
|
||||||
|
//Type string `json:"type"`
|
||||||
|
//ProjectID string `json:"project_id"`
|
||||||
|
//PrivateKeyID string `json:"private_key_id"`
|
||||||
|
PrivateKey string `json:"private_key"`
|
||||||
|
ClientEMail string `json:"client_email"`
|
||||||
|
//ClientID string `json:"client_id"`
|
||||||
|
//AuthURI string `json:"auth_uri"`
|
||||||
|
TokenURI string `json:"token_uri"`
|
||||||
|
//AuthProviderX509CertURL string `json:"auth_provider_x509_cert_url"`
|
||||||
|
//ClientX509CertURL string `json:"client_x509_cert_url"`
|
||||||
|
}
|
||||||
|
|
||||||
func (d *GoogleDrive) refreshToken() error {
|
func (d *GoogleDrive) refreshToken() error {
|
||||||
|
// googleDriveServiceAccountFile gdsaFile
|
||||||
|
gdsaFile, gdsaFileErr := os.Stat(d.RefreshToken)
|
||||||
|
if gdsaFileErr == nil {
|
||||||
|
gdsaFileThis := d.RefreshToken
|
||||||
|
if gdsaFile.IsDir() {
|
||||||
|
if len(d.ServiceAccountFileList) <= 0 {
|
||||||
|
gdsaReadDir, gdsaDirErr := ioutil.ReadDir(d.RefreshToken)
|
||||||
|
if gdsaDirErr != nil {
|
||||||
|
log.Error("read dir fail")
|
||||||
|
return gdsaDirErr
|
||||||
|
}
|
||||||
|
var gdsaFileList []string
|
||||||
|
for _, fi := range gdsaReadDir {
|
||||||
|
if !fi.IsDir() {
|
||||||
|
match, _ := regexp.MatchString("^.*\\.json$", fi.Name())
|
||||||
|
if !match {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
gdsaDirText := d.RefreshToken
|
||||||
|
if d.RefreshToken[len(d.RefreshToken)-1:] != "/" {
|
||||||
|
gdsaDirText = d.RefreshToken + "/"
|
||||||
|
}
|
||||||
|
gdsaFileList = append(gdsaFileList, gdsaDirText+fi.Name())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
d.ServiceAccountFileList = gdsaFileList
|
||||||
|
gdsaFileThis = d.ServiceAccountFileList[d.ServiceAccountFile]
|
||||||
|
d.ServiceAccountFile++
|
||||||
|
} else {
|
||||||
|
if d.ServiceAccountFile < len(d.ServiceAccountFileList) {
|
||||||
|
d.ServiceAccountFile++
|
||||||
|
} else {
|
||||||
|
d.ServiceAccountFile = 0
|
||||||
|
}
|
||||||
|
gdsaFileThis = d.ServiceAccountFileList[d.ServiceAccountFile]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
gdsaFileThisContent, err := ioutil.ReadFile(gdsaFileThis)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
// Now let's unmarshal the data into `payload`
|
||||||
|
var jsonData googleDriveServiceAccount
|
||||||
|
err = utils.Json.Unmarshal(gdsaFileThisContent, &jsonData)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
gdsaScope := "https://www.googleapis.com/auth/drive https://www.googleapis.com/auth/drive.appdata https://www.googleapis.com/auth/drive.file https://www.googleapis.com/auth/drive.metadata https://www.googleapis.com/auth/drive.metadata.readonly https://www.googleapis.com/auth/drive.readonly https://www.googleapis.com/auth/drive.scripts"
|
||||||
|
|
||||||
|
timeNow := time.Now()
|
||||||
|
var timeStart int64 = timeNow.Unix()
|
||||||
|
var timeEnd int64 = timeNow.Add(time.Minute * 60).Unix()
|
||||||
|
|
||||||
|
// load private key from string
|
||||||
|
privateKeyPem, _ := pem.Decode([]byte(jsonData.PrivateKey))
|
||||||
|
privateKey, _ := x509.ParsePKCS8PrivateKey(privateKeyPem.Bytes)
|
||||||
|
|
||||||
|
jwtToken := jwt.NewWithClaims(jwt.SigningMethodRS256,
|
||||||
|
jwt.MapClaims{
|
||||||
|
"iss": jsonData.ClientEMail,
|
||||||
|
"scope": gdsaScope,
|
||||||
|
"aud": jsonData.TokenURI,
|
||||||
|
"exp": timeEnd,
|
||||||
|
"iat": timeStart,
|
||||||
|
})
|
||||||
|
assertion, err := jwtToken.SignedString(privateKey)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
var resp base.TokenResp
|
||||||
|
var e TokenError
|
||||||
|
res, err := base.RestyClient.R().SetResult(&resp).SetError(&e).
|
||||||
|
SetFormData(map[string]string{
|
||||||
|
"assertion": assertion,
|
||||||
|
"grant_type": "urn:ietf:params:oauth:grant-type:jwt-bearer",
|
||||||
|
}).Post(jsonData.TokenURI)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
log.Debug(res.String())
|
||||||
|
if e.Error != "" {
|
||||||
|
return fmt.Errorf(e.Error)
|
||||||
|
}
|
||||||
|
d.AccessToken = resp.AccessToken
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
if gdsaFileErr != nil && os.IsExist(gdsaFileErr) {
|
||||||
|
return gdsaFileErr
|
||||||
|
}
|
||||||
url := "https://www.googleapis.com/oauth2/v4/token"
|
url := "https://www.googleapis.com/oauth2/v4/token"
|
||||||
var resp base.TokenResp
|
var resp base.TokenResp
|
||||||
var e TokenError
|
var e TokenError
|
||||||
|
128
drivers/ipfs_api/driver.go
Normal file
128
drivers/ipfs_api/driver.go
Normal file
@ -0,0 +1,128 @@
|
|||||||
|
package ipfs
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"fmt"
|
||||||
|
"net/url"
|
||||||
|
stdpath "path"
|
||||||
|
"path/filepath"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"github.com/alist-org/alist/v3/internal/driver"
|
||||||
|
"github.com/alist-org/alist/v3/internal/model"
|
||||||
|
shell "github.com/ipfs/go-ipfs-api"
|
||||||
|
)
|
||||||
|
|
||||||
|
type IPFS struct {
|
||||||
|
model.Storage
|
||||||
|
Addition
|
||||||
|
sh *shell.Shell
|
||||||
|
gateURL *url.URL
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *IPFS) Config() driver.Config {
|
||||||
|
return config
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *IPFS) GetAddition() driver.Additional {
|
||||||
|
return &d.Addition
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *IPFS) Init(ctx context.Context) error {
|
||||||
|
d.sh = shell.NewShell(d.Endpoint)
|
||||||
|
gateURL, err := url.Parse(d.Gateway)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
d.gateURL = gateURL
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *IPFS) Drop(ctx context.Context) error {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *IPFS) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([]model.Obj, error) {
|
||||||
|
path := dir.GetPath()
|
||||||
|
if path[len(path):] != "/" {
|
||||||
|
path += "/"
|
||||||
|
}
|
||||||
|
|
||||||
|
path_cid, err := d.sh.FilesStat(ctx, path)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
dirs, err := d.sh.List(path_cid.Hash)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
objlist := []model.Obj{}
|
||||||
|
for _, file := range dirs {
|
||||||
|
gateurl := *d.gateURL
|
||||||
|
gateurl.Path = "ipfs/" + file.Hash
|
||||||
|
gateurl.RawQuery = "filename=" + file.Name
|
||||||
|
objlist = append(objlist, &model.ObjectURL{
|
||||||
|
Object: model.Object{ID: file.Hash, Name: file.Name, Size: int64(file.Size), IsFolder: file.Type == 1},
|
||||||
|
Url: model.Url{Url: gateurl.String()},
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
return objlist, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *IPFS) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
|
||||||
|
link := d.Gateway + "/ipfs/" + file.GetID() + "/?filename=" + file.GetName()
|
||||||
|
return &model.Link{URL: link}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *IPFS) MakeDir(ctx context.Context, parentDir model.Obj, dirName string) error {
|
||||||
|
path := parentDir.GetPath()
|
||||||
|
if path[len(path):] != "/" {
|
||||||
|
path += "/"
|
||||||
|
}
|
||||||
|
return d.sh.FilesMkdir(ctx, path+dirName)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *IPFS) Move(ctx context.Context, srcObj, dstDir model.Obj) error {
|
||||||
|
return d.sh.FilesMv(ctx, srcObj.GetPath(), dstDir.GetPath())
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *IPFS) Rename(ctx context.Context, srcObj model.Obj, newName string) error {
|
||||||
|
newFileName := filepath.Dir(srcObj.GetPath()) + "/" + newName
|
||||||
|
return d.sh.FilesMv(ctx, srcObj.GetPath(), strings.ReplaceAll(newFileName, "\\", "/"))
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *IPFS) Copy(ctx context.Context, srcObj, dstDir model.Obj) error {
|
||||||
|
// TODO copy obj, optional
|
||||||
|
fmt.Println(srcObj.GetPath())
|
||||||
|
fmt.Println(dstDir.GetPath())
|
||||||
|
newFileName := dstDir.GetPath() + "/" + filepath.Base(srcObj.GetPath())
|
||||||
|
fmt.Println(newFileName)
|
||||||
|
return d.sh.FilesCp(ctx, srcObj.GetPath(), strings.ReplaceAll(newFileName, "\\", "/"))
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *IPFS) Remove(ctx context.Context, obj model.Obj) error {
|
||||||
|
// TODO remove obj, optional
|
||||||
|
return d.sh.FilesRm(ctx, obj.GetPath(), true)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *IPFS) Put(ctx context.Context, dstDir model.Obj, stream model.FileStreamer, up driver.UpdateProgress) error {
|
||||||
|
// TODO upload file, optional
|
||||||
|
_, err := d.sh.Add(stream, ToFiles(stdpath.Join(dstDir.GetPath(), stream.GetName())))
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
func ToFiles(dstDir string) shell.AddOpts {
|
||||||
|
return func(rb *shell.RequestBuilder) error {
|
||||||
|
rb.Option("to-files", dstDir)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
//func (d *Template) Other(ctx context.Context, args model.OtherArgs) (interface{}, error) {
|
||||||
|
// return nil, errs.NotSupport
|
||||||
|
//}
|
||||||
|
|
||||||
|
var _ driver.Driver = (*IPFS)(nil)
|
25
drivers/ipfs_api/meta.go
Normal file
25
drivers/ipfs_api/meta.go
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
package ipfs
|
||||||
|
|
||||||
|
import (
|
||||||
|
"github.com/alist-org/alist/v3/internal/driver"
|
||||||
|
"github.com/alist-org/alist/v3/internal/op"
|
||||||
|
)
|
||||||
|
|
||||||
|
type Addition struct {
|
||||||
|
// Usually one of two
|
||||||
|
driver.RootPath
|
||||||
|
Endpoint string `json:"endpoint" default:"http://127.0.0.1:5001"`
|
||||||
|
Gateway string `json:"gateway" default:"https://ipfs.io"`
|
||||||
|
}
|
||||||
|
|
||||||
|
var config = driver.Config{
|
||||||
|
Name: "IPFS API",
|
||||||
|
DefaultRoot: "/",
|
||||||
|
LocalSort: true,
|
||||||
|
}
|
||||||
|
|
||||||
|
func init() {
|
||||||
|
op.RegisterDriver(func() driver.Driver {
|
||||||
|
return &IPFS{}
|
||||||
|
})
|
||||||
|
}
|
@ -2,21 +2,23 @@ package lanzou
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
|
"fmt"
|
||||||
"net/http"
|
"net/http"
|
||||||
"time"
|
"regexp"
|
||||||
|
|
||||||
"github.com/alist-org/alist/v3/drivers/base"
|
"github.com/alist-org/alist/v3/drivers/base"
|
||||||
"github.com/alist-org/alist/v3/internal/driver"
|
"github.com/alist-org/alist/v3/internal/driver"
|
||||||
"github.com/alist-org/alist/v3/internal/errs"
|
"github.com/alist-org/alist/v3/internal/errs"
|
||||||
"github.com/alist-org/alist/v3/internal/model"
|
"github.com/alist-org/alist/v3/internal/model"
|
||||||
|
"github.com/alist-org/alist/v3/pkg/utils"
|
||||||
"github.com/go-resty/resty/v2"
|
"github.com/go-resty/resty/v2"
|
||||||
)
|
)
|
||||||
|
|
||||||
var upClient = base.NewRestyClient().SetTimeout(120 * time.Second)
|
|
||||||
|
|
||||||
type LanZou struct {
|
type LanZou struct {
|
||||||
Addition
|
Addition
|
||||||
model.Storage
|
model.Storage
|
||||||
|
uid string
|
||||||
|
vei string
|
||||||
}
|
}
|
||||||
|
|
||||||
func (d *LanZou) Config() driver.Config {
|
func (d *LanZou) Config() driver.Config {
|
||||||
@ -27,55 +29,98 @@ func (d *LanZou) GetAddition() driver.Additional {
|
|||||||
return &d.Addition
|
return &d.Addition
|
||||||
}
|
}
|
||||||
|
|
||||||
func (d *LanZou) Init(ctx context.Context) error {
|
func (d *LanZou) Init(ctx context.Context) (err error) {
|
||||||
if d.IsCookie() {
|
if d.IsCookie() {
|
||||||
if d.RootFolderID == "" {
|
if d.RootFolderID == "" {
|
||||||
d.RootFolderID = "-1"
|
d.RootFolderID = "-1"
|
||||||
}
|
}
|
||||||
|
ylogin := regexp.MustCompile("ylogin=(.*?);").FindStringSubmatch(d.Cookie)
|
||||||
|
if len(ylogin) < 2 {
|
||||||
|
return fmt.Errorf("cookie does not contain ylogin")
|
||||||
|
}
|
||||||
|
d.uid = ylogin[1]
|
||||||
|
d.vei, err = d.getVei()
|
||||||
}
|
}
|
||||||
return nil
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
func (d *LanZou) Drop(ctx context.Context) error {
|
func (d *LanZou) Drop(ctx context.Context) error {
|
||||||
|
d.uid = ""
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// 获取的大小和时间不准确
|
// 获取的大小和时间不准确
|
||||||
func (d *LanZou) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([]model.Obj, error) {
|
func (d *LanZou) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([]model.Obj, error) {
|
||||||
if d.IsCookie() {
|
if d.IsCookie() {
|
||||||
return d.GetFiles(ctx, dir.GetID())
|
return d.GetAllFiles(dir.GetID())
|
||||||
} else {
|
} else {
|
||||||
return d.GetFileOrFolderByShareUrl(ctx, dir.GetID(), d.SharePassword)
|
return d.GetFileOrFolderByShareUrl(dir.GetID(), d.SharePassword)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (d *LanZou) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
|
func (d *LanZou) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
|
||||||
downID := file.GetID()
|
var (
|
||||||
pwd := d.SharePassword
|
err error
|
||||||
if d.IsCookie() {
|
dfile *FileOrFolderByShareUrl
|
||||||
share, err := d.getFileShareUrlByID(ctx, file.GetID())
|
)
|
||||||
|
switch file := file.(type) {
|
||||||
|
case *FileOrFolder:
|
||||||
|
// 先获取分享链接
|
||||||
|
sfile := file.GetShareInfo()
|
||||||
|
if sfile == nil {
|
||||||
|
sfile, err = d.getFileShareUrlByID(file.GetID())
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
file.SetShareInfo(sfile)
|
||||||
|
}
|
||||||
|
|
||||||
|
// 然后获取下载链接
|
||||||
|
dfile, err = d.GetFilesByShareUrl(sfile.FID, sfile.Pwd)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
downID = share.FID
|
// 修复文件大小
|
||||||
pwd = share.Pwd
|
if d.RepairFileInfo && !file.repairFlag {
|
||||||
|
size, time := d.getFileRealInfo(dfile.Url)
|
||||||
|
if size != nil {
|
||||||
|
file.size = size
|
||||||
|
file.repairFlag = true
|
||||||
|
}
|
||||||
|
if file.time != nil {
|
||||||
|
file.time = time
|
||||||
|
}
|
||||||
|
}
|
||||||
|
case *FileOrFolderByShareUrl:
|
||||||
|
dfile, err = d.GetFilesByShareUrl(file.GetID(), file.Pwd)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
// 修复文件大小
|
||||||
|
if d.RepairFileInfo && !file.repairFlag {
|
||||||
|
size, time := d.getFileRealInfo(dfile.Url)
|
||||||
|
if size != nil {
|
||||||
|
file.size = size
|
||||||
|
file.repairFlag = true
|
||||||
|
}
|
||||||
|
if file.time != nil {
|
||||||
|
file.time = time
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
fileInfo, err := d.getFilesByShareUrl(ctx, downID, pwd, nil)
|
exp := GetExpirationTime(dfile.Url)
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
return &model.Link{
|
return &model.Link{
|
||||||
URL: fileInfo.Url,
|
URL: dfile.Url,
|
||||||
Header: http.Header{
|
Header: http.Header{
|
||||||
"User-Agent": []string{base.UserAgent},
|
"User-Agent": []string{base.UserAgent},
|
||||||
},
|
},
|
||||||
|
Expiration: &exp,
|
||||||
}, nil
|
}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (d *LanZou) MakeDir(ctx context.Context, parentDir model.Obj, dirName string) error {
|
func (d *LanZou) MakeDir(ctx context.Context, parentDir model.Obj, dirName string) (model.Obj, error) {
|
||||||
if d.IsCookie() {
|
if d.IsCookie() {
|
||||||
_, err := d.post(d.BaseUrl+"/doupload.php", func(req *resty.Request) {
|
data, err := d.doupload(func(req *resty.Request) {
|
||||||
req.SetContext(ctx)
|
req.SetContext(ctx)
|
||||||
req.SetFormData(map[string]string{
|
req.SetFormData(map[string]string{
|
||||||
"task": "2",
|
"task": "2",
|
||||||
@ -84,15 +129,21 @@ func (d *LanZou) MakeDir(ctx context.Context, parentDir model.Obj, dirName strin
|
|||||||
"folder_description": "",
|
"folder_description": "",
|
||||||
})
|
})
|
||||||
}, nil)
|
}, nil)
|
||||||
return err
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return &FileOrFolder{
|
||||||
|
Name: dirName,
|
||||||
|
FolID: utils.Json.Get(data, "text").ToString(),
|
||||||
|
}, nil
|
||||||
}
|
}
|
||||||
return errs.NotImplement
|
return nil, errs.NotImplement
|
||||||
}
|
}
|
||||||
|
|
||||||
func (d *LanZou) Move(ctx context.Context, srcObj, dstDir model.Obj) error {
|
func (d *LanZou) Move(ctx context.Context, srcObj, dstDir model.Obj) (model.Obj, error) {
|
||||||
if d.IsCookie() {
|
if d.IsCookie() {
|
||||||
if !srcObj.IsDir() {
|
if !srcObj.IsDir() {
|
||||||
_, err := d.post(d.BaseUrl+"/doupload.php", func(req *resty.Request) {
|
_, err := d.doupload(func(req *resty.Request) {
|
||||||
req.SetContext(ctx)
|
req.SetContext(ctx)
|
||||||
req.SetFormData(map[string]string{
|
req.SetFormData(map[string]string{
|
||||||
"task": "20",
|
"task": "20",
|
||||||
@ -100,16 +151,19 @@ func (d *LanZou) Move(ctx context.Context, srcObj, dstDir model.Obj) error {
|
|||||||
"file_id": srcObj.GetID(),
|
"file_id": srcObj.GetID(),
|
||||||
})
|
})
|
||||||
}, nil)
|
}, nil)
|
||||||
return err
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return srcObj, nil
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return errs.NotImplement
|
return nil, errs.NotImplement
|
||||||
}
|
}
|
||||||
|
|
||||||
func (d *LanZou) Rename(ctx context.Context, srcObj model.Obj, newName string) error {
|
func (d *LanZou) Rename(ctx context.Context, srcObj model.Obj, newName string) (model.Obj, error) {
|
||||||
if d.IsCookie() {
|
if d.IsCookie() {
|
||||||
if !srcObj.IsDir() {
|
if !srcObj.IsDir() {
|
||||||
_, err := d.post(d.BaseUrl+"/doupload.php", func(req *resty.Request) {
|
_, err := d.doupload(func(req *resty.Request) {
|
||||||
req.SetContext(ctx)
|
req.SetContext(ctx)
|
||||||
req.SetFormData(map[string]string{
|
req.SetFormData(map[string]string{
|
||||||
"task": "46",
|
"task": "46",
|
||||||
@ -118,19 +172,19 @@ func (d *LanZou) Rename(ctx context.Context, srcObj model.Obj, newName string) e
|
|||||||
"type": "2",
|
"type": "2",
|
||||||
})
|
})
|
||||||
}, nil)
|
}, nil)
|
||||||
return err
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
srcObj.(*FileOrFolder).NameAll = newName
|
||||||
|
return srcObj, nil
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return errs.NotImplement
|
return nil, errs.NotImplement
|
||||||
}
|
|
||||||
|
|
||||||
func (d *LanZou) Copy(ctx context.Context, srcObj, dstDir model.Obj) error {
|
|
||||||
return errs.NotImplement
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (d *LanZou) Remove(ctx context.Context, obj model.Obj) error {
|
func (d *LanZou) Remove(ctx context.Context, obj model.Obj) error {
|
||||||
if d.IsCookie() {
|
if d.IsCookie() {
|
||||||
_, err := d.post(d.BaseUrl+"/doupload.php", func(req *resty.Request) {
|
_, err := d.doupload(func(req *resty.Request) {
|
||||||
req.SetContext(ctx)
|
req.SetContext(ctx)
|
||||||
if obj.IsDir() {
|
if obj.IsDir() {
|
||||||
req.SetFormData(map[string]string{
|
req.SetFormData(map[string]string{
|
||||||
@ -149,17 +203,23 @@ func (d *LanZou) Remove(ctx context.Context, obj model.Obj) error {
|
|||||||
return errs.NotImplement
|
return errs.NotImplement
|
||||||
}
|
}
|
||||||
|
|
||||||
func (d *LanZou) Put(ctx context.Context, dstDir model.Obj, stream model.FileStreamer, up driver.UpdateProgress) error {
|
func (d *LanZou) Put(ctx context.Context, dstDir model.Obj, stream model.FileStreamer, up driver.UpdateProgress) (model.Obj, error) {
|
||||||
if d.IsCookie() {
|
if d.IsCookie() {
|
||||||
|
var resp RespText[[]FileOrFolder]
|
||||||
_, err := d._post(d.BaseUrl+"/fileup.php", func(req *resty.Request) {
|
_, err := d._post(d.BaseUrl+"/fileup.php", func(req *resty.Request) {
|
||||||
req.SetFormData(map[string]string{
|
req.SetFormData(map[string]string{
|
||||||
"task": "1",
|
"task": "1",
|
||||||
"id": "WU_FILE_0",
|
"vie": "2",
|
||||||
"name": stream.GetName(),
|
"ve": "2",
|
||||||
"folder_id": dstDir.GetID(),
|
"id": "WU_FILE_0",
|
||||||
|
"name": stream.GetName(),
|
||||||
|
"folder_id_bb_n": dstDir.GetID(),
|
||||||
}).SetFileReader("upload_file", stream.GetName(), stream).SetContext(ctx)
|
}).SetFileReader("upload_file", stream.GetName(), stream).SetContext(ctx)
|
||||||
}, nil, true)
|
}, &resp, true)
|
||||||
return err
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return &resp.Text[0], nil
|
||||||
}
|
}
|
||||||
return errs.NotImplement
|
return nil, errs.NotImplement
|
||||||
}
|
}
|
||||||
|
@ -8,12 +8,16 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
"unicode"
|
"unicode"
|
||||||
|
|
||||||
|
log "github.com/sirupsen/logrus"
|
||||||
)
|
)
|
||||||
|
|
||||||
const DAY time.Duration = 84600000000000
|
const DAY time.Duration = 84600000000000
|
||||||
|
|
||||||
|
// 解析时间
|
||||||
var timeSplitReg = regexp.MustCompile("([0-9.]*)\\s*([\u4e00-\u9fa5]+)")
|
var timeSplitReg = regexp.MustCompile("([0-9.]*)\\s*([\u4e00-\u9fa5]+)")
|
||||||
|
|
||||||
|
// 如果解析失败,则返回当前时间
|
||||||
func MustParseTime(str string) time.Time {
|
func MustParseTime(str string) time.Time {
|
||||||
lastOpTime, err := time.ParseInLocation("2006-01-02 -07", str+" +08", time.Local)
|
lastOpTime, err := time.ParseInLocation("2006-01-02 -07", str+" +08", time.Local)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -41,8 +45,10 @@ func MustParseTime(str string) time.Time {
|
|||||||
return lastOpTime
|
return lastOpTime
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 解析大小
|
||||||
var sizeSplitReg = regexp.MustCompile(`(?i)([0-9.]+)\s*([bkm]+)`)
|
var sizeSplitReg = regexp.MustCompile(`(?i)([0-9.]+)\s*([bkm]+)`)
|
||||||
|
|
||||||
|
// 解析失败返回0
|
||||||
func SizeStrToInt64(size string) int64 {
|
func SizeStrToInt64(size string) int64 {
|
||||||
strs := sizeSplitReg.FindStringSubmatch(size)
|
strs := sizeSplitReg.FindStringSubmatch(size)
|
||||||
if len(strs) < 3 {
|
if len(strs) < 3 {
|
||||||
@ -62,8 +68,13 @@ func SizeStrToInt64(size string) int64 {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 移除注释
|
// 移除注释
|
||||||
func RemoveNotes(html []byte) []byte {
|
func RemoveNotes(html string) string {
|
||||||
return regexp.MustCompile(`<!--.*?-->|//.*|/\*.*?\*/`).ReplaceAll(html, []byte{})
|
return regexp.MustCompile(`<!--.*?-->|[^:]//.*|/\*.*?\*/`).ReplaceAllStringFunc(html, func(b string) string {
|
||||||
|
if b[1:3] == "//" {
|
||||||
|
return b[:1]
|
||||||
|
}
|
||||||
|
return "\n"
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
var findAcwScV2Reg = regexp.MustCompile(`arg1='([0-9A-Z]+)'`)
|
var findAcwScV2Reg = regexp.MustCompile(`arg1='([0-9A-Z]+)'`)
|
||||||
@ -71,6 +82,7 @@ var findAcwScV2Reg = regexp.MustCompile(`arg1='([0-9A-Z]+)'`)
|
|||||||
// 在页面被过多访问或其他情况下,有时候会先返回一个加密的页面,其执行计算出一个acw_sc__v2后放入页面后再重新访问页面才能获得正常页面
|
// 在页面被过多访问或其他情况下,有时候会先返回一个加密的页面,其执行计算出一个acw_sc__v2后放入页面后再重新访问页面才能获得正常页面
|
||||||
// 若该页面进行了js加密,则进行解密,计算acw_sc__v2,并加入cookie
|
// 若该页面进行了js加密,则进行解密,计算acw_sc__v2,并加入cookie
|
||||||
func CalcAcwScV2(html string) (string, error) {
|
func CalcAcwScV2(html string) (string, error) {
|
||||||
|
log.Debugln("acw_sc__v2", html)
|
||||||
acwScV2s := findAcwScV2Reg.FindStringSubmatch(html)
|
acwScV2s := findAcwScV2Reg.FindStringSubmatch(html)
|
||||||
if len(acwScV2s) != 2 {
|
if len(acwScV2s) != 2 {
|
||||||
return "", fmt.Errorf("无法匹配acw_sc__v2")
|
return "", fmt.Errorf("无法匹配acw_sc__v2")
|
||||||
@ -163,3 +175,18 @@ func formToMap(from string) map[string]string {
|
|||||||
}
|
}
|
||||||
return param
|
return param
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var regExpirationTime = regexp.MustCompile(`e=(\d+)`)
|
||||||
|
|
||||||
|
func GetExpirationTime(url string) (etime time.Duration) {
|
||||||
|
exps := regExpirationTime.FindStringSubmatch(url)
|
||||||
|
if len(exps) < 2 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
timestamp, err := strconv.ParseInt(exps[1], 10, 64)
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
etime = time.Duration(timestamp-time.Now().Unix()) * time.Second
|
||||||
|
return
|
||||||
|
}
|
||||||
|
@ -7,11 +7,12 @@ import (
|
|||||||
|
|
||||||
type Addition struct {
|
type Addition struct {
|
||||||
Type string `json:"type" type:"select" options:"cookie,url" default:"cookie"`
|
Type string `json:"type" type:"select" options:"cookie,url" default:"cookie"`
|
||||||
Cookie string `json:"cookie" required:"true" help:"about 15 days valid"`
|
Cookie string `json:"cookie" required:"true" help:"about 15 days valid, ignore if shareUrl is used"`
|
||||||
driver.RootID
|
driver.RootID
|
||||||
SharePassword string `json:"share_password"`
|
SharePassword string `json:"share_password"`
|
||||||
BaseUrl string `json:"baseUrl" required:"true" default:"https://pc.woozooo.com"`
|
BaseUrl string `json:"baseUrl" required:"true" default:"https://pc.woozooo.com" help:"basic URL for file operation"`
|
||||||
ShareUrl string `json:"shareUrl" required:"true" default:"https://pan.lanzouo.com"`
|
ShareUrl string `json:"shareUrl" required:"true" default:"https://pan.lanzouo.com" help:"used to get the sharing page"`
|
||||||
|
RepairFileInfo bool `json:"repair_file_info" help:"To use webdav, you need to enable it"`
|
||||||
}
|
}
|
||||||
|
|
||||||
func (a *Addition) IsCookie() bool {
|
func (a *Addition) IsCookie() bool {
|
||||||
|
@ -1,14 +1,20 @@
|
|||||||
package lanzou
|
package lanzou
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/alist-org/alist/v3/internal/model"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
type FilesOrFoldersResp struct {
|
var ErrFileShareCancel = errors.New("file sharing cancellation")
|
||||||
Text []FileOrFolder `json:"text"`
|
var ErrFileNotExist = errors.New("file does not exist")
|
||||||
|
|
||||||
|
type RespText[T any] struct {
|
||||||
|
Text T `json:"text"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type RespInfo[T any] struct {
|
||||||
|
Info T `json:"info"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type FileOrFolder struct {
|
type FileOrFolder struct {
|
||||||
@ -34,30 +40,51 @@ type FileOrFolder struct {
|
|||||||
FolID string `json:"fol_id"`
|
FolID string `json:"fol_id"`
|
||||||
//Folderlock string `json:"folderlock"`
|
//Folderlock string `json:"folderlock"`
|
||||||
//FolderDes string `json:"folder_des"`
|
//FolderDes string `json:"folder_des"`
|
||||||
|
|
||||||
|
// 缓存字段
|
||||||
|
size *int64 `json:"-"`
|
||||||
|
time *time.Time `json:"-"`
|
||||||
|
repairFlag bool `json:"-"`
|
||||||
|
shareInfo *FileShare `json:"-"`
|
||||||
}
|
}
|
||||||
|
|
||||||
func (f *FileOrFolder) isFloder() bool {
|
func (f *FileOrFolder) GetID() string {
|
||||||
return f.FolID != ""
|
if f.IsDir() {
|
||||||
}
|
return f.FolID
|
||||||
func (f *FileOrFolder) ToObj() model.Obj {
|
|
||||||
obj := &model.Object{}
|
|
||||||
if f.isFloder() {
|
|
||||||
obj.ID = f.FolID
|
|
||||||
obj.Name = f.Name
|
|
||||||
obj.Modified = time.Now()
|
|
||||||
obj.IsFolder = true
|
|
||||||
} else {
|
|
||||||
obj.ID = f.ID
|
|
||||||
obj.Name = f.NameAll
|
|
||||||
obj.Modified = MustParseTime(f.Time)
|
|
||||||
obj.Size = SizeStrToInt64(f.Size)
|
|
||||||
}
|
}
|
||||||
return obj
|
return f.ID
|
||||||
|
}
|
||||||
|
func (f *FileOrFolder) GetName() string {
|
||||||
|
if f.IsDir() {
|
||||||
|
return f.Name
|
||||||
|
}
|
||||||
|
return f.NameAll
|
||||||
|
}
|
||||||
|
func (f *FileOrFolder) GetPath() string { return "" }
|
||||||
|
func (f *FileOrFolder) GetSize() int64 {
|
||||||
|
if f.size == nil {
|
||||||
|
size := SizeStrToInt64(f.Size)
|
||||||
|
f.size = &size
|
||||||
|
}
|
||||||
|
return *f.size
|
||||||
|
}
|
||||||
|
func (f *FileOrFolder) IsDir() bool { return f.FolID != "" }
|
||||||
|
func (f *FileOrFolder) ModTime() time.Time {
|
||||||
|
if f.time == nil {
|
||||||
|
time := MustParseTime(f.Time)
|
||||||
|
f.time = &time
|
||||||
|
}
|
||||||
|
return *f.time
|
||||||
}
|
}
|
||||||
|
|
||||||
type FileShareResp struct {
|
func (f *FileOrFolder) SetShareInfo(fs *FileShare) {
|
||||||
Info FileShare `json:"info"`
|
f.shareInfo = fs
|
||||||
}
|
}
|
||||||
|
func (f *FileOrFolder) GetShareInfo() *FileShare {
|
||||||
|
return f.shareInfo
|
||||||
|
}
|
||||||
|
|
||||||
|
/* 通过ID获取文件/文件夹分享信息 */
|
||||||
type FileShare struct {
|
type FileShare struct {
|
||||||
Pwd string `json:"pwd"`
|
Pwd string `json:"pwd"`
|
||||||
Onof string `json:"onof"`
|
Onof string `json:"onof"`
|
||||||
@ -73,31 +100,55 @@ type FileShare struct {
|
|||||||
Des string `json:"des"`
|
Des string `json:"des"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* 分享类型为文件夹 */
|
||||||
type FileOrFolderByShareUrlResp struct {
|
type FileOrFolderByShareUrlResp struct {
|
||||||
Text []FileOrFolderByShareUrl `json:"text"`
|
Text []FileOrFolderByShareUrl `json:"text"`
|
||||||
}
|
}
|
||||||
type FileOrFolderByShareUrl struct {
|
type FileOrFolderByShareUrl struct {
|
||||||
ID string `json:"id"`
|
ID string `json:"id"`
|
||||||
NameAll string `json:"name_all"`
|
NameAll string `json:"name_all"`
|
||||||
Size string `json:"size"`
|
|
||||||
Time string `json:"time"`
|
// 文件特有
|
||||||
Duan string `json:"duan"`
|
Duan string `json:"duan"`
|
||||||
|
Size string `json:"size"`
|
||||||
|
Time string `json:"time"`
|
||||||
//Icon string `json:"icon"`
|
//Icon string `json:"icon"`
|
||||||
//PIco int `json:"p_ico"`
|
//PIco int `json:"p_ico"`
|
||||||
//T int `json:"t"`
|
//T int `json:"t"`
|
||||||
IsFloder bool
|
|
||||||
|
// 文件夹特有
|
||||||
|
IsFloder bool `json:"-"`
|
||||||
|
|
||||||
|
//
|
||||||
|
Url string `json:"-"`
|
||||||
|
Pwd string `json:"-"`
|
||||||
|
|
||||||
|
// 缓存字段
|
||||||
|
size *int64 `json:"-"`
|
||||||
|
time *time.Time `json:"-"`
|
||||||
|
repairFlag bool `json:"-"`
|
||||||
}
|
}
|
||||||
|
|
||||||
func (f *FileOrFolderByShareUrl) ToObj() model.Obj {
|
func (f *FileOrFolderByShareUrl) GetID() string { return f.ID }
|
||||||
return &model.Object{
|
func (f *FileOrFolderByShareUrl) GetName() string { return f.NameAll }
|
||||||
ID: f.ID,
|
func (f *FileOrFolderByShareUrl) GetPath() string { return "" }
|
||||||
Name: f.NameAll,
|
func (f *FileOrFolderByShareUrl) GetSize() int64 {
|
||||||
Size: SizeStrToInt64(f.Size),
|
if f.size == nil {
|
||||||
Modified: MustParseTime(f.Time),
|
size := SizeStrToInt64(f.Size)
|
||||||
IsFolder: f.IsFloder,
|
f.size = &size
|
||||||
}
|
}
|
||||||
|
return *f.size
|
||||||
|
}
|
||||||
|
func (f *FileOrFolderByShareUrl) IsDir() bool { return f.IsFloder }
|
||||||
|
func (f *FileOrFolderByShareUrl) ModTime() time.Time {
|
||||||
|
if f.time == nil {
|
||||||
|
time := MustParseTime(f.Time)
|
||||||
|
f.time = &time
|
||||||
|
}
|
||||||
|
return *f.time
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 获取下载链接的响应
|
||||||
type FileShareInfoAndUrlResp[T string | int] struct {
|
type FileShareInfoAndUrlResp[T string | int] struct {
|
||||||
Dom string `json:"dom"`
|
Dom string `json:"dom"`
|
||||||
URL string `json:"url"`
|
URL string `json:"url"`
|
||||||
@ -111,21 +162,3 @@ func (u *FileShareInfoAndUrlResp[T]) GetBaseUrl() string {
|
|||||||
func (u *FileShareInfoAndUrlResp[T]) GetDownloadUrl() string {
|
func (u *FileShareInfoAndUrlResp[T]) GetDownloadUrl() string {
|
||||||
return fmt.Sprint(u.GetBaseUrl(), "/", u.URL)
|
return fmt.Sprint(u.GetBaseUrl(), "/", u.URL)
|
||||||
}
|
}
|
||||||
|
|
||||||
// 通过分享链接获取文件信息和下载链接
|
|
||||||
type FileInfoAndUrlByShareUrl struct {
|
|
||||||
ID string
|
|
||||||
Name string
|
|
||||||
Size string
|
|
||||||
Time string
|
|
||||||
Url string
|
|
||||||
}
|
|
||||||
|
|
||||||
func (f *FileInfoAndUrlByShareUrl) ToObj() model.Obj {
|
|
||||||
return &model.Object{
|
|
||||||
ID: f.ID,
|
|
||||||
Name: f.Name,
|
|
||||||
Size: SizeStrToInt64(f.Size),
|
|
||||||
Modified: MustParseTime(f.Time),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
@ -1,21 +1,38 @@
|
|||||||
package lanzou
|
package lanzou
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"net/http"
|
"net/http"
|
||||||
"regexp"
|
"regexp"
|
||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
|
"sync"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/alist-org/alist/v3/drivers/base"
|
"github.com/alist-org/alist/v3/drivers/base"
|
||||||
"github.com/alist-org/alist/v3/internal/model"
|
"github.com/alist-org/alist/v3/internal/model"
|
||||||
"github.com/alist-org/alist/v3/pkg/utils"
|
"github.com/alist-org/alist/v3/pkg/utils"
|
||||||
"github.com/go-resty/resty/v2"
|
"github.com/go-resty/resty/v2"
|
||||||
|
log "github.com/sirupsen/logrus"
|
||||||
)
|
)
|
||||||
|
|
||||||
func (d *LanZou) get(url string, callback base.ReqCallback, resp interface{}) ([]byte, error) {
|
var upClient *resty.Client
|
||||||
|
var once sync.Once
|
||||||
|
|
||||||
|
func (d *LanZou) doupload(callback base.ReqCallback, resp interface{}) ([]byte, error) {
|
||||||
|
return d.post(d.BaseUrl+"/doupload.php", func(req *resty.Request) {
|
||||||
|
req.SetQueryParams(map[string]string{
|
||||||
|
"uid": d.uid,
|
||||||
|
"vei": d.vei,
|
||||||
|
})
|
||||||
|
if callback != nil {
|
||||||
|
callback(req)
|
||||||
|
}
|
||||||
|
}, resp)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *LanZou) get(url string, callback base.ReqCallback) ([]byte, error) {
|
||||||
return d.request(url, http.MethodGet, callback, false)
|
return d.request(url, http.MethodGet, callback, false)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -24,7 +41,16 @@ func (d *LanZou) post(url string, callback base.ReqCallback, resp interface{}) (
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (d *LanZou) _post(url string, callback base.ReqCallback, resp interface{}, up bool) ([]byte, error) {
|
func (d *LanZou) _post(url string, callback base.ReqCallback, resp interface{}, up bool) ([]byte, error) {
|
||||||
data, err := d.request(url, http.MethodPost, callback, up)
|
data, err := d.request(url, http.MethodPost, func(req *resty.Request) {
|
||||||
|
req.AddRetryCondition(func(r *resty.Response, err error) bool {
|
||||||
|
if utils.Json.Get(r.Body(), "zt").ToInt() == 4 {
|
||||||
|
time.Sleep(time.Second)
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
})
|
||||||
|
callback(req)
|
||||||
|
}, up)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
@ -47,6 +73,9 @@ func (d *LanZou) _post(url string, callback base.ReqCallback, resp interface{},
|
|||||||
func (d *LanZou) request(url string, method string, callback base.ReqCallback, up bool) ([]byte, error) {
|
func (d *LanZou) request(url string, method string, callback base.ReqCallback, up bool) ([]byte, error) {
|
||||||
var req *resty.Request
|
var req *resty.Request
|
||||||
if up {
|
if up {
|
||||||
|
once.Do(func() {
|
||||||
|
upClient = base.NewRestyClient().SetTimeout(120 * time.Second)
|
||||||
|
})
|
||||||
req = upClient.R()
|
req = upClient.R()
|
||||||
} else {
|
} else {
|
||||||
req = base.RestyClient.R()
|
req = base.RestyClient.R()
|
||||||
@ -68,7 +97,7 @@ func (d *LanZou) request(url string, method string, callback base.ReqCallback, u
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
log.Debugf("lanzou request: url=>%s ,stats=>%d ,body => %s\n", res.Request.URL, res.StatusCode(), res.String())
|
||||||
return res.Body(), err
|
return res.Body(), err
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -77,31 +106,28 @@ func (d *LanZou) request(url string, method string, callback base.ReqCallback, u
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
// 获取文件和文件夹,获取到的文件大小、更改时间不可信
|
// 获取文件和文件夹,获取到的文件大小、更改时间不可信
|
||||||
func (d *LanZou) GetFiles(ctx context.Context, folderID string) ([]model.Obj, error) {
|
func (d *LanZou) GetAllFiles(folderID string) ([]model.Obj, error) {
|
||||||
folders, err := d.getFolders(ctx, folderID)
|
folders, err := d.GetFolders(folderID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
files, err := d.getFiles(ctx, folderID)
|
files, err := d.GetFiles(folderID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
objs := make([]model.Obj, 0, len(folders)+len(files))
|
return append(
|
||||||
for _, folder := range folders {
|
utils.MustSliceConvert(folders, func(folder FileOrFolder) model.Obj {
|
||||||
objs = append(objs, folder.ToObj())
|
return &folder
|
||||||
}
|
}), utils.MustSliceConvert(files, func(file FileOrFolder) model.Obj {
|
||||||
|
return &file
|
||||||
for _, file := range files {
|
})...,
|
||||||
objs = append(objs, file.ToObj())
|
), nil
|
||||||
}
|
|
||||||
return objs, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// 通过ID获取文件夹
|
// 通过ID获取文件夹
|
||||||
func (d *LanZou) getFolders(ctx context.Context, folderID string) ([]FileOrFolder, error) {
|
func (d *LanZou) GetFolders(folderID string) ([]FileOrFolder, error) {
|
||||||
var resp FilesOrFoldersResp
|
var resp RespText[[]FileOrFolder]
|
||||||
_, err := d.post(d.BaseUrl+"/doupload.php", func(req *resty.Request) {
|
_, err := d.doupload(func(req *resty.Request) {
|
||||||
req.SetContext(ctx)
|
|
||||||
req.SetFormData(map[string]string{
|
req.SetFormData(map[string]string{
|
||||||
"task": "47",
|
"task": "47",
|
||||||
"folder_id": folderID,
|
"folder_id": folderID,
|
||||||
@ -114,12 +140,11 @@ func (d *LanZou) getFolders(ctx context.Context, folderID string) ([]FileOrFolde
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 通过ID获取文件
|
// 通过ID获取文件
|
||||||
func (d *LanZou) getFiles(ctx context.Context, folderID string) ([]FileOrFolder, error) {
|
func (d *LanZou) GetFiles(folderID string) ([]FileOrFolder, error) {
|
||||||
files := make([]FileOrFolder, 0)
|
files := make([]FileOrFolder, 0)
|
||||||
for pg := 1; ; pg++ {
|
for pg := 1; ; pg++ {
|
||||||
var resp FilesOrFoldersResp
|
var resp RespText[[]FileOrFolder]
|
||||||
_, err := d.post(d.BaseUrl+"/doupload.php", func(req *resty.Request) {
|
_, err := d.doupload(func(req *resty.Request) {
|
||||||
req.SetContext(ctx)
|
|
||||||
req.SetFormData(map[string]string{
|
req.SetFormData(map[string]string{
|
||||||
"task": "5",
|
"task": "5",
|
||||||
"folder_id": folderID,
|
"folder_id": folderID,
|
||||||
@ -138,37 +163,33 @@ func (d *LanZou) getFiles(ctx context.Context, folderID string) ([]FileOrFolder,
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 通过ID获取文件夹分享地址
|
// 通过ID获取文件夹分享地址
|
||||||
func (d *LanZou) getFolderShareUrlByID(ctx context.Context, fileID string) (share FileShare, err error) {
|
func (d *LanZou) getFolderShareUrlByID(fileID string) (*FileShare, error) {
|
||||||
var resp FileShareResp
|
var resp RespInfo[FileShare]
|
||||||
_, err = d.post(d.BaseUrl+"/doupload.php", func(req *resty.Request) {
|
_, err := d.doupload(func(req *resty.Request) {
|
||||||
req.SetContext(ctx)
|
|
||||||
req.SetFormData(map[string]string{
|
req.SetFormData(map[string]string{
|
||||||
"task": "18",
|
"task": "18",
|
||||||
"file_id": fileID,
|
"file_id": fileID,
|
||||||
})
|
})
|
||||||
}, &resp)
|
}, &resp)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return
|
return nil, err
|
||||||
}
|
}
|
||||||
share = resp.Info
|
return &resp.Info, nil
|
||||||
return
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// 通过ID获取文件分享地址
|
// 通过ID获取文件分享地址
|
||||||
func (d *LanZou) getFileShareUrlByID(ctx context.Context, fileID string) (share FileShare, err error) {
|
func (d *LanZou) getFileShareUrlByID(fileID string) (*FileShare, error) {
|
||||||
var resp FileShareResp
|
var resp RespInfo[FileShare]
|
||||||
_, err = d.post(d.BaseUrl+"/doupload.php", func(req *resty.Request) {
|
_, err := d.doupload(func(req *resty.Request) {
|
||||||
req.SetContext(ctx)
|
|
||||||
req.SetFormData(map[string]string{
|
req.SetFormData(map[string]string{
|
||||||
"task": "22",
|
"task": "22",
|
||||||
"file_id": fileID,
|
"file_id": fileID,
|
||||||
})
|
})
|
||||||
}, &resp)
|
}, &resp)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return
|
return nil, err
|
||||||
}
|
}
|
||||||
share = resp.Info
|
return &resp.Info, nil
|
||||||
return
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -180,237 +201,271 @@ var isFileReg = regexp.MustCompile(`class="fileinfo"|id="file"|文件描述`)
|
|||||||
var isFolderReg = regexp.MustCompile(`id="infos"`)
|
var isFolderReg = regexp.MustCompile(`id="infos"`)
|
||||||
|
|
||||||
// 获取文件文件夹基础信息
|
// 获取文件文件夹基础信息
|
||||||
|
|
||||||
|
// 获取文件名称
|
||||||
var nameFindReg = regexp.MustCompile(`<title>(.+?) - 蓝奏云</title>|id="filenajax">(.+?)</div>|var filename = '(.+?)';|<div style="font-size.+?>([^<>].+?)</div>|<div class="filethetext".+?>([^<>]+?)</div>`)
|
var nameFindReg = regexp.MustCompile(`<title>(.+?) - 蓝奏云</title>|id="filenajax">(.+?)</div>|var filename = '(.+?)';|<div style="font-size.+?>([^<>].+?)</div>|<div class="filethetext".+?>([^<>]+?)</div>`)
|
||||||
|
|
||||||
|
// 获取文件大小
|
||||||
var sizeFindReg = regexp.MustCompile(`(?i)大小\W*([0-9.]+\s*[bkm]+)`)
|
var sizeFindReg = regexp.MustCompile(`(?i)大小\W*([0-9.]+\s*[bkm]+)`)
|
||||||
|
|
||||||
|
// 获取文件时间
|
||||||
var timeFindReg = regexp.MustCompile(`\d+\s*[秒天分小][钟时]?前|[昨前]天|\d{4}-\d{2}-\d{2}`)
|
var timeFindReg = regexp.MustCompile(`\d+\s*[秒天分小][钟时]?前|[昨前]天|\d{4}-\d{2}-\d{2}`)
|
||||||
|
|
||||||
var findSubFolaerReg = regexp.MustCompile(`(folderlink|mbxfolder).+href="/(.+?)"(.+filename")?>(.+?)<`) // 查找分享文件夹子文件夹ID和名称
|
// 查找分享文件夹子文件夹ID和名称
|
||||||
|
var findSubFolaerReg = regexp.MustCompile(`(?i)(?:folderlink|mbxfolder).+href="/(.+?)"(?:.+filename")?>(.+?)<`)
|
||||||
|
|
||||||
// 获取关键数据
|
// 获取下载页面链接
|
||||||
var findDownPageParamReg = regexp.MustCompile(`<iframe.*?src="(.+?)"`)
|
var findDownPageParamReg = regexp.MustCompile(`<iframe.*?src="(.+?)"`)
|
||||||
|
|
||||||
// 通过分享链接获取文件或文件夹,如果是文件则会返回下载链接
|
// 获取分享链接主界面
|
||||||
func (d *LanZou) GetFileOrFolderByShareUrl(ctx context.Context, downID, pwd string) ([]model.Obj, error) {
|
func (d *LanZou) getShareUrlHtml(shareID string) (string, error) {
|
||||||
pageData, err := d.get(fmt.Sprint(d.ShareUrl, "/", downID), func(req *resty.Request) { req.SetContext(ctx) }, nil)
|
var vs string
|
||||||
|
for i := 0; i < 3; i++ {
|
||||||
|
firstPageData, err := d.get(fmt.Sprint(d.ShareUrl, "/", shareID),
|
||||||
|
func(req *resty.Request) {
|
||||||
|
if vs != "" {
|
||||||
|
req.SetCookie(&http.Cookie{
|
||||||
|
Name: "acw_sc__v2",
|
||||||
|
Value: vs,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
|
||||||
|
firstPageDataStr := RemoveNotes(string(firstPageData))
|
||||||
|
if strings.Contains(firstPageDataStr, "取消分享") {
|
||||||
|
return "", ErrFileShareCancel
|
||||||
|
}
|
||||||
|
if strings.Contains(firstPageDataStr, "文件不存在") {
|
||||||
|
return "", ErrFileNotExist
|
||||||
|
}
|
||||||
|
|
||||||
|
// acw_sc__v2
|
||||||
|
if strings.Contains(firstPageDataStr, "acw_sc__v2") {
|
||||||
|
if vs, err = CalcAcwScV2(firstPageDataStr); err != nil {
|
||||||
|
log.Errorf("lanzou: err => acw_sc__v2 validation error ,data => %s\n", firstPageDataStr)
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
return firstPageDataStr, nil
|
||||||
|
}
|
||||||
|
return "", errors.New("acw_sc__v2 validation error")
|
||||||
|
}
|
||||||
|
|
||||||
|
// 通过分享链接获取文件或文件夹
|
||||||
|
func (d *LanZou) GetFileOrFolderByShareUrl(shareID, pwd string) ([]model.Obj, error) {
|
||||||
|
pageData, err := d.getShareUrlHtml(shareID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
pageData = RemoveNotes(pageData)
|
|
||||||
|
|
||||||
var objs []model.Obj
|
if !isFileReg.MatchString(pageData) {
|
||||||
if !isFileReg.Match(pageData) {
|
files, err := d.getFolderByShareUrl(pwd, pageData)
|
||||||
files, err := d.getFolderByShareUrl(ctx, downID, pwd, pageData)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
objs = make([]model.Obj, 0, len(files))
|
return utils.MustSliceConvert(files, func(file FileOrFolderByShareUrl) model.Obj {
|
||||||
for _, file := range files {
|
return &file
|
||||||
objs = append(objs, file.ToObj())
|
}), nil
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
file, err := d.getFilesByShareUrl(ctx, downID, pwd, pageData)
|
file, err := d.getFilesByShareUrl(shareID, pwd, pageData)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
objs = []model.Obj{file.ToObj()}
|
return []model.Obj{file}, nil
|
||||||
}
|
}
|
||||||
return objs, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// 通过分享链接获取文件(下载链接也使用此方法)
|
// 通过分享链接获取文件(下载链接也使用此方法)
|
||||||
|
// FileOrFolderByShareUrl 包含 pwd 和 url 字段
|
||||||
// 参考 https://github.com/zaxtyson/LanZouCloud-API/blob/ab2e9ec715d1919bf432210fc16b91c6775fbb99/lanzou/api/core.py#L440
|
// 参考 https://github.com/zaxtyson/LanZouCloud-API/blob/ab2e9ec715d1919bf432210fc16b91c6775fbb99/lanzou/api/core.py#L440
|
||||||
func (d *LanZou) getFilesByShareUrl(ctx context.Context, downID, pwd string, firstPageData []byte) (file FileInfoAndUrlByShareUrl, err error) {
|
func (d *LanZou) GetFilesByShareUrl(shareID, pwd string) (file *FileOrFolderByShareUrl, err error) {
|
||||||
if firstPageData == nil {
|
pageData, err := d.getShareUrlHtml(shareID)
|
||||||
firstPageData, err = d.get(fmt.Sprint(d.ShareUrl, "/", downID), func(req *resty.Request) { req.SetContext(ctx) }, nil)
|
if err != nil {
|
||||||
if err != nil {
|
return nil, err
|
||||||
return
|
|
||||||
}
|
|
||||||
firstPageData = RemoveNotes(firstPageData)
|
|
||||||
}
|
|
||||||
firstPageDataStr := string(firstPageData)
|
|
||||||
|
|
||||||
if strings.Contains(firstPageDataStr, "acw_sc__v2") {
|
|
||||||
var vs string
|
|
||||||
if vs, err = CalcAcwScV2(firstPageDataStr); err != nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
firstPageData, err = d.get(fmt.Sprint(d.ShareUrl, "/", downID), func(req *resty.Request) {
|
|
||||||
req.SetCookie(&http.Cookie{
|
|
||||||
Name: "acw_sc__v2",
|
|
||||||
Value: vs,
|
|
||||||
})
|
|
||||||
req.SetContext(ctx)
|
|
||||||
}, nil)
|
|
||||||
if err != nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
firstPageData = RemoveNotes(firstPageData)
|
|
||||||
firstPageDataStr = string(firstPageData)
|
|
||||||
}
|
}
|
||||||
|
return d.getFilesByShareUrl(shareID, pwd, pageData)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *LanZou) getFilesByShareUrl(shareID, pwd string, sharePageData string) (*FileOrFolderByShareUrl, error) {
|
||||||
var (
|
var (
|
||||||
param map[string]string
|
param map[string]string
|
||||||
downloadUrl string
|
downloadUrl string
|
||||||
baseUrl string
|
baseUrl string
|
||||||
|
file FileOrFolderByShareUrl
|
||||||
)
|
)
|
||||||
|
|
||||||
// 需要密码
|
// 需要密码
|
||||||
if strings.Contains(firstPageDataStr, "pwdload") || strings.Contains(firstPageDataStr, "passwddiv") {
|
if strings.Contains(sharePageData, "pwdload") || strings.Contains(sharePageData, "passwddiv") {
|
||||||
param, err = htmlFormToMap(firstPageDataStr)
|
param, err := htmlFormToMap(sharePageData)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return
|
return nil, err
|
||||||
}
|
}
|
||||||
param["p"] = pwd
|
param["p"] = pwd
|
||||||
var resp FileShareInfoAndUrlResp[string]
|
var resp FileShareInfoAndUrlResp[string]
|
||||||
_, err = d.post(d.ShareUrl+"/ajaxm.php", func(req *resty.Request) { req.SetFormData(param).SetContext(ctx) }, &resp)
|
_, err = d.post(d.ShareUrl+"/ajaxm.php", func(req *resty.Request) { req.SetFormData(param) }, &resp)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return
|
return nil, err
|
||||||
}
|
}
|
||||||
file.Name = resp.Inf
|
file.NameAll = resp.Inf
|
||||||
|
file.Pwd = pwd
|
||||||
baseUrl = resp.GetBaseUrl()
|
baseUrl = resp.GetBaseUrl()
|
||||||
downloadUrl = resp.GetDownloadUrl()
|
downloadUrl = resp.GetDownloadUrl()
|
||||||
} else {
|
} else {
|
||||||
urlpaths := findDownPageParamReg.FindStringSubmatch(firstPageDataStr)
|
urlpaths := findDownPageParamReg.FindStringSubmatch(sharePageData)
|
||||||
if len(urlpaths) != 2 {
|
if len(urlpaths) != 2 {
|
||||||
err = fmt.Errorf("not find file page param")
|
log.Errorf("lanzou: err => not find file page param ,data => %s\n", sharePageData)
|
||||||
return
|
return nil, fmt.Errorf("not find file page param")
|
||||||
}
|
}
|
||||||
var nextPageData []byte
|
data, err := d.get(fmt.Sprint(d.ShareUrl, urlpaths[1]), nil)
|
||||||
nextPageData, err = d.get(fmt.Sprint(d.ShareUrl, urlpaths[1]), func(req *resty.Request) { req.SetContext(ctx) }, nil)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return
|
return nil, err
|
||||||
}
|
}
|
||||||
nextPageData = RemoveNotes(nextPageData)
|
nextPageData := RemoveNotes(string(data))
|
||||||
nextPageDataStr := string(nextPageData)
|
|
||||||
|
|
||||||
param, err = htmlJsonToMap(nextPageDataStr)
|
param, err = htmlJsonToMap(nextPageData)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
var resp FileShareInfoAndUrlResp[int]
|
var resp FileShareInfoAndUrlResp[int]
|
||||||
_, err = d.post(d.ShareUrl+"/ajaxm.php", func(req *resty.Request) { req.SetFormData(param).SetContext(ctx) }, &resp)
|
_, err = d.post(d.ShareUrl+"/ajaxm.php", func(req *resty.Request) { req.SetFormData(param) }, &resp)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return
|
return nil, err
|
||||||
}
|
}
|
||||||
baseUrl = resp.GetBaseUrl()
|
baseUrl = resp.GetBaseUrl()
|
||||||
downloadUrl = resp.GetDownloadUrl()
|
downloadUrl = resp.GetDownloadUrl()
|
||||||
|
|
||||||
names := nameFindReg.FindStringSubmatch(firstPageDataStr)
|
names := nameFindReg.FindStringSubmatch(sharePageData)
|
||||||
if len(names) > 1 {
|
if len(names) > 1 {
|
||||||
for _, name := range names[1:] {
|
for _, name := range names[1:] {
|
||||||
if name != "" {
|
if name != "" {
|
||||||
file.Name = name
|
file.NameAll = name
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
sizes := sizeFindReg.FindStringSubmatch(firstPageDataStr)
|
sizes := sizeFindReg.FindStringSubmatch(sharePageData)
|
||||||
if len(sizes) == 2 {
|
if len(sizes) == 2 {
|
||||||
file.Size = sizes[1]
|
file.Size = sizes[1]
|
||||||
}
|
}
|
||||||
file.ID = downID
|
file.ID = shareID
|
||||||
file.Time = timeFindReg.FindString(firstPageDataStr)
|
file.Time = timeFindReg.FindString(sharePageData)
|
||||||
|
|
||||||
// 重定向获取真实链接
|
// 重定向获取真实链接
|
||||||
res, err := base.NoRedirectClient.R().SetHeaders(map[string]string{
|
res, err := base.NoRedirectClient.R().SetHeaders(map[string]string{
|
||||||
"accept-language": "zh-CN,zh;q=0.9,en;q=0.8,en-GB;q=0.7,en-US;q=0.6",
|
"accept-language": "zh-CN,zh;q=0.9,en;q=0.8,en-GB;q=0.7,en-US;q=0.6",
|
||||||
}).SetContext(ctx).Get(downloadUrl)
|
}).Get(downloadUrl)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
file.Url = res.Header().Get("location")
|
file.Url = res.Header().Get("location")
|
||||||
|
|
||||||
// 触发验证
|
// 触发验证
|
||||||
rPageDataStr := res.String()
|
rPageData := res.String()
|
||||||
if res.StatusCode() != 302 && strings.Contains(rPageDataStr, "网络异常") {
|
if res.StatusCode() != 302 {
|
||||||
param, err = htmlJsonToMap(rPageDataStr)
|
param, err = htmlJsonToMap(rPageData)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return
|
return nil, err
|
||||||
}
|
}
|
||||||
param["el"] = "2"
|
param["el"] = "2"
|
||||||
time.Sleep(time.Second * 2)
|
time.Sleep(time.Second * 2)
|
||||||
|
|
||||||
// 通过验证获取直连
|
// 通过验证获取直连
|
||||||
var rUrl struct {
|
data, err := d.post(fmt.Sprint(baseUrl, "/ajax.php"), func(req *resty.Request) { req.SetFormData(param) }, nil)
|
||||||
Url string `json:"url"`
|
|
||||||
}
|
|
||||||
_, err = d.post(fmt.Sprint(baseUrl, "/ajax.php"), func(req *resty.Request) { req.SetContext(ctx).SetFormData(param) }, &rUrl)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return
|
return nil, err
|
||||||
}
|
}
|
||||||
file.Url = rUrl.Url
|
file.Url = utils.Json.Get(data, "url").ToString()
|
||||||
}
|
}
|
||||||
return
|
return &file, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// 通过分享链接获取文件夹
|
// 通过分享链接获取文件夹
|
||||||
|
// 似乎子目录和文件不会加密
|
||||||
// 参考 https://github.com/zaxtyson/LanZouCloud-API/blob/ab2e9ec715d1919bf432210fc16b91c6775fbb99/lanzou/api/core.py#L1089
|
// 参考 https://github.com/zaxtyson/LanZouCloud-API/blob/ab2e9ec715d1919bf432210fc16b91c6775fbb99/lanzou/api/core.py#L1089
|
||||||
func (d *LanZou) getFolderByShareUrl(ctx context.Context, downID, pwd string, firstPageData []byte) ([]FileOrFolderByShareUrl, error) {
|
func (d *LanZou) GetFolderByShareUrl(shareID, pwd string) ([]FileOrFolderByShareUrl, error) {
|
||||||
if firstPageData == nil {
|
pageData, err := d.getShareUrlHtml(shareID)
|
||||||
var err error
|
if err != nil {
|
||||||
firstPageData, err = d.get(fmt.Sprint(d.ShareUrl, "/", downID), func(req *resty.Request) { req.SetContext(ctx) }, nil)
|
return nil, err
|
||||||
if err != nil {
|
}
|
||||||
return nil, err
|
return d.getFolderByShareUrl(pwd, pageData)
|
||||||
}
|
}
|
||||||
firstPageData = RemoveNotes(firstPageData)
|
|
||||||
}
|
func (d *LanZou) getFolderByShareUrl(pwd string, sharePageData string) ([]FileOrFolderByShareUrl, error) {
|
||||||
firstPageDataStr := string(firstPageData)
|
from, err := htmlJsonToMap(sharePageData)
|
||||||
|
|
||||||
//
|
|
||||||
if strings.Contains(firstPageDataStr, "acw_sc__v2") {
|
|
||||||
vs, err := CalcAcwScV2(firstPageDataStr)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
firstPageData, err = d.get(fmt.Sprint(d.ShareUrl, "/", downID), func(req *resty.Request) {
|
|
||||||
req.SetCookie(&http.Cookie{
|
|
||||||
Name: "acw_sc__v2",
|
|
||||||
Value: vs,
|
|
||||||
})
|
|
||||||
req.SetContext(ctx)
|
|
||||||
}, nil)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
firstPageData = RemoveNotes(firstPageData)
|
|
||||||
firstPageDataStr = string(firstPageData)
|
|
||||||
}
|
|
||||||
|
|
||||||
from, err := htmlJsonToMap(firstPageDataStr)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
from["pwd"] = pwd
|
|
||||||
|
|
||||||
files := make([]FileOrFolderByShareUrl, 0)
|
files := make([]FileOrFolderByShareUrl, 0)
|
||||||
// vip获取文件夹
|
// vip获取文件夹
|
||||||
floders := findSubFolaerReg.FindAllStringSubmatch(firstPageDataStr, -1)
|
floders := findSubFolaerReg.FindAllStringSubmatch(sharePageData, -1)
|
||||||
for _, floder := range floders {
|
for _, floder := range floders {
|
||||||
if len(floder) == 5 {
|
if len(floder) == 3 {
|
||||||
files = append(files, FileOrFolderByShareUrl{
|
files = append(files, FileOrFolderByShareUrl{
|
||||||
ID: floder[2],
|
// Pwd: pwd, // 子文件夹不加密
|
||||||
NameAll: floder[4],
|
ID: floder[1],
|
||||||
|
NameAll: floder[2],
|
||||||
IsFloder: true,
|
IsFloder: true,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 获取文件
|
||||||
|
from["pwd"] = pwd
|
||||||
for page := 1; ; page++ {
|
for page := 1; ; page++ {
|
||||||
from["pg"] = strconv.Itoa(page)
|
from["pg"] = strconv.Itoa(page)
|
||||||
var resp FileOrFolderByShareUrlResp
|
var resp FileOrFolderByShareUrlResp
|
||||||
_, err := d.post(d.ShareUrl+"/filemoreajax.php", func(req *resty.Request) { req.SetFormData(from).SetContext(ctx) }, &resp)
|
_, err := d.post(d.ShareUrl+"/filemoreajax.php", func(req *resty.Request) { req.SetFormData(from) }, &resp)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
files = append(files, resp.Text...)
|
/*// 文件夹中的文件也不加密
|
||||||
|
for i := 0; i < len(resp.Text); i++ {
|
||||||
|
resp.Text[i].Pwd = pwd
|
||||||
|
}*/
|
||||||
if len(resp.Text) == 0 {
|
if len(resp.Text) == 0 {
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
time.Sleep(time.Millisecond * 600)
|
files = append(files, resp.Text...)
|
||||||
|
time.Sleep(time.Second)
|
||||||
}
|
}
|
||||||
return files, nil
|
return files, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 通过下载头获取真实文件信息
|
||||||
|
func (d *LanZou) getFileRealInfo(downURL string) (*int64, *time.Time) {
|
||||||
|
res, _ := base.RestyClient.R().Head(downURL)
|
||||||
|
if res == nil {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
time, _ := http.ParseTime(res.Header().Get("Last-Modified"))
|
||||||
|
size, _ := strconv.ParseInt(res.Header().Get("Content-Length"), 10, 64)
|
||||||
|
return &size, &time
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *LanZou) getVei() (string, error) {
|
||||||
|
resp, err := d.get("https://pc.woozooo.com/mydisk.php", func(req *resty.Request) {
|
||||||
|
req.SetQueryParams(map[string]string{
|
||||||
|
"item": "files",
|
||||||
|
"action": "index",
|
||||||
|
"u": d.uid,
|
||||||
|
})
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
html := RemoveNotes(string(resp))
|
||||||
|
data, err := htmlJsonToMap(html)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
return data["vei"], nil
|
||||||
|
}
|
||||||
|
@ -1,12 +1,10 @@
|
|||||||
package local
|
package local
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"bytes"
|
|
||||||
"context"
|
"context"
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
"io/ioutil"
|
|
||||||
"net/http"
|
"net/http"
|
||||||
"os"
|
"os"
|
||||||
stdpath "path"
|
stdpath "path"
|
||||||
@ -16,17 +14,18 @@ import (
|
|||||||
|
|
||||||
"github.com/alist-org/alist/v3/internal/conf"
|
"github.com/alist-org/alist/v3/internal/conf"
|
||||||
"github.com/alist-org/alist/v3/internal/driver"
|
"github.com/alist-org/alist/v3/internal/driver"
|
||||||
|
"github.com/alist-org/alist/v3/internal/errs"
|
||||||
"github.com/alist-org/alist/v3/internal/model"
|
"github.com/alist-org/alist/v3/internal/model"
|
||||||
"github.com/alist-org/alist/v3/internal/sign"
|
"github.com/alist-org/alist/v3/internal/sign"
|
||||||
"github.com/alist-org/alist/v3/pkg/utils"
|
"github.com/alist-org/alist/v3/pkg/utils"
|
||||||
"github.com/alist-org/alist/v3/server/common"
|
"github.com/alist-org/alist/v3/server/common"
|
||||||
"github.com/disintegration/imaging"
|
|
||||||
_ "golang.org/x/image/webp"
|
_ "golang.org/x/image/webp"
|
||||||
)
|
)
|
||||||
|
|
||||||
type Local struct {
|
type Local struct {
|
||||||
model.Storage
|
model.Storage
|
||||||
Addition
|
Addition
|
||||||
|
mkdirPerm int32
|
||||||
}
|
}
|
||||||
|
|
||||||
func (d *Local) Config() driver.Config {
|
func (d *Local) Config() driver.Config {
|
||||||
@ -34,6 +33,15 @@ func (d *Local) Config() driver.Config {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (d *Local) Init(ctx context.Context) error {
|
func (d *Local) Init(ctx context.Context) error {
|
||||||
|
if d.MkdirPerm == "" {
|
||||||
|
d.mkdirPerm = 0777
|
||||||
|
} else {
|
||||||
|
v, err := strconv.ParseUint(d.MkdirPerm, 8, 32)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
d.mkdirPerm = int32(v)
|
||||||
|
}
|
||||||
if !utils.Exists(d.GetRootPath()) {
|
if !utils.Exists(d.GetRootPath()) {
|
||||||
return fmt.Errorf("root folder %s not exists", d.GetRootPath())
|
return fmt.Errorf("root folder %s not exists", d.GetRootPath())
|
||||||
}
|
}
|
||||||
@ -44,6 +52,12 @@ func (d *Local) Init(ctx context.Context) error {
|
|||||||
}
|
}
|
||||||
d.Addition.RootFolderPath = abs
|
d.Addition.RootFolderPath = abs
|
||||||
}
|
}
|
||||||
|
if d.ThumbCacheFolder != "" && !utils.Exists(d.ThumbCacheFolder) {
|
||||||
|
err := os.MkdirAll(d.ThumbCacheFolder, os.FileMode(d.mkdirPerm))
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -57,7 +71,7 @@ func (d *Local) GetAddition() driver.Additional {
|
|||||||
|
|
||||||
func (d *Local) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([]model.Obj, error) {
|
func (d *Local) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([]model.Obj, error) {
|
||||||
fullPath := dir.GetPath()
|
fullPath := dir.GetPath()
|
||||||
rawFiles, err := ioutil.ReadDir(fullPath)
|
rawFiles, err := readDir(fullPath)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
@ -67,10 +81,13 @@ func (d *Local) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([
|
|||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
thumb := ""
|
thumb := ""
|
||||||
if d.Thumbnail && utils.GetFileType(f.Name()) == conf.IMAGE {
|
if d.Thumbnail {
|
||||||
thumb = common.GetApiUrl(nil) + stdpath.Join("/d", args.ReqPath, f.Name())
|
typeName := utils.GetFileType(f.Name())
|
||||||
thumb = utils.EncodePath(thumb, true)
|
if typeName == conf.IMAGE || typeName == conf.VIDEO {
|
||||||
thumb += "?type=thumb&sign=" + sign.Sign(stdpath.Join(args.ReqPath, f.Name()))
|
thumb = common.GetApiUrl(nil) + stdpath.Join("/d", args.ReqPath, f.Name())
|
||||||
|
thumb = utils.EncodePath(thumb, true)
|
||||||
|
thumb += "?type=thumb&sign=" + sign.Sign(stdpath.Join(args.ReqPath, f.Name()))
|
||||||
|
}
|
||||||
}
|
}
|
||||||
isFolder := f.IsDir() || isSymlinkDir(f, fullPath)
|
isFolder := f.IsDir() || isSymlinkDir(f, fullPath)
|
||||||
var size int64
|
var size int64
|
||||||
@ -94,29 +111,46 @@ func (d *Local) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([
|
|||||||
return files, nil
|
return files, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (d *Local) Get(ctx context.Context, path string) (model.Obj, error) {
|
||||||
|
path = filepath.Join(d.GetRootPath(), path)
|
||||||
|
f, err := os.Stat(path)
|
||||||
|
if err != nil {
|
||||||
|
if strings.Contains(err.Error(), "cannot find the file") {
|
||||||
|
return nil, errs.ObjectNotFound
|
||||||
|
}
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
isFolder := f.IsDir() || isSymlinkDir(f, path)
|
||||||
|
size := f.Size()
|
||||||
|
if isFolder {
|
||||||
|
size = 0
|
||||||
|
}
|
||||||
|
file := model.Object{
|
||||||
|
Path: path,
|
||||||
|
Name: f.Name(),
|
||||||
|
Modified: f.ModTime(),
|
||||||
|
Size: size,
|
||||||
|
IsFolder: isFolder,
|
||||||
|
}
|
||||||
|
return &file, nil
|
||||||
|
}
|
||||||
|
|
||||||
func (d *Local) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
|
func (d *Local) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
|
||||||
fullPath := file.GetPath()
|
fullPath := file.GetPath()
|
||||||
var link model.Link
|
var link model.Link
|
||||||
if args.Type == "thumb" && utils.Ext(file.GetName()) != "svg" {
|
if args.Type == "thumb" && utils.Ext(file.GetName()) != "svg" {
|
||||||
imgData, err := ioutil.ReadFile(fullPath)
|
buf, thumbPath, err := d.getThumb(file)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
srcBuf := bytes.NewBuffer(imgData)
|
|
||||||
image, err := imaging.Decode(srcBuf)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
thumbImg := imaging.Resize(image, 144, 0, imaging.Lanczos)
|
|
||||||
var buf bytes.Buffer
|
|
||||||
err = imaging.Encode(&buf, thumbImg, imaging.PNG)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
size := buf.Len()
|
|
||||||
link.Data = io.NopCloser(&buf)
|
|
||||||
link.Header = http.Header{
|
link.Header = http.Header{
|
||||||
"Content-Length": []string{strconv.Itoa(size)},
|
"Content-Type": []string{"image/png"},
|
||||||
|
}
|
||||||
|
if thumbPath != nil {
|
||||||
|
link.FilePath = thumbPath
|
||||||
|
} else {
|
||||||
|
link.Data = io.NopCloser(buf)
|
||||||
|
link.Header.Set("Content-Length", strconv.Itoa(buf.Len()))
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
link.FilePath = &fullPath
|
link.FilePath = &fullPath
|
||||||
@ -126,7 +160,7 @@ func (d *Local) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (
|
|||||||
|
|
||||||
func (d *Local) MakeDir(ctx context.Context, parentDir model.Obj, dirName string) error {
|
func (d *Local) MakeDir(ctx context.Context, parentDir model.Obj, dirName string) error {
|
||||||
fullPath := filepath.Join(parentDir.GetPath(), dirName)
|
fullPath := filepath.Join(parentDir.GetPath(), dirName)
|
||||||
err := os.MkdirAll(fullPath, 0700)
|
err := os.MkdirAll(fullPath, os.FileMode(d.mkdirPerm))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
@ -7,8 +7,10 @@ import (
|
|||||||
|
|
||||||
type Addition struct {
|
type Addition struct {
|
||||||
driver.RootPath
|
driver.RootPath
|
||||||
Thumbnail bool `json:"thumbnail" required:"true" help:"enable thumbnail"`
|
Thumbnail bool `json:"thumbnail" required:"true" help:"enable thumbnail"`
|
||||||
ShowHidden bool `json:"show_hidden" default:"true" required:"false" help:"show hidden directories and files"`
|
ThumbCacheFolder string `json:"thumb_cache_folder"`
|
||||||
|
ShowHidden bool `json:"show_hidden" default:"true" required:"false" help:"show hidden directories and files"`
|
||||||
|
MkdirPerm string `json:"mkdir_perm" default:"777"`
|
||||||
}
|
}
|
||||||
|
|
||||||
var config = driver.Config{
|
var config = driver.Config{
|
||||||
|
@ -1,9 +1,19 @@
|
|||||||
package local
|
package local
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"bytes"
|
||||||
|
"fmt"
|
||||||
"io/fs"
|
"io/fs"
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
|
"sort"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"github.com/alist-org/alist/v3/internal/conf"
|
||||||
|
"github.com/alist-org/alist/v3/internal/model"
|
||||||
|
"github.com/alist-org/alist/v3/pkg/utils"
|
||||||
|
"github.com/disintegration/imaging"
|
||||||
|
ffmpeg "github.com/u2takey/ffmpeg-go"
|
||||||
)
|
)
|
||||||
|
|
||||||
func isSymlinkDir(f fs.FileInfo, path string) bool {
|
func isSymlinkDir(f fs.FileInfo, path string) bool {
|
||||||
@ -23,3 +33,79 @@ func isSymlinkDir(f fs.FileInfo, path string) bool {
|
|||||||
}
|
}
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func GetSnapshot(videoPath string, frameNum int) (imgData *bytes.Buffer, err error) {
|
||||||
|
srcBuf := bytes.NewBuffer(nil)
|
||||||
|
err = ffmpeg.Input(videoPath).Filter("select", ffmpeg.Args{fmt.Sprintf("gte(n,%d)", frameNum)}).
|
||||||
|
Output("pipe:", ffmpeg.KwArgs{"vframes": 1, "format": "image2", "vcodec": "mjpeg"}).
|
||||||
|
WithOutput(srcBuf, os.Stdout).
|
||||||
|
Run()
|
||||||
|
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return srcBuf, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func readDir(dirname string) ([]fs.FileInfo, error) {
|
||||||
|
f, err := os.Open(dirname)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
list, err := f.Readdir(-1)
|
||||||
|
f.Close()
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
sort.Slice(list, func(i, j int) bool { return list[i].Name() < list[j].Name() })
|
||||||
|
return list, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *Local) getThumb(file model.Obj) (*bytes.Buffer, *string, error) {
|
||||||
|
fullPath := file.GetPath()
|
||||||
|
thumbPrefix := "alist_thumb_"
|
||||||
|
thumbName := thumbPrefix + utils.GetMD5Encode(fullPath) + ".png"
|
||||||
|
if d.ThumbCacheFolder != "" {
|
||||||
|
// skip if the file is a thumbnail
|
||||||
|
if strings.HasPrefix(file.GetName(), thumbPrefix) {
|
||||||
|
return nil, &fullPath, nil
|
||||||
|
}
|
||||||
|
thumbPath := filepath.Join(d.ThumbCacheFolder, thumbName)
|
||||||
|
if utils.Exists(thumbPath) {
|
||||||
|
return nil, &thumbPath, nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
var srcBuf *bytes.Buffer
|
||||||
|
if utils.GetFileType(file.GetName()) == conf.VIDEO {
|
||||||
|
videoBuf, err := GetSnapshot(fullPath, 10)
|
||||||
|
if err != nil {
|
||||||
|
return nil, nil, err
|
||||||
|
}
|
||||||
|
srcBuf = videoBuf
|
||||||
|
} else {
|
||||||
|
imgData, err := os.ReadFile(fullPath)
|
||||||
|
if err != nil {
|
||||||
|
return nil, nil, err
|
||||||
|
}
|
||||||
|
imgBuf := bytes.NewBuffer(imgData)
|
||||||
|
srcBuf = imgBuf
|
||||||
|
}
|
||||||
|
|
||||||
|
image, err := imaging.Decode(srcBuf)
|
||||||
|
if err != nil {
|
||||||
|
return nil, nil, err
|
||||||
|
}
|
||||||
|
thumbImg := imaging.Resize(image, 144, 0, imaging.Lanczos)
|
||||||
|
var buf bytes.Buffer
|
||||||
|
err = imaging.Encode(&buf, thumbImg, imaging.PNG)
|
||||||
|
if err != nil {
|
||||||
|
return nil, nil, err
|
||||||
|
}
|
||||||
|
if d.ThumbCacheFolder != "" {
|
||||||
|
err = os.WriteFile(filepath.Join(d.ThumbCacheFolder, thumbName), buf.Bytes(), 0666)
|
||||||
|
if err != nil {
|
||||||
|
return nil, nil, err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return &buf, nil, nil
|
||||||
|
}
|
||||||
|
@ -4,6 +4,7 @@ import (
|
|||||||
"context"
|
"context"
|
||||||
"fmt"
|
"fmt"
|
||||||
"net/http"
|
"net/http"
|
||||||
|
"path"
|
||||||
|
|
||||||
"github.com/alist-org/alist/v3/drivers/base"
|
"github.com/alist-org/alist/v3/drivers/base"
|
||||||
"github.com/alist-org/alist/v3/internal/driver"
|
"github.com/alist-org/alist/v3/internal/driver"
|
||||||
@ -75,9 +76,19 @@ func (d *Onedrive) MakeDir(ctx context.Context, parentDir model.Obj, dirName str
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (d *Onedrive) Move(ctx context.Context, srcObj, dstDir model.Obj) error {
|
func (d *Onedrive) Move(ctx context.Context, srcObj, dstDir model.Obj) error {
|
||||||
|
parentPath := ""
|
||||||
|
if dstDir.GetID() == "" {
|
||||||
|
parentPath = dstDir.GetPath()
|
||||||
|
if utils.PathEqual(parentPath, "/") {
|
||||||
|
parentPath = path.Join("/drive/root", parentPath)
|
||||||
|
} else {
|
||||||
|
parentPath = path.Join("/drive/root:/", parentPath)
|
||||||
|
}
|
||||||
|
}
|
||||||
data := base.Json{
|
data := base.Json{
|
||||||
"parentReference": base.Json{
|
"parentReference": base.Json{
|
||||||
"id": dstDir.GetID(),
|
"id": dstDir.GetID(),
|
||||||
|
"path": parentPath,
|
||||||
},
|
},
|
||||||
"name": srcObj.GetName(),
|
"name": srcObj.GetName(),
|
||||||
}
|
}
|
||||||
@ -89,13 +100,15 @@ func (d *Onedrive) Move(ctx context.Context, srcObj, dstDir model.Obj) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (d *Onedrive) Rename(ctx context.Context, srcObj model.Obj, newName string) error {
|
func (d *Onedrive) Rename(ctx context.Context, srcObj model.Obj, newName string) error {
|
||||||
//dstDir, err := op.GetUnwrap(ctx, d, stdpath.Dir(srcObj.GetPath()))
|
|
||||||
var parentID string
|
var parentID string
|
||||||
if o, ok := srcObj.(*Object); ok {
|
if o, ok := srcObj.(*Object); ok {
|
||||||
parentID = o.ParentID
|
parentID = o.ParentID
|
||||||
} else {
|
} else {
|
||||||
return fmt.Errorf("srcObj is not Object")
|
return fmt.Errorf("srcObj is not Object")
|
||||||
}
|
}
|
||||||
|
if parentID == "" {
|
||||||
|
parentID = "root"
|
||||||
|
}
|
||||||
data := base.Json{
|
data := base.Json{
|
||||||
"parentReference": base.Json{
|
"parentReference": base.Json{
|
||||||
"id": parentID,
|
"id": parentID,
|
||||||
|
@ -11,7 +11,7 @@ type Addition struct {
|
|||||||
IsSharepoint bool `json:"is_sharepoint"`
|
IsSharepoint bool `json:"is_sharepoint"`
|
||||||
ClientID string `json:"client_id" required:"true"`
|
ClientID string `json:"client_id" required:"true"`
|
||||||
ClientSecret string `json:"client_secret" required:"true"`
|
ClientSecret string `json:"client_secret" required:"true"`
|
||||||
RedirectUri string `json:"redirect_uri" required:"true" default:"https://tool.nn.ci/onedrive/callback"`
|
RedirectUri string `json:"redirect_uri" required:"true" default:"https://alist.nn.ci/tool/onedrive/callback"`
|
||||||
RefreshToken string `json:"refresh_token" required:"true"`
|
RefreshToken string `json:"refresh_token" required:"true"`
|
||||||
SiteId string `json:"site_id"`
|
SiteId string `json:"site_id"`
|
||||||
ChunkSize int64 `json:"chunk_size" type:"number" default:"5"`
|
ChunkSize int64 `json:"chunk_size" type:"number" default:"5"`
|
||||||
|
@ -43,7 +43,7 @@ type File struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type Object struct {
|
type Object struct {
|
||||||
model.ObjThumbURL
|
model.ObjThumb
|
||||||
ParentID string
|
ParentID string
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -53,7 +53,7 @@ func fileToObj(f File, parentID string) *Object {
|
|||||||
thumb = f.Thumbnails[0].Medium.Url
|
thumb = f.Thumbnails[0].Medium.Url
|
||||||
}
|
}
|
||||||
return &Object{
|
return &Object{
|
||||||
ObjThumbURL: model.ObjThumbURL{
|
ObjThumb: model.ObjThumb{
|
||||||
Object: model.Object{
|
Object: model.Object{
|
||||||
ID: f.Id,
|
ID: f.Id,
|
||||||
Name: f.Name,
|
Name: f.Name,
|
||||||
@ -62,7 +62,7 @@ func fileToObj(f File, parentID string) *Object {
|
|||||||
IsFolder: f.File == nil,
|
IsFolder: f.File == nil,
|
||||||
},
|
},
|
||||||
Thumbnail: model.Thumbnail{Thumbnail: thumb},
|
Thumbnail: model.Thumbnail{Thumbnail: thumb},
|
||||||
Url: model.Url{Url: f.Url},
|
//Url: model.Url{Url: f.Url},
|
||||||
},
|
},
|
||||||
ParentID: parentID,
|
ParentID: parentID,
|
||||||
}
|
}
|
||||||
|
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user