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

4
internal/aria2/add.go
View File

@ -45,10 +45,10 @@ func AddURI(ctx context.Context, uri string, dstDirPath string) error {
return errors.Wrapf(err, "failed to add uri %s", uri)
}
// TODO add to task manager
TaskManager.Submit(task.WithCancelCtx(&task.Task[string, interface{}]{
TaskManager.Submit(task.WithCancelCtx(&task.Task[string]{
ID: gid,
Name: fmt.Sprintf("download %s to [%s](%s)", uri, account.GetAccount().VirtualPath, dstDirActualPath),
Func: func(tsk *task.Task[string, interface{}]) error {
Func: func(tsk *task.Task[string]) error {
m := &Monitor{
tsk: tsk,
tempDir: tempDir,

2
internal/aria2/aria2.go
View File

@ -8,7 +8,7 @@ import (
"time"
)
var TaskManager = task.NewTaskManager[string, interface{}](3)
var TaskManager = task.NewTaskManager[string](3)
var notify = NewNotify()
var client rpc.Client

8
internal/aria2/monitor.go
View File

@ -17,7 +17,7 @@ import (
)
type Monitor struct {
tsk *task.Task[string, interface{}]
tsk *task.Task[string]
tempDir string
retried int
c chan int
@ -92,7 +92,7 @@ func (m *Monitor) Update() (bool, error) {
}
}
var transferTaskManager = task.NewTaskManager[uint64, interface{}](3, func(k *uint64) {
var transferTaskManager = task.NewTaskManager[uint64](3, func(k *uint64) {
atomic.AddUint64(k, 1)
})
@ -118,9 +118,9 @@ func (m *Monitor) Complete() error {
}
}()
for _, file := range files {
transferTaskManager.Submit(task.WithCancelCtx[uint64](&task.Task[uint64, interface{}]{
transferTaskManager.Submit(task.WithCancelCtx[uint64](&task.Task[uint64]{
Name: fmt.Sprintf("transfer %s to %s", file.Path, m.dstDirPath),
Func: func(tsk *task.Task[uint64, interface{}]) error {
Func: func(tsk *task.Task[uint64]) error {
defer wg.Done()
size, _ := strconv.ParseUint(file.Length, 10, 64)
mimetype := mime.TypeByExtension(path.Ext(file.Path))