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

Added parsing error logging

Browse Source
This commit is contained in:
zone117x
2015-05-03 22:12:14 -06:00
parent f781deb4a9
commit bc8b1d14d5
10 changed files with 623 additions and 502 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Jackett/IndexerInterface.cs
View File

@@ -14,6 +14,8 @@ namespace Jackett
// Invoked when the indexer configuration has been applied and verified so the cookie needs to be saved // Invoked when the indexer configuration has been applied and verified so the cookie needs to be saved
event Action<IndexerInterface, JToken> OnSaveConfigurationRequested; event Action<IndexerInterface, JToken> OnSaveConfigurationRequested;
event Action<IndexerInterface, string, Exception> OnResultParsingError;
string DisplayName { get; } string DisplayName { get; }
string DisplayDescription { get; } string DisplayDescription { get; }
Uri SiteLink { get; } Uri SiteLink { get; }

9
src/Jackett/IndexerManager.cs
View File

@@ -43,6 +43,7 @@ namespace Jackett
IndexerInterface newIndexer = (IndexerInterface)Activator.CreateInstance(indexerType); IndexerInterface newIndexer = (IndexerInterface)Activator.CreateInstance(indexerType);
newIndexer.OnSaveConfigurationRequested += newIndexer_OnSaveConfigurationRequested; newIndexer.OnSaveConfigurationRequested += newIndexer_OnSaveConfigurationRequested;
newIndexer.OnResultParsingError += newIndexer_OnResultParsingError;
var configFilePath = GetIndexerConfigFilePath(newIndexer); var configFilePath = GetIndexerConfigFilePath(newIndexer);
if (File.Exists(configFilePath)) if (File.Exists(configFilePath))
@@ -54,6 +55,14 @@ namespace Jackett
Indexers.Add(name, newIndexer); Indexers.Add(name, newIndexer);
} }
void newIndexer_OnResultParsingError(IndexerInterface indexer, string results, Exception ex)
{
var fileName = string.Format("Error on {0} for {1}.txt", DateTime.Now.ToString("yyyyMMddHHmmss"), indexer.DisplayName);
var spacing = string.Join("", Enumerable.Repeat(Environment.NewLine, 5));
var fileContents = string.Format("{0}{1}{2}", ex, spacing, results);
File.WriteAllText(Path.Combine(Program.AppConfigDirectory, fileName), fileContents);
}
string GetIndexerConfigFilePath(IndexerInterface indexer) string GetIndexerConfigFilePath(IndexerInterface indexer)
{ {
return Path.Combine(IndexerConfigDirectory, indexer.GetType().Name.ToLower() + ".json"); return Path.Combine(IndexerConfigDirectory, indexer.GetType().Name.ToLower() + ".json");

229
src/Jackett/Indexers/BitHdtv.cs
View File

@@ -12,139 +12,160 @@ using System.Web;
namespace Jackett.Indexers namespace Jackett.Indexers
{ {
public class BitHdtv : IndexerInterface public class BitHdtv : IndexerInterface
{ {
public string DisplayName { public event Action<IndexerInterface, string, Exception> OnResultParsingError;
get { return "BIT-HDTV"; }
}
public string DisplayDescription { public string DisplayName
get { return "Home of high definition invites"; } {
} get { return "BIT-HDTV"; }
}
public Uri SiteLink { public string DisplayDescription
get { return new Uri (BaseUrl); } {
} get { return "Home of high definition invites"; }
}
static string BaseUrl = "https://www.bit-hdtv.com"; public Uri SiteLink
static string LoginUrl = BaseUrl + "/takelogin.php"; {
static string SearchUrl = BaseUrl + "/torrents.php?cat=0&search="; get { return new Uri(BaseUrl); }
static string DownloadUrl = BaseUrl + "/download.php?/{0}/dl.torrent"; }
CookieContainer cookies; static string BaseUrl = "https://www.bit-hdtv.com";
HttpClientHandler handler; static string LoginUrl = BaseUrl + "/takelogin.php";
HttpClient client; static string SearchUrl = BaseUrl + "/torrents.php?cat=0&search=";
static string DownloadUrl = BaseUrl + "/download.php?/{0}/dl.torrent";
public BitHdtv () CookieContainer cookies;
{ HttpClientHandler handler;
IsConfigured = false; HttpClient client;
cookies = new CookieContainer ();
handler = new HttpClientHandler {
CookieContainer = cookies,
AllowAutoRedirect = true,
UseCookies = true,
};
client = new HttpClient (handler);
}
public Task<ConfigurationData> GetConfigurationForSetup () public BitHdtv()
{ {
var config = new ConfigurationDataBasicLogin (); IsConfigured = false;
return Task.FromResult<ConfigurationData> (config); cookies = new CookieContainer();
} handler = new HttpClientHandler
{
CookieContainer = cookies,
AllowAutoRedirect = true,
UseCookies = true,
};
client = new HttpClient(handler);
}
public async Task ApplyConfiguration (JToken configJson) public Task<ConfigurationData> GetConfigurationForSetup()
{ {
var config = new ConfigurationDataBasicLogin (); var config = new ConfigurationDataBasicLogin();
config.LoadValuesFromJson (configJson); return Task.FromResult<ConfigurationData>(config);
}
var pairs = new Dictionary<string, string> { public async Task ApplyConfiguration(JToken configJson)
{
var config = new ConfigurationDataBasicLogin();
config.LoadValuesFromJson(configJson);
var pairs = new Dictionary<string, string> {
{ "username", config.Username.Value }, { "username", config.Username.Value },
{ "password", config.Password.Value } { "password", config.Password.Value }
}; };
var content = new FormUrlEncodedContent (pairs); var content = new FormUrlEncodedContent(pairs);
var response = await client.PostAsync (LoginUrl, content); var response = await client.PostAsync(LoginUrl, content);
var responseContent = await response.Content.ReadAsStringAsync (); var responseContent = await response.Content.ReadAsStringAsync();
if (!responseContent.Contains ("logout.php")) { if (!responseContent.Contains("logout.php"))
CQ dom = responseContent; {
var messageEl = dom ["table.detail td.text"].Last (); CQ dom = responseContent;
messageEl.Children ("a").Remove (); var messageEl = dom["table.detail td.text"].Last();
messageEl.Children ("style").Remove (); messageEl.Children("a").Remove();
var errorMessage = messageEl.Text ().Trim (); messageEl.Children("style").Remove();
throw new ExceptionWithConfigData (errorMessage, (ConfigurationData)config); var errorMessage = messageEl.Text().Trim();
} else { throw new ExceptionWithConfigData(errorMessage, (ConfigurationData)config);
var configSaveData = new JObject (); }
configSaveData ["cookies"] = cookies.ToJson (SiteLink); else
{
var configSaveData = new JObject();
configSaveData["cookies"] = cookies.ToJson(SiteLink);
if (OnSaveConfigurationRequested != null) if (OnSaveConfigurationRequested != null)
OnSaveConfigurationRequested (this, configSaveData); OnSaveConfigurationRequested(this, configSaveData);
IsConfigured = true; IsConfigured = true;
} }
} }
public event Action<IndexerInterface, JToken> OnSaveConfigurationRequested; public event Action<IndexerInterface, JToken> OnSaveConfigurationRequested;
public bool IsConfigured { get; private set; } public bool IsConfigured { get; private set; }
public void LoadFromSavedConfiguration (JToken jsonConfig) public void LoadFromSavedConfiguration(JToken jsonConfig)
{ {
cookies.FillFromJson (new Uri (BaseUrl), (JArray)jsonConfig ["cookies"]); cookies.FillFromJson(new Uri(BaseUrl), (JArray)jsonConfig["cookies"]);
IsConfigured = true; IsConfigured = true;
} }
public async Task<ReleaseInfo[]> PerformQuery (TorznabQuery query) public async Task<ReleaseInfo[]> PerformQuery(TorznabQuery query)
{ {
List<ReleaseInfo> releases = new List<ReleaseInfo> (); List<ReleaseInfo> releases = new List<ReleaseInfo>();
foreach (var title in query.ShowTitles ?? new string[] { string.Empty }) { foreach (var title in query.ShowTitles ?? new string[] { string.Empty })
var searchString = title + " " + query.GetEpisodeSearchString (); {
var episodeSearchUrl = SearchUrl + HttpUtility.UrlEncode (searchString); var searchString = title + " " + query.GetEpisodeSearchString();
var results = await client.GetStringAsync (episodeSearchUrl); var episodeSearchUrl = SearchUrl + HttpUtility.UrlEncode(searchString);
CQ dom = results; var results = await client.GetStringAsync(episodeSearchUrl);
dom ["#needseed"].Remove (); try
var rows = dom ["table[width='750'] > tbody"].Children (); {
foreach (var row in rows.Skip(1)) { CQ dom = results;
dom["#needseed"].Remove();
var rows = dom["table[width='750'] > tbody"].Children();
foreach (var row in rows.Skip(1))
{
var release = new ReleaseInfo (); var release = new ReleaseInfo();
var qRow = row.Cq (); var qRow = row.Cq();
var qLink = qRow.Children ().ElementAt (2).Cq ().Children ("a").First (); var qLink = qRow.Children().ElementAt(2).Cq().Children("a").First();
release.MinimumRatio = 1; release.MinimumRatio = 1;
release.MinimumSeedTime = 172800; release.MinimumSeedTime = 172800;
release.Title = qLink.Attr ("title"); release.Title = qLink.Attr("title");
release.Description = release.Title; release.Description = release.Title;
release.Guid = new Uri (BaseUrl + qLink.Attr ("href")); release.Guid = new Uri(BaseUrl + qLink.Attr("href"));
release.Comments = release.Guid; release.Comments = release.Guid;
release.Link = new Uri (string.Format (DownloadUrl, qLink.Attr ("href").Split ('=') [1])); release.Link = new Uri(string.Format(DownloadUrl, qLink.Attr("href").Split('=')[1]));
var dateString = qRow.Children ().ElementAt (5).Cq ().Text ().Trim (); var dateString = qRow.Children().ElementAt(5).Cq().Text().Trim();
var pubDate = DateTime.ParseExact (dateString, "yyyy-MM-dd HH:mm:ss", CultureInfo.InvariantCulture); var pubDate = DateTime.ParseExact(dateString, "yyyy-MM-dd HH:mm:ss", CultureInfo.InvariantCulture);
release.PublishDate = pubDate; release.PublishDate = pubDate;
var sizeCol = qRow.Children ().ElementAt (6); var sizeCol = qRow.Children().ElementAt(6);
var sizeVal = sizeCol.ChildNodes [0].NodeValue; var sizeVal = sizeCol.ChildNodes[0].NodeValue;
var sizeUnit = sizeCol.ChildNodes [2].NodeValue; var sizeUnit = sizeCol.ChildNodes[2].NodeValue;
release.Size = ReleaseInfo.GetBytes (sizeUnit, float.Parse (sizeVal)); release.Size = ReleaseInfo.GetBytes(sizeUnit, float.Parse(sizeVal));
release.Seeders = int.Parse (qRow.Children ().ElementAt (8).Cq ().Text ().Trim ()); release.Seeders = int.Parse(qRow.Children().ElementAt(8).Cq().Text().Trim());
release.Peers = int.Parse (qRow.Children ().ElementAt (9).Cq ().Text ().Trim ()) + release.Seeders; release.Peers = int.Parse(qRow.Children().ElementAt(9).Cq().Text().Trim()) + release.Seeders;
releases.Add (release); releases.Add(release);
} }
} }
catch (Exception ex)
{
OnResultParsingError(this, results, ex);
throw ex;
}
}
return releases.ToArray (); return releases.ToArray();
} }
public Task<byte[]> Download (Uri link) public Task<byte[]> Download(Uri link)
{ {
return client.GetByteArrayAsync (link); return client.GetByteArrayAsync(link);
} }
}
}
} }

72
src/Jackett/Indexers/BitMeTV.cs
View File

@@ -50,6 +50,7 @@ namespace Jackett
HttpClient client; HttpClient client;
public event Action<IndexerInterface, JToken> OnSaveConfigurationRequested; public event Action<IndexerInterface, JToken> OnSaveConfigurationRequested;
public event Action<IndexerInterface, string, Exception> OnResultParsingError;
public BitMeTV() public BitMeTV()
{ {
@@ -136,46 +137,54 @@ namespace Jackett
var searchString = title + " " + query.GetEpisodeSearchString(); var searchString = title + " " + query.GetEpisodeSearchString();
var episodeSearchUrl = string.Format("{0}?search={1}&cat=0", SearchUrl, HttpUtility.UrlEncode(searchString)); var episodeSearchUrl = string.Format("{0}?search={1}&cat=0", SearchUrl, HttpUtility.UrlEncode(searchString));
var results = await client.GetStringAsync(episodeSearchUrl); var results = await client.GetStringAsync(episodeSearchUrl);
CQ dom = results; try
var table = dom["tbody > tr > .latest"].Parent().Parent();
foreach (var row in table.Children().Skip(1))
{ {
var release = new ReleaseInfo(); CQ dom = results;
CQ qDetailsCol = row.ChildElements.ElementAt(1).Cq(); var table = dom["tbody > tr > .latest"].Parent().Parent();
CQ qLink = qDetailsCol.Children("a").First();
release.MinimumRatio = 1; foreach (var row in table.Children().Skip(1))
release.MinimumSeedTime = 172800; {
release.Comments = new Uri(BaseUrl + "/" + qLink.Attr("href")); var release = new ReleaseInfo();
release.Guid = release.Comments;
release.Title = qLink.Attr("title");
release.Description = release.Title;
//"Tuesday, June 11th 2013 at 03:52:53 AM" to... CQ qDetailsCol = row.ChildElements.ElementAt(1).Cq();
//"Tuesday June 11 2013 03:52:53 AM" CQ qLink = qDetailsCol.Children("a").First();
var timestamp = qDetailsCol.Children("font").Text().Trim() + " ";
var timeParts = new List<string>(timestamp.Replace(" at", "").Replace(",", "").Split(' '));
timeParts[2] = Regex.Replace(timeParts[2], "[^0-9.]", "");
var formattedTimeString = string.Join(" ", timeParts.ToArray()).Trim();
release.PublishDate = DateTime.ParseExact(formattedTimeString, "dddd MMMM d yyyy hh:mm:ss tt", CultureInfo.InvariantCulture);
release.Link = new Uri(BaseUrl + "/" + row.ChildElements.ElementAt(2).Cq().Children("a.index").Attr("href")); release.MinimumRatio = 1;
release.MinimumSeedTime = 172800;
release.Comments = new Uri(BaseUrl + "/" + qLink.Attr("href"));
release.Guid = release.Comments;
release.Title = qLink.Attr("title");
release.Description = release.Title;
var sizeCol = row.ChildElements.ElementAt(6); //"Tuesday, June 11th 2013 at 03:52:53 AM" to...
var sizeVal = float.Parse(sizeCol.ChildNodes[0].NodeValue); //"Tuesday June 11 2013 03:52:53 AM"
var sizeUnit = sizeCol.ChildNodes[2].NodeValue; var timestamp = qDetailsCol.Children("font").Text().Trim() + " ";
release.Size = ReleaseInfo.GetBytes(sizeUnit, sizeVal); var timeParts = new List<string>(timestamp.Replace(" at", "").Replace(",", "").Split(' '));
timeParts[2] = Regex.Replace(timeParts[2], "[^0-9.]", "");
var formattedTimeString = string.Join(" ", timeParts.ToArray()).Trim();
release.PublishDate = DateTime.ParseExact(formattedTimeString, "dddd MMMM d yyyy hh:mm:ss tt", CultureInfo.InvariantCulture);
release.Seeders = int.Parse(row.ChildElements.ElementAt(8).Cq().Text()); release.Link = new Uri(BaseUrl + "/" + row.ChildElements.ElementAt(2).Cq().Children("a.index").Attr("href"));
release.Peers = int.Parse(row.ChildElements.ElementAt(9).Cq().Text()) + release.Seeders;
if (!release.Title.ToLower().Contains(title.ToLower())) var sizeCol = row.ChildElements.ElementAt(6);
continue; var sizeVal = float.Parse(sizeCol.ChildNodes[0].NodeValue);
var sizeUnit = sizeCol.ChildNodes[2].NodeValue;
release.Size = ReleaseInfo.GetBytes(sizeUnit, sizeVal);
releases.Add(release); release.Seeders = int.Parse(row.ChildElements.ElementAt(8).Cq().Text());
release.Peers = int.Parse(row.ChildElements.ElementAt(9).Cq().Text()) + release.Seeders;
if (!release.Title.ToLower().Contains(title.ToLower()))
continue;
releases.Add(release);
}
}
catch (Exception ex)
{
OnResultParsingError(this, results, ex);
throw ex;
} }
} }
@@ -187,5 +196,6 @@ namespace Jackett
{ {
return client.GetByteArrayAsync(link); return client.GetByteArrayAsync(link);
} }
} }
} }

