mirror of
https://github.com/GopeedLab/gopeed.git
synced 2026-11-17 13:53:41 +00:00
fix: sort of completed tasks (#297)
This commit is contained in:
7 files changed
+25
-19
No files matched your search
@@ -572,7 +572,8 @@ func (d *Downloader) getProtocolConfig(name string, v any) bool {
|
|||||||
func (d *Downloader) watch(task *Task) {
|
func (d *Downloader) watch(task *Task) {
|
||||||
err := task.fetcher.Wait()
|
err := task.fetcher.Wait()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
task.Status = base.DownloadStatusError
|
task.updateStatus(base.DownloadStatusError)
|
||||||
|
d.storage.Put(bucketTask, task.ID, task.clone())
|
||||||
d.emit(EventKeyError, task, err)
|
d.emit(EventKeyError, task, err)
|
||||||
} else {
|
} else {
|
||||||
task.Progress.Used = task.timer.Used()
|
task.Progress.Used = task.timer.Used()
|
||||||
@@ -586,7 +587,7 @@ func (d *Downloader) watch(task *Task) {
|
|||||||
totalSize := task.Meta.Res.Size
|
totalSize := task.Meta.Res.Size
|
||||||
task.Progress.Speed = totalSize / used
|
task.Progress.Speed = totalSize / used
|
||||||
task.Progress.Downloaded = totalSize
|
task.Progress.Downloaded = totalSize
|
||||||
task.Status = base.DownloadStatusDone
|
task.updateStatus(base.DownloadStatusDone)
|
||||||
d.storage.Put(bucketTask, task.ID, task.clone())
|
d.storage.Put(bucketTask, task.ID, task.clone())
|
||||||
d.emit(EventKeyDone, task)
|
d.emit(EventKeyDone, task)
|
||||||
d.emit(EventKeyFinally, task, err)
|
d.emit(EventKeyFinally, task, err)
|
||||||
@@ -658,7 +659,6 @@ func (d *Downloader) doCreate(fetcher fetcher.Fetcher, opts *base.Options) (task
|
|||||||
task.fetcher = fetcher
|
task.fetcher = fetcher
|
||||||
task.Meta = fetcher.Meta()
|
task.Meta = fetcher.Meta()
|
||||||
task.Progress = &Progress{}
|
task.Progress = &Progress{}
|
||||||
task.Status = base.DownloadStatusReady
|
|
||||||
initTask(task)
|
initTask(task)
|
||||||
if err = fetcher.Create(opts); err != nil {
|
if err = fetcher.Create(opts); err != nil {
|
||||||
return
|
return
|
||||||
@@ -699,7 +699,7 @@ func (d *Downloader) doStart(task *Task) (err error) {
|
|||||||
|
|
||||||
cloneTask := task.clone()
|
cloneTask := task.clone()
|
||||||
isCreate := task.Status == base.DownloadStatusReady
|
isCreate := task.Status == base.DownloadStatusReady
|
||||||
task.Status = base.DownloadStatusRunning
|
task.updateStatus(base.DownloadStatusRunning)
|
||||||
|
|
||||||
doStart := func() error {
|
doStart := func() error {
|
||||||
task.lock.Lock()
|
task.lock.Lock()
|
||||||
@@ -714,7 +714,8 @@ func (d *Downloader) doStart(task *Task) (err error) {
|
|||||||
if task.Meta.Res == nil {
|
if task.Meta.Res == nil {
|
||||||
err := task.fetcher.Resolve(task.Meta.Req)
|
err := task.fetcher.Resolve(task.Meta.Req)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
task.Status = base.DownloadStatusError
|
task.updateStatus(base.DownloadStatusError)
|
||||||
|
d.storage.Put(bucketTask, task.ID, task.clone())
|
||||||
d.emit(EventKeyError, task, err)
|
d.emit(EventKeyError, task, err)
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@@ -768,7 +769,7 @@ func (d *Downloader) doStart(task *Task) (err error) {
|
|||||||
func (d *Downloader) doPause(task *Task) (err error) {
|
func (d *Downloader) doPause(task *Task) (err error) {
|
||||||
err = func() error {
|
err = func() error {
|
||||||
if task.Status != base.DownloadStatusDone {
|
if task.Status != base.DownloadStatusDone {
|
||||||
task.Status = base.DownloadStatusPause
|
task.updateStatus(base.DownloadStatusPause)
|
||||||
task.timer.Pause()
|
task.timer.Pause()
|
||||||
if task.fetcher != nil {
|
if task.fetcher != nil {
|
||||||
if err := task.fetcher.Pause(); err != nil {
|
if err := task.fetcher.Pause(); err != nil {
|
||||||
|
|||||||
@@ -24,6 +24,7 @@ type Task struct {
|
|||||||
Status base.Status `json:"status"`
|
Status base.Status `json:"status"`
|
||||||
Progress *Progress `json:"progress"`
|
Progress *Progress `json:"progress"`
|
||||||
CreatedAt time.Time `json:"createdAt"`
|
CreatedAt time.Time `json:"createdAt"`
|
||||||
|
UpdatedAt time.Time `json:"updatedAt"`
|
||||||
|
|
||||||
fetcherBuilder fetcher.FetcherBuilder
|
fetcherBuilder fetcher.FetcherBuilder
|
||||||
fetcher fetcher.Fetcher
|
fetcher fetcher.Fetcher
|
||||||
@@ -41,9 +42,15 @@ func NewTask() *Task {
|
|||||||
ID: id,
|
ID: id,
|
||||||
Status: base.DownloadStatusReady,
|
Status: base.DownloadStatusReady,
|
||||||
CreatedAt: time.Now(),
|
CreatedAt: time.Now(),
|
||||||
|
UpdatedAt: time.Now(),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (t *Task) updateStatus(status base.Status) {
|
||||||
|
t.UpdatedAt = time.Now()
|
||||||
|
t.Status = status
|
||||||
|
}
|
||||||
|
|
||||||
func (t *Task) clone() *Task {
|
func (t *Task) clone() *Task {
|
||||||
return &Task{
|
return &Task{
|
||||||
ID: t.ID,
|
ID: t.ID,
|
||||||
@@ -51,6 +58,7 @@ func (t *Task) clone() *Task {
|
|||||||
Status: t.Status,
|
Status: t.Status,
|
||||||
Progress: t.Progress,
|
Progress: t.Progress,
|
||||||
CreatedAt: t.CreatedAt,
|
CreatedAt: t.CreatedAt,
|
||||||
|
UpdatedAt: t.UpdatedAt,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ class Task {
|
|||||||
Status status;
|
Status status;
|
||||||
Progress progress;
|
Progress progress;
|
||||||
DateTime createdAt;
|
DateTime createdAt;
|
||||||
|
DateTime updatedAt;
|
||||||
|
|
||||||
Task({
|
Task({
|
||||||
required this.id,
|
required this.id,
|
||||||
@@ -20,6 +21,7 @@ class Task {
|
|||||||
required this.status,
|
required this.status,
|
||||||
required this.progress,
|
required this.progress,
|
||||||
required this.createdAt,
|
required this.createdAt,
|
||||||
|
required this.updatedAt,
|
||||||
});
|
});
|
||||||
|
|
||||||
factory Task.fromJson(Map<String, dynamic> json) => _$TaskFromJson(json);
|
factory Task.fromJson(Map<String, dynamic> json) => _$TaskFromJson(json);
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ Task _$TaskFromJson(Map<String, dynamic> json) => Task(
|
|||||||
status: $enumDecode(_$StatusEnumMap, json['status']),
|
status: $enumDecode(_$StatusEnumMap, json['status']),
|
||||||
progress: Progress.fromJson(json['progress'] as Map<String, dynamic>),
|
progress: Progress.fromJson(json['progress'] as Map<String, dynamic>),
|
||||||
createdAt: DateTime.parse(json['createdAt'] as String),
|
createdAt: DateTime.parse(json['createdAt'] as String),
|
||||||
|
updatedAt: DateTime.parse(json['updatedAt'] as String),
|
||||||
);
|
);
|
||||||
|
|
||||||
Map<String, dynamic> _$TaskToJson(Task instance) => <String, dynamic>{
|
Map<String, dynamic> _$TaskToJson(Task instance) => <String, dynamic>{
|
||||||
@@ -20,6 +21,7 @@ Map<String, dynamic> _$TaskToJson(Task instance) => <String, dynamic>{
|
|||||||
'status': _$StatusEnumMap[instance.status]!,
|
'status': _$StatusEnumMap[instance.status]!,
|
||||||
'progress': instance.progress.toJson(),
|
'progress': instance.progress.toJson(),
|
||||||
'createdAt': instance.createdAt.toIso8601String(),
|
'createdAt': instance.createdAt.toIso8601String(),
|
||||||
|
'updatedAt': instance.updatedAt.toIso8601String(),
|
||||||
};
|
};
|
||||||
|
|
||||||
const _$StatusEnumMap = {
|
const _$StatusEnumMap = {
|
||||||
|
|||||||
@@ -3,5 +3,6 @@ import 'package:gopeed/app/modules/task/controllers/task_list_controller.dart';
|
|||||||
import '../../../../api/model/task.dart';
|
import '../../../../api/model/task.dart';
|
||||||
|
|
||||||
class TaskDownloadedController extends TaskListController {
|
class TaskDownloadedController extends TaskListController {
|
||||||
TaskDownloadedController() : super([Status.done], SortDirection.asc);
|
TaskDownloadedController()
|
||||||
|
: super([Status.done], (a, b) => b.updatedAt.compareTo(a.updatedAt));
|
||||||
}
|
}
|
||||||
@@ -9,5 +9,5 @@ class TaskDownloadingController extends TaskListController {
|
|||||||
Status.pause,
|
Status.pause,
|
||||||
Status.wait,
|
Status.wait,
|
||||||
Status.error
|
Status.error
|
||||||
], SortDirection.desc);
|
], (a, b) => b.createdAt.compareTo(a.createdAt));
|
||||||
}
|
}
|
||||||
@@ -5,13 +5,11 @@ import 'package:get/get.dart';
|
|||||||
import '../../../../api/api.dart';
|
import '../../../../api/api.dart';
|
||||||
import '../../../../api/model/task.dart';
|
import '../../../../api/model/task.dart';
|
||||||
|
|
||||||
enum SortDirection { asc, desc }
|
|
||||||
|
|
||||||
abstract class TaskListController extends GetxController {
|
abstract class TaskListController extends GetxController {
|
||||||
List<Status> statuses;
|
List<Status> statuses;
|
||||||
SortDirection sortDirection;
|
int Function(Task a, Task b) compare;
|
||||||
|
|
||||||
TaskListController(this.statuses, this.sortDirection);
|
TaskListController(this.statuses, this.compare);
|
||||||
|
|
||||||
final tasks = <Task>[].obs;
|
final tasks = <Task>[].obs;
|
||||||
final isRunning = false.obs;
|
final isRunning = false.obs;
|
||||||
@@ -48,13 +46,7 @@ abstract class TaskListController extends GetxController {
|
|||||||
getTasksState() async {
|
getTasksState() async {
|
||||||
final tasks = await getTasks(statuses);
|
final tasks = await getTasks(statuses);
|
||||||
// sort tasks by create time
|
// sort tasks by create time
|
||||||
tasks.sort((a, b) {
|
tasks.sort(compare);
|
||||||
if (sortDirection == SortDirection.asc) {
|
|
||||||
return a.createdAt.compareTo(b.createdAt);
|
|
||||||
} else {
|
|
||||||
return b.createdAt.compareTo(a.createdAt);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
this.tasks.value = tasks;
|
this.tasks.value = tasks;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Reference in new issue
Block a user