Organize namespaces

Author: Decimation

SmartImage.Lib/Engines/Search/Base/WebClientSearchEngine.cs

@@ -1,4 +1,5 @@
-using AngleSharp.Html.Parser;
+using System.Diagnostics;
+using AngleSharp.Html.Parser;
 using SmartImage.Lib.Searching;
 
 namespace SmartImage.Lib.Engines.Search.Base;
@@ -16,10 +17,11 @@ protected WebClientSearchEngine(string baseUrl) : base(baseUrl) { }
 
 	protected override object GetProcessingObject(SearchResult sr) => ParseContent(sr.Origin);
 
-	protected virtual object ParseContent(SearchResultOrigin s)
+	
+	protected virtual object ParseContent(SearchResultOrigin origin)
 	{
 		var parser = new HtmlParser();
-		var readStringTask  = s.Response.Content.ReadAsStringAsync();
+		var readStringTask  = origin.Response.Content.ReadAsStringAsync();
 		readStringTask.Wait();
 		var content  = readStringTask.Result;
 		var document = parser.ParseDocument(content);

SmartImage.Lib/Engines/Search/TraceMoeEngine.cs

@@ -66,46 +66,19 @@ protected override SearchResult Process(object obj, SearchResult r)
 			{
 				Error = (sender, args) =>
 				{
-
 					if (object.Equals(args.ErrorContext.Member, nameof(TraceMoeDoc.episode)) /*&&
 					    args.ErrorContext.OriginalObject.GetType() == typeof(TraceMoeRootObject)*/) {
 						args.ErrorContext.Handled = true;
-
 					}
 
 					Debug.WriteLine($"{args.ErrorContext}");
 				}
 			};
 
-			/*var tm2t = request.GetJsonAsync();
-			tm2t.Wait();
-			var tm2 = tm2t.Result;
-
-			dynamic result = tm2.result;
-			Debug.WriteLine($"{result}");
-			tm = new() { result = new(), error = tm2.error, frameCount = tm2.frameCount };
-
-			for (int i = 0; i < result.Count; i++) {
-				Debug.WriteLine($"{result[i]}");
-
-				var d = result[i];
-
-				var doc = new TraceMoeDoc()
-				{
-					episode = d.episode, 
-					from = d.from, 
-					to = d.to, 
-					filename = d.filename, anilist = d.anilist
-				};
-
-				tm.result.Add(doc);
-			}*/
-
-
 			tm = JsonConvert.DeserializeObject<TraceMoeRootObject>(json, settings);
 		}
 		catch (Exception e) {
-			Debug.WriteLine($">>>>{e.Message}");
+			Debug.WriteLine($"{Name}: {nameof(Process)}: {e.Message}");
 
 			goto ret;
 		}
@@ -149,28 +122,18 @@ protected override SearchResult Process(object obj, SearchResult r)
 		return r;
 	}
 