271
src/Jackett/Indexers/Freshon.cs
View File

@@ -14,168 +14,183 @@ using System.Web.UI.WebControls;
namespace Jackett namespace Jackett
{ {
public class Freshon : IndexerInterface public class Freshon : IndexerInterface
{ {
public event Action<IndexerInterface, string, Exception> OnResultParsingError;
static string BaseUrl = "https://freshon.tv"; static string BaseUrl = "https://freshon.tv";
static string LoginUrl = BaseUrl + "/login.php"; static string LoginUrl = BaseUrl + "/login.php";
static string LoginPostUrl = BaseUrl + "/login.php?action=makelogin"; static string LoginPostUrl = BaseUrl + "/login.php?action=makelogin";
static string SearchUrl = BaseUrl + "/browse.php"; static string SearchUrl = BaseUrl + "/browse.php";
static string chromeUserAgent = "Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2272.118 Safari/537.36"; static string chromeUserAgent = "Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2272.118 Safari/537.36";
CookieContainer cookies; CookieContainer cookies;
HttpClientHandler handler; HttpClientHandler handler;
HttpClient client; HttpClient client;
public bool IsConfigured { get; private set; } public bool IsConfigured { get; private set; }
public string DisplayName { get { return "FreshOnTV"; } } public string DisplayName { get { return "FreshOnTV"; } }
public string DisplayDescription { get { return "Our goal is to provide the latest stuff in the TV show domain"; } } public string DisplayDescription { get { return "Our goal is to provide the latest stuff in the TV show domain"; } }
public Uri SiteLink { get { return new Uri (BaseUrl); } } public Uri SiteLink { get { return new Uri(BaseUrl); } }
public event Action<IndexerInterface, JToken> OnSaveConfigurationRequested; public event Action<IndexerInterface, JToken> OnSaveConfigurationRequested;
public Freshon () public Freshon()
{ {
IsConfigured = false; IsConfigured = false;
cookies = new CookieContainer (); cookies = new CookieContainer();
handler = new HttpClientHandler { handler = new HttpClientHandler
CookieContainer = cookies, {
AllowAutoRedirect = true, CookieContainer = cookies,
UseCookies = true, AllowAutoRedirect = true,
}; UseCookies = true,
client = new HttpClient (handler); };
} client = new HttpClient(handler);
}
public async Task<ConfigurationData> GetConfigurationForSetup () public async Task<ConfigurationData> GetConfigurationForSetup()
{ {
var request = CreateHttpRequest (new Uri (LoginUrl)); var request = CreateHttpRequest(new Uri(LoginUrl));
var response = await client.SendAsync (request); var response = await client.SendAsync(request);
await response.Content.ReadAsStreamAsync (); await response.Content.ReadAsStreamAsync();
var config = new ConfigurationDataBasicLogin (); var config = new ConfigurationDataBasicLogin();
return config; return config;
} }
public async Task ApplyConfiguration (JToken configJson) public async Task ApplyConfiguration(JToken configJson)
{ {
var config = new ConfigurationDataBasicLogin (); var config = new ConfigurationDataBasicLogin();
config.LoadValuesFromJson (configJson); config.LoadValuesFromJson(configJson);
var pairs = new Dictionary<string, string> { var pairs = new Dictionary<string, string> {
{ "username", config.Username.Value }, { "username", config.Username.Value },
{ "password", config.Password.Value } { "password", config.Password.Value }
}; };
var content = new FormUrlEncodedContent (pairs); var content = new FormUrlEncodedContent(pairs);
var message = CreateHttpRequest (new Uri (LoginPostUrl)); var message = CreateHttpRequest(new Uri(LoginPostUrl));
message.Method = HttpMethod.Post; message.Method = HttpMethod.Post;
message.Content = content; message.Content = content;
message.Headers.Referrer = new Uri (LoginUrl); message.Headers.Referrer = new Uri(LoginUrl);
var response = await client.SendAsync (message); var response = await client.SendAsync(message);
var responseContent = await response.Content.ReadAsStringAsync (); var responseContent = await response.Content.ReadAsStringAsync();
if (!responseContent.Contains ("/logout.php")) { if (!responseContent.Contains("/logout.php"))
CQ dom = responseContent; {
var messageEl = dom [".error_text"]; CQ dom = responseContent;
var errorMessage = messageEl.Text ().Trim (); var messageEl = dom[".error_text"];
throw new ExceptionWithConfigData (errorMessage, (ConfigurationData)config); var errorMessage = messageEl.Text().Trim();
} else { throw new ExceptionWithConfigData(errorMessage, (ConfigurationData)config);
var configSaveData = new JObject (); }
configSaveData ["cookies"] = cookies.ToJson (SiteLink); else
{
var configSaveData = new JObject();
configSaveData["cookies"] = cookies.ToJson(SiteLink);
if (OnSaveConfigurationRequested != null) if (OnSaveConfigurationRequested != null)
OnSaveConfigurationRequested (this, configSaveData); OnSaveConfigurationRequested(this, configSaveData);
IsConfigured = true; IsConfigured = true;
} }
} }
public void LoadFromSavedConfiguration (JToken jsonConfig) public void LoadFromSavedConfiguration(JToken jsonConfig)
{ {
cookies.FillFromJson (new Uri (BaseUrl), (JArray)jsonConfig ["cookies"]); cookies.FillFromJson(new Uri(BaseUrl), (JArray)jsonConfig["cookies"]);
IsConfigured = true; IsConfigured = true;
} }
HttpRequestMessage CreateHttpRequest (Uri uri) HttpRequestMessage CreateHttpRequest(Uri uri)
{ {
var message = new HttpRequestMessage (); var message = new HttpRequestMessage();
message.Method = HttpMethod.Get; message.Method = HttpMethod.Get;
message.RequestUri = uri; message.RequestUri = uri;
message.Headers.UserAgent.ParseAdd (chromeUserAgent); message.Headers.UserAgent.ParseAdd(chromeUserAgent);
return message; return message;
} }
public async Task<ReleaseInfo[]> PerformQuery (TorznabQuery query) public async Task<ReleaseInfo[]> PerformQuery(TorznabQuery query)
{ {
List<ReleaseInfo> releases = new List<ReleaseInfo> (); List<ReleaseInfo> releases = new List<ReleaseInfo>();
foreach (var title in query.ShowTitles ?? new string[] { string.Empty }) { foreach (var title in query.ShowTitles ?? new string[] { string.Empty })
string episodeSearchUrl; {
string episodeSearchUrl;
if (string.IsNullOrEmpty (title)) if (string.IsNullOrEmpty(title))
episodeSearchUrl = SearchUrl; episodeSearchUrl = SearchUrl;
else { else
var searchString = title + " " + query.GetEpisodeSearchString (); {
episodeSearchUrl = string.Format ("{0}?search={1}&cat=0", SearchUrl, HttpUtility.UrlEncode (searchString)); var searchString = title + " " + query.GetEpisodeSearchString();
} episodeSearchUrl = string.Format("{0}?search={1}&cat=0", SearchUrl, HttpUtility.UrlEncode(searchString));
}
var request = CreateHttpRequest (new Uri (episodeSearchUrl)); var request = CreateHttpRequest(new Uri(episodeSearchUrl));
var response = await client.SendAsync (request); var response = await client.SendAsync(request);
var results = await response.Content.ReadAsStringAsync (); var results = await response.Content.ReadAsStringAsync();
try
{
CQ dom = results;
CQ dom = results; var rows = dom["#highlight > tbody > tr"];
var rows = dom ["#highlight > tbody > tr"]; foreach (var row in rows.Skip(1))
{
var release = new ReleaseInfo();
foreach (var row in rows.Skip(1)) { var qRow = row.Cq();
var release = new ReleaseInfo (); var qLink = qRow.Find("a.torrent_name_link").First();
var qRow = row.Cq (); release.MinimumRatio = 1;
var qLink = qRow.Find ("a.torrent_name_link").First (); release.MinimumSeedTime = 172800;
release.Title = qLink.Attr("title");
release.Description = release.Title;
release.Guid = new Uri(BaseUrl + qLink.Attr("href"));
release.Comments = release.Guid;
release.Link = new Uri(BaseUrl + qRow.Find("td.table_links > a").First().Attr("href"));
release.MinimumRatio = 1; DateTime pubDate;
release.MinimumSeedTime = 172800; var dateString = qRow.Find("td.table_added").Text().Trim();
release.Title = qLink.Attr ("title"); if (dateString.StartsWith("Today "))
release.Description = release.Title; pubDate = (DateTime.UtcNow + TimeSpan.Parse(dateString.Split(' ')[1])).ToLocalTime();
release.Guid = new Uri (BaseUrl + qLink.Attr ("href")); else if (dateString.StartsWith("Yesterday "))
release.Comments = release.Guid; pubDate = (DateTime.UtcNow + TimeSpan.Parse(dateString.Split(' ')[1]) - TimeSpan.FromDays(1)).ToLocalTime();
release.Link = new Uri (BaseUrl + qRow.Find ("td.table_links > a").First ().Attr ("href")); else
pubDate = DateTime.ParseExact(dateString, "d-MMM-yyyy HH:mm:ss", CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal).ToLocalTime();
release.PublishDate = pubDate;
DateTime pubDate; release.Seeders = int.Parse(qRow.Find("td.table_seeders").Text().Trim());
var dateString = qRow.Find ("td.table_added").Text ().Trim (); release.Peers = int.Parse(qRow.Find("td.table_leechers").Text().Trim()) + release.Seeders;
if (dateString.StartsWith ("Today "))
pubDate = (DateTime.UtcNow + TimeSpan.Parse (dateString.Split (' ') [1])).ToLocalTime ();
else if (dateString.StartsWith ("Yesterday "))
pubDate = (DateTime.UtcNow + TimeSpan.Parse (dateString.Split (' ') [1]) - TimeSpan.FromDays (1)).ToLocalTime ();
else
pubDate = DateTime.ParseExact (dateString, "d-MMM-yyyy HH:mm:ss", CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal).ToLocalTime ();
release.PublishDate = pubDate;
release.Seeders = int.Parse (qRow.Find ("td.table_seeders").Text ().Trim ()); var sizeCol = qRow.Find("td.table_size")[0];
release.Peers = int.Parse (qRow.Find ("td.table_leechers").Text ().Trim ()) + release.Seeders; var sizeVal = float.Parse(sizeCol.ChildNodes[0].NodeValue.Trim());
var sizeUnit = sizeCol.ChildNodes[2].NodeValue.Trim();
release.Size = ReleaseInfo.GetBytes(sizeUnit, sizeVal);
var sizeCol = qRow.Find ("td.table_size") [0]; releases.Add(release);
var sizeVal = float.Parse (sizeCol.ChildNodes [0].NodeValue.Trim ()); }
var sizeUnit = sizeCol.ChildNodes [2].NodeValue.Trim (); }
release.Size = ReleaseInfo.GetBytes (sizeUnit, sizeVal); catch (Exception ex)
{
OnResultParsingError(this, results, ex);
throw ex;
}
}
releases.Add (release); return releases.ToArray();
} }
}
return releases.ToArray (); public async Task<byte[]> Download(Uri link)
} {
var request = CreateHttpRequest(link);
public async Task<byte[]> Download (Uri link) var response = await client.SendAsync(request);
{ var bytes = await response.Content.ReadAsByteArrayAsync();
var request = CreateHttpRequest (link); return bytes;
var response = await client.SendAsync (request); }
var bytes = await response.Content.ReadAsByteArrayAsync (); }
return bytes;
}
}
} }

