From ed8e8f7efb2874894822d24a4d453c2328681eae Mon Sep 17 00:00:00 2001 From: Bruno D'Luka Date: Sat, 28 Sep 2024 15:52:29 -0300 Subject: [PATCH] feat: Use mediaPath --- lib/models/event.dart | 13 +++++++++++++ lib/screens/events_timeline/events_playback.dart | 2 +- lib/screens/players/event_player_desktop.dart | 6 +++--- lib/screens/players/event_player_mobile.dart | 4 ++-- lib/utils/video_player.dart | 2 +- 5 files changed, 20 insertions(+), 7 deletions(-) diff --git a/lib/models/event.dart b/lib/models/event.dart index 48dd0096..6ce98c6c 100644 --- a/lib/models/event.dart +++ b/lib/models/event.dart @@ -206,6 +206,19 @@ class Event { } } + String get mediaPath { + return '${mediaURL!.scheme}://' + '${Uri.encodeComponent(server.login)}' + ':' + '${Uri.encodeComponent(server.password)}' + '@' + '${mediaURL!.host}' + ':' + '${mediaURL!.port}' + '${mediaURL!.path}' + '${mediaURL!.query}'; + } + Event copyWith({ Server? server, int? id, diff --git a/lib/screens/events_timeline/events_playback.dart b/lib/screens/events_timeline/events_playback.dart index 10bee0c9..662efff1 100644 --- a/lib/screens/events_timeline/events_playback.dart +++ b/lib/screens/events_timeline/events_playback.dart @@ -367,7 +367,7 @@ extension DevicesMapExtension on MapEntry> { downloads.getDownloadedPathForEvent(event.id), windows: isDesktopPlatform && Platform.isWindows, ).toString() - : event.mediaURL!.toString(); + : event.mediaPath; return TimelineEvent( startTime: event.published, diff --git a/lib/screens/players/event_player_desktop.dart b/lib/screens/players/event_player_desktop.dart index 17986b14..3a77f037 100644 --- a/lib/screens/players/event_player_desktop.dart +++ b/lib/screens/players/event_player_desktop.dart @@ -144,9 +144,9 @@ class _EventPlayerDesktopState extends State { windows: Platform.isWindows, ).toString(); } - return event.mediaURL.toString(); + return event.mediaPath; }() - : event.mediaURL.toString(); + : event.mediaPath; if (mediaUrl != videoController.dataSource) { debugPrint( @@ -193,7 +193,7 @@ class _EventPlayerDesktopState extends State { Expanded( child: InteractiveViewer( child: UnityVideoView( - heroTag: currentEvent.mediaURL, + heroTag: currentEvent.mediaPath, player: videoController, fit: fit, paneBuilder: (context, player) { diff --git a/lib/screens/players/event_player_mobile.dart b/lib/screens/players/event_player_mobile.dart index 583d05e4..922b94ad 100644 --- a/lib/screens/players/event_player_mobile.dart +++ b/lib/screens/players/event_player_mobile.dart @@ -84,7 +84,7 @@ class __EventPlayerMobileState extends State<_EventPlayerMobile> { downloads.getDownloadedPathForEvent(widget.event.id), windows: Platform.isWindows, ).toString() - : widget.event.mediaURL.toString(); + : widget.event.mediaPath; debugPrint(mediaUrl); if (videoController.dataSource != mediaUrl) { @@ -120,7 +120,7 @@ class __EventPlayerMobileState extends State<_EventPlayerMobile> { Expanded( child: SafeArea( child: UnityVideoView( - heroTag: widget.event.mediaURL, + heroTag: widget.event.mediaPath, player: videoController, fit: settings.kVideoFit.value, videoBuilder: (context, video) { diff --git a/lib/utils/video_player.dart b/lib/utils/video_player.dart index abfcc5ac..71c4a871 100644 --- a/lib/utils/video_player.dart +++ b/lib/utils/video_player.dart @@ -160,7 +160,7 @@ class UnityPlayers with ChangeNotifier { ); }, ) - ..setDataSource(event.mediaURL!.toString()) + ..setDataSource(event.mediaPath.toString()) ..setVolume(1.0) ..setSpeed(1.0);