Finishing touches to Rdx 1.2.0

Author: Decimation

SmartImage.Lib/Cookies/BrowserCookiesSource.cs

@@ -33,7 +33,7 @@ public class BrowserCookiesSource : ICookiesSource
 
 		}
 
-		return null;
+		return ListCookiesSource.Default;
 	});
 
 	internal BrowserCookiesSource(BaseCookiesDatabaseReader reader)

SmartImage.Lib/Engines/BaseSearchEngine.cs

@@ -4,6 +4,7 @@
 
 using System.Runtime.CompilerServices;
 using Flurl.Http;
+using Flurl.Http.Configuration;
 using Kantan.Net.Utilities;
 using Microsoft.Extensions.Logging;
 using Microsoft.Net.Http.Headers;
@@ -46,11 +47,12 @@ public abstract class BaseSearchEngine : IDisposable, IEquatable<BaseSearchEngin
 	[JI]
 	protected virtual string[] ErrorBodyMessages { get; }
 
-	protected static FlurlClient Client { get; }
+	protected static IFlurlClient Client {get;}
+
 
 	static BaseSearchEngine()
 	{
-		Client = (FlurlClient) FlurlHttp.Clients.GetOrAdd(nameof(BaseSearchEngine), null, static builder =>
+		Client = FlurlHttp.Clients.GetOrAdd(nameof(BaseSearchEngine), null, static builder =>
 		{
 			builder.Headers.AddOrReplace(HeaderNames.UserAgent, R1.UserAgent1);
 
@@ -67,18 +69,18 @@ static BaseSearchEngine()
 
 			});
 
-			builder.AddMiddleware(static () => new HttpLoggingHandler(Logger));
+			// builder.AddMiddleware(static () => new HttpLoggingHandler(Logger));
 
 		});
 	}
 
 	protected BaseSearchEngine([NN] Url url)
 	{
-		Url           = url;
+		Url               = url;
 		Timeout           = TimeSpan.FromSeconds(30);
 		ErrorBodyMessages = [];
-		MaxLength           = null;
-
+		MaxLength         = null;
+		
 	}
 
 

SmartImage.Lib/Engines/Search/Ascii2DEngine.cs

@@ -52,6 +52,7 @@ public Ascii2DEngine() : base(MAIN_URL)
 		MaxLength  = 10_000_000;
 		Jar        = new CookieJar();
 		m_fsClient = new FlareSolverrClient();
+		
 	}
 
 
