mirror
/
Jackett
mirror of https://github.com/Jackett/Jackett
1
0
Fork 0
Code Issues Releases Wiki Activity

More robust testing/verification for indexers

This commit is contained in:
zone117x 2015-04-19 16:01:42 -06:00
parent c351cebdfc
commit ac003e7a78
9 changed files with 10 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Jackett/IndexerInterface.cs
View File

@ -20,9 +20,6 @@ namespace Jackett
// Called when web API wants to apply setup configuration via web API, usually this is where login and storing cookie happens
Task ApplyConfiguration(JToken configJson);
// Called to check if configuration (cookie) is correct and indexer connection works
Task VerifyConnection();
// Invoked when the indexer configuration has been applied and verified so the cookie needs to be saved
event Action<IndexerInterface, JToken> OnSaveConfigurationRequested;

8
src/Jackett/IndexerManager.cs
View File

@ -85,5 +85,13 @@ namespace Jackett
LoadMissingIndexers();
}
public async Task TestIndexer(IndexerInterface indexer)
{
var browseQuery = new TorznabQuery();
var results = await indexer.PerformQuery(browseQuery);
if (results.Length == 0)
throw new Exception("Found no results while trying to browse this tracker");
}
}
}

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

@ -97,14 +97,6 @@ namespace Jackett.Indexers
}
}
public async Task VerifyConnection()
{
var browseQuery = new TorznabQuery();
var results = await PerformQuery(browseQuery);
if (results.Length == 0)
throw new Exception("Found no results while trying to browse this tracker");
}
public event Action<IndexerInterface, JToken> OnSaveConfigurationRequested;
public bool IsConfigured { get; private set; }

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

@ -118,13 +118,6 @@ namespace Jackett
}
}
public async Task VerifyConnection()
{
var result = await client.GetStringAsync(new Uri(SearchUrl));
if (result.Contains("<h1>Not logged in!</h1>"))
throw new Exception("Detected as not logged in");
}
public void LoadFromSavedConfiguration(JToken jsonConfig)
{
cookies.FillFromJson(new Uri(BaseUrl), (JArray)jsonConfig["cookies"]);

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

@ -102,16 +102,6 @@ namespace Jackett
}
}
public async Task VerifyConnection()
{
var message = CreateHttpRequest(new Uri(SearchUrl));
var response = await client.SendAsync(message);
var result = await response.Content.ReadAsStringAsync();
if (!result.Contains("/logout.php"))
throw new Exception("Detected as not logged in");
}
public void LoadFromSavedConfiguration(JToken jsonConfig)
{
cookies.FillFromJson(new Uri(BaseUrl), (JArray)jsonConfig["cookies"]);

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

@ -111,19 +111,6 @@ namespace Jackett.Indexers
return message;
}
public Task VerifyConnection()
{
return Task.Run(async () =>
{
var message = CreateHttpRequest(new Uri(BaseUrl));
var response = await client.SendAsync(message);
var result = await response.Content.ReadAsStringAsync();
if (!result.Contains("/my.php"))
throw new Exception("Detected as not logged in");
});
}
public void LoadFromSavedConfiguration(Newtonsoft.Json.Linq.JToken jsonConfig)
{
cookies.FillFromJson(new Uri(BaseUrl), (JArray)jsonConfig["cookies"]);

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

@ -107,13 +107,6 @@ namespace Jackett.Indexers
}
}
public async Task VerifyConnection()
{
var response = await client.GetStringAsync(BaseUrl);
if (!response.Contains("logout.php?"))
throw new Exception("Detected as not logged in");
}
public void LoadFromSavedConfiguration(Newtonsoft.Json.Linq.JToken jsonConfig)
{
cookies.FillFromJson(new Uri(BaseUrl), (JArray)jsonConfig["cookies"]);

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

@ -95,12 +95,6 @@ namespace Jackett.Indexers
IsConfigured = true;
}
public async Task VerifyConnection()
{
await TestBrowse(BaseUrl);
}
async Task TestBrowse(string url)
{
var result = await client.GetStringAsync(new Uri(url) + BrowserUrl);

4
src/Jackett/WebApi.cs
View File

@ -228,7 +228,7 @@ namespace Jackett
var indexer = indexerManager.GetIndexer(indexerString);
jsonReply["name"] = indexer.DisplayName;
await indexer.ApplyConfiguration(postData["config"]);
await indexer.VerifyConnection();
await indexerManager.TestIndexer(indexer);
jsonReply["result"] = "success";
}
catch (Exception ex)
@ -281,7 +281,7 @@ namespace Jackett
string indexerString = (string)postData["indexer"];
var indexer = indexerManager.GetIndexer(indexerString);
jsonReply["name"] = indexer.DisplayName;
await indexer.VerifyConnection();
await indexerManager.TestIndexer(indexer);
jsonReply["result"] = "success";
}
catch (Exception ex)