mirror/Jackett
1
0
Fork 0
mirror of https://github.com/Jackett/Jackett synced 2025-02-25 15:42:48 +00:00
Code Issues Releases Wiki Activity

Convert SceneTime to AngleSharp (#7394)

Browse source
This commit is contained in:
Diego Heras 2020-03-01 00:07:41 +01:00 committed by GitHub
parent f4d45517c5
commit c14ee124f5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 31 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
src/Jackett.Common/Indexers/SceneTime.cs
View file

@ -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 CsQuery; 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;
@ -107,14 +107,15 @@ namespace Jackett.Common.Indexers
public override async Task<ConfigurationData> GetConfigurationForSetup() public override async Task<ConfigurationData> GetConfigurationForSetup()
{ {
var loginPage = await RequestStringWithCookies(StartPageUrl, string.Empty); var loginPage = await RequestStringWithCookies(StartPageUrl, string.Empty);
CQ cq = loginPage.Content; var parser = new HtmlParser();
var result = configData; var dom = parser.ParseDocument(loginPage.Content);
result.Captcha.Version = "2"; var recaptcha = dom.QuerySelector(".g-recaptcha");
CQ recaptcha = cq.Find(".g-recaptcha").Attr("data-sitekey"); if (recaptcha != null)
if (recaptcha.Length != 0)
{ {
var result = configData;
result.Captcha.Version = "2";
result.CookieHeader.Value = loginPage.Cookies; result.CookieHeader.Value = loginPage.Cookies;
result.Captcha.SiteKey = cq.Find(".g-recaptcha").Attr("data-sitekey"); result.Captcha.SiteKey = recaptcha.GetAttribute("data-sitekey");
return result; return result;
} }
else else
@ -143,10 +144,8 @@ namespace Jackett.Common.Indexers
try try
{ {
var results = await PerformQuery(new TorznabQuery()); var results = await PerformQuery(new TorznabQuery());
if (results.Count() == 0) if (!results.Any())
{
throw new Exception("Your cookie did not work"); throw new Exception("Your cookie did not work");
}
IsConfigured = true; IsConfigured = true;
SaveConfig(); SaveConfig();
@ -162,8 +161,9 @@ namespace Jackett.Common.Indexers
var result = await RequestLoginAndFollowRedirect(LoginUrl, pairs, null, true, null, LoginUrl); var result = await RequestLoginAndFollowRedirect(LoginUrl, pairs, null, true, null, LoginUrl);
await ConfigureIfOK(result.Cookies, result.Content != null && result.Content.Contains("logout.php"), () => await ConfigureIfOK(result.Cookies, result.Content != null && result.Content.Contains("logout.php"), () =>
{ {
CQ dom = result.Content; var parser = new HtmlParser();
var errorMessage = dom["td.text"].Text().Trim(); var dom = parser.ParseDocument(result.Content);
var errorMessage = dom.QuerySelector("td.text").TextContent.Trim();
throw new ExceptionWithConfigData(errorMessage, configData); throw new ExceptionWithConfigData(errorMessage, configData);
}); });
@ -178,14 +178,10 @@ namespace Jackett.Common.Indexers
var catList = MapTorznabCapsToTrackers(query); var catList = MapTorznabCapsToTrackers(query);
foreach (var cat in catList) foreach (var cat in catList)
{
qParams.Add("c" + cat, "1"); qParams.Add("c" + cat, "1");
}
if (!string.IsNullOrEmpty(query.SanitizedSearchTerm)) if (!string.IsNullOrEmpty(query.SanitizedSearchTerm))
{
qParams.Add("search", query.GetQueryString()); qParams.Add("search", query.GetQueryString());
}
// If Only Freeleech Enabled // If Only Freeleech Enabled
if (configData.Freeleech.Value) if (configData.Freeleech.Value)
@ -206,55 +202,52 @@ namespace Jackett.Common.Indexers
try try
{ {
CQ dom = htmlResponse; var parser = new HtmlParser();
var dom = parser.ParseDocument(htmlResponse);
var headerColumns = dom["table[class*='movehere']"].First().Find("tbody > tr > td[class='cat_Head']").Select(x => x.Cq().Text()).ToList(); var headerColumns = dom.QuerySelector("table.movehere")
.QuerySelectorAll("tbody > tr > td.cat_Head")
.Select(x => x.TextContent).ToList();
var categoryIndex = headerColumns.FindIndex(x => x.Equals("Type")); var categoryIndex = headerColumns.FindIndex(x => x.Equals("Type"));
var nameIndex = headerColumns.FindIndex(x => x.Equals("Name")); var nameIndex = headerColumns.FindIndex(x => x.Equals("Name"));
var sizeIndex = headerColumns.FindIndex(x => x.Equals("Size")); var sizeIndex = headerColumns.FindIndex(x => x.Equals("Size"));
var seedersIndex = headerColumns.FindIndex(x => x.Equals("Seeders")); var seedersIndex = headerColumns.FindIndex(x => x.Equals("Seeders"));
var leechersIndex = headerColumns.FindIndex(x => x.Equals("Leechers")); var leechersIndex = headerColumns.FindIndex(x => x.Equals("Leechers"));
var rows = dom["tr.browse"]; var rows = dom.QuerySelectorAll("tr.browse");
foreach (var row in rows) foreach (var row in rows)
{ {
var release = new ReleaseInfo(); var release = new ReleaseInfo();
release.MinimumRatio = 1; release.MinimumRatio = 1;
release.MinimumSeedTime = 172800; // 48 hours release.MinimumSeedTime = 172800; // 48 hours
var categoryCol = row.ChildElements.ElementAt(categoryIndex); var qCatLink = row.Children[categoryIndex].QuerySelector("a");
var catLink = categoryCol.Cq().Find("a").Attr("href"); if (qCatLink != null)
if (catLink != null)
{ {
var catId = new Regex(@"\?cat=(\d*)").Match(catLink).Groups[1].ToString().Trim(); var catId = new Regex(@"\?cat=(\d*)").Match(qCatLink.GetAttribute("href")).Groups[1].ToString().Trim();
release.Category = MapTrackerCatToNewznab(catId); release.Category = MapTrackerCatToNewznab(catId);
} }
var descCol = row.ChildElements.ElementAt(nameIndex); var qDescCol = row.Children[nameIndex];
var qDescCol = descCol.Cq(); var qLink = qDescCol.QuerySelector("a");
var qLink = qDescCol.Find("a"); release.Title = qLink.TextContent;
release.Title = qLink.Text();
if (!query.MatchQueryStringAND(release.Title)) if (!query.MatchQueryStringAND(release.Title))
continue; continue;
release.Comments = new Uri(SiteLink + "/" + qLink.Attr("href")); release.Comments = new Uri(SiteLink + "/" + qLink.GetAttribute("href"));
release.Guid = release.Comments; release.Guid = release.Comments;
var torrentId = qLink.Attr("href").Split('=')[1]; var torrentId = qLink.GetAttribute("href").Split('=')[1];
release.Link = new Uri(string.Format(DownloadUrl, torrentId)); release.Link = new Uri(string.Format(DownloadUrl, torrentId));
release.PublishDate = DateTimeUtil.FromTimeAgo(descCol.ChildNodes.Last().InnerText); release.PublishDate = DateTimeUtil.FromTimeAgo(qDescCol.ChildNodes.Last().TextContent);
var sizeStr = row.ChildElements.ElementAt(sizeIndex).Cq().Text(); var sizeStr = row.Children[sizeIndex].TextContent;
release.Size = ReleaseInfo.GetBytes(sizeStr); release.Size = ReleaseInfo.GetBytes(sizeStr);
release.Seeders = ParseUtil.CoerceInt(row.ChildElements.ElementAt(seedersIndex).Cq().Text().Trim()); release.Seeders = ParseUtil.CoerceInt(row.Children[seedersIndex].TextContent.Trim());
release.Peers = ParseUtil.CoerceInt(row.ChildElements.ElementAt(leechersIndex).Cq().Text().Trim()) + release.Seeders; release.Peers = ParseUtil.CoerceInt(row.Children[leechersIndex].TextContent.Trim()) + release.Seeders;
if (row.Cq().Find("font > b:contains(Freeleech)").Length >= 1)
release.DownloadVolumeFactor = 0;
else
release.DownloadVolumeFactor = 1;
release.DownloadVolumeFactor = row.QuerySelector("font > b:contains(Freeleech)") != null ? 0 : 1;
release.UploadVolumeFactor = 1; release.UploadVolumeFactor = 1;
releases.Add(release); releases.Add(release);