Work on concurrent searching

Author: Decimation

SmartImage 3/Mode/CliMode.cs

@@ -7,6 +7,7 @@
 using JetBrains.Annotations;
 using SmartImage.Lib;
 using SmartImage.Lib.Results;
+using SmartImage.Utilities;
 using Spectre.Console;
 using Spectre.Console.Rendering;
 using AConsole = Spectre.Console.AnsiConsole;
@@ -51,11 +52,14 @@ public CliMode()
 
 	public async Task<object?> RunAsync(object? c)
 	{
+		var cstr = (string) c;
+		Debug.WriteLine($"Input: {cstr}");
+
 		await AConsole.Progress().AutoRefresh(true).StartAsync(async ctx =>
 		{
 			var p = ctx.AddTask("Creating query");
 			p.IsIndeterminate = true;
-			m_query           = await SearchQuery.TryCreateAsync((string) c!);
+			m_query           = await SearchQuery.TryCreateAsync(cstr);
 			p.Increment(COMPLETE);
 			ctx.Refresh();
 		});
@@ -78,10 +82,11 @@ await AConsole.Progress().AutoRefresh(true).StartAsync(async ctx =>
 
 		SConsole.CancelKeyPress += (sender, args) =>
 		{
-			args.Cancel = false;
-			m_cts.Cancel();
 			AConsole.MarkupLine($"[red]Cancellation requested[/]");
-			Environment.Exit(-1);
+			m_cts.Cancel();
+			args.Cancel = false;
+
+			Environment.Exit(ConsoleUtil.CODE_ERR);
 		};
 
 		// await Prg_1.StartAsync(RunSearchAsync);

SmartImage 3/Program.cs

@@ -106,21 +106,8 @@ public static async Task<int> Main(string[] args)
 				return i;
 
 			}
-			else if (args.Contains("-d")) {
-				var sc             =new SearchClient(SearchConfig.Default);
-				var sq = await SearchQuery.TryCreateAsync("https://i.imgur.com/QtCausw.png");
-				await sq.UploadAsync();
-				var r              =await sc.RunSearchAsync(sq);
-
-				foreach (SearchResult searchResult in r) {
-					Console.WriteLine(searchResult);
-				}
 
-				return 0;
-			}
-			else {
-				return -1;
-			}
+			return ConsoleUtil.CODE_ERR;
 		}
 		else {
 			main1:
@@ -137,7 +124,7 @@ public static async Task<int> Main(string[] args)
 				goto main1;
 			}
 
-			return 0;
+			return ConsoleUtil.CODE_OK;
 		}
 	}
 }

SmartImage 3/Utilities/ConsoleUtil.cs

@@ -73,4 +73,7 @@ internal static void FlashTaskbar()
 
 		Native.FlashWindowEx(ref pwfi);
 	}
+
+	internal const int CODE_ERR = -1;
+	internal const int CODE_OK  = 0;
 }

SmartImage.Lib 3/Engines/ILoginEngine.cs

@@ -6,11 +6,10 @@
 
 public interface ILoginEngine
 {
-    public string Username { get; set; }
-    public string Password { get; set; }
+	public string Username { get; set; }
+	public string Password { get; set; }
 
-    public Task<bool> LoginAsync();
-
-    public bool     IsLoggedIn { get; }
+	public Task<bool> LoginAsync();
 
+	public bool IsLoggedIn { get; }
 }

SmartImage.Lib 3/Engines/Impl/Search/YandexEngine.cs

@@ -159,7 +159,7 @@ public override async Task<SearchResult> GetResultAsync(SearchQuery query, Cance
 		var otherImages = GetOtherImages(doc, sr);
 		sr.Results.AddRange(otherImages);
 
-		var ext =  ParseExternalInfo(doc, sr);
+		var ext = ParseExternalInfo(doc, sr);
 		sr.Results.AddRange(ext);
 
 		//

SmartImage.Lib 3/SearchClient.cs

@@ -88,12 +88,76 @@ static SearchClient()
 	/// </summary>
 	/// <param name="query">Search query</param>
 	/// <param name="token">Cancellation token passed to <see cref="BaseSearchEngine.GetResultAsync"/></param>
-	public async Task<SearchResult[]> RunSearchAsync(SearchQuery query, CancellationToken? token = null, [CBN] IProgress<int> p=null)
+	/// <param name="p"><see cref="IProgress{T}"/></param>
+	public async Task<SearchResult[]> RunSearchAsync(SearchQuery[] query, CancellationToken? token = null,
+	                                                 [CBN] IProgress<int> p = null)
 	{
 		if (!ConfigApplied) {
 			await ApplyConfigAsync();
 		}
 
+		token ??= CancellationToken.None;
+		var tasks = query.SelectMany(e => GetSearchTasks(e, token.Value)).ToList();
+
+		var results = new SearchResult[tasks.Count];
+		int i       = 0;
+
+		while (tasks.Any()) {
+			if (token.Value.IsCancellationRequested) {
+
+				Logger.LogWarning("Cancellation requested");
+				IsComplete = true;
+
+				return results;
+			}
+
+			var task = await Task.WhenAny(tasks);
+
+			var result = await task;
+
+			OnResult?.Invoke(this, result);
+			p?.Report(i);
+
+			if (Config.PriorityEngines.HasFlag(result.Engine.EngineOption)) {
+
+				OpenResult(result);
+			}
+
+			results[i] = result;
+			i++;
+			// results.Add(result);
+			tasks.Remove(task);
+		}
+
+		OnComplete?.Invoke(this, results);
+
+		IsComplete = true;
+
+		if (Config.PriorityEngines == SearchEngineOptions.Auto) {
+
+			// var sri    = results.SelectMany(r => r.Results).ToArray();
+			// var result = Optimize(sri).FirstOrDefault() ?? sri.FirstOrDefault();
+			//todo
+			OpenResult(results.FirstOrDefault());
+
+		}
+
+		return results;
+	}
+
+	/// <summary>
+	/// Runs a search of <paramref name="query"/>.
+	/// </summary>
+	/// <param name="query">Search query</param>
+	/// <param name="token">Cancellation token passed to <see cref="BaseSearchEngine.GetResultAsync"/></param>
+	/// <param name="p"><see cref="IProgress{T}"/></param>
+	public Task<SearchResult[]> RunSearchAsync(SearchQuery query, CancellationToken? token = null,
+	                                           [CBN] IProgress<int> p = null)
+	{
+		/*if (!ConfigApplied) {
+			await ApplyConfigAsync();
+		}
+
 		token ??= CancellationToken.None;
 
 		var tasks = GetSearchTasks(query, token.Value);
@@ -141,7 +205,9 @@ public async Task<SearchResult[]> RunSearchAsync(SearchQuery query, Cancellation
 
 		}
 
-		return results;
+		return results;*/
+
+		return RunSearchAsync(new SearchQuery[] { query }, token, p);
 	}
 
 	private void OpenResult(SearchResult result)
@@ -271,5 +337,4 @@ public void Dispose()
 		ConfigApplied = false;
 		IsComplete    = false;
 	}
-	
 }