From 7eace4175c3d3104ebf6e2819fd5d9c19b81ec78 Mon Sep 17 00:00:00 2001 From: SenexCrenshaw <35600301+SenexCrenshaw@users.noreply.github.com> Date: Thu, 8 Feb 2024 15:41:10 -0500 Subject: [PATCH] fix: Fix FileUtil.GetFileDataStream to return a --- StreamMaster.Application/Hub/StreamMasterHub.cs | 4 ++-- StreamMaster.Domain/Common/FileUtil.cs | 13 +++++-------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/StreamMaster.Application/Hub/StreamMasterHub.cs b/StreamMaster.Application/Hub/StreamMasterHub.cs index 2639cc22e..f011ced77 100644 --- a/StreamMaster.Application/Hub/StreamMasterHub.cs +++ b/StreamMaster.Application/Hub/StreamMasterHub.cs @@ -23,7 +23,7 @@ public class SignalRMessage public partial class StreamMasterHub(ISender mediator, ISettingsService settingsService, IBackgroundTaskQueue taskQueue) : Hub, ISharedHub { - private static readonly ConcurrentHashSet _connections = new(); + private static readonly ConcurrentHashSet _connections = []; public static bool IsConnected { @@ -49,7 +49,7 @@ public override async Task OnDisconnectedAsync(Exception exception) - public Task GetIsSystemReady() + public Task GetIsSystemReady(object waste) { return mediator.Send(new GetIsSystemReadyRequest()); } diff --git a/StreamMaster.Domain/Common/FileUtil.cs b/StreamMaster.Domain/Common/FileUtil.cs index e518fd8e9..ab0d6e9ae 100644 --- a/StreamMaster.Domain/Common/FileUtil.cs +++ b/StreamMaster.Domain/Common/FileUtil.cs @@ -45,7 +45,7 @@ public static string CleanUpFileName(string fullName) { XmlSerializer serializer = new(typeof(XMLTV)); - using StreamReader reader = GetFileDataStream(filepath); + using Stream reader = GetFileDataStream(filepath); object? result = serializer.Deserialize(reader); return (XMLTV?)result; } @@ -229,18 +229,15 @@ public static async Task GetContentType(string Url) - public static StreamReader GetFileDataStream(string source) + public static Stream GetFileDataStream(string source) { if (!IsFileGzipped(source)) { - using StreamReader readerf = new(source, Encoding.Default); - return readerf; + return File.OpenRead(source); } - using FileStream fs = File.OpenRead(source); - using GZipStream gzStream = new(fs, CompressionMode.Decompress); - using StreamReader reader = new(gzStream, Encoding.Default); - return reader; + FileStream fs = File.OpenRead(source); + return new GZipStream(fs, CompressionMode.Decompress); } public static async Task GetFileData(string source)