From 3f7ee82d45a331f1ce14330cb6f6bfdd6256c69e Mon Sep 17 00:00:00 2001 From: xkeyC <3334969096@qq.com> Date: Wed, 22 May 2024 20:05:50 +0800 Subject: [PATCH] bump: dependencies --- lib/common/rust/api/asar_api.dart | 7 +- lib/common/rust/api/http_api.dart | 11 +- lib/common/rust/api/rs_process.dart | 7 +- lib/common/rust/api/win32_api.dart | 8 +- lib/common/rust/frb_generated.dart | 127 +++++++------ lib/common/rust/frb_generated.io.dart | 179 ++++++++++-------- lib/common/rust/http_package.dart | 2 +- lib/provider/aria2c.dart | 2 +- lib/provider/aria2c.freezed.dart | 8 +- lib/provider/aria2c.g.dart | 2 +- lib/provider/unp4kc.freezed.dart | 4 +- .../home_downloader_ui_model.freezed.dart | 6 +- pubspec.yaml | 2 +- rust/Cargo.toml | 2 +- rust/src/frb_generated.io.rs | 48 +++-- rust/src/frb_generated.rs | 30 +-- 16 files changed, 243 insertions(+), 202 deletions(-) diff --git a/lib/common/rust/api/asar_api.dart b/lib/common/rust/api/asar_api.dart index 232e903..aefc7bb 100644 --- a/lib/common/rust/api/asar_api.dart +++ b/lib/common/rust/api/asar_api.dart @@ -1,5 +1,5 @@ // This file is automatically generated, so please do not edit it. -// Generated by `flutter_rust_bridge`@ 2.0.0-dev.33. +// Generated by `flutter_rust_bridge`@ 2.0.0-dev.35. // ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import @@ -8,7 +8,8 @@ import 'package:flutter_rust_bridge/flutter_rust_bridge_for_generated.dart'; Future getRsiLauncherAsarData( {required String asarPath, dynamic hint}) => - RustLib.instance.api.getRsiLauncherAsarData(asarPath: asarPath, hint: hint); + RustLib.instance.api + .crateApiAsarApiGetRsiLauncherAsarData(asarPath: asarPath, hint: hint); class RsiLauncherAsarData { final String asarPath; @@ -22,7 +23,7 @@ class RsiLauncherAsarData { }); Future writeMainJs({required List content, dynamic hint}) => - RustLib.instance.api.rsiLauncherAsarDataWriteMainJs( + RustLib.instance.api.crateApiAsarApiRsiLauncherAsarDataWriteMainJs( that: this, content: content, hint: hint); @override diff --git a/lib/common/rust/api/http_api.dart b/lib/common/rust/api/http_api.dart index 90b624a..5efb1be 100644 --- a/lib/common/rust/api/http_api.dart +++ b/lib/common/rust/api/http_api.dart @@ -1,5 +1,5 @@ // This file is automatically generated, so please do not edit it. -// Generated by `flutter_rust_bridge`@ 2.0.0-dev.33. +// Generated by `flutter_rust_bridge`@ 2.0.0-dev.35. // ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import @@ -9,7 +9,8 @@ import 'package:flutter_rust_bridge/flutter_rust_bridge_for_generated.dart'; Future setDefaultHeader( {required Map headers, dynamic hint}) => - RustLib.instance.api.setDefaultHeader(headers: headers, hint: hint); + RustLib.instance.api + .crateApiHttpApiSetDefaultHeader(headers: headers, hint: hint); Future fetch( {required MyMethod method, @@ -18,7 +19,7 @@ Future fetch( Uint8List? inputData, String? withIpAddress, dynamic hint}) => - RustLib.instance.api.fetch( + RustLib.instance.api.crateApiHttpApiFetch( method: method, url: url, headers: headers, @@ -27,10 +28,10 @@ Future fetch( hint: hint); Future> dnsLookupTxt({required String host, dynamic hint}) => - RustLib.instance.api.dnsLookupTxt(host: host, hint: hint); + RustLib.instance.api.crateApiHttpApiDnsLookupTxt(host: host, hint: hint); Future> dnsLookupIps({required String host, dynamic hint}) => - RustLib.instance.api.dnsLookupIps(host: host, hint: hint); + RustLib.instance.api.crateApiHttpApiDnsLookupIps(host: host, hint: hint); enum MyMethod { options, diff --git a/lib/common/rust/api/rs_process.dart b/lib/common/rust/api/rs_process.dart index 5e4d580..73c88ba 100644 --- a/lib/common/rust/api/rs_process.dart +++ b/lib/common/rust/api/rs_process.dart @@ -1,5 +1,5 @@ // This file is automatically generated, so please do not edit it. -// Generated by `flutter_rust_bridge`@ 2.0.0-dev.33. +// Generated by `flutter_rust_bridge`@ 2.0.0-dev.35. // ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import @@ -13,14 +13,15 @@ Stream start( required List arguments, required String workingDirectory, dynamic hint}) => - RustLib.instance.api.start( + RustLib.instance.api.crateApiRsProcessStart( executable: executable, arguments: arguments, workingDirectory: workingDirectory, hint: hint); Future write({required int rsPid, required String data, dynamic hint}) => - RustLib.instance.api.write(rsPid: rsPid, data: data, hint: hint); + RustLib.instance.api + .crateApiRsProcessWrite(rsPid: rsPid, data: data, hint: hint); class RsProcessStreamData { final RsProcessStreamDataType dataType; diff --git a/lib/common/rust/api/win32_api.dart b/lib/common/rust/api/win32_api.dart index e412a06..3678ac4 100644 --- a/lib/common/rust/api/win32_api.dart +++ b/lib/common/rust/api/win32_api.dart @@ -1,5 +1,5 @@ // This file is automatically generated, so please do not edit it. -// Generated by `flutter_rust_bridge`@ 2.0.0-dev.33. +// Generated by `flutter_rust_bridge`@ 2.0.0-dev.35. // ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import @@ -12,7 +12,7 @@ Future sendNotify( String? appName, String? appId, dynamic hint}) => - RustLib.instance.api.sendNotify( + RustLib.instance.api.crateApiWin32ApiSendNotify( summary: summary, body: body, appName: appName, @@ -20,5 +20,5 @@ Future sendNotify( hint: hint); Future setForegroundWindow({required String windowName, dynamic hint}) => - RustLib.instance.api - .setForegroundWindow(windowName: windowName, hint: hint); + RustLib.instance.api.crateApiWin32ApiSetForegroundWindow( + windowName: windowName, hint: hint); diff --git a/lib/common/rust/frb_generated.dart b/lib/common/rust/frb_generated.dart index b1f52b2..4d9b1b4 100644 --- a/lib/common/rust/frb_generated.dart +++ b/lib/common/rust/frb_generated.dart @@ -1,5 +1,5 @@ // This file is automatically generated, so please do not edit it. -// Generated by `flutter_rust_bridge`@ 2.0.0-dev.33. +// Generated by `flutter_rust_bridge`@ 2.0.0-dev.35. // ignore_for_file: unused_import, unused_element, unnecessary_import, duplicate_ignore, invalid_use_of_internal_member, annotate_overrides, non_constant_identifier_names, curly_braces_in_flow_control_structures, prefer_const_literals_to_create_immutables, unused_field @@ -55,7 +55,7 @@ class RustLib extends BaseEntrypoint { kDefaultExternalLibraryLoaderConfig; @override - String get codegenVersion => '2.0.0-dev.33'; + String get codegenVersion => '2.0.0-dev.35'; @override int get rustContentHash => 1832496273; @@ -69,19 +69,21 @@ class RustLib extends BaseEntrypoint { } abstract class RustLibApi extends BaseApi { - Future getRsiLauncherAsarData( + Future crateApiAsarApiGetRsiLauncherAsarData( {required String asarPath, dynamic hint}); - Future rsiLauncherAsarDataWriteMainJs( + Future crateApiAsarApiRsiLauncherAsarDataWriteMainJs( {required RsiLauncherAsarData that, required List content, dynamic hint}); - Future> dnsLookupIps({required String host, dynamic hint}); + Future> crateApiHttpApiDnsLookupIps( + {required String host, dynamic hint}); - Future> dnsLookupTxt({required String host, dynamic hint}); + Future> crateApiHttpApiDnsLookupTxt( + {required String host, dynamic hint}); - Future fetch( + Future crateApiHttpApiFetch( {required MyMethod method, required String url, Map? headers, @@ -89,25 +91,27 @@ abstract class RustLibApi extends BaseApi { String? withIpAddress, dynamic hint}); - Future setDefaultHeader( + Future crateApiHttpApiSetDefaultHeader( {required Map headers, dynamic hint}); - Stream start( + Stream crateApiRsProcessStart( {required String executable, required List arguments, required String workingDirectory, dynamic hint}); - Future write({required int rsPid, required String data, dynamic hint}); + Future crateApiRsProcessWrite( + {required int rsPid, required String data, dynamic hint}); - Future sendNotify( + Future crateApiWin32ApiSendNotify( {String? summary, String? body, String? appName, String? appId, dynamic hint}); - Future setForegroundWindow({required String windowName, dynamic hint}); + Future crateApiWin32ApiSetForegroundWindow( + {required String windowName, dynamic hint}); } class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi { @@ -119,31 +123,33 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi { }); @override - Future getRsiLauncherAsarData( + Future crateApiAsarApiGetRsiLauncherAsarData( {required String asarPath, dynamic hint}) { return handler.executeNormal(NormalTask( callFfi: (port_) { var arg0 = cst_encode_String(asarPath); - return wire.wire_get_rsi_launcher_asar_data(port_, arg0); + return wire.wire__crate__api__asar_api__get_rsi_launcher_asar_data( + port_, arg0); }, codec: DcoCodec( decodeSuccessData: dco_decode_rsi_launcher_asar_data, decodeErrorData: dco_decode_AnyhowException, ), - constMeta: kGetRsiLauncherAsarDataConstMeta, + constMeta: kCrateApiAsarApiGetRsiLauncherAsarDataConstMeta, argValues: [asarPath], apiImpl: this, hint: hint, )); } - TaskConstMeta get kGetRsiLauncherAsarDataConstMeta => const TaskConstMeta( + TaskConstMeta get kCrateApiAsarApiGetRsiLauncherAsarDataConstMeta => + const TaskConstMeta( debugName: "get_rsi_launcher_asar_data", argNames: ["asarPath"], ); @override - Future rsiLauncherAsarDataWriteMainJs( + Future crateApiAsarApiRsiLauncherAsarDataWriteMainJs( {required RsiLauncherAsarData that, required List content, dynamic hint}) { @@ -151,74 +157,79 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi { callFfi: (port_) { var arg0 = cst_encode_box_autoadd_rsi_launcher_asar_data(that); var arg1 = cst_encode_list_prim_u_8_loose(content); - return wire.wire_rsi_launcher_asar_data_write_main_js( - port_, arg0, arg1); + return wire + .wire__crate__api__asar_api__rsi_launcher_asar_data_write_main_js( + port_, arg0, arg1); }, codec: DcoCodec( decodeSuccessData: dco_decode_unit, decodeErrorData: dco_decode_AnyhowException, ), - constMeta: kRsiLauncherAsarDataWriteMainJsConstMeta, + constMeta: kCrateApiAsarApiRsiLauncherAsarDataWriteMainJsConstMeta, argValues: [that, content], apiImpl: this, hint: hint, )); } - TaskConstMeta get kRsiLauncherAsarDataWriteMainJsConstMeta => + TaskConstMeta get kCrateApiAsarApiRsiLauncherAsarDataWriteMainJsConstMeta => const TaskConstMeta( debugName: "rsi_launcher_asar_data_write_main_js", argNames: ["that", "content"], ); @override - Future> dnsLookupIps({required String host, dynamic hint}) { + Future> crateApiHttpApiDnsLookupIps( + {required String host, dynamic hint}) { return handler.executeNormal(NormalTask( callFfi: (port_) { var arg0 = cst_encode_String(host); - return wire.wire_dns_lookup_ips(port_, arg0); + return wire.wire__crate__api__http_api__dns_lookup_ips(port_, arg0); }, codec: DcoCodec( decodeSuccessData: dco_decode_list_String, decodeErrorData: dco_decode_AnyhowException, ), - constMeta: kDnsLookupIpsConstMeta, + constMeta: kCrateApiHttpApiDnsLookupIpsConstMeta, argValues: [host], apiImpl: this, hint: hint, )); } - TaskConstMeta get kDnsLookupIpsConstMeta => const TaskConstMeta( + TaskConstMeta get kCrateApiHttpApiDnsLookupIpsConstMeta => + const TaskConstMeta( debugName: "dns_lookup_ips", argNames: ["host"], ); @override - Future> dnsLookupTxt({required String host, dynamic hint}) { + Future> crateApiHttpApiDnsLookupTxt( + {required String host, dynamic hint}) { return handler.executeNormal(NormalTask( callFfi: (port_) { var arg0 = cst_encode_String(host); - return wire.wire_dns_lookup_txt(port_, arg0); + return wire.wire__crate__api__http_api__dns_lookup_txt(port_, arg0); }, codec: DcoCodec( decodeSuccessData: dco_decode_list_String, decodeErrorData: dco_decode_AnyhowException, ), - constMeta: kDnsLookupTxtConstMeta, + constMeta: kCrateApiHttpApiDnsLookupTxtConstMeta, argValues: [host], apiImpl: this, hint: hint, )); } - TaskConstMeta get kDnsLookupTxtConstMeta => const TaskConstMeta( + TaskConstMeta get kCrateApiHttpApiDnsLookupTxtConstMeta => + const TaskConstMeta( debugName: "dns_lookup_txt", argNames: ["host"], ); @override - Future fetch( + Future crateApiHttpApiFetch( {required MyMethod method, required String url, Map? headers, @@ -232,50 +243,52 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi { var arg2 = cst_encode_opt_Map_String_String(headers); var arg3 = cst_encode_opt_list_prim_u_8_strict(inputData); var arg4 = cst_encode_opt_String(withIpAddress); - return wire.wire_fetch(port_, arg0, arg1, arg2, arg3, arg4); + return wire.wire__crate__api__http_api__fetch( + port_, arg0, arg1, arg2, arg3, arg4); }, codec: DcoCodec( decodeSuccessData: dco_decode_rust_http_response, decodeErrorData: dco_decode_AnyhowException, ), - constMeta: kFetchConstMeta, + constMeta: kCrateApiHttpApiFetchConstMeta, argValues: [method, url, headers, inputData, withIpAddress], apiImpl: this, hint: hint, )); } - TaskConstMeta get kFetchConstMeta => const TaskConstMeta( + TaskConstMeta get kCrateApiHttpApiFetchConstMeta => const TaskConstMeta( debugName: "fetch", argNames: ["method", "url", "headers", "inputData", "withIpAddress"], ); @override - Future setDefaultHeader( + Future crateApiHttpApiSetDefaultHeader( {required Map headers, dynamic hint}) { return handler.executeNormal(NormalTask( callFfi: (port_) { var arg0 = cst_encode_Map_String_String(headers); - return wire.wire_set_default_header(port_, arg0); + return wire.wire__crate__api__http_api__set_default_header(port_, arg0); }, codec: DcoCodec( decodeSuccessData: dco_decode_unit, decodeErrorData: null, ), - constMeta: kSetDefaultHeaderConstMeta, + constMeta: kCrateApiHttpApiSetDefaultHeaderConstMeta, argValues: [headers], apiImpl: this, hint: hint, )); } - TaskConstMeta get kSetDefaultHeaderConstMeta => const TaskConstMeta( + TaskConstMeta get kCrateApiHttpApiSetDefaultHeaderConstMeta => + const TaskConstMeta( debugName: "set_default_header", argNames: ["headers"], ); @override - Stream start( + Stream crateApiRsProcessStart( {required String executable, required List arguments, required String workingDirectory, @@ -287,13 +300,14 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi { var arg1 = cst_encode_list_String(arguments); var arg2 = cst_encode_String(workingDirectory); var arg3 = cst_encode_StreamSink_rs_process_stream_data_Dco(streamSink); - return wire.wire_start(port_, arg0, arg1, arg2, arg3); + return wire.wire__crate__api__rs_process__start( + port_, arg0, arg1, arg2, arg3); }, codec: DcoCodec( decodeSuccessData: dco_decode_unit, decodeErrorData: null, ), - constMeta: kStartConstMeta, + constMeta: kCrateApiRsProcessStartConstMeta, argValues: [executable, arguments, workingDirectory, streamSink], apiImpl: this, hint: hint, @@ -301,37 +315,38 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi { return streamSink.stream; } - TaskConstMeta get kStartConstMeta => const TaskConstMeta( + TaskConstMeta get kCrateApiRsProcessStartConstMeta => const TaskConstMeta( debugName: "start", argNames: ["executable", "arguments", "workingDirectory", "streamSink"], ); @override - Future write({required int rsPid, required String data, dynamic hint}) { + Future crateApiRsProcessWrite( + {required int rsPid, required String data, dynamic hint}) { return handler.executeNormal(NormalTask( callFfi: (port_) { var arg0 = cst_encode_u_32(rsPid); var arg1 = cst_encode_String(data); - return wire.wire_write(port_, arg0, arg1); + return wire.wire__crate__api__rs_process__write(port_, arg0, arg1); }, codec: DcoCodec( decodeSuccessData: dco_decode_unit, decodeErrorData: null, ), - constMeta: kWriteConstMeta, + constMeta: kCrateApiRsProcessWriteConstMeta, argValues: [rsPid, data], apiImpl: this, hint: hint, )); } - TaskConstMeta get kWriteConstMeta => const TaskConstMeta( + TaskConstMeta get kCrateApiRsProcessWriteConstMeta => const TaskConstMeta( debugName: "write", argNames: ["rsPid", "data"], ); @override - Future sendNotify( + Future crateApiWin32ApiSendNotify( {String? summary, String? body, String? appName, @@ -343,43 +358,47 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi { var arg1 = cst_encode_opt_String(body); var arg2 = cst_encode_opt_String(appName); var arg3 = cst_encode_opt_String(appId); - return wire.wire_send_notify(port_, arg0, arg1, arg2, arg3); + return wire.wire__crate__api__win32_api__send_notify( + port_, arg0, arg1, arg2, arg3); }, codec: DcoCodec( decodeSuccessData: dco_decode_unit, decodeErrorData: dco_decode_AnyhowException, ), - constMeta: kSendNotifyConstMeta, + constMeta: kCrateApiWin32ApiSendNotifyConstMeta, argValues: [summary, body, appName, appId], apiImpl: this, hint: hint, )); } - TaskConstMeta get kSendNotifyConstMeta => const TaskConstMeta( + TaskConstMeta get kCrateApiWin32ApiSendNotifyConstMeta => const TaskConstMeta( debugName: "send_notify", argNames: ["summary", "body", "appName", "appId"], ); @override - Future setForegroundWindow({required String windowName, dynamic hint}) { + Future crateApiWin32ApiSetForegroundWindow( + {required String windowName, dynamic hint}) { return handler.executeNormal(NormalTask( callFfi: (port_) { var arg0 = cst_encode_String(windowName); - return wire.wire_set_foreground_window(port_, arg0); + return wire.wire__crate__api__win32_api__set_foreground_window( + port_, arg0); }, codec: DcoCodec( decodeSuccessData: dco_decode_bool, decodeErrorData: dco_decode_AnyhowException, ), - constMeta: kSetForegroundWindowConstMeta, + constMeta: kCrateApiWin32ApiSetForegroundWindowConstMeta, argValues: [windowName], apiImpl: this, hint: hint, )); } - TaskConstMeta get kSetForegroundWindowConstMeta => const TaskConstMeta( + TaskConstMeta get kCrateApiWin32ApiSetForegroundWindowConstMeta => + const TaskConstMeta( debugName: "set_foreground_window", argNames: ["windowName"], ); @@ -888,7 +907,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi { void sse_encode_AnyhowException( AnyhowException self, SseSerializer serializer) { // Codec=Sse (Serialization based), see doc to use other codecs - throw UnimplementedError('Unreachable ()'); + sse_encode_String(self.message, serializer); } @protected diff --git a/lib/common/rust/frb_generated.io.dart b/lib/common/rust/frb_generated.io.dart index 49845a0..86926ad 100644 --- a/lib/common/rust/frb_generated.io.dart +++ b/lib/common/rust/frb_generated.io.dart @@ -1,5 +1,5 @@ // This file is automatically generated, so please do not edit it. -// Generated by `flutter_rust_bridge`@ 2.0.0-dev.33. +// Generated by `flutter_rust_bridge`@ 2.0.0-dev.35. // ignore_for_file: unused_import, unused_element, unnecessary_import, duplicate_ignore, invalid_use_of_internal_member, annotate_overrides, non_constant_identifier_names, curly_braces_in_flow_control_structures, prefer_const_literals_to_create_immutables, unused_field @@ -531,86 +531,90 @@ class RustLibWire implements BaseWire { late final _store_dart_post_cobject = _store_dart_post_cobjectPtr .asFunction(); - void wire_get_rsi_launcher_asar_data( + void wire__crate__api__asar_api__get_rsi_launcher_asar_data( int port_, ffi.Pointer asar_path, ) { - return _wire_get_rsi_launcher_asar_data( + return _wire__crate__api__asar_api__get_rsi_launcher_asar_data( port_, asar_path, ); } - late final _wire_get_rsi_launcher_asar_dataPtr = _lookup< + late final _wire__crate__api__asar_api__get_rsi_launcher_asar_dataPtr = _lookup< ffi.NativeFunction< ffi.Void Function( ffi.Int64, ffi.Pointer)>>( - 'frbgen_starcitizen_doctor_wire_get_rsi_launcher_asar_data'); - late final _wire_get_rsi_launcher_asar_data = - _wire_get_rsi_launcher_asar_dataPtr.asFunction< + 'frbgen_starcitizen_doctor_wire__crate__api__asar_api__get_rsi_launcher_asar_data'); + late final _wire__crate__api__asar_api__get_rsi_launcher_asar_data = + _wire__crate__api__asar_api__get_rsi_launcher_asar_dataPtr.asFunction< void Function(int, ffi.Pointer)>(); - void wire_rsi_launcher_asar_data_write_main_js( + void wire__crate__api__asar_api__rsi_launcher_asar_data_write_main_js( int port_, ffi.Pointer that, ffi.Pointer content, ) { - return _wire_rsi_launcher_asar_data_write_main_js( + return _wire__crate__api__asar_api__rsi_launcher_asar_data_write_main_js( port_, that, content, ); } - late final _wire_rsi_launcher_asar_data_write_main_jsPtr = _lookup< - ffi.NativeFunction< - ffi.Void Function( - ffi.Int64, - ffi.Pointer, - ffi.Pointer)>>( - 'frbgen_starcitizen_doctor_wire_rsi_launcher_asar_data_write_main_js'); - late final _wire_rsi_launcher_asar_data_write_main_js = - _wire_rsi_launcher_asar_data_write_main_jsPtr.asFunction< - void Function(int, ffi.Pointer, - ffi.Pointer)>(); + late final _wire__crate__api__asar_api__rsi_launcher_asar_data_write_main_jsPtr = + _lookup< + ffi.NativeFunction< + ffi.Void Function( + ffi.Int64, + ffi.Pointer, + ffi.Pointer)>>( + 'frbgen_starcitizen_doctor_wire__crate__api__asar_api__rsi_launcher_asar_data_write_main_js'); + late final _wire__crate__api__asar_api__rsi_launcher_asar_data_write_main_js = + _wire__crate__api__asar_api__rsi_launcher_asar_data_write_main_jsPtr + .asFunction< + void Function(int, ffi.Pointer, + ffi.Pointer)>(); - void wire_dns_lookup_ips( + void wire__crate__api__http_api__dns_lookup_ips( int port_, ffi.Pointer host, ) { - return _wire_dns_lookup_ips( + return _wire__crate__api__http_api__dns_lookup_ips( port_, host, ); } - late final _wire_dns_lookup_ipsPtr = _lookup< + late final _wire__crate__api__http_api__dns_lookup_ipsPtr = _lookup< ffi.NativeFunction< ffi.Void Function( ffi.Int64, ffi.Pointer)>>( - 'frbgen_starcitizen_doctor_wire_dns_lookup_ips'); - late final _wire_dns_lookup_ips = _wire_dns_lookup_ipsPtr.asFunction< - void Function(int, ffi.Pointer)>(); + 'frbgen_starcitizen_doctor_wire__crate__api__http_api__dns_lookup_ips'); + late final _wire__crate__api__http_api__dns_lookup_ips = + _wire__crate__api__http_api__dns_lookup_ipsPtr.asFunction< + void Function(int, ffi.Pointer)>(); - void wire_dns_lookup_txt( + void wire__crate__api__http_api__dns_lookup_txt( int port_, ffi.Pointer host, ) { - return _wire_dns_lookup_txt( + return _wire__crate__api__http_api__dns_lookup_txt( port_, host, ); } - late final _wire_dns_lookup_txtPtr = _lookup< + late final _wire__crate__api__http_api__dns_lookup_txtPtr = _lookup< ffi.NativeFunction< ffi.Void Function( ffi.Int64, ffi.Pointer)>>( - 'frbgen_starcitizen_doctor_wire_dns_lookup_txt'); - late final _wire_dns_lookup_txt = _wire_dns_lookup_txtPtr.asFunction< - void Function(int, ffi.Pointer)>(); + 'frbgen_starcitizen_doctor_wire__crate__api__http_api__dns_lookup_txt'); + late final _wire__crate__api__http_api__dns_lookup_txt = + _wire__crate__api__http_api__dns_lookup_txtPtr.asFunction< + void Function(int, ffi.Pointer)>(); - void wire_fetch( + void wire__crate__api__http_api__fetch( int port_, int method, ffi.Pointer url, @@ -618,7 +622,7 @@ class RustLibWire implements BaseWire { ffi.Pointer input_data, ffi.Pointer with_ip_address, ) { - return _wire_fetch( + return _wire__crate__api__http_api__fetch( port_, method, url, @@ -628,7 +632,7 @@ class RustLibWire implements BaseWire { ); } - late final _wire_fetchPtr = _lookup< + late final _wire__crate__api__http_api__fetchPtr = _lookup< ffi.NativeFunction< ffi.Void Function( ffi.Int64, @@ -637,42 +641,45 @@ class RustLibWire implements BaseWire { ffi.Pointer, ffi.Pointer, ffi.Pointer)>>( - 'frbgen_starcitizen_doctor_wire_fetch'); - late final _wire_fetch = _wire_fetchPtr.asFunction< - void Function( - int, - int, - ffi.Pointer, - ffi.Pointer, - ffi.Pointer, - ffi.Pointer)>(); + 'frbgen_starcitizen_doctor_wire__crate__api__http_api__fetch'); + late final _wire__crate__api__http_api__fetch = + _wire__crate__api__http_api__fetchPtr.asFunction< + void Function( + int, + int, + ffi.Pointer, + ffi.Pointer, + ffi.Pointer, + ffi.Pointer)>(); - void wire_set_default_header( + void wire__crate__api__http_api__set_default_header( int port_, ffi.Pointer headers, ) { - return _wire_set_default_header( + return _wire__crate__api__http_api__set_default_header( port_, headers, ); } - late final _wire_set_default_headerPtr = _lookup< + late final _wire__crate__api__http_api__set_default_headerPtr = _lookup< ffi.NativeFunction< ffi.Void Function( ffi.Int64, ffi.Pointer)>>( - 'frbgen_starcitizen_doctor_wire_set_default_header'); - late final _wire_set_default_header = _wire_set_default_headerPtr.asFunction< - void Function(int, ffi.Pointer)>(); + 'frbgen_starcitizen_doctor_wire__crate__api__http_api__set_default_header'); + late final _wire__crate__api__http_api__set_default_header = + _wire__crate__api__http_api__set_default_headerPtr.asFunction< + void Function( + int, ffi.Pointer)>(); - void wire_start( + void wire__crate__api__rs_process__start( int port_, ffi.Pointer executable, ffi.Pointer arguments, ffi.Pointer working_directory, ffi.Pointer stream_sink, ) { - return _wire_start( + return _wire__crate__api__rs_process__start( port_, executable, arguments, @@ -681,7 +688,7 @@ class RustLibWire implements BaseWire { ); } - late final _wire_startPtr = _lookup< + late final _wire__crate__api__rs_process__startPtr = _lookup< ffi.NativeFunction< ffi.Void Function( ffi.Int64, @@ -689,43 +696,46 @@ class RustLibWire implements BaseWire { ffi.Pointer, ffi.Pointer, ffi.Pointer)>>( - 'frbgen_starcitizen_doctor_wire_start'); - late final _wire_start = _wire_startPtr.asFunction< - void Function( - int, - ffi.Pointer, - ffi.Pointer, - ffi.Pointer, - ffi.Pointer)>(); + 'frbgen_starcitizen_doctor_wire__crate__api__rs_process__start'); + late final _wire__crate__api__rs_process__start = + _wire__crate__api__rs_process__startPtr.asFunction< + void Function( + int, + ffi.Pointer, + ffi.Pointer, + ffi.Pointer, + ffi.Pointer)>(); - void wire_write( + void wire__crate__api__rs_process__write( int port_, int rs_pid, ffi.Pointer data, ) { - return _wire_write( + return _wire__crate__api__rs_process__write( port_, rs_pid, data, ); } - late final _wire_writePtr = _lookup< + late final _wire__crate__api__rs_process__writePtr = _lookup< ffi.NativeFunction< ffi.Void Function(ffi.Int64, ffi.Uint32, ffi.Pointer)>>( - 'frbgen_starcitizen_doctor_wire_write'); - late final _wire_write = _wire_writePtr.asFunction< - void Function(int, int, ffi.Pointer)>(); + 'frbgen_starcitizen_doctor_wire__crate__api__rs_process__write'); + late final _wire__crate__api__rs_process__write = + _wire__crate__api__rs_process__writePtr.asFunction< + void Function( + int, int, ffi.Pointer)>(); - void wire_send_notify( + void wire__crate__api__win32_api__send_notify( int port_, ffi.Pointer summary, ffi.Pointer body, ffi.Pointer app_name, ffi.Pointer app_id, ) { - return _wire_send_notify( + return _wire__crate__api__win32_api__send_notify( port_, summary, body, @@ -734,7 +744,7 @@ class RustLibWire implements BaseWire { ); } - late final _wire_send_notifyPtr = _lookup< + late final _wire__crate__api__win32_api__send_notifyPtr = _lookup< ffi.NativeFunction< ffi.Void Function( ffi.Int64, @@ -742,32 +752,33 @@ class RustLibWire implements BaseWire { ffi.Pointer, ffi.Pointer, ffi.Pointer)>>( - 'frbgen_starcitizen_doctor_wire_send_notify'); - late final _wire_send_notify = _wire_send_notifyPtr.asFunction< - void Function( - int, - ffi.Pointer, - ffi.Pointer, - ffi.Pointer, - ffi.Pointer)>(); + 'frbgen_starcitizen_doctor_wire__crate__api__win32_api__send_notify'); + late final _wire__crate__api__win32_api__send_notify = + _wire__crate__api__win32_api__send_notifyPtr.asFunction< + void Function( + int, + ffi.Pointer, + ffi.Pointer, + ffi.Pointer, + ffi.Pointer)>(); - void wire_set_foreground_window( + void wire__crate__api__win32_api__set_foreground_window( int port_, ffi.Pointer window_name, ) { - return _wire_set_foreground_window( + return _wire__crate__api__win32_api__set_foreground_window( port_, window_name, ); } - late final _wire_set_foreground_windowPtr = _lookup< + late final _wire__crate__api__win32_api__set_foreground_windowPtr = _lookup< ffi.NativeFunction< ffi.Void Function( ffi.Int64, ffi.Pointer)>>( - 'frbgen_starcitizen_doctor_wire_set_foreground_window'); - late final _wire_set_foreground_window = - _wire_set_foreground_windowPtr.asFunction< + 'frbgen_starcitizen_doctor_wire__crate__api__win32_api__set_foreground_window'); + late final _wire__crate__api__win32_api__set_foreground_window = + _wire__crate__api__win32_api__set_foreground_windowPtr.asFunction< void Function(int, ffi.Pointer)>(); ffi.Pointer diff --git a/lib/common/rust/http_package.dart b/lib/common/rust/http_package.dart index f2c84e4..c737fdb 100644 --- a/lib/common/rust/http_package.dart +++ b/lib/common/rust/http_package.dart @@ -1,5 +1,5 @@ // This file is automatically generated, so please do not edit it. -// Generated by `flutter_rust_bridge`@ 2.0.0-dev.33. +// Generated by `flutter_rust_bridge`@ 2.0.0-dev.35. // ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import diff --git a/lib/provider/aria2c.dart b/lib/provider/aria2c.dart index bd908f6..0c03b98 100644 --- a/lib/provider/aria2c.dart +++ b/lib/provider/aria2c.dart @@ -103,7 +103,7 @@ class Aria2cModel extends _$Aria2cModel { arguments: [ "-V", "-c", - "-x 10", + "-x 16", "--dir=${state.aria2cDir}\\downloads", "--disable-ipv6", "--enable-rpc", diff --git a/lib/provider/aria2c.freezed.dart b/lib/provider/aria2c.freezed.dart index 30fc2c5..eeb7609 100644 --- a/lib/provider/aria2c.freezed.dart +++ b/lib/provider/aria2c.freezed.dart @@ -151,13 +151,13 @@ class _$Aria2cModelStateImpl (identical(other.aria2cDir, aria2cDir) || other.aria2cDir == aria2cDir) && (identical(other.aria2c, aria2c) || other.aria2c == aria2c) && - const DeepCollectionEquality() - .equals(other.aria2globalStat, aria2globalStat)); + (identical(other.aria2globalStat, aria2globalStat) || + other.aria2globalStat == aria2globalStat)); } @override - int get hashCode => Object.hash(runtimeType, aria2cDir, aria2c, - const DeepCollectionEquality().hash(aria2globalStat)); + int get hashCode => + Object.hash(runtimeType, aria2cDir, aria2c, aria2globalStat); @JsonKey(ignore: true) @override diff --git a/lib/provider/aria2c.g.dart b/lib/provider/aria2c.g.dart index 03656a4..a437498 100644 --- a/lib/provider/aria2c.g.dart +++ b/lib/provider/aria2c.g.dart @@ -6,7 +6,7 @@ part of 'aria2c.dart'; // RiverpodGenerator // ************************************************************************** -String _$aria2cModelHash() => r'8efef4661876de219510cf3e7e2d86c02405eb26'; +String _$aria2cModelHash() => r'55dea5bd2e1c81fec0ef8ef1a10f41179775d7ee'; /// See also [Aria2cModel]. @ProviderFor(Aria2cModel) diff --git a/lib/provider/unp4kc.freezed.dart b/lib/provider/unp4kc.freezed.dart index 769eb5e..0e32078 100644 --- a/lib/provider/unp4kc.freezed.dart +++ b/lib/provider/unp4kc.freezed.dart @@ -234,7 +234,7 @@ class _$Unp4kcStateImpl with DiagnosticableTreeMixin implements _Unp4kcState { other is _$Unp4kcStateImpl && (identical(other.startUp, startUp) || other.startUp == startUp) && const DeepCollectionEquality().equals(other._files, _files) && - const DeepCollectionEquality().equals(other.fs, fs) && + (identical(other.fs, fs) || other.fs == fs) && (identical(other.curPath, curPath) || other.curPath == curPath) && (identical(other.endMessage, endMessage) || other.endMessage == endMessage) && @@ -249,7 +249,7 @@ class _$Unp4kcStateImpl with DiagnosticableTreeMixin implements _Unp4kcState { runtimeType, startUp, const DeepCollectionEquality().hash(_files), - const DeepCollectionEquality().hash(fs), + fs, curPath, endMessage, tempOpenFile, diff --git a/lib/ui/home/downloader/home_downloader_ui_model.freezed.dart b/lib/ui/home/downloader/home_downloader_ui_model.freezed.dart index d51c21f..392d994 100644 --- a/lib/ui/home/downloader/home_downloader_ui_model.freezed.dart +++ b/lib/ui/home/downloader/home_downloader_ui_model.freezed.dart @@ -190,8 +190,8 @@ class _$HomeDownloaderUIStateImpl implements _HomeDownloaderUIState { .equals(other._waitingTasks, _waitingTasks) && const DeepCollectionEquality() .equals(other._stoppedTasks, _stoppedTasks) && - const DeepCollectionEquality() - .equals(other.globalStat, globalStat)); + (identical(other.globalStat, globalStat) || + other.globalStat == globalStat)); } @override @@ -200,7 +200,7 @@ class _$HomeDownloaderUIStateImpl implements _HomeDownloaderUIState { const DeepCollectionEquality().hash(_tasks), const DeepCollectionEquality().hash(_waitingTasks), const DeepCollectionEquality().hash(_stoppedTasks), - const DeepCollectionEquality().hash(globalStat)); + globalStat); @JsonKey(ignore: true) @override diff --git a/pubspec.yaml b/pubspec.yaml index ac41136..b21d6d1 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -42,7 +42,7 @@ dependencies: flutter_tilt: ^3.0.0 card_swiper: ^3.0.1 ffi: ^2.1.0 - flutter_rust_bridge: 2.0.0-dev.34 + flutter_rust_bridge: ^2.0.0-dev.35 freezed_annotation: ^2.4.1 meta: ^1.9.1 hexcolor: ^3.0.1 diff --git a/rust/Cargo.toml b/rust/Cargo.toml index e9cbd2a..e30522b 100644 --- a/rust/Cargo.toml +++ b/rust/Cargo.toml @@ -11,7 +11,7 @@ strip = "debuginfo" crate-type = ["cdylib", "staticlib"] [dependencies] -flutter_rust_bridge = "=2.0.0-dev.34" +flutter_rust_bridge = "=2.0.0-dev.35" tokio = { version = "1", features = ["rt", "rt-multi-thread", "macros", "process"] } futures = { version = "0.3", default-features = false, features = ["executor"] } url = "2.5" diff --git a/rust/src/frb_generated.io.rs b/rust/src/frb_generated.io.rs index bec5f49..f731a1f 100644 --- a/rust/src/frb_generated.io.rs +++ b/rust/src/frb_generated.io.rs @@ -1,5 +1,5 @@ // This file is automatically generated, so please do not edit it. -// Generated by `flutter_rust_bridge`@ 2.0.0-dev.33. +// Generated by `flutter_rust_bridge`@ 2.0.0-dev.35. // Section: imports @@ -209,40 +209,40 @@ impl Default for wire_cst_rust_http_response { } #[no_mangle] -pub extern "C" fn frbgen_starcitizen_doctor_wire_get_rsi_launcher_asar_data( +pub extern "C" fn frbgen_starcitizen_doctor_wire__crate__api__asar_api__get_rsi_launcher_asar_data( port_: i64, asar_path: *mut wire_cst_list_prim_u_8_strict, ) { - wire_get_rsi_launcher_asar_data_impl(port_, asar_path) + wire__crate__api__asar_api__get_rsi_launcher_asar_data_impl(port_, asar_path) } #[no_mangle] -pub extern "C" fn frbgen_starcitizen_doctor_wire_rsi_launcher_asar_data_write_main_js( +pub extern "C" fn frbgen_starcitizen_doctor_wire__crate__api__asar_api__rsi_launcher_asar_data_write_main_js( port_: i64, that: *mut wire_cst_rsi_launcher_asar_data, content: *mut wire_cst_list_prim_u_8_loose, ) { - wire_rsi_launcher_asar_data_write_main_js_impl(port_, that, content) + wire__crate__api__asar_api__rsi_launcher_asar_data_write_main_js_impl(port_, that, content) } #[no_mangle] -pub extern "C" fn frbgen_starcitizen_doctor_wire_dns_lookup_ips( +pub extern "C" fn frbgen_starcitizen_doctor_wire__crate__api__http_api__dns_lookup_ips( port_: i64, host: *mut wire_cst_list_prim_u_8_strict, ) { - wire_dns_lookup_ips_impl(port_, host) + wire__crate__api__http_api__dns_lookup_ips_impl(port_, host) } #[no_mangle] -pub extern "C" fn frbgen_starcitizen_doctor_wire_dns_lookup_txt( +pub extern "C" fn frbgen_starcitizen_doctor_wire__crate__api__http_api__dns_lookup_txt( port_: i64, host: *mut wire_cst_list_prim_u_8_strict, ) { - wire_dns_lookup_txt_impl(port_, host) + wire__crate__api__http_api__dns_lookup_txt_impl(port_, host) } #[no_mangle] -pub extern "C" fn frbgen_starcitizen_doctor_wire_fetch( +pub extern "C" fn frbgen_starcitizen_doctor_wire__crate__api__http_api__fetch( port_: i64, method: i32, url: *mut wire_cst_list_prim_u_8_strict, @@ -250,54 +250,60 @@ pub extern "C" fn frbgen_starcitizen_doctor_wire_fetch( input_data: *mut wire_cst_list_prim_u_8_strict, with_ip_address: *mut wire_cst_list_prim_u_8_strict, ) { - wire_fetch_impl(port_, method, url, headers, input_data, with_ip_address) + wire__crate__api__http_api__fetch_impl(port_, method, url, headers, input_data, with_ip_address) } #[no_mangle] -pub extern "C" fn frbgen_starcitizen_doctor_wire_set_default_header( +pub extern "C" fn frbgen_starcitizen_doctor_wire__crate__api__http_api__set_default_header( port_: i64, headers: *mut wire_cst_list_record_string_string, ) { - wire_set_default_header_impl(port_, headers) + wire__crate__api__http_api__set_default_header_impl(port_, headers) } #[no_mangle] -pub extern "C" fn frbgen_starcitizen_doctor_wire_start( +pub extern "C" fn frbgen_starcitizen_doctor_wire__crate__api__rs_process__start( port_: i64, executable: *mut wire_cst_list_prim_u_8_strict, arguments: *mut wire_cst_list_String, working_directory: *mut wire_cst_list_prim_u_8_strict, stream_sink: *mut wire_cst_list_prim_u_8_strict, ) { - wire_start_impl(port_, executable, arguments, working_directory, stream_sink) + wire__crate__api__rs_process__start_impl( + port_, + executable, + arguments, + working_directory, + stream_sink, + ) } #[no_mangle] -pub extern "C" fn frbgen_starcitizen_doctor_wire_write( +pub extern "C" fn frbgen_starcitizen_doctor_wire__crate__api__rs_process__write( port_: i64, rs_pid: u32, data: *mut wire_cst_list_prim_u_8_strict, ) { - wire_write_impl(port_, rs_pid, data) + wire__crate__api__rs_process__write_impl(port_, rs_pid, data) } #[no_mangle] -pub extern "C" fn frbgen_starcitizen_doctor_wire_send_notify( +pub extern "C" fn frbgen_starcitizen_doctor_wire__crate__api__win32_api__send_notify( port_: i64, summary: *mut wire_cst_list_prim_u_8_strict, body: *mut wire_cst_list_prim_u_8_strict, app_name: *mut wire_cst_list_prim_u_8_strict, app_id: *mut wire_cst_list_prim_u_8_strict, ) { - wire_send_notify_impl(port_, summary, body, app_name, app_id) + wire__crate__api__win32_api__send_notify_impl(port_, summary, body, app_name, app_id) } #[no_mangle] -pub extern "C" fn frbgen_starcitizen_doctor_wire_set_foreground_window( +pub extern "C" fn frbgen_starcitizen_doctor_wire__crate__api__win32_api__set_foreground_window( port_: i64, window_name: *mut wire_cst_list_prim_u_8_strict, ) { - wire_set_foreground_window_impl(port_, window_name) + wire__crate__api__win32_api__set_foreground_window_impl(port_, window_name) } #[no_mangle] diff --git a/rust/src/frb_generated.rs b/rust/src/frb_generated.rs index cfc6eed..8ece42b 100644 --- a/rust/src/frb_generated.rs +++ b/rust/src/frb_generated.rs @@ -1,5 +1,5 @@ // This file is automatically generated, so please do not edit it. -// Generated by `flutter_rust_bridge`@ 2.0.0-dev.33. +// Generated by `flutter_rust_bridge`@ 2.0.0-dev.35. #![allow( non_camel_case_types, @@ -14,7 +14,8 @@ clippy::double_parens, clippy::let_and_return, clippy::too_many_arguments, - clippy::match_single_binding + clippy::match_single_binding, + clippy::let_unit_value )] // Section: imports @@ -30,7 +31,7 @@ flutter_rust_bridge::frb_generated_boilerplate!( default_rust_opaque = RustOpaqueNom, default_rust_auto_opaque = RustAutoOpaqueNom, ); -pub(crate) const FLUTTER_RUST_BRIDGE_CODEGEN_VERSION: &str = "2.0.0-dev.33"; +pub(crate) const FLUTTER_RUST_BRIDGE_CODEGEN_VERSION: &str = "2.0.0-dev.35"; pub(crate) const FLUTTER_RUST_BRIDGE_CODEGEN_CONTENT_HASH: i32 = 1832496273; // Section: executor @@ -39,7 +40,7 @@ flutter_rust_bridge::frb_generated_default_handler!(); // Section: wire_funcs -fn wire_get_rsi_launcher_asar_data_impl( +fn wire__crate__api__asar_api__get_rsi_launcher_asar_data_impl( port_: flutter_rust_bridge::for_generated::MessagePort, asar_path: impl CstDecode, ) { @@ -62,7 +63,7 @@ fn wire_get_rsi_launcher_asar_data_impl( }, ) } -fn wire_rsi_launcher_asar_data_write_main_js_impl( +fn wire__crate__api__asar_api__rsi_launcher_asar_data_write_main_js_impl( port_: flutter_rust_bridge::for_generated::MessagePort, that: impl CstDecode, content: impl CstDecode>, @@ -91,7 +92,7 @@ fn wire_rsi_launcher_asar_data_write_main_js_impl( }, ) } -fn wire_dns_lookup_ips_impl( +fn wire__crate__api__http_api__dns_lookup_ips_impl( port_: flutter_rust_bridge::for_generated::MessagePort, host: impl CstDecode, ) { @@ -112,7 +113,7 @@ fn wire_dns_lookup_ips_impl( }, ) } -fn wire_dns_lookup_txt_impl( +fn wire__crate__api__http_api__dns_lookup_txt_impl( port_: flutter_rust_bridge::for_generated::MessagePort, host: impl CstDecode, ) { @@ -133,7 +134,7 @@ fn wire_dns_lookup_txt_impl( }, ) } -fn wire_fetch_impl( +fn wire__crate__api__http_api__fetch_impl( port_: flutter_rust_bridge::for_generated::MessagePort, method: impl CstDecode, url: impl CstDecode, @@ -171,7 +172,7 @@ fn wire_fetch_impl( }, ) } -fn wire_set_default_header_impl( +fn wire__crate__api__http_api__set_default_header_impl( port_: flutter_rust_bridge::for_generated::MessagePort, headers: impl CstDecode>, ) { @@ -191,7 +192,7 @@ fn wire_set_default_header_impl( }, ) } -fn wire_start_impl( +fn wire__crate__api__rs_process__start_impl( port_: flutter_rust_bridge::for_generated::MessagePort, executable: impl CstDecode, arguments: impl CstDecode>, @@ -233,7 +234,7 @@ fn wire_start_impl( }, ) } -fn wire_write_impl( +fn wire__crate__api__rs_process__write_impl( port_: flutter_rust_bridge::for_generated::MessagePort, rs_pid: impl CstDecode, data: impl CstDecode, @@ -260,7 +261,7 @@ fn wire_write_impl( }, ) } -fn wire_send_notify_impl( +fn wire__crate__api__win32_api__send_notify_impl( port_: flutter_rust_bridge::for_generated::MessagePort, summary: impl CstDecode>, body: impl CstDecode>, @@ -291,7 +292,7 @@ fn wire_send_notify_impl( }, ) } -fn wire_set_foreground_window_impl( +fn wire__crate__api__win32_api__set_foreground_window_impl( port_: flutter_rust_bridge::for_generated::MessagePort, window_name: impl CstDecode, ) { @@ -395,7 +396,8 @@ impl CstDecode for u8 { impl SseDecode for flutter_rust_bridge::for_generated::anyhow::Error { // Codec=Sse (Serialization based), see doc to use other codecs fn sse_decode(deserializer: &mut flutter_rust_bridge::for_generated::SseDeserializer) -> Self { - unreachable!(""); + let mut inner = ::sse_decode(deserializer); + return anyhow::anyhow!("{}", inner); } }