280
src/Jackett/Indexers/IPTorrents.cs
View File

@@ -11,181 +11,199 @@ using System.Web;
namespace Jackett.Indexers namespace Jackett.Indexers
{ {
public class IPTorrents : IndexerInterface public class IPTorrents : IndexerInterface
{ {
public event Action<IndexerInterface, Newtonsoft.Json.Linq.JToken> OnSaveConfigurationRequested; public event Action<IndexerInterface, JToken> OnSaveConfigurationRequested;
public event Action<IndexerInterface, string, Exception> OnResultParsingError;
public string DisplayName { get { return "IPTorrents"; } } public string DisplayName { get { return "IPTorrents"; } }
public string DisplayDescription { get { return "Always a step ahead"; } } public string DisplayDescription { get { return "Always a step ahead"; } }
public Uri SiteLink { get { return new Uri (BaseUrl); } } public Uri SiteLink { get { return new Uri(BaseUrl); } }
public bool IsConfigured { get; private set; } public bool IsConfigured { get; private set; }
static string chromeUserAgent = "Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2272.118 Safari/537.36"; static string chromeUserAgent = "Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2272.118 Safari/537.36";
static string BaseUrl = "https://iptorrents.com"; static string BaseUrl = "https://iptorrents.com";
string SearchUrl = BaseUrl + "/t?q="; string SearchUrl = BaseUrl + "/t?q=";
CookieContainer cookies; CookieContainer cookies;
HttpClientHandler handler; HttpClientHandler handler;
HttpClient client; HttpClient client;
public IPTorrents () public IPTorrents()
{ {
IsConfigured = false; IsConfigured = false;
cookies = new CookieContainer (); cookies = new CookieContainer();
handler = new HttpClientHandler { handler = new HttpClientHandler
CookieContainer = cookies, {
AllowAutoRedirect = true, CookieContainer = cookies,
UseCookies = true, AllowAutoRedirect = true,
}; UseCookies = true,
client = new HttpClient (handler); };
} client = new HttpClient(handler);
}
public async Task<ConfigurationData> GetConfigurationForSetup () public async Task<ConfigurationData> GetConfigurationForSetup()
{ {
await client.GetAsync (new Uri (BaseUrl)); await client.GetAsync(new Uri(BaseUrl));
var config = new ConfigurationDataBasicLogin (); var config = new ConfigurationDataBasicLogin();
return (ConfigurationData)config; return (ConfigurationData)config;
} }
public async Task ApplyConfiguration (JToken configJson) public async Task ApplyConfiguration(JToken configJson)
{ {
var config = new ConfigurationDataBasicLogin (); var config = new ConfigurationDataBasicLogin();
config.LoadValuesFromJson (configJson); config.LoadValuesFromJson(configJson);
var pairs = new Dictionary<string, string> { var pairs = new Dictionary<string, string> {
{ "username", config.Username.Value }, { "username", config.Username.Value },
{ "password", config.Password.Value } { "password", config.Password.Value }
}; };
var content = new FormUrlEncodedContent (pairs); var content = new FormUrlEncodedContent(pairs);
var message = new HttpRequestMessage (); var message = new HttpRequestMessage();
message.Method = HttpMethod.Post; message.Method = HttpMethod.Post;
message.Content = content; message.Content = content;
message.RequestUri = new Uri (BaseUrl); message.RequestUri = new Uri(BaseUrl);
message.Headers.Referrer = new Uri (BaseUrl); message.Headers.Referrer = new Uri(BaseUrl);
message.Headers.UserAgent.ParseAdd (chromeUserAgent); message.Headers.UserAgent.ParseAdd(chromeUserAgent);
var response = await client.SendAsync (message); var response = await client.SendAsync(message);
var responseContent = await response.Content.ReadAsStringAsync (); var responseContent = await response.Content.ReadAsStringAsync();
if (!responseContent.Contains ("/my.php")) { if (!responseContent.Contains("/my.php"))
CQ dom = responseContent; {
var messageEl = dom ["body > div"].First (); CQ dom = responseContent;
var errorMessage = messageEl.Text ().Trim (); var messageEl = dom["body > div"].First();
throw new ExceptionWithConfigData (errorMessage, (ConfigurationData)config); var errorMessage = messageEl.Text().Trim();
} else { throw new ExceptionWithConfigData(errorMessage, (ConfigurationData)config);
var configSaveData = new JObject (); }
configSaveData ["cookies"] = cookies.ToJson (SiteLink); else
{
var configSaveData = new JObject();
configSaveData["cookies"] = cookies.ToJson(SiteLink);
if (OnSaveConfigurationRequested != null) if (OnSaveConfigurationRequested != null)
OnSaveConfigurationRequested (this, configSaveData); OnSaveConfigurationRequested(this, configSaveData);
IsConfigured = true; IsConfigured = true;
} }
} }
HttpRequestMessage CreateHttpRequest (Uri uri) HttpRequestMessage CreateHttpRequest(Uri uri)
{ {
var message = new HttpRequestMessage (); var message = new HttpRequestMessage();
message.Method = HttpMethod.Get; message.Method = HttpMethod.Get;
message.RequestUri = uri; message.RequestUri = uri;
message.Headers.UserAgent.ParseAdd (chromeUserAgent); message.Headers.UserAgent.ParseAdd(chromeUserAgent);
return message; return message;
} }
public void LoadFromSavedConfiguration (Newtonsoft.Json.Linq.JToken jsonConfig) public void LoadFromSavedConfiguration(Newtonsoft.Json.Linq.JToken jsonConfig)
{ {
cookies.FillFromJson (new Uri (BaseUrl), (JArray)jsonConfig ["cookies"]); cookies.FillFromJson(new Uri(BaseUrl), (JArray)jsonConfig["cookies"]);
IsConfigured = true; IsConfigured = true;
} }
public async Task<ReleaseInfo[]> PerformQuery (TorznabQuery query) public async Task<ReleaseInfo[]> PerformQuery(TorznabQuery query)
{ {
List<ReleaseInfo> releases = new List<ReleaseInfo> (); List<ReleaseInfo> releases = new List<ReleaseInfo>();
foreach (var title in query.ShowTitles ?? new string[] { string.Empty }) { foreach (var title in query.ShowTitles ?? new string[] { string.Empty })
{
var searchString = title + " " + query.GetEpisodeSearchString (); var searchString = title + " " + query.GetEpisodeSearchString();
var episodeSearchUrl = SearchUrl + HttpUtility.UrlEncode (searchString); var episodeSearchUrl = SearchUrl + HttpUtility.UrlEncode(searchString);
var request = CreateHttpRequest (new Uri (episodeSearchUrl)); var request = CreateHttpRequest(new Uri(episodeSearchUrl));
var response = await client.SendAsync (request); var response = await client.SendAsync(request);
var results = await response.Content.ReadAsStringAsync (); var results = await response.Content.ReadAsStringAsync();
CQ dom = results; try
{
CQ dom = results;
var rows = dom ["table.torrents > tbody > tr"]; var rows = dom["table.torrents > tbody > tr"];
foreach (var row in rows.Skip(1)) { foreach (var row in rows.Skip(1))
var release = new ReleaseInfo (); {
var release = new ReleaseInfo();
var qRow = row.Cq (); var qRow = row.Cq();
var qTitleLink = qRow.Find ("a.t_title").First (); var qTitleLink = qRow.Find("a.t_title").First();
release.Title = qTitleLink.Text ().Trim (); release.Title = qTitleLink.Text().Trim();
release.Description = release.Title; release.Description = release.Title;
release.Guid = new Uri (BaseUrl + qTitleLink.Attr ("href")); release.Guid = new Uri(BaseUrl + qTitleLink.Attr("href"));
release.Comments = release.Guid; release.Comments = release.Guid;
DateTime pubDate; DateTime pubDate;
var descString = qRow.Find (".t_ctime").Text (); var descString = qRow.Find(".t_ctime").Text();
var dateString = descString.Split ('|').Last ().Trim (); var dateString = descString.Split('|').Last().Trim();
dateString = dateString.Split (new string[] { " by " }, StringSplitOptions.None) [0]; dateString = dateString.Split(new string[] { " by " }, StringSplitOptions.None)[0];
var dateValue = float.Parse (dateString.Split (' ') [0]); var dateValue = float.Parse(dateString.Split(' ')[0]);
var dateUnit = dateString.Split (' ') [1]; var dateUnit = dateString.Split(' ')[1];
if (dateUnit.Contains ("minute")) if (dateUnit.Contains("minute"))
pubDate = DateTime.Now - TimeSpan.FromMinutes (dateValue); pubDate = DateTime.Now - TimeSpan.FromMinutes(dateValue);
else if (dateUnit.Contains ("hour")) else if (dateUnit.Contains("hour"))
pubDate = DateTime.Now - TimeSpan.FromHours (dateValue); pubDate = DateTime.Now - TimeSpan.FromHours(dateValue);
else if (dateUnit.Contains ("day")) else if (dateUnit.Contains("day"))
pubDate = DateTime.Now - TimeSpan.FromDays (dateValue); pubDate = DateTime.Now - TimeSpan.FromDays(dateValue);
else if (dateUnit.Contains ("week")) else if (dateUnit.Contains("week"))
pubDate = DateTime.Now - TimeSpan.FromDays (7 * dateValue); pubDate = DateTime.Now - TimeSpan.FromDays(7 * dateValue);
else if (dateUnit.Contains ("month")) else if (dateUnit.Contains("month"))
pubDate = DateTime.Now - TimeSpan.FromDays (30 * dateValue); pubDate = DateTime.Now - TimeSpan.FromDays(30 * dateValue);
else if (dateUnit.Contains ("year")) else if (dateUnit.Contains("year"))
pubDate = DateTime.Now - TimeSpan.FromDays (365 * dateValue); pubDate = DateTime.Now - TimeSpan.FromDays(365 * dateValue);
else else
pubDate = DateTime.MinValue; pubDate = DateTime.MinValue;
release.PublishDate = pubDate; release.PublishDate = pubDate;
var qLink = row.ChildElements.ElementAt (3).Cq ().Children ("a"); var qLink = row.ChildElements.ElementAt(3).Cq().Children("a");
release.Link = new Uri (BaseUrl + qLink.Attr ("href")); release.Link = new Uri(BaseUrl + qLink.Attr("href"));
var sizeStr = row.ChildElements.ElementAt (5).Cq ().Text ().Trim (); var sizeStr = row.ChildElements.ElementAt(5).Cq().Text().Trim();
var sizeVal = float.Parse (sizeStr.Split (' ') [0]); var sizeVal = float.Parse(sizeStr.Split(' ')[0]);
var sizeUnit = sizeStr.Split (' ') [1]; var sizeUnit = sizeStr.Split(' ')[1];
release.Size = ReleaseInfo.GetBytes (sizeUnit, sizeVal); release.Size = ReleaseInfo.GetBytes(sizeUnit, sizeVal);
release.Seeders = int.Parse (qRow.Find (".t_seeders").Text ().Trim ()); release.Seeders = int.Parse(qRow.Find(".t_seeders").Text().Trim());
release.Peers = int.Parse (qRow.Find (".t_leechers").Text ().Trim ()) + release.Seeders; release.Peers = int.Parse(qRow.Find(".t_leechers").Text().Trim()) + release.Seeders;
releases.Add (release); releases.Add(release);
} }
}
catch (Exception ex)
{
OnResultParsingError(this, results, ex);
throw ex;
}
} }
return releases.ToArray (); return releases.ToArray();
} }
public async Task<byte[]> Download (Uri link) public async Task<byte[]> Download(Uri link)
{ {
var request = CreateHttpRequest (link); var request = CreateHttpRequest(link);
var response = await client.SendAsync (request); var response = await client.SendAsync(request);
var bytes = await response.Content.ReadAsByteArrayAsync (); var bytes = await response.Content.ReadAsByteArrayAsync();
return bytes; return bytes;
} }
}
}
} }

