Work on cookies

Decimation · Decimation · commit 4db6056d7987 · 2024-10-15T12:42:16.000-05:00
diff --git a/SmartImage.Lib/Engines/Impl/Search/ArchiveMoeEngine.cs b/SmartImage.Lib/Engines/Impl/Search/ArchiveMoeEngine.cs
@@ -10,8 +10,8 @@
 using AngleSharp.Html.Dom;
 using JetBrains.Annotations;
 using Novus.Streams;
-using SmartImage.Lib.Model;
 using SmartImage.Lib.Results;
+using SmartImage.Lib.Results.Data;
 
 namespace SmartImage.Lib.Engines.Impl.Search;
 
diff --git a/SmartImage.Lib/Engines/Impl/Search/EHentaiEngine.cs b/SmartImage.Lib/Engines/Impl/Search/EHentaiEngine.cs
@@ -16,8 +16,8 @@
 using Kantan.Net.Utilities;
 using Kantan.Net.Web;
 using Kantan.Text;
-using SmartImage.Lib.Model;
 using SmartImage.Lib.Results;
+using SmartImage.Lib.Results.Data;
 using SmartImage.Lib.Utilities;
 
 namespace SmartImage.Lib.Engines.Impl.Search;
@@ -26,7 +26,7 @@ namespace SmartImage.Lib.Engines.Impl.Search;
 ///     <see cref="SearchEngineOptions.EHentai" />
 /// </summary>
 /// <remarks>Handles both ExHentai and E-Hentai</remarks>
