updates

Author: Decimation

SmartImage.Lib/Engines/Search/Base/BaseSearchEngine.cs

@@ -1,10 +1,15 @@
 using System;
 using System.Diagnostics;
+using System.Linq;
 using System.Net;
 using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
+using Flurl.Http;
 using Kantan.Net;
+using Kantan.Text;
+using Novus.Utilities;
+using SmartImage.Lib.Properties;
 using SmartImage.Lib.Searching;
 using static Kantan.Diagnostics.LogCategories;
 
@@ -32,7 +37,6 @@ protected BaseSearchEngine(string baseUrl)
 	protected bool FollowRedirects { get; set; } = true;
 
 	public abstract EngineSearchType SearchType { get; }
-	
 
 
 	public virtual SearchResult GetResult(ImageQuery query, CancellationToken? c = null)
@@ -57,14 +61,14 @@ public virtual SearchResult GetResult(ImageQuery query, CancellationToken? c = n
 			sr.RawUri = sr.Origin.RawUri;
 			sr.Status = ResultStatus.Success;
 		}
-		
+
 		return sr;
 	}
 
 
 	public async Task<SearchResult> GetResultAsync(ImageQuery query, CancellationToken? c = null)
 	{
-		c??= CancellationToken.None;
+		c ??= CancellationToken.None;
 
 		var task = Task.Run(delegate
 		{
@@ -112,7 +116,6 @@ protected virtual SearchResultOrigin GetResultOrigin(ImageQuery query, Cancellat
 			success = true;
 		}
 
-		
 
 		string content = null;
 
@@ -126,14 +129,24 @@ protected virtual SearchResultOrigin GetResultOrigin(ImageQuery query, Cancellat
 		{
 			Response = res,
 			// Content  = content,
-			Success  = success,
-			RawUri   = rawUri,
-			Query    = query
+			Success = success,
+			RawUri  = rawUri,
+			Query   = query
 		};
 
 		return origin;
 
 	}
+
+	public static BaseSearchEngine[] GetAllSearchEngines()
+	{
+		var engines = typeof(BaseSearchEngine).GetAllSubclasses()
+		                                      .Select(Activator.CreateInstance)
+		                                      .Cast<BaseSearchEngine>()
+		                                      .ToArray();
+		
+		return engines;
+	}
 }
 
 /// <summary>

SmartImage.Lib/Engines/Search/Base/WebClientSearchEngine.cs

@@ -14,9 +14,8 @@ protected WebClientSearchEngine(string baseUrl) : base(baseUrl) { }
 	public abstract override SearchEngineOptions EngineOption { get; }
 
 	public abstract override EngineSearchType SearchType { get; }
-
+	
 	protected override object GetProcessingObject(SearchResult sr) => ParseContent(sr.Origin);
-
 
 	protected virtual object ParseContent(SearchResultOrigin origin)
 	{

SmartImage.Lib/Engines/Upload/Base/BaseUploadEngine.cs

@@ -1,7 +1,9 @@
 using System;
+using System.Linq;
 using System.Threading.Tasks;
 using Kantan.Numeric;
 using Novus.OS;
+using Novus.Utilities;
 
 namespace SmartImage.Lib.Engines.Upload.Base;
 
@@ -43,4 +45,12 @@ protected void Verify(string file)
 			throw new ArgumentException($"File {file} is too large (max {MaxSize} MB) for {Name}");
 		}
 	}
+
+	public static BaseUploadEngine[] GetAllUploadEngines()
+	{
+		return typeof(BaseUploadEngine).GetAllSubclasses()
+		                               .Select(Activator.CreateInstance)
+		                               .Cast<BaseUploadEngine>()
+		                               .ToArray();
+	}
 }

SmartImage.Lib/Properties/Resources.Designer.cs

@@ -144,4 +144,7 @@
     <value>priority-engines</value>
     <comment>Config key: priority engines</comment>
   </data>
+  <data name="U_DeprecatedEngines" xml:space="preserve">
+    <value>https://raw.githubusercontent.com/Decimation/SmartImage/master/DEPRECATED_ENGINES</value>
+  </data>
 </root>

SmartImage.Lib/Properties/Resources.resx

@@ -107,18 +107,21 @@ public SearchClient(SearchConfig config)
 	/// <summary>
 	///     Reloads <see cref="Config" /> and <see cref="Engines" /> accordingly.
 	/// </summary>
-	public void Reload()
+	public void Reload(bool saveCfg = false)
 	{
 		if (Config.SearchEngines == SearchEngineOptions.None) {
 			Config.SearchEngines = SearchEngineOptions.All;
 		}
 
-		Engines = GetAllSearchEngines()
-		          .Where(e => Config.SearchEngines.HasFlag(e.EngineOption))
-		          .ToArray();
+		Engines = BaseSearchEngine.GetAllSearchEngines()
+		            .Where(e => Config.SearchEngines.HasFlag(e.EngineOption))
+		            .ToArray();
 
 		Trace.WriteLine($"{nameof(SearchClient)}: Config:\n{Config}", C_DEBUG);
 
+		if (saveCfg) {
+			Config.Save();
+		}
 	}
 
 	/// <summary>
@@ -339,22 +342,6 @@ public List<SearchResult> MaximizeResults<T>(Func<SearchResult, T> property)
 		return res;
 	}
 
-	public static BaseUploadEngine[] GetAllUploadEngines()
-	{
-		return typeof(BaseUploadEngine).GetAllSubclasses()
-		                               .Select(Activator.CreateInstance)
-		                               .Cast<BaseUploadEngine>()
-		                               .ToArray();
-	}
-
-	public static BaseSearchEngine[] GetAllSearchEngines()
-	{
-		return typeof(BaseSearchEngine).GetAllSubclasses()
-		                               .Select(Activator.CreateInstance)
-		                               .Cast<BaseSearchEngine>()
-		                               .ToArray();
-	}
-
 	/// <summary>
 	/// Fires when <see cref="GetResultContinueCallback"/> returns
 	/// </summary>