opensource/cloudreve
1
0
Fork 0
mirror of https://github.com/cloudreve/cloudreve.git synced 2025-11-04 04:47:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: incorrect progress count (#1379)

Browse Source 
* fix: incorrect progress count

文件中转 已完成文件计数 应在文件成功上传后+1 #1367

* fix failed ut

Co-authored-by: HFO4 <912394456@qq.com>
This commit is contained in:
小白-白
2022-07-12 19:30:41 +08:00
committed by GitHub
parent c99b36f788
commit 9869671633
2 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/task/tranfer.go
View File

@ -96,9 +96,8 @@ func (job *TransferTask) Do() {
return return
} }
for index, file := range job.TaskProps.Src { successCount := 0
job.TaskModel.SetProgress(index) for _, file := range job.TaskProps.Src {
dst := path.Join(job.TaskProps.Dst, filepath.Base(file)) dst := path.Join(job.TaskProps.Dst, filepath.Base(file))
if job.TaskProps.TrimPath { if job.TaskProps.TrimPath {
// 保留原始目录 // 保留原始目录
@ -132,6 +131,9 @@ func (job *TransferTask) Do() {
if err != nil { if err != nil {
job.SetErrorMsg("文件转存失败", err) job.SetErrorMsg("文件转存失败", err)
} else {
successCount++
job.TaskModel.SetProgress(successCount)
} }
} }

10
pkg/task/transfer_test.go
View File

@ -88,11 +88,6 @@ func TestTransferTask_Do(t *testing.T) {
} }
task.TaskProps.Src = []string{"test/not_exist"} task.TaskProps.Src = []string{"test/not_exist"}
task.TaskProps.Parent = "test/not_exist" task.TaskProps.Parent = "test/not_exist"
// 更新进度
mock.ExpectBegin()
mock.ExpectExec("UPDATE(.+)").WillReturnResult(sqlmock.NewResult(1,
1))
mock.ExpectCommit()
// 更新错误 // 更新错误
mock.ExpectBegin() mock.ExpectBegin()
mock.ExpectExec("UPDATE(.+)").WillReturnResult(sqlmock.NewResult(1, mock.ExpectExec("UPDATE(.+)").WillReturnResult(sqlmock.NewResult(1,
@ -113,11 +108,6 @@ func TestTransferTask_Do(t *testing.T) {
task.TaskProps.Src = []string{"test/not_exist"} task.TaskProps.Src = []string{"test/not_exist"}
task.TaskProps.Parent = "test/not_exist" task.TaskProps.Parent = "test/not_exist"
task.TaskProps.TrimPath = true task.TaskProps.TrimPath = true
// 更新进度
mock.ExpectBegin()
mock.ExpectExec("UPDATE(.+)").WillReturnResult(sqlmock.NewResult(1,
1))
mock.ExpectCommit()
// 更新错误 // 更新错误
mock.ExpectBegin() mock.ExpectBegin()
mock.ExpectExec("UPDATE(.+)").WillReturnResult(sqlmock.NewResult(1, mock.ExpectExec("UPDATE(.+)").WillReturnResult(sqlmock.NewResult(1,