Add TorrentHeaven, Andraste, Torrent Network, myAmity trackers and remove PtN AND filtering (#520)

* Add TorrentHeaven tracker

* Add Andraste tracker

* Remove PtN AND filtering

Not needed anymore.
The torrent search is now using AND by default

* Add Torrent Network tracker

* Add myAmity tracker
This commit is contained in:
kaso17
2016-09-22 12:27:35 +02:00
committed by JigSaw
parent a26e07210f
commit 66e3f8eea5
11 changed files with 805 additions and 4 deletions

View File

@@ -16,6 +16,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
#### Supported Private Trackers
* Abnormal
* AlphaRatio
* Andraste
* AnimeBytes
* Avistaz
* BakaBT
@@ -49,6 +50,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
* PirateTheNet
* MoreThanTV
* MyAnonamouse
* myAmity
* NCore
* NextGen
* Pretome
@@ -60,8 +62,10 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
* Shazbat
* SpeedCD
* TehConnection
* Torrent Network
* TorrentBytes
* TorrentDay
* TorrentHeaven
* TorrentLeech
* TorrentShack
* Torrent-Syndikat

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

View File

@@ -0,0 +1,189 @@
using Jackett.Utils.Clients;
using NLog;
using Jackett.Services;
using Jackett.Utils;
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 System.Linq;
namespace Jackett.Indexers
{
public class Andraste : BaseIndexer, IIndexer
{
string LoginUrl { get { return SiteLink + "takelogin.php"; } }
string BrowseUrl { get { return SiteLink + "browse.php"; } }
new ConfigurationDataBasicLoginWithRSSAndDisplay configData
{
get { return (ConfigurationDataBasicLoginWithRSSAndDisplay)base.configData; }
set { base.configData = value; }
}
public Andraste(IIndexerManagerService i, IWebClient wc, Logger l, IProtectionService ps)
: base(name: "Andraste",
description: "A German general tracker.",
link: "https://andraste.io/",
caps: TorznabUtil.CreateDefaultTorznabTVCaps(),
manager: i,
client: wc,
logger: l,
p: ps,
configData: new ConfigurationDataBasicLoginWithRSSAndDisplay())
{
AddCategoryMapping(9, TorznabCatType.Other); // Anderes
AddCategoryMapping(23, TorznabCatType.TVAnime); // Animation - Film &; Serie
AddCategoryMapping(1, TorznabCatType.PC); // Appz
AddCategoryMapping(52, TorznabCatType.Other); // Botuploads
AddCategoryMapping(25, TorznabCatType.TVDocumentary); // Doku - Alle Formate
AddCategoryMapping(27, TorznabCatType.Books); // E-Books
AddCategoryMapping(51, TorznabCatType.Movies3D); // Film/3D
AddCategoryMapping(20, TorznabCatType.MoviesDVD); // Film/DVDr
AddCategoryMapping(37, TorznabCatType.MoviesHD); // Film/HD 1080p++
AddCategoryMapping(38, TorznabCatType.MoviesSD); // Film/HD 720p
AddCategoryMapping(36, TorznabCatType.Movies); // Film/im Kino
AddCategoryMapping(19, TorznabCatType.Movies); // Film/XviD,DivX,x264
AddCategoryMapping(4, TorznabCatType.PCGames); // Games/PC
AddCategoryMapping(12, TorznabCatType.ConsolePS4); // Games/Playstation
AddCategoryMapping(22, TorznabCatType.ConsoleWii); // Games/Wii & DS
AddCategoryMapping(21, TorznabCatType.ConsoleXbox); // Games/Xbox & 360
AddCategoryMapping(48, TorznabCatType.PCPhoneAndroid); // Handy & PDA/Android
AddCategoryMapping(47, TorznabCatType.PCPhoneIOS); // Handy & PDA/iOS
AddCategoryMapping(44, TorznabCatType.PCMac); // Macintosh
AddCategoryMapping(41, TorznabCatType.Other); // MegaPack
AddCategoryMapping(24, TorznabCatType.AudioAudiobook); // Musik/Hörbuch & Hörspiel
AddCategoryMapping(46, TorznabCatType.Audio); // Musik/HQ 320++
AddCategoryMapping(6, TorznabCatType.Audio); // Musik/Musik
AddCategoryMapping(26, TorznabCatType.AudioVideo); // Musik/Musikvideos
AddCategoryMapping(29, TorznabCatType.TVSD); // Serien/DVDr
AddCategoryMapping(35, TorznabCatType.TVHD); // Serien/HD 720p++
AddCategoryMapping(7, TorznabCatType.TV); // Serien/XviD,DivX,x264
AddCategoryMapping(45, TorznabCatType.TV); // Shows
AddCategoryMapping(40, TorznabCatType.TVSport); // Sport
AddCategoryMapping(32, TorznabCatType.XXX); // XXX
}
public async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson)
{
configData.LoadValuesFromJson(configJson);
var pairs = new Dictionary<string, string>
{
{ "username", configData.Username.Value },
{ "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"), () =>
{
CQ dom = result.Content;
var errorMessage = dom["table.tableinborder"].Html();
errorMessage = result.Content;
throw new ExceptionWithConfigData(errorMessage, configData);
});
return IndexerConfigurationStatus.RequiresTesting;
}
public 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 searchString = query.GetQueryString();
var searchUrl = BrowseUrl;
var queryCollection = new NameValueCollection();
queryCollection.Add("showsearch", "1");
queryCollection.Add("incldead", "1");
queryCollection.Add("orderby", "added");
queryCollection.Add("sort", "desc");
if (!string.IsNullOrWhiteSpace(searchString))
{
queryCollection.Add("search", searchString);
}
foreach (var cat in MapTorznabCapsToTrackers(query))
{
queryCollection.Add("c" + cat, "1");
}
searchUrl += "?" + queryCollection.GetQueryString();
var response = await RequestBytesWithCookies(searchUrl);
var results = Encoding.GetEncoding("iso-8859-1").GetString(response.Content);
try
{
CQ dom = results;
var rows = dom["table.tableinborder > tbody > tr:has(td.tableb)"];
foreach (var row in rows)
{
var release = new ReleaseInfo();
var qRow = row.Cq();
var qDetailsLink = qRow.Find("a[href^=details.php?id=]").First();
release.Title = qDetailsLink.Attr("title");
var qCatLink = qRow.Find("a[href^=browse.php?cat=]").First();
var qDLLink = qRow.Find("a[href^=download.php?torrent=]").First();
var qSeeders = qRow.Find("span:contains(Seeder) > b:eq(0)");
var qLeechers = qRow.Find("span:contains(Seeder) > b:eq(1)");
var qDateStr = qRow.Find("td > table > tbody > tr > td:eq(7)").First();
var qSize = qRow.Find("span:contains(Volumen) > b:eq(0)").First();
var qOnlyUpload = qRow.Find("img[title=OnlyUpload]");
if(qOnlyUpload.Any())
{
release.MinimumRatio = 2;
release.MinimumSeedTime = 144 * 60 * 60;
}
else
{
release.MinimumRatio = 1;
release.MinimumSeedTime = 72 * 60 * 60;
}
var catStr = qCatLink.Attr("href").Split('=')[1];
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().Replace('\xA0', ' ');
DateTime dateGerman = DateTime.SpecifyKind(DateTime.ParseExact(dateStr, "dd.MM.yyyy HH:mm", CultureInfo.InvariantCulture), DateTimeKind.Unspecified);
DateTime pubDateUtc = TimeZoneInfo.ConvertTimeToUtc(dateGerman, germanyTz);
release.PublishDate = pubDateUtc.ToLocalTime();
releases.Add(release);
}
}
catch (Exception ex)
{
OnParseError(results, ex);
}
return releases;
}
}
}

