Demonoid: Fix Parsing (#451)

Demonoid: Fix Parsing
This commit is contained in:
flightlevel 2016-08-20 18:16:59 +10:00 committed by GitHub
parent 121736358b
commit 268f5a8ae5
1 changed files with 137 additions and 137 deletions

View File

@ -1,141 +1,141 @@
using CsQuery; using CsQuery;
using Jackett.Models; using Jackett.Models;
using Jackett.Models.IndexerConfig; using Jackett.Models.IndexerConfig;
using Jackett.Services; using Jackett.Services;
using Jackett.Utils; using Jackett.Utils;
using Jackett.Utils.Clients; using Jackett.Utils.Clients;
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
using NLog; using NLog;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Globalization; using System.Globalization;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Web; using System.Web;
namespace Jackett.Indexers namespace Jackett.Indexers
{ {
public class Demonoid : BaseIndexer, IIndexer public class Demonoid : BaseIndexer, IIndexer
{ {
private string LoginUrl { get { return SiteLink + "account_handler.php"; } } private string LoginUrl { get { return SiteLink + "account_handler.php"; } }
private string SearchUrl { get { return SiteLink + "files/?category={0}&subcategory=All&quality=All&seeded=0&to=1&query={1}"; } } private string SearchUrl { get { return SiteLink + "files/?category={0}&subcategory=All&quality=All&seeded=0&to=1&query={1}"; } }
new ConfigurationDataBasicLogin configData new ConfigurationDataBasicLogin configData
{ {
get { return (ConfigurationDataBasicLogin)base.configData; } get { return (ConfigurationDataBasicLogin)base.configData; }
set { base.configData = value; } set { base.configData = value; }
} }
public Demonoid(IIndexerManagerService i, Logger l, IWebClient wc, IProtectionService ps) public Demonoid(IIndexerManagerService i, Logger l, IWebClient wc, IProtectionService ps)
: base(name: "Demonoid", : base(name: "Demonoid",
description: "Demonoid", description: "Demonoid",
link: "http://www.demonoid.pw/", link: "http://www.demonoid.pw/",
caps: TorznabUtil.CreateDefaultTorznabTVCaps(), caps: TorznabUtil.CreateDefaultTorznabTVCaps(),
manager: i, manager: i,
client: wc, client: wc,
logger: l, logger: l,
p: ps, p: ps,
configData: new ConfigurationDataBasicLogin()) configData: new ConfigurationDataBasicLogin())
{ {
AddCategoryMapping(3, TorznabCatType.TV); AddCategoryMapping(3, TorznabCatType.TV);
AddCategoryMapping(3, TorznabCatType.TVSD); AddCategoryMapping(3, TorznabCatType.TVSD);
AddCategoryMapping(3, TorznabCatType.TVHD); AddCategoryMapping(3, TorznabCatType.TVHD);
AddCategoryMapping(1, TorznabCatType.Movies); AddCategoryMapping(1, TorznabCatType.Movies);
} }
public async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson) public async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson)
{ {
configData.LoadValuesFromJson(configJson); configData.LoadValuesFromJson(configJson);
var pairs = new Dictionary<string, string> { var pairs = new Dictionary<string, string> {
{ "nickname", configData.Username.Value }, { "nickname", configData.Username.Value },
{ "password", configData.Password.Value }, { "password", configData.Password.Value },
{ "returnpath", "/" }, { "returnpath", "/" },
{ "withq", "0" }, { "withq", "0" },
{ "Submit", "Submit" } { "Submit", "Submit" }
}; };
var result = await RequestLoginAndFollowRedirect(LoginUrl, pairs, null, true, null, SiteLink); var result = await RequestLoginAndFollowRedirect(LoginUrl, pairs, null, true, null, SiteLink);
await ConfigureIfOK(result.Cookies, result.Content != null && result.Content.Contains("user_control_panel.php"), () => await ConfigureIfOK(result.Cookies, result.Content != null && result.Content.Contains("user_control_panel.php"), () =>
{ {
CQ dom = result.Content; CQ dom = result.Content;
var errorMessage = dom[".red"].ElementAt(1).Cq().Text().Trim(); string errorMessage = dom["form[id='bb_code_form']"].Parent().Find("font[class='red']").Text();
throw new ExceptionWithConfigData(errorMessage, configData); throw new ExceptionWithConfigData(errorMessage, configData);
}); });
return IndexerConfigurationStatus.RequiresTesting; return IndexerConfigurationStatus.RequiresTesting;
} }
public async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query) public async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
{ {
var releases = new List<ReleaseInfo>(); var releases = new List<ReleaseInfo>();
var trackerCats = MapTorznabCapsToTrackers(query); var trackerCats = MapTorznabCapsToTrackers(query);
var cat = (trackerCats.Count == 1 ? trackerCats.ElementAt(0) : "0"); var cat = (trackerCats.Count == 1 ? trackerCats.ElementAt(0) : "0");
var episodeSearchUrl = string.Format(SearchUrl, cat, HttpUtility.UrlEncode(query.GetQueryString())); var episodeSearchUrl = string.Format(SearchUrl, cat, HttpUtility.UrlEncode(query.GetQueryString()));
var results = await RequestStringWithCookiesAndRetry(episodeSearchUrl); var results = await RequestStringWithCookiesAndRetry(episodeSearchUrl);
if (results.Content.Contains("No torrents found")) if (results.Content.Contains("No torrents found"))
{ {
return releases; return releases;
} }
try try
{ {
CQ dom = results.Content; CQ dom = results.Content;
var rows = dom[".ctable_content_no_pad > table > tbody > tr"].ToArray(); var rows = dom[".ctable_content_no_pad > table > tbody > tr"].ToArray();
DateTime lastDateTime = default(DateTime); DateTime lastDateTime = default(DateTime);
for (var i = 0; i < rows.Length; i++) for (var i = 0; i < rows.Length; i++)
{ {
var rowA = rows[i]; var rowA = rows[i];
var rAlign = rowA.Attributes["align"]; var rAlign = rowA.Attributes["align"];
if (rAlign == "right" || rAlign == "center") if (rAlign == "right" || rAlign == "center")
continue; continue;
if (rAlign == "left") if (rAlign == "left")
{ {
// ex: "Monday, Jun 01, 2015", "Monday, Aug 03, 2015" // ex: "Monday, Jun 01, 2015", "Monday, Aug 03, 2015"
var dateStr = rowA.Cq().Text().Trim().Replace("Added on ", ""); var dateStr = rowA.Cq().Text().Trim().Replace("Added on ", "");
if (dateStr.ToLowerInvariant().Contains("today")) if (dateStr.ToLowerInvariant().Contains("today"))
lastDateTime = DateTime.Now; lastDateTime = DateTime.Now;
else else
lastDateTime = DateTime.SpecifyKind(DateTime.ParseExact(dateStr, "dddd, MMM dd, yyyy", CultureInfo.InvariantCulture), DateTimeKind.Utc).ToLocalTime(); lastDateTime = DateTime.SpecifyKind(DateTime.ParseExact(dateStr, "dddd, MMM dd, yyyy", CultureInfo.InvariantCulture), DateTimeKind.Utc).ToLocalTime();
continue; continue;
} }
if (rowA.ChildElements.Count() < 2) if (rowA.ChildElements.Count() < 2)
continue; continue;
var rowB = rows[++i]; var rowB = rows[++i];
var release = new ReleaseInfo(); var release = new ReleaseInfo();
release.MinimumRatio = 1; release.MinimumRatio = 1;
release.MinimumSeedTime = 172800; release.MinimumSeedTime = 172800;
release.PublishDate = lastDateTime; release.PublishDate = lastDateTime;
var qLink = rowA.ChildElements.ElementAt(1).FirstElementChild.Cq(); var qLink = rowA.ChildElements.ElementAt(1).FirstElementChild.Cq();
release.Title = qLink.Text().Trim(); release.Title = qLink.Text().Trim();
release.Description = release.Title; release.Description = release.Title;
release.Comments = new Uri(SiteLink + qLink.Attr("href")); release.Comments = new Uri(SiteLink + qLink.Attr("href"));
release.Guid = release.Comments; release.Guid = release.Comments;
var qDownload = rowB.ChildElements.ElementAt(2).ChildElements.ElementAt(1).Cq(); var qDownload = rowB.ChildElements.ElementAt(2).ChildElements.ElementAt(0).Cq();
release.Link = new Uri(SiteLink + qDownload.Attr("href")); release.Link = new Uri(SiteLink + qDownload.Attr("href"));
var sizeStr = rowB.ChildElements.ElementAt(3).Cq().Text(); var sizeStr = rowB.ChildElements.ElementAt(3).Cq().Text();
release.Size = ReleaseInfo.GetBytes(sizeStr); release.Size = ReleaseInfo.GetBytes(sizeStr);
release.Seeders = ParseUtil.CoerceInt(rowB.ChildElements.ElementAt(6).Cq().Text()); release.Seeders = ParseUtil.CoerceInt(rowB.ChildElements.ElementAt(6).Cq().Text());
release.Peers = ParseUtil.CoerceInt(rowB.ChildElements.ElementAt(6).Cq().Text()) + release.Seeders; release.Peers = ParseUtil.CoerceInt(rowB.ChildElements.ElementAt(6).Cq().Text()) + release.Seeders;
releases.Add(release); releases.Add(release);
} }
} }
catch (Exception ex) catch (Exception ex)
{ {
OnParseError(results.Content, ex); OnParseError(results.Content, ex);
} }
return releases; return releases;
} }
} }
} }