v3.0.3 RC 2

Author: Decimation

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

@@ -71,11 +71,17 @@ private async void Input_TextChanging(TextChangingEventArgs tc)
 		var sourceType = SearchQuery.IsValidSourceType(text);
 
 		if (sourceType) {
+			// m_upload.WaitOne();
+			/*if (_inputVerifying) {
+				return;
+			}*/
+
 			var ok = await TrySetQueryAsync(text);
 
 			Btn_Run.Enabled = ok;
 			Debug.WriteLine($"{nameof(Input_TextChanging)} :: ok");
 
+			// m_upload.Release();
 			if (ok && Config.AutoSearch && !Client.IsRunning) {
 				Run_Clicked();
 			}

SmartImage 3/Mode/Shell/ShellMode.cs

@@ -429,11 +429,20 @@ public ShellMode(string[] args)
 		Btn_Cancel.Clicked       += Cancel_Clicked;
 		Btn_Browse.Clicked       += Browse_Clicked;
 		Lbl_InputInfo.Clicked    += InputInfo_Clicked;
-		Tf_Input.TextChanging    += Input_TextChanging;
-		Btn_Delete.Clicked       += Delete_Clicked;
-		Cb_Queue.Toggled         += Queue_Checked;
-		Btn_Queue.Clicked        += Queue_Dialog;
-		Btn_Next.Clicked         += Next_Clicked;
+
+		Tf_Input.TextChanging += delegate(TextChangingEventArgs eventArgs)
+		{
+			if (_inputVerifying) {
+				return;
+			}
+
+			Input_TextChanging(eventArgs);
+		};
+
+		Btn_Delete.Clicked += Delete_Clicked;
+		Cb_Queue.Toggled   += Queue_Checked;
+		Btn_Queue.Clicked  += Queue_Dialog;
+		Btn_Next.Clicked   += Next_Clicked;
 		// Btn_Reload.Clicked       += Reload_Clicked;
 
 		Lbl_QueryUpload.Clicked += () =>
@@ -631,8 +640,11 @@ internal void SetInputText(ustring s)
 
 	}
 
+	private Semaphore m_upload = new Semaphore(0, 1);
+
 	private async Task<bool> TrySetQueryAsync(ustring text)
 	{
+
 		// TODO: IMPROVE
 
 		// Btn_Run.Enabled = false;
@@ -657,7 +669,7 @@ private async Task<bool> TrySetQueryAsync(ustring text)
 			Lbl_Status2.Text     = ustring.Empty;
 			Btn_Delete.Enabled   = false;
 			Btn_Reload.Enabled   = false;
-			_inputVerifying     = false;
+			_inputVerifying      = false;
 			return false;
 		}
 
@@ -679,7 +691,7 @@ private async Task<bool> TrySetQueryAsync(ustring text)
 		Tf_Input.ReadOnly  = true;
 		Btn_Delete.Enabled = true;
 		Btn_Reload.Enabled = true;
-		_inputVerifying   = false;
+		_inputVerifying    = false;
 
 		return true;
 	}
@@ -764,6 +776,8 @@ private async Task<bool> TryUploadQueryAsync(SearchQuery sq)
 
 	#endregion
 
+	internal static bool _clipboardFile;
+
 	private bool ClipboardCallback(MainLoop c)
 	{
 		// Debug.WriteLine($"executing timeout {nameof(ClipboardCallback)} {c} {UseClipboard} {Clipboard.SequenceNumber}");
@@ -810,8 +824,11 @@ private bool ClipboardCallback(MainLoop c)
 				}
 
 				Debug.WriteLine($"{str}");*/
+				_clipboardFile = true;
 
 				SetInputText(str);
+				_clipboardFile = false;
+
 				// Lbl_InputOk.Text   = UI.Clp;
 				Lbl_InputInfo.Text = R2.Inf_Clipboard;
 
@@ -827,6 +844,7 @@ private bool ClipboardCallback(MainLoop c)
 			r1:
 			c.RemoveTimeout(m_cbCallbackTok);
 			m_cbCallbackTok = c.AddTimeout(TimeoutTimeSpan, ClipboardCallback);
+			_clipboardFile  = false;
 			return false;
 		}
 		catch (Exception e) {
@@ -836,6 +854,7 @@ private bool ClipboardCallback(MainLoop c)
 		finally { }
 
 		r2:
+		_clipboardFile = false;
 		// Debug.WriteLine($"{UseClipboard}");
 		return true;
 		// return UseClipboard;
@@ -867,6 +886,7 @@ private async Task RunMainAsync()
 
 	private void Clear()
 	{
+		_inputVerifying   = false;
 		Tf_Input.ReadOnly = false;
 
 		Tf_Input.DeleteAll();
@@ -903,7 +923,7 @@ private void Clear()
 		m_results.Clear();
 
 		_keyPressHandling = false;
-		_inputVerifying  = false;
+		_inputVerifying   = false;
 	}
 
 	public void Close()

SmartImage.Lib 3/Engines/Impl/Upload/BaseUploadEngine.cs

@@ -57,7 +57,7 @@ protected void Verify(string file)
 	public static readonly BaseUploadEngine[] All =
 		ReflectionHelper.CreateAllInAssembly<BaseUploadEngine>(TypeProperties.Subclass).ToArray();
 
-	public static BaseUploadEngine Default { get; set; } = new CatboxEngine();
+	public static BaseUploadEngine Default { get; set; } = new LitterboxEngine();
 }
 
 public abstract class BaseCatboxEngine : BaseUploadEngine

SmartImage.Lib 3/Engines/Impl/Upload/CatboxEngine.cs

@@ -11,7 +11,7 @@ public sealed class CatboxEngine : BaseCatboxEngine
 
 	public CatboxEngine() : base("https://catbox.moe/user/api.php")
 	{
-		Paranoid = true;
+		// Paranoid = true;
 	}
 
 }

SmartImage.Lib 3/SearchQuery.cs

@@ -43,18 +43,6 @@ public static async Task<SearchQuery> TryCreateAsync(string value)
 	{
 		var uf = await UniSource.TryGetAsync(value, whitelist: FileType.Image);
 
-		if (uf != null) {
-			if (uf.IsFile) {
-				var f  = uf.Value.ToString();
-				var f2 = await test(f);
-				Debug.WriteLine($"replacing {f} with {f2}");
-				if (f!=f2) {
-					uf.Dispose();
-					uf = await UniSource.TryGetAsync(f2, whitelist: FileType.Image);
-				}
-			}
-		}
-
 		var sq = new SearchQuery(uf)
 			{ };
 
@@ -213,25 +201,4 @@ public override int GetHashCode()
 
 		return (t, b);
 	}
-
-	public static async Task<string> test(string fi)
-	{
-		using var im = await SixLabors.ImageSharp.Image.LoadAsync(fi);
-		var       m  = im.Metadata;
-
-		string fn = fi;
-
-		if (m.XmpProfile is { } || m.ExifProfile is { }) {
-			Debug.WriteLine($"metadata found");
-			m.XmpProfile  = null;
-			m.ExifProfile = null;
-			fn            = Path.GetFileNameWithoutExtension(fi) + "_1" + Path.GetExtension(fi);
-
-			await im.SaveAsync(fn);
-		}
-		else { }
-
-		return fn;
-	}
-	
 }