View File

@@ -165,10 +165,6 @@ namespace Jackett.Indexers
var qDetailsLink = qRow.Find("td:eq(1) > a:eq(0)"); // link to the movie, not the actual torrent
release.Title = qDetailsLink.Attr("alt");
// PtN search returns a lot of unrelated releases and offers no option to use AND logic, so we filter it ourself
if (!query.MatchQueryStringAND(release.Title))
continue;
var qCatIcon = qRow.Find("td:eq(0) > img");
var qSeeders = qRow.Find("td:eq(8)");
var qLeechers = qRow.Find("td:eq(9)");

View File

@@ -0,0 +1,239 @@
using Jackett.Utils.Clients;
using NLog;
using Jackett.Services;
using Jackett.Utils;
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 System.Linq;
using System.Threading;
namespace Jackett.Indexers
{
public class TorrentHeaven : BaseIndexer, IIndexer
{
string IndexUrl { get { return SiteLink + "index.php"; } }
string LoginCompleteUrl { get { return SiteLink + "index.php?strWebValue=account&strWebAction=login_complete&ancestry=verify"; } }
new ConfigurationDataCaptchaLogin configData
{
get { return (ConfigurationDataCaptchaLogin)base.configData; }
set { base.configData = value; }
}
public TorrentHeaven(IIndexerManagerService i, IWebClient wc, Logger l, IProtectionService ps)
: base(name: "TorrentHeaven",
description: "A German general tracker.",
link: "https://torrentheaven.myfqdn.info/",
caps: TorznabUtil.CreateDefaultTorznabTVCaps(),
manager: i,
client: wc,
logger: l,
p: ps,
configData: new ConfigurationDataCaptchaLogin())
{
AddCategoryMapping(1, TorznabCatType.PCGames); // GAMES/PC
AddCategoryMapping(3, TorznabCatType.Console); // GAMES/Sonstige
AddCategoryMapping(59, TorznabCatType.ConsolePS4); // GAMES/PlayStation
AddCategoryMapping(60, TorznabCatType.ConsolePSP); // GAMES/PSP
AddCategoryMapping(63, TorznabCatType.ConsoleWii); // GAMES/Wii
AddCategoryMapping(67, TorznabCatType.ConsoleXbox360); // GAMES/XBOX 360
AddCategoryMapping(68, TorznabCatType.PCPhoneOther); // GAMES/PDA / Handy
AddCategoryMapping(72, TorznabCatType.ConsoleNDS); // GAMES/NDS
AddCategoryMapping(7 , TorznabCatType.MoviesDVD); // MOVIES/DVD
AddCategoryMapping(8, TorznabCatType.MoviesSD); // MOVIES/SD
AddCategoryMapping(37, TorznabCatType.MoviesDVD); // MOVIES/DVD Spezial
AddCategoryMapping(41, TorznabCatType.MoviesForeign); // MOVIES/International
AddCategoryMapping(101, TorznabCatType.MoviesHD); // MOVIES/720p
AddCategoryMapping(102, TorznabCatType.MoviesHD); // MOVIES/1080p
AddCategoryMapping(103, TorznabCatType.MoviesHD); // MOVIES/AVCHD
AddCategoryMapping(104, TorznabCatType.MoviesBluRay); // MOVIES/Bluray
AddCategoryMapping(106, TorznabCatType.Movies3D); // MOVIES/3D
AddCategoryMapping(14, TorznabCatType.Audio); // AUDIO/Musik
AddCategoryMapping(15, TorznabCatType.AudioAudiobook); // AUDIO/Hörbücher
AddCategoryMapping(16, TorznabCatType.AudioAudiobook); // AUDIO/Hörspiele
AddCategoryMapping(36, TorznabCatType.AudioLossless); // AUDIO/Flac
AddCategoryMapping(42, TorznabCatType.AudioOther); // AUDIO/Soundtracks
AddCategoryMapping(58, TorznabCatType.AudioVideo); // AUDIO/Musikvideos
AddCategoryMapping(18, TorznabCatType.TVSD); // TV/Serien SD
AddCategoryMapping(19, TorznabCatType.TVHD); // TV/Serien HD 720p
AddCategoryMapping(20, TorznabCatType.TVHD); // TV/Serien HD 1080p
AddCategoryMapping(49, TorznabCatType.TVSD); // TV/Serien DVD
AddCategoryMapping(51, TorznabCatType.TVDocumentary); // TV/Doku SD
AddCategoryMapping(52, TorznabCatType.TVDocumentary); // TV/Doku HD
AddCategoryMapping(53, TorznabCatType.TV); // TV/Serien Complete Packs
AddCategoryMapping(54, TorznabCatType.TVSport); // TV/Sport
AddCategoryMapping(66, TorznabCatType.TVFOREIGN); // TV/International
AddCategoryMapping(22, TorznabCatType.Books); // MISC/EBooks
AddCategoryMapping(24, TorznabCatType.Other); // MISC/Sonstiges
AddCategoryMapping(25, TorznabCatType.Other); // MISC/Tonspuren
AddCategoryMapping(108, TorznabCatType.TVAnime); // MISC/Anime
AddCategoryMapping(28, TorznabCatType.PC); // APPLICATIONS/PC
AddCategoryMapping(29, TorznabCatType.PCPhoneOther); // APPLICATIONS/Mobile
AddCategoryMapping(30, TorznabCatType.PC); // APPLICATIONS/Sonstige
AddCategoryMapping(70, TorznabCatType.PC); // APPLICATIONS/Linux
AddCategoryMapping(71, TorznabCatType.PCMac); // APPLICATIONS/Mac
}
public override async Task<ConfigurationData> GetConfigurationForSetup()
{
var loginPage = await RequestStringWithCookies(IndexUrl, string.Empty);
CQ dom = loginPage.Content;
CQ qCaptchaImg = dom.Find("td.tablea > img").First();
if(qCaptchaImg.Length == 1) {
var CaptchaUrl = SiteLink + qCaptchaImg.Attr("src");
var captchaImage = await RequestBytesWithCookies(CaptchaUrl, loginPage.Cookies);
configData.CaptchaImage.Value = captchaImage.Content;
}
configData.CaptchaCookie.Value = loginPage.Cookies;
return configData;
}
public async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson)
{
configData.LoadValuesFromJson(configJson);
var pairs = new Dictionary<string, string>
{
{ "strWebAction", "login" },
{ "strWebValue", "account" },
{ "jsenabled", "1" },
{ "screenwidth", "2560" },
{ "username", configData.Username.Value },
{ "password", configData.Password.Value }
};
if (!string.IsNullOrWhiteSpace(configData.CaptchaText.Value))
{
pairs.Add("proofcode", configData.CaptchaText.Value);
}
var result = await RequestLoginAndFollowRedirect(IndexUrl, pairs, configData.CaptchaCookie.Value, true, null, IndexUrl, true);
if (result.Content == null || !result.Content.Contains("login_complete"))
{
CQ dom = result.Content;
var errorMessage = dom["table > tbody > tr > td[valign=top][width=100%]"].Html();
if(errorMessage.Length == 0)
errorMessage = result.Content;
throw new ExceptionWithConfigData(errorMessage, configData);
}
var result2 = await RequestStringWithCookies(LoginCompleteUrl, result.Cookies);
await ConfigureIfOK(result2.Cookies, result2.Cookies != null && result2.Cookies.Contains("pass"), () =>
{
var errorMessage = "Didn't get a user/pass cookie";
throw new ExceptionWithConfigData(errorMessage, configData);
});
return IndexerConfigurationStatus.RequiresTesting;
}
public 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 searchString = query.GetQueryString();
var searchUrl = IndexUrl;
var queryCollection = new NameValueCollection();
queryCollection.Add("strWebValue", "torrent");
queryCollection.Add("strWebAction", "search");
queryCollection.Add("sort", "torrent_added");
queryCollection.Add("by", "d");
queryCollection.Add("type", "0");
queryCollection.Add("do_search", "suchen");
queryCollection.Add("time", "0");
queryCollection.Add("details", "title");
if (!string.IsNullOrWhiteSpace(searchString))
{
queryCollection.Add("searchstring", searchString);
}
foreach (var cat in MapTorznabCapsToTrackers(query))
{
queryCollection.Add("dirs" + cat, "1");
}
searchUrl += "?" + queryCollection.GetQueryString();
logger.Error(searchUrl);
logger.Error(CookieHeader);
var response = await RequestBytesWithCookies(searchUrl);
var results = Encoding.GetEncoding("iso-8859-1").GetString(response.Content);
try
{
CQ dom = results;
var rows = dom["table.torrenttable > tbody > tr"];
foreach (var row in rows.Skip(1))
{
var release = new ReleaseInfo();
release.MinimumRatio = 0.8;
release.MinimumSeedTime = 0;
var qRow = row.Cq();
var qDetailsLink = qRow.Find("a[href^=index.php?strWebValue=torrent&strWebAction=details]").First();
release.Title = qDetailsLink.Text();
var qCatLink = qRow.Find("a[href^=index.php?strWebValue=torrent&strWebAction=search&dir=]").First();
var qDLLink = qRow.Find("a[href^=index.php?strWebValue=torrent&strWebAction=download&id=]").First();
var qSeeders = qRow.Find("td.column1:eq(3)");
var qLeechers = qRow.Find("td.column2:eq(3)");
var qDateStr = qRow.Find("font:has(a)").First();
var qSize = qRow.Find("td.column2[align=center]").First();
var catStr = qCatLink.Attr("href").Split('=')[3].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();
var dateStrParts = dateStr.Split();
DateTime dateGerman;
if (dateStrParts[0] == "Heute")
dateGerman = DateTime.SpecifyKind(DateTime.UtcNow.Date, DateTimeKind.Unspecified) + TimeSpan.Parse(dateStrParts[1]);
else if (dateStrParts[0] == "Gestern")
dateGerman = DateTime.SpecifyKind(DateTime.UtcNow.Date, DateTimeKind.Unspecified) + TimeSpan.Parse(dateStrParts[1]) - TimeSpan.FromDays(1);
else
dateGerman = DateTime.SpecifyKind(DateTime.ParseExact(dateStrParts[0]+ dateStrParts[1], "dd.MM.yyyyHH:mm", CultureInfo.InvariantCulture), DateTimeKind.Unspecified);
DateTime pubDateUtc = TimeZoneInfo.ConvertTimeToUtc(dateGerman, germanyTz);
release.PublishDate = pubDateUtc.ToLocalTime();
releases.Add(release);
}
}
catch (Exception ex)
{
OnParseError(results, ex);
}
return releases;
}
}
}

