github
/
alist
mirror of https://github.com/Xhofe/alist
1
0
Fork 0
Code Issues Releases Wiki Activity

feat: add progress for task

refactor/fs
Noah Hsu 2022-06-18 20:06:45 +08:00
parent 6ad2cf2003
commit adf0178bb7
4 changed files with 29 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/driver/driver.go
View File

@ -53,4 +53,4 @@ type Writer interface {
Put(ctx context.Context, parentDir model.Obj, stream model.FileStreamer, up UpdateProgress) error Put(ctx context.Context, parentDir model.Obj, stream model.FileStreamer, up UpdateProgress) error
} }
type UpdateProgress func(percentage float64) type UpdateProgress func(percentage int)

32
internal/fs/copy.go
View File

@ -35,53 +35,51 @@ func Copy(ctx context.Context, account driver.Driver, srcPath, dstPath string) (
CopyTaskManager.Add( CopyTaskManager.Add(
fmt.Sprintf("copy [%s](%s) to [%s](%s)", srcAccount.GetAccount().VirtualPath, srcActualPath, dstAccount.GetAccount().VirtualPath, dstActualPath), fmt.Sprintf("copy [%s](%s) to [%s](%s)", srcAccount.GetAccount().VirtualPath, srcActualPath, dstAccount.GetAccount().VirtualPath, dstActualPath),
func(task *task.Task) error { func(task *task.Task) error {
return CopyBetween2Accounts(task.Ctx, srcAccount, dstAccount, srcActualPath, dstActualPath, task.SetStatus) return CopyBetween2Accounts(task, srcAccount, dstAccount, srcActualPath, dstActualPath)
}) })
return true, nil return true, nil
} }
func CopyBetween2Accounts(ctx context.Context, srcAccount, dstAccount driver.Driver, srcPath, dstPath string, setStatus func(status string)) error { func CopyBetween2Accounts(t *task.Task, srcAccount, dstAccount driver.Driver, srcPath, dstPath string) error {
setStatus("getting src object") t.SetStatus("getting src object")
srcObj, err := operations.Get(ctx, srcAccount, srcPath) srcObj, err := operations.Get(t.Ctx, srcAccount, srcPath)
if err != nil { if err != nil {
return errors.WithMessagef(err, "failed get src [%s] file", srcPath) return errors.WithMessagef(err, "failed get src [%s] file", srcPath)
} }
if srcObj.IsDir() { if srcObj.IsDir() {
setStatus("src object is dir, listing objs") t.SetStatus("src object is dir, listing objs")
objs, err := operations.List(ctx, srcAccount, srcPath) objs, err := operations.List(t.Ctx, srcAccount, srcPath)
if err != nil { if err != nil {
return errors.WithMessagef(err, "failed list src [%s] objs", srcPath) return errors.WithMessagef(err, "failed list src [%s] objs", srcPath)
} }
for _, obj := range objs { for _, obj := range objs {
if utils.IsCanceled(ctx) { if utils.IsCanceled(t.Ctx) {
return nil return nil
} }
srcObjPath := stdpath.Join(srcPath, obj.GetName()) srcObjPath := stdpath.Join(srcPath, obj.GetName())
dstObjPath := stdpath.Join(dstPath, obj.GetName()) dstObjPath := stdpath.Join(dstPath, obj.GetName())
CopyTaskManager.Add( CopyTaskManager.Add(
fmt.Sprintf("copy [%s](%s) to [%s](%s)", srcAccount.GetAccount().VirtualPath, srcObjPath, dstAccount.GetAccount().VirtualPath, dstObjPath), fmt.Sprintf("copy [%s](%s) to [%s](%s)", srcAccount.GetAccount().VirtualPath, srcObjPath, dstAccount.GetAccount().VirtualPath, dstObjPath),
func(task *task.Task) error { func(t *task.Task) error {
return CopyBetween2Accounts(ctx, srcAccount, dstAccount, srcObjPath, dstObjPath, task.SetStatus) return CopyBetween2Accounts(t, srcAccount, dstAccount, srcObjPath, dstObjPath)
}) })
} }
} else { } else {
CopyTaskManager.Add( CopyTaskManager.Add(
fmt.Sprintf("copy [%s](%s) to [%s](%s)", srcAccount.GetAccount().VirtualPath, srcPath, dstAccount.GetAccount().VirtualPath, dstPath), fmt.Sprintf("copy [%s](%s) to [%s](%s)", srcAccount.GetAccount().VirtualPath, srcPath, dstAccount.GetAccount().VirtualPath, dstPath),
func(task *task.Task) error { func(t *task.Task) error {
return CopyFileBetween2Accounts(task.Ctx, srcAccount, dstAccount, srcPath, dstPath, func(percentage float64) { return CopyFileBetween2Accounts(t, srcAccount, dstAccount, srcPath, dstPath)
task.SetStatus(fmt.Sprintf("uploading: %2.f%%", percentage))
})
}) })
} }
return nil return nil
} }
func CopyFileBetween2Accounts(ctx context.Context, srcAccount, dstAccount driver.Driver, srcPath, dstPath string, up driver.UpdateProgress) error { func CopyFileBetween2Accounts(t *task.Task, srcAccount, dstAccount driver.Driver, srcPath, dstPath string) error {
srcFile, err := operations.Get(ctx, srcAccount, srcPath) srcFile, err := operations.Get(t.Ctx, srcAccount, srcPath)
if err != nil { if err != nil {
return errors.WithMessagef(err, "failed get src [%s] file", srcPath) return errors.WithMessagef(err, "failed get src [%s] file", srcPath)
} }
link, err := operations.Link(ctx, srcAccount, srcPath, model.LinkArgs{}) link, err := operations.Link(t.Ctx, srcAccount, srcPath, model.LinkArgs{})
if err != nil { if err != nil {
return errors.WithMessagef(err, "failed get [%s] link", srcPath) return errors.WithMessagef(err, "failed get [%s] link", srcPath)
} }
@ -89,5 +87,5 @@ func CopyFileBetween2Accounts(ctx context.Context, srcAccount, dstAccount driver
if err != nil { if err != nil {
return errors.WithMessagef(err, "failed get [%s] stream", srcPath) return errors.WithMessagef(err, "failed get [%s] stream", srcPath)
} }
return operations.Put(ctx, dstAccount, dstPath, stream, up) return operations.Put(t.Ctx, dstAccount, dstPath, stream, t.SetProgress)
} }

1
pkg/task/manager.go
View File

@ -8,6 +8,7 @@ import (
) )
type Manager struct { type Manager struct {
works uint
curID uint64 curID uint64
tasks generic_sync.MapOf[uint64, *Task] tasks generic_sync.MapOf[uint64, *Task]
} }

5
pkg/task/task.go
View File

@ -22,6 +22,7 @@ type Task struct {
Status string Status string
Error error Error error
Func Func Func Func
Progress int
Ctx context.Context Ctx context.Context
cancel context.CancelFunc cancel context.CancelFunc
} }
@ -41,6 +42,10 @@ func (t *Task) SetStatus(status string) {
t.Status = status t.Status = status
} }
func (t *Task) SetProgress(percentage int) {
t.Progress = percentage
}
func (t *Task) Run() { func (t *Task) Run() {
t.Status = RUNNING t.Status = RUNNING
t.Error = t.Func(t) t.Error = t.Func(t)