feat: Use mediaPath

bluecherrydvr · Sep 28, 2024 · ed8e8f7 · ed8e8f7
1 parent 3d343e6
commit ed8e8f7
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 7 deletions.
diff --git 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
@@ -367,7 +367,7 @@ extension DevicesMapExtension on MapEntry<Device, Iterable<Event>> {
                 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
@@ -144,9 +144,9 @@ class _EventPlayerDesktopState extends State<EventPlayerDesktop> {
                 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<EventPlayerDesktop> {
                     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
@@ -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
@@ -160,7 +160,7 @@ class UnityPlayers with ChangeNotifier {
         );
       },
     )
-      ..setDataSource(event.mediaURL!.toString())
+      ..setDataSource(event.mediaPath.toString())
       ..setVolume(1.0)
       ..setSpeed(1.0);