feat: support create task directly (GopeedLab#262)

xiaosu2334 · Nov 9, 2023 · af52c4c · af52c4c
1 parent aae79c2
commit af52c4c
Show file tree

Hide file tree

Showing 12 changed files with 337 additions and 291 deletions.
diff --git a/internal/protocol/bt/fetcher.go b/internal/protocol/bt/fetcher.go
@@ -161,7 +161,7 @@ func (f *Fetcher) Wait() (err error) {
 						}
 					}
 					if !selected {
-						util.SafeRemove(filepath.Join(f.meta.Opts.Path, file.Path()))
+						util.SafeRemove(filepath.Join(f.meta.Opts.Path, f.meta.Res.Name, file.Path()))
 					}
 				}
 				break
@@ -202,7 +202,7 @@ func (f *Fetcher) updateRes() {
 			Size: file.Length(),
 		}
 	}
-	res.CalcSize()
+	res.CalcSize(nil)
 	f.meta.Res = res
 	if f.meta.Opts != nil {
 		f.meta.Opts.InitSelectFiles(len(res.Files))

diff --git a/pkg/base/model.go b/pkg/base/model.go
@@ -3,6 +3,7 @@ package base
 import (
 	"fmt"
 	"github.com/GopeedLab/gopeed/pkg/util"
+	"golang.org/x/exp/slices"
 )
 
 // Request download request
@@ -47,10 +48,12 @@ func (r *Resource) Validate() error {
 	return nil
 }
 
-func (r *Resource) CalcSize() {
+func (r *Resource) CalcSize(selectFiles []int) {
 	var size int64
-	for _, file := range r.Files {
-		size += file.Size
+	for i, file := range r.Files {
+		if len(selectFiles) == 0 || slices.Contains(selectFiles, i) {
+			size += file.Size
+		}
 	}
 	r.Size = size
 }

diff --git a/pkg/download/downloader.go b/pkg/download/downloader.go
@@ -540,11 +540,17 @@ func (d *Downloader) GetTask(id string) *Task {
 }
 
 func (d *Downloader) GetTasks() []*Task {
-	// reverse tasks, so that the latest task is in the front
 	tasks := make([]*Task, len(d.tasks))
 	for i := 0; i < len(d.tasks); i++ {
-		tasks[i] = d.tasks[len(d.tasks)-i-1]
+		tasks[i] = d.tasks[i]
 	}
+	// sort tasks by status, order by Status(if(running,1,0)) desc, CreatedAt desc
+	sort.Slice(tasks, func(i, j int) bool {
+		if tasks[i].Status != tasks[j].Status {
+			return tasks[i].Status == base.DownloadStatusRunning
+		}
+		return tasks[i].CreatedAt.After(tasks[j].CreatedAt)
+	})
 	return tasks
 }
 
@@ -579,16 +585,16 @@ func (d *Downloader) watch(task *Task) {
 		d.emit(EventKeyError, task, err)
 	} else {
 		task.Progress.Used = task.timer.Used()
-		if task.Size == 0 {
-			task.Size = task.fetcher.Progress().TotalDownloaded()
-			task.Meta.Res.Size = task.Size
+		if task.Meta.Res.Size == 0 {
+			task.Meta.Res.Size = task.fetcher.Progress().TotalDownloaded()
 		}
 		used := task.Progress.Used / int64(time.Second)
 		if used == 0 {
 			used = 1
 		}
-		task.Progress.Speed = task.Size / used
-		task.Progress.Downloaded = task.Size
+		totalSize := task.Meta.Res.Size
+		task.Progress.Speed = totalSize / used
+		task.Progress.Downloaded = totalSize
 		task.Status = base.DownloadStatusDone
 		d.storage.Put(bucketTask, task.ID, task.clone())
 		d.emit(EventKeyDone, task)
@@ -741,6 +747,8 @@ func (d *Downloader) doStart(task *Task) (err error) {
 				}
 				task.Meta.Opts.Name = newName
 			}
+
+			task.Meta.Res.CalcSize(task.Meta.Opts.SelectFiles)
 		}
 
 		task.Progress.Speed = 0

diff --git a/pkg/download/extension.go b/pkg/download/extension.go
@@ -243,7 +243,7 @@ func (d *Downloader) triggerOnResolve(req *base.Request) (res *base.Resource) {
 					gopeed.Logger.logger.Warn().Err(err).Msgf("[%s] resource invalid", ext.buildIdentity())
 					return
 				}
-				ctx.Res.CalcSize()
+				ctx.Res.CalcSize(nil)
 			}
 			res = ctx.Res
 		},

diff --git a/pkg/download/model.go b/pkg/download/model.go
@@ -22,7 +22,6 @@ type Task struct {
 	Meta      *fetcher.FetcherMeta `json:"meta"`
 	Status    base.Status          `json:"status"`
 	Progress  *Progress            `json:"progress"`
-	Size      int64                `json:"size"`
 	CreatedAt time.Time            `json:"createdAt"`
 
 	fetcherBuilder fetcher.FetcherBuilder
@@ -50,7 +49,6 @@ func (t *Task) clone() *Task {
 		Meta:      t.Meta,
 		Status:    t.Status,
 		Progress:  t.Progress,
-		Size:      t.Size,
 		CreatedAt: t.CreatedAt,
 	}
 }

diff --git a/ui/flutter/assets/locales/en_US.json b/ui/flutter/assets/locales/en_US.json
@@ -12,6 +12,7 @@
   "donate": "Donate",
   "exit": "Exit",
   "create": "Create Task",
+  "directDownload": "Direct Download",
   "advancedOptions": "Advanced Options",
   "downloadLink": "Download Link",
   "downloadLinkValid": "Please enter the download link",

diff --git a/ui/flutter/assets/locales/zh_CN.json b/ui/flutter/assets/locales/zh_CN.json
@@ -12,6 +12,7 @@
   "donate": "打赏",
   "exit": "退出",
   "create": "创建任务",
+  "directDownload": "直接下载",
   "advancedOptions": "高级选项",
   "downloadLink": "下载链接",
   "downloadLinkValid": "请输入下载链接",

diff --git a/ui/flutter/lib/api/model/task.dart b/ui/flutter/lib/api/model/task.dart
@@ -12,15 +12,13 @@ class Task {
   Meta meta;
   Status status;
   Progress progress;
-  int size;
   DateTime createdAt;
 
   Task({
     required this.id,
     required this.meta,
     required this.status,
     required this.progress,
-    required this.size,
     required this.createdAt,
   });
 

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/create/controllers/create_controller.dart b/ui/flutter/lib/app/modules/create/controllers/create_controller.dart
@@ -10,8 +10,9 @@ class CreateController extends GetxController
   final RxList fileInfos = [].obs;
   final RxList openedFolders = [].obs;
   final selectedIndexes = <int>[].obs;
-  final isResolving = false.obs;
+  final isConfirming = false.obs;
   final showAdvanced = false.obs;
+  final directDownload = false.obs;
   late TabController advancedTabController;
   final oldUrl = "".obs;
   final fileDataUri = "".obs;