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

Cardigann: login again if necessary (#744)

Browse Source
This commit is contained in:
kaso17
2016-11-26 18:00:53 +01:00
committed by GitHub
parent 69ff142596
commit 98a916b4c1
1 changed files with 32 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/Jackett/Indexers/CardigannIndexer.cs
View File

@@ -17,6 +17,7 @@ using AngleSharp.Parser.Html;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using System.Web; using System.Web;
using AngleSharp.Dom; using AngleSharp.Dom;
using AngleSharp.Dom.Html;
namespace Jackett.Indexers namespace Jackett.Indexers
{ {
@@ -428,6 +429,24 @@ namespace Jackett.Indexers
return true; return true;
} }
protected bool CheckIfLoginIsNeeded(WebClientByteResult Result, IHtmlDocument document)
{
if (Result.IsRedirect)
{
return true;
}
if (Definition.Login.Test.Selector != null)
{
var selection = document.QuerySelectorAll(Definition.Login.Test.Selector);
if (selection.Length == 0)
{
return true;
}
}
return false;
}
public async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson) public async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson)
{ {
configData.LoadValuesFromJson(configJson); configData.LoadValuesFromJson(configJson);
@@ -644,7 +663,19 @@ namespace Jackett.Indexers
{ {
var SearchResultParser = new HtmlParser(); var SearchResultParser = new HtmlParser();
var SearchResultDocument = SearchResultParser.Parse(results); var SearchResultDocument = SearchResultParser.Parse(results);
// check if we need to login again
var loginNeeded = CheckIfLoginIsNeeded(response, SearchResultDocument);
if (loginNeeded)
{
logger.Info(string.Format("CardigannIndexer ({0}): Relogin required", ID));
await DoLogin();
await TestLogin();
response = await RequestBytesWithCookies(searchUrl);
results = Encoding.GetEncoding("iso-8859-1").GetString(response.Content);
SearchResultDocument = SearchResultParser.Parse(results);
}
var RowsDom = SearchResultDocument.QuerySelectorAll(Search.Rows.Selector); var RowsDom = SearchResultDocument.QuerySelectorAll(Search.Rows.Selector);
List<IElement> Rows = new List<IElement>(); List<IElement> Rows = new List<IElement>();
foreach (var RowDom in RowsDom) foreach (var RowDom in RowsDom)