feat: make subtitleeditparser generic

MediaBrowser.MediaEncoding/Subtitles/AssParser.cs

@@ -1,19 +0,0 @@
-using Microsoft.Extensions.Logging;
-using Nikse.SubtitleEdit.Core.SubtitleFormats;
-
-namespace MediaBrowser.MediaEncoding.Subtitles
-{
-    /// <summary>
-    /// Advanced SubStation Alpha subtitle parser.
-    /// </summary>
-    public class AssParser : SubtitleEditParser<AdvancedSubStationAlpha>
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AssParser"/> class.
-        /// </summary>
-        /// <param name="logger">The logger.</param>
-        public AssParser(ILogger logger) : base(logger)
-        {
-        }
-    }
-}

MediaBrowser.MediaEncoding/Subtitles/ISubtitleParser.cs

@@ -1,7 +1,6 @@
 #pragma warning disable CS1591
 
 using System.IO;
-using System.Threading;
 using MediaBrowser.Model.MediaInfo;
 
 namespace MediaBrowser.MediaEncoding.Subtitles
@@ -12,8 +11,8 @@ namespace MediaBrowser.MediaEncoding.Subtitles
         /// Parses the specified stream.
         /// </summary>
         /// <param name="stream">The stream.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <param name="fileExtension">The file extension.</param>
         /// <returns>SubtitleTrackInfo.</returns>
-        SubtitleTrackInfo Parse(Stream stream, CancellationToken cancellationToken);
+        SubtitleTrackInfo Parse(Stream stream, string fileExtension);
     }
 }

MediaBrowser.MediaEncoding/Subtitles/SrtParser.cs

@@ -1,19 +0,0 @@
-using Microsoft.Extensions.Logging;
-using Nikse.SubtitleEdit.Core.SubtitleFormats;
-
-namespace MediaBrowser.MediaEncoding.Subtitles
-{
-    /// <summary>
-    /// SubRip subtitle parser.
-    /// </summary>
-    public class SrtParser : SubtitleEditParser<SubRip>
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SrtParser"/> class.
-        /// </summary>
-        /// <param name="logger">The logger.</param>
-        public SrtParser(ILogger logger) : base(logger)
-        {
-        }
-    }
-}

MediaBrowser.MediaEncoding/Subtitles/SsaParser.cs

@@ -1,19 +0,0 @@
-using Microsoft.Extensions.Logging;
-using Nikse.SubtitleEdit.Core.SubtitleFormats;
-
-namespace MediaBrowser.MediaEncoding.Subtitles
-{
-    /// <summary>
-    /// SubStation Alpha subtitle parser.
-    /// </summary>
-    public class SsaParser : SubtitleEditParser<SubStationAlpha>
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SsaParser"/> class.
-        /// </summary>
-        /// <param name="logger">The logger.</param>
-        public SsaParser(ILogger logger) : base(logger)
-        {
-        }
-    }
-}

MediaBrowser.MediaEncoding/Subtitles/SubtitleEditParser.cs

@@ -1,7 +1,7 @@
+using System;
 using System.Globalization;
 using System.IO;
 using System.Linq;
-using System.Threading;
 using Jellyfin.Extensions;
 using MediaBrowser.Model.MediaInfo;
 using Microsoft.Extensions.Logging;
@@ -14,31 +14,34 @@ namespace MediaBrowser.MediaEncoding.Subtitles
     /// <summary>
     /// SubStation Alpha subtitle parser.
     /// </summary>
