shpaq/Jackett-Jackett
1
0
Fork 0
mirror of https://github.com/Jackett/Jackett.git synced 2025-10-03 17:07:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Convert BB to AngleSharp (#7356) #7292

Browse Source
This commit is contained in:
Cory
2020-02-28 16:32:43 -06:00
committed by GitHub
parent 8056e47fef
commit 4d48c1be44
1 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/Jackett.Common/Indexers/BB.cs
View File

@@ -5,7 +5,8 @@ using System.Linq;
using System.Text;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
using CsQuery;
using AngleSharp.Dom;
using AngleSharp.Html.Parser;
using Jackett.Common.Models;
using Jackett.Common.Models.IndexerConfig;
using Jackett.Common.Services.Interfaces;
@@ -74,13 +75,14 @@ namespace Jackett.Common.Indexers
var response = await RequestLoginAndFollowRedirect(LoginUrl, pairs, null, true, null, SiteLink);
await ConfigureIfOK(response.Cookies, response.Content != null && response.Content.Contains("logout.php"), () =>
{
CQ dom = response.Content;
var messageEl = dom["#loginform"];
var parser = new HtmlParser();
var dom = parser.ParseDocument(response.Content);
var messageEl = dom.QuerySelectorAll("#loginform");
var messages = new List<string>();
for (var i = 0; i < 13; i++)
{
var child = messageEl[0].ChildNodes[i];
messages.Add(child.Cq().Text().Trim());
messages.Add(child.Text().Trim());
}
var message = string.Join(" ", messages);
throw new ExceptionWithConfigData(message, configData);
@@ -134,52 +136,53 @@ namespace Jackett.Common.Indexers
}
try
{
CQ dom = results.Content;
var rows = dom["#torrent_table > tbody > tr.torrent"];
var parser = new HtmlParser();
var dom = parser.ParseDocument(results.Content);
var rows = dom.QuerySelectorAll("#torrent_table > tbody > tr.torrent");
foreach (var row in rows)
{
var qRow = row.Cq();
var release = new ReleaseInfo();
release.MinimumRatio = 1;
release.MinimumSeedTime = 172800; // 48 hours
var catStr = row.ChildElements.ElementAt(0).FirstElementChild.GetAttribute("href").Split(new char[] { '[', ']' })[1];
var catStr = row.Children[0].FirstElementChild.GetAttribute("href").Split(new char[] { '[', ']' })[1];
release.Category = MapTrackerCatToNewznab(catStr);
var qLink = row.ChildElements.ElementAt(1).Cq().Children("a")[0].Cq();
var linkStr = qLink.Attr("href");
var qLink = row.Children[1].QuerySelector("a");
var linkStr = qLink.GetAttribute("href");
release.Comments = new Uri(BaseUrl + "/" + linkStr);
release.Guid = release.Comments;
var qDownload = row.ChildElements.ElementAt(1).Cq().Find("a[title='Download']")[0].Cq();
release.Link = new Uri(BaseUrl + "/" + qDownload.Attr("href"));
var qDownload = row.Children[1].QuerySelector("a[title='Download']");
release.Link = new Uri(BaseUrl + "/" + qDownload.GetAttribute("href"));
var dateStr = row.ChildElements.ElementAt(3).Cq().Text().Trim().Replace(" and", "");
var dateStr = row.Children[3].TextContent.Trim().Replace(" and", "");
release.PublishDate = DateTimeUtil.FromTimeAgo(dateStr);
var sizeStr = row.ChildElements.ElementAt(4).Cq().Text();
var sizeStr = row.Children[4].TextContent;
release.Size = ReleaseInfo.GetBytes(sizeStr);
release.Files = ParseUtil.CoerceInt(row.ChildElements.ElementAt(2).Cq().Text().Trim());
release.Grabs = ParseUtil.CoerceInt(row.ChildElements.ElementAt(6).Cq().Text().Trim());
release.Seeders = ParseUtil.CoerceInt(row.ChildElements.ElementAt(7).Cq().Text().Trim());
release.Peers = ParseUtil.CoerceInt(row.ChildElements.ElementAt(8).Cq().Text().Trim()) + release.Seeders;
release.Files = ParseUtil.CoerceInt(row.Children[2].TextContent.Trim());
release.Grabs = ParseUtil.CoerceInt(row.Children[6].TextContent.Trim());
release.Seeders = ParseUtil.CoerceInt(row.Children[7].TextContent.Trim());
release.Peers = ParseUtil.CoerceInt(row.Children[8].TextContent.Trim()) + release.Seeders;
var grabs = qRow.Find("td:nth-child(6)").Text();
var grabs = row.QuerySelector("td:nth-child(6)").TextContent;
release.Grabs = ParseUtil.CoerceInt(grabs);
if (qRow.Find("strong:contains(\"Freeleech!\")").Length >= 1)
if (row.QuerySelector("strong:contains(\"Freeleech!\")") != null)
release.DownloadVolumeFactor = 0;
else
release.DownloadVolumeFactor = 1;
release.UploadVolumeFactor = 1;
var title = qRow.Find("td:nth-child(2)");
title.Find("span, strong, div, br").Remove();
var title = row.QuerySelector("td:nth-child(2)");
foreach (var element in title.QuerySelectorAll("span, strong, div, br"))
element.Remove();
release.Title = ParseUtil.NormalizeMultiSpaces(title.Text().Replace(" - ]", "]"));
release.Title = ParseUtil.NormalizeMultiSpaces(title.TextContent.Replace(" - ]", "]"));
if (catStr == "10") //change "Season #" to "S##" for TV shows
release.Title = Regex.Replace(release.Title, @"Season (\d+)",