View File

@@ -0,0 +1,190 @@
using Jackett.Utils.Clients;
using NLog;
using Jackett.Services;
using Jackett.Utils;
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;
namespace Jackett.Indexers
{
public class TorrentNetwork : BaseIndexer, IIndexer
{
string LoginUrl { get { return SiteLink + "takelogin.php"; } }
string BrowseUrl { get { return SiteLink + "browse.php"; } }
new ConfigurationDataBasicLoginWithRSSAndDisplay configData
{
get { return (ConfigurationDataBasicLoginWithRSSAndDisplay)base.configData; }
set { base.configData = value; }
}
public TorrentNetwork(IIndexerManagerService i, IWebClient wc, Logger l, IProtectionService ps)
: base(name: "Torrent Network",
description: "A German general tracker.",
link: "https://tntracker.org/",
caps: TorznabUtil.CreateDefaultTorznabTVCaps(),
manager: i,
client: wc,
logger: l,
p: ps,
configData: new ConfigurationDataBasicLoginWithRSSAndDisplay())
{
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
}
public async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson)
{
configData.LoadValuesFromJson(configJson);
var pairs = new Dictionary<string, string>
{
{ "username", configData.Username.Value },
{ "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"), () =>
{
CQ dom = result.Content;
var errorMessage = dom["table.tableinborder"].Html();
errorMessage = result.Content;
throw new ExceptionWithConfigData(errorMessage, configData);
});
return IndexerConfigurationStatus.RequiresTesting;
}
public 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 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");
if (!string.IsNullOrWhiteSpace(searchString))
{
queryCollection.Add("search", searchString);
}
foreach (var cat in MapTorznabCapsToTrackers(query))
{
queryCollection.Add("c" + cat, "1");
}
searchUrl += "?" + queryCollection.GetQueryString();
var response = await RequestBytesWithCookies(searchUrl);
var results = Encoding.GetEncoding("iso-8859-1").GetString(response.Content);
try
{
CQ dom = results;
var rows = dom["table[border=1] > tbody > tr:has(td.torrenttable)"];
foreach (var row in rows)
{
var release = new ReleaseInfo();
release.MinimumRatio = 0.8;
release.MinimumSeedTime = 48 * 60 * 60;
var qRow = row.Cq();
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();
releases.Add(release);
}
}
catch (Exception ex)
{
OnParseError(results, ex);
}
return releases;
}
}
}