-    /// <typeparam name="T">The <see cref="SubtitleFormat" />.</typeparam>
-    public abstract class SubtitleEditParser<T> : ISubtitleParser
-        where T : SubtitleFormat, new()
+    public class SubtitleEditParser : ISubtitleParser
     {
         private readonly ILogger _logger;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="SubtitleEditParser{T}"/> class.
+        /// Initializes a new instance of the <see cref="SubtitleEditParser"/> class.
         /// </summary>
         /// <param name="logger">The logger.</param>
-        protected SubtitleEditParser(ILogger logger)
+        public SubtitleEditParser(ILogger logger)
         {
             _logger = logger;
         }
 
         /// <inheritdoc />
-        public SubtitleTrackInfo Parse(Stream stream, CancellationToken cancellationToken)
+        public SubtitleTrackInfo Parse(Stream stream, string fileExtension)
         {
-            var subtitle = new Subtitle();
-            var subRip = new T();
+            var subtitleFormat = SubtitleFormat.AllSubtitleFormats.FirstOrDefault(asf => asf.Extension.Equals(fileExtension, StringComparison.OrdinalIgnoreCase));
+            if (subtitleFormat == null)
+            {
+                throw new ArgumentException("Unsupported format: " + fileExtension);
+            }
+
             var lines = stream.ReadAllLines().ToList();
-            subRip.LoadSubtitle(subtitle, lines, "untitled");
-            if (subRip.ErrorCount > 0)
+            var subtitle = new Subtitle();
+            subtitleFormat.LoadSubtitle(subtitle, lines, fileExtension);
+            if (subtitleFormat.ErrorCount > 0)
             {
-                _logger.LogError("{ErrorCount} errors encountered while parsing subtitle", subRip.ErrorCount);
+                _logger.LogError("{ErrorCount} errors encountered while parsing subtitle", subtitleFormat.ErrorCount);
             }
 
             var trackInfo = new SubtitleTrackInfo();

MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs

@@ -74,7 +74,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
             try
             {
                 var reader = GetReader(inputFormat);
-                var trackInfo = reader.Parse(stream, cancellationToken);
+                var trackInfo = reader.Parse(stream, $".{inputFormat}");
 
                 FilterEvents(trackInfo, startTimeTicks, endTimeTicks, preserveOriginalTimestamps);
 
@@ -249,26 +249,8 @@ namespace MediaBrowser.MediaEncoding.Subtitles
 
         private bool TryGetReader(string format, [NotNullWhen(true)] out ISubtitleParser? value)
         {
-            if (string.Equals(format, SubtitleFormat.SRT, StringComparison.OrdinalIgnoreCase))
-            {
-                value = new SrtParser(_logger);
-                return true;
-            }
-
-            if (string.Equals(format, SubtitleFormat.SSA, StringComparison.OrdinalIgnoreCase))
-            {
-                value = new SsaParser(_logger);
-                return true;
-            }
-
-            if (string.Equals(format, SubtitleFormat.ASS, StringComparison.OrdinalIgnoreCase))
-            {
-                value = new AssParser(_logger);
-                return true;
-            }
-
-            value = null;
-            return false;
+            value = new SubtitleEditParser(_logger);
+            return true;
         }
 
         private ISubtitleParser GetReader(string format)

tests/Jellyfin.MediaEncoding.Tests/Subtitles/AssParserTests.cs

@@ -15,7 +15,7 @@ namespace Jellyfin.MediaEncoding.Subtitles.Tests
         {
             using (var stream = File.OpenRead("Test Data/example.ass"))
             {
-                var parsed = new AssParser(new NullLogger<AssParser>()).Parse(stream, CancellationToken.None);
+                var parsed = new SubtitleEditParser(new NullLogger<SubtitleEditParser>()).Parse(stream, ".ass");
                 Assert.Single(parsed.TrackEvents);
                 var trackEvent = parsed.TrackEvents[0];
 

tests/Jellyfin.MediaEncoding.Tests/Subtitles/SrtParserTests.cs

@@ -15,7 +15,7 @@ namespace Jellyfin.MediaEncoding.Subtitles.Tests
         {
             using (var stream = File.OpenRead("Test Data/example.srt"))
             {
-                var parsed = new SrtParser(new NullLogger<SrtParser>()).Parse(stream, CancellationToken.None);
+                var parsed = new SubtitleEditParser(new NullLogger<SubtitleEditParser>()).Parse(stream, ".srt");
                 Assert.Equal(2, parsed.TrackEvents.Count);
 
                 var trackEvent1 = parsed.TrackEvents[0];
@@ -37,7 +37,7 @@ namespace Jellyfin.MediaEncoding.Subtitles.Tests
         {
             using (var stream = File.OpenRead("Test Data/example2.srt"))
             {
-                var parsed = new SrtParser(new NullLogger<SrtParser>()).Parse(stream, CancellationToken.None);
+                var parsed = new SubtitleEditParser(new NullLogger<SubtitleEditParser>()).Parse(stream, ".srt");
                 Assert.Equal(2, parsed.TrackEvents.Count);
 
                 var trackEvent1 = parsed.TrackEvents[0];

tests/Jellyfin.MediaEncoding.Tests/Subtitles/SsaParserTests.cs

@@ -13,7 +13,7 @@ namespace Jellyfin.MediaEncoding.Subtitles.Tests
 {
     public class SsaParserTests
     {
-        private readonly SsaParser _parser = new SsaParser(new NullLogger<AssParser>());
+        private readonly SubtitleEditParser _parser = new SubtitleEditParser(new NullLogger<SubtitleEditParser>());
 
         [Theory]
         [MemberData(nameof(Parse_MultipleDialogues_TestData))]
@@ -21,7 +21,7 @@ namespace Jellyfin.MediaEncoding.Subtitles.Tests
         {
             using (Stream stream = new MemoryStream(Encoding.UTF8.GetBytes(ssa)))
             {
-                SubtitleTrackInfo subtitleTrackInfo = _parser.Parse(stream, CancellationToken.None);
+                SubtitleTrackInfo subtitleTrackInfo = _parser.Parse(stream, ".ssa");
 
                 Assert.Equal(expectedSubtitleTrackEvents.Count, subtitleTrackInfo.TrackEvents.Count);
 
@@ -76,7 +76,7 @@ namespace Jellyfin.MediaEncoding.Subtitles.Tests
         {
             using (var stream = File.OpenRead("Test Data/example.ssa"))
             {
-                var parsed = _parser.Parse(stream, CancellationToken.None);
+                var parsed = _parser.Parse(stream, ".ssa");
                 Assert.Single(parsed.TrackEvents);
                 var trackEvent = parsed.TrackEvents[0];