From cc43bbacd64caca6e10ef67d85d684136c83e25b Mon Sep 17 00:00:00 2001 From: Brian Hartvigsen Date: Sat, 1 Apr 2017 05:34:23 -0700 Subject: [PATCH] Fix Bit-HDTV (#1232) Table size changed and now there can be more then 1 table (used for pinned results.) This will now search all tables, skipping header row. --- src/Jackett/Indexers/BitHdtv.cs | 101 ++++++++++++++++---------------- 1 file changed, 52 insertions(+), 49 deletions(-) diff --git a/src/Jackett/Indexers/BitHdtv.cs b/src/Jackett/Indexers/BitHdtv.cs index 72a166ec0..5f891770e 100644 --- a/src/Jackett/Indexers/BitHdtv.cs +++ b/src/Jackett/Indexers/BitHdtv.cs @@ -102,66 +102,69 @@ namespace Jackett.Indexers { CQ dom = results.Content; dom["#needseed"].Remove(); - var rows = dom["table[width='750'] > tbody"].Children(); - foreach (var row in rows.Skip(1)) + foreach (var table in dom["table[width='785'] > tbody"]) { + var rows = table.Cq().Children(); + foreach (var row in rows.Skip(1)) + { - var release = new ReleaseInfo(); + var release = new ReleaseInfo(); - var qRow = row.Cq(); - var qLink = qRow.Children().ElementAt(2).Cq().Children("a").First(); + var qRow = row.Cq(); + var qLink = qRow.Children().ElementAt(2).Cq().Children("a").First(); - release.MinimumRatio = 1; - release.MinimumSeedTime = 172800; - release.Title = qLink.Attr("title"); - if (!query.MatchQueryStringAND(release.Title)) - continue; - release.Files = ParseUtil.CoerceLong(qRow.Find("td:nth-child(4)").Text()); - release.Grabs = ParseUtil.CoerceLong(qRow.Find("td:nth-child(8)").Text()); - release.Guid = new Uri(qLink.Attr("href")); - release.Comments = release.Guid; - release.Link = new Uri(string.Format(DownloadUrl, qLink.Attr("href").Split('=')[1])); + release.MinimumRatio = 1; + release.MinimumSeedTime = 172800; + release.Title = qLink.Attr("title"); + if (!query.MatchQueryStringAND(release.Title)) + continue; + release.Files = ParseUtil.CoerceLong(qRow.Find("td:nth-child(4)").Text()); + release.Grabs = ParseUtil.CoerceLong(qRow.Find("td:nth-child(8)").Text()); + release.Guid = new Uri(qLink.Attr("href")); + release.Comments = release.Guid; + release.Link = new Uri(string.Format(DownloadUrl, qLink.Attr("href").Split('=')[1])); - var catUrl = qRow.Children().ElementAt(1).FirstElementChild.Cq().Attr("href"); - var catNum = catUrl.Split(new char[] { '=', '&' })[1]; - release.Category = MapTrackerCatToNewznab(catNum); + var catUrl = qRow.Children().ElementAt(1).FirstElementChild.Cq().Attr("href"); + var catNum = catUrl.Split(new char[] { '=', '&' })[1]; + release.Category = MapTrackerCatToNewznab(catNum); - // This tracker cannot search multiple cats at a time, so search all cats then filter out results from different cats - if (trackerCats.Count > 0 && !trackerCats.Contains(catNum)) - continue; + // This tracker cannot search multiple cats at a time, so search all cats then filter out results from different cats + if (trackerCats.Count > 0 && !trackerCats.Contains(catNum)) + continue; - var dateString = qRow.Children().ElementAt(5).Cq().Text().Trim(); - var pubDate = DateTime.ParseExact(dateString, "yyyy-MM-dd HH:mm:ss", CultureInfo.InvariantCulture); - release.PublishDate = DateTime.SpecifyKind(pubDate, DateTimeKind.Local); + var dateString = qRow.Children().ElementAt(5).Cq().Text().Trim(); + var pubDate = DateTime.ParseExact(dateString, "yyyy-MM-dd HH:mm:ss", CultureInfo.InvariantCulture); + release.PublishDate = DateTime.SpecifyKind(pubDate, DateTimeKind.Local); - var sizeStr = qRow.Children().ElementAt(6).Cq().Text(); - release.Size = ReleaseInfo.GetBytes(sizeStr); + var sizeStr = qRow.Children().ElementAt(6).Cq().Text(); + release.Size = ReleaseInfo.GetBytes(sizeStr); - release.Seeders = ParseUtil.CoerceInt(qRow.Children().ElementAt(8).Cq().Text().Trim()); - release.Peers = ParseUtil.CoerceInt(qRow.Children().ElementAt(9).Cq().Text().Trim()) + release.Seeders; + release.Seeders = ParseUtil.CoerceInt(qRow.Children().ElementAt(8).Cq().Text().Trim()); + release.Peers = ParseUtil.CoerceInt(qRow.Children().ElementAt(9).Cq().Text().Trim()) + release.Seeders; - var bgcolor = qRow.Attr("bgcolor"); - if (bgcolor == "#DDDDDD") - { - release.DownloadVolumeFactor = 1; - release.UploadVolumeFactor = 2; - } - else if (bgcolor == "#FFFF99") - { - release.DownloadVolumeFactor = 0; - release.UploadVolumeFactor = 1; - } - else if (bgcolor == "#CCFF99") - { - release.DownloadVolumeFactor = 0; - release.UploadVolumeFactor = 2; - } - else - { - release.DownloadVolumeFactor = 1; - release.UploadVolumeFactor = 1; + var bgcolor = qRow.Attr("bgcolor"); + if (bgcolor == "#DDDDDD") + { + release.DownloadVolumeFactor = 1; + release.UploadVolumeFactor = 2; + } + else if (bgcolor == "#FFFF99") + { + release.DownloadVolumeFactor = 0; + release.UploadVolumeFactor = 1; + } + else if (bgcolor == "#CCFF99") + { + release.DownloadVolumeFactor = 0; + release.UploadVolumeFactor = 2; + } + else + { + release.DownloadVolumeFactor = 1; + release.UploadVolumeFactor = 1; + } + releases.Add(release); } - releases.Add(release); } } catch (Exception ex)