From dbf9ac1233d1edf75325f6d09561d899c21ad663 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Tue, 9 Apr 2013 01:06:13 -0400 Subject: [PATCH] paging progress --- MediaBrowser.Api/UserLibrary/ItemsService.cs | 4 ++-- .../Updates/InstallationManager.cs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/MediaBrowser.Api/UserLibrary/ItemsService.cs b/MediaBrowser.Api/UserLibrary/ItemsService.cs index 62b7d5fc94..4561d823b2 100644 --- a/MediaBrowser.Api/UserLibrary/ItemsService.cs +++ b/MediaBrowser.Api/UserLibrary/ItemsService.cs @@ -198,6 +198,8 @@ namespace MediaBrowser.Api.UserLibrary items = items.AsParallel(); + items = ApplyAdditionalFilters(request, items); + // Apply filters // Run them starting with the ones that are likely to reduce the list the most foreach (var filter in GetFilters(request).OrderByDescending(f => (int)f)) @@ -205,8 +207,6 @@ namespace MediaBrowser.Api.UserLibrary items = ApplyFilter(items, filter, user); } - items = ApplyAdditionalFilters(request, items); - items = items.AsEnumerable(); items = ApplySearchTerm(request, items); diff --git a/MediaBrowser.Server.Implementations/Updates/InstallationManager.cs b/MediaBrowser.Server.Implementations/Updates/InstallationManager.cs index 271d3d8775..347e378feb 100644 --- a/MediaBrowser.Server.Implementations/Updates/InstallationManager.cs +++ b/MediaBrowser.Server.Implementations/Updates/InstallationManager.cs @@ -288,7 +288,7 @@ namespace MediaBrowser.Server.Implementations.Updates return latestPluginInfo != null && latestPluginInfo.version > p.Version ? latestPluginInfo : null; - }).Where(p => !CompletedInstallations.Any(i => i.Name.Equals(p.name, StringComparison.OrdinalIgnoreCase))) + }).Where(p => !CompletedInstallations.Any(i => string.Equals(i.Name, p.name, StringComparison.OrdinalIgnoreCase))) .Where(p => p != null && !string.IsNullOrWhiteSpace(p.sourceUrl)); }