mirror of https://github.com/Jackett/Jackett
TorrentNetwork: fix indexer
This commit is contained in:
kaso17
parent
7af8e1916e
commit
7675214092
|
|
@ -6,19 +6,24 @@ using Jackett.Models;
|
|||
using System.Threading.Tasks;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using System.Collections.Generic;
|
||||
using CsQuery;
|
||||
using System;
|
||||
using System.Globalization;
|
||||
using Jackett.Models.IndexerConfig;
|
||||
using System.Collections.Specialized;
|
||||
using System.Text;
|
||||
using Newtonsoft.Json;
|
||||
using static Jackett.Models.IndexerConfig.ConfigurationData;
|
||||
|
||||
namespace Jackett.Indexers
|
||||
{
|
||||
public class TorrentNetwork : BaseWebIndexer
|
||||
{
|
||||
string LoginUrl { get { return SiteLink + "takelogin.php"; } }
|
||||
string BrowseUrl { get { return SiteLink + "browse.php"; } }
|
||||
string APIUrl { get { return SiteLink + "api/"; } }
|
||||
private string passkey;
|
||||
|
||||
private Dictionary<string, string> APIHeaders = new Dictionary<string, string>()
|
||||
{
|
||||
{"Content-Type", "application/json"},
|
||||
};
|
||||
|
||||
new ConfigurationDataBasicLoginWithRSSAndDisplay configData
|
||||
{
|
||||
|
|
@ -28,9 +33,9 @@ namespace Jackett.Indexers
|
|||
|
||||
public TorrentNetwork(IIndexerConfigurationService configService, IWebClient wc, Logger l, IProtectionService ps)
|
||||
: base(name: "Torrent Network",
|
||||
description: "A German general tracker.",
|
||||
description: null,
|
||||
link: "https://tntracker.org/",
|
||||
caps: TorznabUtil.CreateDefaultTorznabTVCaps(),
|
||||
caps: new TorznabCapabilities(),
|
||||
configService: configService,
|
||||
client: wc,
|
||||
logger: l,
|
||||
|
|
@ -41,51 +46,93 @@ namespace Jackett.Indexers
|
|||
Language = "de-de";
|
||||
Type = "private";
|
||||
|
||||
AddCategoryMapping(1, TorznabCatType.AudioAudiobook); // aBook
|
||||
AddCategoryMapping(4, TorznabCatType.PCMac); // App|Mac
|
||||
AddCategoryMapping(5, TorznabCatType.PC); // App|Win
|
||||
AddCategoryMapping(7, TorznabCatType.TVDocumentary); // Docu|HD
|
||||
AddCategoryMapping(6, TorznabCatType.TVDocumentary); // Docu|SD
|
||||
AddCategoryMapping(8, TorznabCatType.Books); // eBook
|
||||
AddCategoryMapping(10, TorznabCatType.PCGames); // Game|PC
|
||||
AddCategoryMapping(13, TorznabCatType.ConsolePS4); // Game|PSX
|
||||
AddCategoryMapping(12, TorznabCatType.ConsoleWii); // Game|Wii
|
||||
AddCategoryMapping(14, TorznabCatType.ConsoleXbox); // Game|XBOX
|
||||
AddCategoryMapping(30, TorznabCatType.Other); // Misc
|
||||
AddCategoryMapping(17, TorznabCatType.MoviesHD); // Movie|DE|1080p
|
||||
AddCategoryMapping(20, TorznabCatType.MoviesHD); // Movie|DE|2160p
|
||||
AddCategoryMapping(36, TorznabCatType.Movies3D); // Movie|DE|3D
|
||||
AddCategoryMapping(18, TorznabCatType.MoviesHD); // Movie|DE|720p
|
||||
AddCategoryMapping(34, TorznabCatType.TVAnime); // Movie|DE|Anime
|
||||
AddCategoryMapping(19, TorznabCatType.MoviesBluRay); // Movie|DE|BluRay
|
||||
AddCategoryMapping(45, TorznabCatType.Movies); // Movie|DE|Remux
|
||||
AddCategoryMapping(24, TorznabCatType.MoviesSD); // Movie|DE|SD
|
||||
AddCategoryMapping(39, TorznabCatType.Movies); // Movie|EN/JP|Anime
|
||||
AddCategoryMapping(43, TorznabCatType.MoviesHD); // Movie|EN|1080p
|
||||
AddCategoryMapping(37, TorznabCatType.MoviesHD); // Movie|EN|2160p
|
||||
AddCategoryMapping(35, TorznabCatType.MoviesHD); // Movie|EN|720p
|
||||
AddCategoryMapping(38, TorznabCatType.MoviesBluRay); // Movie|EN|BluRay
|
||||
AddCategoryMapping(46, TorznabCatType.Movies); // Movie|EN|Remux
|
||||
AddCategoryMapping(22, TorznabCatType.MoviesSD); // Movie|EN|SD
|
||||
AddCategoryMapping(44, TorznabCatType.AudioLossless); // Music|Flac
|
||||
AddCategoryMapping(25, TorznabCatType.AudioMP3); // Music|MP3
|
||||
AddCategoryMapping(26, TorznabCatType.AudioVideo); // Music|Video
|
||||
AddCategoryMapping(31, TorznabCatType.TVSport); // Sport
|
||||
AddCategoryMapping(2, TorznabCatType.TVAnime); // TV|DE|Anime
|
||||
AddCategoryMapping(28, TorznabCatType.TVHD); // TV|DE|HD
|
||||
AddCategoryMapping(16, TorznabCatType.TV); // TV|DE|Pack
|
||||
AddCategoryMapping(27, TorznabCatType.TVSD); // TV|DE|SD
|
||||
AddCategoryMapping(41, TorznabCatType.TVAnime); // TV|EN/JP|Anime
|
||||
AddCategoryMapping(40, TorznabCatType.TVHD); // TV|EN|HD
|
||||
AddCategoryMapping(42, TorznabCatType.TV); // TV|EN|Pack
|
||||
AddCategoryMapping(29, TorznabCatType.TVSD); // TV|EN|SD
|
||||
AddCategoryMapping(33, TorznabCatType.XXX); // XXX|HD
|
||||
AddCategoryMapping(32, TorznabCatType.XXX); // XXX|SD
|
||||
configData.AddDynamic("token", new HiddenItem() { Name = "token" });
|
||||
configData.AddDynamic("passkey", new HiddenItem() { Name = "passkey" });
|
||||
|
||||
AddCategoryMapping(24, TorznabCatType.MoviesSD, "Movies GER/SD");
|
||||
AddCategoryMapping(18, TorznabCatType.MoviesHD, "Movies GER/720p");
|
||||
AddCategoryMapping(17, TorznabCatType.MoviesHD, "Movies GER/1080p");
|
||||
AddCategoryMapping(20, TorznabCatType.MoviesHD, "Movies GER/2160p");
|
||||
AddCategoryMapping(45, TorznabCatType.MoviesOther, "Movies GER/Remux");
|
||||
AddCategoryMapping(19, TorznabCatType.MoviesBluRay, "Movies GER/BluRay");
|
||||
AddCategoryMapping(34, TorznabCatType.TVAnime, "Movies GER/Anime");
|
||||
AddCategoryMapping(36, TorznabCatType.Movies3D, "Movies GER/3D");
|
||||
|
||||
AddCategoryMapping(22, TorznabCatType.MoviesSD, "Movies ENG/SD");
|
||||
AddCategoryMapping(35, TorznabCatType.MoviesHD, "Movies ENG/720p");
|
||||
AddCategoryMapping(43, TorznabCatType.MoviesHD, "Movies ENG/1080p");
|
||||
AddCategoryMapping(37, TorznabCatType.MoviesHD, "Movies ENG/2160p");
|
||||
AddCategoryMapping(46, TorznabCatType.MoviesOther, "Movies ENG/Remux");
|
||||
AddCategoryMapping(38, TorznabCatType.MoviesBluRay, "Movies ENG/BluRay");
|
||||
AddCategoryMapping(39, TorznabCatType.TVAnime, "Movies ENG/Anime");
|
||||
|
||||
AddCategoryMapping(27, TorznabCatType.TVSD, "Series GER/SD");
|
||||
AddCategoryMapping(28, TorznabCatType.TVHD, "Series GER/HD");
|
||||
AddCategoryMapping(2, TorznabCatType.TVAnime, "Series GER/Anime");
|
||||
AddCategoryMapping(16, TorznabCatType.TV, "Series GER/Pack");
|
||||
AddCategoryMapping(6, TorznabCatType.TVDocumentary, "Docu/SD");
|
||||
AddCategoryMapping(7, TorznabCatType.TVDocumentary, "Docu/HD");
|
||||
|
||||
AddCategoryMapping(29, TorznabCatType.TVSD, "Series ENG/SD");
|
||||
AddCategoryMapping(40, TorznabCatType.TVHD, "Series ENG/HD");
|
||||
AddCategoryMapping(41, TorznabCatType.TVAnime, "Series ENG/Anime");
|
||||
AddCategoryMapping(42, TorznabCatType.TV, "Series ENG/Pack");
|
||||
AddCategoryMapping(31, TorznabCatType.TVSport, "Sport");
|
||||
|
||||
|
||||
AddCategoryMapping(10, TorznabCatType.PCGames, "Games/Win");
|
||||
AddCategoryMapping(12, TorznabCatType.ConsoleWii, "Games/Wii");
|
||||
AddCategoryMapping(13, TorznabCatType.ConsolePS4, "Games/PSX");
|
||||
AddCategoryMapping(14, TorznabCatType.ConsoleXbox, "Games/XBOX");
|
||||
|
||||
AddCategoryMapping(4, TorznabCatType.PCMac, "Apps/Mac");
|
||||
AddCategoryMapping(5, TorznabCatType.PC0day, "Apps/Win");
|
||||
|
||||
AddCategoryMapping(1, TorznabCatType.AudioAudiobook, "Misc/aBook");
|
||||
AddCategoryMapping(8, TorznabCatType.Books, "Misc/eBook");
|
||||
AddCategoryMapping(30, TorznabCatType.Other, "Misc/Sonstiges");
|
||||
|
||||
AddCategoryMapping(44, TorznabCatType.AudioLossless, "Musik/Flac");
|
||||
AddCategoryMapping(25, TorznabCatType.AudioMP3, "Musik/MP3");
|
||||
AddCategoryMapping(26, TorznabCatType.AudioVideo, "Musik/Video");
|
||||
|
||||
AddCategoryMapping(32, TorznabCatType.XXX, "XXX/XXX");
|
||||
AddCategoryMapping(33, TorznabCatType.XXX, "XXX/XXX|HD");
|
||||
}
|
||||
|
||||
public override void LoadValuesFromJson(JToken jsonConfig, bool useProtectionService = false)
|
||||
{
|
||||
base.LoadValuesFromJson(jsonConfig, useProtectionService);
|
||||
|
||||
var tokenItem = (HiddenItem)configData.GetDynamic("token");
|
||||
if (tokenItem != null)
|
||||
{
|
||||
var token = tokenItem.Value;
|
||||
if (!string.IsNullOrWhiteSpace(token))
|
||||
APIHeaders["Authorizationn"] = token;
|
||||
}
|
||||
|
||||
var passkeyItem = (HiddenItem)configData.GetDynamic("passkey");
|
||||
if (passkeyItem != null)
|
||||
{
|
||||
passkey = passkeyItem.Value;
|
||||
}
|
||||
}
|
||||
|
||||
private async Task<dynamic> SendAPIRequest(string endpoint, object data)
|
||||
{
|
||||
var jsonData = JsonConvert.SerializeObject(data);
|
||||
var result = await PostDataWithCookies(APIUrl + endpoint, null, null, SiteLink, APIHeaders, jsonData);
|
||||
if (!result.Content.StartsWith("{")) // not JSON => error
|
||||
throw new ExceptionWithConfigData(result.Content, configData);
|
||||
dynamic json = JsonConvert.DeserializeObject<dynamic>(result.Content);
|
||||
return json;
|
||||
}
|
||||
|
||||
public override async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson)
|
||||
{
|
||||
LoadValuesFromJson(configJson);
|
||||
APIHeaders.Remove("Authorization"); // remove any token from the headers
|
||||
|
||||
var pairs = new Dictionary<string, string>
|
||||
{
|
||||
|
|
@ -93,113 +140,100 @@ namespace Jackett.Indexers
|
|||
{ "password", configData.Password.Value }
|
||||
};
|
||||
|
||||
var result = await RequestLoginAndFollowRedirect(LoginUrl, pairs, null, true, null, LoginUrl, true);
|
||||
await ConfigureIfOK(result.Cookies, result.Content != null && result.Content.Contains("logout.php"), () =>
|
||||
var json = await SendAPIRequest("auth", pairs);
|
||||
string token = json.token;
|
||||
|
||||
APIHeaders["Authorization"] = token;
|
||||
|
||||
var curuser = await SendAPIRequest("curuser", null);
|
||||
|
||||
var passkeyItem = (HiddenItem)configData.GetDynamic("passkey");
|
||||
passkeyItem.Value = curuser.passkey;
|
||||
|
||||
var tokenItem = (HiddenItem)configData.GetDynamic("token");
|
||||
tokenItem.Value = token;
|
||||
|
||||
await ConfigureIfOK("", token.Length > 0, () =>
|
||||
{
|
||||
CQ dom = result.Content;
|
||||
var errorMessage = dom["table.tableinborder"].Html();
|
||||
errorMessage = result.Content;
|
||||
throw new ExceptionWithConfigData(errorMessage, configData);
|
||||
throw new ExceptionWithConfigData(json.ToString(), configData);
|
||||
});
|
||||
|
||||
return IndexerConfigurationStatus.RequiresTesting;
|
||||
}
|
||||
|
||||
protected override async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
|
||||
{
|
||||
TimeZoneInfo.TransitionTime startTransition = TimeZoneInfo.TransitionTime.CreateFloatingDateRule(new DateTime(1, 1, 1, 3, 0, 0), 3, 5, DayOfWeek.Sunday);
|
||||
TimeZoneInfo.TransitionTime endTransition = TimeZoneInfo.TransitionTime.CreateFloatingDateRule(new DateTime(1, 1, 1, 4, 0, 0), 10, 5, DayOfWeek.Sunday);
|
||||
TimeSpan delta = new TimeSpan(1, 0, 0);
|
||||
TimeZoneInfo.AdjustmentRule adjustment = TimeZoneInfo.AdjustmentRule.CreateAdjustmentRule(new DateTime(1999, 10, 1), DateTime.MaxValue.Date, delta, startTransition, endTransition);
|
||||
TimeZoneInfo.AdjustmentRule[] adjustments = { adjustment };
|
||||
TimeZoneInfo germanyTz = TimeZoneInfo.CreateCustomTimeZone("W. Europe Standard Time", new TimeSpan(1, 0, 0), "(GMT+01:00) W. Europe Standard Time", "W. Europe Standard Time", "W. Europe DST Time", adjustments);
|
||||
|
||||
var releases = new List<ReleaseInfo>();
|
||||
|
||||
|
||||
var searchUrl = "browse";
|
||||
var searchString = query.GetQueryString();
|
||||
var searchUrl = BrowseUrl;
|
||||
var queryCollection = new NameValueCollection();
|
||||
queryCollection.Add("incldead", "1");
|
||||
queryCollection.Add("_by", "0");
|
||||
queryCollection.Add("sort", "4");
|
||||
queryCollection.Add("type", "desc");
|
||||
queryCollection.Add("orderC", "4");
|
||||
queryCollection.Add("orderD", "desc");
|
||||
queryCollection.Add("start", "0");
|
||||
queryCollection.Add("length", "100");
|
||||
|
||||
if (!string.IsNullOrWhiteSpace(searchString))
|
||||
{
|
||||
queryCollection.Add("search", searchString);
|
||||
}
|
||||
|
||||
foreach (var cat in MapTorznabCapsToTrackers(query))
|
||||
{
|
||||
queryCollection.Add("c" + cat, "1");
|
||||
}
|
||||
var cats = MapTorznabCapsToTrackers(query);
|
||||
if (cats.Count > 0)
|
||||
queryCollection.Add("cats", string.Join(",", cats));
|
||||
|
||||
searchUrl += "?" + queryCollection.GetQueryString();
|
||||
|
||||
var response = await RequestStringWithCookies(searchUrl);
|
||||
var results = response.Content;
|
||||
var result = await SendAPIRequest(searchUrl, null);
|
||||
try
|
||||
{
|
||||
CQ dom = results;
|
||||
var rows = dom["table[border=1] > tbody > tr:has(td.torrenttable)"];
|
||||
if (result["error"] != null)
|
||||
throw new Exception(result["error"].ToString());
|
||||
|
||||
foreach (var row in rows)
|
||||
var data = (JArray)result.data;
|
||||
|
||||
foreach (JArray torrent in data)
|
||||
{
|
||||
var release = new ReleaseInfo();
|
||||
release.MinimumRatio = 0.8;
|
||||
release.MinimumSeedTime = 48 * 60 * 60;
|
||||
|
||||
var qRow = row.Cq();
|
||||
release.Category = MapTrackerCatToNewznab(torrent[0].ToString());
|
||||
release.Title = torrent[1].ToString();
|
||||
var torrentID = (long)torrent[2];
|
||||
release.Comments = new Uri(SiteLink + "torrent/" + torrentID);
|
||||
release.Guid = release.Comments;
|
||||
release.Link = new Uri(SiteLink + "sdownload/" + torrentID + "/" + passkey);
|
||||
release.PublishDate = DateTimeUtil.UnixTimestampToDateTime((double)torrent[3]).ToLocalTime();
|
||||
//var preDelaySeconds = (long)torrent[4];
|
||||
release.Size = (long)torrent[5];
|
||||
release.Seeders = (int)torrent[6];
|
||||
release.Peers = release.Seeders + (int)torrent[7];
|
||||
//var imdbRating = (double)torrent[8] / 10;
|
||||
var genres = (string)torrent[9];
|
||||
if (!string.IsNullOrWhiteSpace(genres))
|
||||
release.Description = "Genres: " + genres;
|
||||
|
||||
var qDetailsLink = qRow.Find("a[href^=details.php?id=]").First();
|
||||
var qTitle = qDetailsLink.Find("b").First();
|
||||
release.Title = qTitle.Text();
|
||||
|
||||
var qCatLink = qRow.Find("a[href^=browse.php?cat=]").First();
|
||||
var qDLLink = qRow.Find("a.download").First();
|
||||
var qSeeders = qRow.Find("td.torrenttable:eq(7)");
|
||||
var qLeechers = qRow.Find("td.torrenttable:eq(8)");
|
||||
var qDateStr = qRow.Find("td.torrenttable:eq(4)").First();
|
||||
var qSize = qRow.Find("td.torrenttable:eq(5)").First();
|
||||
|
||||
var catStr = qCatLink.Attr("href").Split('=')[1].Split('\'')[0];
|
||||
release.Category = MapTrackerCatToNewznab(catStr);
|
||||
|
||||
release.Link = new Uri(SiteLink + qDLLink.Attr("href"));
|
||||
release.Comments = new Uri(SiteLink + qDetailsLink.Attr("href"));
|
||||
release.Guid = release.Link;
|
||||
|
||||
var sizeStr = qSize.Text();
|
||||
release.Size = ReleaseInfo.GetBytes(sizeStr);
|
||||
|
||||
release.Seeders = ParseUtil.CoerceInt(qSeeders.Text());
|
||||
release.Peers = ParseUtil.CoerceInt(qLeechers.Text()) + release.Seeders;
|
||||
|
||||
var dateStr = qDateStr.Text().Trim();
|
||||
DateTime dateGerman = DateTime.SpecifyKind(DateTime.ParseExact(dateStr, "MMM d yyyy HH:mm", CultureInfo.InvariantCulture), DateTimeKind.Unspecified);
|
||||
|
||||
DateTime pubDateUtc = TimeZoneInfo.ConvertTimeToUtc(dateGerman, germanyTz);
|
||||
release.PublishDate = pubDateUtc.ToLocalTime();
|
||||
|
||||
var files = qRow.Find("td:nth-child(4)").Text();
|
||||
release.Files = ParseUtil.CoerceInt(files);
|
||||
|
||||
var grabs = qRow.Find("td:nth-child(8)").Get(0).FirstChild.ToString();
|
||||
release.Grabs = ParseUtil.CoerceInt(grabs);
|
||||
|
||||
if (qRow.Find("img[src=\"pic/torrent_ou.gif\"]").Length >= 1)
|
||||
var DownloadVolumeFlag = (long)torrent[10];
|
||||
release.UploadVolumeFactor = 1;
|
||||
if (DownloadVolumeFlag == 2) // Only Up
|
||||
release.DownloadVolumeFactor = 0;
|
||||
else if (qRow.Find("font[color=\"gray\"]:contains(50% Down)").Length >= 1)
|
||||
else if (DownloadVolumeFlag == 1) // 50 % Down
|
||||
release.DownloadVolumeFactor = 0.5;
|
||||
else
|
||||
else if (DownloadVolumeFlag == 0)
|
||||
release.DownloadVolumeFactor = 1;
|
||||
|
||||
release.UploadVolumeFactor = 1;
|
||||
release.Grabs = (long)torrent[11];
|
||||
|
||||
// 12/13/14 unknown, probably IDs/name of the uploader
|
||||
//var row12 = (long)torrent[12];
|
||||
//var row13 = (string)torrent[13];
|
||||
//var row14 = (long)torrent[14];
|
||||
|
||||
releases.Add(release);
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
OnParseError(results, ex);
|
||||
OnParseError(result.ToString(), ex);
|
||||
}
|
||||
|
||||
return releases;
|
||||
|
|
|
|||
Loading…
Reference in New Issue