From ebff29d6cd5b1d51062b77552441e6e0ddbd7984 Mon Sep 17 00:00:00 2001 From: Jason Dove Date: Thu, 11 Feb 2021 09:35:32 -0600 Subject: [PATCH] Xml and scanner fixes (#7) * flush xml, use utf8 * scan ts files * use links instead of icons for m3u, xmltv, api --- ErsatzTV.Core/Iptv/ChannelGuide.cs | 7 ++++--- ErsatzTV.Core/Metadata/LocalMediaScanner.cs | 2 +- ErsatzTV/Shared/MainLayout.razor | 13 ++++--------- 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/ErsatzTV.Core/Iptv/ChannelGuide.cs b/ErsatzTV.Core/Iptv/ChannelGuide.cs index d13127604..8465ff146 100644 --- a/ErsatzTV.Core/Iptv/ChannelGuide.cs +++ b/ErsatzTV.Core/Iptv/ChannelGuide.cs @@ -23,8 +23,8 @@ namespace ErsatzTV.Core.Iptv public string ToXml() { - var sb = new StringBuilder(); - using var xml = XmlWriter.Create(sb); + using var ms = new MemoryStream(); + using var xml = XmlWriter.Create(ms); xml.WriteStartDocument(); xml.WriteStartElement("tv"); @@ -113,7 +113,8 @@ namespace ErsatzTV.Core.Iptv xml.WriteEndElement(); // tv xml.WriteEndDocument(); - return sb.ToString(); + xml.Flush(); + return Encoding.UTF8.GetString(ms.ToArray()); } } } diff --git a/ErsatzTV.Core/Metadata/LocalMediaScanner.cs b/ErsatzTV.Core/Metadata/LocalMediaScanner.cs index df3603b8b..54cf57a9c 100644 --- a/ErsatzTV.Core/Metadata/LocalMediaScanner.cs +++ b/ErsatzTV.Core/Metadata/LocalMediaScanner.cs @@ -60,7 +60,7 @@ namespace ErsatzTV.Core.Metadata var knownExtensions = new List { ".mpg", ".mp2", ".mpeg", ".mpe", ".mpv", ".ogg", ".mp4", ".m4p", ".m4v", - ".avi", ".wmv", ".mov", ".mkv" + ".avi", ".wmv", ".mov", ".mkv", ".ts" }; var allFiles = Directory.GetFiles(localMediaSource.Folder, "*", SearchOption.AllDirectories) diff --git a/ErsatzTV/Shared/MainLayout.razor b/ErsatzTV/Shared/MainLayout.razor index 8e1a8ec37..221b2337a 100644 --- a/ErsatzTV/Shared/MainLayout.razor +++ b/ErsatzTV/Shared/MainLayout.razor @@ -9,21 +9,16 @@ ErsatzTV - - - - - - + M3U + XMLTV + API + - - -