*

Author: Decimation

SmartImage.Lib 3/Engines/BaseSearchEngine.cs

@@ -35,7 +35,7 @@ public abstract class BaseSearchEngine : IDisposable
 
 	public bool IsAdvanced { get; protected set; }
 
-	public TimeSpan Timeout { get; set; } = TimeSpan.FromSeconds(20);
+	public TimeSpan Timeout { get; set; } = TimeSpan.FromSeconds(15);
 
 	public string? EndpointUrl { get; }
 

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

@@ -152,7 +152,7 @@ public SearchResultItem Convert(SearchResult sr, out SearchResultItem[] children
 		{
 			Artist     = Credits.FirstOrDefault()?.Name,
 			Url        = Location,
-			Similarity = Score * 100.0d,
+			Similarity = Math.Round(Score * 100.0d, 2),
 			Metadata   = this,
 			Thumbnail  = Thumbnail?.Location,
 			Site       = Platform

SmartImage.Lib 3/SearchClient.cs

@@ -279,7 +279,7 @@ public List<Task<SearchResult>> GetSearchTasks(SearchQuery query, TaskScheduler
 					{
 
 						// Debug.Assert(r.IsCompleted);
-						Debug.WriteLine($"{r.Id} :: {r.Status}");
+						// Debug.WriteLine($"{r.Id} :: {r.Status}");
 						ProcessResult(r.Result);
 						return r.Result;
 

SmartImage.Rdx/Program.cs

@@ -17,6 +17,7 @@ namespace SmartImage.Rdx;
  * dotnet run -c Test --project SmartImage.Rdx --  "/home/neorenegade/0c4c80957134d4304538c27499d84dbe.jpeg" -e All -p Auto
  * ./SmartImage.Rdx/bin/Release/net8.0/publish/linux-x64/SmartImage "/home/neorenegade/0c4c80957134d4304538c27499d84dbe.jpeg"
  * dotnet run --project SmartImage.Rdx -- --help
+ * dotnet run --project SmartImage.Rdx/ "C:\Users\Deci\Pictures\Epic anime\Kallen_FINAL_1-3.png" --search-engines All --output-format "Delimited" --output-file "output.csv" --read-cookies
  */
 
 public static class Program

SmartImage.Rdx/SearchCommand.cs

@@ -65,6 +65,7 @@ internal sealed class SearchCommand : AsyncCommand<SearchCommandSettings>, IDisp
 	public SearchCommand()
 	{
 		Config = new SearchConfig();
+
 		// Config = (SearchConfig) cfg;
 		Client = new SearchClient(Config);
 
@@ -78,7 +79,7 @@ public SearchCommand()
 		Query = SearchQuery.Null;
 	}
 
-	#region 
+	#region
 
 	private async Task SetupSearchAsync(ProgressContext ctx)
 	{
@@ -96,8 +97,6 @@ private async Task SetupSearchAsync(ProgressContext ctx)
 		if (url == null) {
 			throw new SmartImageException(); //todo
 		}
-		
-		AConsole.WriteLine($"{url}");
 
 		p.Increment(COMPLETE / 2);
 	}
@@ -141,7 +140,8 @@ private async Task RunSearchAsync(ProgressContext c)
 		}
 
 		await search;
-		Debug.WriteLine($"{nameof(RunSearchAsync)} complete");
+
+		// Debug.WriteLine($"{nameof(RunSearchAsync)} complete");
 
 		return;
 
@@ -183,7 +183,8 @@ public override async Task<int> ExecuteAsync(CommandContext context, SearchComma
 					break;
 
 				case OutputFileFormat.Delimited:
-					run = run.ContinueWith(WriteOutputFileAsync, m_cts.Token, TaskContinuationOptions.OnlyOnRanToCompletion,
+					run = run.ContinueWith(WriteOutputFileAsync, m_cts.Token,
+					                       TaskContinuationOptions.OnlyOnRanToCompletion,
 					                       TaskScheduler.Default);
 					break;
 
@@ -193,12 +194,7 @@ public override async Task<int> ExecuteAsync(CommandContext context, SearchComma
 
 		}
 
-		try {
-			await run;
-		}
-		catch (TaskCanceledException e) {
-			Debugger.Break();
-		}
+		await run;
 
 		return EC_OK;
 	}
@@ -216,6 +212,18 @@ private async Task WriteOutputFileAsync([CBN] object o)
 		var res    = m_results.ToArray();
 		var fields = m_scs.OutputFields;
 
+		bool fName   = fields.HasFlag(OutputFields.Name);
+		var  fUrl    = fields.HasFlag(OutputFields.Url);
+		var  fSim    = fields.HasFlag(OutputFields.Similarity);
+		var  fArtist = fields.HasFlag(OutputFields.Artist);
+		var  fSite   = fields.HasFlag(OutputFields.Site);
+
+		var names = Enum.GetValues<OutputFields>()
+			.Where(f => fields.HasFlag(f) && !f.Equals(default(OutputFields)))
+			.Select(f => Enum.GetName(f));
+
+		sw.WriteLine(String.Join(m_scs.OutputFileDelimiter, names));
+
 		for (int i = 0; i < res.Length; i++) {
 			var sr = res[i];
 
@@ -224,18 +232,26 @@ private async Task WriteOutputFileAsync([CBN] object o)
 
 				var rg = new List<string>();
 
-				if (fields.HasFlag(OutputFields.Name)) {
+				if (fName) {
 					rg.Add($"{sr.Engine.Name} #{j + 1}");
 				}
 
-				if (fields.HasFlag(OutputFields.Url)) {
+				if (fUrl) {
 					rg.Add(sri.Url);
 				}
 
-				if (fields.HasFlag(OutputFields.Similarity)) {
+				if (fSim) {
 					rg.Add($"{sri.Similarity}");
 				}
 
+				if (fArtist) {
+					rg.Add($"{sri.Artist}");
+				}
+
+				if (fSite) {
+					rg.Add($"{sri.Site}");
+				}
+
 				// string[] items  = [$"{sr.Engine.Name} #{j + 1}", sri.Url?.ToString()];
 				sw.WriteLine(String.Join(m_scs.OutputFileDelimiter, rg));
 			}
@@ -317,7 +333,8 @@ private Grid CreateInfoGrid()
 			[R1.S_AutoSearch]      = Config.AutoSearch,
 			[R1.S_ReadCookies]     = Config.ReadCookies,
 
-			["Input"] = Query
+			["Input"]  = Query,
+			["Upload"] = Query.Upload
 		};
 
 		foreach (var o in kv) {

SmartImage.Rdx/SearchCommandSettings.cs

@@ -2,8 +2,6 @@
 // $File.CreatedYear-$File.CreatedMonth-26 @ 0:56
 
 using System.ComponentModel;
-using System.ComponentModel.DataAnnotations;
-using System.Globalization;
 using SmartImage.Lib;
 using SmartImage.Lib.Engines;
 using SmartImage.Rdx.Shell;
@@ -56,10 +54,13 @@ internal sealed class SearchCommandSettings : CommandSettings
 	public string? OutputFileDelimiter { get; internal set; }
 
 	[CommandOption("--output-fields")]
-	[DefaultValue(OutputFields.Default)]
+	[DefaultValue(OUTPUT_FIELDS_DEFAULT)]
 	[Description("Output fields")]
 	public OutputFields OutputFields { get; internal set; }
 
+	public const OutputFields OUTPUT_FIELDS_DEFAULT =
+		OutputFields.Name | OutputFields.Similarity | OutputFields.Url;
+
 	#endregion
 
 	#region
@@ -79,15 +80,15 @@ public override ValidationResult Validate()
 		var result = base.Validate();
 
 		if (!SearchQuery.IsValidSourceType(Query)) {
-			return ValidationResult.Error($"Invalid query");
+			return ValidationResult.Error("Invalid query");
 		}
 
 		var  hasOutputFile       = !String.IsNullOrWhiteSpace(OutputFile);
 		var  hasOutputFileDelim  = !String.IsNullOrEmpty(OutputFileDelimiter);
 		bool isOutputFormatDelim = OutputFileFormat == OutputFileFormat.Delimited;
 
 		if (!isOutputFormatDelim && hasOutputFile) {
-			OutputFileFormat        = OutputFileFormat.Delimited;
+			OutputFileFormat    = OutputFileFormat.Delimited;
 			isOutputFormatDelim = true;
 		}
 
@@ -106,5 +107,4 @@ public override ValidationResult Validate()
 		return result;
 	}
 
-}
-
+}

SmartImage.Rdx/Shell/CliFormat.cs

@@ -15,13 +15,16 @@ namespace SmartImage.Rdx.Shell;
 [Flags]
 public enum OutputFields
 {
-	None       = 0,
+
+	None = 0,
 
 	Name       = 1 << 0,
 	Url        = 1 << 1,
 	Similarity = 1 << 2,
+	Artist     = 1 << 3,
+	Site       = 1 << 4,
 
-	Default = Name | Url | Similarity
+	// Default = Name | Url | Similarity
 
 }