mirror of https://github.com/Jackett/Jackett
Update AngleSharp to v0.10
Breaking changes in AngleSharp v0.10, more information here https://github.com/AngleSharp/AngleSharp/blob/master/doc/Migration.md
This commit is contained in:
parent
12ffb4cbe7
commit
fa71356666
|
@ -4,7 +4,7 @@ using System.Collections.Specialized;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using AngleSharp.Parser.Html;
|
using AngleSharp.Html.Parser;
|
||||||
using Jackett.Common.Models;
|
using Jackett.Common.Models;
|
||||||
using Jackett.Common.Models.IndexerConfig;
|
using Jackett.Common.Models.IndexerConfig;
|
||||||
using Jackett.Common.Services.Interfaces;
|
using Jackett.Common.Services.Interfaces;
|
||||||
|
@ -172,7 +172,7 @@ namespace Jackett.Common.Indexers
|
||||||
string RowsSelector = "ul.topics > li.row";
|
string RowsSelector = "ul.topics > li.row";
|
||||||
|
|
||||||
var ResultParser = new HtmlParser();
|
var ResultParser = new HtmlParser();
|
||||||
var SearchResultDocument = ResultParser.Parse(results.Content);
|
var SearchResultDocument = ResultParser.ParseDocument(results.Content);
|
||||||
var Rows = SearchResultDocument.QuerySelectorAll(RowsSelector);
|
var Rows = SearchResultDocument.QuerySelectorAll(RowsSelector);
|
||||||
foreach (var Row in Rows)
|
foreach (var Row in Rows)
|
||||||
{
|
{
|
||||||
|
@ -190,7 +190,7 @@ namespace Jackett.Common.Indexers
|
||||||
release.Guid = release.Comments;
|
release.Guid = release.Comments;
|
||||||
|
|
||||||
var detailsResult = await RequestStringWithCookies(SiteLink + qDetailsLink.GetAttribute("href"));
|
var detailsResult = await RequestStringWithCookies(SiteLink + qDetailsLink.GetAttribute("href"));
|
||||||
var DetailsResultDocument = ResultParser.Parse(detailsResult.Content);
|
var DetailsResultDocument = ResultParser.ParseDocument(detailsResult.Content);
|
||||||
var qDownloadLink = DetailsResultDocument.QuerySelector("table.table2 > tbody > tr > td > a[href^=\"/download/torrent.php?id\"]");
|
var qDownloadLink = DetailsResultDocument.QuerySelector("table.table2 > tbody > tr > td > a[href^=\"/download/torrent.php?id\"]");
|
||||||
|
|
||||||
release.Link = new Uri(SiteLink + qDownloadLink.GetAttribute("href").TrimStart('/'));
|
release.Link = new Uri(SiteLink + qDownloadLink.GetAttribute("href").TrimStart('/'));
|
||||||
|
|
|
@ -3,7 +3,7 @@ using System.Collections.Generic;
|
||||||
using System.Collections.Specialized;
|
using System.Collections.Specialized;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using AngleSharp.Parser.Html;
|
using AngleSharp.Html.Parser;
|
||||||
using Jackett.Common.Models;
|
using Jackett.Common.Models;
|
||||||
using Jackett.Common.Models.IndexerConfig;
|
using Jackett.Common.Models.IndexerConfig;
|
||||||
using Jackett.Common.Services.Interfaces;
|
using Jackett.Common.Services.Interfaces;
|
||||||
|
@ -1647,7 +1647,7 @@ namespace Jackett.Common.Indexers
|
||||||
string RowsSelector = "ul.topics > li";
|
string RowsSelector = "ul.topics > li";
|
||||||
|
|
||||||
var SearchResultParser = new HtmlParser();
|
var SearchResultParser = new HtmlParser();
|
||||||
var SearchResultDocument = SearchResultParser.Parse(results.Content);
|
var SearchResultDocument = SearchResultParser.ParseDocument(results.Content);
|
||||||
var Rows = SearchResultDocument.QuerySelectorAll(RowsSelector);
|
var Rows = SearchResultDocument.QuerySelectorAll(RowsSelector);
|
||||||
foreach (var Row in Rows)
|
foreach (var Row in Rows)
|
||||||
{
|
{
|
||||||
|
|
|
@ -6,7 +6,7 @@ using System.Linq;
|
||||||
using System.Net;
|
using System.Net;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using AngleSharp.Parser.Html;
|
using AngleSharp.Html.Parser;
|
||||||
using Jackett.Common.Models;
|
using Jackett.Common.Models;
|
||||||
using Jackett.Common.Models.IndexerConfig;
|
using Jackett.Common.Models.IndexerConfig;
|
||||||
using Jackett.Common.Services.Interfaces;
|
using Jackett.Common.Services.Interfaces;
|
||||||
|
@ -78,7 +78,7 @@ namespace Jackett.Common.Indexers.Abstract
|
||||||
await ConfigureIfOK(response.Cookies, response.Content != null && response.Content.Contains("logout.php"), () =>
|
await ConfigureIfOK(response.Cookies, response.Content != null && response.Content.Contains("logout.php"), () =>
|
||||||
{
|
{
|
||||||
var loginResultParser = new HtmlParser();
|
var loginResultParser = new HtmlParser();
|
||||||
var loginResultDocument = loginResultParser.Parse(response.Content);
|
var loginResultDocument = loginResultParser.ParseDocument(response.Content);
|
||||||
var loginform = loginResultDocument.QuerySelector("#loginform");
|
var loginform = loginResultDocument.QuerySelector("#loginform");
|
||||||
if (loginform == null)
|
if (loginform == null)
|
||||||
throw new ExceptionWithConfigData(response.Content, configData);
|
throw new ExceptionWithConfigData(response.Content, configData);
|
||||||
|
|
|
@ -7,7 +7,7 @@ using System.Text;
|
||||||
using System.Text.RegularExpressions;
|
using System.Text.RegularExpressions;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using AngleSharp.Dom;
|
using AngleSharp.Dom;
|
||||||
using AngleSharp.Parser.Html;
|
using AngleSharp.Html.Parser;
|
||||||
using Jackett.Common.Models;
|
using Jackett.Common.Models;
|
||||||
using Jackett.Common.Models.IndexerConfig;
|
using Jackett.Common.Models.IndexerConfig;
|
||||||
using Jackett.Common.Services.Interfaces;
|
using Jackett.Common.Services.Interfaces;
|
||||||
|
@ -144,7 +144,7 @@ namespace Jackett.Common.Indexers
|
||||||
const string rowsSelector = "table.torrent_table > tbody > tr:not(tr.colhead)";
|
const string rowsSelector = "table.torrent_table > tbody > tr:not(tr.colhead)";
|
||||||
|
|
||||||
var searchResultParser = new HtmlParser();
|
var searchResultParser = new HtmlParser();
|
||||||
var searchResultDocument = searchResultParser.Parse(results.Content);
|
var searchResultDocument = searchResultParser.ParseDocument(results.Content);
|
||||||
var rows = searchResultDocument.QuerySelectorAll(rowsSelector);
|
var rows = searchResultDocument.QuerySelectorAll(rowsSelector);
|
||||||
foreach (var row in rows)
|
foreach (var row in rows)
|
||||||
{
|
{
|
||||||
|
@ -276,7 +276,7 @@ namespace Jackett.Common.Indexers
|
||||||
const string rowsSelector = "table.torrent_table > tbody > tr:not(tr.colhead)";
|
const string rowsSelector = "table.torrent_table > tbody > tr:not(tr.colhead)";
|
||||||
|
|
||||||
var searchResultParser = new HtmlParser();
|
var searchResultParser = new HtmlParser();
|
||||||
var searchResultDocument = searchResultParser.Parse(results.Content);
|
var searchResultDocument = searchResultParser.ParseDocument(results.Content);
|
||||||
var rows = searchResultDocument.QuerySelectorAll(rowsSelector);
|
var rows = searchResultDocument.QuerySelectorAll(rowsSelector);
|
||||||
|
|
||||||
ICollection<int> groupCategory = null;
|
ICollection<int> groupCategory = null;
|
||||||
|
|
|
@ -8,8 +8,8 @@ using System.Text;
|
||||||
using System.Text.RegularExpressions;
|
using System.Text.RegularExpressions;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using AngleSharp.Dom;
|
using AngleSharp.Dom;
|
||||||
using AngleSharp.Dom.Html;
|
using AngleSharp.Html.Dom;
|
||||||
using AngleSharp.Parser.Html;
|
using AngleSharp.Html.Parser;
|
||||||
using Jackett.Common.Helpers;
|
using Jackett.Common.Helpers;
|
||||||
using Jackett.Common.Models;
|
using Jackett.Common.Models;
|
||||||
using Jackett.Common.Models.IndexerConfig;
|
using Jackett.Common.Models.IndexerConfig;
|
||||||
|
@ -371,7 +371,7 @@ namespace Jackett.Common.Indexers
|
||||||
return true; // no error
|
return true; // no error
|
||||||
|
|
||||||
var ResultParser = new HtmlParser();
|
var ResultParser = new HtmlParser();
|
||||||
var ResultDocument = ResultParser.Parse(loginResult.Content);
|
var ResultDocument = ResultParser.ParseDocument(loginResult.Content);
|
||||||
foreach (errorBlock error in errorBlocks)
|
foreach (errorBlock error in errorBlocks)
|
||||||
{
|
{
|
||||||
var selection = ResultDocument.QuerySelector(error.Selector);
|
var selection = ResultDocument.QuerySelector(error.Selector);
|
||||||
|
@ -445,7 +445,7 @@ namespace Jackett.Common.Indexers
|
||||||
// request real login page again
|
// request real login page again
|
||||||
landingResult = await RequestStringWithCookies(LoginUrl, null, SiteLink);
|
landingResult = await RequestStringWithCookies(LoginUrl, null, SiteLink);
|
||||||
var htmlParser = new HtmlParser();
|
var htmlParser = new HtmlParser();
|
||||||
landingResultDocument = htmlParser.Parse(landingResult.Content);
|
landingResultDocument = htmlParser.ParseDocument(landingResult.Content);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -719,7 +719,7 @@ namespace Jackett.Common.Indexers
|
||||||
if (Login.Test.Selector != null)
|
if (Login.Test.Selector != null)
|
||||||
{
|
{
|
||||||
var testResultParser = new HtmlParser();
|
var testResultParser = new HtmlParser();
|
||||||
var testResultDocument = testResultParser.Parse(testResult.Content);
|
var testResultDocument = testResultParser.ParseDocument(testResult.Content);
|
||||||
var selection = testResultDocument.QuerySelectorAll(Login.Test.Selector);
|
var selection = testResultDocument.QuerySelectorAll(Login.Test.Selector);
|
||||||
if (selection.Length == 0)
|
if (selection.Length == 0)
|
||||||
{
|
{
|
||||||
|
@ -784,7 +784,7 @@ namespace Jackett.Common.Indexers
|
||||||
landingResult = await RequestStringWithCookies(LoginUrl.AbsoluteUri, null, SiteLink);
|
landingResult = await RequestStringWithCookies(LoginUrl.AbsoluteUri, null, SiteLink);
|
||||||
|
|
||||||
var htmlParser = new HtmlParser();
|
var htmlParser = new HtmlParser();
|
||||||
landingResultDocument = htmlParser.Parse(landingResult.Content);
|
landingResultDocument = htmlParser.ParseDocument(landingResult.Content);
|
||||||
|
|
||||||
var hasCaptcha = false;
|
var hasCaptcha = false;
|
||||||
|
|
||||||
|
@ -1237,7 +1237,7 @@ namespace Jackett.Common.Indexers
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
var SearchResultParser = new HtmlParser();
|
var SearchResultParser = new HtmlParser();
|
||||||
var SearchResultDocument = SearchResultParser.Parse(results);
|
var SearchResultDocument = SearchResultParser.ParseDocument(results);
|
||||||
|
|
||||||
// check if we need to login again
|
// check if we need to login again
|
||||||
var loginNeeded = CheckIfLoginIsNeeded(response, SearchResultDocument);
|
var loginNeeded = CheckIfLoginIsNeeded(response, SearchResultDocument);
|
||||||
|
@ -1257,7 +1257,7 @@ namespace Jackett.Common.Indexers
|
||||||
await FollowIfRedirect(response);
|
await FollowIfRedirect(response);
|
||||||
|
|
||||||
results = response.Content;
|
results = response.Content;
|
||||||
SearchResultDocument = SearchResultParser.Parse(results);
|
SearchResultDocument = SearchResultParser.ParseDocument(results);
|
||||||
}
|
}
|
||||||
|
|
||||||
checkForError(response, Definition.Search.Error);
|
checkForError(response, Definition.Search.Error);
|
||||||
|
@ -1265,7 +1265,7 @@ namespace Jackett.Common.Indexers
|
||||||
if (Search.Preprocessingfilters != null)
|
if (Search.Preprocessingfilters != null)
|
||||||
{
|
{
|
||||||
results = applyFilters(results, Search.Preprocessingfilters, variables);
|
results = applyFilters(results, Search.Preprocessingfilters, variables);
|
||||||
SearchResultDocument = SearchResultParser.Parse(results);
|
SearchResultDocument = SearchResultParser.ParseDocument(results);
|
||||||
logger.Debug(string.Format("CardigannIndexer ({0}): result after preprocessingfilters: {1}", ID, results));
|
logger.Debug(string.Format("CardigannIndexer ({0}): result after preprocessingfilters: {1}", ID, results));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1652,7 +1652,7 @@ namespace Jackett.Common.Indexers
|
||||||
response = await RequestStringWithCookies(response.RedirectingTo);
|
response = await RequestStringWithCookies(response.RedirectingTo);
|
||||||
var results = response.Content;
|
var results = response.Content;
|
||||||
var SearchResultParser = new HtmlParser();
|
var SearchResultParser = new HtmlParser();
|
||||||
var SearchResultDocument = SearchResultParser.Parse(results);
|
var SearchResultDocument = SearchResultParser.ParseDocument(results);
|
||||||
var DlUri = SearchResultDocument.QuerySelector(selector);
|
var DlUri = SearchResultDocument.QuerySelector(selector);
|
||||||
if (DlUri != null)
|
if (DlUri != null)
|
||||||
{
|
{
|
||||||
|
|
|
@ -5,7 +5,7 @@ using System.Linq;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Text.RegularExpressions;
|
using System.Text.RegularExpressions;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using AngleSharp.Parser.Html;
|
using AngleSharp.Html.Parser;
|
||||||
using Jackett.Common.Models.IndexerConfig.Bespoke;
|
using Jackett.Common.Models.IndexerConfig.Bespoke;
|
||||||
using Jackett.Common.Models;
|
using Jackett.Common.Models;
|
||||||
using Jackett.Common.Models.IndexerConfig;
|
using Jackett.Common.Models.IndexerConfig;
|
||||||
|
@ -170,7 +170,7 @@ namespace Jackett.Common.Indexers
|
||||||
{
|
{
|
||||||
var RowsSelector = "table[id='sortabletable'] > tbody > tr";
|
var RowsSelector = "table[id='sortabletable'] > tbody > tr";
|
||||||
var SearchResultParser = new HtmlParser();
|
var SearchResultParser = new HtmlParser();
|
||||||
var SearchResultDocument = SearchResultParser.Parse(results.Content);
|
var SearchResultDocument = SearchResultParser.ParseDocument(results.Content);
|
||||||
var Rows = SearchResultDocument.QuerySelectorAll(RowsSelector);
|
var Rows = SearchResultDocument.QuerySelectorAll(RowsSelector);
|
||||||
var lastDate = DateTime.Now;
|
var lastDate = DateTime.Now;
|
||||||
|
|
||||||
|
|
|
@ -5,7 +5,7 @@ using System.Globalization;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using AngleSharp.Parser.Html;
|
using AngleSharp.Html.Parser;
|
||||||
using Jackett.Common.Models;
|
using Jackett.Common.Models;
|
||||||
using Jackett.Common.Models.IndexerConfig;
|
using Jackett.Common.Models.IndexerConfig;
|
||||||
using Jackett.Common.Services.Interfaces;
|
using Jackett.Common.Services.Interfaces;
|
||||||
|
@ -233,7 +233,7 @@ namespace Jackett.Common.Indexers
|
||||||
string RowsSelector = ".torrent_table > tbody > tr";
|
string RowsSelector = ".torrent_table > tbody > tr";
|
||||||
|
|
||||||
var SearchResultParser = new HtmlParser();
|
var SearchResultParser = new HtmlParser();
|
||||||
var SearchResultDocument = SearchResultParser.Parse(results.Content);
|
var SearchResultDocument = SearchResultParser.ParseDocument(results.Content);
|
||||||
var Rows = SearchResultDocument.QuerySelectorAll(RowsSelector);
|
var Rows = SearchResultDocument.QuerySelectorAll(RowsSelector);
|
||||||
|
|
||||||
bool stickyGroup = false;
|
bool stickyGroup = false;
|
||||||
|
|
|
@ -13,7 +13,7 @@ using Jackett.Common.Utils.Clients;
|
||||||
using Newtonsoft.Json.Linq;
|
using Newtonsoft.Json.Linq;
|
||||||
using NLog;
|
using NLog;
|
||||||
using System.Text.RegularExpressions;
|
using System.Text.RegularExpressions;
|
||||||
using AngleSharp.Parser.Html;
|
using AngleSharp.Html.Parser;
|
||||||
|
|
||||||
namespace Jackett.Common.Indexers
|
namespace Jackett.Common.Indexers
|
||||||
{
|
{
|
||||||
|
@ -83,7 +83,7 @@ namespace Jackett.Common.Indexers
|
||||||
{
|
{
|
||||||
return releases.ToArray();
|
return releases.ToArray();
|
||||||
}
|
}
|
||||||
var dom = ResultParser.Parse(response.Content);
|
var dom = ResultParser.ParseDocument(response.Content);
|
||||||
var resultLinks = dom.QuerySelectorAll("ul > li > a");
|
var resultLinks = dom.QuerySelectorAll("ul > li > a");
|
||||||
var uniqueShowLinks = new HashSet<string>();
|
var uniqueShowLinks = new HashSet<string>();
|
||||||
foreach (var resultLink in resultLinks)
|
foreach (var resultLink in resultLinks)
|
||||||
|
@ -125,7 +125,7 @@ namespace Jackett.Common.Indexers
|
||||||
return releases.ToArray();
|
return releases.ToArray();
|
||||||
}
|
}
|
||||||
|
|
||||||
var dom = ResultParser.Parse(response.Content);
|
var dom = ResultParser.ParseDocument(response.Content);
|
||||||
var latestresults = dom.QuerySelectorAll("ul > li > a");
|
var latestresults = dom.QuerySelectorAll("ul > li > a");
|
||||||
foreach (var resultLink in latestresults)
|
foreach (var resultLink in latestresults)
|
||||||
{
|
{
|
||||||
|
@ -173,7 +173,7 @@ namespace Jackett.Common.Indexers
|
||||||
while(true)
|
while(true)
|
||||||
{
|
{
|
||||||
var showAPIResponse = await RequestStringWithCookiesAndRetry(apiUrl + "&nextid=" + nextId, string.Empty);
|
var showAPIResponse = await RequestStringWithCookiesAndRetry(apiUrl + "&nextid=" + nextId, string.Empty);
|
||||||
var showAPIdom = ResultParser.Parse(showAPIResponse.Content);
|
var showAPIdom = ResultParser.ParseDocument(showAPIResponse.Content);
|
||||||
var releaseRowResults = showAPIdom.QuerySelectorAll("div.rls-info-container");
|
var releaseRowResults = showAPIdom.QuerySelectorAll("div.rls-info-container");
|
||||||
releaserows.AddRange(releaseRowResults);
|
releaserows.AddRange(releaseRowResults);
|
||||||
nextId++;
|
nextId++;
|
||||||
|
|
|
@ -7,7 +7,7 @@ using System.Text;
|
||||||
using System.Text.RegularExpressions;
|
using System.Text.RegularExpressions;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using AngleSharp.Dom;
|
using AngleSharp.Dom;
|
||||||
using AngleSharp.Parser.Html;
|
using AngleSharp.Html.Parser;
|
||||||
using CsQuery;
|
using CsQuery;
|
||||||
using Jackett.Common.Models;
|
using Jackett.Common.Models;
|
||||||
using Jackett.Common.Models.IndexerConfig;
|
using Jackett.Common.Models.IndexerConfig;
|
||||||
|
@ -351,7 +351,7 @@ namespace Jackett.Common.Indexers
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
var parser = new HtmlParser();
|
var parser = new HtmlParser();
|
||||||
var document = parser.Parse(results.Content);
|
var document = parser.ParseDocument(results.Content);
|
||||||
var rows = document.QuerySelectorAll("div.row");
|
var rows = document.QuerySelectorAll("div.row");
|
||||||
|
|
||||||
foreach (var row in rows)
|
foreach (var row in rows)
|
||||||
|
@ -380,7 +380,7 @@ namespace Jackett.Common.Indexers
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
var parser = new HtmlParser();
|
var parser = new HtmlParser();
|
||||||
var document = parser.Parse(results.Content);
|
var document = parser.ParseDocument(results.Content);
|
||||||
|
|
||||||
var playButton = document.QuerySelector("div.external-btn");
|
var playButton = document.QuerySelector("div.external-btn");
|
||||||
if (playButton != null && !playButton.ClassList.Contains("inactive"))
|
if (playButton != null && !playButton.ClassList.Contains("inactive"))
|
||||||
|
@ -428,7 +428,7 @@ namespace Jackett.Common.Indexers
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
var parser = new HtmlParser();
|
var parser = new HtmlParser();
|
||||||
var document = parser.Parse(results.Content);
|
var document = parser.ParseDocument(results.Content);
|
||||||
var seasons = document.QuerySelectorAll("div.serie-block");
|
var seasons = document.QuerySelectorAll("div.serie-block");
|
||||||
var rowSelector = "table.movie-parts-list > tbody > tr";
|
var rowSelector = "table.movie-parts-list > tbody > tr";
|
||||||
|
|
||||||
|
@ -585,7 +585,7 @@ namespace Jackett.Common.Indexers
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
var parser = new HtmlParser();
|
var parser = new HtmlParser();
|
||||||
var document = parser.Parse(results.Content);
|
var document = parser.ParseDocument(results.Content);
|
||||||
var meta = document.QuerySelector("meta");
|
var meta = document.QuerySelector("meta");
|
||||||
var metaContent = meta.GetAttribute("content");
|
var metaContent = meta.GetAttribute("content");
|
||||||
|
|
||||||
|
@ -611,7 +611,7 @@ namespace Jackett.Common.Indexers
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
var parser = new HtmlParser();
|
var parser = new HtmlParser();
|
||||||
var document = parser.Parse(results.Content);
|
var document = parser.ParseDocument(results.Content);
|
||||||
var rows = document.QuerySelectorAll("div.inner-box--item");
|
var rows = document.QuerySelectorAll("div.inner-box--item");
|
||||||
|
|
||||||
logger.Debug("> Parsing " + rows.Count().ToString() + " releases");
|
logger.Debug("> Parsing " + rows.Count().ToString() + " releases");
|
||||||
|
|
|
@ -4,8 +4,8 @@ using System.Linq;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Text.RegularExpressions;
|
using System.Text.RegularExpressions;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using AngleSharp.Dom.Html;
|
using AngleSharp.Html.Dom;
|
||||||
using AngleSharp.Parser.Html;
|
using AngleSharp.Html.Parser;
|
||||||
using Jackett.Common.Models;
|
using Jackett.Common.Models;
|
||||||
using Jackett.Common.Models.IndexerConfig;
|
using Jackett.Common.Models.IndexerConfig;
|
||||||
using Jackett.Common.Services.Interfaces;
|
using Jackett.Common.Services.Interfaces;
|
||||||
|
@ -762,7 +762,7 @@ namespace Jackett.Common.Indexers
|
||||||
{
|
{
|
||||||
var result = await mt.RequestBytesWithCookies(uri.AbsoluteUri, null, method, null, data, headers);
|
var result = await mt.RequestBytesWithCookies(uri.AbsoluteUri, null, method, null, data, headers);
|
||||||
var SearchResultParser = new HtmlParser();
|
var SearchResultParser = new HtmlParser();
|
||||||
var doc = SearchResultParser.Parse(mt.Encoding.GetString(result.Content));
|
var doc = SearchResultParser.ParseDocument(mt.Encoding.GetString(result.Content));
|
||||||
return doc;
|
return doc;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,7 +7,7 @@ using System.Text;
|
||||||
using System.Text.RegularExpressions;
|
using System.Text.RegularExpressions;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using AngleSharp.Dom;
|
using AngleSharp.Dom;
|
||||||
using AngleSharp.Parser.Html;
|
using AngleSharp.Html.Parser;
|
||||||
using CsQuery;
|
using CsQuery;
|
||||||
using Jackett.Common.Models;
|
using Jackett.Common.Models;
|
||||||
using Jackett.Common.Models.IndexerConfig;
|
using Jackett.Common.Models.IndexerConfig;
|
||||||
|
@ -120,7 +120,7 @@ namespace Jackett.Common.Indexers
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
var parser = new HtmlParser();
|
var parser = new HtmlParser();
|
||||||
var document = parser.Parse(response.Content);
|
var document = parser.ParseDocument(response.Content);
|
||||||
var groups = document.QuerySelectorAll(".torrent_table > tbody > tr.group");
|
var groups = document.QuerySelectorAll(".torrent_table > tbody > tr.group");
|
||||||
var torrents = document.QuerySelectorAll(".torrent_table > tbody > tr.torrent");
|
var torrents = document.QuerySelectorAll(".torrent_table > tbody > tr.torrent");
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,7 @@ using System.Linq;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Text.RegularExpressions;
|
using System.Text.RegularExpressions;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using AngleSharp.Parser.Html;
|
using AngleSharp.Html.Parser;
|
||||||
using Jackett.Common.Models;
|
using Jackett.Common.Models;
|
||||||
using Jackett.Common.Models.IndexerConfig;
|
using Jackett.Common.Models.IndexerConfig;
|
||||||
using Jackett.Common.Services.Interfaces;
|
using Jackett.Common.Services.Interfaces;
|
||||||
|
@ -373,7 +373,7 @@ namespace Jackett.Common.Indexers
|
||||||
private IEnumerable<NewpctRelease> ParseDailyContent(string content)
|
private IEnumerable<NewpctRelease> ParseDailyContent(string content)
|
||||||
{
|
{
|
||||||
var SearchResultParser = new HtmlParser();
|
var SearchResultParser = new HtmlParser();
|
||||||
var doc = SearchResultParser.Parse(content);
|
var doc = SearchResultParser.ParseDocument(content);
|
||||||
|
|
||||||
List<NewpctRelease> releases = new List<NewpctRelease>();
|
List<NewpctRelease> releases = new List<NewpctRelease>();
|
||||||
|
|
||||||
|
@ -425,7 +425,7 @@ namespace Jackett.Common.Indexers
|
||||||
private string ParseSeriesListContent(string content, string title)
|
private string ParseSeriesListContent(string content, string title)
|
||||||
{
|
{
|
||||||
var SearchResultParser = new HtmlParser();
|
var SearchResultParser = new HtmlParser();
|
||||||
var doc = SearchResultParser.Parse(content);
|
var doc = SearchResultParser.ParseDocument(content);
|
||||||
|
|
||||||
Dictionary<string, string> results = new Dictionary<string, string>();
|
Dictionary<string, string> results = new Dictionary<string, string>();
|
||||||
|
|
||||||
|
@ -450,7 +450,7 @@ namespace Jackett.Common.Indexers
|
||||||
private IEnumerable<NewpctRelease> ParseEpisodesListContent(string content)
|
private IEnumerable<NewpctRelease> ParseEpisodesListContent(string content)
|
||||||
{
|
{
|
||||||
var SearchResultParser = new HtmlParser();
|
var SearchResultParser = new HtmlParser();
|
||||||
var doc = SearchResultParser.Parse(content);
|
var doc = SearchResultParser.ParseDocument(content);
|
||||||
|
|
||||||
List<NewpctRelease> releases = new List<NewpctRelease>();
|
List<NewpctRelease> releases = new List<NewpctRelease>();
|
||||||
|
|
||||||
|
@ -517,7 +517,7 @@ namespace Jackett.Common.Indexers
|
||||||
private IEnumerable<NewpctRelease> ParseSearchContent(string content)
|
private IEnumerable<NewpctRelease> ParseSearchContent(string content)
|
||||||
{
|
{
|
||||||
var SearchResultParser = new HtmlParser();
|
var SearchResultParser = new HtmlParser();
|
||||||
var doc = SearchResultParser.Parse(content);
|
var doc = SearchResultParser.ParseDocument(content);
|
||||||
|
|
||||||
List<NewpctRelease> releases = new List<NewpctRelease>();
|
List<NewpctRelease> releases = new List<NewpctRelease>();
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@ using System.Collections.Specialized;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Text.RegularExpressions;
|
using System.Text.RegularExpressions;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using AngleSharp.Parser.Html;
|
using AngleSharp.Html.Parser;
|
||||||
using Jackett.Common.Models;
|
using Jackett.Common.Models;
|
||||||
using Jackett.Common.Models.IndexerConfig;
|
using Jackett.Common.Models.IndexerConfig;
|
||||||
using Jackett.Common.Services.Interfaces;
|
using Jackett.Common.Services.Interfaces;
|
||||||
|
@ -57,7 +57,7 @@ namespace Jackett.Common.Indexers
|
||||||
{
|
{
|
||||||
var loginPage = await RequestStringWithCookies(LoginUrl, string.Empty);
|
var loginPage = await RequestStringWithCookies(LoginUrl, string.Empty);
|
||||||
var LoginParser = new HtmlParser();
|
var LoginParser = new HtmlParser();
|
||||||
var LoginDocument = LoginParser.Parse(loginPage.Content);
|
var LoginDocument = LoginParser.ParseDocument(loginPage.Content);
|
||||||
|
|
||||||
configData.CaptchaCookie.Value = loginPage.Cookies;
|
configData.CaptchaCookie.Value = loginPage.Cookies;
|
||||||
|
|
||||||
|
@ -104,7 +104,7 @@ namespace Jackett.Common.Indexers
|
||||||
await ConfigureIfOK(result.Cookies, result.Content.Contains("logout.php"), () =>
|
await ConfigureIfOK(result.Cookies, result.Content.Contains("logout.php"), () =>
|
||||||
{
|
{
|
||||||
var LoginParser = new HtmlParser();
|
var LoginParser = new HtmlParser();
|
||||||
var LoginDocument = LoginParser.Parse(result.Content);
|
var LoginDocument = LoginParser.ParseDocument(result.Content);
|
||||||
var errorMessage = LoginDocument.QuerySelector("span.warning[id!=\"no-cookies\"]:has(br)").TextContent;
|
var errorMessage = LoginDocument.QuerySelector("span.warning[id!=\"no-cookies\"]:has(br)").TextContent;
|
||||||
throw new ExceptionWithConfigData(errorMessage, configData);
|
throw new ExceptionWithConfigData(errorMessage, configData);
|
||||||
});
|
});
|
||||||
|
@ -144,7 +144,7 @@ namespace Jackett.Common.Indexers
|
||||||
|
|
||||||
Regex IMDBRegEx = new Regex(@"tt(\d+)", RegexOptions.Compiled);
|
Regex IMDBRegEx = new Regex(@"tt(\d+)", RegexOptions.Compiled);
|
||||||
var hParser = new HtmlParser();
|
var hParser = new HtmlParser();
|
||||||
var ResultDocument = hParser.Parse(results.Content);
|
var ResultDocument = hParser.ParseDocument(results.Content);
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
var Groups = ResultDocument.QuerySelectorAll("div.browsePoster");
|
var Groups = ResultDocument.QuerySelectorAll("div.browsePoster");
|
||||||
|
|
|
@ -4,7 +4,7 @@ using System.Collections.Specialized;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Text.RegularExpressions;
|
using System.Text.RegularExpressions;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using AngleSharp.Parser.Html;
|
using AngleSharp.Html.Parser;
|
||||||
using Jackett.Common.Models;
|
using Jackett.Common.Models;
|
||||||
using Jackett.Common.Models.IndexerConfig;
|
using Jackett.Common.Models.IndexerConfig;
|
||||||
using Jackett.Common.Services.Interfaces;
|
using Jackett.Common.Services.Interfaces;
|
||||||
|
@ -95,7 +95,7 @@ namespace Jackett.Common.Indexers
|
||||||
string RowsSelector = "table.torrent_table > tbody > tr.torrent";
|
string RowsSelector = "table.torrent_table > tbody > tr.torrent";
|
||||||
|
|
||||||
var SearchResultParser = new HtmlParser();
|
var SearchResultParser = new HtmlParser();
|
||||||
var SearchResultDocument = SearchResultParser.Parse(results.Content);
|
var SearchResultDocument = SearchResultParser.ParseDocument(results.Content);
|
||||||
var Rows = SearchResultDocument.QuerySelectorAll(RowsSelector);
|
var Rows = SearchResultDocument.QuerySelectorAll(RowsSelector);
|
||||||
foreach (var Row in Rows)
|
foreach (var Row in Rows)
|
||||||
{
|
{
|
||||||
|
|
|
@ -6,7 +6,7 @@ using System.Net;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using AngleSharp.Dom;
|
using AngleSharp.Dom;
|
||||||
using AngleSharp.Parser.Html;
|
using AngleSharp.Html.Parser;
|
||||||
using Jackett.Common.Models;
|
using Jackett.Common.Models;
|
||||||
using Jackett.Common.Models.IndexerConfig;
|
using Jackett.Common.Models.IndexerConfig;
|
||||||
using Jackett.Common.Services.Interfaces;
|
using Jackett.Common.Services.Interfaces;
|
||||||
|
@ -106,7 +106,7 @@ namespace Jackett.Common.Indexers
|
||||||
string RowsSelector = "div.borderwrap:has(div.maintitle) > table > tbody > tr:has(a[href*=\"index.php?showtopic=\"])";
|
string RowsSelector = "div.borderwrap:has(div.maintitle) > table > tbody > tr:has(a[href*=\"index.php?showtopic=\"])";
|
||||||
|
|
||||||
var SearchResultParser = new HtmlParser();
|
var SearchResultParser = new HtmlParser();
|
||||||
var SearchResultDocument = SearchResultParser.Parse(results.Content);
|
var SearchResultDocument = SearchResultParser.ParseDocument(results.Content);
|
||||||
var Rows = SearchResultDocument.QuerySelectorAll(RowsSelector);
|
var Rows = SearchResultDocument.QuerySelectorAll(RowsSelector);
|
||||||
foreach (var Row in Rows)
|
foreach (var Row in Rows)
|
||||||
{
|
{
|
||||||
|
@ -201,7 +201,7 @@ namespace Jackett.Common.Indexers
|
||||||
var response = await RequestStringWithCookies(link.ToString());
|
var response = await RequestStringWithCookies(link.ToString());
|
||||||
var results = response.Content;
|
var results = response.Content;
|
||||||
var SearchResultParser = new HtmlParser();
|
var SearchResultParser = new HtmlParser();
|
||||||
var SearchResultDocument = SearchResultParser.Parse(results);
|
var SearchResultDocument = SearchResultParser.ParseDocument(results);
|
||||||
var downloadSelector = "a[title=\"Download attachment\"]";
|
var downloadSelector = "a[title=\"Download attachment\"]";
|
||||||
var DlUri = SearchResultDocument.QuerySelector(downloadSelector);
|
var DlUri = SearchResultDocument.QuerySelector(downloadSelector);
|
||||||
if (DlUri != null)
|
if (DlUri != null)
|
||||||
|
|
|
@ -5,7 +5,7 @@ using System.Net;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Text.RegularExpressions;
|
using System.Text.RegularExpressions;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using AngleSharp.Parser.Html;
|
using AngleSharp.Html.Parser;
|
||||||
using Jackett.Common.Models;
|
using Jackett.Common.Models;
|
||||||
using Jackett.Common.Models.IndexerConfig;
|
using Jackett.Common.Models.IndexerConfig;
|
||||||
using Jackett.Common.Services.Interfaces;
|
using Jackett.Common.Services.Interfaces;
|
||||||
|
@ -64,7 +64,7 @@ namespace Jackett.Common.Indexers
|
||||||
await ConfigureIfOK(response.Cookies, response.Content != null && response.Content.Contains("logout.php"), () =>
|
await ConfigureIfOK(response.Cookies, response.Content != null && response.Content.Contains("logout.php"), () =>
|
||||||
{
|
{
|
||||||
var parser = new HtmlParser();
|
var parser = new HtmlParser();
|
||||||
var document = parser.Parse(response.Content);
|
var document = parser.ParseDocument(response.Content);
|
||||||
var messageEl = document.QuerySelector("form > span[class='warning']");
|
var messageEl = document.QuerySelector("form > span[class='warning']");
|
||||||
var errorMessage = response.Content;
|
var errorMessage = response.Content;
|
||||||
if (messageEl != null)
|
if (messageEl != null)
|
||||||
|
@ -104,7 +104,7 @@ namespace Jackett.Common.Indexers
|
||||||
{
|
{
|
||||||
var globalFreeleech = false;
|
var globalFreeleech = false;
|
||||||
var parser = new HtmlParser();
|
var parser = new HtmlParser();
|
||||||
var document = parser.Parse(htmlResponse);
|
var document = parser.ParseDocument(htmlResponse);
|
||||||
|
|
||||||
if (document.QuerySelector("div.nicebar > span:contains(\"Personal Freeleech\")") != null)
|
if (document.QuerySelector("div.nicebar > span:contains(\"Personal Freeleech\")") != null)
|
||||||
globalFreeleech = true;
|
globalFreeleech = true;
|
||||||
|
|
|
@ -4,7 +4,7 @@ using System.Collections.Specialized;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Text.RegularExpressions;
|
using System.Text.RegularExpressions;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using AngleSharp.Parser.Html;
|
using AngleSharp.Html.Parser;
|
||||||
using Jackett.Common.Models;
|
using Jackett.Common.Models;
|
||||||
using Jackett.Common.Models.IndexerConfig;
|
using Jackett.Common.Models.IndexerConfig;
|
||||||
using Jackett.Common.Models.IndexerConfig.Bespoke;
|
using Jackett.Common.Models.IndexerConfig.Bespoke;
|
||||||
|
@ -1443,7 +1443,7 @@ namespace Jackett.Common.Indexers
|
||||||
configData.CookieHeader.Value = null;
|
configData.CookieHeader.Value = null;
|
||||||
var response = await RequestStringWithCookies(LoginUrl);
|
var response = await RequestStringWithCookies(LoginUrl);
|
||||||
var LoginResultParser = new HtmlParser();
|
var LoginResultParser = new HtmlParser();
|
||||||
var LoginResultDocument = LoginResultParser.Parse(response.Content);
|
var LoginResultDocument = LoginResultParser.ParseDocument(response.Content);
|
||||||
var captchaimg = LoginResultDocument.QuerySelector("img[src^=\"https://static.t-ru.org/captcha/\"]");
|
var captchaimg = LoginResultDocument.QuerySelector("img[src^=\"https://static.t-ru.org/captcha/\"]");
|
||||||
if (captchaimg != null)
|
if (captchaimg != null)
|
||||||
{
|
{
|
||||||
|
@ -1489,7 +1489,7 @@ namespace Jackett.Common.Indexers
|
||||||
logger.Debug(result.Content);
|
logger.Debug(result.Content);
|
||||||
var errorMessage = "Unknown error message, please report";
|
var errorMessage = "Unknown error message, please report";
|
||||||
var LoginResultParser = new HtmlParser();
|
var LoginResultParser = new HtmlParser();
|
||||||
var LoginResultDocument = LoginResultParser.Parse(result.Content);
|
var LoginResultDocument = LoginResultParser.ParseDocument(result.Content);
|
||||||
var errormsg = LoginResultDocument.QuerySelector("h4[class=\"warnColor1 tCenter mrg_16\"]");
|
var errormsg = LoginResultDocument.QuerySelector("h4[class=\"warnColor1 tCenter mrg_16\"]");
|
||||||
if (errormsg != null)
|
if (errormsg != null)
|
||||||
errorMessage = errormsg.TextContent;
|
errorMessage = errormsg.TextContent;
|
||||||
|
@ -1534,7 +1534,7 @@ namespace Jackett.Common.Indexers
|
||||||
string RowsSelector = "table#tor-tbl > tbody > tr";
|
string RowsSelector = "table#tor-tbl > tbody > tr";
|
||||||
|
|
||||||
var SearchResultParser = new HtmlParser();
|
var SearchResultParser = new HtmlParser();
|
||||||
var SearchResultDocument = SearchResultParser.Parse(results.Content);
|
var SearchResultDocument = SearchResultParser.ParseDocument(results.Content);
|
||||||
var Rows = SearchResultDocument.QuerySelectorAll(RowsSelector);
|
var Rows = SearchResultDocument.QuerySelectorAll(RowsSelector);
|
||||||
foreach (var Row in Rows)
|
foreach (var Row in Rows)
|
||||||
{
|
{
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="AngleSharp" Version="0.9.11" />
|
<PackageReference Include="AngleSharp" Version="0.10.1" />
|
||||||
<PackageReference Include="Autofac" Version="4.8.1" />
|
<PackageReference Include="Autofac" Version="4.8.1" />
|
||||||
<PackageReference Include="AutoMapper" Version="8.0.0" />
|
<PackageReference Include="AutoMapper" Version="8.0.0" />
|
||||||
<PackageReference Include="BencodeNET" Version="2.2.24" />
|
<PackageReference Include="BencodeNET" Version="2.2.24" />
|
||||||
|
|
Loading…
Reference in New Issue