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

WebRequest: make encoding configurable (#816)

Browse Source
This commit is contained in:
kaso17
2016-12-06 14:56:47 +01:00
committed by GitHub
parent 7835da2ea8
commit d499c291b9
71 changed files with 351 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/Jackett/Utils/Clients/HttpWebClient.cs
View File

@@ -9,23 +9,21 @@ using System.Linq;
using System.Net;
using System.Net.Http;
using System.Text;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
namespace Jackett.Utils.Clients
{
public class HttpWebClient : IWebClient
{
Logger logger;
IConfigurationService configService;
public HttpWebClient(Logger l, IConfigurationService c)
{
logger = l;
configService = c;
public HttpWebClient(IProcessService p, Logger l, IConfigurationService c)
: base(p: p,
l: l,
c: c)
{
}
public void Init()
override public void Init()
{
if (Startup.IgnoreSslErrors == true)
{
@@ -34,30 +32,7 @@ namespace Jackett.Utils.Clients
}
}
public async Task<WebClientByteResult> GetBytes(WebRequest request)
{
logger.Debug(string.Format("WindowsWebClient:GetBytes(Url:{0})", request.Url));
var result = await Run(request);
logger.Debug(string.Format("WindowsWebClient: Returning {0} => {1} bytes", result.Status, (result.Content == null ? "<NULL>" : result.Content.Length.ToString())));
return result;
}
public async Task<WebClientStringResult> GetString(WebRequest request)
{
logger.Debug(string.Format("WindowsWebClient:GetString(Url:{0})", request.Url));
var result = await Run(request);
logger.Debug(string.Format("WindowsWebClient: Returning {0} => {1}", result.Status, (result.Content == null ? "<NULL>" : Encoding.UTF8.GetString(result.Content))));
WebClientStringResult stringResult = Mapper.Map<WebClientStringResult>(result);
string[] server;
if (stringResult.Headers.TryGetValue("server", out server))
{
if (server[0] == "cloudflare-nginx")
stringResult.Content = BrowserUtil.DecodeCloudFlareProtectedEmailFromHTML(stringResult.Content);
}
return stringResult;
}
private async Task<WebClientByteResult> Run(WebRequest webRequest)
override protected async Task<WebClientByteResult> Run(WebRequest webRequest)
{
ServicePointManager.SecurityProtocol = (SecurityProtocolType)192 | (SecurityProtocolType)768 | (SecurityProtocolType)3072;