From 396bc57920b3d5a1fdab6fde806af9e9282a1ebf Mon Sep 17 00:00:00 2001 From: kodjomoustapha <107993382+kodjodevf@users.noreply.github.com> Date: Wed, 16 Oct 2024 10:53:07 +0100 Subject: [PATCH] Upgrade frb --- lib/modules/anime/anime_player_view.dart | 16 ++++++++-------- lib/router/router.g.dart | 2 +- lib/src/rust/api/image.dart | 2 +- lib/src/rust/api/rhttp/client.dart | 2 +- lib/src/rust/api/rhttp/error.dart | 2 +- lib/src/rust/api/rhttp/http.dart | 2 +- lib/src/rust/frb_generated.dart | 4 ++-- lib/src/rust/frb_generated.io.dart | 2 +- lib/src/rust/frb_generated.web.dart | 2 +- lib/src/rust/lib.dart | 2 +- pubspec.lock | 4 ++-- pubspec.yaml | 2 +- rust/Cargo.lock | 15 +++++++++++---- rust/Cargo.toml | 2 +- rust/src/frb_generated.rs | 8 ++++---- 15 files changed, 37 insertions(+), 30 deletions(-) diff --git a/lib/modules/anime/anime_player_view.dart b/lib/modules/anime/anime_player_view.dart index 78b649bb..c560e5f6 100644 --- a/lib/modules/anime/anime_player_view.dart +++ b/lib/modules/anime/anime_player_view.dart @@ -183,15 +183,15 @@ class _AnimeStreamPageState extends riv.ConsumerState ? SubtitleTrack.uri(file, title: label, language: label) : SubtitleTrack.data(file, title: label, language: label)); } catch (_) {} + try { + if (_firstVid.audios?.isNotEmpty ?? false) { + _player.setAudioTrack(AudioTrack.uri( + _firstVid.audios!.first.file ?? "", + title: _firstVid.audios!.first.label, + language: _firstVid.audios!.first.label)); + } + } catch (_) {} } - try { - if (_firstVid.audios?.isNotEmpty ?? false) { - _player.setAudioTrack(AudioTrack.uri( - _firstVid.audios!.first.file ?? "", - title: _firstVid.audios!.first.label, - language: _firstVid.audios!.first.label)); - } - } catch (_) {} _initSubtitleAndAudio = false; } }, diff --git a/lib/router/router.g.dart b/lib/router/router.g.dart index 5716c42e..f32fc799 100644 --- a/lib/router/router.g.dart +++ b/lib/router/router.g.dart @@ -6,7 +6,7 @@ part of 'router.dart'; // RiverpodGenerator // ************************************************************************** -String _$routerHash() => r'b995df5ff14b21e89769cbb0f0955a4a41b39386'; +String _$routerHash() => r'b08b3dc93b39ca2a8b7ef3dfbb5e47d516411c9d'; /// See also [router]. @ProviderFor(router) diff --git a/lib/src/rust/api/image.dart b/lib/src/rust/api/image.dart index 93a702d4..202ccf9a 100644 --- a/lib/src/rust/api/image.dart +++ b/lib/src/rust/api/image.dart @@ -1,5 +1,5 @@ // This file is automatically generated, so please do not edit it. -// @generated by `flutter_rust_bridge`@ 2.4.0. +// @generated by `flutter_rust_bridge`@ 2.5.0. // ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import diff --git a/lib/src/rust/api/rhttp/client.dart b/lib/src/rust/api/rhttp/client.dart index bf962400..b54fecca 100644 --- a/lib/src/rust/api/rhttp/client.dart +++ b/lib/src/rust/api/rhttp/client.dart @@ -1,5 +1,5 @@ // This file is automatically generated, so please do not edit it. -// @generated by `flutter_rust_bridge`@ 2.4.0. +// @generated by `flutter_rust_bridge`@ 2.5.0. // ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import diff --git a/lib/src/rust/api/rhttp/error.dart b/lib/src/rust/api/rhttp/error.dart index aeb40c9c..c866afa5 100644 --- a/lib/src/rust/api/rhttp/error.dart +++ b/lib/src/rust/api/rhttp/error.dart @@ -1,5 +1,5 @@ // This file is automatically generated, so please do not edit it. -// @generated by `flutter_rust_bridge`@ 2.4.0. +// @generated by `flutter_rust_bridge`@ 2.5.0. // ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import diff --git a/lib/src/rust/api/rhttp/http.dart b/lib/src/rust/api/rhttp/http.dart index c51eca52..a73ab4a0 100644 --- a/lib/src/rust/api/rhttp/http.dart +++ b/lib/src/rust/api/rhttp/http.dart @@ -1,5 +1,5 @@ // This file is automatically generated, so please do not edit it. -// @generated by `flutter_rust_bridge`@ 2.4.0. +// @generated by `flutter_rust_bridge`@ 2.5.0. // ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import diff --git a/lib/src/rust/frb_generated.dart b/lib/src/rust/frb_generated.dart index eb5aed1d..b7895877 100644 --- a/lib/src/rust/frb_generated.dart +++ b/lib/src/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.4.0. +// @generated by `flutter_rust_bridge`@ 2.5.0. // 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 @@ -67,7 +67,7 @@ class RustLib extends BaseEntrypoint { kDefaultExternalLibraryLoaderConfig; @override - String get codegenVersion => '2.4.0'; + String get codegenVersion => '2.5.0'; @override int get rustContentHash => 107666026; diff --git a/lib/src/rust/frb_generated.io.dart b/lib/src/rust/frb_generated.io.dart index bd08a035..5b039506 100644 --- a/lib/src/rust/frb_generated.io.dart +++ b/lib/src/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.4.0. +// @generated by `flutter_rust_bridge`@ 2.5.0. // 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 diff --git a/lib/src/rust/frb_generated.web.dart b/lib/src/rust/frb_generated.web.dart index 767af832..691e932f 100644 --- a/lib/src/rust/frb_generated.web.dart +++ b/lib/src/rust/frb_generated.web.dart @@ -1,5 +1,5 @@ // This file is automatically generated, so please do not edit it. -// @generated by `flutter_rust_bridge`@ 2.4.0. +// @generated by `flutter_rust_bridge`@ 2.5.0. // 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 diff --git a/lib/src/rust/lib.dart b/lib/src/rust/lib.dart index c89e1a2f..e791013d 100644 --- a/lib/src/rust/lib.dart +++ b/lib/src/rust/lib.dart @@ -1,5 +1,5 @@ // This file is automatically generated, so please do not edit it. -// @generated by `flutter_rust_bridge`@ 2.4.0. +// @generated by `flutter_rust_bridge`@ 2.5.0. // ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import diff --git a/pubspec.lock b/pubspec.lock index 759433b8..ef300997 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -573,10 +573,10 @@ packages: dependency: "direct main" description: name: flutter_rust_bridge - sha256: a43a6649385b853bc836ef2bc1b056c264d476c35e131d2d69c38219b5e799f1 + sha256: "0ad5079de35d317650fec59b26cb4d0c116ebc2ce703a29f9367513b8a91c287" url: "https://pub.dev" source: hosted - version: "2.4.0" + version: "2.5.0" flutter_test: dependency: "direct dev" description: flutter diff --git a/pubspec.yaml b/pubspec.yaml index 354611eb..27772633 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -66,7 +66,7 @@ dependencies: highlight: ^0.7.0 json_view: ^0.4.2 super_sliver_list: ^0.4.1 - flutter_rust_bridge: ^2.4.0 + flutter_rust_bridge: ^2.5.0 rust_lib_mangayomi: path: rust_builder pseudom: ^1.0.1 diff --git a/rust/Cargo.lock b/rust/Cargo.lock index a5dcb7e8..28c28c4b 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -482,9 +482,9 @@ dependencies = [ [[package]] name = "flutter_rust_bridge" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ff967a5893be60d849e4362910762acdc275febe44333153a11dcec1bca2cd2" +checksum = "35a06af75bcc46b5443c2293f99fda22819e816f8a5f5bea04c72f8cb04a106a" dependencies = [ "allo-isolate", "android_logger", @@ -502,6 +502,7 @@ dependencies = [ "lazy_static", "log", "oslog", + "portable-atomic", "threadpool", "tokio", "wasm-bindgen", @@ -511,9 +512,9 @@ dependencies = [ [[package]] name = "flutter_rust_bridge_macros" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d48b4d3fae9d29377b19134a38386d8792bde70b9448cde49e96391bcfc8fed1" +checksum = "9250f0a18500e7825617ddb677bccf1336a2fe4c4edf6c6ce7717967ed67f42e" dependencies = [ "hex", "md-5", @@ -1277,6 +1278,12 @@ dependencies = [ "miniz_oxide", ] +[[package]] +name = "portable-atomic" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2" + [[package]] name = "ppv-lite86" version = "0.2.17" diff --git a/rust/Cargo.toml b/rust/Cargo.toml index 849f7934..308a6e4e 100644 --- a/rust/Cargo.toml +++ b/rust/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" crate-type = ["cdylib", "staticlib"] [dependencies] -flutter_rust_bridge = { version = "=2.4.0", features = ["chrono"] } +flutter_rust_bridge = { version = "=2.5.0", features = ["chrono"] } image = "0.25.0" chrono = "0.4.38" futures-util = "0.3.30" diff --git a/rust/src/frb_generated.rs b/rust/src/frb_generated.rs index a7f3fbc6..4e32f4b0 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.4.0. +// @generated by `flutter_rust_bridge`@ 2.5.0. #![allow( non_camel_case_types, @@ -38,7 +38,7 @@ flutter_rust_bridge::frb_generated_boilerplate!( default_rust_opaque = RustOpaqueMoi, default_rust_auto_opaque = RustAutoOpaqueMoi, ); -pub(crate) const FLUTTER_RUST_BRIDGE_CODEGEN_VERSION: &str = "2.4.0"; +pub(crate) const FLUTTER_RUST_BRIDGE_CODEGEN_VERSION: &str = "2.5.0"; pub(crate) const FLUTTER_RUST_BRIDGE_CODEGEN_CONTENT_HASH: i32 = 107666026; // Section: executor @@ -1905,7 +1905,7 @@ impl SseEncode for usize { #[cfg(not(target_family = "wasm"))] mod io { // This file is automatically generated, so please do not edit it. - // @generated by `flutter_rust_bridge`@ 2.4.0. + // @generated by `flutter_rust_bridge`@ 2.5.0. // Section: imports @@ -1957,7 +1957,7 @@ pub use io::*; #[cfg(target_family = "wasm")] mod web { // This file is automatically generated, so please do not edit it. - // @generated by `flutter_rust_bridge`@ 2.4.0. + // @generated by `flutter_rust_bridge`@ 2.5.0. // Section: imports