From d16618843f8f2f7f403977afe74c810a7f35826d Mon Sep 17 00:00:00 2001 From: Jason Dove Date: Thu, 11 Feb 2021 04:55:56 -0600 Subject: [PATCH] more search fixes --- .../MediaItems/Queries/GetAggregateMediaItemsHandler.cs | 5 +++-- ErsatzTV/Pages/PlayoutEditor.razor | 4 ++-- ErsatzTV/Pages/ScheduleItemsEditor.razor | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ErsatzTV.Application/MediaItems/Queries/GetAggregateMediaItemsHandler.cs b/ErsatzTV.Application/MediaItems/Queries/GetAggregateMediaItemsHandler.cs index 46abd2a92..189916267 100644 --- a/ErsatzTV.Application/MediaItems/Queries/GetAggregateMediaItemsHandler.cs +++ b/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; @@ -25,7 +26,7 @@ namespace ErsatzTV.Application.MediaItems.Queries if (!string.IsNullOrEmpty(request.SearchString)) { allItems = allItems.Filter( - i => i.Metadata?.Title.ToLowerInvariant().Contains(request.SearchString.ToLowerInvariant()) == + i => i.Metadata?.Title.Contains(request.SearchString, StringComparison.OrdinalIgnoreCase) == true); } diff --git a/ErsatzTV/Pages/PlayoutEditor.razor b/ErsatzTV/Pages/PlayoutEditor.razor index 9e3c66b48..edb74cb55 100644 --- a/ErsatzTV/Pages/PlayoutEditor.razor +++ b/ErsatzTV/Pages/PlayoutEditor.razor @@ -49,10 +49,10 @@ } private Task> 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> 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() diff --git a/ErsatzTV/Pages/ScheduleItemsEditor.razor b/ErsatzTV/Pages/ScheduleItemsEditor.razor index eac6db5c3..a73ea18ce 100644 --- a/ErsatzTV/Pages/ScheduleItemsEditor.razor +++ b/ErsatzTV/Pages/ScheduleItemsEditor.razor @@ -170,7 +170,7 @@ } private Task> SearchMediaCollections(string value) => - _mediaCollections.Filter(c => c.Name.ToLowerInvariant().Contains((value ?? string.Empty).ToLowerInvariant())).AsTask(); + _mediaCollections.Filter(c => c.Name.Contains(value ?? string.Empty, StringComparison.OrdinalIgnoreCase)).AsTask(); private async Task SaveChanges() {