Fixes; server work; Rdx 1.0.9

Author: Decimation

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

@@ -73,12 +73,13 @@ public override async Task<SearchResult> GetResultAsync(SearchQuery query, Cance
 			var er = await response.GetJsonAsync<FluffleErrorCode>();
 
 			sr.ErrorMessage = $"{er.Message}: {er.Code}";
-
+			sr.Status = SearchResultStatus.UnknownError;
 			// return sr;
 			goto ret;
 		}
 
 		if (response == null) {
+			sr.Status = SearchResultStatus.UnknownError;
 			goto ret;
 		}
 
@@ -88,7 +89,7 @@ public override async Task<SearchResult> GetResultAsync(SearchQuery query, Cance
 			var item = result.Convert(sr);
 			sr.Results.Add(item);
 		}
-
+		sr.Status = SearchResultStatus.Success;
 	ret:
 		sr.Update();
 		response?.Dispose();

SmartImage.Lib/Engines/Impl/Search/SauceNaoEngine.cs

@@ -17,6 +17,7 @@
 using SmartImage.Lib.Results.Data;
 using static Kantan.Diagnostics.LogCategories;
 using SmartImage.Lib.Utilities;
+using Novus.Streams;
 
 // ReSharper disable PossibleNullReferenceException
 
@@ -129,8 +130,8 @@ private async ValueTask GetWebResultsAsync(SearchQuery query, SearchResult sr)
 		response = await Client.Request(EndpointUrl).AllowHttpStatus()
 			           .OnError(x =>
 			           {
-
 				           x.ExceptionHandled = true;
+				           Trace.WriteLine($"{x.Exception.Message}");
 
 				           /*if (x.Exception is FlurlHttpException ex) {
 						           if (ex.StatusCode == (int)HttpStatusCode.TooManyRequests) { }
@@ -146,8 +147,10 @@ private async ValueTask GetWebResultsAsync(SearchQuery query, SearchResult sr)
 				           if (query.Source.IsUri) { }
 				           else if (query.Source.IsFile) {
 					           m.AddFile("file", query.Source.Value.ToString(), fileName: "image.png");
-				           }
+				           }else {
+					           m.AddFile("file", query.Source.FilePath, fileName: "image.png");
 
+				           }
 			           });
 
 		html = await response.GetStringAsync();
@@ -398,9 +401,11 @@ private static void Parse(INode result, SearchResult sr)
 		{
 			var b = !String.IsNullOrWhiteSpace(x);
 			var c = true;
+
 			if (b) {
 				c = !IsLookupUrl(Url.Parse(x));
 			}
+
 			return b && c;
 		}).Distinct().ToArray();
 

SmartImage.Lib/Engines/Impl/Search/TinEyeEngine.cs

@@ -67,11 +67,13 @@ public override async Task<SearchResult> GetResultAsync(SearchQuery query, Cance
 		catch (Exception e) {
 			// Debugger.Break();
 			Trace.WriteLine(e.Message);
+			sr.Status = SearchResultStatus.UnknownError;
 			goto ret;
 		}
 
 		if (tinEyeRoot?.Matches == null) {
 			sr.Flags |= SearchResultFlags.NoResults;
+
 			goto ret;
 		}
 
@@ -121,6 +123,8 @@ public override async Task<SearchResult> GetResultAsync(SearchQuery query, Cance
 			sr.Results.Add(resultItem);
 		}
 
+		sr.Status = SearchResultStatus.Success;
+
 	ret:
 		response?.Dispose();
 		return sr;
@@ -244,12 +248,7 @@ public class TinEyeRoot
 }
 
 [JsonSerializable(typeof(TinEyeRoot))]
-public partial class TinEyeContext : JsonSerializerContext
-{
-
-	
-
-}
+public partial class TinEyeContext : JsonSerializerContext { }
 
 public class TinEyeMatch
 {

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

@@ -83,7 +83,7 @@ public override async Task<SearchResult> GetResultAsync(SearchQuery query, Cance
 
 				try {
 					var results = await ConvertResultsAsync(tm, r);
-
+					r.Status = SearchResultStatus.Success;
 					r.RawUrl = new Url(BaseUrl + query.Upload);
 					r.Results.AddRange(results);
 				}

SmartImage.Lib/Engines/Impl/Search/YandexEngine.cs

@@ -154,6 +154,7 @@ public override async Task<SearchResult> GetResultAsync(SearchQuery query, Cance
 				Debug.WriteLine("Timeout", nameof(GetResultAsync));
 
 			}
+			sr.Status = SearchResultStatus.UnknownError;
 		}
 
 		if (!Validate(doc, sr)) {
@@ -192,7 +193,7 @@ public override async Task<SearchResult> GetResultAsync(SearchQuery query, Cance
 		if (looksLike != null) {
 			sr.Overview = looksLike;
 		}
-
+		sr.Status = SearchResultStatus.Success;
 	ret:
 		sr.Update();
 		doc?.Dispose();

SmartImage.Lib/Engines/Impl/Upload/CatboxEngine.cs

@@ -1,5 +1,6 @@
 using System.ComponentModel;
 using Flurl.Http;
+using Flurl.Http.Content;
 using Kantan.Net.Utilities;
 using SmartImage.Lib.Results;
 
@@ -15,10 +16,7 @@ public override async Task<UploadResult> UploadFileAsync(string file, Cancellati
 		Verify(file);
 
 		var response = await Client.Request(EndpointUrl)
-			               .WithSettings(r =>
-			               {
-				               r.Timeout = Timeout;
-			               })
+			               .WithSettings(r => { r.Timeout = Timeout; })
 			               .WithHeaders(new
 			               {
 				               User_Agent = HttpUtilities.UserAgent
@@ -34,6 +32,26 @@ public override async Task<UploadResult> UploadFileAsync(string file, Cancellati
 		return await ProcessResultAsync(response, ct).ConfigureAwait(false);
 	}
 
+	/*public async Task<UploadResult> UploadFileAsync(Stream file, CancellationToken ct = default)
+	{
+
+		var response = await Client.Request(EndpointUrl)
+			               .WithSettings(r => { r.Timeout = Timeout; })
+			               .WithHeaders(new
+			               {
+				               User_Agent = HttpUtilities.UserAgent
+			               })
+			               .PostMultipartAsync(mp =>
+			               {
+				               mp.AddFile("fileToUpload", file, Path.GetTempFileName())
+					               .AddString("reqtype", "fileupload")
+					               .AddString("time", "1h")
+					               .AddString("userhash", string.Empty);
+			               }, cancellationToken: ct, completionOption: HttpCompletionOption.ResponseHeadersRead);
+
+		return await ProcessResultAsync(response, ct).ConfigureAwait(false);
+	}*/
+
 	protected BaseCatboxEngine(string s) : base(s) { }
 
 }
@@ -43,8 +61,6 @@ public sealed class CatboxEngine : BaseCatboxEngine
 
 	public override long? MaxSize => 200_000_000L;
 
-	public CatboxEngine() : base("https://catbox.moe/user/api.php")
-	{
-	}
+	public CatboxEngine() : base("https://catbox.moe/user/api.php") { }
 
 }