48
src/Jackett/Indexers/MoreThanTV.cs
View File

@@ -30,6 +30,7 @@ namespace Jackett.Indexers
public event Action<IndexerInterface, JToken> OnSaveConfigurationRequested; public event Action<IndexerInterface, JToken> OnSaveConfigurationRequested;
public event Action<IndexerInterface, string, Exception> OnResultParsingError;
public bool IsConfigured { get; private set; } public bool IsConfigured { get; private set; }
@@ -159,36 +160,44 @@ namespace Jackett.Indexers
var response = await CurlHelper.GetAsync(episodeSearchUrl, cookieHeader); var response = await CurlHelper.GetAsync(episodeSearchUrl, cookieHeader);
results = Encoding.UTF8.GetString(response.Content); results = Encoding.UTF8.GetString(response.Content);
} }
try
var json = JObject.Parse(results);
foreach (JObject r in json["response"]["results"])
{ {
var pubDate = UnixTimestampToDateTime(double.Parse((string)r["groupTime"])); var json = JObject.Parse(results);
var groupName = (string)r["groupName"]; foreach (JObject r in json["response"]["results"])
if (r["torrents"] is JArray)
{ {
foreach (JObject t in r["torrents"])
var pubDate = UnixTimestampToDateTime(double.Parse((string)r["groupTime"]));
var groupName = (string)r["groupName"];
if (r["torrents"] is JArray)
{
foreach (JObject t in r["torrents"])
{
var release = new ReleaseInfo();
release.PublishDate = pubDate;
release.Title = groupName;
release.Description = groupName;
FillReleaseInfoFromJson(release, t);
releases.Add(release);
}
}
else
{ {
var release = new ReleaseInfo(); var release = new ReleaseInfo();
release.PublishDate = pubDate; release.PublishDate = pubDate;
release.Title = groupName; release.Title = groupName;
release.Description = groupName; release.Description = groupName;
FillReleaseInfoFromJson(release, t); FillReleaseInfoFromJson(release, r);
releases.Add(release); releases.Add(release);
} }
}
else
{
var release = new ReleaseInfo();
release.PublishDate = pubDate;
release.Title = groupName;
release.Description = groupName;
FillReleaseInfoFromJson(release, r);
releases.Add(release);
}
}
}
catch (Exception ex)
{
OnResultParsingError(this, results, ex);
throw ex;
} }
} }
@@ -215,5 +224,6 @@ namespace Jackett.Indexers
} }
} }
} }
} }

