Increase Iqdb timeout; async tweaks

Author: Decimation

SmartImage.Lib/Engines/Impl/Search/Ascii2DEngine.cs

@@ -47,7 +47,7 @@ protected override string[] ErrorBodyMessages
 
 	public const string MAIN_URL = "https://ascii2d.net/search/url/";
 
-	public Ascii2DEngine() : base(ALT_URL)
+	public Ascii2DEngine() : base(MAIN_URL)
 	{
 		Timeout = TimeSpan.FromSeconds(30);
 		MaxSize = 10_000_000;

SmartImage.Lib/Engines/Impl/Search/IqdbEngine.cs

@@ -38,7 +38,7 @@ protected IqdbEngine(string b) : base(b)
 	{
 		MaxSize = MAX_FILE_SIZE; // NOTE: assuming IQDB uses kilobytes instead of kibibytes
 
-		Timeout = TimeSpan.FromSeconds(25);
+		Timeout = TimeSpan.FromSeconds(90);
 	}
 
 	private const int MAX_FILE_SIZE = 8_388_608;

SmartImage.Lib/SearchClient.cs

@@ -209,7 +209,7 @@ public async Task<SearchResult[]> RunSearchAsync(SearchQuery query,
 			}
 			catch (Exception e) {
 				s_logger.LogError(e, "Run search error");
-				
+
 				Debugger.Break();
 			}
 
@@ -304,21 +304,13 @@ public async ValueTask LoadEnginesAsync(CancellationToken token = default)
 
 		Engines = BaseSearchEngine.GetSelectedEngines(Config.SearchEngines).ToFrozenSet();
 
-		if (Config.ReadCookies) {
-
-			try {
-				Config.CookiesProvider = ICookiesProvider.GetProvider();
+		ValueTask<bool> readCookies;
+		ValueTask<bool> loadFlareSolverr;
+		Task            applyConfig;
 
-				await ((BrowserCookiesProvider) Config.CookiesProvider).OpenAsync();
-			}
-			catch (Exception e) {
-				s_logger.LogError(e, "Error reading cookies");
-				Config.ReadCookies = false;
-				Config.CookiesProvider.Dispose();
-			}
-		}
+		readCookies = Config.TryReadCookiesAsync();
 
-		await Parallel.ForEachAsync(Engines, token, async (bse, cancellationToken) =>
+		applyConfig = Parallel.ForEachAsync(Engines, token, async (bse, cancellationToken) =>
 		{
 			if (bse is ISearchConfigReceiver cfg) {
 				s_logger.LogTrace("Applying config to {Engine}", bse.Name);
@@ -327,26 +319,11 @@ await Parallel.ForEachAsync(Engines, token, async (bse, cancellationToken) =>
 		});
 
 
-		if (Config.FlareSolverr && !FlareSolverrClient.Value.IsInitialized) {
-
-			var ok = await FlareSolverrClient.Value.ApplyConfigAsync(Config, token);
+		loadFlareSolverr = Config.TryLoadFlareSolverrAsync(token);
 
-			if (!ok) {
-				Debugger.Break();
-			}
-			else {
-				// Ensure FlareSolverr
-
-				try {
-					var idx = await FlareSolverrClient.Value.Clearance.Solverr.GetIndexAsync();
-				}
-				catch (Exception e) {
-					s_logger.LogError(e, "FlareSolverr error");
-					Config.FlareSolverr = false;
-					FlareSolverrClient.Value.Dispose();
-				}
-			}
-		}
+		await readCookies;
+		await applyConfig;
+		await loadFlareSolverr;
 
 		// CookiesManager.Instance.Dispose();
 

SmartImage.Lib/SearchConfig.cs

@@ -7,11 +7,14 @@
 using Kantan.Model.MemberIndex;
 using Kantan.Utilities;
 using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Logging;
+using SmartImage.Lib.Clients;
 using SmartImage.Lib.Cookies;
 using SmartImage.Lib.Engines;
 using SmartImage.Lib.Engines.Impl.Search;
 using SmartImage.Lib.Engines.Impl.Upload;
 using SmartImage.Lib.Results.Data;
+using SmartImage.Lib.Utilities.Diagnostics;
 using Configuration = System.Configuration.Configuration;
 using ConfigurationManager = System.Configuration.ConfigurationManager;
 using ConfigurationSection = System.Configuration.ConfigurationSection;
@@ -21,7 +24,7 @@ namespace SmartImage.Lib;
 public sealed class SearchConfig : INotifyPropertyChanged
 {
 
-	#region Defaults
+#region Defaults
 
 	/// <summary>
 	/// Default value for <see cref="SearchEngines"/>
@@ -57,7 +60,7 @@ public sealed class SearchConfig : INotifyPropertyChanged
 
 	public const UploadEngineOptions UPLOAD_ENGINE_DEFAULT = UploadEngineOptions.Pomf;
 
-	#endregion
+#endregion
 
 	/// <summary>
 	/// Engines used to search.
@@ -196,16 +199,69 @@ public UploadEngineOptions UploadEngine
 
 	public static readonly SearchConfig Default = new();
 
+	private static readonly ILogger s_logger = AppSupport.Factory.CreateLogger(nameof(SearchClient));
+
+	public static readonly Configuration Configuration =
+		ConfigurationManager.OpenExeConfiguration(ConfigurationUserLevel.None);
+
 	public SearchConfig()
 	{
 		PropertyChanged += static (sender, args) =>
 		{
-			Trace.WriteLine($"Changed {args.PropertyName}", nameof(SearchConfig));
+			//
+			s_logger.LogTrace("Changed {PropName}", args.PropertyName);
 		};
 	}
 
-	public static readonly Configuration Configuration =
-		ConfigurationManager.OpenExeConfiguration(ConfigurationUserLevel.None);
+
+	internal async ValueTask<bool> TryReadCookiesAsync()
+	{
+		var ok = false;
+
+		if (ReadCookies) {
+			try {
+				CookiesProvider = ICookiesProvider.GetProvider();
+
+				await ((BrowserCookiesProvider) CookiesProvider).OpenAsync();
+				ok = true;
+			}
+			catch (Exception e) {
+				s_logger.LogError(e, "Error reading cookies");
+				ReadCookies = ok;
+				CookiesProvider.Dispose();
+			}
+		}
+
+		return ok;
+	}
+
+	internal async ValueTask<bool> TryLoadFlareSolverrAsync(CancellationToken token)
+	{
+		bool ok = false;
+
+		if (this.FlareSolverr && !FlareSolverrClient.Value.IsInitialized) {
+
+			ok = await FlareSolverrClient.Value.ApplyConfigAsync(this, token);
+
+			if (!ok) {
+				Debugger.Break();
+			}
+			else {
+				// Ensure FlareSolverr
+
+				try {
+					var idx = await FlareSolverrClient.Value.Clearance.Solverr.GetIndexAsync();
+				}
+				catch (Exception e) {
+					s_logger.LogError(e, "FlareSolverr error");
+					this.FlareSolverr = ok;
+					FlareSolverrClient.Value.Dispose();
+				}
+			}
+		}
+
+		return ok;
+	}
 
 	private bool Set<T>(T s = default, [CMN] string name = default)
 	{