Merge branch 'main' into fix/torrent_resovle

GopeedLab · Dec 27, 2024 · 407b9e4 · 407b9e4
2 parents bbcc545 + f54ed5d
commit 407b9e4
Show file tree

Hide file tree

Showing 32 changed files with 307 additions and 136 deletions.
diff --git a/README.md b/README.md
@@ -174,7 +174,7 @@ command:
 - android
 
 ```bash
-gomobile bind -tags nosqlite -ldflags="-w -s" -o ui/flutter/android/app/libs/libgopeed.aar -target=android -androidapi 21 -javapkg="com.gopeed" github.com/GopeedLab/gopeed/bind/mobile
+gomobile bind -tags nosqlite -ldflags="-w -s -checklinkname=0" -o ui/flutter/android/app/libs/libgopeed.aar -target=android -androidapi 21 -javapkg="com.gopeed" github.com/GopeedLab/gopeed/bind/mobile
 cd ui/flutter
 flutter build apk
 ```

diff --git a/README_ja-JP.md b/README_ja-JP.md
@@ -162,7 +162,7 @@ gomobile init
 - android
 
 ```bash
-gomobile bind -tags nosqlite -ldflags="-w -s" -o ui/flutter/android/app/libs/libgopeed.aar -target=android -androidapi 21 -javapkg="com.gopeed" github.com/GopeedLab/gopeed/bind/mobile
+gomobile bind -tags nosqlite -ldflags="-w -s -checklinkname=0" -o ui/flutter/android/app/libs/libgopeed.aar -target=android -androidapi 21 -javapkg="com.gopeed" github.com/GopeedLab/gopeed/bind/mobile
 cd ui/flutter
 flutter build apk
 ```

diff --git a/README_vi-VN.md b/README_vi-VN.md
@@ -170,7 +170,7 @@ command:
 - android
 
 ```bash
-gomobile bind -tags nosqlite -ldflags="-w -s" -o ui/flutter/android/app/libs/libgopeed.aar -target=android -androidapi 21 -javapkg="com.gopeed" github.com/GopeedLab/gopeed/bind/mobile
+gomobile bind -tags nosqlite -ldflags="-w -s -checklinkname=0" -o ui/flutter/android/app/libs/libgopeed.aar -target=android -androidapi 21 -javapkg="com.gopeed" github.com/GopeedLab/gopeed/bind/mobile
 cd ui/flutter
 flutter build apk
 ```

diff --git a/README_zh-CN.md b/README_zh-CN.md
@@ -174,7 +174,7 @@ gomobile init
 - android
 
 ```bash
-gomobile bind -tags nosqlite -ldflags="-w -s" -o ui/flutter/android/app/libs/libgopeed.aar -target=android -androidapi 21 -javapkg="com.gopeed" github.com/GopeedLab/gopeed/bind/mobile
+gomobile bind -tags nosqlite -ldflags="-w -s -checklinkname=0" -o ui/flutter/android/app/libs/libgopeed.aar -target=android -androidapi 21 -javapkg="com.gopeed" github.com/GopeedLab/gopeed/bind/mobile
 cd ui/flutter
 flutter build apk
 ```

diff --git a/README_zh-TW.md b/README_zh-TW.md
@@ -170,7 +170,7 @@ gomobile init
 - android
 
 ```bash
-gomobile bind -tags nosqlite -ldflags="-w -s" -o ui/flutter/android/app/libs/libgopeed.aar -target=android -androidapi 21 -javapkg="com.gopeed" github.com/GopeedLab/gopeed/bind/mobile
+gomobile bind -tags nosqlite -ldflags="-w -s -checklinkname=0" -o ui/flutter/android/app/libs/libgopeed.aar -target=android -androidapi 21 -javapkg="com.gopeed" github.com/GopeedLab/gopeed/bind/mobile
 cd ui/flutter
 flutter build apk
 ```

diff --git a/ui/flutter/lib/api/api.dart b/ui/flutter/lib/api/api.dart
@@ -129,19 +129,36 @@ Future<void> continueTask(String id) async {
   return _parse(() => _client.dio.put("/api/v1/tasks/$id/continue"), null);
 }
 
