Queue mode working

Author: Decimation

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

@@ -123,7 +123,7 @@ private async void Run_Clicked()
 		await RunMainAsync();
 	}
 
-	private void Queue_Clicked()
+	private void Queue_Dialog()
 	{
 		var d = new Dialog()
 		{
@@ -146,7 +146,7 @@ private void Queue_Clicked()
 		{
 			Width  = Dim.Fill(),
 			Height = Dim.Fill(),
-			Y      =Pos.Bottom(tf)
+			Y      = Pos.Bottom(tf)
 		};
 
 		var btnRm = new Button("Remove")
@@ -163,6 +163,7 @@ private void Queue_Clicked()
 		btnRm.Clicked += () =>
 		{
 			var cpy2 = lv.Source.ToList();
+
 			if (lv.SelectedItem < cpy2.Count && lv.SelectedItem >= 0) {
 				var i = (string) cpy2[lv.SelectedItem];
 				Debug.WriteLine($"{i}");
@@ -179,12 +180,28 @@ private void Queue_Clicked()
 
 		btnRmAll.Clicked += () =>
 		{
-			lv.Source = new ListWrapper(Enumerable.Empty<string>().ToList());
+			lv.Source = new ListWrapper(Array.Empty<string>());
 			Queue.Clear();
 			lv.SetFocus();
 		};
 
-		d.Add(tf,lv);
+		tf.TextChanging += a =>
+		{
+
+			var s = a.NewText.ToString();
+
+			if (SearchQuery.IsValidSourceType(s)) {
+				Queue.Enqueue(s);
+				lv.Source = new ListWrapper(Queue.ToList());
+				tf.DeleteAll();
+				tf.Text  = ustring.Empty;
+				a.Cancel = true;
+				tf.SetFocus();
+				tf.SetNeedsDisplay();
+			}
+		};
+
+		d.Add(tf, lv);
 		d.AddButton(btnRm);
 		d.AddButton(btnRmAll);
 
@@ -196,7 +213,7 @@ private void Queue_Checked(bool b)
 		QueueMode = !b;
 
 		Btn_Queue.Enabled = QueueMode;
-		Btn_Next.Enabled = QueueMode;
+		Btn_Next.Enabled  = QueueMode;
 	}
 
 	/// <summary>
@@ -227,16 +244,21 @@ private void Browse_Clicked()
 			foreach (string fs in files) {
 				Queue.Enqueue(fs);
 			}
+
+			NextQueue();
 		}
 
-		var f = files.FirstOrDefault(); //todo
+		else {
+			var f = files.FirstOrDefault(); //todo
 
-		if (!string.IsNullOrWhiteSpace(f)) {
-			Tf_Input.DeleteAll();
-			Debug.WriteLine($"Picked file: {f}", nameof(Browse_Clicked));
+			if (!string.IsNullOrWhiteSpace(f)) {
+				Tf_Input.DeleteAll();
+				Debug.WriteLine($"Picked file: {f}", nameof(Browse_Clicked));
 
-			SetInputText(f);
-			Btn_Run.SetFocus();
+				SetInputText(f);
+				Btn_Run.SetFocus();
+
+			}
 
 		}
 
@@ -330,12 +352,17 @@ private void Delete_Clicked()
 	private void Next_Clicked()
 	{
 		Restart_Clicked(true);
+		NextQueue();
+	}
+
+	private void NextQueue()
+	{
 		var tryDequeue = Queue.TryDequeue(out var n);
+
 		if (tryDequeue) {
 			// SetQuery(n);
 
 			SetInputText(n);
 		}
 	}
-
 }

SmartImage 3/Mode/Shell/ShellMode.cs

@@ -417,7 +417,7 @@ public ShellMode(string[] args)
 		Tf_Input.TextChanging    += Input_TextChanging;
 		Btn_Delete.Clicked       += Delete_Clicked;
 		Cb_Queue.Toggled         += Queue_Checked;
-		Btn_Queue.Clicked        += Queue_Clicked;
+		Btn_Queue.Clicked        += Queue_Dialog;
 		Btn_Next.Clicked         += Next_Clicked;
 
 		Lbl_QueryUpload.Clicked += () =>
@@ -547,13 +547,20 @@ private void OnCompleteWin(object sender, SearchResult[] results)
 
 	#endregion
 
-	public void Close()
+	private async Task<object?> RunSearchAsync()
 	{
-		if (Compat.IsWin) {
-			Player.Dispose();
-		}
+		PreSearch();
 
-		Application.Shutdown();
+		Status = null;
+		IsReady.WaitOne();
+
+		var results = await Client.RunSearchAsync(Query, m_token.Token);
+
+		Status = false;
+
+		PostSearch();
+
+		return null;
 	}
 
 	private void ProcessArgs()
@@ -704,22 +711,6 @@ private async Task<bool> SetQuery(ustring text)
 		return true;
 	}
 
-	private async Task<object?> RunSearchAsync()
-	{
-		PreSearch();
-
-		Status = null;
-		IsReady.WaitOne();
-
-		var results = await Client.RunSearchAsync(Query, m_token.Token);
-
-		Status = false;
-
-		PostSearch();
-
-		return null;
-	}
-
 	private bool ClipboardCallback(MainLoop c)
 	{
 		// Debug.WriteLine($"executing timeout {nameof(ClipboardCallback)} {c} {UseClipboard} {Clipboard.SequenceNumber}");
@@ -793,16 +784,6 @@ private bool ClipboardCallback(MainLoop c)
 		// return UseClipboard;
 	}
 
-	public void Dispose()
-	{
-		Client.Dispose();
-		Query.Dispose();
-		m_token.Dispose();
-		m_tokenu.Dispose();
-		Queue.Clear();
-		m_results.Clear();
-	}
-
 	private async Task RunMainAsync()
 	{
 		Pbr_Status.BidirectionalMarquee = false;
@@ -862,4 +843,23 @@ private void Clear()
 		// Queue.Clear();
 		m_results.Clear();
 	}
+
+	public void Close()
+	{
+		if (Compat.IsWin) {
+			Player.Dispose();
+		}
+
+		Application.Shutdown();
+	}
+
+	public void Dispose()
+	{
+		Client.Dispose();
+		Query.Dispose();
+		m_token.Dispose();
+		m_tokenu.Dispose();
+		Queue.Clear();
+		m_results.Clear();
+	}
 }

SmartImage.Lib 3/Engines/WebSearchEngine.cs

@@ -18,7 +18,16 @@ public override async Task<SearchResult> GetResultAsync(SearchQuery query, Cance
 		token ??= CancellationToken.None;
 		var res = await base.GetResultAsync(query, token);
 
-		IDocument doc = await GetDocumentAsync(res.RawUrl, query: query, token: token.Value);
+		IDocument doc;
+
+		try {
+			doc = await GetDocumentAsync(res.RawUrl, query: query, token: token.Value);
+		}
+		catch (Exception e) {
+			Debug.WriteLine($"{e.Message}", nameof(GetResultAsync));
+			doc = null;
+
+		}
 
 		if (doc is not { }) {
 			res.Status = SearchResultStatus.Failure;