SubtitleParse: ass parse use ILogger<T> instead of ILogger

Nekomoekissaten-SUB · May 9, 2024 · e42dd81 · e42dd81
1 parent 8613f1a
commit e42dd81
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 18 deletions.
diff --git a/SubtitleParse/src/AssTypes/AssData.cs b/SubtitleParse/src/AssTypes/AssData.cs
@@ -4,7 +4,7 @@
 
 namespace Mobsub.SubtitleParse.AssTypes;
 
-public class AssData(ILogger<AssData>? logger = null)
+public class AssData(ILogger? logger = null)
 {
     public bool CarriageReturn = false;
     public Encoding CharEncoding = Utils.EncodingRefOS();
@@ -17,7 +17,7 @@ public class AssData(ILogger<AssData>? logger = null)
     public List<AssEmbedded.Font> Fonts = [];
     public List<AssEmbedded.Graphic> Graphics = [];
 
-    private readonly ILogger<AssData>? _logger = logger;
+    private readonly ILogger? _logger = logger;
     private const string sectionNameFonts = "[Fonts]";
     private const string sectionNameGraphics = "[Graphics]";
     private const string sectionNameAegisubProjectGarbage = "[Aegisub Project Garbage]";

diff --git a/SubtitleParse/src/AssTypes/AssEmbedded.cs b/SubtitleParse/src/AssTypes/AssEmbedded.cs
@@ -6,7 +6,7 @@ namespace Mobsub.SubtitleParse.AssTypes;
 
 public class AssEmbedded
 {
-    public class Font(ILogger<AssData>? logger = null)
+    public class Font(ILogger? logger = null)
     {
         public string OriginalName = string.Empty;  // lowercase
         public bool Bold = false;
@@ -16,7 +16,7 @@ public class Font(ILogger<AssData>? logger = null)
         public List<string> Data = [];
         public int DataLength = 0;
 
-        private readonly ILogger<AssData>? _logger = logger;
+        private readonly ILogger? _logger = logger;
 
         // public void EncodeFont(FileInfo file)
         // {
@@ -66,13 +66,13 @@ public void WriteFile(string filePath)
         }
     }
 
-    public class Graphic(ILogger<AssData>? logger = null)
+    public class Graphic(ILogger? logger = null)
     {
         public string Name = string.Empty;  // lowercase
         public List<string> Data = [];
         public int DataLength = 0;
 
-        private readonly ILogger<AssData>? _logger = logger;
+        private readonly ILogger? _logger = logger;
 
         public void EncodeGraphic(FileInfo file)
         {
@@ -108,7 +108,7 @@ public void WriteFile(string filePath)
 
     }
 
-    internal static List<Font> ParseFontsFromAss(ReadOnlySpan<char> sp, int lineNumber, ILogger<AssData>? _logger = null)
+    internal static List<Font> ParseFontsFromAss(ReadOnlySpan<char> sp, int lineNumber, ILogger? _logger = null)
     {
         var fonts = new List<Font>();
         if (sp.StartsWith("fontname:"))
@@ -182,7 +182,7 @@ internal static List<Font> ParseFontsFromAss(ReadOnlySpan<char> sp, int lineNumb
         return fonts;
     }
 
-    internal static List<Graphic> ParseGraphicsFromAss(ReadOnlySpan<char> sp, int lineNumber, ILogger<AssData>? _logger = null)
+    internal static List<Graphic> ParseGraphicsFromAss(ReadOnlySpan<char> sp, int lineNumber, ILogger? _logger = null)
     {
         var graphics = new List<Graphic>();
         if (sp.StartsWith("filename:"))

diff --git a/SubtitleParse/src/AssTypes/AssEvent.cs b/SubtitleParse/src/AssTypes/AssEvent.cs
@@ -5,7 +5,7 @@
 
 namespace Mobsub.SubtitleParse.AssTypes;
 
-public class AssEvents(ILogger<AssData>? logger = null)
+public class AssEvents(ILogger? logger = null)
 {
     private string[]? formats;
     public string[] Formats
@@ -14,7 +14,7 @@ public string[] Formats
         set => formats = value;
     }
     public List<AssEvent> Collection = [];
-    private readonly ILogger<AssData>? _logger = logger;
+    private readonly ILogger? _logger = logger;
     internal const string sectionName = "[Events]";
 
     public void Read(ReadOnlySpan<char> sp, string scriptType, int lineNumber)
@@ -59,7 +59,7 @@ public void Write(StreamWriter sw, char[] newline, bool ctsRounding)
     }
 }
 
-public class AssEvent(ILogger<AssData>? logger = null)
+public class AssEvent(ILogger? logger = null)
 {
     private int layer = 0;
     public int lineNumber;
@@ -83,7 +83,7 @@ public int Layer
     public int MarginB { get; set; } = 0;
     public string? Effect { get; set; }
     public List<char[]> Text { get; set; } = [];  // override tags block, special chars block, normal text block
-    private readonly ILogger<AssData>? _logger = logger;
+    private readonly ILogger? _logger = logger;
 
     public bool Read(ReadOnlySpan<char> sp, int lineNum, string[] formats) => Read(sp, sp.IndexOf(':'), lineNum, formats);
 

diff --git a/SubtitleParse/src/AssTypes/AssScriptInfo.cs b/SubtitleParse/src/AssTypes/AssScriptInfo.cs
@@ -3,7 +3,7 @@
 
 namespace Mobsub.SubtitleParse.AssTypes;
 
-public class AssScriptInfo(ILogger<AssData>? logger = null)
+public class AssScriptInfo(ILogger? logger = null)
 {
     private readonly string[] scriptTypes = ["v4.00", "v4.00+", "v4.00++"];
     private string scriptType = "v4.00";
@@ -71,7 +71,7 @@ public int WrapStyle
     // public int status = 0;
     public HashSet<string> Orders = [];
 
-    private readonly ILogger<AssData>? _logger = logger;
+    private readonly ILogger? _logger = logger;
     internal const string sectionName = "[Script Info]";
 
     public void Read(ReadOnlySpan<char> sp, int lineNumber)

diff --git a/SubtitleParse/src/AssTypes/AssStyle.cs b/SubtitleParse/src/AssTypes/AssStyle.cs
@@ -3,7 +3,7 @@
 
 namespace Mobsub.SubtitleParse.AssTypes;
 
-public class AssStyles(ILogger<AssData>? logger = null)
+public class AssStyles(ILogger? logger = null)
 {
     private readonly string formatV4 = "Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, TertiaryColour, BackColour, Bold, Italic, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, AlphaLevel, Encoding";
     private readonly string formatV4P = "Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding";
@@ -22,7 +22,7 @@ public string[] Formats
     public List<AssStyle> Collection = [];
     public HashSet<string> Names = [];
 
-    private readonly ILogger<AssData>? _logger = logger;
+    private readonly ILogger? _logger = logger;
 
     public void Read(ReadOnlySpan<char> sp, int lineNumber)
     {
@@ -117,11 +117,11 @@ public void Write(StreamWriter sw, char[] newline, string scriptType)
 
 }
 
-public class AssStyle(ILogger<AssData>? logger = null)
+public class AssStyle(ILogger? logger = null)
 {
     private string? name;
     private string? fontname;
-    private readonly ILogger<AssData>? _logger = logger;
+    private readonly ILogger? _logger = logger;
     public string Name
     {
         get => name is null ? "Default" : name;