View File

@@ -0,0 +1,167 @@
using Jackett.Utils.Clients;
using NLog;
using Jackett.Services;
using Jackett.Utils;
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;
namespace Jackett.Indexers
{
public class myAmity : BaseIndexer, IIndexer
{
string LoginUrl { get { return SiteLink + "account-login.php"; } }
string BrowseUrl { get { return SiteLink + "torrents-search.php"; } }
new ConfigurationDataBasicLoginWithRSSAndDisplay configData
{
get { return (ConfigurationDataBasicLoginWithRSSAndDisplay)base.configData; }
set { base.configData = value; }
}
public myAmity(IIndexerManagerService i, IWebClient wc, Logger l, IProtectionService ps)
: base(name: "myAmity",
description: "A German general tracker.",
link: "https://ttv2.myamity.info/",
caps: TorznabUtil.CreateDefaultTorznabTVCaps(),
manager: i,
client: wc,
logger: l,
p: ps,
configData: new ConfigurationDataBasicLoginWithRSSAndDisplay())
{
AddCategoryMapping(20, TorznabCatType.PC); // Apps - PC
AddCategoryMapping(24, TorznabCatType.AudioAudiobook); // Audio - Hoerbuch/-spiel
AddCategoryMapping(22, TorznabCatType.Audio); // Audio - Musik
AddCategoryMapping(52, TorznabCatType.Movies3D); // Filme - 3D
AddCategoryMapping(51, TorznabCatType.MoviesBluRay); // Filme - BluRay Complete
AddCategoryMapping(1, TorznabCatType.MoviesDVD); // Filme - DVD
AddCategoryMapping(54, TorznabCatType.MoviesHD); // Filme - HD/1080p
AddCategoryMapping(3, TorznabCatType.MoviesHD); // Filme - HD/720p
AddCategoryMapping(48, TorznabCatType.XXX); // Filme - Heimatfilme.XXX
AddCategoryMapping(50, TorznabCatType.Movies); // Filme - x264/H.264
AddCategoryMapping(2, TorznabCatType.MoviesSD); // Filme - XViD
AddCategoryMapping(11, TorznabCatType.Console); // Games - Konsolen
AddCategoryMapping(10, TorznabCatType.PCGames); // Games - PC
AddCategoryMapping(53, TorznabCatType.Other); // International - Complete
AddCategoryMapping(36, TorznabCatType.Books); // Sonstige - E-Books
AddCategoryMapping(38, TorznabCatType.Other); // Sonstige - Handy
AddCategoryMapping(7, TorznabCatType.TVDocumentary); // TV/HDTV - Dokus
AddCategoryMapping(8, TorznabCatType.TV); // TV/HDTV - Serien
}
public async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson)
{
configData.LoadValuesFromJson(configJson);
var pairs = new Dictionary<string, string>
{
{ "username", configData.Username.Value },
{ "password", configData.Password.Value }
};
var result = await RequestLoginAndFollowRedirect(LoginUrl, pairs, null, true, null, LoginUrl, true);
await ConfigureIfOK(result.Cookies, result.Content != null && result.Cookies.Contains("pass=") && !result.Cookies.Contains("deleted"), () =>
{
CQ dom = result.Content;
var errorMessage = dom["div.myFrame-content"].Html();
throw new ExceptionWithConfigData(errorMessage, configData);
});
return IndexerConfigurationStatus.RequiresTesting;
}
public 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 searchString = query.GetQueryString();
var searchUrl = BrowseUrl;
var queryCollection = new NameValueCollection();
queryCollection.Add("incldead", "1");
queryCollection.Add("freeleech", "0");
queryCollection.Add("inclexternal", "0");
queryCollection.Add("lang", "0");
if (!string.IsNullOrWhiteSpace(searchString))
{
queryCollection.Add("search", searchString);
}
foreach (var cat in MapTorznabCapsToTrackers(query))
{
queryCollection.Add("c" + cat, "1");
}
searchUrl += "?" + queryCollection.GetQueryString();
var response = await RequestBytesWithCookies(searchUrl);
var results = Encoding.UTF8.GetString(response.Content);
try
{
CQ dom = results;
var rows = dom["table.ttable_headinner > tbody > tr.t-row"];
foreach (var row in rows)
{
var release = new ReleaseInfo();
release.MinimumRatio = 1;
release.MinimumSeedTime = 90 * 60;
var qRow = row.Cq();
var qDetailsLink = qRow.Find("a[href^=torrents-details.php?id=]").First();
release.Title = qDetailsLink.Attr("title");
var qCatLink = qRow.Find("a[href^=torrents.php?cat=]").First();
var qDLLink = qRow.Find("a[href^=download.php]").First();
var qSeeders = qRow.Find("td:eq(6)");
var qLeechers = qRow.Find("td:eq(7)");
var qDateStr = qRow.Find("td:eq(9)").First();
var qSize = qRow.Find("td:eq(4)").First();
var catStr = qCatLink.Attr("href").Split('=')[1];
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, "dd.MM.yy HH:mm:ss", CultureInfo.InvariantCulture), DateTimeKind.Unspecified);
DateTime pubDateUtc = TimeZoneInfo.ConvertTimeToUtc(dateGerman, germanyTz);
release.PublishDate = pubDateUtc.ToLocalTime();
releases.Add(release);
}
}
catch (Exception ex)
{
OnParseError(results, ex);
}
return releases;
}
}
}

View File

@@ -156,6 +156,10 @@
<Compile Include="Controllers\TorznabController.cs" />
<Compile Include="Controllers\DownloadController.cs" />
<Compile Include="Engine.cs" />
<Compile Include="Indexers\myAmity.cs" />
<Compile Include="Indexers\TorrentNetwork.cs" />
<Compile Include="Indexers\Andraste.cs" />
<Compile Include="Indexers\TorrentHeaven.cs" />
<Compile Include="Indexers\NewRealWorld.cs" />
<Compile Include="Indexers\BestFriends.cs" />
<Compile Include="Indexers\BitCityReloaded.cs" />
@@ -427,6 +431,9 @@
<Content Include="Content\login.html">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Content\logos\andraste.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Content\logos\bestfriends.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
@@ -439,6 +446,9 @@
<Content Include="Content\logos\houseoftorrents.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Content\logos\myamity.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Content\logos\myanonamouse.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
@@ -451,6 +461,12 @@
<Content Include="Content\logos\piratethenet.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Content\logos\torrentheaven.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Content\logos\torrentnetwork.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Content\logos\torrentsyndikat.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>