-Future<void> pauseAllTasks() async {
-  return _parse(() => _client.dio.put("/api/v1/tasks/pause"), null);
+Future<void> pauseAllTasks(List<String>? ids) async {
+  return _parse(
+      () => _client.dio.put("/api/v1/tasks/pause", queryParameters: {
+            "id": ids,
+          }),
+      null);
 }
 
-Future<void> continueAllTasks() async {
-  return _parse(() => _client.dio.put("/api/v1/tasks/continue"), null);
+Future<void> continueAllTasks(List<String>? ids) async {
+  return _parse(
+      () => _client.dio.put("/api/v1/tasks/continue", queryParameters: {
+            "id": ids,
+          }),
+      null);
 }
 
 Future<void> deleteTask(String id, bool force) async {
   return _parse(
       () => _client.dio.delete("/api/v1/tasks/$id?force=$force"), null);
 }
 
+Future<void> deleteTasks(List<String>? ids, bool force) async {
+  return _parse(
+      () => _client.dio.delete("/api/v1/tasks", queryParameters: {
+            "id": ids,
+            "force": force,
+          }),
+      null);
+}
+
 Future<DownloaderConfig> getConfig() async {
   return _parse(() => _client.dio.get("/api/v1/config"),
       (data) => DownloaderConfig.fromJson(data));

diff --git a/ui/flutter/lib/app/modules/app/controllers/app_controller.dart b/ui/flutter/lib/app/modules/app/controllers/app_controller.dart
@@ -218,11 +218,11 @@ class AppController extends GetxController with WindowListener, TrayListener {
       ),
       MenuItem(
         label: "startAll".tr,
-        onClick: (menuItem) async => {continueAllTasks()},
+        onClick: (menuItem) async => {continueAllTasks(null)},
       ),
       MenuItem(
         label: "pauseAll".tr,
-        onClick: (menuItem) async => {pauseAllTasks()},
+        onClick: (menuItem) async => {pauseAllTasks(null)},
       ),
       MenuItem(
         label: 'setting'.tr,

diff --git a/ui/flutter/lib/app/modules/task/controllers/task_controller.dart b/ui/flutter/lib/app/modules/task/controllers/task_controller.dart
@@ -6,5 +6,4 @@ class TaskController extends GetxController {
   final tabIndex = 0.obs;
   final scaffoldKey = GlobalKey<ScaffoldState>();
   final selectTask = Rx<Task?>(null);
-  final copyUrlDone = false.obs;
 }
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,13 @@ class TaskDownloadingController extends TaskListController {
           Status.pause,
           Status.wait,
           Status.error
-        ], (a, b) => b.createdAt.compareTo(a.createdAt));
+        ], (a, b) {
+          if (a.status == Status.running && b.status != Status.running) {
+            return -1;
+          } else if (a.status != Status.running && b.status == Status.running) {
+            return 1;
+          } else {
+            return b.updatedAt.compareTo(a.updatedAt);
+          }
+        });
 }
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
@@ -12,6 +12,7 @@ abstract class TaskListController extends GetxController {
   TaskListController(this.statuses, this.compare);
 
   final tasks = <Task>[].obs;
+  final selectedTaskIds = <String>[].obs;
   final isRunning = false.obs;
 
   late final Timer _timer;

diff --git a/ui/flutter/lib/app/modules/task/views/task_downloaded_view.dart b/ui/flutter/lib/app/modules/task/views/task_downloaded_view.dart
@@ -9,6 +9,7 @@ class TaskDownloadedView extends GetView<TaskDownloadedController> {
 
   @override
   Widget build(BuildContext context) {
-    return BuildTaskListView(tasks: controller.tasks);
+    return BuildTaskListView(
+        tasks: controller.tasks, selectedTaskIds: controller.selectedTaskIds);
   }
 }
diff --git a/ui/flutter/lib/app/modules/task/views/task_downloading_view.dart b/ui/flutter/lib/app/modules/task/views/task_downloading_view.dart
@@ -9,6 +9,7 @@ class TaskDownloadingView extends GetView<TaskDownloadingController> {
 
   @override
   Widget build(BuildContext context) {
-    return BuildTaskListView(tasks: controller.tasks);
+    return BuildTaskListView(
+        tasks: controller.tasks, selectedTaskIds: controller.selectedTaskIds);
   }
 }
diff --git a/ui/flutter/lib/app/modules/task/views/task_files_view.dart b/ui/flutter/lib/app/modules/task/views/task_files_view.dart
@@ -64,9 +64,8 @@ class TaskFilesView extends GetView<TaskFilesController> {
                         [meta.opts.path, meta.res!.name, fileRelativePath]);
                     final fileName = basename(filePath);
                     return ListTile(
-                      leading: file.isDirectory
-                          ? const Icon(folderIcon)
-                          : Icon(fileIcon(fileName)),
+                      leading:
+                          Icon(fileIcon(fileName, isFolder: file.isDirectory)),
                       title: Text(fileName),
                       subtitle: file.isDirectory
                           ? Text('items'.trParams({