use xml writer so strings are properly escaped (#4)

* fix yml formatting

* test build action

* move ci workflow

* fix unit tests from dotnet test command

* add release workflow

* try another matrix syntax

* fix path to csproj

* fix target framework

* more release fixes

* port fixes for running outside of docker

* more search fixes

* improve fallback metadata parsing, add tests

* fix odd behavior when searching collections

* more fallback metadata fixes

* refresh "other" metadata on startup

.github/workflows/ci.yml

@@ -21,6 +21,9 @@ jobs:
         with:
           dotnet-version: 5.0.x
 
+      - name: Clean
+        run: dotnet clean --configuration Release && dotnet nuget locals all --clear
+
       - name: Install dependencies
         run: dotnet restore
 

.github/workflows/release.yml

@@ -39,19 +39,24 @@ jobs:
           # Define some variables for things we need
           tag=$(git describe --tags --abbrev=0)
           release_name="ErsatzTV-$tag-${{ matrix.target }}"
+          release_name_cli="ErsatzTV.CommandLine-$tag-${{ matrix.target }}"
 
           # Build everything
           dotnet publish ErsatzTV/ErsatzTV.csproj --framework net5.0 --runtime "${{ matrix.target }}" -c Release -o "$release_name"
+          dotnet publish ErsatzTV.CommandLine/ErsatzTV.CommandLine.csproj --framework net5.0 --runtime "${{ matrix.target }}" -c Release -o "$release_name_cli"
 
           # Pack files
           if [ "${{ matrix.target }}" == "win-x64" ]; then
             7z a -tzip "${release_name}.zip" "./${release_name}/*"
+            7z a -tzip "${release_name_cli}.zip" "./${release_name_cli}/*"
           else
             tar czvf "${release_name}.tar.gz" "$release_name"
+            tar czvf "${release_name_cli}.tar.gz" "$release_name_cli"
           fi
 
           # Delete output directory
           rm -r "$release_name"
+          rm -r "$release_name_cli"
 
       - name: Publish
         uses: softprops/action-gh-release@v1

ErsatzTV.Application/MediaItems/Queries/GetAggregateMediaItemsHandler.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
@@ -24,7 +25,9 @@ namespace ErsatzTV.Application.MediaItems.Queries
 
             if (!string.IsNullOrEmpty(request.SearchString))
             {
-                allItems = allItems.Filter(i => i.Metadata?.Title.Contains(request.SearchString) == true);
+                allItems = allItems.Filter(
+                    i => i.Metadata?.Title.Contains(request.SearchString, StringComparison.OrdinalIgnoreCase) ==
+                         true);
             }
 
             return allItems.GroupBy(c => new { c.Source.Name, c.Metadata.Title }).Map(

ErsatzTV.Core.Tests/FFmpeg/FFmpegPlaybackSettingsServiceTests.cs

@@ -6,6 +6,7 @@ using NUnit.Framework;
 
 namespace ErsatzTV.Core.Tests.FFmpeg
 {
+    [TestFixture]
     public class FFmpegPlaybackSettingsCalculatorTests
     {
         public class CalculateSettings

ErsatzTV.Core.Tests/Metadata/FallbackMetadataProviderTests.cs

@@ -0,0 +1,40 @@
+using ErsatzTV.Core.Domain;
+using ErsatzTV.Core.Metadata;
+using FluentAssertions;
+using NUnit.Framework;
+
+namespace ErsatzTV.Core.Tests.Metadata
+{
+    [TestFixture]
+    public class FallbackMetadataProviderTests
+    {
+        [Test]
+        [TestCase("Awesome Show - s01e02.mkv", "Awesome Show", 1, 2)]
+        [TestCase("Awesome Show - S01E02.mkv", "Awesome Show", 1, 2)]
+        [TestCase("Awesome Show - s1e2.mkv", "Awesome Show", 1, 2)]
+        [TestCase("Awesome Show - S1E2.mkv", "Awesome Show", 1, 2)]
+        [TestCase("Awesome Show - s01e02 - Episode Title.mkv", "Awesome Show", 1, 2)]
+        [TestCase("Awesome Show - S01E02 - Episode Title.mkv", "Awesome Show", 1, 2)]
+        [TestCase("Awesome Show - s1e2 - Episode Title.mkv", "Awesome Show", 1, 2)]
+        [TestCase("Awesome Show - S1E2 - Episode Title.mkv", "Awesome Show", 1, 2)]
+        [TestCase("Awesome Show (2021) - s01e02 - Episode Title.mkv", "Awesome Show (2021)", 1, 2)]
+        [TestCase("Awesome Show (2021) - S01E02 - Episode Title.mkv", "Awesome Show (2021)", 1, 2)]
+        [TestCase("Awesome Show (2021) - s1e2 - Episode Title.mkv", "Awesome Show (2021)", 1, 2)]
+        [TestCase("Awesome Show (2021) - S1E2 - Episode Title.mkv", "Awesome Show (2021)", 1, 2)]
+        [TestCase("Awesome Show - s01e02 - Episode Title-720p.mkv", "Awesome Show", 1, 2)]
+        [TestCase("Awesome Show - S01E02 - Episode Title-720p.mkv", "Awesome Show", 1, 2)]
+        [TestCase("Awesome Show - s1e2 - Episode Title-720p.mkv", "Awesome Show", 1, 2)]
+        [TestCase("Awesome Show - S1E2 - Episode Title-720p.mkv", "Awesome Show", 1, 2)]
+        [TestCase("Awesome Show (2021) - S01E02 - Description; More Description (1080p QUALITY codec GROUP).mkv", "Awesome Show (2021)", 1, 2)]
+        [TestCase("Awesome.Show.S01E02.Description.more.Description.QUAlity.codec.CODEC-GROUP.mkv", "Awesome.Show", 1, 2)]
+        public void GetFallbackMetadata_ShouldHandleVariousFormats(string path, string title, int season, int episode)
+        {
+            var metadata = FallbackMetadataProvider.GetFallbackMetadata(path);
+
+            metadata.MediaType.Should().Be(MediaType.TvShow);
+            metadata.Title.Should().Be(title);
+            metadata.SeasonNumber.Should().Be(season);
+            metadata.EpisodeNumber.Should().Be(episode);
+        }
+    }
+}

ErsatzTV.Core.Tests/Scheduling/ChronologicalContentTests.cs

@@ -9,6 +9,7 @@ using static LanguageExt.Prelude;
 
 namespace ErsatzTV.Core.Tests.Scheduling
 {
+    [TestFixture]
     public class ChronologicalContentTests
     {
         [Test]

ErsatzTV.Core.Tests/Scheduling/PlayoutBuilderTests.cs

@@ -14,6 +14,7 @@ using static LanguageExt.Prelude;
 
 namespace ErsatzTV.Core.Tests.Scheduling
 {
+    [TestFixture]
     public class PlayoutBuilderTests
     {
         private readonly ILogger<PlayoutBuilder> _logger;

ErsatzTV.Core.Tests/Scheduling/RandomizedContentTests.cs

@@ -9,6 +9,7 @@ using static LanguageExt.Prelude;
 
 namespace ErsatzTV.Core.Tests.Scheduling
 {
+    [TestFixture]
     public class RandomizedContentTests
     {
         private const int KnownSeed = 22295;

ErsatzTV.Core.Tests/Scheduling/ShuffledContentTests.cs

@@ -9,6 +9,7 @@ using static LanguageExt.Prelude;
 
 namespace ErsatzTV.Core.Tests.Scheduling
 {
+    [TestFixture]
     public class ShuffledContentTests
     {
         // this seed will produce (shuffle) 1-10 in order

ErsatzTV.Core/Iptv/ChannelGuide.cs

@@ -2,6 +2,7 @@
 using System.IO;
 using System.Linq;
 using System.Text;
+using System.Xml;
 using ErsatzTV.Core.Domain;
 using static LanguageExt.Prelude;
 
@@ -23,19 +24,31 @@ namespace ErsatzTV.Core.Iptv
         public string ToXml()
         {
             var sb = new StringBuilder();
-            sb.AppendLine("<?xml version=\"1.0\"?>");
-            sb.AppendLine("<tv generator-info-name=\"ersatztv\">");
-
+            using var xml = XmlWriter.Create(sb);
+            xml.WriteStartDocument();
+            
+            xml.WriteStartElement("tv");
+            xml.WriteAttributeString("generator-info-name", "ersatztv");
+            
             foreach (Channel channel in _channels)
             {
-                sb.AppendLine($"<channel id=\"{channel.Number}\">");
-                sb.AppendLine($"<display-name lang=\"en\">{channel.Name}</display-name>");
-                sb.AppendLine(
-                    !string.IsNullOrWhiteSpace(channel.Logo)
-                        ? $"<icon src=\"{_scheme}://{_host}/iptv/images/{channel.Logo}\"/>"
-                        : $"<icon src=\"{_scheme}://{_host}/images/ersatztv-500.png\"/>");
+                xml.WriteStartElement("channel");
+                xml.WriteAttributeString("id", channel.Number.ToString());
+                
+                xml.WriteStartElement("display-name");
+                xml.WriteAttributeString("lang", "en");
+                xml.WriteString(channel.Name);
+                xml.WriteEndElement(); // display-name
 
-                sb.AppendLine("</channel>");
+                xml.WriteStartElement("icon");
+                xml.WriteAttributeString(
+                    "src",
+                    !string.IsNullOrWhiteSpace(channel.Logo)
+                        ? $"{_scheme}://{_host}/iptv/images/{channel.Logo}"
+                        : $"{_scheme}://{_host}/images/ersatztv-500.png");
+                xml.WriteEndElement(); // icon
+
+                xml.WriteEndElement(); // channel
             }
 
             foreach (Channel channel in _channels)
@@ -50,35 +63,55 @@ namespace ErsatzTV.Core.Iptv
                             Title = Path.GetFileName(playoutItem.MediaItem.Path)
                         });
 
-                    sb.AppendLine(
-                        $"<programme start=\"{start}\" stop=\"{stop}\" channel=\"{channel.Number}\">");
-                    sb.AppendLine($"<title lang=\"en\">{metadata.Title}</title>");
-                    sb.AppendLine("<previously-shown/>");
-                    sb.AppendLine("<sub-title lang=\"en\"></sub-title>");
+                    xml.WriteStartElement("programme");
+                    xml.WriteAttributeString("start", start);
+                    xml.WriteAttributeString("stop", stop);
+                    xml.WriteAttributeString("channel", channel.Number.ToString());
+
+                    xml.WriteStartElement("title");
+                    xml.WriteAttributeString("lang", "en");
+                    xml.WriteString(metadata.Title);
+                    xml.WriteEndElement(); // title
+                    
+                    xml.WriteStartElement("previously-shown");
+                    xml.WriteEndElement(); // previously-shown
+
+                    xml.WriteStartElement("sub-title");
+                    xml.WriteAttributeString("lang", "en");
+                    xml.WriteEndElement(); // sub-title
 
                     int season = Optional(metadata.SeasonNumber).IfNone(0);
                     int episode = Optional(metadata.EpisodeNumber).IfNone(0);
                     if (season > 0 && episode > 0)
                     {
-                        sb.AppendLine($"<episode-num system=\"xmltv_ns\">{season - 1}.{episode - 1}.0/1</episode-num>");
+                        xml.WriteStartElement("episode-num");
+                        xml.WriteAttributeString("system", "xmltv_ns");
+                        xml.WriteString($"{season - 1}.{episode - 1}.0/1");
+                        xml.WriteEndElement(); // episode-num
                     }
 
                     // sb.AppendLine("<icon src=\"\"/>");
-                    sb.AppendLine($"<desc lang=\"en\">{metadata.Description}</desc>");
+                    xml.WriteStartElement("desc");
+                    xml.WriteAttributeString("lang", "en");
+                    xml.WriteString(metadata.Description);
+                    xml.WriteEndElement(); // desc
 
                     if (!string.IsNullOrWhiteSpace(metadata.ContentRating))
                     {
-                        sb.AppendLine("<rating system=\"MPAA\">");
-                        sb.AppendLine($"<value>{metadata.ContentRating}</value>");
-                        sb.AppendLine("</rating>");
+                        xml.WriteStartElement("rating");
+                        xml.WriteAttributeString("system", "MPAA");
+                        xml.WriteStartElement("value");
+                        xml.WriteString(metadata.ContentRating);
+                        xml.WriteEndElement(); // value
+                        xml.WriteEndElement(); // rating
                     }
 
-                    sb.AppendLine("</programme>");
+                    xml.WriteEndElement(); // programme
                 }
             }
 
-            sb.AppendLine("</tv>");
-
+            xml.WriteEndElement(); // tv
+            xml.WriteEndDocument();
 
             return sb.ToString();
         }

ErsatzTV.Core/Metadata/FallbackMetadataProvider.cs

@@ -0,0 +1,30 @@
+using System.IO;
+using System.Text.RegularExpressions;
+using ErsatzTV.Core.Domain;
+
+namespace ErsatzTV.Core.Metadata
+{
+    public static class FallbackMetadataProvider
+    {
+        public static MediaMetadata GetFallbackMetadata(string path)
+        {
+            string fileName = Path.GetFileName(path);
+            var metadata = new MediaMetadata { Title = fileName ?? path };
+
+            if (fileName != null)
+            {
+                const string PATTERN = @"^(.*?)[.\s-]+[sS](\d+)[eE](\d+).*\.\w+$";
+                Match match = Regex.Match(fileName, PATTERN);
+                if (match.Success)
+                {
+                    metadata.MediaType = MediaType.TvShow;
+                    metadata.Title = match.Groups[1].Value;
+                    metadata.SeasonNumber = int.Parse(match.Groups[2].Value);
+                    metadata.EpisodeNumber = int.Parse(match.Groups[3].Value);
+                }
+            }
+
+            return metadata;
+        }
+    }
+}

ErsatzTV.Core/Metadata/LocalMediaScanner.cs

@@ -82,12 +82,13 @@ namespace ErsatzTV.Core.Metadata
             }
 
             // if exists, check if the file was modified
+            // also, try to re-categorize "other" by refreshing metadata
             Seq<MediaItem> modifiedMediaItems = existingMediaItems.Filter(
                 mediaItem =>
                 {
                     DateTime lastWrite = File.GetLastWriteTimeUtc(mediaItem.Path);
                     bool modified = lastWrite > mediaItem.LastWriteTime.IfNone(DateTime.MinValue);
-                    return modified || mediaItem.Metadata == null;
+                    return modified || mediaItem.Metadata == null || mediaItem.Metadata.MediaType == MediaType.Other;
                 });
             modifiedPlayoutIds.AddRange(await _playoutRepository.GetPlayoutIdsForMediaItems(modifiedMediaItems));
             foreach (MediaItem mediaItem in modifiedMediaItems)

ErsatzTV.Core/Metadata/LocalMetadataProvider.cs

@@ -21,7 +21,8 @@ namespace ErsatzTV.Core.Metadata
         public async Task RefreshMetadata(MediaItem mediaItem)
         {
             Option<MediaMetadata> maybeMetadata = await LoadMetadata(mediaItem);
-            MediaMetadata metadata = maybeMetadata.IfNone(() => GetFallbackMetadata(mediaItem));
+            MediaMetadata metadata =
+                maybeMetadata.IfNone(() => FallbackMetadataProvider.GetFallbackMetadata(mediaItem.Path));
             await ApplyMetadataUpdate(mediaItem, metadata);
         }
 
@@ -99,27 +100,6 @@ namespace ErsatzTV.Core.Metadata
                 None);
         }
 
-        private MediaMetadata GetFallbackMetadata(MediaItem mediaItem)
-        {
-            string fileName = Path.GetFileName(mediaItem.Path);
-            var metadata = new MediaMetadata { Title = fileName ?? mediaItem.Path };
-
-            if (fileName != null)
-            {
-                const string PATTERN = @"^(.*?)[\s-]+[sS](\d+)[eE](\d+)\.\w+$";
-                Match match = Regex.Match(fileName, PATTERN);
-                if (match.Success)
-                {
-                    metadata.MediaType = MediaType.TvShow;
-                    metadata.Title = match.Groups[1].Value;
-                    metadata.SeasonNumber = int.Parse(match.Groups[2].Value);
-                    metadata.EpisodeNumber = int.Parse(match.Groups[3].Value);
-                }
-            }
-
-            return metadata;
-        }
-
         private static DateTime? GetAired(string aired)
         {
             if (string.IsNullOrWhiteSpace(aired))

ErsatzTV/Pages/MediaCollections.razor

@@ -91,7 +91,11 @@
 
         _totalItems = aggregateData.Count;
 
-        _pagedData = aggregateData.Skip(state.Page * state.PageSize).Take(state.PageSize);
+        _pagedData = aggregateData
+            .Skip(_totalItems <= state.PageSize ? 0 : state.Page * state.PageSize)
+            .Take(state.PageSize)
+            .OrderBy(c => c.Name);
+
         return new TableData<MediaCollectionSummaryViewModel> { TotalItems = _totalItems, Items = _pagedData };
     }
 

ErsatzTV/Pages/PlayoutEditor.razor

@@ -49,10 +49,10 @@
     }
 
     private Task<IEnumerable<ChannelViewModel>> SearchChannels(string value) =>
-        _channels.Filter(c => $"{c.Number} - {c.Name}".ToLowerInvariant().Contains(value ?? string.Empty)).AsTask();
+        _channels.Filter(c => $"{c.Number} - {c.Name}".Contains(value ?? string.Empty, StringComparison.OrdinalIgnoreCase)).AsTask();
 
     private Task<IEnumerable<ProgramScheduleViewModel>> SearchProgramSchedules(string value) =>
-        _programSchedules.Filter(c => c.Name.ToLowerInvariant().StartsWith(value ?? string.Empty)).AsTask();
+        _programSchedules.Filter(c => c.Name.Contains(value ?? string.Empty, StringComparison.OrdinalIgnoreCase)).AsTask();
 
 
     private async Task HandleSubmitAsync()

ErsatzTV/Pages/ScheduleItemsEditor.razor

@@ -170,7 +170,7 @@
     }
 
     private Task<IEnumerable<MediaCollectionViewModel>> SearchMediaCollections(string value) =>
-        _mediaCollections.Filter(c => c.Name.ToLowerInvariant().StartsWith(value ?? string.Empty)).AsTask();
+        _mediaCollections.Filter(c => c.Name.Contains(value ?? string.Empty, StringComparison.OrdinalIgnoreCase)).AsTask();
 
     private async Task SaveChanges()
     {