More work on logic

Author: Decimation

SmartImage.Lib 3/Engines/Impl/Search/TraceMoeEngine.cs

@@ -1,5 +1,6 @@
 using System.Collections;
 using System.Diagnostics;
+using System.Json;
 using Flurl;
 using Flurl.Http;
 using JetBrains.Annotations;
@@ -46,8 +47,10 @@ public override async Task<SearchResult> GetResultAsync(SearchQuery query, Cance
 				.AllowAnyHttpStatus()
 				.SetQueryParam("url", query.Upload, true);
 
-			var json = await request.GetStringAsync(cancellationToken: token);
+			var response = await request.GetAsync(cancellationToken: token);
 
+			var json = await response.GetStringAsync();
+			
 			var settings = new JsonSerializerSettings
 			{
 				Error = (sender, args) =>

SmartImage.Lib 3/SearchClient.cs

@@ -136,7 +136,7 @@ public async Task<SearchResult[]> RunSearchAsync(SearchQuery query, bool reload
 		}
 
 		OnComplete?.Invoke(this, results);
-
+		IsRunning  = false;
 		IsComplete = true;
 
 		if (Config.PriorityEngines == SearchEngineOptions.Auto) {

SmartImage.Lib 3/SearchQuery.cs

@@ -23,7 +23,7 @@ public sealed class SearchQuery : IDisposable, IEquatable<SearchQuery>
 	public UniSource Uni { get; }
 
 	[MN]
-	public Url Upload { get; private set; }
+	public Url Upload { get; internal set; }
 
 	public long Size { get; private set; }
 

SmartImage.UI/App.xaml.cs

@@ -75,11 +75,12 @@ private static void SendMessage(StartupEventArgs e)
 
 	public event PipeMessageCallback OnPipeMessage;
 
+	[DebuggerHidden]
 	private void StartServer()
 	{
 		PipeServer = new NamedPipeServerStream(IPC_PIPE_NAME, PipeDirection.In);
 
-		PipeThread = new Thread(() =>
+		PipeThread = new Thread([DebuggerHidden]() =>
 		{
 			while (true) {
 				PipeServer.WaitForConnection();

SmartImage.UI/MainWindow.Handlers.cs

@@ -6,16 +6,19 @@
 using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.Diagnostics;
+using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
+using System.Windows.Data;
 using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Threading;
+using Flurl;
 using Kantan.Text;
 using Kantan.Utilities;
 using Microsoft.VisualBasic.FileIO;
@@ -79,7 +82,7 @@ private void Tb_Input_Drop(object sender, DragEventArgs e)
 		var f1 = files1.FirstOrDefault();
 
 		if (!string.IsNullOrWhiteSpace(f1)) {
-			CurrentQueueItem = f1;
+			SetQueue(f1);
 
 		}
 
@@ -181,7 +184,9 @@ private void Btn_Restart_Click(object sender, RoutedEventArgs e)
 	{
 		var ctrl = Keyboard.Modifiers.HasFlag(ModifierKeys.Control);
 		Restart(ctrl);
-		Queue.Clear();
+		// ClearQueue();
+		// ClearResults(true);
+
 		e.Handled = true;
 	}
 
@@ -200,6 +205,8 @@ private void Btn_Cancel_Click(object sender, RoutedEventArgs e)
 		Cancel();
 		ReloadToken();
 		Lb_Queue.IsEnabled = true;
+		Btn_Run.IsEnabled  = true;
+		Btn_Remove.IsEnabled = true;
 		e.Handled          = true;
 	}
 
@@ -215,16 +222,16 @@ private void Btn_Remove_Click(object sender, RoutedEventArgs e)
 
 		var old = CurrentQueueItem;
 
-		if (old == null) {
+		if (old == null || old.IsPrimitive) {
 			goto ret;
 		}
 		var i = Queue.IndexOf(old);
 		Queue.Remove(old);
-
+		old?.Dispose();
 		// TrySeekQueue(q);
 		// AdvanceQueue(-1);
 
-		if (m_queries.TryRemove(old, out var sq)) {
+		/*if (m_queries.TryRemove(old, out var sq)) {
 			m_resultMap.TryRemove(sq, out var result);
 			
 			foreach (var r in result) {
@@ -233,28 +240,31 @@ private void Btn_Remove_Click(object sender, RoutedEventArgs e)
 			result.Clear();
 			/*foreach (var r in m_resultMap[sq]) {
 				r.Dispose();
-			}*/
+			}#1#
 
 			m_images.TryRemove(sq, out var img);
 			img = null;
-		}
+		}*/
+
 		// ClearQueryControls();
 
-		var i2 = i - 1;
+		/*var i2 = i - 1;
 
 		i2 = Math.Clamp(i2, 0, Queue.Count);
-		string n;
+		ResultModel n;
 
 		if (Queue.Count == 0)
-			n = String.Empty;
+			n = null;
 		else
 			n = Queue[i2];
-		CurrentQueueItem       = n;
-		
+		// SetQueue(n);
+
+		CurrentQueueItem = n;*/
 		// Lb_Queue.ItemsSource.  = n;
 		// AdvanceQueue(i-1);
 
-		sq?.Dispose();
+		// n?.Dispose();
+
 		GC.Collect();
 		GC.WaitForPendingFinalizers();
 		GC.Collect();
@@ -269,18 +279,19 @@ private void Btn_Delete_Click(object sender, RoutedEventArgs e)
 		ClearResults();
 		m_cbDispatch.Stop();
 		var old = CurrentQueueItem;
-		m_clipboardHistory.Remove(old);
-		CurrentQueueItem = String.Empty;
-		m_queries.TryRemove(old, out var q);
-		m_resultMap.TryRemove(Query, out var x);
-		Query.Dispose();
+		m_clipboardHistory.Remove(old.Value);
+		old.Dispose();
+		// CurrentQueueItem = null;
+		// m_queries.TryRemove(old, out var q);
+		// m_resultMap.TryRemove(Query, out var x);
+		// Query.Dispose();
 		Queue.Remove(old);
 		Img_Preview.Source = m_image = null;
-		Query              = SearchQuery.Null;
+		// Query              = SearchQuery.Null;
 		bool ok;
 
 		try {
-			VBFS.DeleteFile(old, UIOption.OnlyErrorDialogs, RecycleOption.SendToRecycleBin);
+			VBFS.DeleteFile(old.Value, UIOption.OnlyErrorDialogs, RecycleOption.SendToRecycleBin);
 			// FileSystem.SendFileToRecycleBin(old);
 			ok = true;
 		}
@@ -290,8 +301,8 @@ private void Btn_Delete_Click(object sender, RoutedEventArgs e)
 		}
 
 		m_cbDispatch.Start();
-		Btn_Delete.IsEnabled = !ok;
-		Btn_Remove.IsEnabled = !ok;
+		Btn_Delete.IsEnabled = ok;
+		Btn_Remove.IsEnabled = ok;
 		AdvanceQueue();
 		// FileSystem.SendFileToRecycleBin(InputText);
 		e.Handled = true;
@@ -390,8 +401,9 @@ private void Lv_Results_KeyDown(object sender, KeyEventArgs e)
 
 				CurrentResultItem.Dispose();
 
-				Results.Remove(CurrentResultItem);
+				// Results.Remove(CurrentResultItem);
 
+				CurrentQueueItem.Results.Remove(CurrentResultItem);
 				Img_Preview.Source = m_image;
 				break;
 			case Key.C when ctrl:
@@ -538,7 +550,7 @@ private void Wnd_Main_Loaded(object sender, RoutedEventArgs e)
 		}
 
 		// todo: not used for now
-		// m_trDispatch.Start();
+		m_trDispatch.Start();
 		e.Handled = true;
 		Debug.WriteLine("Main loaded");
 
@@ -703,8 +715,8 @@ private void Btn_Filter_Click(object sender, RoutedEventArgs e)
 
 	private void Tb_Search_TextChanged(object sender, TextChangedEventArgs e)
 	{
-		if (string.IsNullOrWhiteSpace(Tb_Search.Text) && m_resultMap.TryGetValue(Query, out var value)) {
-			Lv_Results.ItemsSource = value;
+		if (string.IsNullOrWhiteSpace(Tb_Search.Text)) /*&& m_resultMap.TryGetValue(Query, out var value))*/ {
+			Lv_Results.ItemsSource = CurrentQueueItem.Results; //todo
 		}
 		else {
 			var selected = (string) Cb_SearchFields.SelectionBoxItem;
@@ -726,4 +738,27 @@ private void Tb_Search_TextChanged(object sender, TextChangedEventArgs e)
 
 		e.Handled = true;
 	}
+}
+[ValueConversion(typeof(Url), typeof(String))]
+public class UrlConverter : IValueConverter
+{
+	public object Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
+	{
+		if (value == null) {
+			return null;
+		}
+		var date = (Url)value;
+		return date.ToString();
+	}
+
+	public object ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
+	{
+		if (value == null) {
+			return null;
+		}
+		string   strValue = value as string;
+		Url resultDateTime;
+
+		return (Url) strValue;
+	}
 }

SmartImage.UI/MainWindow.State.cs

@@ -91,4 +91,49 @@ public bool IsChecked
 			OnPropertyChanged();
 		}
 	}
+
+	public ResultModel? Find(string s)
+	{
+		var x = Queue.FirstOrDefault(x => x.Value == s);
+
+		return x;
+	}
+
+	public void ClearQueue()
+	{
+		lock (Queue) {
+			foreach (var kv in Queue) {
+				kv.Dispose();
+			}
+			Lb_Queue.Dispatcher.Invoke(() =>
+			{
+				Lb_Queue.SelectedIndex = -1;
+				Queue.Clear();
+				Queue.Insert(0, new ResultModel());
+				Lb_Queue.SelectedIndex = 0;
+			});
+			
+			// CurrentQueueItem       = new ResultModel();
+
+			/*var item = new ResultModel();
+			Queue.Add(item);
+			CurrentQueueItem = item;*/
+		}
+	}
+
+	public bool SetQueue(string s)
+	{
+		var x = Find(s);
+
+		var b = x == null;
+
+		if (b) {
+			x = new ResultModel(s);
+			Queue.Add(x);
+		}
+
+		CurrentQueueItem = x;
+
+		return b;
+	}
 }