Browse Source

Fix: Repeated requests to NuGet web service caused by wrong filtering for "SharpDevelopAddIn" tag.

pull/32/head
Andreas Weizel 13 years ago
parent
commit
b6a1ec0661
  1. 1
      src/AddIns/Misc/AddInManager2/Project/Src/Model/Interfaces/INuGetPackageManager.cs
  2. 5
      src/AddIns/Misc/AddInManager2/Project/Src/Model/NuGetPackageManager.cs
  3. 1
      src/AddIns/Misc/AddInManager2/Project/Src/ViewModel/AvailableAddInsViewModel.cs
  4. 7
      src/AddIns/Misc/AddInManager2/Project/Src/ViewModel/NuGetAddInsViewModelBase.cs

1
src/AddIns/Misc/AddInManager2/Project/Src/Model/Interfaces/INuGetPackageManager.cs

@ -17,7 +17,6 @@ namespace ICSharpCode.AddInManager2.Model
{ {
get; get;
} }
bool PackageContainsAddIn(IPackage package);
IPackageOperationResolver CreateInstallPackageOperationResolver(bool allowPrereleaseVersions); IPackageOperationResolver CreateInstallPackageOperationResolver(bool allowPrereleaseVersions);
void ExecuteOperation(PackageOperation operation); void ExecuteOperation(PackageOperation operation);
} }

5
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) public IPackageOperationResolver CreateInstallPackageOperationResolver(bool allowPrereleaseVersions)
{ {
EnsurePackageManagerInstance(); EnsurePackageManagerInstance();

1
src/AddIns/Misc/AddInManager2/Project/Src/ViewModel/AvailableAddInsViewModel.cs

@ -55,7 +55,6 @@ namespace ICSharpCode.AddInManager2.ViewModel
protected override IEnumerable<IPackage> GetFilteredPackagesBeforePagingResults(IQueryable<IPackage> allPackages) protected override IEnumerable<IPackage> GetFilteredPackagesBeforePagingResults(IQueryable<IPackage> allPackages)
{ {
return base.GetFilteredPackagesBeforePagingResults(allPackages) return base.GetFilteredPackagesBeforePagingResults(allPackages)
.Where(package => AddInManager.NuGet.PackageContainsAddIn(package))
.Where(package => package.IsReleaseVersion()) .Where(package => package.IsReleaseVersion())
.DistinctLast(PackageEqualityComparer.Id); .DistinctLast(PackageEqualityComparer.Id);
} }

7
src/AddIns/Misc/AddInManager2/Project/Src/ViewModel/NuGetAddInsViewModelBase.cs

@ -122,6 +122,7 @@ namespace ICSharpCode.AddInManager2.ViewModel
{ {
IQueryable<IPackage> packages = GetAllPackages(); IQueryable<IPackage> packages = GetAllPackages();
packages = OrderPackages(packages); packages = OrderPackages(packages);
packages = FilterPackagesByStaticFilter(packages);
packages = FilterPackagesBySearchCriteria(packages); packages = FilterPackagesBySearchCriteria(packages);
TotalItems = packages.Count(); TotalItems = packages.Count();
_allPackages = GetFilteredPackagesBeforePagingResults(packages); _allPackages = GetFilteredPackagesBeforePagingResults(packages);
@ -141,6 +142,12 @@ namespace ICSharpCode.AddInManager2.ViewModel
return FilterPackagesBySearchCriteria(packages, searchCriteria); return FilterPackagesBySearchCriteria(packages, searchCriteria);
} }
private IQueryable<IPackage> FilterPackagesByStaticFilter(IQueryable<IPackage> packages)
{
// Look for "SharpDevelopAddIn" tag to show only SD AddIn packages
return packages.Find(new string[] { "Tags" }, "sharpdevelopaddin");
}
private string GetSearchCriteria() private string GetSearchCriteria()
{ {
if (String.IsNullOrWhiteSpace(SearchTerms)) if (String.IsNullOrWhiteSpace(SearchTerms))

Loading…
Cancel
Save