ProjectHentai/alist
6
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(task): remove Data field

Browse Source
This commit is contained in:
Noah Hsu
2022-06-22 19:28:41 +08:00
parent a6df492fff
commit 3fe0a7bf6b
8 changed files with 55 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
pkg/task/manager.go
View File

@ -5,14 +5,14 @@ import (
log "github.com/sirupsen/logrus"
)
type Manager[K comparable, V any] struct {
type Manager[K comparable] struct {
workerC chan struct{}
curID K
updateID func(*K)
tasks generic_sync.MapOf[K, *Task[K, V]]
tasks generic_sync.MapOf[K, *Task[K]]
}
func (tm *Manager[K, V]) Submit(task *Task[K, V]) K {
func (tm *Manager[K]) Submit(task *Task[K]) K {
if tm.updateID != nil {
task.ID = tm.curID
tm.updateID(&task.ID)
@ -22,7 +22,7 @@ func (tm *Manager[K, V]) Submit(task *Task[K, V]) K {
return task.ID
}
func (tm *Manager[K, V]) do(task *Task[K, V]) {
func (tm *Manager[K]) do(task *Task[K]) {
go func() {
log.Debugf("task [%s] waiting for worker", task.Name)
select {
@ -36,20 +36,20 @@ func (tm *Manager[K, V]) do(task *Task[K, V]) {
}()
}
func (tm *Manager[K, V]) GetAll() []*Task[K, V] {
func (tm *Manager[K]) GetAll() []*Task[K] {
return tm.tasks.Values()
}
func (tm *Manager[K, V]) Get(tid K) (*Task[K, V], bool) {
func (tm *Manager[K]) Get(tid K) (*Task[K], bool) {
return tm.tasks.Load(tid)
}
func (tm *Manager[K, V]) MustGet(tid K) *Task[K, V] {
func (tm *Manager[K]) MustGet(tid K) *Task[K] {
task, _ := tm.Get(tid)
return task
}
func (tm *Manager[K, V]) Retry(tid K) error {
func (tm *Manager[K]) Retry(tid K) error {
t, ok := tm.Get(tid)
if !ok {
return ErrTaskNotFound
@ -58,7 +58,7 @@ func (tm *Manager[K, V]) Retry(tid K) error {
return nil
}
func (tm *Manager[K, V]) Cancel(tid K) error {
func (tm *Manager[K]) Cancel(tid K) error {
t, ok := tm.Get(tid)
if !ok {
return ErrTaskNotFound
@ -67,17 +67,17 @@ func (tm *Manager[K, V]) Cancel(tid K) error {
return nil
}
func (tm *Manager[K, V]) Remove(tid K) {
func (tm *Manager[K]) Remove(tid K) {
tm.tasks.Delete(tid)
}
// RemoveAll removes all tasks from the manager, this maybe shouldn't be used
// because the task maybe still running.
func (tm *Manager[K, V]) RemoveAll() {
func (tm *Manager[K]) RemoveAll() {
tm.tasks.Clear()
}
func (tm *Manager[K, V]) RemoveFinished() {
func (tm *Manager[K]) RemoveFinished() {
tasks := tm.GetAll()
for _, task := range tasks {
if task.Status == FINISHED {
@ -86,7 +86,7 @@ func (tm *Manager[K, V]) RemoveFinished() {
}
}
func (tm *Manager[K, V]) RemoveError() {
func (tm *Manager[K]) RemoveError() {
tasks := tm.GetAll()
for _, task := range tasks {
if task.Error != nil {
@ -95,9 +95,9 @@ func (tm *Manager[K, V]) RemoveError() {
}
}
func NewTaskManager[K comparable, V any](maxWorker int, updateID ...func(*K)) *Manager[K, V] {
tm := &Manager[K, V]{
tasks: generic_sync.MapOf[K, *Task[K, V]]{},
func NewTaskManager[K comparable](maxWorker int, updateID ...func(*K)) *Manager[K] {
tm := &Manager[K]{
tasks: generic_sync.MapOf[K, *Task[K]]{},
workerC: make(chan struct{}, maxWorker),
}
for i := 0; i < maxWorker; i++ {

24
pkg/task/task.go
View File

@ -16,34 +16,32 @@ var (
ERRORED = "errored"
)
type Func[K comparable, V any] func(task *Task[K, V]) error
type Callback[K comparable, V any] func(task *Task[K, V])
type Func[K comparable] func(task *Task[K]) error
type Callback[K comparable] func(task *Task[K])
type Task[K comparable, V any] struct {
type Task[K comparable] struct {
ID K
Name string
Status string
Error error
Data V
Func Func[K, V]
callback Callback[K, V]
Func Func[K]
callback Callback[K]
Ctx context.Context
progress int
cancel context.CancelFunc
}
func (t *Task[K, V]) SetStatus(status string) {
func (t *Task[K]) SetStatus(status string) {
t.Status = status
}
func (t *Task[K, V]) SetProgress(percentage int) {
func (t *Task[K]) SetProgress(percentage int) {
t.progress = percentage
}
func (t *Task[K, V]) run() {
func (t *Task[K]) run() {
t.Status = RUNNING
defer func() {
if err := recover(); err != nil {
@ -68,11 +66,11 @@ func (t *Task[K, V]) run() {
}
}
func (t *Task[K, V]) retry() {
func (t *Task[K]) retry() {
t.run()
}
func (t *Task[K, V]) Cancel() {
func (t *Task[K]) Cancel() {
if t.Status == FINISHED || t.Status == CANCELED {
return
}
@ -83,7 +81,7 @@ func (t *Task[K, V]) Cancel() {
t.Status = CANCELING
}
func WithCancelCtx[K comparable, V any](task *Task[K, V]) *Task[K, V] {
func WithCancelCtx[K comparable](task *Task[K]) *Task[K] {
ctx, cancel := context.WithCancel(context.Background())
task.Ctx = ctx
task.cancel = cancel

18
pkg/task/task_test.go
View File

@ -9,12 +9,12 @@ import (
)
func TestTask_Manager(t *testing.T) {
tm := NewTaskManager[uint64, struct{}](3, func(id *uint64) {
tm := NewTaskManager[uint64](3, func(id *uint64) {
atomic.AddUint64(id, 1)
})
id := tm.Submit(WithCancelCtx(&Task[uint64, struct{}]{
id := tm.Submit(WithCancelCtx(&Task[uint64]{
Name: "test",
Func: func(task *Task[uint64, struct{}]) error {
Func: func(task *Task[uint64]) error {
time.Sleep(time.Millisecond * 500)
return nil
},
@ -34,12 +34,12 @@ func TestTask_Manager(t *testing.T) {
}
func TestTask_Cancel(t *testing.T) {
tm := NewTaskManager[uint64, struct{}](3, func(id *uint64) {
tm := NewTaskManager[uint64](3, func(id *uint64) {
atomic.AddUint64(id, 1)
})
id := tm.Submit(WithCancelCtx(&Task[uint64, struct{}]{
id := tm.Submit(WithCancelCtx(&Task[uint64]{
Name: "test",
Func: func(task *Task[uint64, struct{}]) error {
Func: func(task *Task[uint64]) error {
for {
if utils.IsCanceled(task.Ctx) {
return nil
@ -62,13 +62,13 @@ func TestTask_Cancel(t *testing.T) {
}
func TestTask_Retry(t *testing.T) {
tm := NewTaskManager[uint64, struct{}](3, func(id *uint64) {
tm := NewTaskManager[uint64](3, func(id *uint64) {
atomic.AddUint64(id, 1)
})
num := 0
id := tm.Submit(WithCancelCtx(&Task[uint64, struct{}]{
id := tm.Submit(WithCancelCtx(&Task[uint64]{
Name: "test",
Func: func(task *Task[uint64, struct{}]) error {
Func: func(task *Task[uint64]) error {
num++
if num&1 == 1 {
return errors.New("test error")