49
src/Jackett/Indexers/Strike.cs
View File

@@ -31,6 +31,7 @@ namespace Jackett.Indexers
public event Action<IndexerInterface, JToken> OnSaveConfigurationRequested; public event Action<IndexerInterface, JToken> OnSaveConfigurationRequested;
public event Action<IndexerInterface, string, Exception> OnResultParsingError;
public string DisplayName public string DisplayName
{ {
@@ -116,32 +117,40 @@ namespace Jackett.Indexers
var searchString = title + " " + query.GetEpisodeSearchString(); var searchString = title + " " + query.GetEpisodeSearchString();
var episodeSearchUrl = baseUrl + string.Format(SearchUrl, HttpUtility.UrlEncode(searchString.Trim())); var episodeSearchUrl = baseUrl + string.Format(SearchUrl, HttpUtility.UrlEncode(searchString.Trim()));
var results = await client.GetStringAsync(episodeSearchUrl); var results = await client.GetStringAsync(episodeSearchUrl);
var jResults = JObject.Parse(results); try
foreach (JObject result in (JArray)jResults["torrents"])
{ {
var release = new ReleaseInfo(); var jResults = JObject.Parse(results);
foreach (JObject result in (JArray)jResults["torrents"])
{
var release = new ReleaseInfo();
release.MinimumRatio = 1; release.MinimumRatio = 1;
release.MinimumSeedTime = 172800; release.MinimumSeedTime = 172800;
release.Title = (string)result["torrent_title"]; release.Title = (string)result["torrent_title"];
release.Description = release.Title; release.Description = release.Title;
release.Seeders = (int)result["seeds"]; release.Seeders = (int)result["seeds"];
release.Peers = (int)result["leeches"] + release.Seeders; release.Peers = (int)result["leeches"] + release.Seeders;
release.Size = (long)result["size"]; release.Size = (long)result["size"];
// "Apr 2, 2015", "Apr 12, 2015" (note the spacing) // "Apr 2, 2015", "Apr 12, 2015" (note the spacing)
var dateString = string.Join(" ", ((string)result["upload_date"]).Split(new char[] { ' ' }, StringSplitOptions.RemoveEmptyEntries)); var dateString = string.Join(" ", ((string)result["upload_date"]).Split(new char[] { ' ' }, StringSplitOptions.RemoveEmptyEntries));
release.PublishDate = DateTime.ParseExact(dateString, "MMM d, yyyy", CultureInfo.InvariantCulture); release.PublishDate = DateTime.ParseExact(dateString, "MMM d, yyyy", CultureInfo.InvariantCulture);
release.Guid = new Uri((string)result["page"]); release.Guid = new Uri((string)result["page"]);
release.Comments = release.Guid; release.Comments = release.Guid;
release.InfoHash = (string)result["torrent_hash"]; release.InfoHash = (string)result["torrent_hash"];
release.MagnetUri = new Uri((string)result["magnet_uri"]); release.MagnetUri = new Uri((string)result["magnet_uri"]);
release.Link = new Uri(string.Format("{0}{1}{2}", baseUrl, DownloadUrl, release.InfoHash)); release.Link = new Uri(string.Format("{0}{1}{2}", baseUrl, DownloadUrl, release.InfoHash));
releases.Add(release); releases.Add(release);
}
}
catch (Exception ex)
{
OnResultParsingError(this, results, ex);
throw ex;
} }
} }
@@ -157,5 +166,7 @@ namespace Jackett.Indexers
{ {
throw new NotImplementedException(); throw new NotImplementedException();
} }
} }
} }

