bithdtv: add imdb search (#7576)

This commit is contained in:
Diego Heras
2020-03-08 14:12:08 +01:00
committed by GitHub
parent 2cc601c5a9
commit 1cfe4f9226

View File

@@ -5,7 +5,6 @@ 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.Dom;
using AngleSharp.Html.Parser; using AngleSharp.Html.Parser;
using Jackett.Common.Models; using Jackett.Common.Models;
using Jackett.Common.Models.IndexerConfig; using Jackett.Common.Models.IndexerConfig;
@@ -32,19 +31,21 @@ namespace Jackett.Common.Indexers
public BitHdtv(IIndexerConfigurationService configService, WebClient w, Logger l, IProtectionService ps) public BitHdtv(IIndexerConfigurationService configService, WebClient w, Logger l, IProtectionService ps)
: base(name: "BIT-HDTV", : base(name: "BIT-HDTV",
description: "Home of high definition invites", description: "BIT-HDTV - Home of High Definition",
link: "https://www.bit-hdtv.com/", link: "https://www.bit-hdtv.com/",
caps: new TorznabCapabilities(), caps: new TorznabCapabilities(),
configService: configService, configService: configService,
client: w, client: w,
logger: l, logger: l,
p: ps, p: ps,
configData: new ConfigurationDataRecaptchaLogin()) configData: new ConfigurationDataRecaptchaLogin("For best results, change the 'Torrents per page' setting to 100 in your profile."))
{ {
Encoding = Encoding.GetEncoding("iso-8859-1"); Encoding = Encoding.GetEncoding("iso-8859-1");
Language = "en-us"; Language = "en-us";
Type = "private"; Type = "private";
TorznabCaps.SupportsImdbMovieSearch = true;
AddCategoryMapping(1, TorznabCatType.TVAnime); // Anime AddCategoryMapping(1, TorznabCatType.TVAnime); // Anime
AddCategoryMapping(2, TorznabCatType.MoviesBluRay); // Blu-ray AddCategoryMapping(2, TorznabCatType.MoviesBluRay); // Blu-ray
AddCategoryMapping(4, TorznabCatType.TVDocumentary); // Documentaries AddCategoryMapping(4, TorznabCatType.TVDocumentary); // Documentaries
@@ -59,11 +60,13 @@ namespace Jackett.Common.Indexers
public override async Task<ConfigurationData> GetConfigurationForSetup() public override async Task<ConfigurationData> GetConfigurationForSetup()
{ {
var result = configData;
var loginPage = await RequestStringWithCookies(LoginUrl, configData.CookieHeader.Value); var loginPage = await RequestStringWithCookies(LoginUrl, configData.CookieHeader.Value);
if (loginPage.IsRedirect)
return result; // already logged in
var parser = new HtmlParser(); var parser = new HtmlParser();
var cq = parser.ParseDocument(loginPage.Content); var cq = parser.ParseDocument(loginPage.Content);
var recaptchaSiteKey = cq.QuerySelector(".g-recaptcha").GetAttribute("data-sitekey"); var recaptchaSiteKey = cq.QuerySelector(".g-recaptcha")?.GetAttribute("data-sitekey");
var result = configData;
result.CookieHeader.Value = loginPage.Cookies; result.CookieHeader.Value = loginPage.Cookies;
result.Captcha.SiteKey = recaptchaSiteKey; result.Captcha.SiteKey = recaptchaSiteKey;
result.Captcha.Version = "2"; result.Captcha.Version = "2";
@@ -88,9 +91,7 @@ namespace Jackett.Common.Indexers
{ {
var results = await PerformQuery(new TorznabQuery()); var results = await PerformQuery(new TorznabQuery());
if (!results.Any()) 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();
@@ -122,17 +123,19 @@ 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 searchString = query.GetQueryString();
var queryCollection = new NameValueCollection();
if (!string.IsNullOrWhiteSpace(searchString)) var qc = new NameValueCollection();
if (!string.IsNullOrWhiteSpace(query.ImdbID))
{ {
queryCollection.Add("search", searchString); qc.Add("search", query.ImdbID);
qc.Add("options", "4");
} }
else if (!string.IsNullOrWhiteSpace(query.GetQueryString()))
queryCollection.Add("incldead", "1"); {
qc.Add("search", query.GetQueryString());
var searchUrl = SearchUrl + queryCollection.GetQueryString(); qc.Add("options", "0");
}
var searchUrl = SearchUrl + qc.GetQueryString();
var trackerCats = MapTorznabCapsToTrackers(query, mapChildrenCatsToParent: true); var trackerCats = MapTorznabCapsToTrackers(query, mapChildrenCatsToParent: true);
@@ -149,8 +152,6 @@ namespace Jackett.Common.Indexers
foreach (var row in rows.Skip(1)) foreach (var row in rows.Skip(1))
{ {
var release = new ReleaseInfo(); var release = new ReleaseInfo();
var qLink = row.Children[2].QuerySelector("a"); var qLink = row.Children[2].QuerySelector("a");
release.MinimumRatio = 1; release.MinimumRatio = 1;
@@ -165,7 +166,7 @@ namespace Jackett.Common.Indexers
release.Link = new Uri(string.Format(DownloadUrl, qLink.GetAttribute("href").Split('=')[1])); release.Link = new Uri(string.Format(DownloadUrl, qLink.GetAttribute("href").Split('=')[1]));
var catUrl = row.Children[1].FirstElementChild.GetAttribute("href"); var catUrl = row.Children[1].FirstElementChild.GetAttribute("href");
var catNum = catUrl.Split(new char[] { '=', '&' })[1]; var catNum = catUrl.Split('=', '&')[1];
release.Category = MapTrackerCatToNewznab(catNum); release.Category = MapTrackerCatToNewznab(catNum);
// This tracker cannot search multiple cats at a time, so search all cats then filter out results from different cats // This tracker cannot search multiple cats at a time, so search all cats then filter out results from different cats