-	private IEnumerable<ImageResult> ConvertResults(TraceMoeRootObject obj, SearchResult r)
+	private IEnumerable<ImageResult> ConvertResults(TraceMoeRootObject obj, SearchResult sr)
 	{
-		var docs    = obj.result;
-		var results = new ImageResult[docs.Count];
+		var results    = obj.result;
+		var imageResults = new ImageResult[results.Count];
 
-		for (int i = 0; i < results.Length; i++) {
-			var   doc = docs[i];
+		for (int i = 0; i < imageResults.Length; i++) {
+			var   doc = results[i];
 			float sim = MathF.Round((float) (doc.similarity * 100.0f), 2);
 
-			var episode = doc.episode;
-
-			string epStr = episode.ToString();
+			string epStr = GetEpisodeString(doc);
 
-			if (episode is string) {
-				epStr = episode as string;
-			}
-			else if (episode is IEnumerable enumerable) {
-				var ls = enumerable.CopyToList().Select(x => Int64.Parse(x.ToString() ?? String.Empty));
-				epStr = ls.QuickJoin();
-			}
-
-			var result = new ImageResult(r)
+			var result = new ImageResult(sr)
 			{
 				Similarity  = sim,
 				Description = $"Episode #{epStr} @ {TimeSpan.FromSeconds(doc.from)}"
@@ -192,10 +155,26 @@ private IEnumerable<ImageResult> ConvertResults(TraceMoeRootObject obj, SearchRe
 				                                 $"< {FILTER_THRESHOLD / 100:P})");
 			}
 
-			results[i] = result;
+			imageResults[i] = result;
 		}
 
-		return results;
+		return imageResults;
+
+		static string GetEpisodeString(TraceMoeDoc doc)
+		{
+			object episode = doc.episode;
+
+			string epStr = episode is string s ? s : episode.ToString();
+
+			if (episode is IEnumerable e) {
+				var epList = e.CopyToList()
+				          .Select(x => Int64.Parse(x.ToString() ?? String.Empty));
+
+				epStr = epList.QuickJoin();
+			}
+
+			return epStr;
+		}
 	}
 
 	/// <summary>
@@ -223,8 +202,7 @@ private class TraceMoeDoc
 		public string filename { get; set; }
 
 
-		/// <remarks>Episode field may contain multiple possible results delimited by <c>|</c></remarks>
-		// [JsonIgnore]
+		/// <remarks>Episode may be a JSON array (edge case) or a normal integer</remarks>
 		public object episode { get; set; }
 
 		public double similarity { get; set; }

SmartImage/App/AppToast.cs

@@ -3,6 +3,7 @@
 using Kantan.Net;
 using Microsoft.Toolkit.Uwp.Notifications;
 using SmartImage.Lib;
+using SmartImage.Lib.Searching;
 using SmartImage.Lib.Utilities;
 
 // ReSharper disable PossibleNullReferenceException
@@ -34,9 +35,12 @@ internal static void ShowToast(object sender, SearchCompletedEventArgs args)
 		}
 		else if (Program.Client.Results.Any()) {
 			var result = Program.Client.Results.First();
-			url = result.PrimaryResult.Url.ToString();
 
-			builder.AddText($"Engine: {result.Engine}");
+			url = result.PrimaryResult.Url.ToString();
+			/*var rr    = Program.Client.Results.Where(x => x.PrimaryResult is { Url: { } });
+			var first = rr.First();
+			url = first.PrimaryResult?.Url?.ToString() ?? first.RawUri.ToString();*/
+			builder.AddText($"Engine: {result.Engine.Name}");
 		}
 
 		button.SetContent("Open")

SmartImage/Cli/CliArguments.cs

@@ -0,0 +1,67 @@
+using Kantan.Utilities;
+using SmartImage.Lib.Searching;
+
+namespace SmartImage.Cli;
+
+internal static class CliArguments
+{
+	/// <summary>
+	/// Command line argument handler
+	/// </summary>
+	internal static readonly CliHandler ArgumentHandler = new()
+	{
+		Parameters =
+		{
+			new()
+			{
+				ArgumentCount = 1,
+				ParameterId   = "-se",
+				Function = strings =>
+				{
+					Program.Config.SearchEngines = Enum.Parse<SearchEngineOptions>(strings[0]);
+					return null;
+				}
+			},
+			new()
+			{
+				ArgumentCount = 1,
+				ParameterId   = "-pe",
+				Function = strings =>
+				{
+					Program.Config.PriorityEngines = Enum.Parse<SearchEngineOptions>(strings[0]);
+					return null;
+				}
+			},
+			new()
+			{
+				ArgumentCount = 0,
+				ParameterId   = "-f",
+				Function = delegate
+				{
+					Program.Config.Filtering = true;
+					return null;
+				}
+			},
+			new()
+			{
+				ArgumentCount = 0,
+				ParameterId   = "-output_only",
+				Function = delegate
+				{
+					Program.Config.OutputOnly = true;
+					return null;
+				}
+			}
+		},
+		Default = new()
+		{
+			ArgumentCount = 1,
+			ParameterId   = null,
+			Function = strings =>
+			{
+				Program.Config.Query = strings[0];
+				return null;
+			}
+		}
+	};
+}