@@ -148,7 +149,7 @@ protected override async Task<IDocument> GetSourceAsync(SearchResult sr, SearchQ
 
 				try {
 					var msg = new HttpRequestMessage(HttpMethod.Get, origin);
-
+					
 					var fsr     = await m_fsClient.Clearance.Solverr.SolveAsync(msg).ConfigureAwait(false);
 					var cookies = fsr.Solution.Cookies;
 					var newUrl  = fsr.Solution.Url;

SmartImage.Lib/Images/ImageScanner.cs

@@ -292,8 +292,7 @@ public static async ValueTask<IFlurlResponse> GetResponseAsync(Url value, Cancel
 			request = new FlurlRequest(value) { };
 		}
 
-		var response = await request
-			               .OnError(act => { act.ExceptionHandled = true; })
+		var response = await request.OnError(act => { act.ExceptionHandled = true; })
 			               .GetAsync(cancellationToken: ct);
 
 		return response;

SmartImage.Lib/SearchClient.cs

@@ -59,7 +59,7 @@ public SearchClient(SearchConfig cfg)
 		Config        = cfg;
 		ConfigApplied = false;
 		IsRunning     = false;
-		Engines       = Config.GetSelectedEngines();
+		Engines       = SearchConfig.GetSelectedEngines(Config.SearchEngines);
 	}
 
 	static SearchClient() { }
@@ -132,6 +132,7 @@ public async Task<bool> RunSearchAsync(SearchQuery query, CancellationToken toke
 		if (Config.PriorityEngines == SearchEngineOptions.Auto) {
 			var best = GetBest(results);
 			s_logger.LogInformation("Best: {Sr}", best);
+
 			if (best != null) {
 				OpenResult(best.Url);
 			}
@@ -143,24 +144,9 @@ public async Task<bool> RunSearchAsync(SearchQuery query, CancellationToken toke
 	/// <inheritdoc />
 	public async ValueTask<bool> ApplyConfigAsync(SearchConfig cfg, CancellationToken ct = default)
 	{
-		Config  = cfg;
-		Engines = Config.GetSelectedEngines();
-
+		Config = cfg;
 		s_logger.LogTrace("Loading engines");
-
-		foreach (var engine in Engines) {
-
-			if (engine is ISearchConfigReceiver rcvr) {
-				s_logger.LogTrace("Applying config to {Engine}", engine.Name);
-				await rcvr.ApplyConfigAsync(Config, ct);
-
-			}
-
-			if (engine is ICookiesReceiver ck) {
-				s_logger.LogTrace("Applying cookies to {Engine}", engine.Name);
-				await ck.ApplyCookiesAsync(Config.GetCookiesSource(), ct);
-			}
-		}
+		await Config.LoadEngines(Engines, ct);
 
 		s_logger.LogDebug("Loaded engines");
 

SmartImage.Lib/SearchConfig.cs

@@ -209,10 +209,25 @@ public string FlareSolverrApiUrl
 		set => Set(value);
 	}
 
-
 #endregion
 
-	public IEnumerable<BaseSearchEngine> GetSelectedEngines() => GetSelectedEngines(SearchEngines);
+	
+
+	public async ValueTask LoadEngines(IEnumerable<BaseSearchEngine> engines2, CancellationToken ct)
+	{
+		foreach (BaseSearchEngine engine in engines2) {
+			if (engine is ISearchConfigReceiver rcvr) {
+				s_logger.LogTrace("Applying config to {Engine}", engine.Name);
+				await rcvr.ApplyConfigAsync(this, ct);
+
+			}
+
+			if (engine is ICookiesReceiver ck) {
+				s_logger.LogTrace("Applying cookies to {Engine}", engine.Name);
+				await ck.ApplyCookiesAsync(GetCookiesSource(), ct);
+			}
+		}
+	}
 
 	public static IEnumerable<BaseSearchEngine> GetSelectedEngines(SearchEngineOptions options)
 	{
@@ -321,20 +336,14 @@ public string HydrusKey
 	*/
 
 
-	public SearchConfig()
-	{
-		PropertyChanged += static (sender, args) =>
-		{
-			//
-			s_logger.LogTrace("{Sender} Changed {PropName}", sender, args.PropertyName);
-		};
-	}
+	public SearchConfig() { }
 
 
 	public event PropertyChangedEventHandler PropertyChanged;
 
 	private void OnPropertyChanged([CMN] string propertyName = null)
 	{
+		s_logger.LogTrace("Changed {PropName}", propertyName);
 		PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
 	}
 
@@ -343,4 +352,31 @@ public override string ToString()
 		return $"{SearchEngines}\n{PriorityEngines}";
 	}
 
+
+	/*public static IConfigurationRoot GetConfig()
+	{
+	// TODO
+		/*var bldr2 = new ConfigurationBuilder();
+		var host  = Host.CreateDefaultBuilder();
+		var bldr  = host.ConfigureServices((ctx, svc) => { svc.AddSingleton<SearchConfig>(); });
+
+		bldr2.SetBasePath(Directory.GetCurrentDirectory())
+			.AddJsonFile("smartimage.json", optional: false, reloadOnChange: true);
+			#1#
+
+		// TODO
+
+		var currentDirectory = BaseOSIntegration.ExecutableDirectory;
+		var configFileName   = $"{R1.Name}.json";
+
+		// var configFilePath   = Path.Combine(currentDirectory, configFileName);
+
+		var cfg = new ConfigurationBuilder()
+			.SetBasePath(currentDirectory)
+			.AddJsonFile(configFileName, optional: false, reloadOnChange: true)
+			.Build();
+
+		return cfg;
+	}*/
+
 }

SmartImage.Rdx/Commands/Search/SearchCommand.cs

@@ -73,6 +73,8 @@ public sealed partial class SearchCommand : CommonAsyncCommand<SearchCommandSett
 
 	private SpcTable m_mainTable;
 
+	// private readonly ConcurrentDictionary<SearchResult, SelectionPrompt<SearchResultItem>> m_prompts = new();
+
 	private Layout m_layout;
 
 	private static readonly ILogger s_logger = AppSupport.Factory.CreateLogger(nameof(SearchCommand));
@@ -167,6 +169,7 @@ public override async Task<int> ExecuteAsync(CommandContext context, SearchComma
 		// AnsiConsole.Write(m_layout);
 
 		try {
+
 			IRenderable elem = CommandSettings.Interactive ? m_layout : m_mainTable;
 
 			Task main = AnsiConsole.Live(elem)
@@ -234,6 +237,20 @@ private async Task RunSearchLiveAsync(LiveDisplayContext c, CancellationToken ct
 				}
 
 				m_resultTables.TryAdd(result, table);
+
+				/*var prompt = new SelectionPrompt<SearchResultItem>()
+				{
+					Converter = static r =>
+					{
+						return r.Url;
+					},
+					Mode = SelectionMode.Independent,
+					SearchEnabled = true,
+				};
+				prompt.AddChoices(result.Results);
+
+				m_prompts.TryAdd(result, prompt);*/
+
 				m_mainTable.AddRow(result.GetMainRows());
 				Elements.Prm_SearchResult.AddChoice(result);
 			}
@@ -284,6 +301,8 @@ private async Task RunInteractiveAsync(CancellationToken ct = default)
 					break;
 				}
 
+				// var selx = AC.Prompt(m_prompts[sr]);
+
 				var sel     = ShellSelection.GetSelectionChoice(sr);
 				var sri     = sel.Item;
 				var selIdx  = sel.Index();
@@ -297,7 +316,7 @@ private async Task RunInteractiveAsync(CancellationToken ct = default)
 					continue;
 				}
 
-				if (cmd == R2.Chc_Scan) {
+				if (cmd == R2.Chc_Scan && !sel.IsScannedItem) {
 					await AnsiConsole.Live(srTable).StartAsync(async (f) =>
 					{
 						s_logger.LogTrace("Scanning {Item}", sri);
@@ -316,6 +335,7 @@ await AnsiConsole.Live(srTable).StartAsync(async (f) =>
 							srTable.InsertRow(selIdx + i + 1, scnRow);
 						}
 
+						// m_prompts[sr].AddChoiceGroup(sri, sri.ScannedItems);
 
 						f.Refresh();
 
@@ -357,9 +377,9 @@ await AnsiConsole.Live(srTable).StartAsync(async (f) =>
 				}
 
 
-			} while (cmd != R2.Chc_Back);
+			} while (cmd != R2.Chc_Back && !ct.IsCancellationRequested);
 
-		} while (cmd != R2.Chc_Exit);
+		} while (cmd != R2.Chc_Exit && !ct.IsCancellationRequested);
 	}
 
 #endregion
@@ -426,7 +446,18 @@ private void ShowPreview(CanvasImage ci, SearchResultItem sri)
 	{
 		var (w, h) = (AnsiConsole.Profile.Width, AC.Profile.Height);
 
-		var pnl = new Panel(ci) { Expand = true, Border = BoxBorder.None };
+		var pnl        = new Panel(ci) { Expand = true, Border = BoxBorder.None, Header = new PanelHeader($"{sri.Value}")};
+		/*var sriLayout = new Layout("Info");
+
+		sriLayout.SplitColumns(
+			new Layout("Metadata"),
+			new Layout("Image")
+		);
+
+
+		var grid = sri.GetInfoGrid();
+		sriLayout["Metadata"].Update(grid);
+		sriLayout["Image"].Update(ci);*/
 
 		AnsiConsole.Live(pnl).Start(ldc =>
 		{
@@ -516,8 +547,10 @@ private void OnCancelKeyPress(object sender, ConsoleCancelEventArgs args)
 
 		// AnsiConsole.Clear();
 
-		// m_cts.Cancel();
 		m_ctsRun.Cancel();
+		m_cts.Cancel();
+		m_cts.TryReset();
+		m_ctsRun.TryReset();
 
 		args.Cancel = true;
 

SmartImage.Rdx/Commands/Search/SearchCommandSettings.cs

@@ -85,7 +85,7 @@ public sealed class SearchCommandSettings : CommonCommandSettings
 	// public const string PROP_ARG_RESULTS = "$all_results";
 
 	[CommandOption("--interactive")]
-	[DefaultValue(false)]
+	[DefaultValue(true)]
 	[Description("Interactive results")]
 	public bool Interactive { get; private set; }
 

SmartImage.Rdx/Program.cs

@@ -78,8 +78,8 @@ public static async Task<int> Main(string[] args)
 			c.AddCommand<IntegrationCommand>("integrate")
 				.WithDescription("Configure system integration such as context menu");
 
-			c.AddCommand<ServerCommand>("server")
-				.WithDescription("Start listen server (experimental)");
+			/*c.AddCommand<ServerCommand>("server")
+				.WithDescription("Start listen server (experimental)");*/
 		});
 
 		int x = BaseOSIntegration.EC_OK;
@@ -168,6 +168,8 @@ private static void HandleArgs(ref string[] args)
 			args = [sz];
 		}*/
 
+#if !DEBUG
+		
 
 		if (Console.IsInputRedirected) {
 			Trace.WriteLine("Input redirected");
@@ -182,33 +184,7 @@ private static void HandleArgs(ref string[] args)
 
 			AnsiConsole.WriteLine($"Received input from stdin");
 		}
+#endif
 
 	}
-
-	/*public static IConfigurationRoot GetConfig()
-	{
-	// TODO
-		/*var bldr2 = new ConfigurationBuilder();
-		var host  = Host.CreateDefaultBuilder();
-		var bldr  = host.ConfigureServices((ctx, svc) => { svc.AddSingleton<SearchConfig>(); });
-
-		bldr2.SetBasePath(Directory.GetCurrentDirectory())
-			.AddJsonFile("smartimage.json", optional: false, reloadOnChange: true);
-			#1#
-
-		// TODO
-
-		var currentDirectory = BaseOSIntegration.ExecutableDirectory;
-		var configFileName   = $"{R1.Name}.json";
-
-		// var configFilePath   = Path.Combine(currentDirectory, configFileName);
-
-		var cfg = new ConfigurationBuilder()
-			.SetBasePath(currentDirectory)
-			.AddJsonFile(configFileName, optional: false, reloadOnChange: true)
-			.Build();
-
-		return cfg;
-	}*/
-
 }