Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

general: fix form upload when ticked "As A Task" #5145

Merged
merged 17 commits into from
Sep 3, 2023
Merged

general: fix form upload when ticked "As A Task" #5145

merged 17 commits into from
Sep 3, 2023

Conversation

SeanHeuc
Copy link
Member

@SeanHeuc SeanHeuc commented Sep 2, 2023 •
edited

Close #5134

@SeanHeuc
general: hash support; cross-storage rapid-upload support; enhance up…
7fcf224 
…load to avoid local temp file if possible; replace readseekcloser with File interface to speed up stream operations

(cherry picked from commit d92db01)
@SeanHeuc
general: fix merge conflict
9e335bc
@SeanHeuc
general: remove useless code
3b7b310 
(cherry picked from commit b1f395e)
@SeanHeuc
general: tidy hash code
b57bfe4 
(cherry picked from commit e311a86)
@SeanHeuc
feat(local): fix createTime
f56ca27
@SeanHeuc
feat(aliyundrive_open): fix upload
89602a9 
(cherry picked from commit 09d4813)
@SeanHeuc
general: make downloader buffer size fixed
839ca74 
(cherry picked from commit a200e71)
@SeanHeuc
Merge branch 'main_upstream' into main-pr-ready
3239495 
# Conflicts:
#	go.sum
@SeanHeuc
feat(115,aliyundrive_open) improve upload, enable cross storage rapid…
f0914bf 
…-upload

(cherry picked from commit bbd538a)
@SeanHeuc
feat(115): add comment
1b92c82 
(cherry picked from commit a511590)
@SeanHeuc
feat(baidu_netdisk): fix updateTime&createTime
fc0272e 
(cherry picked from commit e74e8e0)
@SeanHeuc
general: fix go.sum
1caaa0a
@SeanHeuc
Merge branch 'main_upstream' into main-pr-ready
12bdf9b 
# Conflicts:
#	drivers/local/driver.go
#	internal/stream/stream.go
@SeanHeuc
general: fix updateTime, createTime and HashInfo in alist
c5d2ffb
@SeanHeuc
general: fix form upload "As A Task"
c85e91f 
(cherry picked from commit bf4509a)
@SeanHeuc
Merge branch 'main_upstream' into main-pr-ready
59fee46
@anwen-anyi
Copy link
Member

anwen-anyi commented Sep 3, 2023 •
edited

以下测试结果

测试只测试了[百度，阿里，移动，天翼，115]，并未全部测试，成功的截图就不截图占地方了，有失败任务的再单独截图

百度云盘

Stream：正常✅（测试文件大小为78M/69M/67M）

  • 添加为任务：正常✅（测试文件大小为88M/84M/82M）

Form：正常✅（测试文件大小为55M/69M/60M）

  • 添加为任务：正常✅（测试文件大小为58M/80M/74M）

修改时间：正常✅

百度偶尔会出现这个错误，感觉这是百度的问题：

image-20230903101055985

阿里云盘

开启秒传

115/阿里互传：正常✅

正常上传文件秒传：正常✅

从其他存储复制到阿里：正常✅（测试文件大小为222M/226M/218M）

Stream：正常✅（测试文件大小为190M/221M/272M）

  • 添加为任务：不正常❌（测试文件大小为248M/271M/265M）
    • 添加为任务后并未秒传[图一]，网盘已经有了的[图二]，然后最后还报错了[图三]，日志信息已固定，多次测试依旧提示如下信息
    • image-20230903105944778

Form：正常✅（测试文件大小为308M/314M/344M）

  • 添加为任务：正常✅（测试文件大小为270M/344M/280M）

修改时间：不正常❌截图如下

image-20230903110927503

未开启秒传

从其他存储复制到阿里：正常✅（测试文件大小为43M/92M/127M）

Stream：正常✅（测试文件大小为74M/69M/67M）

  • 添加为任务：正常✅（测试文件大小为82M/80M/78M）

Form：正常✅（测试文件大小为66M/65M/65M）

  • 添加为任务：正常✅（测试文件大小为88M/84M/82M）

修改时间：不正常❌，截图如下

image-20230903104853629

移动云盘

Stream：正常✅（测试文件大小为74M/69M/67M）

  • 添加为任务：正常✅（测试文件大小为82M/80M/78M）

Form：正常✅（测试文件大小为66M/65M/65M）

  • 添加为任务：正常✅（测试文件大小为88M/84M/82M）

修改时间：不正常❌，截图如下

image-20230903102520960

天翼云盘

Stream：正常✅（测试文件大小为74M/69M/67M）

  • 添加为任务：正常✅（测试文件大小为82M/80M/78M）

