Correct IQDB max filesize; minor UI fixes

Author: Decimation

SmartImage 3/Modes/GuiMode.cs

@@ -373,6 +373,7 @@ public override void Dispose()
 
 	protected override void ProcessArg(object? val, IEnumerator e)
 	{
+
 		if (val is string s && s == Resources.Arg_Input) {
 			e.MoveNext();
 			var s2 = e.Current?.ToString();
@@ -385,15 +386,15 @@ protected override void ProcessArg(object? val, IEnumerator e)
 
 	#endregion
 
+	//note: ideally some of these computations aren't necessary and can be stored as respective fields but this is to ensure program correctness
+
 	private bool IsQueryReady()
 	{
-		//note: ideally this computation isn't necessary and can be stored as a bool field but this is to ensure program correctness
 		return Query != SearchQuery.Null && Url.IsValid(Query.Upload);
 	}
 
 	private bool IsInputValidIndicator()
 	{
-		//note: ideally this computation isn't necessary and can be stored as a bool field but this is to ensure program correctness
 		return SearchQuery.IsIndicatorValid(Tf_Input.Text.ToString());
 	}
 
@@ -402,12 +403,6 @@ private void ApplyConfig()
 		Integration.KeepOnTop(Config.OnTop);
 	}
 
-	public void SetInfoText(string s)
-	{
-		Lbl_InputInfo2.Text = $"{s}";
-		Lbl_InputInfo2.SetNeedsDisplay();
-	}
-
 	internal void SetInputText(ustring s)
 	{
 		Tf_Input.Text = s;
@@ -476,7 +471,8 @@ private bool ClipboardCallback(MainLoop c)
 			 */
 			if (Integration.ReadClipboard(out var str) && !IsInputValidIndicator() && !m_clipboard.Contains(str)) {
 				SetInputText(str);
-				Lbl_InputOk.Text = Values.Clp;
+				// Lbl_InputOk.Text   = Values.Clp;
+				Lbl_InputInfo.Text = $"Clipboard data";
 
 				m_clipboard.Add(str);
 			}
@@ -499,6 +495,10 @@ private bool ClipboardCallback(MainLoop c)
 	private void OnClear()
 	{
 		Tf_Input.DeleteAll();
+		Lbl_InputOk.Text = Values.NA;
+		Lbl_InputOk.SetNeedsDisplay();
+		Lbl_InputInfo.Text = ustring.Empty;
+		Lbl_InputInfo2.Text = ustring.Empty;
 	}
 
 	private void OnConfigDialog()
@@ -630,32 +630,39 @@ void ReloadDialog()
 
 	private void ClearControls()
 	{
-		try {
-			Tf_Input.DeleteAll();
-			Tf_Input.ClearHistoryChanges();
-			Query = SearchQuery.Null;
+		Tf_Input.DeleteAll();
+		Tf_Input.ClearHistoryChanges();
 
-			Lbl_InputOk.Text = Values.NA;
-			Dt_Results.Clear();
+		Query = SearchQuery.Null;
+		
+		Lbl_InputOk.Text = Values.NA;
+		Lbl_InputOk.SetNeedsDisplay();
 
-			IsReady.Reset();
-			ResultCount         = 0;
-			Pbr_Status.Fraction = 0;
+		Dt_Results.Clear();
 
-			Lbl_InputInfo.Text   = ustring.Empty;
-			Lbl_QueryUpload.Text = ustring.Empty;
-			Lbl_InputInfo2.Text  = ustring.Empty;
-			Lbl_Status.Text      = ustring.Empty;
+		IsReady.Reset();
+		ResultCount         = 0;
+		Pbr_Status.Fraction = 0;
 
-			Tv_Results.SetNeedsDisplay();
-			Tf_Input.SetFocus();
-			Tf_Input.EnsureFocus();
-			Btn_Cancel.Enabled = false;
+		Lbl_InputInfo.Text   = ustring.Empty;
+		Lbl_QueryUpload.Text = ustring.Empty;
+		Lbl_InputInfo2.Text  = ustring.Empty;
+		Lbl_Status.Text      = ustring.Empty;
+
+		Tv_Results.SetNeedsDisplay();
+		Tf_Input.SetFocus();
+		Tf_Input.EnsureFocus();
+		Btn_Cancel.Enabled = false;
+
+		/*Application.MainLoop.Invoke(() =>
+		{ });*/
+
+		/*try {
 			// Application.Refresh();
 		}
 		catch (Exception e) {
 			Debug.WriteLine($"{e.Message}", nameof(ClearControls));
-		}
+		}*/
 	}
 
 	private void OnRestart()
@@ -682,6 +689,8 @@ private void OnRestart()
 		Tf_Input.SetFocus();
 		Tf_Input.EnsureFocus();
 
+		/*Application.MainLoop.Invoke(() =>
+		{ });*/
 	}
 
 	private void OnCellActivated(TableView.CellActivatedEventArgs args)

SmartImage.Lib 3 Unit Test/UnitTest.cs

@@ -186,7 +186,7 @@ public async Task SearchQuery_Test2(string s)
 
 	public async Task Test3(string s)
 	{
-		var o              = await QFileHandle.GetHandleAsync(s);
+		var o              = await UniFile.GetHandleAsync(s);
 		var o2 = await SearchQuery.TryCreateAsync(s);
 		Assert.Pass();
 	}

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

@@ -94,7 +94,7 @@ private static SearchResultItem ParseResult(IHtmlCollection<IElement> tr, Search
 		else {
 			uri = null;
 		}
-		
+
 		var result = new SearchResultItem(r)
 		{
 			Url         = uri,
@@ -108,9 +108,10 @@ private static SearchResultItem ParseResult(IHtmlCollection<IElement> tr, Search
 		return result;
 	}
 
+	public const int MAX_FILE_SIZE = 8192 * 1024; // NOTE: assuming IQDB uses kilobytes instead of kibibytes
+
 	private async Task<IDocument> GetDocumentAsync(SearchQuery query)
 	{
-		const int MAX_FILE_SIZE = 0x800000;
 
 		if (query.Size > MAX_FILE_SIZE) {
 			return null;

SmartImage.Lib 3/Engines/Search/SauceNaoEngine.cs

@@ -40,6 +40,10 @@ public sealed class SauceNaoEngine : BaseSearchEngine, IClientSearchEngine
 	 * https://github.com/luk1337/SauceNAO/blob/master/app/src/main/java/com/luk/saucenao/MainActivity.java
 	 */
 
+	public string EndpointUrl => BASE_ENDPOINT;
+
+	public FlurlClient Client { get; }
+
 	public SauceNaoEngine(string authentication) : base(BASIC_RESULT)
 	{
 		Authentication = authentication;
@@ -467,14 +471,6 @@ private sealed class SauceNaoDataResult
 
 		public string Creator { get; internal set; }
 	}
-
-	#region Implementation of IClientSearchEngine
-
-	public string EndpointUrl => BASE_ENDPOINT;
-
-	public FlurlClient Client { get; }
-
-	#endregion
 }
 
 public enum SauceNaoSiteIndex

SmartImage.Lib 3/SearchClient.cs

@@ -72,10 +72,7 @@ public async Task<List<SearchResult>> RunSearchAsync(SearchQuery query, Cancella
 
 				var url1 = result.Best?.Url ?? result.RawUrl;
 
-				if (url1 is { } && Url.IsValid(url1)) {
-					HttpUtilities.OpenUrl(url1);
-				}
-
+				HttpUtilities.TryOpenUrl(url1);
 			}
 
 			results.Add(result);
@@ -104,7 +101,7 @@ public async Task<List<SearchResult>> RunSearchAsync(SearchQuery query, Cancella
 			try {
 				var result = results.SelectMany(r => r.Results)
 				                    .Where(r => Url.IsValid(r.Url))
-				                    .OrderByDescending(r => r.Similarity)
+				                    .OrderByDescending(r => r.Score)
 				                    .First();
 
 				Debug.WriteLine($"{result}");

SmartImage.Lib 3/SearchQuery.cs

@@ -4,6 +4,7 @@
 using System.Diagnostics;
 using System.Runtime.CompilerServices;
 using Flurl.Http;
+using Kantan.Net.Utilities;
 using Novus.FileTypes;
 using Kantan.Text;
 using SmartImage.Lib.Engines.Upload;
@@ -12,6 +13,7 @@
 namespace SmartImage.Lib;
 
 //todo: DynamicResource
+
 public sealed class SearchQuery : IDisposable
 {
 	public string Value { get; }
@@ -54,7 +56,10 @@ public static async Task<SearchQuery> TryCreateAsync(string value)
 		}
 		else {
 			try {
-				var res = await value.AllowAnyHttpStatus()
+				var res = await value.AllowAnyHttpStatus().WithHeaders(new
+				                     {
+										 User_Agent=HttpUtilities.UserAgent
+				                     })
 				                     .GetAsync();
 
 				/*if (!res.ResponseMessage.IsSuccessStatusCode) {

SmartImage.Lib 3/SearchResult.cs

@@ -39,9 +39,17 @@ public sealed class SearchResult : IDisposable
 	[CBN]
 	public string Overview { get; internal set; }
 
+	[MN]
 	public SearchResultItem Best
 	{
-		get { return Results.MaxBy(r => r.Score); }
+		get
+		{
+			if (!Results.Any()) {
+				return null;
+			}
+
+			return Results.MaxBy(r => r.Score);
+		}
 	}
 
 	internal SearchResult(BaseSearchEngine bse)