Use primary constructor everywhere

ConfusedPolarBear.Plugin.IntroSkipper.Tests/TestEdl.cs

@@ -1,5 +1,6 @@
 using System;
 using ConfusedPolarBear.Plugin.IntroSkipper.Data;
+using ConfusedPolarBear.Plugin.IntroSkipper.Manager;
 using Xunit;
 
 namespace ConfusedPolarBear.Plugin.IntroSkipper.Tests;

ConfusedPolarBear.Plugin.IntroSkipper/Analyzers/AnalyzerHelper.cs

@@ -5,13 +5,13 @@ using ConfusedPolarBear.Plugin.IntroSkipper.Configuration;
 using ConfusedPolarBear.Plugin.IntroSkipper.Data;
 using Microsoft.Extensions.Logging;
 
-namespace ConfusedPolarBear.Plugin.IntroSkipper;
-
-/// <summary>
-/// Analyzer Helper.
-/// </summary>
-public class AnalyzerHelper
+namespace ConfusedPolarBear.Plugin.IntroSkipper.Analyzers
 {
+    /// <summary>
+    /// Analyzer Helper.
+    /// </summary>
+    public class AnalyzerHelper
+    {
         private readonly ILogger _logger;
         private readonly double _silenceDetectionMinimumDuration;
 
@@ -113,4 +113,5 @@ public class AnalyzerHelper
                     silenceRange.Duration >= _silenceDetectionMinimumDuration &&
                     silenceRange.Start >= adjustedIntro.Start;
         }
+    }
 }

ConfusedPolarBear.Plugin.IntroSkipper/ConfusedPolarBear.Plugin.IntroSkipper.csproj

@@ -23,8 +23,4 @@
     <EmbeddedResource Include="Configuration\visualizer.js" />
     <EmbeddedResource Include="Configuration\inject.js" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Manager\" />
-    <Folder Include="Services\" />
-  </ItemGroup>
 </Project>

ConfusedPolarBear.Plugin.IntroSkipper/Helper/XmlSerializationHelper.cs

@@ -6,7 +6,7 @@ using System.Runtime.Serialization;
 using System.Xml;
 using ConfusedPolarBear.Plugin.IntroSkipper.Data;
 
