Search cancellation

Author: Decimation

SmartImage.Lib/Engines/Model/BaseSearchEngine.cs

@@ -88,12 +88,14 @@ protected virtual Uri GetRawUri(ImageQuery query)
 	protected virtual SearchResultOrigin GetResultOrigin(ImageQuery query, CancellationToken? c = null)
 	{
 		Uri rawUri = GetRawUri(query);
-
-		const int maxAutoRedirects = 50;
+		
 
 		var res = HttpUtilities.GetHttpResponse(rawUri.ToString(),
 		                                             (int) Timeout.TotalMilliseconds,
 		                                             HttpMethod.Get, FollowRedirects);
+		
+
+
 		bool success;
 
 		if (res is { IsSuccessStatusCode: false }) {

SmartImage.Lib/SearchClient.cs

@@ -97,8 +97,6 @@ public SearchClient(SearchConfig config)
 	private List<Task> ContinueTasks { get; }
 
 
-
-
 	/// <summary>
 	///     Reloads <see cref="Config" /> and <see cref="Engines" /> accordingly.
 	/// </summary>
@@ -136,26 +134,28 @@ public void Reset()
 	/// <summary>
 	///     Performs an image search asynchronously.
 	/// </summary>
-	public async Task RunSearchAsync(CancellationTokenSource cts = null, CancellationTokenSource cts2= null)
+	public async Task RunSearchAsync(CancellationToken? cts = null)
 	{
 		if (IsComplete) {
 			Reset();
 		}
 
+		cts ??= CancellationToken.None;
 
 		Tasks = new List<Task<SearchResult>>(Engines.Select(engine =>
 		{
-			var task = engine.GetResultAsync(Config.Query, cts?.Token ?? CancellationToken.None);
+			var task = engine.GetResultAsync(Config.Query, cts.Value);
 
 			return task;
 		}));
 
 		PendingCount = Tasks.Count;
 
-		while (!IsComplete) {
+
+		while (!IsComplete && !cts.Value.IsCancellationRequested) {
 			var finished = await Task.WhenAny(Tasks);
 
-			var task = finished.ContinueWith(GetResultContinueCallback, null, cts2?.Token ?? CancellationToken.None,
+			var task = finished.ContinueWith(GetResultContinueCallback, null, cts.Value,
 			                                 0, TaskScheduler.Default);
 			ContinueTasks.Add(task);
 
@@ -225,14 +225,13 @@ public async Task RunSearchAsync(CancellationTokenSource cts = null, Cancellatio
 		SearchCompleted?.Invoke(null, args);
 	}
 
-	public async Task RunContinueAsync()
+	public async Task RunContinueAsync(CancellationToken? c = null)
 	{
 
 		IsContinueComplete = false;
+		c??= CancellationToken.None;
 
-
-
-		while (!IsContinueComplete) {
+		while (!IsContinueComplete&&!c.Value.IsCancellationRequested) {
 			var task = await Task.WhenAny(ContinueTasks);
 			await task;
 

SmartImage.Lib/Utilities/ImageHelper.cs

@@ -66,12 +66,16 @@ public static string Download(Uri src, string path)
 	/// <param name="url">Url to search</param>
 	/// <param name="count">Number of direct images to return</param>
 	/// <param name="timeoutMS"></param>
-	public static async Task<List<DirectImage>> ScanForImages(string url, int count = 10, long timeoutMS = TimeoutMS)
+	/// <param name="c"></param>
+	public static async Task<List<DirectImage>> ScanForImages(string url, int count = 10, long timeoutMS = TimeoutMS,
+	                                                          CancellationToken? c2 = null)
 	{
 		var images = new List<DirectImage>();
 
 		IHtmlDocument document = null;
 
+		var c =c2?? CancellationToken.None;
+
 		try {
 			var client = new HttpClient();
 			var task   = client.GetStringAsync(url);
@@ -90,7 +94,6 @@ public static async Task<List<DirectImage>> ScanForImages(string url, int count
 			return images;
 		}
 
-		using var cts = new CancellationTokenSource();
 
 		var urls = new List<string>();
 
@@ -132,15 +135,15 @@ public static async Task<List<DirectImage>> ScanForImages(string url, int count
 			{
 				string s = urls[iCopy];
 
-				if (IsImage(s, (int) timeoutMS, out var di)) {
+				if (IsImage(s, (int) timeoutMS, out var di, c)) {
 					return di;
 				}
 
 				di?.Dispose();
 
 				return null;
 
-			}, cts.Token));
+			}, c));
 		}
 
 		while (tasks.Any() && count != 0) {
@@ -164,11 +167,11 @@ public static async Task<List<DirectImage>> ScanForImages(string url, int count
 		return images;
 	}
 
-	public static bool IsImage(string url, out DirectImage di)
-		=> IsImage(url, TimeoutMS, out di);
+	public static bool IsImage(string url, out DirectImage di, CancellationToken? c = null)
+		=> IsImage(url, TimeoutMS, out di, c);
 
 
-	public static bool IsImage(string url, long timeout, out DirectImage di)
+	public static bool IsImage(string url, long timeout, out DirectImage di, CancellationToken? c = null)
 	{
 		di = new DirectImage();
 
@@ -177,7 +180,9 @@ public static bool IsImage(string url, long timeout, out DirectImage di)
 		}
 
 
-		var response = HttpUtilities.GetHttpResponse(url, (int) timeout, HttpMethod.Head);
+		var response1 = HttpUtilities.GetHttpResponseAsync(url, (int) timeout, HttpMethod.Head, token: c);
+		response1.Wait();
+		var response = response1.Result;
 
 		// var response1 = HttpUtilities.GetHttpResponseAsync(url, (int) timeout, HttpMethod.Head, c: c);
 		// response1.Wait();
@@ -210,7 +215,7 @@ public static bool IsImage(string url, long timeout, out DirectImage di)
 
 		try {
 			using var client = new HttpClient();
-			var       task   = client.GetStreamAsync(url);
+			var       task   = client.GetStreamAsync(url, c ?? CancellationToken.None);
 			task.Wait((int) timeout);
 
 			var stream = task.Result;