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

Indexer refactor complete. This is going to need lots of testing!

Browse Source
This commit is contained in:
KZ
2015-07-27 01:03:51 +01:00
parent 33d85bc4f4
commit 51042e91fc
53 changed files with 1046 additions and 1892 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,5 @@
using Jackett.Models;
using AutoMapper;
using Jackett.Models;
using Jackett.Services;
using NLog;
using System;
@@ -23,10 +24,23 @@ namespace Jackett.Utils.Clients
public async Task<WebClientByteResult> GetBytes(WebRequest request)
{
Jackett.CurlHelper.CurlResponse response;
logger.Debug(string.Format("UnixLibCurlWebClient:GetBytes(Url:{0})", request.Url));
var result = await Run(request);
logger.Debug(string.Format("UnixLibCurlWebClient: Returning", result.Status));
return result;
}
public async Task<WebClientStringResult> GetString(WebRequest request)
{
logger.Debug(string.Format("UnixLibCurlWebClient:GetString(Url:{0})", request.Url));
var result = await Run(request);
logger.Debug(string.Format("UnixLibCurlWebClient: Returning", result.Status));
return Mapper.Map<WebClientStringResult>(result);
}
private async Task<WebClientByteResult> Run(WebRequest request)
{
Jackett.CurlHelper.CurlResponse response;
if (request.Type == RequestType.GET)
{
response = await CurlHelper.GetAsync(request.Url, request.Cookies, request.Referer);
@@ -45,32 +59,17 @@ namespace Jackett.Utils.Clients
if (response.Headers != null)
{
foreach(var header in response.Headers)
foreach (var header in response.Headers)
{
if(string.Equals(header.Key, "location", StringComparison.InvariantCultureIgnoreCase) && header.Value !=null)
if (string.Equals(header.Key, "location", StringComparison.InvariantCultureIgnoreCase) && header.Value != null)
{
result.RedirectingTo = header.Value;
}
}
}
logger.Debug(string.Format("UnixLibCurlWebClient: Returning", result.Status));
ServerUtil.ResureRedirectIsFullyQualified(request, result);
return result;
}
public async Task<WebClientStringResult> GetString(WebRequest request)
{
logger.Debug(string.Format("UnixLibCurlWebClient:GetString(Url:{0})", request.Url));
var result = await GetBytes(request);
var sresult = new WebClientStringResult()
{
Content = Encoding.UTF8.GetString(result.Content),
Cookies = result.Cookies,
Status = result.Status
};
return sresult;
}
}
}