-public sealed class EHentaiEngine : WebSearchEngine, IConfig, ICookieEngine, INotifyPropertyChanged
+public sealed class EHentaiEngine : WebSearchEngine, IConfigurable, ICookieReceiver, INotifyPropertyChanged
 {
 
 	private const string HOST_EH = ".e-hentai.org";
@@ -91,10 +91,10 @@ public EHentaiEngine(bool useExHentai = true) : base(EHentaiBase)
 	 * https://gitlab.com/NekoInverter/EhViewer/-/blob/master/app/src/main/java/com/hippo/ehviewer/client/EhCookieStore.java
 	 */
 
-	public async ValueTask ApplyConfigAsync(SearchConfig cfg)
+	public async ValueTask ApplyAsync(SearchConfig cfg)
 	{
 		/*if (this is { IsLoggedIn: true }/* && !(Username != cfg.EhUsername && Password != cfg.EhPassword)#1#) {
-			Debug.WriteLine($"{Name} is already logged in", nameof(ApplyConfigAsync));
+			Debug.WriteLine($"{Name} is already logged in", nameof(ApplyAsync));
 
 			return;
 		}*/
@@ -108,16 +108,18 @@ public async ValueTask ApplyConfigAsync(SearchConfig cfg)
 	 */
 
 
-	public async ValueTask<bool> ApplyCookiesAsync(IEnumerable<IBrowserCookie> cookies = null)
+	public async ValueTask<bool> ApplyCookiesAsync(ICookieProvider provider, CancellationToken ct = default)
 	{
 		Trace.WriteLine($"Applying cookies to {Name}");
 
-		if (await CookiesManager.Instance.LoadCookiesAsync()) {
+		/*if (await CookiesManager.Instance.LoadCookiesAsync()) {
 			cookies ??= CookiesManager.Instance.Cookies;
 		}
 		else {
 			return false;
-		}
+		}*/
+
+		var cookies = await provider.LoadCookiesAsync(ct);
 
 		var fcc = cookies.OfType<FirefoxCookie>().Where(x =>
 		{
diff --git a/SmartImage.Lib/Engines/Impl/Search/FluffleEngine.cs b/SmartImage.Lib/Engines/Impl/Search/FluffleEngine.cs
@@ -13,8 +13,8 @@
 using SixLabors.ImageSharp.Formats;
 using SixLabors.ImageSharp.Formats.Png;
 using SixLabors.ImageSharp.Processing;
-using SmartImage.Lib.Model;
 using SmartImage.Lib.Results;
+using SmartImage.Lib.Results.Data;
 
 namespace SmartImage.Lib.Engines.Impl.Search;
 
diff --git a/SmartImage.Lib/Engines/Impl/Search/RepostSleuthEngine.cs b/SmartImage.Lib/Engines/Impl/Search/RepostSleuthEngine.cs
@@ -3,8 +3,8 @@
 using System.Text.Json.Serialization;
 using System.Text.Json.Serialization.Metadata;
 using Flurl.Http;
-using SmartImage.Lib.Model;
 using SmartImage.Lib.Results;
+using SmartImage.Lib.Results.Data;
 using JsonSerializer = System.Text.Json.JsonSerializer;
 
 #pragma warning disable CS0649
diff --git a/SmartImage.Lib/Engines/Impl/Search/SauceNaoEngine.cs b/SmartImage.Lib/Engines/Impl/Search/SauceNaoEngine.cs
@@ -12,8 +12,8 @@
 using Kantan.Monad;
 using Kantan.Net.Utilities;
 using Kantan.Text;
-using SmartImage.Lib.Model;
 using SmartImage.Lib.Results;
+using SmartImage.Lib.Results.Data;
 using static Kantan.Diagnostics.LogCategories;
 using JsonArray = System.Json.JsonArray;
 using JsonObject = System.Json.JsonObject;
@@ -31,7 +31,7 @@
 
 namespace SmartImage.Lib.Engines.Impl.Search;
 
-public sealed class SauceNaoEngine : BaseSearchEngine, IConfig, IDisposable
+public sealed class SauceNaoEngine : BaseSearchEngine, IConfigurable, IDisposable
 {
 
 	private const string URL_BASE = "https://saucenao.com/";
@@ -472,7 +472,7 @@ private async ValueTask GetAPIResultsAsync(SearchQuery url, SearchResult sr)
 		return;
 	}
 
-	public ValueTask ApplyConfigAsync(SearchConfig cfg)
+	public ValueTask ApplyAsync(SearchConfig cfg)
 	{
 		Authentication = cfg.SauceNaoKey;
 		return ValueTask.CompletedTask;
diff --git a/SmartImage.Lib/Engines/Impl/Search/TraceMoeEngine.cs b/SmartImage.Lib/Engines/Impl/Search/TraceMoeEngine.cs
@@ -7,8 +7,8 @@
 using Kantan.Collections;
 using Kantan.Text;
 using SmartImage.Lib.Clients;
-using SmartImage.Lib.Model;
 using SmartImage.Lib.Results;
+using SmartImage.Lib.Results.Data;
 
 // ReSharper disable InconsistentNaming
 #pragma warning disable IDE1006, IDE0051
diff --git a/SmartImage.Lib/Images/Uni/UniImage.cs b/SmartImage.Lib/Images/Uni/UniImage.cs
@@ -16,7 +16,7 @@
 using SixLabors.ImageSharp.Formats.Png;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
-using SmartImage.Lib.Model;
+using SmartImage.Lib.Results.Data;
 
 namespace SmartImage.Lib.Images.Uni;
 #nullable disable
diff --git a/SmartImage.Lib/Model/IConfig.cs b/SmartImage.Lib/Model/IConfig.cs
diff --git a/SmartImage.Lib/Model/ICookieEngine.cs b/SmartImage.Lib/Model/ICookieEngine.cs
diff --git a/SmartImage.Lib/Results/Data/IConfigurable.cs b/SmartImage.Lib/Results/Data/IConfigurable.cs
@@ -0,0 +1,10 @@
+﻿// Read Stanton SmartImage.Lib IConfigurable.cs
+// 2023-01-13 @ 11:09 PM
+
+namespace SmartImage.Lib.Results.Data;
+
+public interface IConfigurable
+{
+	public ValueTask ApplyAsync(SearchConfig cfg);
+
+}
diff --git a/SmartImage.Lib/Results/Data/ICookieReceiver.cs b/SmartImage.Lib/Results/Data/ICookieReceiver.cs
@@ -0,0 +1,26 @@
+﻿// Author: Deci | Project: SmartImage.Lib | Name: ICookieReceiver.cs
+// Date: 2024/06/06 @ 17:06:56
+
+using Kantan.Net.Web;
+using SmartImage.Lib.Utilities;
+
+namespace SmartImage.Lib.Results.Data;
+
+public interface ICookieReceiver
+{
+
+	public ValueTask<bool> ApplyCookiesAsync(ICookieProvider provider, CancellationToken ct = default);
+
+}
+
+public interface ICookieProvider : IDisposable
+{
+
+	public IEnumerable<IBrowserCookie> Cookies { get; }
+
+	[MNNW(true, nameof(Cookies))]
+	public bool Loaded => Cookies != null;
+
+	public ValueTask<bool> LoadCookiesAsync(CancellationToken ct = default);
+
+}
diff --git a/SmartImage.Lib/Results/Data/IItemSize.cs b/SmartImage.Lib/Results/Data/IItemSize.cs
@@ -1,7 +1,9 @@
 ﻿// Deci SmartImage.Lib IItemSize.cs
 // $File.CreatedYear-$File.CreatedMonth-24 @ 15:40
 
-namespace SmartImage.Lib.Model;
+namespace SmartImage.Lib.Results.Data;
+
+// TODO: delete
 
 public interface IItemSize
 {
diff --git a/SmartImage.Lib/Results/Data/IParseable.cs b/SmartImage.Lib/Results/Data/IParseable.cs
@@ -1,4 +1,4 @@
-﻿namespace SmartImage.Lib.Model;
+﻿namespace SmartImage.Lib.Results.Data;
 
 public interface IParseable<out TResult, in TSource>
 {
diff --git a/SmartImage.Lib/Results/Data/IResultConvertable.cs b/SmartImage.Lib/Results/Data/IResultConvertable.cs
@@ -1,9 +1,13 @@
 ﻿// Read S SmartImage.Lib IResultParsable.cs
 // 2023-07-04 @ 1:27 PM
 
+
+// Read S SmartImage.Lib IResultParsable.cs
+// 2023-07-04 @ 1:27 PM
+
 using SmartImage.Lib.Results;
 
-namespace SmartImage.Lib.Model;
+namespace SmartImage.Lib.Results.Data;
 
 public interface IResultConvertable
 {
diff --git a/SmartImage.Lib/SearchClient.cs b/SmartImage.Lib/SearchClient.cs
@@ -25,8 +25,8 @@
 using SmartImage.Lib.Engines;
 using SmartImage.Lib.Engines.Impl.Search;
 using SmartImage.Lib.Images;
-using SmartImage.Lib.Model;
 using SmartImage.Lib.Results;
+using SmartImage.Lib.Results.Data;
 using SmartImage.Lib.Utilities;
 using static System.Runtime.InteropServices.JavaScript.JSType;
 
@@ -316,11 +316,11 @@ public async ValueTask LoadEnginesAsync()
 		}
 
 		foreach (BaseSearchEngine bse in Engines) {
-			if (bse is IConfig cfg) {
-				await cfg.ApplyConfigAsync(Config);
+			if (bse is IConfigurable cfg) {
+				await cfg.ApplyAsync(Config);
 			}
 
-			if (Config.ReadCookies && bse is ICookieEngine ce) {
+			if (Config.ReadCookies && bse is ICookieReceiver ce) {
 				await ce.ApplyCookiesAsync(CookiesManager.Instance.Cookies);
 
 				// if (await CookiesManager.Instance.LoadCookiesAsync()) { }
diff --git a/SmartImage.Lib/SearchConfig.cs b/SmartImage.Lib/SearchConfig.cs
@@ -9,7 +9,7 @@
 using Microsoft.Extensions.Configuration;
 using SmartImage.Lib.Engines;
 using SmartImage.Lib.Engines.Impl.Search;
-using SmartImage.Lib.Model;
+using SmartImage.Lib.Results.Data;
 using Configuration = System.Configuration.Configuration;
 using ConfigurationManager = System.Configuration.ConfigurationManager;
 using ConfigurationSection = System.Configuration.ConfigurationSection;
@@ -176,7 +176,7 @@ public string SauceNaoKey
 	/// Parse browser cookies automatically whenever necessary
 	/// </summary>
 	/// <remarks>
-	/// <see cref="ICookieEngine"/>
+	/// <see cref="ICookieReceiver"/>
 	/// </remarks>
 	public bool ReadCookies
 	{
diff --git a/SmartImage.Lib/Utilities/CookiesManager.cs b/SmartImage.Lib/Utilities/CookiesManager.cs
@@ -1,28 +1,87 @@
 ﻿// Author: Deci | Project: SmartImage.Lib | Name: CookiesManager.cs
 
+using System.Data;
 using System.Diagnostics;
 using System.Net;
 using System.Runtime.Caching;
+using System.Runtime.CompilerServices;
 using Flurl.Http;
 using Kantan.Net.Web;
+using SmartImage.Lib.Results.Data;
 
 namespace SmartImage.Lib.Utilities;
 
-public class CookiesManager : IDisposable
+public class AsyncLazy<T> : Lazy<Task<T>>
 {
-	// TODO
 
-	// [DebuggerHidden]
-	private static async Task<List<IBrowserCookie>> ReadCookiesAsync()
+	public AsyncLazy(Func<T> valueFactory, CancellationToken ct = default) :
+		base(() => Task.Factory.StartNew(valueFactory, ct)) { }
+
+	public AsyncLazy(Func<Task<T>> taskFactory, CancellationToken ct = default) :
+		base(() => Task.Factory.StartNew(() => taskFactory(), ct).Unwrap()) { }
+
+	public AsyncLazy(Func<object, T> valueFactory, CancellationToken ct = default)
+		: base(() => Task.Factory.StartNew((z) => valueFactory(z), ct)) { }
+
+	public AsyncLazy(Func<object, Task<T>> valueFactory, CancellationToken ct = default)
+		: base(() => Task.Factory.StartNew((z) => valueFactory(z), ct).Unwrap()) { }
+
+	/*public AsyncLazy(Func<object, Task<T>> valueFactory, CancellationToken ct = default)
+		: base(() => Task.Factory.StartNew(z => valueFactory(z)), ct) { }*/
+
+	public TaskAwaiter<T> GetAwaiter()
 	{
-		using var ff = new FirefoxCookieReader();
-		await ff.OpenAsync();
+		return Value.GetAwaiter();
+	}
 
-		var cookies = await ff.ReadCookiesAsync();
+}
 
-		return cookies;
+public class FirefoxCookiesProvider : ICookieProvider
+{
+
+	private readonly FirefoxCookieReader m_reader;
+
+
+	public IEnumerable<IBrowserCookie> Cookies { get; }
+
+	public FirefoxCookiesProvider()
+	{
+		m_reader = new FirefoxCookieReader();
+		Cookies = [];
 	}
 
+	public async ValueTask<bool> LoadCookiesAsync(CancellationToken ct = default)
+	{
+		if (((ICookieProvider) this).Loaded) {
+			if (m_reader.Connection.State == ConnectionState.Open) {
+				await m_reader.OpenAsync();
+
+			}
+
+			Cookies = await m_reader.ReadCookiesAsync();
+
+		}
+
+
+		return ((ICookieProvider) this).Loaded;
+
+	}
+
+	public void Dispose()
+	{
+		m_reader.Dispose();
+	}
+
+}
+
+public class CookiesManager : IDisposable
+{
+
+	// TODO
+
+	// [DebuggerHidden]
+	private static async Task<List<IBrowserCookie>> ReadCookiesAsync() { }
+
 	public List<IBrowserCookie> Cookies { get; private set; }
 
 	[MNNW(true, nameof(Cookies))]
