Browse Source

Allow searching for packages by id, tags and description.

Can now run searches for NuGet packages using 'id', 'tags' and
'description' on repositories that support this feature such as the
main NuGet feed.

Example searches:

id:nunit
tags:typescript
description:typescript
pull/403/head
Matt Ward 12 years ago
parent
commit
5d4439e393
  1. 16
      src/AddIns/Misc/PackageManagement/Project/Src/AvailablePackagesViewModel.cs
  2. 1
      src/AddIns/Misc/PackageManagement/Project/Src/Design/FakePackage.cs
  3. 3
      src/AddIns/Misc/PackageManagement/Project/Src/InstalledPackagesViewModel.cs
  4. 18
      src/AddIns/Misc/PackageManagement/Project/Src/PackagesViewModel.cs
  5. 2
      src/AddIns/Misc/PackageManagement/Project/Src/RecentPackagesViewModel.cs
  6. 2
      src/AddIns/Misc/PackageManagement/Project/Src/UpdatedPackagesViewModel.cs
  7. 1
      src/AddIns/Misc/PackageManagement/Test/PackageManagement.Tests.csproj
  8. 60
      src/AddIns/Misc/PackageManagement/Test/Src/AvailablePackagesViewModelTests.cs
  9. 50
      src/AddIns/Misc/PackageManagement/Test/Src/Helpers/FakeServiceBasedRepository.cs
  10. 11
      src/AddIns/Misc/PackageManagement/Test/Src/Helpers/TestablePackagesViewModel.cs

16
src/AddIns/Misc/PackageManagement/Project/Src/AvailablePackagesViewModel.cs