Form：正常✅（测试文件大小为66M/65M/65M）

  • 添加为任务：正常✅（测试文件大小为82M/84M/82M）

修改时间：不正常❌，截图如下

image-20230903103319427

115云盘

115/阿里互传：正常✅

其他存储跨存储秒传：正常✅

正常上传文件秒传：正常✅

Stream：正常✅（测试文件大小为74M/69M/67M）

  • 添加为任务：正常✅（测试文件大小为82M/80M/78M）

Form：正常✅（测试文件大小为66M/65M/65M）

  • 添加为任务：正常✅（测试文件大小为82M/84M/82M）

修改时间：不正常❌，截图就不截了 和上面的一样

@anwen-anyi
Copy link
Member

目前测试有问题的只有 阿里云盘_开启秒传_Stream模式_添加为任务 会出错，错误详细看上一条内容。

@SeanHeuc
Copy link
Member Author

SeanHeuc commented Sep 3, 2023

修改时间不正常应该是你用的前端不是最新的main分支的吧，需要前端把修改时间传过来才行，老版本前端不传的

@anwen-anyi
Copy link
Member

anwen-anyi commented Sep 3, 2023 •
edited

修改时间不正常应该是你用的前端不是最新的main分支的吧，需要前端把修改时间传过来才行，老版本前端不传的

这个不知道，我用的你提交代码在 Action自动构建的，倒是百度的是正确的 😹 xhofe好像提交了这个修复？

  • 刚也新测试了115 加到了上面测试内容文本里面了，没有任何问题(除了时间哪个问题)。

xhofe
xhofe reviewed Sep 3, 2023
View reviewed changes
server/handles/fsup.go Outdated Show resolved Hide resolved
@SeanHeuc
general: fix "stream upload" in web
71c8be2 
(cherry picked from commit 42ed0ed)
@pull-request-size pull-request-size bot added size/L and removed size/M labels Sep 3, 2023
@SeanHeuc
Copy link
Member Author

SeanHeuc commented Sep 3, 2023

阿里云服务器在上传时不接受local_created_at和local_modified_at，上传成功但是local_created_at和local_modified_at为空，而created_at和updated_at为上传发生的时间。这个等后人修复吧

@anwen-anyi
Copy link
Member

更新时间的不重要，等后人修复吧 😹 😹 😹

@SeanHeuc SeanHeuc mentioned this pull request Sep 3, 2023
Closed
@xhofe xhofe merged commit e7c0d94 into alist-org:main Sep 3, 2023
1 of 2 checks passed
@SeanHeuc SeanHeuc mentioned this pull request Sep 3, 2023
Merged
@anwen-anyi
Copy link
Member

合并的太快啦~ 😹 😹
百度的依然是 随机出现上述提到的问题，就是百度服务器的问题 没法人工干预了。

  • 重新测试了[移动 天翼 百度 阿里 115] 的两种上传,四种模式，没问题。

  • 其他存储秒传到115没有问题

  • 阿里秒传到115没有问题

  • 其他存储秒传到阿里，有一点儿问题，很奇怪，唯独个别文件不行，例如ffmpeg.exe ，在上一版的时候 这个没问题，报错信息如下

HttpMessageNotReadableException:JSON parse error: Cannot deserialize value of type `java.util.Date` from String "2018-07-25T07:53:20Z": expected format "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'"; nested exception is com.fasterxml.jackson.databind.exc.InvalidFormatException: Cannot deserialize value of type `java.util.Date` from String "2018-07-25T07:53:20Z": expected format "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'" at [Source: (PushbackInputStream); line: 1, column: 115] (through reference chain: com.alibaba.ic.adrive.common.model.pds.file.req.PdsCreateFileWithProofReq["local_modified_at"])

image

  • 115秒传到阿里有一点儿问题，报错信息一样，但是同样的文件从本地跨存储秒传到阿里没问题，115跨存储秒传到阿里就这样的的错误
    image

同样的文件从本地跨存储到阿里秒传没有报错

image

@SeanHeuc SeanHeuc deleted the main-pr-ready branch September 3, 2023 09:11
@xhofe xhofe added this to the v3.27.0 milestone Sep 3, 2023
@zimq
Copy link

zimq commented Sep 20, 2023 •
edited

提示一下115非会员账号上传单文件大小限制5g

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@xhofe xhofe xhofe approved these changes

Assignees
No one assigned
Labels
size/L
Projects
None yet
Milestone
v3.27.0
Development

Successfully merging this pull request may close these issues.

Multipart file was closed before reading when use form+asTask to upload
4 participants
@SeanHeuc @anwen-anyi @zimq @xhofe