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

GFTracker: fix and improve search

Browse Source
This commit is contained in:
kaso17
2017-01-03 16:09:07 +01:00
parent e476233f07
commit eed8cb70a3
1 changed files with 59 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
src/Jackett/Indexers/GFTracker.cs
View File

@@ -48,18 +48,37 @@ namespace Jackett.Indexers
Encoding = Encoding.UTF8;
Language = "en-us";
AddCategoryMapping(4, TorznabCatType.TV); // TV/XVID
AddCategoryMapping(17, TorznabCatType.TVHD); // TV/X264
AddCategoryMapping(19, TorznabCatType.TV); // TV/DVDRIP
AddCategoryMapping(26, TorznabCatType.TVHD); // TV/BLURAY
AddCategoryMapping(37, TorznabCatType.TV); // TV/DVDR
AddCategoryMapping(47, TorznabCatType.TV); // TV/SD
AddCategoryMapping(7, TorznabCatType.Movies); // Movies/XVID
AddCategoryMapping(8, TorznabCatType.MoviesDVD); // Movies/DVDR
AddCategoryMapping(12, TorznabCatType.MoviesBluRay); // Movies/BLURAY
AddCategoryMapping(18, TorznabCatType.MoviesHD); // Movies/X264-HD
AddCategoryMapping(49, TorznabCatType.MoviesSD); // Movies/X264-SD
AddCategoryMapping(2, TorznabCatType.PC0day, "0DAY");
AddCategoryMapping(16, TorznabCatType.TVAnime, "Anime");
AddCategoryMapping(1, TorznabCatType.PC0day, "APPS");
AddCategoryMapping(9, TorznabCatType.Other, "E-Learning");
AddCategoryMapping(35, TorznabCatType.TVFOREIGN, "Foreign");
AddCategoryMapping(32, TorznabCatType.ConsoleNDS, "Games/NDS");
AddCategoryMapping(6, TorznabCatType.PCGames, "Games/PC");
AddCategoryMapping(36, TorznabCatType.ConsolePS4, "Games/Playstation");
AddCategoryMapping(29, TorznabCatType.ConsolePSP, "Games/PSP");
AddCategoryMapping(23, TorznabCatType.ConsoleWii, "Games/WII");
AddCategoryMapping(12, TorznabCatType.ConsoleXbox, "Games/XBOX");
AddCategoryMapping(11, TorznabCatType.Other, "Misc");
AddCategoryMapping(48, TorznabCatType.MoviesBluRay, "Movies/BLURAY");
AddCategoryMapping(8, TorznabCatType.MoviesDVD, "Movies/DVDR");
AddCategoryMapping(18, TorznabCatType.MoviesHD, "Movies/X264-HD");
AddCategoryMapping(49, TorznabCatType.MoviesSD, "Movies/X264-SD");
AddCategoryMapping(7, TorznabCatType.MoviesSD, "Movies/XVID");
AddCategoryMapping(38, TorznabCatType.AudioOther, "Music/DVDR");
AddCategoryMapping(46, TorznabCatType.AudioLossless, "Music/FLAC");
AddCategoryMapping(5, TorznabCatType.AudioMP3, "Music/MP3");
AddCategoryMapping(13, TorznabCatType.AudioVideo, "Music/Vids");
AddCategoryMapping(26, TorznabCatType.TVHD, "TV/BLURAY");
AddCategoryMapping(37, TorznabCatType.TVSD, "TV/DVDR");
AddCategoryMapping(19, TorznabCatType.TVSD, "TV/DVDRIP");
AddCategoryMapping(47, TorznabCatType.TVSD, "TV/SD");
AddCategoryMapping(17, TorznabCatType.TVHD, "TV/X264");
AddCategoryMapping(4, TorznabCatType.TVSD, "TV/XVID");
AddCategoryMapping(22, TorznabCatType.XXX, "XXX/0DAY");
AddCategoryMapping(25, TorznabCatType.XXXDVD, "XXX/DVDR");
AddCategoryMapping(20, TorznabCatType.XXX, "XXX/HD");
AddCategoryMapping(3, TorznabCatType.XXXXviD, "XXX/XVID");
}
public override async Task<ConfigurationData> GetConfigurationForSetup()
@@ -116,18 +135,17 @@ namespace Jackett.Indexers
}
}
var cookieJar = configData.CookieHeader.Value;
var response = await RequestLoginAndFollowRedirect(LoginUrl, pairs, configData.CookieHeader.Value, true, null, StartPageUrl);
cookieJar += response.Cookies.ToString();
response = await RequestStringWithCookiesAndRetry(SearchUrl, cookieJar);
var response = await RequestLoginAndFollowRedirect(LoginUrl, pairs, configData.CookieHeader.Value, true, SearchUrl, StartPageUrl);
UpdateCookieHeader(response.Cookies);
await ConfigureIfOK(cookieJar, response.Content != null && response.Content.Contains("logout.php"), () =>
await ConfigureIfOK(configData.CookieHeader.Value, response.Content != null && response.Content.Contains("logout.php"), () =>
{
CQ dom = response.Content;
var messageEl = dom["h2"].Last();
var messageEl = dom["div:has(h2)"].Last();
messageEl.Children("a").Remove();
messageEl.Children("style").Remove();
var errorMessage = messageEl.Text().Trim();
IsConfigured = false;
throw new ExceptionWithConfigData(errorMessage, configData);
});
return IndexerConfigurationStatus.RequiresTesting;
@@ -140,6 +158,8 @@ namespace Jackett.Indexers
var queryCollection = new NameValueCollection();
queryCollection.Add("view", "0");
queryCollection.Add("searchtype", "1");
queryCollection.Add("incldead", "1");
if (!string.IsNullOrWhiteSpace(searchString))
{
queryCollection.Add("search", searchString);
@@ -152,7 +172,14 @@ namespace Jackett.Indexers
var searchUrl = SearchUrl + "?" + queryCollection.GetQueryString();
var results = await RequestStringWithCookiesAndRetry(searchUrl, CookieHeader);
var results = await RequestStringWithCookiesAndRetry(searchUrl);
if (results.IsRedirect)
{
// re-login
await ApplyConfiguration(null);
results = await RequestStringWithCookiesAndRetry(searchUrl);
}
try
{
CQ dom = results.Content;
@@ -162,19 +189,11 @@ namespace Jackett.Indexers
var release = new ReleaseInfo();
CQ qRow = row.Cq();
//CQ qLink = qRow.Children().ElementAt(1).Cq().Children("a").ElementAt(1).Cq();
CQ qLink;
CQ qTmp = qRow.Children().ElementAt(1).Cq().Find("a");
if (qTmp.Length < 2) {
qLink = qRow.Children().ElementAt(1).Cq().Find("a").ElementAt(0).Cq();
} else {
qLink = qRow.Children().ElementAt(1).Cq().Find("a").ElementAt(1).Cq();
}
release.MinimumRatio = 0;
release.MinimumSeedTime = 2 * 24 * 60 * 60;
release.MinimumRatio = 1;
release.MinimumSeedTime = 172800;
var qLink = qRow.Find("a[title][href^=\"details.php?id=\"]");
release.Title = qLink.Attr("title");
release.Description = release.Title;
release.Guid = new Uri(SiteLink + qLink.Attr("href").TrimStart('/'));
release.Comments = release.Guid;
@@ -186,14 +205,22 @@ namespace Jackett.Indexers
release.Category = MapTrackerCatToNewznab(catNum);
var dateString = qRow.Children().ElementAt(6).Cq().Text().Trim();
//var pubDate = DateTime.ParseExact(dateString, "yyyy-MM-dd HH:mm:ss", CultureInfo.InvariantCulture);
release.PublishDate = Jackett.Utils.DateTimeUtil.FromTimeAgo(dateString);
release.PublishDate = DateTime.ParseExact(dateString, "yyyy-MM-ddHH:mm:ss", CultureInfo.InvariantCulture);
var sizeStr = qRow.Children().ElementAt(7).Cq().Text().Split(new char[] { '/' })[0];
release.Size = ReleaseInfo.GetBytes(sizeStr);
release.Seeders = ParseUtil.CoerceInt(qRow.Children().ElementAt(8).Cq().Text().Split(new char[] { '/' })[0].Trim());
release.Peers = ParseUtil.CoerceInt(qRow.Children().ElementAt(8).Cq().Text().Split(new char[] { '/' })[1].Trim()) + release.Seeders;
release.Files = ParseUtil.CoerceLong(qRow.Find("td:nth-child(5)").Text());
release.Grabs = ParseUtil.CoerceLong(qRow.Find("a[href^=\"snatches.php?id=\"]").Text().Split(' ')[0]);
release.DownloadVolumeFactor = 0;
release.UploadVolumeFactor = 1;
var desc = qRow.Find("td:nth-child(2)");
desc.Find("a").Remove();
release.Description = desc.Text();
releases.Add(release);
}