fix: sort of completed tasks

GopeedLab · Dec 12, 2023 · d07cf83 · d07cf83
1 parent d935b9d
commit d07cf83
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 19 deletions.
diff --git a/pkg/download/downloader.go b/pkg/download/downloader.go
@@ -572,7 +572,8 @@ func (d *Downloader) getProtocolConfig(name string, v any) bool {
 func (d *Downloader) watch(task *Task) {
 	err := task.fetcher.Wait()
 	if err != nil {
-		task.Status = base.DownloadStatusError
+		task.updateStatus(base.DownloadStatusError)
+		d.storage.Put(bucketTask, task.ID, task.clone())
 		d.emit(EventKeyError, task, err)
 	} else {
 		task.Progress.Used = task.timer.Used()
@@ -586,7 +587,7 @@ func (d *Downloader) watch(task *Task) {
 		totalSize := task.Meta.Res.Size
 		task.Progress.Speed = totalSize / used
 		task.Progress.Downloaded = totalSize
-		task.Status = base.DownloadStatusDone
+		task.updateStatus(base.DownloadStatusDone)
 		d.storage.Put(bucketTask, task.ID, task.clone())
 		d.emit(EventKeyDone, task)
 		d.emit(EventKeyFinally, task, err)
@@ -658,7 +659,6 @@ func (d *Downloader) doCreate(fetcher fetcher.Fetcher, opts *base.Options) (task
 	task.fetcher = fetcher
 	task.Meta = fetcher.Meta()
 	task.Progress = &Progress{}
-	task.Status = base.DownloadStatusReady
 	initTask(task)
 	if err = fetcher.Create(opts); err != nil {
 		return
@@ -699,7 +699,7 @@ func (d *Downloader) doStart(task *Task) (err error) {
 
 	cloneTask := task.clone()
 	isCreate := task.Status == base.DownloadStatusReady
-	task.Status = base.DownloadStatusRunning
+	task.updateStatus(base.DownloadStatusRunning)
 
 	doStart := func() error {
 		task.lock.Lock()
@@ -714,7 +714,8 @@ func (d *Downloader) doStart(task *Task) (err error) {
 		if task.Meta.Res == nil {
 			err := task.fetcher.Resolve(task.Meta.Req)
 			if err != nil {
-				task.Status = base.DownloadStatusError
+				task.updateStatus(base.DownloadStatusError)
+				d.storage.Put(bucketTask, task.ID, task.clone())
 				d.emit(EventKeyError, task, err)
 				return err
 			}
@@ -768,7 +769,7 @@ func (d *Downloader) doStart(task *Task) (err error) {
 func (d *Downloader) doPause(task *Task) (err error) {
 	err = func() error {
 		if task.Status != base.DownloadStatusDone {
-			task.Status = base.DownloadStatusPause
+			task.updateStatus(base.DownloadStatusPause)
 			task.timer.Pause()
 			if task.fetcher != nil {
 				if err := task.fetcher.Pause(); err != nil {

diff --git a/pkg/download/model.go b/pkg/download/model.go
@@ -24,6 +24,7 @@ type Task struct {
 	Status    base.Status          `json:"status"`
 	Progress  *Progress            `json:"progress"`
 	CreatedAt time.Time            `json:"createdAt"`
+	UpdatedAt time.Time            `json:"updatedAt"`
 
 	fetcherBuilder fetcher.FetcherBuilder
 	fetcher        fetcher.Fetcher
@@ -41,16 +42,23 @@ func NewTask() *Task {
 		ID:        id,
 		Status:    base.DownloadStatusReady,
 		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 {
 	return &Task{
 		ID:        t.ID,
 		Meta:      t.Meta,
 		Status:    t.Status,
 		Progress:  t.Progress,
 		CreatedAt: t.CreatedAt,
+		UpdatedAt: t.UpdatedAt,
 	}
 }
 

diff --git a/ui/flutter/lib/api/model/task.dart b/ui/flutter/lib/api/model/task.dart
@@ -13,13 +13,15 @@ class Task {
   Status status;
   Progress progress;
   DateTime createdAt;
+  DateTime updatedAt;
 
   Task({
     required this.id,
     required this.meta,
     required this.status,
     required this.progress,
     required this.createdAt,
+    required this.updatedAt,
   });
 
   factory Task.fromJson(Map<String, dynamic> json) => _$TaskFromJson(json);

diff --git a/ui/flutter/lib/api/model/task.g.dart b/ui/flutter/lib/api/model/task.g.dart
diff --git a/ui/flutter/lib/app/modules/task/controllers/task_downloaded_controller.dart b/ui/flutter/lib/app/modules/task/controllers/task_downloaded_controller.dart
@@ -3,5 +3,6 @@ import 'package:gopeed/app/modules/task/controllers/task_list_controller.dart';
 import '../../../../api/model/task.dart';
 
 class TaskDownloadedController extends TaskListController {
-  TaskDownloadedController() : super([Status.done], SortDirection.asc);
+  TaskDownloadedController()
+      : super([Status.done], (a, b) => b.updatedAt.compareTo(a.updatedAt));
 }
diff --git a/ui/flutter/lib/app/modules/task/controllers/task_downloading_controller.dart b/ui/flutter/lib/app/modules/task/controllers/task_downloading_controller.dart
@@ -9,5 +9,5 @@ class TaskDownloadingController extends TaskListController {
           Status.pause,
           Status.wait,
           Status.error
-        ], SortDirection.desc);
+        ], (a, b) => b.createdAt.compareTo(a.createdAt));
 }
diff --git a/ui/flutter/lib/app/modules/task/controllers/task_list_controller.dart b/ui/flutter/lib/app/modules/task/controllers/task_list_controller.dart
@@ -5,13 +5,11 @@ import 'package:get/get.dart';
 import '../../../../api/api.dart';
 import '../../../../api/model/task.dart';
 
-enum SortDirection { asc, desc }
-
 abstract class TaskListController extends GetxController {
   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 isRunning = false.obs;
@@ -48,13 +46,7 @@ abstract class TaskListController extends GetxController {
   getTasksState() async {
     final tasks = await getTasks(statuses);
     // sort tasks by create time
-    tasks.sort((a, b) {
-      if (sortDirection == SortDirection.asc) {
-        return a.createdAt.compareTo(b.createdAt);
-      } else {
-        return b.createdAt.compareTo(a.createdAt);
-      }
-    });
+    tasks.sort(compare);
     this.tasks.value = tasks;
   }
 }