v3.0.3 RC* (fixes)

Author: Decimation

SmartImage 3/App/Integration.cs

@@ -362,6 +362,11 @@ public static string[] OpenFile(OpenFileNameFlags flags = 0)
 				files.Add(pd);
 				goto ret;
 			}
+			else {
+				if (File.Exists(pd)) {
+					pd = Path.GetDirectoryName(pd);
+				}
+			}
 
 			var ofs  = (ofn.nFileOffset * 2);
 			var ptr1 = (((byte*) p1p.Pointer) + ofs);

SmartImage 3/Mode/Shell/Assets/UI.Styles.cs

@@ -123,7 +123,11 @@ internal static partial class UI
 		Normal = Atr_Red_Black,
 		Focus  = Atr_BrightRed_Black
 	};
-
+	internal static readonly ColorScheme Cs_Lbl4 = new()
+	{
+		Normal = Atr_Red_Black,
+		HotNormal = Atr_Red_Black,
+	};
 	internal static readonly ColorScheme Cs_Win2 = new()
 	{
 		Normal = Atr_White_Black,

SmartImage 3/Mode/Shell/ShellMode.Handlers.cs

@@ -163,6 +163,7 @@ private void Browse_Clicked()
 			foreach (string fs in files) {
 				Queue.Enqueue(fs);
 			}
+
 			if (!IsQueryReady()) {
 				NextQueue();
 
@@ -227,11 +228,13 @@ private void Cancel_Clicked()
 	{
 		m_token.Cancel();
 		m_tokenu.Cancel();
+		Lbl_Status2.ColorScheme = UI.Cs_Lbl4;
 		Lbl_Status2.Text = R2.Inf_Cancel;
 		Lbl_Status2.SetNeedsDisplay();
 		Btn_Restart.Enabled = true;
 		Application.MainLoop.RemoveIdle(m_runIdleTok);
 		Tv_Results.SetFocus();
+		Lbl_Status2.ColorScheme = UI.Cs_Lbl1;
 
 	}
 
@@ -282,11 +285,11 @@ private void Delete_Clicked()
 
 	private void Next_Clicked()
 	{
-		if (!Client.IsComplete) {
+		if (Client.IsRunning) {
 			Cancel_Clicked();
 		}
 
-		Dispose(false);
+		// Dispose(false);
 
 		Restart_Clicked(true);
 

SmartImage 3/Mode/Shell/ShellMode.cs

@@ -478,8 +478,6 @@ private void PostSearch()
 			Btn_Cancel.Enabled = false;
 		}
 
-		Lbl_Status2.ColorScheme = UI.Cs_Lbl1_Success;
-		Lbl_Status2.Text        = "Complete";
 	}
 
 	#region SearchClient callbacks
@@ -525,8 +523,11 @@ private void OnResult(object o, SearchResult result)
 
 	private void OnComplete(object sender, SearchResult[] results)
 	{
-		Btn_Restart.Enabled = true;
-		Btn_Cancel.Enabled  = false;
+		Btn_Restart.Enabled     = true;
+		Btn_Cancel.Enabled      = false;
+		Lbl_Status2.ColorScheme = UI.Cs_Lbl1_Success;
+		Lbl_Status2.Text        = R2.Inf_Complete;
+
 	}
 
 	[SupportedOSPlatform(Compat.OS)]
@@ -627,11 +628,7 @@ private async Task<bool> SetQuery(ustring text)
 		try {
 			Pbr_Status.Pulse();
 
-			Lbl_Status2.WithScheme(_ =>
-			{
-				Lbl_Status2.Text = $"Verifying...";
-				return;
-			}, UI.Cs_Lbl1_Neutral);
+			Lbl_Status2.Text = $"Verifying...";
 
 			lock (Btn_Run) {
 				Btn_Run.Enabled = false;

SmartImage 3/Resources.Designer.cs

@@ -157,4 +157,7 @@
   <data name="Arg_NoUI" xml:space="preserve">
     <value>--noui</value>
   </data>
+  <data name="Inf_Complete" xml:space="preserve">
+    <value>Complete</value>
+  </data>
 </root>

SmartImage 3/Resources.resx

@@ -139,7 +139,7 @@
   </ItemGroup>
   <PropertyGroup>
     <PackageId>SmartImage</PackageId>
-    <Version>3.0.2</Version>
+    <Version>3.0.3</Version>
     <Authors>Read Stanton (Decimation)</Authors>
     <PackageTags>Image reverse search identification source sauce</PackageTags>
     <RepositoryUrl>https://github.com/Decimation/SmartImage</RepositoryUrl>

SmartImage 3/SmartImage.csproj

@@ -34,12 +34,15 @@ public sealed class SearchClient : IDisposable
 
 	public bool ConfigApplied { get; private set; }
 
+	public bool IsRunning { get; private set;  }
+
 	private static readonly ILogger Logger = LogUtil.Factory.CreateLogger(nameof(SearchClient));
 
 	public SearchClient(SearchConfig cfg)
 	{
 		Config        = cfg;
 		ConfigApplied = false;
+		IsRunning     = false;
 		LoadEngines();
 	}
 
@@ -88,6 +91,7 @@ static SearchClient()
 	public async Task<SearchResult[]> RunSearchAsync(SearchQuery query, CancellationToken token = default,
 	                                                 [CBN] IProgress<int> p = null)
 	{
+		IsRunning = true;
 		if (!ConfigApplied) {
 			await ApplyConfigAsync();
 		}
@@ -141,6 +145,8 @@ public async Task<SearchResult[]> RunSearchAsync(SearchQuery query, Cancellation
 
 		}
 
+		IsRunning = false;
+
 		return results;
 	}
 
@@ -283,5 +289,6 @@ public void Dispose()
 
 		ConfigApplied = false;
 		IsComplete    = false;
+		IsRunning     = false;
 	}
 }