shpaq/Jackett-Jackett
1
0
Fork 0
mirror of https://github.com/Jackett/Jackett.git synced 2025-09-17 17:34:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

core: refactor http webclient part 13 #8529 (#8941)

Browse Source 
Merge string/byte request code
This commit is contained in:
Cory
2020-06-11 10:09:27 -05:00
committed by ngosang
parent 67c7b4ca70
commit ac0ba0f9b1
91 changed files with 330 additions and 399 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Jackett.Test/TestUtil.cs
View File

@@ -33,16 +33,11 @@ namespace Jackett.Test
public static IContainer Container => testContainer;
public static void RegisterByteCall(WebRequest r, Func<WebRequest, WebResult> f)
//Currently not used in any Unit Tests
public static void RegisterRequestCallback(WebRequest r, Func<WebRequest, WebResult> f)
{
var client = testContainer.Resolve<WebClient>() as TestWebClient;
client.RegisterByteCall(r, f);
}
public static void RegisterStringCall(WebRequest r, Func<WebRequest, WebResult> f)
{
var client = testContainer.Resolve<WebClient>() as TestWebClient;
client.RegisterStringCall(r, f);
client.RegisterRequestCallback(r, f);
}
public static string GetResource(string item)

18
src/Jackett.Test/TestWebClient.cs
View File

@@ -9,26 +9,20 @@ using NLog;
namespace Jackett.Test
{
// Currently not used in any Unit tests. Leaving it for potential future testing purposes.
public class TestWebClient : WebClient
{
private readonly Dictionary<WebRequest, Func<WebRequest, WebResult>> byteCallbacks = new Dictionary<WebRequest, Func<WebRequest, WebResult>>();
private readonly Dictionary<WebRequest, Func<WebRequest, WebResult>> stringCallbacks = new Dictionary<WebRequest, Func<WebRequest, WebResult>>();
private readonly Dictionary<WebRequest, Func<WebRequest, WebResult>> _requestCallbacks = new Dictionary<WebRequest, Func<WebRequest, WebResult>>();
public TestWebClient(IProcessService p, Logger l, IConfigurationService c, ServerConfig sc)
: base(p: p,
l: l,
c: c,
sc: sc)
: base(p, l, c, sc)
{
}
public void RegisterByteCall(WebRequest req, Func<WebRequest, WebResult> f) => byteCallbacks.Add(req, f);
public void RegisterRequestCallback(WebRequest req, Func<WebRequest, WebResult> f) => _requestCallbacks.Add(req, f);
public void RegisterStringCall(WebRequest req, Func<WebRequest, WebResult> f) => stringCallbacks.Add(req, f);
public override Task<WebResult> GetBytes(WebRequest request) => Task.FromResult(byteCallbacks.Where(r => r.Key.Equals(request)).First().Value.Invoke(request));
public override Task<WebResult> GetString(WebRequest request) => Task.FromResult(stringCallbacks.Where(r => r.Key.Equals(request)).First().Value.Invoke(request));
public override Task<WebResult> GetResultAsync(WebRequest request) => Task.FromResult(_requestCallbacks.First(r => r.Key.Equals(request)).Value.Invoke(request));
public override void Init()
{