101
src/Jackett/Indexers/ThePirateBay.cs
View File

@@ -31,7 +31,9 @@ namespace Jackett.Indexers
} }
} }
public event Action<IndexerInterface, Newtonsoft.Json.Linq.JToken> OnSaveConfigurationRequested; public event Action<IndexerInterface, JToken> OnSaveConfigurationRequested;
public event Action<IndexerInterface, string, Exception> OnResultParsingError;
public string DisplayName { get { return "The Pirate Bay"; } } public string DisplayName { get { return "The Pirate Bay"; } }
@@ -133,54 +135,61 @@ namespace Jackett.Indexers
var response = await CurlHelper.GetAsync(baseUrl + SwitchSingleViewUrl, null, episodeSearchUrl); var response = await CurlHelper.GetAsync(baseUrl + SwitchSingleViewUrl, null, episodeSearchUrl);
results = Encoding.UTF8.GetString(response.Content); results = Encoding.UTF8.GetString(response.Content);
} }
try
CQ dom = results;
var rows = dom["#searchResult > tbody > tr"];
foreach (var row in rows)
{ {
var release = new ReleaseInfo(); CQ dom = results;
CQ qLink = row.ChildElements.ElementAt(1).Cq().Children("a").First(); var rows = dom["#searchResult > tbody > tr"];
foreach (var row in rows)
release.MinimumRatio = 1;
release.MinimumSeedTime = 172800;
release.Title = qLink.Text().Trim();
release.Description = release.Title;
release.Comments = new Uri(baseUrl + qLink.Attr("href").TrimStart('/'));
release.Guid = release.Comments;
var timeString = row.ChildElements.ElementAt(2).Cq().Text();
if (timeString.Contains("mins ago"))
release.PublishDate = (DateTime.Now - TimeSpan.FromMinutes(int.Parse(timeString.Split(' ')[0])));
else if (timeString.Contains("Today"))
release.PublishDate = (DateTime.UtcNow - TimeSpan.FromHours(2) - TimeSpan.Parse(timeString.Split(' ')[1])).ToLocalTime();
else if (timeString.Contains("Y-day"))
release.PublishDate = (DateTime.UtcNow - TimeSpan.FromHours(26) - TimeSpan.Parse(timeString.Split(' ')[1])).ToLocalTime();
else if (timeString.Contains(':'))
{ {
var utc = DateTime.ParseExact(timeString, "MM-dd HH:mm", CultureInfo.InvariantCulture) - TimeSpan.FromHours(2); var release = new ReleaseInfo();
release.PublishDate = DateTime.SpecifyKind(utc, DateTimeKind.Utc).ToLocalTime();
CQ qLink = row.ChildElements.ElementAt(1).Cq().Children("a").First();
release.MinimumRatio = 1;
release.MinimumSeedTime = 172800;
release.Title = qLink.Text().Trim();
release.Description = release.Title;
release.Comments = new Uri(baseUrl + qLink.Attr("href").TrimStart('/'));
release.Guid = release.Comments;
var timeString = row.ChildElements.ElementAt(2).Cq().Text();
if (timeString.Contains("mins ago"))
release.PublishDate = (DateTime.Now - TimeSpan.FromMinutes(int.Parse(timeString.Split(' ')[0])));
else if (timeString.Contains("Today"))
release.PublishDate = (DateTime.UtcNow - TimeSpan.FromHours(2) - TimeSpan.Parse(timeString.Split(' ')[1])).ToLocalTime();
else if (timeString.Contains("Y-day"))
release.PublishDate = (DateTime.UtcNow - TimeSpan.FromHours(26) - TimeSpan.Parse(timeString.Split(' ')[1])).ToLocalTime();
else if (timeString.Contains(':'))
{
var utc = DateTime.ParseExact(timeString, "MM-dd HH:mm", CultureInfo.InvariantCulture) - TimeSpan.FromHours(2);
release.PublishDate = DateTime.SpecifyKind(utc, DateTimeKind.Utc).ToLocalTime();
}
else
{
var utc = DateTime.ParseExact(timeString, "MM-dd yyyy", CultureInfo.InvariantCulture) - TimeSpan.FromHours(2);
release.PublishDate = DateTime.SpecifyKind(utc, DateTimeKind.Utc).ToLocalTime();
}
var downloadCol = row.ChildElements.ElementAt(3).Cq().Find("a");
release.MagnetUri = new Uri(downloadCol.Attr("href"));
release.InfoHash = release.MagnetUri.ToString().Split(':')[3].Split('&')[0];
var sizeString = row.ChildElements.ElementAt(4).Cq().Text().Split(' ');
var sizeVal = float.Parse(sizeString[0]);
var sizeUnit = sizeString[1];
release.Size = ReleaseInfo.GetBytes(sizeUnit, sizeVal);
release.Seeders = int.Parse(row.ChildElements.ElementAt(5).Cq().Text());
release.Peers = int.Parse(row.ChildElements.ElementAt(6).Cq().Text()) + release.Seeders;
releases.Add(release);
} }
else }
{ catch (Exception ex)
var utc = DateTime.ParseExact(timeString, "MM-dd yyyy", CultureInfo.InvariantCulture) - TimeSpan.FromHours(2); {
release.PublishDate = DateTime.SpecifyKind(utc, DateTimeKind.Utc).ToLocalTime(); OnResultParsingError(this, results, ex);
} throw ex;
var downloadCol = row.ChildElements.ElementAt(3).Cq().Find("a");
release.MagnetUri = new Uri(downloadCol.Attr("href"));
release.InfoHash = release.MagnetUri.ToString().Split(':')[3].Split('&')[0];
var sizeString = row.ChildElements.ElementAt(4).Cq().Text().Split(' ');
var sizeVal = float.Parse(sizeString[0]);
var sizeUnit = sizeString[1];
release.Size = ReleaseInfo.GetBytes(sizeUnit, sizeVal);
release.Seeders = int.Parse(row.ChildElements.ElementAt(5).Cq().Text());
release.Peers = int.Parse(row.ChildElements.ElementAt(6).Cq().Text()) + release.Seeders;
releases.Add(release);
} }
} }
return releases.ToArray(); return releases.ToArray();
@@ -192,5 +201,7 @@ namespace Jackett.Indexers
{ {
throw new NotImplementedException(); throw new NotImplementedException();
} }
} }
} }

64
src/Jackett/Indexers/TorrentLeech.cs
View File

@@ -14,6 +14,7 @@ namespace Jackett.Indexers
{ {
public class TorrentLeech : IndexerInterface public class TorrentLeech : IndexerInterface
{ {
public event Action<IndexerInterface, string, Exception> OnResultParsingError;
public event Action<IndexerInterface, JToken> OnSaveConfigurationRequested; public event Action<IndexerInterface, JToken> OnSaveConfigurationRequested;
@@ -114,45 +115,55 @@ namespace Jackett.Indexers
var searchString = title + " " + query.GetEpisodeSearchString(); var searchString = title + " " + query.GetEpisodeSearchString();
var episodeSearchUrl = string.Format(SearchUrl, HttpUtility.UrlEncode(searchString)); var episodeSearchUrl = string.Format(SearchUrl, HttpUtility.UrlEncode(searchString));
var results = await client.GetStringAsync(episodeSearchUrl); var results = await client.GetStringAsync(episodeSearchUrl);
CQ dom = results; try
CQ qRows = dom["#torrenttable > tbody > tr"];
foreach (var row in qRows)
{ {
var release = new ReleaseInfo(); CQ dom = results;
var qRow = row.Cq(); CQ qRows = dom["#torrenttable > tbody > tr"];
var debug = qRow.Html(); foreach (var row in qRows)
{
var release = new ReleaseInfo();
release.MinimumRatio = 1; var qRow = row.Cq();
release.MinimumSeedTime = 172800;
CQ qLink = qRow.Find(".title > a").First(); var debug = qRow.Html();
release.Guid = new Uri(BaseUrl + qLink.Attr("href"));
release.Comments = release.Guid;
release.Title = qLink.Text();
release.Description = release.Title;
release.Link = new Uri(BaseUrl + qRow.Find(".quickdownload > a").Attr("href")); release.MinimumRatio = 1;
release.MinimumSeedTime = 172800;
var dateString = qRow.Find(".name").First()[0].ChildNodes[4].NodeValue.Replace(" on", "").Trim(); CQ qLink = qRow.Find(".title > a").First();
//"2015-04-25 23:38:12" release.Guid = new Uri(BaseUrl + qLink.Attr("href"));
//"yyyy-MMM-dd hh:mm:ss" release.Comments = release.Guid;
release.PublishDate = DateTime.ParseExact(dateString, "yyyy-MM-dd HH:mm:ss", CultureInfo.InvariantCulture); release.Title = qLink.Text();
release.Description = release.Title;
var sizeStringParts = qRow.Children().ElementAt(4).InnerText.Split(' '); release.Link = new Uri(BaseUrl + qRow.Find(".quickdownload > a").Attr("href"));
release.Size = ReleaseInfo.GetBytes(sizeStringParts[1], float.Parse(sizeStringParts[0]));
release.Seeders = int.Parse(qRow.Find(".seeders").Text()); var dateString = qRow.Find(".name").First()[0].ChildNodes[4].NodeValue.Replace(" on", "").Trim();
release.Peers = int.Parse(qRow.Find(".leechers").Text()); //"2015-04-25 23:38:12"
//"yyyy-MMM-dd hh:mm:ss"
release.PublishDate = DateTime.ParseExact(dateString, "yyyy-MM-dd HH:mm:ss", CultureInfo.InvariantCulture);
releases.Add(release); var sizeStringParts = qRow.Children().ElementAt(4).InnerText.Split(' ');
release.Size = ReleaseInfo.GetBytes(sizeStringParts[1], float.Parse(sizeStringParts[0]));
release.Seeders = int.Parse(qRow.Find(".seeders").Text());
release.Peers = int.Parse(qRow.Find(".leechers").Text());
releases.Add(release);
}
}
catch (Exception ex)
{
OnResultParsingError(this, results, ex);
throw ex;
} }
} }
return releases.ToArray(); return releases.ToArray();
} }
@@ -160,5 +171,8 @@ namespace Jackett.Indexers
{ {
return client.GetByteArrayAsync(link); return client.GetByteArrayAsync(link);
} }
} }
} }