From 9869671633d25785be36cd0f1e1437c5c05d84cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E7=99=BD-=E7=99=BD?= Date: Tue, 12 Jul 2022 19:30:41 +0800 Subject: [PATCH] fix: incorrect progress count (#1379) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: incorrect progress count 文件中转 已完成文件计数 应在文件成功上传后+1 #1367 * fix failed ut Co-authored-by: HFO4 <912394456@qq.com> --- pkg/task/tranfer.go | 8 +++++--- pkg/task/transfer_test.go | 10 ---------- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/pkg/task/tranfer.go b/pkg/task/tranfer.go index 596ae9e..5f9aa58 100644 --- a/pkg/task/tranfer.go +++ b/pkg/task/tranfer.go @@ -96,9 +96,8 @@ func (job *TransferTask) Do() { return } - for index, file := range job.TaskProps.Src { - job.TaskModel.SetProgress(index) - + successCount := 0 + for _, file := range job.TaskProps.Src { dst := path.Join(job.TaskProps.Dst, filepath.Base(file)) if job.TaskProps.TrimPath { // 保留原始目录 @@ -132,6 +131,9 @@ func (job *TransferTask) Do() { if err != nil { job.SetErrorMsg("文件转存失败", err) + } else { + successCount++ + job.TaskModel.SetProgress(successCount) } } diff --git a/pkg/task/transfer_test.go b/pkg/task/transfer_test.go index 94301f6..612a453 100644 --- a/pkg/task/transfer_test.go +++ b/pkg/task/transfer_test.go @@ -88,11 +88,6 @@ func TestTransferTask_Do(t *testing.T) { } task.TaskProps.Src = []string{"test/not_exist"} task.TaskProps.Parent = "test/not_exist" - // 更新进度 - mock.ExpectBegin() - mock.ExpectExec("UPDATE(.+)").WillReturnResult(sqlmock.NewResult(1, - 1)) - mock.ExpectCommit() // 更新错误 mock.ExpectBegin() 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.Parent = "test/not_exist" task.TaskProps.TrimPath = true - // 更新进度 - mock.ExpectBegin() - mock.ExpectExec("UPDATE(.+)").WillReturnResult(sqlmock.NewResult(1, - 1)) - mock.ExpectCommit() // 更新错误 mock.ExpectBegin() mock.ExpectExec("UPDATE(.+)").WillReturnResult(sqlmock.NewResult(1,