-namespace ConfusedPolarBear.Plugin.IntroSkipper
+namespace ConfusedPolarBear.Plugin.IntroSkipper.Helper
 {
     internal sealed class XmlSerializationHelper
     {

ConfusedPolarBear.Plugin.IntroSkipper/Manager/EdlManager.cs

@@ -4,13 +4,13 @@ using System.IO;
 using ConfusedPolarBear.Plugin.IntroSkipper.Data;
 using Microsoft.Extensions.Logging;
 
-namespace ConfusedPolarBear.Plugin.IntroSkipper;
-
-/// <summary>
-/// Update EDL files associated with a list of episodes.
-/// </summary>
-public static class EdlManager
+namespace ConfusedPolarBear.Plugin.IntroSkipper.Manager
 {
+    /// <summary>
+    /// Update EDL files associated with a list of episodes.
+    /// </summary>
+    public static class EdlManager
+    {
         private static ILogger? _logger;
 
         /// <summary>
@@ -113,4 +113,5 @@ public static class EdlManager
         {
             return Path.ChangeExtension(mediaPath, "edl");
         }
+    }
 }

ConfusedPolarBear.Plugin.IntroSkipper/Manager/QueueManager.cs

@@ -10,18 +10,18 @@ using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Library;
 using Microsoft.Extensions.Logging;
 
-namespace ConfusedPolarBear.Plugin.IntroSkipper;
-
-/// <summary>
-/// Manages enqueuing library items for analysis.
-/// </summary>
-/// <remarks>
-/// Initializes a new instance of the <see cref="QueueManager"/> class.
-/// </remarks>
-/// <param name="logger">Logger.</param>
-/// <param name="libraryManager">Library manager.</param>
-public class QueueManager(ILogger<QueueManager> logger, ILibraryManager libraryManager)
+namespace ConfusedPolarBear.Plugin.IntroSkipper.Manager
 {
+    /// <summary>
+    /// Manages enqueuing library items for analysis.
+    /// </summary>
+    /// <remarks>
+    /// Initializes a new instance of the <see cref="QueueManager"/> class.
+    /// </remarks>
+    /// <param name="logger">Logger.</param>
+    /// <param name="libraryManager">Library manager.</param>
+    public class QueueManager(ILogger<QueueManager> logger, ILibraryManager libraryManager)
+    {
         private readonly ILibraryManager _libraryManager = libraryManager;
         private readonly ILogger<QueueManager> _logger = logger;
         private readonly Dictionary<Guid, List<QueuedEpisode>> _queuedEpisodes = [];
@@ -293,4 +293,5 @@ public class QueueManager(ILogger<QueueManager> logger, ILibraryManager libraryM
 
             return (verified, reqModes);
         }
+    }
 }

ConfusedPolarBear.Plugin.IntroSkipper/Plugin.cs

@@ -6,6 +6,7 @@ using System.Linq;
 using System.Text.RegularExpressions;
 using ConfusedPolarBear.Plugin.IntroSkipper.Configuration;
 using ConfusedPolarBear.Plugin.IntroSkipper.Data;
+using ConfusedPolarBear.Plugin.IntroSkipper.Helper;
 using MediaBrowser.Common;
 using MediaBrowser.Common.Configuration;
 using MediaBrowser.Common.Plugins;

ConfusedPolarBear.Plugin.IntroSkipper/PluginServiceRegistrator.cs

@@ -1,4 +1,5 @@
 using ConfusedPolarBear.Plugin.IntroSkipper.Providers;
+using ConfusedPolarBear.Plugin.IntroSkipper.Services;
 using MediaBrowser.Controller;
 using MediaBrowser.Controller.Plugins;
 using Microsoft.Extensions.DependencyInjection;

ConfusedPolarBear.Plugin.IntroSkipper/ScheduledTasks/BaseItemAnalyzerTask.cs

@@ -6,6 +6,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using ConfusedPolarBear.Plugin.IntroSkipper.Analyzers;
 using ConfusedPolarBear.Plugin.IntroSkipper.Data;
+using ConfusedPolarBear.Plugin.IntroSkipper.Manager;
 using MediaBrowser.Controller.Library;
 using Microsoft.Extensions.Logging;
 

ConfusedPolarBear.Plugin.IntroSkipper/ScheduledTasks/CleanCacheTask.cs

@@ -4,6 +4,7 @@ using System.IO;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using ConfusedPolarBear.Plugin.IntroSkipper.Manager;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Model.Tasks;
 using Microsoft.Extensions.Logging;

ConfusedPolarBear.Plugin.IntroSkipper/ScheduledTasks/DetectCreditsTask.cs

@@ -4,6 +4,7 @@ using System.Collections.ObjectModel;
 using System.Threading;
 using System.Threading.Tasks;
 using ConfusedPolarBear.Plugin.IntroSkipper.Data;
+using ConfusedPolarBear.Plugin.IntroSkipper.Services;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Model.Tasks;
 using Microsoft.Extensions.Logging;

ConfusedPolarBear.Plugin.IntroSkipper/ScheduledTasks/DetectIntrosCreditsTask.cs

@@ -4,6 +4,7 @@ using System.Collections.ObjectModel;
 using System.Threading;
 using System.Threading.Tasks;
 using ConfusedPolarBear.Plugin.IntroSkipper.Data;
+using ConfusedPolarBear.Plugin.IntroSkipper.Services;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Model.Tasks;
 using Microsoft.Extensions.Logging;

ConfusedPolarBear.Plugin.IntroSkipper/ScheduledTasks/DetectIntrosTask.cs

@@ -4,6 +4,7 @@ using System.Collections.ObjectModel;
 using System.Threading;
 using System.Threading.Tasks;
 using ConfusedPolarBear.Plugin.IntroSkipper.Data;
+using ConfusedPolarBear.Plugin.IntroSkipper.Services;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Model.Tasks;
 using Microsoft.Extensions.Logging;

ConfusedPolarBear.Plugin.IntroSkipper/Services/AutoSkip.cs

@@ -15,23 +15,23 @@ using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using Timer = System.Timers.Timer;
 
-namespace ConfusedPolarBear.Plugin.IntroSkipper;
-
-/// <summary>
-/// Automatically skip past introduction sequences.
-/// Commands clients to seek to the end of the intro as soon as they start playing it.
-/// </summary>
-/// <remarks>
-/// Initializes a new instance of the <see cref="AutoSkip"/> class.
-/// </remarks>
-/// <param name="userDataManager">User data manager.</param>
-/// <param name="sessionManager">Session manager.</param>
-/// <param name="logger">Logger.</param>
-public class AutoSkip(
+namespace ConfusedPolarBear.Plugin.IntroSkipper.Services
+{
+    /// <summary>
+    /// Automatically skip past introduction sequences.
+    /// Commands clients to seek to the end of the intro as soon as they start playing it.
+    /// </summary>
+    /// <remarks>
+    /// Initializes a new instance of the <see cref="AutoSkip"/> class.
+    /// </remarks>
+    /// <param name="userDataManager">User data manager.</param>
+    /// <param name="sessionManager">Session manager.</param>
+    /// <param name="logger">Logger.</param>
+    public class AutoSkip(
         IUserDataManager userDataManager,
         ISessionManager sessionManager,
         ILogger<AutoSkip> logger) : IHostedService, IDisposable
-{
+    {
         private readonly object _sentSeekCommandLock = new();
 
         private ILogger<AutoSkip> _logger = logger;
@@ -227,4 +227,5 @@ public class AutoSkip(
             _userDataManager.UserDataSaved -= UserDataManager_UserDataSaved;
             return Task.CompletedTask;
         }
+    }
 }

ConfusedPolarBear.Plugin.IntroSkipper/Services/AutoSkipCredits.cs

@@ -15,23 +15,23 @@ using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using Timer = System.Timers.Timer;
 
-namespace ConfusedPolarBear.Plugin.IntroSkipper;
-
-/// <summary>
-/// Automatically skip past credit sequences.
-/// Commands clients to seek to the end of the credits as soon as they start playing it.
-/// </summary>
-/// <remarks>
-/// Initializes a new instance of the <see cref="AutoSkipCredits"/> class.
-/// </remarks>
-/// <param name="userDataManager">User data manager.</param>
-/// <param name="sessionManager">Session manager.</param>
-/// <param name="logger">Logger.</param>
-public class AutoSkipCredits(
+namespace ConfusedPolarBear.Plugin.IntroSkipper.Services
+{
+    /// <summary>
+    /// Automatically skip past credit sequences.
+    /// Commands clients to seek to the end of the credits as soon as they start playing it.
+    /// </summary>
+    /// <remarks>
+    /// Initializes a new instance of the <see cref="AutoSkipCredits"/> class.
+    /// </remarks>
+    /// <param name="userDataManager">User data manager.</param>
+    /// <param name="sessionManager">Session manager.</param>
+    /// <param name="logger">Logger.</param>
+    public class AutoSkipCredits(
         IUserDataManager userDataManager,
         ISessionManager sessionManager,
         ILogger<AutoSkipCredits> logger) : IHostedService, IDisposable
-{
+    {
         private readonly object _sentSeekCommandLock = new();
 
         private ILogger<AutoSkipCredits> _logger = logger;
@@ -227,4 +227,5 @@ public class AutoSkipCredits(
             _userDataManager.UserDataSaved -= UserDataManager_UserDataSaved;
             return Task.CompletedTask;
         }
+    }
 }

ConfusedPolarBear.Plugin.IntroSkipper/Services/Entrypoint.cs

@@ -4,6 +4,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using ConfusedPolarBear.Plugin.IntroSkipper.Configuration;
 using ConfusedPolarBear.Plugin.IntroSkipper.Data;
+using ConfusedPolarBear.Plugin.IntroSkipper.Manager;
 using ConfusedPolarBear.Plugin.IntroSkipper.ScheduledTasks;
 using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Library;
@@ -13,13 +14,13 @@ using MediaBrowser.Model.Tasks;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 
-namespace ConfusedPolarBear.Plugin.IntroSkipper;
-
-/// <summary>
-/// Server entrypoint.
-/// </summary>
-public sealed class Entrypoint : IHostedService, IDisposable
+namespace ConfusedPolarBear.Plugin.IntroSkipper.Services
 {
+    /// <summary>
+    /// Server entrypoint.
+    /// </summary>
+    public sealed class Entrypoint : IHostedService, IDisposable
+    {
         private readonly ITaskManager _taskManager;
         private readonly ILibraryManager _libraryManager;
         private readonly ILogger<Entrypoint> _logger;
@@ -323,4 +324,5 @@ public sealed class Entrypoint : IHostedService, IDisposable
             _cancellationTokenSource?.Dispose();
             _autoTaskCompletEvent.Dispose();
         }
+    }
 }