From 378ba937b6e5f79a065c56b065d57c192a634fb7 Mon Sep 17 00:00:00 2001 From: Thomas Jones Date: Tue, 23 Sep 2025 13:17:52 -0600 Subject: [PATCH 1/2] Added in pragma warning disable for CA1815 warning. Co-authored-by: Derpipose <90276123+Derpipose@users.noreply.github.com> --- Emby.Naming/AudioBook/AudioBookNameParserResult.cs | 2 ++ Emby.Naming/Video/CleanDateTimeResult.cs | 2 ++ MediaBrowser.Model/Drawing/ImageDimensions.cs | 1 + 3 files changed, 5 insertions(+) diff --git a/Emby.Naming/AudioBook/AudioBookNameParserResult.cs b/Emby.Naming/AudioBook/AudioBookNameParserResult.cs index 3f2d7b2b0b..de78e75a91 100644 --- a/Emby.Naming/AudioBook/AudioBookNameParserResult.cs +++ b/Emby.Naming/AudioBook/AudioBookNameParserResult.cs @@ -1,3 +1,5 @@ +#pragma warning disable CA1815 + namespace Emby.Naming.AudioBook { /// diff --git a/Emby.Naming/Video/CleanDateTimeResult.cs b/Emby.Naming/Video/CleanDateTimeResult.cs index c675a19d0f..e367f92213 100644 --- a/Emby.Naming/Video/CleanDateTimeResult.cs +++ b/Emby.Naming/Video/CleanDateTimeResult.cs @@ -1,3 +1,5 @@ +#pragma warning disable CA1815 + namespace Emby.Naming.Video { /// diff --git a/MediaBrowser.Model/Drawing/ImageDimensions.cs b/MediaBrowser.Model/Drawing/ImageDimensions.cs index f84fe68305..49528ef8ae 100644 --- a/MediaBrowser.Model/Drawing/ImageDimensions.cs +++ b/MediaBrowser.Model/Drawing/ImageDimensions.cs @@ -1,4 +1,5 @@ #pragma warning disable CS1591 +#pragma warning disable CA1815 using System.Globalization; From a014cb538e0b833057e141c5671b0a86d643d188 Mon Sep 17 00:00:00 2001 From: Thomas Jones Date: Tue, 23 Sep 2025 14:18:15 -0600 Subject: [PATCH 2/2] Fixed 3 different CA1051 warnings. Changed them to auto properties and rearranged the members to fit styling rules. Co-authored-by: Derpipose <90276123+Derpipose@users.noreply.github.com> --- .../MediaEncoding/EncodingJobInfo.cs | 7 ++++--- .../Net/BasePeriodicWebSocketListener.cs | 10 +++++----- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs b/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs index ef912f42c3..43680f5c01 100644 --- a/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs +++ b/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs @@ -23,9 +23,6 @@ namespace MediaBrowser.Controller.MediaEncoding { private static readonly char[] _separators = ['|', ',']; - public int? OutputAudioBitrate; - public int? OutputAudioChannels; - private TranscodeReason? _transcodeReasons = null; public EncodingJobInfo(TranscodingJobType jobType) @@ -37,6 +34,10 @@ namespace MediaBrowser.Controller.MediaEncoding SupportedSubtitleCodecs = Array.Empty(); } + public int? OutputAudioBitrate { get; set; } + + public int? OutputAudioChannels { get; set; } + public TranscodeReason TranscodeReasons { get diff --git a/MediaBrowser.Controller/Net/BasePeriodicWebSocketListener.cs b/MediaBrowser.Controller/Net/BasePeriodicWebSocketListener.cs index 1e0d77fe51..6b1eac8047 100644 --- a/MediaBrowser.Controller/Net/BasePeriodicWebSocketListener.cs +++ b/MediaBrowser.Controller/Net/BasePeriodicWebSocketListener.cs @@ -40,11 +40,6 @@ namespace MediaBrowser.Controller.Net /// private readonly List<(IWebSocketConnection Connection, CancellationTokenSource CancellationTokenSource, TStateType State)> _activeConnections = new(); - /// - /// The logger. - /// - protected readonly ILogger> Logger; - private readonly Task _messageConsumerTask; protected BasePeriodicWebSocketListener(ILogger> logger) @@ -56,6 +51,11 @@ namespace MediaBrowser.Controller.Net _messageConsumerTask = HandleMessages(); } + /// + /// Gets the Logger. + /// + protected ILogger> Logger { get; } + /// /// Gets the type used for the messages sent to the client. ///