fix nfo reader (#995)

* fix nfo reader

* fix template fade

* update dependencies

CHANGELOG.md

@@ -7,6 +7,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Fixed
 - Fix bug where tail or fallback filler would sometimes schedule much longer than expected
   - This only happened with fixed start schedule items following a schedule item with tail or fallback filler
+- Fix NFO reader bug that caused inaccurate warning messages about invalid XML and incomplete metadata
 
 ### Added
 - Add music video credits template system

ErsatzTV.Core.Tests/ErsatzTV.Core.Tests.csproj

@@ -12,7 +12,7 @@
       <PackageReference Include="FluentAssertions" Version="6.7.0" />
       <PackageReference Include="LanguageExt.Core" Version="4.2.9" />
       <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="6.0.1" />
-      <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
+      <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.1" />
       <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
       <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.2" />
       <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="6.0.0" />

ErsatzTV.Core/Metadata/Nfo/NfoReader.cs

@@ -35,22 +35,16 @@ public abstract class NfoReader<T>
 
     protected async Task<Stream> SanitizedStreamForFile(string fileName)
     {
-        using (var fs = new FileStream(fileName, FileMode.Open, FileAccess.Read, FileShare.Read, Buffer.Length, true))
+        await using var fs = new FileStream(fileName, FileMode.Open, FileAccess.Read, FileShare.Read, Buffer.Length, true);
-        {
+        using var sr = new StreamReader(fs, Encoding.UTF8);
-            while (await fs.ReadAsync(Buffer) > 0)
+        string text = await sr.ReadToEndAsync();
-            {
+        // trim BOM and zero width space, replace controls with replacement character
-                // read the file
+        string stripped = Pattern.Replace(text.Trim('\uFEFF', '\u200B'), "\ufffd");
-            }
+
-
+        MemoryStream ms = _recyclableMemoryStreamManager.GetStream();
-            string text = Encoding.UTF8.GetString(Buffer);
+        await ms.WriteAsync(Encoding.UTF8.GetBytes(stripped));
-            // trim BOM and zero width space, replace controls with replacement character
+        ms.Position = 0;
-            string stripped = Pattern.Replace(text.Trim('\uFEFF', '\u200B'), "\ufffd");
+        return ms;
-
-            MemoryStream ms = _recyclableMemoryStreamManager.GetStream();
-            await ms.WriteAsync(Encoding.UTF8.GetBytes(stripped));
-            ms.Position = 0;
-            return ms;
-        }
     }
 
     protected async Task ReadStringContent(XmlReader reader, T nfo, Action<T, string> action)

ErsatzTV.Infrastructure/ErsatzTV.Infrastructure.csproj

@@ -14,12 +14,12 @@
       <PackageReference Include="Lucene.Net" Version="4.8.0-beta00016" />
       <PackageReference Include="Lucene.Net.Analysis.Common" Version="4.8.0-beta00016" />
       <PackageReference Include="Lucene.Net.QueryParser" Version="4.8.0-beta00016" />
-      <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.9" />
+      <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.10" />
-      <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.9">
+      <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.10">
         <PrivateAssets>all</PrivateAssets>
         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       </PackageReference>
-      <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.9" />
+      <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.10" />
       <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.3.44">
         <PrivateAssets>all</PrivateAssets>
         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

ErsatzTV/ErsatzTV.csproj

@@ -55,14 +55,14 @@
       <PackageReference Include="Bugsnag.AspNet.Core" Version="3.1.0" />
       <PackageReference Include="FluentValidation" Version="11.2.2" />
       <PackageReference Include="FluentValidation.AspNetCore" Version="11.2.2" />
-      <PackageReference Include="HtmlSanitizer" Version="7.1.542" />
+      <PackageReference Include="HtmlSanitizer" Version="8.0.601" />
       <PackageReference Include="LanguageExt.Core" Version="4.2.9" />
       <PackageReference Include="Markdig" Version="0.30.4" />
       <PackageReference Include="MediatR.Courier.DependencyInjection" Version="5.0.0" />
       <PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="11.0.0" />
-      <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.9" />
+      <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.10" />
-      <PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="6.0.9" /> 
+      <PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="6.0.10" /> 
-      <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.9">
+      <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.10">
         <PrivateAssets>all</PrivateAssets>
         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       </PackageReference>
@@ -70,7 +70,7 @@
         <PrivateAssets>all</PrivateAssets>
         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       </PackageReference>
-      <PackageReference Include="MudBlazor" Version="6.0.16" />
+      <PackageReference Include="MudBlazor" Version="6.0.17" />
       <PackageReference Include="NaturalSort.Extension" Version="4.0.0" />
       <PackageReference Include="PPioli.FluentValidation.Blazor" Version="11.1.0" />
       <PackageReference Include="Refit.HttpClientFactory" Version="6.3.2" />

ErsatzTV/Resources/Templates/_default.ass.sbntxt

@@ -12,4 +12,4 @@ Style: Default,OPTIKabel-Heavy,{{ resolution.height // 20.0 }},&HFFFFFF,&HFFFFFF
 
 [Events]
 Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text
-Dialogue: 0,00:00:09.00,00:00:16.00,Default,,{{ resolution.width * 0.03 | math.round }},{{ resolution.width * 0.03 | math.round }},{{ resolution.height * 0.05 | math.round }},,{fad(1200, 1200)}{{ if all_artists | array.size == 0 }}{{ artist }}{{ else }}{{ all_artists | array.join " / " }}{{ end }}\N"{{ title }}"{{ if album }}\N{{ album }}{{ end }}
+Dialogue: 0,00:00:09.00,00:00:16.00,Default,,{{ resolution.width * 0.03 | math.round }},{{ resolution.width * 0.03 | math.round }},{{ resolution.height * 0.05 | math.round }},,{\fad(1200, 1200)}{{ if all_artists | array.size == 0 }}{{ artist }}{{ else }}{{ all_artists | array.join " / " }}{{ end }}\N"{{ title }}"{{ if album }}\N{{ album }}{{ end }}

ErsatzTV/Shared/MarkdownView.razor.cs

@@ -1,4 +1,4 @@
-using Ganss.XSS;
+using Ganss.Xss;
 using Markdig;
 using Microsoft.AspNetCore.Components;
 using Microsoft.JSInterop;

ErsatzTV/Startup.cs

@@ -56,7 +56,7 @@ using ErsatzTV.Services;
 using ErsatzTV.Services.RunOnce;
 using FluentValidation;
 using FluentValidation.AspNetCore;
-using Ganss.XSS;
+using Ganss.Xss;
 using MediatR;
 using MediatR.Courier.DependencyInjection;
 using Microsoft.AspNetCore.StaticFiles;