From 7331833544da10d3a429ed62c9108f29d794b81e Mon Sep 17 00:00:00 2001 From: Bruno D'Luka Date: Fri, 27 Oct 2023 18:08:53 -0300 Subject: [PATCH 1/3] chore: bump version --- bluecherry_appcast.xml | 5 +++++ installer/windows-installer.iss | 2 +- linux/debian/DEBIAN/control | 2 +- linux/debian/usr/share/metainfo/bluecherry.appdata.xml | 1 + linux/rpm/bluecherry.spec | 2 +- pubspec.yaml | 2 +- snap/snapcraft.yaml | 2 +- 7 files changed, 11 insertions(+), 5 deletions(-) diff --git a/bluecherry_appcast.xml b/bluecherry_appcast.xml index 375d6ed4..4cf465b8 100644 --- a/bluecherry_appcast.xml +++ b/bluecherry_appcast.xml @@ -2,6 +2,11 @@ Bluecherry - Appcast + + Version 3.0.0-beta13 + Redesigned Settings, optmized Servers and updated translations. + Fri, 27 Oct 2023 + Version 3.0.0-beta12 Possibility to filter events by time. Correctly show video when there is any special characters on the password. diff --git a/installer/windows-installer.iss b/installer/windows-installer.iss index 9441bdc8..0c1e3fbc 100644 --- a/installer/windows-installer.iss +++ b/installer/windows-installer.iss @@ -2,7 +2,7 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define MyAppName "Bluecherry DVR" -#define MyAppVersion "3.0.0-beta12" +#define MyAppVersion "3.0.0-beta13" #define MyAppPublisher "Bluecherry DVR" #define MyAppURL "https://www.bluecherrydvr.com/" #define MyAppExeName "bluecherry_client.exe" diff --git a/linux/debian/DEBIAN/control b/linux/debian/DEBIAN/control index d3bc35b4..de3600d3 100644 --- a/linux/debian/DEBIAN/control +++ b/linux/debian/DEBIAN/control @@ -1,5 +1,5 @@ Package: bluecherrydvr -Version: 3.0.0-beta12 +Version: 3.0.0-beta13 Section: base Priority: optional Homepage: https://www.bluecherrydvr.com/ diff --git a/linux/debian/usr/share/metainfo/bluecherry.appdata.xml b/linux/debian/usr/share/metainfo/bluecherry.appdata.xml index b7e6c569..48c17535 100644 --- a/linux/debian/usr/share/metainfo/bluecherry.appdata.xml +++ b/linux/debian/usr/share/metainfo/bluecherry.appdata.xml @@ -35,6 +35,7 @@ --> bluecherrydvr.desktop + | | | diff --git a/linux/rpm/bluecherry.spec b/linux/rpm/bluecherry.spec index 7b459f7c..a90e965f 100644 --- a/linux/rpm/bluecherry.spec +++ b/linux/rpm/bluecherry.spec @@ -1,5 +1,5 @@ Name: bluecherrydvr -Version: 3.0.0_beta12 +Version: 3.0.0_beta13 Release: 1 Summary: Bluecherry client written in Flutter. License: EULA diff --git a/pubspec.yaml b/pubspec.yaml index 5e61d6c7..4489c1d0 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -3,7 +3,7 @@ description: Bluecherry client written in Flutter. publish_to: "none" -version: 3.0.0-beta12 +version: 3.0.0-beta13 environment: sdk: ">=3.0.0 <4.0.0" diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 02bdb271..32c1d671 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -1,5 +1,5 @@ name: bluecherry-client -version: 3.0.0-beta12 +version: 3.0.0-beta13 summary: Bluecherry DVR Client description: Bluecherry DVR client From 0b7339d356aef4e72226e6d734d991a1c5aa147b Mon Sep 17 00:00:00 2001 From: Bruno D'Luka Date: Fri, 27 Oct 2023 18:14:44 -0300 Subject: [PATCH 2/3] chore: bump dependencies --- .../unity_video_player_main/pubspec.yaml | 6 +++--- pubspec.lock | 4 ++-- pubspec.yaml | 2 +- windows/flutter/CMakeLists.txt | 7 ++++++- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/packages/unity_video_player/unity_video_player_main/pubspec.yaml b/packages/unity_video_player/unity_video_player_main/pubspec.yaml index 8b11c454..86549ddb 100644 --- a/packages/unity_video_player/unity_video_player_main/pubspec.yaml +++ b/packages/unity_video_player/unity_video_player_main/pubspec.yaml @@ -12,9 +12,9 @@ environment: dependencies: flutter: sdk: flutter - media_kit: ^1.1.8 # Primary package. - media_kit_video: ^1.2.1 # For video rendering. - media_kit_libs_video: ^1.0.3 # Native video dependencies. + media_kit: ^1.1.10 # Primary package. + media_kit_video: ^1.2.4 # For video rendering. + media_kit_libs_video: ^1.0.4 # Native video dependencies. unity_video_player_platform_interface: path: ../unity_video_player_platform_interface/ path_provider: diff --git a/pubspec.lock b/pubspec.lock index 815eeb3b..0b19f244 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1042,10 +1042,10 @@ packages: dependency: "direct main" description: name: window_manager - sha256: "6ee795be9124f90660ea9d05e581a466de19e1c89ee74fc4bf528f60c8600edd" + sha256: dcc865277f26a7dad263a47d0e405d77e21f12cb71f30333a52710a408690bd7 url: "https://pub.dev" source: hosted - version: "0.3.6" + version: "0.3.7" xdg_directories: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 4489c1d0..d79f8889 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -56,7 +56,7 @@ dependencies: uuid: ^4.1.0 # Desktop - window_manager: ^0.3.2 + window_manager: ^0.3.7 unity_multi_window: path: packages/unity_multi_window/ diff --git a/windows/flutter/CMakeLists.txt b/windows/flutter/CMakeLists.txt index 930d2071..903f4899 100644 --- a/windows/flutter/CMakeLists.txt +++ b/windows/flutter/CMakeLists.txt @@ -10,6 +10,11 @@ include(${EPHEMERAL_DIR}/generated_config.cmake) # https://github.com/flutter/flutter/issues/57146. set(WRAPPER_ROOT "${EPHEMERAL_DIR}/cpp_client_wrapper") +# Set fallback configurations for older versions of the flutter tool. +if (NOT DEFINED FLUTTER_TARGET_PLATFORM) + set(FLUTTER_TARGET_PLATFORM "windows-x64") +endif() + # === Flutter Library === set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/flutter_windows.dll") @@ -92,7 +97,7 @@ add_custom_command( COMMAND ${CMAKE_COMMAND} -E env ${FLUTTER_TOOL_ENVIRONMENT} "${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.bat" - windows-x64 $ + ${FLUTTER_TARGET_PLATFORM} $ VERBATIM ) add_custom_target(flutter_assemble DEPENDS From 55e648742aa0abcadfd3df86fc1935f946cb1b78 Mon Sep 17 00:00:00 2001 From: Bruno D'Luka Date: Fri, 27 Oct 2023 18:19:38 -0300 Subject: [PATCH 3/3] fix: server adding --- lib/providers/update_provider.dart | 8 ++++---- lib/widgets/servers/add_server.dart | 9 +++++++-- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/lib/providers/update_provider.dart b/lib/providers/update_provider.dart index 97d08128..1cce149f 100644 --- a/lib/providers/update_provider.dart +++ b/lib/providers/update_provider.dart @@ -107,10 +107,10 @@ class UpdateManager extends ChangeNotifier { final currentVersion = Version.parse(packageInfo.version); final latestVersion = Version.parse(this.latestVersion!.version); - assert( - latestVersion >= currentVersion, - 'The latest version can not be older than the current version', - ); + // assert( + // latestVersion >= currentVersion, + // 'The latest version can not be older than the current version', + // ); return currentVersion != latestVersion; } diff --git a/lib/widgets/servers/add_server.dart b/lib/widgets/servers/add_server.dart index b47ba1e3..ae5e25d3 100644 --- a/lib/widgets/servers/add_server.dart +++ b/lib/widgets/servers/add_server.dart @@ -606,8 +606,13 @@ class _ConfigureDVRServerScreenState extends State { final name = nameController.text.trim(); final hostname = getServerHostname(hostnameController.text.trim()); - if (ServersProvider.instance.servers - .any((s) => Uri.parse(s.login).host == Uri.parse(hostname).host)) { + if (ServersProvider.instance.servers.any((s) { + final serverHost = Uri.parse(s.login).host; + final newServerHost = Uri.parse(hostname).host; + return serverHost.isNotEmpty && + newServerHost.isNotEmpty && + serverHost == newServerHost; + })) { showDialog( context: context, builder: (context) {