When feed is a local folder, search for all packages and than apply all filters in app.

Author: maraf

src/PackageManager.NuGet/Services/NuGetSearchService.cs

@@ -8,6 +8,7 @@
 using Neptuo.Activators;
 using Neptuo.Logging;
 using NuGet.Common;
+using NuGet.Protocol;
 using NuGet.Protocol.Core.Types;
 using NuGet.Versioning;
 using PackageManager.Logging;
@@ -71,11 +72,16 @@ public async Task<IEnumerable<IPackage>> SearchAsync(IEnumerable<IPackageSource>
             queryTransformer.Transform(term);
             term.Id.Remove(searchText);
 
-            bool isLateIdSearch = false;
+            NuGetSearchTerm lateTerm = null;
             if (term.IsEmpty())
+            {
                 term.Id.Add(searchText);
+            }
             else
-                isLateIdSearch = true;
+            {
+                lateTerm = term.Clone();
+                lateTerm.Id.Add(searchText);
+            }
 
             log.Debug($"Searching - user text:'{searchText}'; target query:'{term}'.");
 
@@ -103,6 +109,21 @@ public async Task<IEnumerable<IPackage>> SearchAsync(IEnumerable<IPackageSource>
                         continue;
                     }
 
+                    NuGetSearchTerm localTerm = null;
+                    bool clearLateTerm = false;
+                    if (search is LocalPackageSearchResource)
+                    {
+                        // Searching a feed from folder.
+                        localTerm = term;
+                        term = new NuGetSearchTerm();
+
+                        if (lateTerm == null)
+                        {
+                            lateTerm = localTerm;
+                            clearLateTerm = true;
+                        }
+                    }
+
                     int sourceSearchPackageCount = 0;
                     foreach (IPackageSearchMetadata package in await SearchAsync(search, term.ToString(), options, cancellationToken))
                     {
@@ -112,8 +133,11 @@ public async Task<IEnumerable<IPackage>> SearchAsync(IEnumerable<IPackageSource>
                         if (result.Count >= options.PageSize)
                             break;
 
-                        if (isLateIdSearch && package.Identity.Id.IndexOf(searchText, StringComparison.InvariantCultureIgnoreCase) == -1)
+                        if (lateTerm != null && !lateTerm.IsMatched(package))
+                        {
+                            log.Debug($"Package skipped by late search term '{lateTerm}'.");
                             continue;
+                        }
 
                         await AddPackageAsync(result, repository, package, options.IsPrereleaseIncluded, cancellationToken);
                         sourceSearchPackageCount++;
@@ -122,6 +146,15 @@ public async Task<IEnumerable<IPackage>> SearchAsync(IEnumerable<IPackageSource>
                     // If package source reached end, skip it from next probing.
                     if (sourceSearchPackageCount < options.PageSize)
                         sourcesToSkip.Add(packageSource);
+
+                    if (localTerm != null)
+                    {
+                        term = localTerm;
+                        localTerm = null;
+
+                        if (clearLateTerm)
+                            lateTerm = null;
+                    }
                 }
 
                 if (!hasItems)

src/PackageManager.NuGet/Services/NuGetSearchTerm.cs

@@ -1,4 +1,6 @@
-using System;
+using Neptuo;
+using NuGet.Protocol.Core.Types;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -7,7 +9,7 @@
 
 namespace PackageManager.Services
 {
-    public class NuGetSearchTerm
+    public class NuGetSearchTerm : ICloneable<NuGetSearchTerm>
     {
         public List<string> Id { get; } = new List<string>();
         public List<string> Version { get; } = new List<string>();
@@ -55,5 +57,44 @@ private bool IsEmpty(List<string> values)
 
             return false;
         }
+
+        public bool IsMatched(IPackageSearchMetadata package)
+            => IsMatched(package.Identity.Id, Id)
+            && IsMatched(package.Identity.Version.OriginalVersion, Version)
+            && IsMatched(package.Title, Title)
+            && IsMatched(package.Tags, Tags)
+            && IsMatched(package.Description, Description)
+            && IsMatched(package.Summary, Summary)
+            && IsMatched(package.Owners, Owner);
+
+        private bool IsMatched(string packageValue, List<string> values)
+        {
+            bool result = true;
+            foreach (var value in values)
+            {
+                if (String.IsNullOrEmpty(value))
+                    continue;
+
+                if (packageValue.IndexOf(value, StringComparison.InvariantCultureIgnoreCase) != -1)
+                    return true;
+
+                result = false;
+            }
+
+            return result;
+        }
+
+        public NuGetSearchTerm Clone()
+        {
+            var clone = new NuGetSearchTerm();
+            clone.Id.AddRange(Id);
+            clone.Version.AddRange(Version);
+            clone.Title.AddRange(Title);
+            clone.Tags.AddRange(Tags);
+            clone.Description.AddRange(Description);
+            clone.Summary.AddRange(Summary);
+            clone.Owner.AddRange(Owner);
+            return clone;
+        }
     }
 }