From 73c0c0bf448ee016c1818ab795c8f2fead778c39 Mon Sep 17 00:00:00 2001 From: Noah Hsu Date: Fri, 17 Jun 2022 21:38:37 +0800 Subject: [PATCH] chore: export copy and upload task manager --- internal/fs/copy.go | 8 ++++---- internal/fs/put.go | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/fs/copy.go b/internal/fs/copy.go index aa9b7c33..2c4a8a0c 100644 --- a/internal/fs/copy.go +++ b/internal/fs/copy.go @@ -13,7 +13,7 @@ import ( "github.com/pkg/errors" ) -var copyTaskManager = task.NewTaskManager() +var CopyTaskManager = task.NewTaskManager() // Copy if in an account, call move method // if not, add copy task @@ -31,7 +31,7 @@ func Copy(ctx context.Context, account driver.Driver, srcPath, dstPath string) ( return false, operations.Copy(ctx, account, srcActualPath, dstActualPath) } // not in an account - copyTaskManager.Add(fmt.Sprintf("copy [%s](%s) to [%s](%s)", srcAccount.GetAccount().VirtualPath, srcActualPath, dstAccount.GetAccount().VirtualPath, dstActualPath), func(task *task.Task) error { + CopyTaskManager.Add(fmt.Sprintf("copy [%s](%s) to [%s](%s)", srcAccount.GetAccount().VirtualPath, srcActualPath, dstAccount.GetAccount().VirtualPath, dstActualPath), func(task *task.Task) error { return CopyBetween2Accounts(task.Ctx, srcAccount, dstAccount, srcActualPath, dstActualPath, task.SetStatus) }) return true, nil @@ -55,12 +55,12 @@ func CopyBetween2Accounts(ctx context.Context, srcAccount, dstAccount driver.Dri } srcObjPath := stdpath.Join(srcPath, obj.GetName()) dstObjPath := stdpath.Join(dstPath, obj.GetName()) - copyTaskManager.Add(fmt.Sprintf("copy [%s](%s) to [%s](%s)", srcAccount.GetAccount().VirtualPath, srcObjPath, dstAccount.GetAccount().VirtualPath, dstObjPath), func(task *task.Task) error { + CopyTaskManager.Add(fmt.Sprintf("copy [%s](%s) to [%s](%s)", srcAccount.GetAccount().VirtualPath, srcObjPath, dstAccount.GetAccount().VirtualPath, dstObjPath), func(task *task.Task) error { return CopyBetween2Accounts(ctx, srcAccount, dstAccount, srcObjPath, dstObjPath, task.SetStatus) }) } } else { - copyTaskManager.Add(fmt.Sprintf("copy [%s](%s) to [%s](%s)", srcAccount.GetAccount().VirtualPath, srcPath, dstAccount.GetAccount().VirtualPath, dstPath), func(task *task.Task) error { + CopyTaskManager.Add(fmt.Sprintf("copy [%s](%s) to [%s](%s)", srcAccount.GetAccount().VirtualPath, srcPath, dstAccount.GetAccount().VirtualPath, dstPath), func(task *task.Task) error { return CopyFileBetween2Accounts(task.Ctx, srcAccount, dstAccount, srcPath, dstPath, func(percentage float64) { task.SetStatus(fmt.Sprintf("uploading: %2.f%", percentage)) }) diff --git a/internal/fs/put.go b/internal/fs/put.go index edb1b916..6c2ce412 100644 --- a/internal/fs/put.go +++ b/internal/fs/put.go @@ -10,7 +10,7 @@ import ( "github.com/pkg/errors" ) -var uploadTaskManager = task.NewTaskManager() +var UploadTaskManager = task.NewTaskManager() // Put add as a put task func Put(ctx context.Context, account driver.Driver, parentPath string, file model.FileStreamer) error { @@ -18,7 +18,7 @@ func Put(ctx context.Context, account driver.Driver, parentPath string, file mod if err != nil { return errors.WithMessage(err, "failed get account") } - uploadTaskManager.Add(fmt.Sprintf("upload %s to [%s](%s)", file.GetName(), account.GetAccount().VirtualPath, actualParentPath), func(task *task.Task) error { + UploadTaskManager.Add(fmt.Sprintf("upload %s to [%s](%s)", file.GetName(), account.GetAccount().VirtualPath, actualParentPath), func(task *task.Task) error { return operations.Put(task.Ctx, account, actualParentPath, file, nil) }) return nil