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

Fixed bug with app not exiting, piratebay now works on mono

Browse Source
This commit is contained in:
zone117x
2015-04-23 20:21:19 -06:00
parent 7834411bbd
commit 8cf45a5e45
10 changed files with 222 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

177
src/Jackett/CurlHelper.cs
View File

@@ -10,19 +10,12 @@ using System.Net.Http.Headers;
namespace Jackett
{
public class CurlHelper
public static class CurlHelper
{
private const string ChromeUserAgent = "Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/42.0.2311.90 Safari/537.36";
public static CurlHelper Shared = new CurlHelper();
private BlockingCollection<CurlRequest> curlRequests = new BlockingCollection<CurlRequest>();
public bool IsSupported { get; private set; }
private class CurlRequest
public class CurlRequest
{
public TaskCompletionSource<CurlResponse> TaskCompletion { get; private set; }
public string Url { get; private set; }
@@ -36,7 +29,6 @@ namespace Jackett
public CurlRequest(HttpMethod method, string url, string cookies = null, string referer = null)
{
TaskCompletion = new TaskCompletionSource<CurlResponse>();
Method = method;
Url = url;
Cookies = cookies;
@@ -70,54 +62,65 @@ namespace Jackett
}
}
public void AddCookiesFromHeaderValue(string cookieHeaderValue)
{
var rawCookies = cookieHeaderValue.Split(';');
foreach (var rawCookie in rawCookies)
{
var parts = rawCookie.Split(new char[] { '=' }, 2, StringSplitOptions.RemoveEmptyEntries);
if (parts.Length == 1)
Cookies[rawCookie.Trim()] = string.Empty;
else
Cookies[parts[0].Trim()] = parts[1].Trim();
}
}
public void AddCookiesFromHeaders(List<string[]> headers)
{
foreach (var h in headers)
{
if (h[0] == "set-cookie")
{
var rawCookies = h[1].Split(';');
foreach (var rawCookie in rawCookies)
{
var parts = rawCookie.Split(new char[] { '=' }, 2, StringSplitOptions.RemoveEmptyEntries);
if (parts.Length == 1)
Cookies[rawCookie.Trim()] = string.Empty;
else
Cookies[parts[0].Trim()] = parts[1].Trim();
}
AddCookiesFromHeaderValue(h[1]);
}
}
}
}
public async Task<CurlResponse> GetAsync(string url, string cookies = null, string referer = null)
public static async Task<CurlResponse> GetAsync(string url, string cookies = null, string referer = null)
{
var curlRequest = new CurlRequest(HttpMethod.Get, url, cookies, referer);
curlRequests.Add(curlRequest);
var result = await curlRequest.TaskCompletion.Task;
var result = await PerformCurlAsync(curlRequest);
var checkedResult = await FollowRedirect(url, result);
return checkedResult;
}
public async Task<CurlResponse> PostAsync(string url, Dictionary<string, string> formData, string cookies = null, string referer = null)
public static async Task<CurlResponse> PostAsync(string url, Dictionary<string, string> formData, string cookies = null, string referer = null)
{
var curlRequest = new CurlRequest(HttpMethod.Post, url, cookies, referer);
curlRequest.PostData = formData;
curlRequests.Add(curlRequest);
var result = await curlRequest.TaskCompletion.Task;
var result = await PerformCurlAsync(curlRequest);
var checkedResult = await FollowRedirect(url, result);
return checkedResult;
}
private async Task<CurlResponse> FollowRedirect(string url, CurlResponse response)
private static async Task<CurlResponse> FollowRedirect(string url, CurlResponse response)
{
var uri = new Uri(url);
string redirect;
if (response.Headers.TryGetValue("location", out redirect))
{
string cookie = response.Headers["set-cookie"];
var redirectUrl = uri.Scheme + "://" + uri.Host + "/" + redirect;
var newRedirect = await GetAsync(redirectUrl, cookie, url);
string cookie = response.CookieHeader;
if (!redirect.StartsWith("http://") && !redirect.StartsWith("https://"))
{
if (redirect.StartsWith("/"))
redirect = string.Format("{0}://{1}{2}", uri.Scheme, uri.Host, redirect);
else
redirect = string.Format("{0}://{1}/{2}", uri.Scheme, uri.Host, redirect);
}
var newRedirect = await GetAsync(redirect, cookie);
foreach (var c in response.Cookies)
newRedirect.Cookies[c.Key] = c.Value;
newRedirect.AddCookiesFromHeaders(response.HeaderList);
return newRedirect;
}
@@ -125,88 +128,74 @@ namespace Jackett
return response;
}
public CurlHelper()
public static async Task<CurlResponse> PerformCurlAsync(CurlRequest curlRequest)
{
try
{
Curl.GlobalInit(CurlInitFlag.All);
IsSupported = true;
}
catch (Exception ex)
{
IsSupported = false;
}
Task.Run((Action)CurlServicer);
return await Task.Run(() => PerformCurl(curlRequest));
}
private void CurlServicer()
public static CurlResponse PerformCurl(CurlRequest curlRequest)
{
foreach (var curlRequest in curlRequests.GetConsumingEnumerable())
{
PerformCurl(curlRequest);
}
}
Curl.GlobalInit(CurlInitFlag.All);
private void PerformCurl(CurlRequest curlRequest)
{
var headerBuffers = new List<byte[]>();
var contentBuffers = new List<byte[]>();
try
using (var easy = new CurlEasy())
{
using (var easy = new CurlEasy())
easy.Url = curlRequest.Url;
easy.BufferSize = 64 * 1024;
easy.UserAgent = ChromeUserAgent;
easy.WriteFunction = (byte[] buf, int size, int nmemb, object data) =>
{
easy.Url = curlRequest.Url;
easy.BufferSize = 64 * 1024;
easy.UserAgent = ChromeUserAgent;
easy.WriteFunction = (byte[] buf, int size, int nmemb, object data) =>
{
contentBuffers.Add(buf);
return size * nmemb;
};
easy.HeaderFunction = (byte[] buf, int size, int nmemb, object extraData) =>
{
headerBuffers.Add(buf);
return size * nmemb;
};
contentBuffers.Add(buf);
return size * nmemb;
};
easy.HeaderFunction = (byte[] buf, int size, int nmemb, object extraData) =>
{
headerBuffers.Add(buf);
return size * nmemb;
};
if (!string.IsNullOrEmpty(curlRequest.Cookies))
easy.Cookie = curlRequest.Cookies;
if (!string.IsNullOrEmpty(curlRequest.Cookies))
easy.Cookie = curlRequest.Cookies;
if (curlRequest.Method == HttpMethod.Post)
{
easy.Post = true;
var postString = new FormUrlEncodedContent(curlRequest.PostData).ReadAsStringAsync().Result;
easy.PostFields = postString;
easy.PostFieldSize = Encoding.UTF8.GetByteCount(postString);
}
if (!string.IsNullOrEmpty(curlRequest.Referer))
easy.Referer = curlRequest.Referer;
easy.Perform();
if (curlRequest.Method == HttpMethod.Post)
{
easy.Post = true;
var postString = new FormUrlEncodedContent(curlRequest.PostData).ReadAsStringAsync().Result;
easy.PostFields = postString;
easy.PostFieldSize = Encoding.UTF8.GetByteCount(postString);
}
var headerBytes = Combine(headerBuffers.ToArray());
var headerString = Encoding.UTF8.GetString(headerBytes);
var headerParts = headerString.Split(new char[] { '\n', '\r' }, StringSplitOptions.RemoveEmptyEntries);
var headers = new List<string[]>();
foreach (var headerPart in headerParts.Skip(1))
{
var keyVal = headerPart.Split(new char[] { ':' }, 2);
if (keyVal.Length > 1)
{
headers.Add(new[] { keyVal[0].ToLower().Trim(), keyVal[1].Trim() });
}
}
var contentBytes = Combine(contentBuffers.ToArray());
//var contentString = Encoding.UTF8.GetString (contentBytes);
var curlResponse = new CurlResponse(headers, contentBytes);
curlResponse.AddCookiesFromHeaders(headers);
curlRequest.TaskCompletion.SetResult(curlResponse);
easy.Perform();
}
catch (Exception ex)
var headerBytes = Combine(headerBuffers.ToArray());
var headerString = Encoding.UTF8.GetString(headerBytes);
var headerParts = headerString.Split(new char[] { '\n', '\r' }, StringSplitOptions.RemoveEmptyEntries);
var headers = new List<string[]>();
foreach (var headerPart in headerParts.Skip(1))
{
curlRequest.TaskCompletion.TrySetException(ex);
var keyVal = headerPart.Split(new char[] { ':' }, 2);
if (keyVal.Length > 1)
{
headers.Add(new[] { keyVal[0].ToLower().Trim(), keyVal[1].Trim() });
}
}
var contentBytes = Combine(contentBuffers.ToArray());
var curlResponse = new CurlResponse(headers, contentBytes);
if (!string.IsNullOrEmpty(curlRequest.Cookies))
curlResponse.AddCookiesFromHeaderValue(curlRequest.Cookies);
curlResponse.AddCookiesFromHeaders(headers);
return curlResponse;
}
public static byte[] Combine(params byte[][] arrays)