1 files changed, 43 insertions, 60 deletions
diff --git a/Emby.Server.Implementations/LiveTv/TunerHosts/SharedHttpStream.cs b/Emby.Server.Implementations/LiveTv/TunerHosts/SharedHttpStream.cs
index 67879cbae..b1ce7b2b3 100644
--- a/Emby.Server.Implementations/LiveTv/TunerHosts/SharedHttpStream.cs
+++ b/Emby.Server.Implementations/LiveTv/TunerHosts/SharedHttpStream.cs
@@ -3,7 +3,6 @@
 #pragma warning disable CS1591
 
 using System;
-using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
 using System.Net.Http;
@@ -55,39 +54,26 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
             Directory.CreateDirectory(Path.GetDirectoryName(TempFilePath));
 
             var typeName = GetType().Name;
-            Logger.LogInformation("Opening " + typeName + " Live stream from {0}", url);
+            Logger.LogInformation("Opening {StreamType} Live stream from {Url}", typeName, url);
 
             // Response stream is disposed manually.
             var response = await _httpClientFactory.CreateClient(NamedClient.Default)
                 .GetAsync(url, HttpCompletionOption.ResponseHeadersRead, CancellationToken.None)
                 .ConfigureAwait(false);
 
-            var extension = "ts";
-            var requiresRemux = false;
-
             var contentType = response.Content.Headers.ContentType?.ToString() ?? string.Empty;
-            if (contentType.IndexOf("matroska", StringComparison.OrdinalIgnoreCase) != -1)
-            {
-                requiresRemux = true;
-            }
-            else if (contentType.IndexOf("mp4", StringComparison.OrdinalIgnoreCase) != -1 ||
-               contentType.IndexOf("dash", StringComparison.OrdinalIgnoreCase) != -1 ||
-               contentType.IndexOf("mpegURL", StringComparison.OrdinalIgnoreCase) != -1 ||
-               contentType.IndexOf("text/", StringComparison.OrdinalIgnoreCase) != -1)
-            {
-                requiresRemux = true;
-            }
-
-            // Close the stream without any sharing features
-            if (requiresRemux)
+            if (contentType.Contains("matroska", StringComparison.OrdinalIgnoreCase)
+                || contentType.Contains("mp4", StringComparison.OrdinalIgnoreCase)
+                || contentType.Contains("dash", StringComparison.OrdinalIgnoreCase)
+                || contentType.Contains("mpegURL", StringComparison.OrdinalIgnoreCase)
+                || contentType.Contains("text/", StringComparison.OrdinalIgnoreCase))
             {
-                using (response)
-                {
-                    return;
-                }
+                // Close the stream without any sharing features
+                response.Dispose();
+                return;
             }
 
-            SetTempFilePath(extension);
+            SetTempFilePath("ts");
 
             var taskCompletionSource = new TaskCompletionSource<bool>();
 
@@ -117,49 +103,46 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
 
             if (!taskCompletionSource.Task.Result)
             {
-                Logger.LogWarning("Zero bytes copied from stream {0} to {1} but no exception raised", GetType().Name, TempFilePath);
+                Logger.LogWarning("Zero bytes copied from stream {StreamType} to {FilePath} but no exception raised", GetType().Name, TempFilePath);
                 throw new EndOfStreamException(string.Format(CultureInfo.InvariantCulture, "Zero bytes copied from stream {0}", GetType().Name));
             }
         }
 
-        public string GetFilePath()
-        {
-            return TempFilePath;
-        }
-
         private Task StartStreaming(HttpResponseMessage response, TaskCompletionSource<bool> openTaskCompletionSource, CancellationToken cancellationToken)
         {
-            return Task.Run(async () =>
-            {
-                try
-                {
-                    Logger.LogInformation("Beginning {0} stream to {1}", GetType().Name, TempFilePath);
-                    using var message = response;
-                    await using var stream = await response.Content.ReadAsStreamAsync(cancellationToken).ConfigureAwait(false);
-                    await using var fileStream = new FileStream(TempFilePath, FileMode.Create, FileAccess.Write, FileShare.Read);
-                    await StreamHelper.CopyToAsync(
-                        stream,
-                        fileStream,
-                        IODefaults.CopyToBufferSize,
-                        () => Resolve(openTaskCompletionSource),
-                        cancellationToken).ConfigureAwait(false);
-                }
-                catch (OperationCanceledException ex)
+            return Task.Run(
+                async () =>
                 {
-                    Logger.LogInformation("Copying of {0} to {1} was canceled", GetType().Name, TempFilePath);
-                    openTaskCompletionSource.TrySetException(ex);
-                }
-                catch (Exception ex)
-                {
-                    Logger.LogError(ex, "Error copying live stream {0} to {1}.", GetType().Name, TempFilePath);
-                    openTaskCompletionSource.TrySetException(ex);
-                }
-
-                openTaskCompletionSource.TrySetResult(false);
-
-                EnableStreamSharing = false;
-                await DeleteTempFiles(new List<string> { TempFilePath }).ConfigureAwait(false);
-            }, CancellationToken.None);
+                    try
+                    {
+                        Logger.LogInformation("Beginning {StreamType} stream to {FilePath}", GetType().Name, TempFilePath);
+                        using var message = response;
+                        await using var stream = await response.Content.ReadAsStreamAsync(cancellationToken).ConfigureAwait(false);
+                        await using var fileStream = new FileStream(TempFilePath, FileMode.Create, FileAccess.Write, FileShare.Read, IODefaults.FileStreamBufferSize, FileOptions.Asynchronous);
+                        await StreamHelper.CopyToAsync(
+                            stream,
+                            fileStream,
+                            IODefaults.CopyToBufferSize,
+                            () => Resolve(openTaskCompletionSource),
+                            cancellationToken).ConfigureAwait(false);
+                    }
+                    catch (OperationCanceledException ex)
+                    {
+                        Logger.LogInformation("Copying of {StreamType} to {FilePath} was canceled", GetType().Name, TempFilePath);
+                        openTaskCompletionSource.TrySetException(ex);
+                    }
+                    catch (Exception ex)
+                    {
+                        Logger.LogError(ex, "Error copying live stream {StreamType} to {FilePath}", GetType().Name, TempFilePath);
+                        openTaskCompletionSource.TrySetException(ex);
+                    }
+
+                    openTaskCompletionSource.TrySetResult(false);
+
+                    EnableStreamSharing = false;
+                    await DeleteTempFiles(TempFilePath).ConfigureAwait(false);
+                },
+                CancellationToken.None);
         }
 
         private void Resolve(TaskCompletionSource<bool> openTaskCompletionSource)