mirror of https://github.com/Jackett/Jackett
parent
869b09f574
commit
b2040d3a5b
|
@ -2,6 +2,7 @@ using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Collections.Specialized;
|
using System.Collections.Specialized;
|
||||||
using System.Globalization;
|
using System.Globalization;
|
||||||
|
using System.Linq;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using AngleSharp.Html.Parser;
|
using AngleSharp.Html.Parser;
|
||||||
|
@ -49,6 +50,7 @@ namespace Jackett.Common.Indexers
|
||||||
Type = "private";
|
Type = "private";
|
||||||
|
|
||||||
TorznabCaps.SupportsImdbMovieSearch = true;
|
TorznabCaps.SupportsImdbMovieSearch = true;
|
||||||
|
TorznabCaps.SupportsImdbTVSearch = true;
|
||||||
|
|
||||||
TorznabCaps.Categories.Clear();
|
TorznabCaps.Categories.Clear();
|
||||||
|
|
||||||
|
@ -107,22 +109,17 @@ namespace Jackett.Common.Indexers
|
||||||
protected override async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
|
protected override async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
|
||||||
{
|
{
|
||||||
var releases = new List<ReleaseInfo>();
|
var releases = new List<ReleaseInfo>();
|
||||||
var searchUrl = SearchUrl;// string.Format(SearchUrl, HttpUtility.UrlEncode()));
|
var searchUrl = SearchUrl + string.Join(
|
||||||
var queryCollection = new NameValueCollection();
|
string.Empty, MapTorznabCapsToTrackers(query).Select(cat => $"category[]={cat}&"));
|
||||||
var searchString = query.GetQueryString();
|
var queryCollection = new NameValueCollection
|
||||||
|
{
|
||||||
|
{"search", query.ImdbID ?? query.GetQueryString()},
|
||||||
|
{"active", "0"},
|
||||||
|
{"options", "0"}
|
||||||
|
};
|
||||||
|
|
||||||
foreach (var cat in MapTorznabCapsToTrackers(query))
|
// manually url encode parenthesis to prevent "hacking" detection
|
||||||
searchUrl += "category%5B%5D=" + cat + "&";
|
searchUrl += queryCollection.GetQueryString().Replace("(", "%28").Replace(")", "%29");
|
||||||
|
|
||||||
if (query.ImdbID != null)
|
|
||||||
queryCollection.Add("search", query.ImdbID);
|
|
||||||
else if (!string.IsNullOrWhiteSpace(searchString))
|
|
||||||
queryCollection.Add("search", searchString);
|
|
||||||
|
|
||||||
queryCollection.Add("active", "0");
|
|
||||||
queryCollection.Add("options", "0");
|
|
||||||
|
|
||||||
searchUrl += queryCollection.GetQueryString().Replace("(", "%28").Replace(")", "%29"); // maually url encode brackets to prevent "hacking" detection
|
|
||||||
|
|
||||||
var results = await RequestStringWithCookiesAndRetry(searchUrl);
|
var results = await RequestStringWithCookiesAndRetry(searchUrl);
|
||||||
try
|
try
|
||||||
|
@ -130,8 +127,8 @@ namespace Jackett.Common.Indexers
|
||||||
var parser = new HtmlParser();
|
var parser = new HtmlParser();
|
||||||
var dom = parser.ParseDocument(results.Content);
|
var dom = parser.ParseDocument(results.Content);
|
||||||
|
|
||||||
var userInfo = dom.QuerySelector(".mainmenu > table > tbody > tr:has(td[title=\"Active-Torrents\"])");
|
var userInfo = dom.QuerySelector("table.navus tr");
|
||||||
var rank = userInfo.QuerySelector("td:nth-child(2)").TextContent.Substring(6);
|
var rank = userInfo.Children[1].TextContent.Replace("Rank:", string.Empty).Trim();
|
||||||
|
|
||||||
var freeleechRanks = new HashSet<string>(StringComparer.OrdinalIgnoreCase)
|
var freeleechRanks = new HashSet<string>(StringComparer.OrdinalIgnoreCase)
|
||||||
{
|
{
|
||||||
|
@ -144,48 +141,52 @@ namespace Jackett.Common.Indexers
|
||||||
};
|
};
|
||||||
var hasFreeleech = freeleechRanks.Contains(rank);
|
var hasFreeleech = freeleechRanks.Contains(rank);
|
||||||
|
|
||||||
var rows = dom.QuerySelectorAll(".mainblockcontenttt > tbody > tr:has(a[href^=\"details.php?id=\"])");
|
var rows = dom.QuerySelectorAll("table.mainblockcontenttt tr:has(td.mainblockcontent)");
|
||||||
foreach (var row in rows)
|
foreach (var row in rows.Skip(1))
|
||||||
{
|
{
|
||||||
var release = new ReleaseInfo();
|
var release = new ReleaseInfo();
|
||||||
|
|
||||||
release.Title = row.QuerySelector("td.mainblockcontent b a").TextContent;
|
var mainLink = row.Children[2].QuerySelector("a");
|
||||||
release.Description = row.QuerySelector("td:nth-child(3) > span").TextContent;
|
|
||||||
|
release.Title = mainLink.TextContent;
|
||||||
|
release.Description = row.Children[2].QuerySelector("span").TextContent;
|
||||||
|
|
||||||
release.MinimumRatio = 1;
|
release.MinimumRatio = 1;
|
||||||
release.MinimumSeedTime = 172800; // 48 hours
|
release.MinimumSeedTime = 172800; // 48 hours
|
||||||
|
|
||||||
var tdIndex = 0;
|
// Sometimes the uploader column is missing, so seeders, leechers, and grabs may be at a different index.
|
||||||
if (row.QuerySelector("td:nth-last-child(1)").TextContent == "Edit")
|
// There's room for improvement, but this works for now.
|
||||||
tdIndex = 1;
|
var endIndex = row.Children.Length;
|
||||||
// moderators get additional delete, recomend and like links
|
|
||||||
if (row.QuerySelector("td:nth-last-child(4)").TextContent == "Edit")
|
|
||||||
tdIndex = 4;
|
|
||||||
|
|
||||||
// Sometimes the uploader column is missing
|
//Maybe use row.Children.Index(Node) after searching for an element instead?
|
||||||
if (ParseUtil.TryCoerceInt(row.QuerySelector($"td:nth-last-child({tdIndex + 3})").TextContent, out var seeders))
|
if (row.Children[endIndex - 1].TextContent == "Edit")
|
||||||
|
endIndex -= 1;
|
||||||
|
// moderators get additional delete, recommend and like links
|
||||||
|
else if (row.Children[endIndex - 4].TextContent == "Edit")
|
||||||
|
endIndex -= 4;
|
||||||
|
|
||||||
|
if (ParseUtil.TryCoerceInt(row.Children[endIndex - 3].TextContent, out var seeders))
|
||||||
{
|
{
|
||||||
release.Seeders = seeders;
|
release.Seeders = seeders;
|
||||||
if (ParseUtil.TryCoerceInt(row.QuerySelector($"td:nth-last-child({tdIndex + 2})").TextContent, out var peers))
|
if (ParseUtil.TryCoerceInt(row.Children[endIndex - 2].TextContent, out var peers))
|
||||||
release.Peers = peers + release.Seeders;
|
release.Peers = peers + release.Seeders;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Sometimes the grabs column is missing
|
if (ParseUtil.TryCoerceLong(row.Children[endIndex - 1].TextContent, out var grabs))
|
||||||
if (ParseUtil.TryCoerceLong(row.QuerySelector($"td:nth-last-child({tdIndex + 1})").TextContent, out var grabs))
|
|
||||||
release.Grabs = grabs;
|
release.Grabs = grabs;
|
||||||
|
|
||||||
var fullSize = row.QuerySelectorAll("td.mainblockcontent")[6].TextContent;
|
var fullSize = row.Children[7].TextContent;
|
||||||
release.Size = ReleaseInfo.GetBytes(fullSize);
|
release.Size = ReleaseInfo.GetBytes(fullSize);
|
||||||
|
|
||||||
release.Guid = new Uri(SiteLink + row.QuerySelector("td.mainblockcontent b a").GetAttribute("href"));
|
release.Guid = new Uri(SiteLink + mainLink.GetAttribute("href"));
|
||||||
release.Link = new Uri(SiteLink + row.QuerySelectorAll("td.mainblockcontent")[3].FirstElementChild.GetAttribute("href"));
|
release.Link = new Uri(SiteLink + row.Children[4].FirstElementChild.GetAttribute("href"));
|
||||||
release.Comments = new Uri(SiteLink + row.QuerySelector("td.mainblockcontent b a").GetAttribute("href"));
|
release.Comments = new Uri(SiteLink + mainLink.GetAttribute("href"));
|
||||||
|
|
||||||
var dateSplit = row.QuerySelectorAll("td.mainblockcontent")[5].InnerHtml.Split(',');
|
var dateTag = row.Children[6].FirstElementChild;
|
||||||
var dateString = dateSplit[1].Substring(0, dateSplit[1].IndexOf('>')).Replace("=\"\"", "").Trim();
|
var dateString = string.Join(" ", dateTag.Attributes.Select(attr => attr.Name));
|
||||||
release.PublishDate = DateTime.ParseExact(dateString, "dd MMM yyyy HH:mm:ss zz00", CultureInfo.InvariantCulture).ToLocalTime();
|
release.PublishDate = DateTime.ParseExact(dateString, "dd MMM yyyy HH:mm:ss zz00", CultureInfo.InvariantCulture).ToLocalTime();
|
||||||
|
|
||||||
var category = row.QuerySelector("td:nth-of-type(1) a").GetAttribute("href").Replace("torrents.php?category=", "");
|
var category = row.FirstElementChild.FirstElementChild.GetAttribute("href").Split('=')[1];
|
||||||
release.Category = MapTrackerCatToNewznab(category);
|
release.Category = MapTrackerCatToNewznab(category);
|
||||||
|
|
||||||
release.UploadVolumeFactor = 1;
|
release.UploadVolumeFactor = 1;
|
||||||
|
@ -195,7 +196,7 @@ namespace Jackett.Common.Indexers
|
||||||
release.DownloadVolumeFactor = 0;
|
release.DownloadVolumeFactor = 0;
|
||||||
release.UploadVolumeFactor = 0;
|
release.UploadVolumeFactor = 0;
|
||||||
}
|
}
|
||||||
else if (hasFreeleech)
|
else if (hasFreeleech || row.QuerySelector("img[alt=\"Golden Torrent\"]") != null)
|
||||||
release.DownloadVolumeFactor = 0;
|
release.DownloadVolumeFactor = 0;
|
||||||
else if (row.QuerySelector("img[alt=\"Silver Torrent\"]") != null)
|
else if (row.QuerySelector("img[alt=\"Silver Torrent\"]") != null)
|
||||||
release.DownloadVolumeFactor = 0.5;
|
release.DownloadVolumeFactor = 0.5;
|
||||||
|
@ -206,9 +207,9 @@ namespace Jackett.Common.Indexers
|
||||||
else
|
else
|
||||||
release.DownloadVolumeFactor = 1;
|
release.DownloadVolumeFactor = 1;
|
||||||
|
|
||||||
var imdblink = row.QuerySelector("a[href*=\"www.imdb.com/title/\"]")?.GetAttribute("href");
|
var imdbLink = row.QuerySelector("a[href*=\"www.imdb.com/title/\"]")?.GetAttribute("href");
|
||||||
if (!string.IsNullOrWhiteSpace(imdblink))
|
if (!string.IsNullOrWhiteSpace(imdbLink))
|
||||||
release.Imdb = ParseUtil.GetLongFromString(imdblink);
|
release.Imdb = ParseUtil.GetLongFromString(imdbLink);
|
||||||
|
|
||||||
releases.Add(release);
|
releases.Add(release);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue