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
event Action<IndexerInterface, JToken> OnSaveConfigurationRequested;
event Action<IndexerInterface, string, Exception> OnResultParsingError;
string DisplayName { get; }
string DisplayDescription { get; }
Uri SiteLink { get; }

9
src/Jackett/IndexerManager.cs
View File

@@ -43,6 +43,7 @@ namespace Jackett
IndexerInterface newIndexer = (IndexerInterface)Activator.CreateInstance(indexerType);
newIndexer.OnSaveConfigurationRequested += newIndexer_OnSaveConfigurationRequested;
newIndexer.OnResultParsingError += newIndexer_OnResultParsingError;
var configFilePath = GetIndexerConfigFilePath(newIndexer);
if (File.Exists(configFilePath))
@@ -54,6 +55,14 @@ namespace Jackett
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)
{
return Path.Combine(IndexerConfigDirectory, indexer.GetType().Name.ToLower() + ".json");

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

@@ -14,15 +14,20 @@ namespace Jackett.Indexers
{
public class BitHdtv : IndexerInterface
{
public string DisplayName {
public event Action<IndexerInterface, string, Exception> OnResultParsingError;
public string DisplayName
{
get { return "BIT-HDTV"; }
}
public string DisplayDescription {
public string DisplayDescription
{
get { return "Home of high definition invites"; }
}
public Uri SiteLink {
public Uri SiteLink
{
get { return new Uri(BaseUrl); }
}
@@ -39,7 +44,8 @@ namespace Jackett.Indexers
{
IsConfigured = false;
cookies = new CookieContainer();
handler = new HttpClientHandler {
handler = new HttpClientHandler
{
CookieContainer = cookies,
AllowAutoRedirect = true,
UseCookies = true,
@@ -68,14 +74,17 @@ namespace Jackett.Indexers
var response = await client.PostAsync(LoginUrl, content);
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();
messageEl.Children("a").Remove();
messageEl.Children("style").Remove();
var errorMessage = messageEl.Text().Trim();
throw new ExceptionWithConfigData(errorMessage, (ConfigurationData)config);
} else {
}
else
{
var configSaveData = new JObject();
configSaveData["cookies"] = cookies.ToJson(SiteLink);
@@ -101,14 +110,18 @@ namespace Jackett.Indexers
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 results = await client.GetStringAsync(episodeSearchUrl);
try
{
CQ dom = results;
dom["#needseed"].Remove();
var rows = dom["table[width='750'] > tbody"].Children();
foreach (var row in rows.Skip(1)) {
foreach (var row in rows.Skip(1))
{
var release = new ReleaseInfo();
@@ -138,6 +151,12 @@ namespace Jackett.Indexers
releases.Add(release);
}
}
catch (Exception ex)
{
OnResultParsingError(this, results, ex);
throw ex;
}
}
return releases.ToArray();
}
@@ -146,5 +165,7 @@ namespace Jackett.Indexers
{
return client.GetByteArrayAsync(link);
}
}
}

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

@@ -50,6 +50,7 @@ namespace Jackett
HttpClient client;
public event Action<IndexerInterface, JToken> OnSaveConfigurationRequested;
public event Action<IndexerInterface, string, Exception> OnResultParsingError;
public BitMeTV()
{
@@ -136,6 +137,8 @@ namespace Jackett
var searchString = title + " " + query.GetEpisodeSearchString();
var episodeSearchUrl = string.Format("{0}?search={1}&cat=0", SearchUrl, HttpUtility.UrlEncode(searchString));
var results = await client.GetStringAsync(episodeSearchUrl);
try
{
CQ dom = results;
var table = dom["tbody > tr > .latest"].Parent().Parent();
@@ -178,6 +181,12 @@ namespace Jackett
releases.Add(release);
}
}
catch (Exception ex)
{
OnResultParsingError(this, results, ex);
throw ex;
}
}
return releases.ToArray();
@@ -187,5 +196,6 @@ namespace Jackett
{
return client.GetByteArrayAsync(link);
}
}
}

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

@@ -16,6 +16,7 @@ namespace Jackett
{
public class Freshon : IndexerInterface
{
public event Action<IndexerInterface, string, Exception> OnResultParsingError;
static string BaseUrl = "https://freshon.tv";
static string LoginUrl = BaseUrl + "/login.php";
@@ -42,7 +43,8 @@ namespace Jackett
{
IsConfigured = false;
cookies = new CookieContainer();
handler = new HttpClientHandler {
handler = new HttpClientHandler
{
CookieContainer = cookies,
AllowAutoRedirect = true,
UseCookies = true,
@@ -78,12 +80,15 @@ namespace Jackett
var response = await client.SendAsync(message);
var responseContent = await response.Content.ReadAsStringAsync();
if (!responseContent.Contains ("/logout.php")) {
if (!responseContent.Contains("/logout.php"))
{
CQ dom = responseContent;
var messageEl = dom[".error_text"];
var errorMessage = messageEl.Text().Trim();
throw new ExceptionWithConfigData(errorMessage, (ConfigurationData)config);
} else {
}
else
{
var configSaveData = new JObject();
configSaveData["cookies"] = cookies.ToJson(SiteLink);
@@ -113,12 +118,14 @@ namespace Jackett
{
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;
if (string.IsNullOrEmpty(title))
episodeSearchUrl = SearchUrl;
else {
else
{
var searchString = title + " " + query.GetEpisodeSearchString();
episodeSearchUrl = string.Format("{0}?search={1}&cat=0", SearchUrl, HttpUtility.UrlEncode(searchString));
}
@@ -126,12 +133,14 @@ namespace Jackett
var request = CreateHttpRequest(new Uri(episodeSearchUrl));
var response = await client.SendAsync(request);
var results = await response.Content.ReadAsStringAsync();
try
{
CQ dom = results;
var rows = dom["#highlight > tbody > tr"];
foreach (var row in rows.Skip(1)) {
foreach (var row in rows.Skip(1))
{
var release = new ReleaseInfo();
var qRow = row.Cq();
@@ -166,6 +175,12 @@ namespace Jackett
releases.Add(release);
}
}
catch (Exception ex)
{
OnResultParsingError(this, results, ex);
throw ex;
}
}
return releases.ToArray();
}

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

@@ -14,7 +14,8 @@ namespace Jackett.Indexers
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"; } }
@@ -40,7 +41,8 @@ namespace Jackett.Indexers
{
IsConfigured = false;
cookies = new CookieContainer();
handler = new HttpClientHandler {
handler = new HttpClientHandler
{
CookieContainer = cookies,
AllowAutoRedirect = true,
UseCookies = true,
@@ -77,12 +79,15 @@ namespace Jackett.Indexers
var response = await client.SendAsync(message);
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();
var errorMessage = messageEl.Text().Trim();
throw new ExceptionWithConfigData(errorMessage, (ConfigurationData)config);
} else {
}
else
{
var configSaveData = new JObject();
configSaveData["cookies"] = cookies.ToJson(SiteLink);
@@ -115,7 +120,8 @@ namespace Jackett.Indexers
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);
@@ -124,10 +130,13 @@ namespace Jackett.Indexers
var response = await client.SendAsync(request);
var results = await response.Content.ReadAsStringAsync();
try
{
CQ dom = results;
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 qRow = row.Cq();
@@ -173,6 +182,12 @@ namespace Jackett.Indexers
releases.Add(release);
}
}
catch (Exception ex)
{
OnResultParsingError(this, results, ex);
throw ex;
}
}
@@ -187,5 +202,8 @@ namespace Jackett.Indexers
var bytes = await response.Content.ReadAsByteArrayAsync();
return bytes;
}
}
}

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

@@ -30,6 +30,7 @@ namespace Jackett.Indexers
public event Action<IndexerInterface, JToken> OnSaveConfigurationRequested;
public event Action<IndexerInterface, string, Exception> OnResultParsingError;
public bool IsConfigured { get; private set; }
@@ -159,6 +160,8 @@ namespace Jackett.Indexers
var response = await CurlHelper.GetAsync(episodeSearchUrl, cookieHeader);
results = Encoding.UTF8.GetString(response.Content);
}
try
{
var json = JObject.Parse(results);
foreach (JObject r in json["response"]["results"])
@@ -191,6 +194,12 @@ namespace Jackett.Indexers
}
}
catch (Exception ex)
{
OnResultParsingError(this, results, ex);
throw ex;
}
}
return releases.ToArray();
}
@@ -215,5 +224,6 @@ namespace Jackett.Indexers
}
}
}
}

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

@@ -31,6 +31,7 @@ namespace Jackett.Indexers
public event Action<IndexerInterface, JToken> OnSaveConfigurationRequested;
public event Action<IndexerInterface, string, Exception> OnResultParsingError;
public string DisplayName
{
@@ -116,6 +117,8 @@ namespace Jackett.Indexers
var searchString = title + " " + query.GetEpisodeSearchString();
var episodeSearchUrl = baseUrl + string.Format(SearchUrl, HttpUtility.UrlEncode(searchString.Trim()));
var results = await client.GetStringAsync(episodeSearchUrl);
try
{
var jResults = JObject.Parse(results);
foreach (JObject result in (JArray)jResults["torrents"])
{
@@ -144,6 +147,12 @@ namespace Jackett.Indexers
releases.Add(release);
}
}
catch (Exception ex)
{
OnResultParsingError(this, results, ex);
throw ex;
}
}
return releases.ToArray();
}
@@ -157,5 +166,7 @@ namespace Jackett.Indexers
{
throw new NotImplementedException();
}
}
}

15
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"; } }
@@ -133,7 +135,8 @@ namespace Jackett.Indexers
var response = await CurlHelper.GetAsync(baseUrl + SwitchSingleViewUrl, null, episodeSearchUrl);
results = Encoding.UTF8.GetString(response.Content);
}
try
{
CQ dom = results;
var rows = dom["#searchResult > tbody > tr"];
@@ -183,6 +186,12 @@ namespace Jackett.Indexers
releases.Add(release);
}
}
catch (Exception ex)
{
OnResultParsingError(this, results, ex);
throw ex;
}
}
return releases.ToArray();
}
@@ -192,5 +201,7 @@ namespace Jackett.Indexers
{
throw new NotImplementedException();
}
}
}

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

@@ -14,6 +14,7 @@ namespace Jackett.Indexers
{
public class TorrentLeech : IndexerInterface
{
public event Action<IndexerInterface, string, Exception> OnResultParsingError;
public event Action<IndexerInterface, JToken> OnSaveConfigurationRequested;
@@ -114,6 +115,8 @@ namespace Jackett.Indexers
var searchString = title + " " + query.GetEpisodeSearchString();
var episodeSearchUrl = string.Format(SearchUrl, HttpUtility.UrlEncode(searchString));
var results = await client.GetStringAsync(episodeSearchUrl);
try
{
CQ dom = results;
CQ qRows = dom["#torrenttable > tbody > tr"];
@@ -150,9 +153,17 @@ namespace Jackett.Indexers
releases.Add(release);
}
}
catch (Exception ex)
{
OnResultParsingError(this, results, ex);
throw ex;
}
}
return releases.ToArray();
}
@@ -160,5 +171,8 @@ namespace Jackett.Indexers
{
return client.GetByteArrayAsync(link);
}
}
}