SmartImage.Lib/Engines/WebSearchEngine.cs

@@ -61,6 +61,7 @@ public override async Task<SearchResult> GetResultAsync(SearchQuery query, Cance
 		Debug.WriteLine($"{Name} :: {res.RawUrl} {doc.TextContent?.Length} {nodes.Length}",
 		                nameof(GetResultAsync));
 
+		res.Status = SearchResultStatus.Success;
 	ret:
 		res.Update();
 		return res;

SmartImage.Lib/Results/Data/ICookiesProvider.cs

@@ -17,7 +17,11 @@ public interface ICookiesProvider : IDisposable
 	public static ICookiesProvider GetProvider()
 	{
 		if (BaseOSIntegration.Integration.IsFirefoxInstalled) {
-			return new BrowserCookiesProvider(new FirefoxCookieReader());
+			var cookieFile = FirefoxCookieReader.FindCookieFile();
+			if (cookieFile != null) {
+				return new BrowserCookiesProvider(new FirefoxCookieReader(cookieFile.FullName));
+
+			}
 		}
 
 		return new DefaultCookiesProvider();

SmartImage.Lib/Results/SearchResult.cs

@@ -118,7 +118,9 @@ internal SearchResult(BaseSearchEngine bse)
 
 	public void Update()
 	{
-
+		if (Status.IsUnknown()) {
+			
+		}
 		if (Status.IsError()) {
 			return;
 		}

SmartImage.Lib/SearchClient.cs

@@ -313,7 +313,7 @@ public async ValueTask LoadEnginesAsync(CancellationToken token = default)
 			if (bse is ISearchConfigReceiver cfg) {
 				await cfg.ApplyConfigAsync(Config, token);
 			}
-
+			
 			/*
 			if (Config.ReadCookies && bse is ICookiesReceiver ce) {