Properly parsing m3u/m3u8 files

Fix reconnecting to stream

Author: miclat97

QuickViewFile/Controls/VideoPlayerControl.xaml.cs

@@ -269,9 +269,9 @@ protected virtual void Dispose(bool disposing)
             }
         }
 
+        // Ta metoda wywoła się, gdy stream się "urwie" lub skończy
         private void VideoInWindowPlayer_MediaEnded(object sender, RoutedEventArgs e)
         {
-            // Stream się zakończył (np. serwer zerwał połączenie) - próbujemy połączyć ponownie
             ReloadStream();
         }
 
@@ -281,23 +281,18 @@ private void VideoInWindowPlayer_MediaFailed(object sender, ExceptionRoutedEvent
             ReloadStream();
         }
 
-        private void ReloadStream()
+        private async void ReloadStream()
         {
-            // Check if user paused video manually
-            if (isVideoPaused || !mediaPlayerIsPlaying) return;
+            if (isVideoPaused) return;
 
-            Dispatcher.Invoke(() =>
-            {
-                // This will force WPF to reconnect to the stream
-                var currentSource = videoInWindowPlayer.Source;
+            await Task.Delay(1);
 
-                if (currentSource != null)
-                {
-                    videoInWindowPlayer.Source = null;
-                    videoInWindowPlayer.Source = currentSource;
-                    videoInWindowPlayer.Play();
-                }
-            });
+            if (isVideoPaused) return;
+
+            var currentTempSource = videoInWindowPlayer.Source;
+            videoInWindowPlayer.Source = null;
+            videoInWindowPlayer.Source = currentTempSource;
+            videoInWindowPlayer.Play();
         }
 
         public TimeSpan GetCurrentVideoPosition()

QuickViewFile/Helpers/FileContentReader.cs

@@ -1,7 +1,46 @@
+using System.IO;
+
 namespace QuickViewFile.Helpers
 {
     public static class FileContentReader
     {
+        /// <summary>
+        /// Reads file m3u/m3u8 and parse valid stream URL
+        /// </summary>
+        public static string? ExtractStreamUrlFromM3u(string filePath)
+        {
+            if (string.IsNullOrWhiteSpace(filePath) || !File.Exists(filePath))
+                return null;
+
+            try
+            {
+                foreach (string line in File.ReadLines(filePath))
+                {
+                    if (string.IsNullOrWhiteSpace(line))
+                        continue;
+
+                    string cleanLine = line.Trim();
+
+                    if (cleanLine.StartsWith("#"))
+                        continue;
+
+
+                    if (cleanLine.StartsWith("http", StringComparison.OrdinalIgnoreCase) ||  // both http and https
+                        cleanLine.StartsWith("rtsp", StringComparison.OrdinalIgnoreCase) ||
+                        cleanLine.StartsWith("rtmp", StringComparison.OrdinalIgnoreCase) ||
+                        cleanLine.StartsWith("udp", StringComparison.OrdinalIgnoreCase) ||
+                        cleanLine.StartsWith("mms", StringComparison.OrdinalIgnoreCase))
+                    {
+                        return cleanLine;
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                return "Error parsing m3u/m3u8 file!";
+            }
 
+            return null;
+        }
     }
 }

QuickViewFile/ViewModel/FilesListViewModel.cs

@@ -249,7 +249,7 @@ public async Task LazyLoadFile(bool? forceLoad = false)
             {
                 try
                 {
-                    string streamUrl = File.ReadAllText(filePath).Trim();
+                    string streamUrl = FileContentReader.ExtractStreamUrlFromM3u(filePath);
                     SelectedItem.FileContentModel.VideoMedia = new Controls.VideoPlayerControl(streamUrl, Config.BitmapScalingMode);
                     SelectedItem.FileContentModel.TextContent = null;
                     SelectedItem.FileContentModel.ShowTextBox = false;