Cookies

Author: Decimation

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

@@ -45,20 +45,18 @@ public sealed class EHentaiEngine : WebSearchEngine, IConfig, INotifyPropertyCha
 		CookieContainer                = new() { },
 
 	};
-
+	
 	public override Url BaseUrl => IsLoggedIn ? ExHentaiBase : EHentaiBase;
 
 	private Url LookupUrl => IsLoggedIn ? ExHentaiLookup : EHentaiLookup;
 
-	public CookieCollection Cookies { get; }
-
 	public override SearchEngineOptions EngineOption => SearchEngineOptions.EHentai;
 
 	protected override string NodesSelector => Serialization.S_EHentai;
 
 	public bool IsLoggedIn { get; private set; }
 
-	#region 
+	#region
 
 	private static readonly Url EHentaiIndex  = "https://forums.e-hentai.org/index.php";
 	public static readonly  Url EHentaiBase   = "https://e-hentai.org/";
@@ -74,7 +72,6 @@ static EHentaiEngine() { }
 	public EHentaiEngine() : base(EHentaiBase)
 	{
 		m_client   = new HttpClient(m_clientHandler);
-		Cookies    = new();
 		IsLoggedIn = false;
 	}
 
@@ -136,6 +133,15 @@ public async Task<bool> LoginAsync(bool useEx = false)
 			return x.Host.Contains(HOST_EX);
 		});
 
+		/*var fcc = CookiesManager.Cookies.Where(x =>
+		{
+			if (!useEx) {
+				return x.Domain.Contains(HOST_EH);
+			}
+
+			return x.Domain.Contains(HOST_EX);
+		});*/
+
 		/*var content = new MultipartFormDataContent()
 		{
 			{ new StringContent("1"), "CookieDate" },
@@ -158,10 +164,12 @@ public async Task<bool> LoginAsync(bool useEx = false)
 						   .WithCookies(out var cj)
 						   .PostAsync(content);*/
 
-		foreach (var fc in fcc) {
-			Cookies.Add(fc.AsCookie());
+		foreach (var cookie in fcc) {
+			m_clientHandler.CookieContainer.Add(cookie.AsCookie());
 		}
 
+		// foreach (var fc in fcc) { }
+
 		var res2 = await GetSessionAsync();
 
 		return IsLoggedIn = res2.ResponseMessage.IsSuccessStatusCode;
@@ -211,8 +219,8 @@ protected override async Task<IDocument> GetDocumentAsync(SearchResult sr, Searc
 		// data.Add(new FileContent(f.FullName), "sfile", "a.jpg");
 
 		//todo
-		m_clientHandler.CookieContainer.Add(Cookies);
-
+		/*m_clientHandler.CookieContainer.Add(Cookies);
+		
 		Debug.WriteLine($"{LookupUrl}", nameof(GetDocumentAsync));
 
 		var req = new HttpRequestMessage(HttpMethod.Post, LookupUrl)
@@ -228,7 +236,23 @@ protected override async Task<IDocument> GetDocumentAsync(SearchResult sr, Searc
 
 		var content = await res.Content.ReadAsStringAsync(token);
 
-		sr.RawUrl = res.RequestMessage.RequestUri;
+		sr.RawUrl = res.RequestMessage.RequestUri;*/
+
+		var req = new FlurlRequest(LookupUrl)
+		{
+			Content = data, 
+			Headers =
+			{
+				{ "User-Agent", HttpUtilities.UserAgent }
+			},
+			Verb = HttpMethod.Post,
+			
+		};
+
+		var res     = await Client.SendAsync(req, cancellationToken: token);
+		var content = await res.GetStringAsync();
+		
+		sr.RawUrl = res.ResponseMessage.RequestMessage.RequestUri;
 
 		if (content.Contains("Please wait a bit longer between each file search.")) {
 			Debug.WriteLine($"cooldown", Name);
@@ -242,7 +266,7 @@ protected override async Task<IDocument> GetDocumentAsync(SearchResult sr, Searc
 
 	private Task<IFlurlResponse> GetSessionAsync()
 	{
-		return ExHentaiBase.WithCookies(Cookies)
+		return ExHentaiBase.WithCookies(m_clientHandler.CookieContainer)
 			.WithHeaders(new
 			{
 				User_Agent = HttpUtilities.UserAgent
@@ -293,7 +317,7 @@ public override void Dispose()
 	{
 		m_client.Dispose();
 		m_clientHandler.Dispose();
-		Cookies.Clear();
+		
 		IsLoggedIn = false;
 	}
 

SmartImage.Lib 3/Model/IParseable.cs

@@ -2,5 +2,7 @@
 
 public interface IParseable<out TResult, in TSource>
 {
-    public static abstract TResult Parse(TSource t);
+
+	public static abstract TResult Parse(TSource t);
+
 }

SmartImage.Lib 3/Utilities/CookiesManager.cs

@@ -1,12 +1,15 @@
 // Author: Deci | Project: SmartImage.Lib | Name: CookiesManager.cs
 
+using System.Diagnostics;
+using System.Net;
+using Flurl.Http;
 using Kantan.Net.Web;
 
 namespace SmartImage.Lib.Utilities;
 
 public static class CookiesManager
 {
-
+	[DebuggerHidden]
 	public static async Task<List<IBrowserCookie>> ReadCookiesAsync()
 	{
 		using var ff = new FirefoxCookieReader();
@@ -25,7 +28,7 @@ public static async Task<bool> LoadCookiesAsync(bool force = false)
 
 		if (b) {
 			Cookies = await ReadCookiesAsync();
-
+			
 		}
 
 		return Cookies != null;

SmartImage.Rdx/Program.cs

@@ -1,6 +1,7 @@
 using System.Configuration;
 using System.Diagnostics;
 using System.Reflection;
+using Flurl.Http;
 using Kantan.Text;
 using Microsoft.Extensions.DependencyInjection;
 using Spectre.Console;
@@ -45,10 +46,6 @@ public static async Task<int> Main(string[] args)
 
 #if DEBUG
 		AConsole.WriteLine(args.QuickJoin());
-
-		foreach (string? s in ConfigurationManager.AppSettings) {
-			AConsole.WriteLine(s);
-		}
 #endif
 
 		Grid grd = CliFormat.CreateInfoGrid();
@@ -69,7 +66,7 @@ public static async Task<int> Main(string[] args)
 
 		try {
 			var x = await app.RunAsync(args);
-
+			
 			return x;
 		}
 		catch (Exception e) {