@ -26,7 +26,7 @@ namespace ICSharpCode.PackageManagement @@ -26,7 +26,7 @@ namespace ICSharpCode.PackageManagement
{
public class AvailablePackagesViewModel : PackagesViewModel
{
IPackageRepository availablePackagesRepository;
IPackageRepository repository;
public AvailablePackagesViewModel(
IPackageManagementSolution solution,
@ -66,22 +66,26 @@ namespace ICSharpCode.PackageManagement @@ -66,22 +66,26 @@ namespace ICSharpCode.PackageManagement
protected override void UpdateRepositoryBeforeReadPackagesTaskStarts()
{
try {
availablePackagesRepository = RegisteredPackageRepositories.ActiveRepository;
repository = RegisteredPackageRepositories.ActiveRepository;
} catch (Exception ex) {
errorMessage = ex.Message;
}
}
protected override IQueryable<IPackage> GetAllPackages()
protected override IQueryable<IPackage> GetAllPackages(string searchCriteria)
{
if (availablePackagesRepository == null) {
if (repository == null) {
throw new ApplicationException(errorMessage);
}
if (IncludePrerelease) {
return availablePackagesRepository.GetPackages();
return repository
.Search(searchCriteria, IncludePrerelease)
.Where(package => package.IsAbsoluteLatestVersion);
}
return availablePackagesRepository.GetPackages().Where(package => package.IsLatestVersion);
return repository
.Search(SearchTerms, IncludePrerelease)
.Where(package => package.IsLatestVersion);
}
/// <summary>

1
src/AddIns/Misc/PackageManagement/Project/Src/Design/FakePackage.cs

@ -54,6 +54,7 @@ namespace ICSharpCode.PackageManagement.Design @@ -54,6 +54,7 @@ namespace ICSharpCode.PackageManagement.Design
this.Version = new SemanticVersion(version);
this.Listed = true;
this.IsLatestVersion = true;
this.IsAbsoluteLatestVersion = true;
}
public static FakePackage CreatePackageWithVersion(string version)

3
src/AddIns/Misc/PackageManagement/Project/Src/InstalledPackagesViewModel.cs

@ -18,7 +18,6 @@ @@ -18,7 +18,6 @@
using System;
using System.Linq;
using System.Collections.Generic;
using NuGet;
namespace ICSharpCode.PackageManagement
@ -60,7 +59,7 @@ namespace ICSharpCode.PackageManagement @@ -60,7 +59,7 @@ namespace ICSharpCode.PackageManagement
ReadPackages();
}
protected override IQueryable<IPackage> GetAllPackages()
protected override IQueryable<IPackage> GetAllPackages(string searchCriteria)
{
if (!string.IsNullOrEmpty(errorMessage)) {
ThrowOriginalExceptionWhenTryingToGetProjectManager();

18
src/AddIns/Misc/PackageManagement/Project/Src/PackagesViewModel.cs

@ -224,9 +224,8 @@ namespace ICSharpCode.PackageManagement @@ -224,9 +224,8 @@ namespace ICSharpCode.PackageManagement
/// </summary>
public IQueryable<IPackage> GetPackagesFromPackageSource()
{
IQueryable<IPackage> packages = GetAllPackages();
packages = OrderPackages(packages);
return FilterPackagesBySearchCriteria(packages);
IQueryable<IPackage> packages = GetAllPackages(GetSearchCriteria());
return OrderPackages(packages);
}
protected virtual IQueryable<IPackage> OrderPackages(IQueryable<IPackage> packages)
@ -235,12 +234,6 @@ namespace ICSharpCode.PackageManagement @@ -235,12 +234,6 @@ namespace ICSharpCode.PackageManagement
.OrderBy(package => package.Id);
}
IQueryable<IPackage> FilterPackagesBySearchCriteria(IQueryable<IPackage> packages)
{
string searchCriteria = GetSearchCriteria();
return FilterPackagesBySearchCriteria(packages, searchCriteria);
}
string GetSearchCriteria()
{
if (String.IsNullOrWhiteSpace(SearchTerms)) {
@ -248,11 +241,6 @@ namespace ICSharpCode.PackageManagement @@ -248,11 +241,6 @@ namespace ICSharpCode.PackageManagement
}
return SearchTerms;
}
protected virtual IQueryable<IPackage> FilterPackagesBySearchCriteria(IQueryable<IPackage> packages, string searchCriteria)
{
return packages.Find(searchCriteria);
}
IEnumerable<IPackage> GetPackagesForSelectedPage(IEnumerable<IPackage> allPackages)
{
@ -265,7 +253,7 @@ namespace ICSharpCode.PackageManagement @@ -265,7 +253,7 @@ namespace ICSharpCode.PackageManagement
/// <summary>
/// Returns all the packages.
/// </summary>
protected virtual IQueryable<IPackage> GetAllPackages()
protected virtual IQueryable<IPackage> GetAllPackages(string searchCriteria)
{
return null;
}

2
src/AddIns/Misc/PackageManagement/Project/Src/RecentPackagesViewModel.cs

@ -71,7 +71,7 @@ namespace ICSharpCode.PackageManagement @@ -71,7 +71,7 @@ namespace ICSharpCode.PackageManagement
ReadPackages();
}
protected override IQueryable<IPackage> GetAllPackages()
protected override IQueryable<IPackage> GetAllPackages(string searchCriteria)
{
if (recentPackagesRepository == null) {
throw new ApplicationException(errorMessage);

2
src/AddIns/Misc/PackageManagement/Project/Src/UpdatedPackagesViewModel.cs

@ -89,7 +89,7 @@ namespace ICSharpCode.PackageManagement @@ -89,7 +89,7 @@ namespace ICSharpCode.PackageManagement
return selectedProjects.GetPackages(aggregateRepository);
}
protected override IQueryable<IPackage> GetAllPackages()
protected override IQueryable<IPackage> GetAllPackages(string searchCriteria)
{
if (updatedPackages == null) {
ThrowSavedException();

1
src/AddIns/Misc/PackageManagement/Test/PackageManagement.Tests.csproj

@ -111,6 +111,7 @@ @@ -111,6 +111,7 @@
<Compile Include="Src\Helpers\FakeCodeGenerator.cs" />
<Compile Include="Src\Helpers\FakeOperationAwarePackageRepository.cs" />
<Compile Include="Src\Helpers\FakeSelectProjectsService.cs" />
<Compile Include="Src\Helpers\FakeServiceBasedRepository.cs" />
<Compile Include="Src\Helpers\FakeSolutionPackageRepositoryFactory.cs" />
<Compile Include="Src\Helpers\FakeUpdatePackageActions.cs" />
<Compile Include="Src\Helpers\FakeUpdatePackageActionsFactory.cs" />

60
src/AddIns/Misc/PackageManagement/Test/Src/AvailablePackagesViewModelTests.cs

@ -561,5 +561,65 @@ namespace PackageManagement.Tests @@ -561,5 +561,65 @@ namespace PackageManagement.Tests
Assert.AreEqual(viewModel, parent);
}
[Test]
public void GetPackagesFromPackageSource_RepositoryIsServiceBasedRepository_ServiceBasedRepositorySearchUsed()
{
CreateViewModel();
var package = FakePackage.CreatePackageWithVersion("Test", "0.1.0.0");
var packages = new FakePackage[] { package };
var repository = new FakeServiceBasedRepository();
repository.PackagesToReturnForSearch("id:test", false, packages);
registeredPackageRepositories.FakeActiveRepository = repository;
viewModel.SearchTerms = "id:test";
viewModel.IncludePrerelease = false;
viewModel.ReadPackages();
IList<IPackage> allPackages = viewModel.GetPackagesFromPackageSource().ToList();
var expectedPackages = new FakePackage[] { package };
PackageCollectionAssert.AreEqual(expectedPackages, allPackages);
}
[Test]
public void GetPackagesFromPackageSource_RepositoryIsServiceBasedRepositoryAndPrereleaseIncluded_ServiceBasedRepositorySearchUsed()
{
CreateViewModel();
var package = FakePackage.CreatePackageWithVersion("Test", "0.1.0.0");
var packages = new FakePackage[] { package };
var repository = new FakeServiceBasedRepository();
repository.PackagesToReturnForSearch("id:test", true, packages);
registeredPackageRepositories.FakeActiveRepository = repository;
viewModel.SearchTerms = "id:test";
viewModel.IncludePrerelease = true;
viewModel.ReadPackages();
IList<IPackage> allPackages = viewModel.GetPackagesFromPackageSource().ToList();
var expectedPackages = new FakePackage[] { package };
PackageCollectionAssert.AreEqual(expectedPackages, allPackages);
}
[Test]
public void GetPackagesFromPackageSource_RepositoryHasThreePackagesWithSameIdButDifferentVersionsAndSearchIncludesPrerelease_AbsoluteLatestPackageVersionOnlyRequestedFromPackageSource()
{
CreateViewModel();
var package1 = new FakePackage("Test", "0.1.0.0") { IsAbsoluteLatestVersion = false };
var package2 = new FakePackage("Test", "0.2.0.0") { IsAbsoluteLatestVersion = false };
var package3 = new FakePackage("Test", "0.3.0.0") { IsAbsoluteLatestVersion = true };
var packages = new FakePackage[] {
package1, package2, package3
};
registeredPackageRepositories.FakeActiveRepository.FakePackages.AddRange(packages);
viewModel.IncludePrerelease = true;
viewModel.ReadPackages();
IList<IPackage> allPackages = viewModel.GetPackagesFromPackageSource().ToList();
var expectedPackages = new FakePackage[] {
package3
};
PackageCollectionAssert.AreEqual(expectedPackages, allPackages);
}
}
}

50
src/AddIns/Misc/PackageManagement/Test/Src/Helpers/FakeServiceBasedRepository.cs

@ -0,0 +1,50 @@ @@ -0,0 +1,50 @@
// Copyright (c) 2014 AlphaSierraPapa for the SharpDevelop Team
//
// Permission is hereby granted, free of charge, to any person obtaining a copy of this
// software and associated documentation files (the "Software"), to deal in the Software
// without restriction, including without limitation the rights to use, copy, modify, merge,
// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
// to whom the Software is furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in all copies or
// substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
using System;
using System.Collections.Generic;
using System.Linq;
using System.Runtime.Versioning;
using ICSharpCode.PackageManagement.Design;
using NuGet;
using Rhino.Mocks;
namespace PackageManagement.Tests.Helpers
{
public class FakeServiceBasedRepository : FakePackageRepository, IServiceBasedRepository
{
public IServiceBasedRepository Repository = MockRepository.GenerateStub<IServiceBasedRepository>();
public IQueryable<IPackage> Search(string searchTerm, IEnumerable<string> targetFrameworks, bool allowPrereleaseVersions)
{
return Repository.Search(searchTerm, targetFrameworks, allowPrereleaseVersions);
}
public void PackagesToReturnForSearch(string search, bool allowPrereleaseVersions, IEnumerable<IPackage> packages)
{
Repository
.Stub(repo => repo.Search(search, new string[0], allowPrereleaseVersions))
.Return(packages.AsQueryable());
}
public IEnumerable<IPackage> GetUpdates(IEnumerable<IPackageName> packages, bool includePrerelease, bool includeAllVersions, IEnumerable<FrameworkName> targetFrameworks, IEnumerable<IVersionSpec> versionConstraints)
{
throw new NotImplementedException();
}
}
}

11
src/AddIns/Misc/PackageManagement/Test/Src/Helpers/TestablePackagesViewModel.cs

@ -90,10 +90,11 @@ namespace PackageManagement.Tests.Helpers @@ -90,10 +90,11 @@ namespace PackageManagement.Tests.Helpers
}
}
protected override IQueryable<NuGet.IPackage> GetAllPackages()
protected override IQueryable<IPackage> GetAllPackages(string searchCriteria)
{
GetAllPackagesCallCount++;
return FakePackages.AsQueryable();
SearchCriteriaPassedToFilterPackagesBySearchCriteria = searchCriteria;
return FakePackages.AsQueryable().Find(searchCriteria);
}
protected override IEnumerable<IPackage> GetFilteredPackagesBeforePagingResults(IQueryable<IPackage> packages)
@ -111,11 +112,5 @@ namespace PackageManagement.Tests.Helpers @@ -111,11 +112,5 @@ namespace PackageManagement.Tests.Helpers
{
AddFakePackages(howMany: 3);
}
protected override IQueryable<IPackage> FilterPackagesBySearchCriteria(IQueryable<IPackage> packages, string searchTerms)
{
SearchCriteriaPassedToFilterPackagesBySearchCriteria = searchTerms;
return base.FilterPackagesBySearchCriteria(packages, searchTerms);
}
}
}

Loading…
Cancel
Save