fixes

Author: Decimation

SmartImage.Cli/Program.cs

@@ -8,6 +8,7 @@
 using System.Diagnostics;
 using System.Linq;
 using System.Threading.Tasks;
+using SimpleCore.Net;
 
 // ReSharper disable UnusedMember.Global
 
@@ -54,15 +55,21 @@ public ImageResult[] FindBestResults(int n)
 				                  var x = r.OtherResults;
 				                  x.Insert(0, r.PrimaryResult);
 				                  return x;
-			                  })
-			                  .AsParallel()
-			                  .Where(r => r.Url != null && ImageHelper.IsDirect(r.Url.ToString()))
-			                  .OrderByDescending(r => r.Similarity)
-			                  .ThenByDescending(r => r.DetailScore)
-			                  .Take(n)
-			                  .ToArray();
-
-			return best;
+			                  });
+
+			Debug.WriteLine(best.Count());
+
+
+			best = best
+			       .AsParallel()
+			       .Where(r => r.Url != null && ImageHelper.IsDirect(r.Url.ToString()))
+			       .OrderByDescending(r => r.Similarity)
+			       .ThenByDescending(r => r.PixelResolution)
+			       .ThenByDescending(r => r.DetailScore)
+			       .Take(n);
+
+
+			return best.ToArray();
 		}
 
 		public List<SearchResult> MaximizeResults<T>(Func<SearchResult, T> property)
@@ -125,13 +132,13 @@ public async Task RunSearchAsync()
 				Results.Add(value);
 
 				// Call event
-				ResultCompleted?.Invoke(this, new SearchResultEventArgs(value));
+				ResultCompleted?.Invoke(null, new SearchResultEventArgs(value));
 
 				IsComplete = !tasks.Any();
 			}
 
 			Trace.WriteLine($"[success] {nameof(SearchClient)}: Search complete");
-			//SearchCompleted?.Invoke(this, EventArgs.Empty);
+			SearchCompleted?.Invoke(null, null);
 
 			return;
 		}

SmartImage.Cli/SmartImage.Cli.csproj

@@ -45,16 +45,17 @@ public static async Task Main(string[] args)
 			var q = new ImageQuery("https://litter.catbox.moe/5yr86t.jpg");
 
 			var cfg = new SearchConfig
-			{ Query = q, SearchEngines = SearchEngineOptions.All };
+				{Query = q, SearchEngines = SearchEngineOptions.All};
 
 			var cl = new SearchClient(cfg);
-
+			cl.SearchCompleted += (sender, eventArgs) => { Console.WriteLine("g"); };
 			await cl.RunSearchAsync();
 			Console.WriteLine($"hi {cl.Results.Count}");
 			var sw = Stopwatch.StartNew();
 			var r2 = cl.FindBestResults(5);
 			sw.Stop();
 			Console.WriteLine(sw.Elapsed.TotalSeconds);
+
 			foreach (var imageResult in r2) {
 				Console.WriteLine(imageResult);
 			}
@@ -76,12 +77,14 @@ public static async Task Main(string[] args)
 			//var r = cl.RunSearchAsync();
 			//await r;
 
-			//var i  = new YandexEngine();
+			//var i = new YandexEngine();
 			//var i2 = i.GetResultAsync(q);
 			//var r2 = await i2;
 
-			//Console.WriteLine(r2);
 
+			//foreach (var x in r2.OtherResults) {
+			//	Console.WriteLine(x);
+			//}
 
 			//Console.WriteLine(">> {0}", r2);