Delaying id search after packages are loaded from feed.

Author: maraf

src/PackageManager.NuGet/Services/EmptyNuGetSearchTermTransformer.cs

@@ -9,7 +9,9 @@ namespace PackageManager.Services
 {
     public class EmptyNuGetSearchTermTransformer : INuGetSearchTermTransformer
     {
-        public string Transform(string searchTerm) => searchTerm;
+        public void Transform(NuGetSearchTerm searchTerm)
+        {
+        }
 
         #region Singleton
 

src/PackageManager.NuGet/Services/INuGetSearchTermTransformer.cs

@@ -9,6 +9,6 @@ namespace PackageManager.Services
 {
     public interface INuGetSearchTermTransformer
     {
-        string Transform(string searchTerm);
+        void Transform(NuGetSearchTerm searchTerm);
     }
 }

src/PackageManager.NuGet/Services/NuGetSearchService.cs

@@ -65,9 +65,19 @@ private Task<IEnumerable<IPackageSearchMetadata>> SearchAsync(PackageSearchResou
 
         public async Task<IEnumerable<IPackage>> SearchAsync(IEnumerable<IPackageSource> packageSources, string searchText, SearchOptions options = default, CancellationToken cancellationToken = default)
         {
-            searchText = queryTransformer.Transform($"id:{searchText}");
+            NuGetSearchTerm term = new NuGetSearchTerm();
+            term.Id.Add(searchText);
 
-            log.Debug($"Searching '{searchText}'.");
+            queryTransformer.Transform(term);
+            term.Id.Remove(searchText);
+
+            bool isLateIdSearch = false;
+            if (term.IsEmpty())
+                term.Id.Add(searchText);
+            else
+                isLateIdSearch = true;
+
+            log.Debug($"Searching - user text:'{searchText}'; target query:'{term}'.");
 
             options = EnsureOptions(options);
 
@@ -94,14 +104,17 @@ public async Task<IEnumerable<IPackage>> SearchAsync(IEnumerable<IPackageSource>
                     }
 
                     int sourceSearchPackageCount = 0;
-                    foreach (IPackageSearchMetadata package in await SearchAsync(search, searchText, options, cancellationToken))
+                    foreach (IPackageSearchMetadata package in await SearchAsync(search, term.ToString(), options, cancellationToken))
                     {
                         log.Debug($"Found '{package.Identity}'.");
 
                         hasItems = true;
                         if (result.Count >= options.PageSize)
                             break;
 
+                        if (isLateIdSearch && package.Identity.Id.IndexOf(searchText, StringComparison.InvariantCultureIgnoreCase) == -1)
+                            continue;
+
                         await AddPackageAsync(result, repository, package, options.IsPrereleaseIncluded, cancellationToken);
                         sourceSearchPackageCount++;
                     }

src/PackageManager.NuGet/Services/NuGetSearchTerm.cs

@@ -0,0 +1,59 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PackageManager.Services
+{
+    public class NuGetSearchTerm
+    {
+        public List<string> Id { get; } = new List<string>();
+        public List<string> Version { get; } = new List<string>();
+        public List<string> Title { get; } = new List<string>();
+        public List<string> Tags { get; } = new List<string>();
+        public List<string> Description { get; } = new List<string>();
+        public List<string> Summary { get; } = new List<string>();
+        public List<string> Owner { get; } = new List<string>();
+
+        public override string ToString()
+        {
+            StringBuilder result = new StringBuilder();
+            Append(result, "id", Id);
+            Append(result, "version", Version);
+            Append(result, "title", Title);
+            Append(result, "tags", Tags);
+            Append(result, "description", Description);
+            Append(result, "summary", Summary);
+            Append(result, "owner", Owner);
+            return result.ToString();
+        }
+
+        private void Append(StringBuilder result, string key, List<string> values)
+        {
+            foreach (var value in values)
+                result.Append(" ").Append(key).Append(":").Append(value);
+        }
+
+        public bool IsEmpty()
+            => IsEmpty(Id) 
+            && IsEmpty(Version) 
+            && IsEmpty(Title) 
+            && IsEmpty(Tags) 
+            && IsEmpty(Description) 
+            && IsEmpty(Summary) 
+            && IsEmpty(Owner);
+
+        private bool IsEmpty(List<string> values)
+        {
+            if (values.Count == 0)
+                return false;
+
+            if (values.Any(s => !String.IsNullOrEmpty(s)))
+                return true;
+
+            return false;
+        }
+    }
+}

src/PackageManager.UI/Services/TagsNuGetSearchTermTransformer.cs

@@ -18,12 +18,10 @@ public TagsNuGetSearchTermTransformer(string tags)
             this.tags = tags;
         }
 
-        public string Transform(string searchTerm)
+        public void Transform(NuGetSearchTerm searchTerm)
         {
-            if (String.IsNullOrEmpty(tags))
-                return searchTerm;
-
-            return $"{searchTerm} tags:{tags}";
+            if (!String.IsNullOrEmpty(tags))
+                searchTerm.Tags.Add(tags);
         }
     }
 }