Merge pull request #9215 from Shadowghost/api-scoped-namespace

1 files changed, 89 insertions, 90 deletions

diff --git a/Jellyfin.Api/WebSocketListeners/SessionInfoWebSocketListener.cs b/Jellyfin.Api/WebSocketListeners/SessionInfoWebSocketListener.cs
index d996ac69f..0d8bf205c 100644
--- a/Jellyfin.Api/WebSocketListeners/SessionInfoWebSocketListener.cs
+++ b/Jellyfin.Api/WebSocketListeners/SessionInfoWebSocketListener.cs
@@ -6,99 +6,98 @@ using MediaBrowser.Controller.Session;
 using MediaBrowser.Model.Session;
 using Microsoft.Extensions.Logging;
 
-namespace Jellyfin.Api.WebSocketListeners
+namespace Jellyfin.Api.WebSocketListeners;
+
+/// <summary>
+/// Class SessionInfoWebSocketListener.
+/// </summary>
+public class SessionInfoWebSocketListener : BasePeriodicWebSocketListener<IEnumerable<SessionInfo>, WebSocketListenerState>
 {
+    private readonly ISessionManager _sessionManager;
+
     /// <summary>
-    /// Class SessionInfoWebSocketListener.
+    /// Initializes a new instance of the <see cref="SessionInfoWebSocketListener"/> class.
     /// </summary>
-    public class SessionInfoWebSocketListener : BasePeriodicWebSocketListener<IEnumerable<SessionInfo>, WebSocketListenerState>
+    /// <param name="logger">Instance of the <see cref="ILogger{SessionInfoWebSocketListener}"/> interface.</param>
+    /// <param name="sessionManager">Instance of the <see cref="ISessionManager"/> interface.</param>
+    public SessionInfoWebSocketListener(ILogger<SessionInfoWebSocketListener> logger, ISessionManager sessionManager)
+        : base(logger)
+    {
+        _sessionManager = sessionManager;
+
+        _sessionManager.SessionStarted += OnSessionManagerSessionStarted;
+        _sessionManager.SessionEnded += OnSessionManagerSessionEnded;
+        _sessionManager.PlaybackStart += OnSessionManagerPlaybackStart;
+        _sessionManager.PlaybackStopped += OnSessionManagerPlaybackStopped;
+        _sessionManager.PlaybackProgress += OnSessionManagerPlaybackProgress;
+        _sessionManager.CapabilitiesChanged += OnSessionManagerCapabilitiesChanged;
+        _sessionManager.SessionActivity += OnSessionManagerSessionActivity;
+    }
+
+    /// <inheritdoc />
+    protected override SessionMessageType Type => SessionMessageType.Sessions;
+
+    /// <inheritdoc />
+    protected override SessionMessageType StartType => SessionMessageType.SessionsStart;
+
+    /// <inheritdoc />
+    protected override SessionMessageType StopType => SessionMessageType.SessionsStop;
+
+    /// <summary>
+    /// Gets the data to send.
+    /// </summary>
+    /// <returns>Task{SystemInfo}.</returns>
+    protected override Task<IEnumerable<SessionInfo>> GetDataToSend()
+    {
+        return Task.FromResult(_sessionManager.Sessions);
+    }
+
+    /// <inheritdoc />
+    protected override void Dispose(bool dispose)
+    {
+        _sessionManager.SessionStarted -= OnSessionManagerSessionStarted;
+        _sessionManager.SessionEnded -= OnSessionManagerSessionEnded;
+        _sessionManager.PlaybackStart -= OnSessionManagerPlaybackStart;
+        _sessionManager.PlaybackStopped -= OnSessionManagerPlaybackStopped;
+        _sessionManager.PlaybackProgress -= OnSessionManagerPlaybackProgress;
+        _sessionManager.CapabilitiesChanged -= OnSessionManagerCapabilitiesChanged;
+        _sessionManager.SessionActivity -= OnSessionManagerSessionActivity;
+
+        base.Dispose(dispose);
+    }
+
+    private async void OnSessionManagerSessionActivity(object? sender, SessionEventArgs e)
+    {
+        await SendData(false).ConfigureAwait(false);
+    }
+
+    private async void OnSessionManagerCapabilitiesChanged(object? sender, SessionEventArgs e)
+    {
+        await SendData(true).ConfigureAwait(false);
+    }
+
+    private async void OnSessionManagerPlaybackProgress(object? sender, PlaybackProgressEventArgs e)
+    {
+        await SendData(!e.IsAutomated).ConfigureAwait(false);
+    }
+
+    private async void OnSessionManagerPlaybackStopped(object? sender, PlaybackStopEventArgs e)
+    {
+        await SendData(true).ConfigureAwait(false);
+    }
+
+    private async void OnSessionManagerPlaybackStart(object? sender, PlaybackProgressEventArgs e)
+    {
+        await SendData(true).ConfigureAwait(false);
+    }
+
+    private async void OnSessionManagerSessionEnded(object? sender, SessionEventArgs e)
+    {
+        await SendData(true).ConfigureAwait(false);
+    }
+
+    private async void OnSessionManagerSessionStarted(object? sender, SessionEventArgs e)
     {
-        private readonly ISessionManager _sessionManager;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SessionInfoWebSocketListener"/> class.
-        /// </summary>
-        /// <param name="logger">Instance of the <see cref="ILogger{SessionInfoWebSocketListener}"/> interface.</param>
-        /// <param name="sessionManager">Instance of the <see cref="ISessionManager"/> interface.</param>
-        public SessionInfoWebSocketListener(ILogger<SessionInfoWebSocketListener> logger, ISessionManager sessionManager)
-            : base(logger)
-        {
-            _sessionManager = sessionManager;
-
-            _sessionManager.SessionStarted += OnSessionManagerSessionStarted;
-            _sessionManager.SessionEnded += OnSessionManagerSessionEnded;
-            _sessionManager.PlaybackStart += OnSessionManagerPlaybackStart;
-            _sessionManager.PlaybackStopped += OnSessionManagerPlaybackStopped;
-            _sessionManager.PlaybackProgress += OnSessionManagerPlaybackProgress;
-            _sessionManager.CapabilitiesChanged += OnSessionManagerCapabilitiesChanged;
-            _sessionManager.SessionActivity += OnSessionManagerSessionActivity;
-        }
-
-        /// <inheritdoc />
-        protected override SessionMessageType Type => SessionMessageType.Sessions;
-
-        /// <inheritdoc />
-        protected override SessionMessageType StartType => SessionMessageType.SessionsStart;
-
-        /// <inheritdoc />
-        protected override SessionMessageType StopType => SessionMessageType.SessionsStop;
-
-        /// <summary>
-        /// Gets the data to send.
-        /// </summary>
-        /// <returns>Task{SystemInfo}.</returns>
-        protected override Task<IEnumerable<SessionInfo>> GetDataToSend()
-        {
-            return Task.FromResult(_sessionManager.Sessions);
-        }
-
-        /// <inheritdoc />
-        protected override void Dispose(bool dispose)
-        {
-            _sessionManager.SessionStarted -= OnSessionManagerSessionStarted;
-            _sessionManager.SessionEnded -= OnSessionManagerSessionEnded;
-            _sessionManager.PlaybackStart -= OnSessionManagerPlaybackStart;
-            _sessionManager.PlaybackStopped -= OnSessionManagerPlaybackStopped;
-            _sessionManager.PlaybackProgress -= OnSessionManagerPlaybackProgress;
-            _sessionManager.CapabilitiesChanged -= OnSessionManagerCapabilitiesChanged;
-            _sessionManager.SessionActivity -= OnSessionManagerSessionActivity;
-
-            base.Dispose(dispose);
-        }
-
-        private async void OnSessionManagerSessionActivity(object? sender, SessionEventArgs e)
-        {
-            await SendData(false).ConfigureAwait(false);
-        }
-
-        private async void OnSessionManagerCapabilitiesChanged(object? sender, SessionEventArgs e)
-        {
-            await SendData(true).ConfigureAwait(false);
-        }
-
-        private async void OnSessionManagerPlaybackProgress(object? sender, PlaybackProgressEventArgs e)
-        {
-            await SendData(!e.IsAutomated).ConfigureAwait(false);
-        }
-
-        private async void OnSessionManagerPlaybackStopped(object? sender, PlaybackStopEventArgs e)
-        {
-            await SendData(true).ConfigureAwait(false);
-        }
-
-        private async void OnSessionManagerPlaybackStart(object? sender, PlaybackProgressEventArgs e)
-        {
-            await SendData(true).ConfigureAwait(false);
-        }
-
-        private async void OnSessionManagerSessionEnded(object? sender, SessionEventArgs e)
-        {
-            await SendData(true).ConfigureAwait(false);
-        }
-
-        private async void OnSessionManagerSessionStarted(object? sender, SessionEventArgs e)
-        {
-            await SendData(true).ConfigureAwait(false);
-        }
+        await SendData(true).ConfigureAwait(false);
     }
 }