Merge pull request #271 from OmniSharp/nuget-sources

Added package sources endpoint

src/OmniSharp/Api/v1/NuGet/OmnisharpController.Package.cs

@@ -25,6 +25,29 @@ namespace OmniSharp
 #if DNX451
     public partial class OmnisharpController
     {
+        [HttpPost("packagesource")]
+        public PackageSourceResponse PackageSource(PackageSourceRequest request)
+        {
+            var projectPath = request.ProjectPath;
+            if (request.ProjectPath.EndsWith(".json"))
+            {
+                projectPath = Path.GetDirectoryName(projectPath);
+            }
+
+            if (!string.IsNullOrWhiteSpace(projectPath))
+            {
+                var tasks = new List<Task<IEnumerable<SimpleSearchMetadata>>>();
+                var repositoryProvider = new OmniSharpSourceRepositoryProvider(projectPath);
+                var repos = repositoryProvider.GetRepositories().ToArray();
+                return new PackageSourceResponse()
+                {
+                    Sources = repos.Select(x => x.PackageSource.Source)
+                };
+            }
+
+            return new PackageSourceResponse();
+        }
+
         [HttpPost("packagesearch")]
         public async Task<PackageSearchResponse> PackageSearch(PackageSearchRequest request)
         {
@@ -42,6 +65,9 @@ public async Task<PackageSearchResponse> PackageSearch(PackageSearchRequest requ
                 if (request.PackageTypes == null)
                     request.PackageTypes = Enumerable.Empty<string>();
 
+                if (request.Sources == null)
+                    request.Sources = Enumerable.Empty<string>();
+
                 var token = CancellationToken.None;
                 var filter = new SearchFilter()
                 {
@@ -52,6 +78,11 @@ public async Task<PackageSearchResponse> PackageSearch(PackageSearchRequest requ
                 var tasks = new List<Task<IEnumerable<SimpleSearchMetadata>>>();
                 var repositoryProvider = new OmniSharpSourceRepositoryProvider(projectPath);
                 var repos = repositoryProvider.GetRepositories().ToArray();
+                if (request.Sources.Any())
+                {
+                    // Reduce to just the sources we requested
+                    repos = repos.Join(request.Sources, x => x.PackageSource.Source, x => x, (x, y) => x).ToArray();
+                }
 
                 foreach (var repo in repos)
                 {
@@ -74,7 +105,6 @@ private PackageSearchResponse MergeResults(IEnumerable<SimpleSearchMetadata>[] r
             var comparer = new PackageIdentityComparer();
             return new PackageSearchResponse()
             {
-                Sources = repos.Select(repo => repo.PackageSource.Source),
                 Packages = results
                     .SelectMany(metadata => metadata)
                     .GroupBy(metadata => metadata.Identity.Id)
@@ -101,6 +131,9 @@ public async Task<PackageVersionResponse> PackageVersion(PackageVersionRequest r
 
             if (!string.IsNullOrWhiteSpace(projectPath))
             {
+                if (request.Sources == null)
+                    request.Sources = Enumerable.Empty<string>();
+
                 var token = CancellationToken.None;
 
                 var filter = new SearchFilter
@@ -110,6 +143,11 @@ public async Task<PackageVersionResponse> PackageVersion(PackageVersionRequest r
                 var foundVersions = new List<NuGetVersion>();
                 var repositoryProvider = new OmniSharpSourceRepositoryProvider(projectPath);
                 var repos = repositoryProvider.GetRepositories().ToArray();
+                if (request.Sources.Any())
+                {
+                    // Reduce to just the sources we requested
+                    repos = repos.Join(request.Sources, x => x.PackageSource.Source, x => x, (x, y) => x).ToArray();
+                }
                 foreach (var repo in repos)
                 {
                     // TODO: Swap when bug is fixed

src/OmniSharp/Models/v1/PackageSearchRequest.cs

@@ -9,6 +9,11 @@ public class PackageSearchRequest
         /// </summary>
         public string ProjectPath { get; set; }
 
+        /// <summary>
+        /// The sources to search for the given package
+        /// </summary>
+        public IEnumerable<string> Sources { get; set; }
+
         /// <summary>
         /// The filter search critera
         /// </summary>

src/OmniSharp/Models/v1/PackageSearchResponse.cs

@@ -5,6 +5,5 @@ namespace OmniSharp.Models
     public class PackageSearchResponse
     {
         public IEnumerable<PackageSearchItem> Packages { get; set; }
-        public IEnumerable<string> Sources { get; set; }
     }
 }

src/OmniSharp/Models/v1/PackageSourceRequest.cs

@@ -0,0 +1,12 @@
+using System.Collections.Generic;
+
+namespace OmniSharp.Models
+{
+    public class PackageSourceRequest
+    {
+        /// <summary>
+        /// The path to the project file
+        /// </summary>
+        public string ProjectPath { get; set; }
+    }
+}

src/OmniSharp/Models/v1/PackageSourceResponse.cs

@@ -0,0 +1,9 @@
+using System.Collections.Generic;
+
+namespace OmniSharp.Models
+{
+    public class PackageSourceResponse
+    {
+        public IEnumerable<string> Sources { get; set; }
+    }
+}

src/OmniSharp/Models/v1/PackageVersionRequest.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 
 namespace OmniSharp.Models
 {
@@ -9,6 +10,11 @@ public class PackageVersionRequest
         /// </summary>
         public string ProjectPath { get; set; }
 
+        /// <summary>
+        /// The sources to search for the given package
+        /// </summary>
+        public IEnumerable<string> Sources { get; set; }
+
         /// <summary>
         /// The id of the package to look up the versions
         /// </summary>

src/OmniSharp/project.json

@@ -31,6 +31,7 @@
                 "NuGet.Packaging.Core": "3.1.0-*",
                 "NuGet.Protocol.Core.v2": "3.1.0-*",
                 "NuGet.Protocol.Core.v3": "3.1.0-*"
+
             },
             "frameworkAssemblies": {
                 "System.Globalization": "",