refactor(downloader): remove opts parameter from Resolve (#1595)

ui/flutter/lib/api/api.dart

@@ -10,6 +10,7 @@ import 'model/install_extension.dart';
 import 'model/login.dart';
 import 'model/resolve_result.dart';
 import 'model/resolve_task.dart';
+import 'model/patch_task.dart';
 import 'model/result.dart';
 import 'model/switch_extension.dart';
 import 'model/task.dart';
@@ -91,7 +92,7 @@ Future<List<String>> createTaskBatch(CreateTaskBatch createTaskBatch) {
   );
 }
 
-Future<void> patchTask(String id, ResolveTask patchTask) {
+Future<void> patchTask(String id, PatchTask patchTask) {
   return _parse<void>(() => _request('api/v1/tasks/$id', method: 'PATCH', data: patchTask), null);
 }
 

ui/flutter/lib/api/model/patch_task.dart

@@ -0,0 +1,16 @@
+import 'options.dart';
+import 'request.dart';
+
+class PatchTask {
+  final Request? req;
+  final Options? opts;
+
+  PatchTask({this.req, this.opts});
+
+  factory PatchTask.fromJson(Map<String, dynamic> json) => PatchTask(
+    req: json['req'] == null ? null : Request.fromJson(json['req'] as Map<String, dynamic>),
+    opts: json['opts'] == null ? null : Options.fromJson(json['opts'] as Map<String, dynamic>),
+  );
+
+  Map<String, dynamic> toJson() => {'req': req?.toJson(), 'opts': opts?.toJson()};
+}

ui/flutter/lib/api/model/resolve_task.dart

@@ -1,6 +1,5 @@
 import 'package:json_annotation/json_annotation.dart';
 
-import 'options.dart';
 import 'request.dart';
 
 part 'resolve_task.g.dart';
@@ -8,9 +7,8 @@ part 'resolve_task.g.dart';
 @JsonSerializable()
 class ResolveTask {
   Request? req;
-  Options? opts;
 
-  ResolveTask({this.req, this.opts});
+  ResolveTask({this.req});
 
   factory ResolveTask.fromJson(Map<String, dynamic> json) => _$ResolveTaskFromJson(json);
   Map<String, dynamic> toJson() => _$ResolveTaskToJson(this);

ui/flutter/lib/api/model/resolve_task.g.dart

@@ -7,11 +7,10 @@ part of 'resolve_task.dart';
 // **************************************************************************
 
 ResolveTask _$ResolveTaskFromJson(Map<String, dynamic> json) => ResolveTask(
-  req: json['req'] == null ? null : Request.fromJson(json['req'] as Map<String, dynamic>),
-  opts: json['opts'] == null ? null : Options.fromJson(json['opts'] as Map<String, dynamic>),
+  req: json['req'] == null
+      ? null
+      : Request.fromJson(json['req'] as Map<String, dynamic>),
 );
 
-Map<String, dynamic> _$ResolveTaskToJson(ResolveTask instance) => <String, dynamic>{
-  'req': ?instance.req,
-  'opts': ?instance.opts,
-};
+Map<String, dynamic> _$ResolveTaskToJson(ResolveTask instance) =>
+    <String, dynamic>{'req': ?instance.req};

ui/flutter/lib/core/capabilities/app_capabilities.dart

@@ -8,6 +8,7 @@ import '../../api/model/extension.dart';
 import '../../api/model/install_extension.dart';
 import '../../api/model/resolve_result.dart';
 import '../../api/model/resolve_task.dart';
+import '../../api/model/patch_task.dart';
 import '../../api/model/switch_extension.dart';
 import '../../api/model/task.dart';
 import '../../api/model/update_check_extension_resp.dart';
@@ -85,7 +86,7 @@ void _bindGopeed(CapabilityRegistry registry) {
     ..bind(GopeedMethods.createTask, api.createTask)
     ..bind(GopeedMethods.createTaskBatch, api.createTaskBatch)
     ..bind(GopeedMethods.patchTask, (params) async {
-      await api.patchTask(params['id'] as String, ResolveTask.fromJson(params['request'] as Map<String, dynamic>));
+      await api.patchTask(params['id'] as String, PatchTask.fromJson(params['request'] as Map<String, dynamic>));
       return const RpcUnit();
     })
     ..bind(

ui/flutter/lib/core/capabilities/gopeed_capability.dart

@@ -5,6 +5,7 @@ import '../../api/model/extension.dart';
 import '../../api/model/install_extension.dart';
 import '../../api/model/resolve_result.dart';
 import '../../api/model/resolve_task.dart';
+import '../../api/model/patch_task.dart';
 import '../../api/model/switch_extension.dart';
 import '../../api/model/task.dart';
 import '../../api/model/update_check_extension_resp.dart';
@@ -49,7 +50,7 @@ class GopeedService {
   Future<List<String>> createTaskBatch(CreateTaskBatch request) =>
       _invoker.invoke(GopeedMethods.createTaskBatch, request);
 
-  Future<void> patchTask(String id, ResolveTask request) async {
+  Future<void> patchTask(String id, PatchTask request) async {
     await _invoker.invoke(GopeedMethods.patchTask, {'id': id, 'request': request.toJson()});
   }
 

ui/flutter/lib/features/tasks/application/tasks_controller.dart

@@ -3,7 +3,7 @@ import 'dart:async';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
 import '../../../api/model/request.dart';
-import '../../../api/model/resolve_task.dart';
+import '../../../api/model/patch_task.dart';
 import '../../../api/model/task.dart' as api_model;
 import '../../../core/capabilities/app_capabilities.dart';
 import '../domain/task_record.dart';
@@ -99,7 +99,7 @@ class TasksController extends AsyncNotifier<TasksState> {
   }
 
   Future<void> updateRequest(String id, Request request) async {
-    await ref.read(gopeedServiceProvider).patchTask(id, ResolveTask(req: request));
+    await ref.read(gopeedServiceProvider).patchTask(id, PatchTask(req: request));
     await ref.read(gopeedServiceProvider).continueTask(id);
     await refresh(silent: true);
   }

ui/flutter/lib/features/tasks/presentation/pages/create_task_window_page.dart

@@ -927,8 +927,7 @@ class _CreateTaskWindowPageState extends ConsumerState<CreateTaskWindowPage> {
       }
 
       final request = _buildRequest(urls.first, protocolUrl: _protocolUrlFor(urls.first));
-      final options = _buildOptions();
-      final result = await ref.read(gopeedServiceProvider).resolve(ResolveTask(req: request, opts: options));
+      final result = await ref.read(gopeedServiceProvider).resolve(ResolveTask(req: request));
       if (!mounted) return;
       final created = await _showResolveDialog(request, result);
       if (!created) {