From b6a1ec0661471fa4bc5e2f6f188fe83ca4f58fa0 Mon Sep 17 00:00:00 2001 From: Andreas Weizel Date: Thu, 24 Jan 2013 22:15:27 +0100 Subject: [PATCH] Fix: Repeated requests to NuGet web service caused by wrong filtering for "SharpDevelopAddIn" tag. --- .../Project/Src/Model/Interfaces/INuGetPackageManager.cs | 1 - .../AddInManager2/Project/Src/Model/NuGetPackageManager.cs | 5 ----- .../Project/Src/ViewModel/AvailableAddInsViewModel.cs | 1 - .../Project/Src/ViewModel/NuGetAddInsViewModelBase.cs | 7 +++++++ 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/AddIns/Misc/AddInManager2/Project/Src/Model/Interfaces/INuGetPackageManager.cs b/src/AddIns/Misc/AddInManager2/Project/Src/Model/Interfaces/INuGetPackageManager.cs index 98a5b68623..cec745e433 100644 --- a/src/AddIns/Misc/AddInManager2/Project/Src/Model/Interfaces/INuGetPackageManager.cs +++ b/src/AddIns/Misc/AddInManager2/Project/Src/Model/Interfaces/INuGetPackageManager.cs @@ -17,7 +17,6 @@ namespace ICSharpCode.AddInManager2.Model { get; } - bool PackageContainsAddIn(IPackage package); IPackageOperationResolver CreateInstallPackageOperationResolver(bool allowPrereleaseVersions); void ExecuteOperation(PackageOperation operation); } diff --git a/src/AddIns/Misc/AddInManager2/Project/Src/Model/NuGetPackageManager.cs b/src/AddIns/Misc/AddInManager2/Project/Src/Model/NuGetPackageManager.cs index 3677d95504..36e87b145e 100644 --- a/src/AddIns/Misc/AddInManager2/Project/Src/Model/NuGetPackageManager.cs +++ b/src/AddIns/Misc/AddInManager2/Project/Src/Model/NuGetPackageManager.cs @@ -77,11 +77,6 @@ namespace ICSharpCode.AddInManager2.Model } } - public bool PackageContainsAddIn(IPackage package) - { - return (package != null) && (package.Tags != null) && package.Tags.ToLowerInvariant().Contains("sharpdevelopaddin"); - } - public IPackageOperationResolver CreateInstallPackageOperationResolver(bool allowPrereleaseVersions) { EnsurePackageManagerInstance(); diff --git a/src/AddIns/Misc/AddInManager2/Project/Src/ViewModel/AvailableAddInsViewModel.cs b/src/AddIns/Misc/AddInManager2/Project/Src/ViewModel/AvailableAddInsViewModel.cs index cd906c6474..bd2c03d0b6 100644 --- a/src/AddIns/Misc/AddInManager2/Project/Src/ViewModel/AvailableAddInsViewModel.cs +++ b/src/AddIns/Misc/AddInManager2/Project/Src/ViewModel/AvailableAddInsViewModel.cs @@ -55,7 +55,6 @@ namespace ICSharpCode.AddInManager2.ViewModel protected override IEnumerable GetFilteredPackagesBeforePagingResults(IQueryable allPackages) { return base.GetFilteredPackagesBeforePagingResults(allPackages) - .Where(package => AddInManager.NuGet.PackageContainsAddIn(package)) .Where(package => package.IsReleaseVersion()) .DistinctLast(PackageEqualityComparer.Id); } diff --git a/src/AddIns/Misc/AddInManager2/Project/Src/ViewModel/NuGetAddInsViewModelBase.cs b/src/AddIns/Misc/AddInManager2/Project/Src/ViewModel/NuGetAddInsViewModelBase.cs index 902fbf6ee3..73e2f4b482 100644 --- a/src/AddIns/Misc/AddInManager2/Project/Src/ViewModel/NuGetAddInsViewModelBase.cs +++ b/src/AddIns/Misc/AddInManager2/Project/Src/ViewModel/NuGetAddInsViewModelBase.cs @@ -122,6 +122,7 @@ namespace ICSharpCode.AddInManager2.ViewModel { IQueryable packages = GetAllPackages(); packages = OrderPackages(packages); + packages = FilterPackagesByStaticFilter(packages); packages = FilterPackagesBySearchCriteria(packages); TotalItems = packages.Count(); _allPackages = GetFilteredPackagesBeforePagingResults(packages); @@ -141,6 +142,12 @@ namespace ICSharpCode.AddInManager2.ViewModel return FilterPackagesBySearchCriteria(packages, searchCriteria); } + private IQueryable FilterPackagesByStaticFilter(IQueryable packages) + { + // Look for "SharpDevelopAddIn" tag to show only SD AddIn packages + return packages.Find(new string[] { "Tags" }, "sharpdevelopaddin"); + } + private string GetSearchCriteria() { if (String.IsNullOrWhiteSpace(SearchTerms))