diff --git a/README.md b/README.md
index 7cd35eeaa..01de7cdb1 100644
--- a/README.md
+++ b/README.md
@@ -21,6 +21,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
* BakaBT
* bB
* BeyondHD
+ * Bit-City Reloaded
* BIT-HDTV
* BitMeTV
* BitSoup
@@ -41,6 +42,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
* Immortalseed
* IPTorrents
* PassThePopcorn
+ * PirateTheNet
* MoreThanTV
* MyAnonamouse
* NCore
@@ -58,6 +60,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
* TorrentDay
* TorrentLeech
* TorrentShack
+ * Torrent-Syndikat
* TransmitheNet
* TV Chaos UK
* World-In-HD
diff --git a/src/Jackett/Content/logos/bitcityreloaded.png b/src/Jackett/Content/logos/bitcityreloaded.png
new file mode 100644
index 000000000..fbb4ffae5
Binary files /dev/null and b/src/Jackett/Content/logos/bitcityreloaded.png differ
diff --git a/src/Jackett/Content/logos/piratethenet.png b/src/Jackett/Content/logos/piratethenet.png
new file mode 100644
index 000000000..c622a89eb
Binary files /dev/null and b/src/Jackett/Content/logos/piratethenet.png differ
diff --git a/src/Jackett/Content/logos/torrentsyndikat.png b/src/Jackett/Content/logos/torrentsyndikat.png
new file mode 100644
index 000000000..93e9d976b
Binary files /dev/null and b/src/Jackett/Content/logos/torrentsyndikat.png differ
diff --git a/src/Jackett/Indexers/Abstract/AvistazTracker.cs b/src/Jackett/Indexers/Abstract/AvistazTracker.cs
index 72ef2a29e..2237bb7e0 100644
--- a/src/Jackett/Indexers/Abstract/AvistazTracker.cs
+++ b/src/Jackett/Indexers/Abstract/AvistazTracker.cs
@@ -52,13 +52,13 @@ namespace Jackett.Indexers
{
configData.LoadValuesFromJson(configJson);
var loginPage = await RequestStringWithCookies(LoginUrl, string.Empty);
- var token = new Regex("Avz.CSRF_TOKEN = '(.*?)';").Match(loginPage.Content).Groups[1].ToString();
+ var token = new Regex("").Match(loginPage.Content).Groups[1].ToString();
var pairs = new Dictionary {
{ "_token", token },
- { "username_email", configData.Username.Value },
+ { "email_username", configData.Username.Value },
{ "password", configData.Password.Value },
- { "remember", "on" }
- };
+ { "remember", "1" }
+ };
var result = await RequestLoginAndFollowRedirect(LoginUrl, pairs, loginPage.Cookies, true, null, LoginUrl);
await ConfigureIfOK(result.Cookies, result.Content != null && result.Content.Contains("auth/logout"), () =>
@@ -100,27 +100,29 @@ namespace Jackett.Indexers
release.MinimumRatio = 1;
release.MinimumSeedTime = 172800;
- var qLink = row.ChildElements.ElementAt(1).FirstElementChild.Cq();
+ var qLink = qRow.Find("a.torrent-filename"); ;
release.Title = qLink.Text().Trim();
release.Comments = new Uri(qLink.Attr("href"));
release.Guid = release.Comments;
- var qDownload = row.ChildElements.ElementAt(3).FirstElementChild.Cq();
+ var qDownload = qRow.Find("a.torrent-download-icon"); ;
release.Link = new Uri(qDownload.Attr("href"));
- var dateStr = row.ChildElements.ElementAt(5).Cq().Text().Trim();
+ var dateStr = qRow.Find("td:eq(3) > span").Text().Trim();
release.PublishDate = DateTimeUtil.FromTimeAgo(dateStr);
- var sizeStr = row.ChildElements.ElementAt(6).Cq().Text();
+ var sizeStr = qRow.Find("td:eq(5) > span").Text().Trim();
release.Size = ReleaseInfo.GetBytes(sizeStr);
- release.Seeders = ParseUtil.CoerceInt(row.ChildElements.ElementAt(8).Cq().Text());
- release.Peers = ParseUtil.CoerceInt(row.ChildElements.ElementAt(9).Cq().Text()) + release.Seeders;
+ release.Seeders = ParseUtil.CoerceInt(qRow.Find("td:eq(6)").Text().Trim());
+ release.Peers = ParseUtil.CoerceInt(qRow.Find("td:eq(7)").Text().Trim()) + release.Seeders;
var cat = row.Cq().Find("td:eq(0) i").First().Attr("class")
- .Replace("gi gi-film", "1")
- .Replace("gi gi-tv", "2")
- .Replace("gi gi-music", "3")
+ .Replace("torrent-icon", string.Empty)
+ .Replace("fa fa-", string.Empty)
+ .Replace("film", "1")
+ .Replace("tv", "2")
+ .Replace("music", "3")
.Replace("text-pink", string.Empty);
release.Category = MapTrackerCatToNewznab(cat.Trim());
releases.Add(release);
diff --git a/src/Jackett/Indexers/BitCityReloaded.cs b/src/Jackett/Indexers/BitCityReloaded.cs
new file mode 100644
index 000000000..685ecbd46
--- /dev/null
+++ b/src/Jackett/Indexers/BitCityReloaded.cs
@@ -0,0 +1,179 @@
+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.Web;
+using System;
+using System.Globalization;
+using Jackett.Models.IndexerConfig;
+using System.Collections.Specialized;
+
+namespace Jackett.Indexers
+{
+ public class BitCityReloaded : BaseIndexer, IIndexer
+ {
+ string LoginUrl { get { return SiteLink + "login.php"; } }
+ string BrowseUrl { get { return SiteLink + "uebersicht.php"; } }
+ TimeZoneInfo germanyTz = TimeZoneInfo.FindSystemTimeZoneById("W. Europe Standard Time");
+
+ new ConfigurationDataBasicLoginWithRSSAndDisplay configData
+ {
+ get { return (ConfigurationDataBasicLoginWithRSSAndDisplay)base.configData; }
+ set { base.configData = value; }
+ }
+
+ public BitCityReloaded(IIndexerManagerService i, IWebClient wc, Logger l, IProtectionService ps)
+ : base(name: "Bit-City Reloaded",
+ description: "A German general tracker.",
+ link: "https://bc-reloaded.net/",
+ caps: TorznabUtil.CreateDefaultTorznabTVCaps(),
+ manager: i,
+ client: wc,
+ logger: l,
+ p: ps,
+ configData: new ConfigurationDataBasicLoginWithRSSAndDisplay())
+ {
+ this.configData.DisplayText.Value = "Only the results from the first search result page are shown, adjust your profile settings to show a reasonable amount (it looks like there's no maximum).";
+ this.configData.DisplayText.Name = "Notice";
+
+ AddCategoryMapping(1, TorznabCatType.Other); // Anderes
+ AddCategoryMapping(2, TorznabCatType.TVAnime); // Anime
+ AddCategoryMapping(34, TorznabCatType.PC); // Appz/Linux
+ AddCategoryMapping(35, TorznabCatType.PCMac); // Appz/Mac
+ AddCategoryMapping(36, TorznabCatType.PC); // Appz/Other
+ AddCategoryMapping(20, TorznabCatType.PC); // Appz/Win
+ AddCategoryMapping(3, TorznabCatType.TVDocumentary); // Doku/Alle Formate
+ AddCategoryMapping(4, TorznabCatType.Books); // EBooks
+ AddCategoryMapping(12, TorznabCatType.ConsolePS4); // Games PS / PSX
+ AddCategoryMapping(11, TorznabCatType.ConsoleNDS); // Games/Nintendo DS
+ AddCategoryMapping(10, TorznabCatType.PCGames); // Games/PC
+ AddCategoryMapping(13, TorznabCatType.ConsoleWii); // Games/Wii
+ AddCategoryMapping(14, TorznabCatType.ConsoleXbox); // Games/Xbox & 360
+ AddCategoryMapping(15, TorznabCatType.PCPhoneOther); // Handy & PDA
+ AddCategoryMapping(16, TorznabCatType.AudioAudiobook); // Hörspiel/Hörbuch
+ AddCategoryMapping(30, TorznabCatType.Other); // International
+ AddCategoryMapping(17, TorznabCatType.Other); // MegaPack
+ AddCategoryMapping(43, TorznabCatType.Movies3D); // Movie/3D
+ AddCategoryMapping(5, TorznabCatType.MoviesDVD); // Movie/DVD/R
+ AddCategoryMapping(6, TorznabCatType.MoviesHD); // Movie/HD 1080p
+ AddCategoryMapping(7, TorznabCatType.MoviesHD); // Movie/HD 720p
+ AddCategoryMapping(32, TorznabCatType.MoviesOther); // Movie/TVRip
+ AddCategoryMapping(9, TorznabCatType.MoviesOther); // Movie/XviD,DivX,h264
+ AddCategoryMapping(26, TorznabCatType.XXX); // Movie/XXX
+ AddCategoryMapping(41, TorznabCatType.XXXOther); // Movie/XXX/Other
+ AddCategoryMapping(42, TorznabCatType.XXXPacks); // Movie/XXX/Pack
+ AddCategoryMapping(45, TorznabCatType.MoviesHD); // Movies/4K
+ AddCategoryMapping(33, TorznabCatType.MoviesBluRay); // Movies/BluRay
+ AddCategoryMapping(18, TorznabCatType.Audio); // Musik
+ AddCategoryMapping(19, TorznabCatType.AudioVideo); // Musik Videos
+ AddCategoryMapping(44, TorznabCatType.TVOTHER); // Serie/DVD/R
+ AddCategoryMapping(22, TorznabCatType.TVHD); // Serie/HDTV
+ AddCategoryMapping(38, TorznabCatType.TV); // Serie/Pack
+ AddCategoryMapping(23, TorznabCatType.TVOTHER); // Serie/XviD,DivX,h264
+ AddCategoryMapping(25, TorznabCatType.TVSport); // Sport
+ }
+
+ public async Task ApplyConfiguration(JToken configJson)
+ {
+ configData.LoadValuesFromJson(configJson);
+
+ var pairs = new Dictionary
+ {
+ { "username", configData.Username.Value },
+ { "password", configData.Password.Value }
+ };
+
+ var result = await RequestLoginAndFollowRedirect(LoginUrl, pairs, null, true, null, LoginUrl);
+ await ConfigureIfOK(result.Cookies, result.Content != null && result.Content.Contains("logout.php"), () =>
+ {
+ CQ dom = result.Content;
+ var errorMessage = dom["#login_error"].Text().Trim();
+ throw new ExceptionWithConfigData(errorMessage, configData);
+ });
+ return IndexerConfigurationStatus.RequiresTesting;
+ }
+
+ public async Task> PerformQuery(TorznabQuery query)
+ {
+ var releases = new List();
+
+ var searchString = query.GetQueryString();
+ var searchUrl = BrowseUrl;
+ var queryCollection = new NameValueCollection();
+ queryCollection.Add("showsearch", "0");
+ queryCollection.Add("incldead", "1");
+ queryCollection.Add("blah", "0");
+ queryCollection.Add("team", "0");
+ 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 RequestStringWithCookiesAndRetry(searchUrl, null, BrowseUrl);
+ var results = response.Content;
+ try
+ {
+ CQ dom = results;
+ var rows = dom["table.tableinborder[cellpadding=0] > tbody > tr"];
+
+ foreach (var row in rows)
+ {
+ var release = new ReleaseInfo();
+ release.MinimumRatio = 0.7;
+ release.MinimumSeedTime = 48 * 60 * 60;
+ var qRow = row.Cq();
+ var flagImgs = qRow.Find("table tbody tr: eq(0) td > img");
+ List flags = new List();
+ flagImgs.Each(flagImg => {
+ flags.Add(flagImg.GetAttribute("src").Replace("pic/torrent_", "").Replace(".gif", "").ToUpper());
+ });
+
+ var titleLink = qRow.Find("table tbody tr:eq(0) td a:has(b)").First();
+ var DLLink = qRow.Find("td.tableb > a:has(img[title=\"Torrent herunterladen\"])").First();
+ release.Comments = new Uri(SiteLink + titleLink.Attr("href").Replace("&hit=1", ""));
+ release.Link = new Uri(SiteLink + DLLink.Attr("href"));
+ release.Title = titleLink.Text().Trim();
+ release.Description = String.Join(", ", flags);
+ release.Guid = release.Link;
+
+ var dateStr = qRow.Find("table tbody tr:eq(1) td:eq(4)").Html().Replace(" ", " ").Trim();
+ var dateGerman = DateTime.SpecifyKind(DateTime.ParseExact(dateStr, "dd.MM.yyyy HH:mm:ss", CultureInfo.InvariantCulture), DateTimeKind.Unspecified);
+ DateTime pubDateUtc = TimeZoneInfo.ConvertTimeToUtc(dateGerman, germanyTz);
+ release.PublishDate = pubDateUtc.ToLocalTime();
+
+ var sizeStr = qRow.Find("table tbody tr:eq(1) td b").First().Text().Trim();
+ release.Size = ReleaseInfo.GetBytes(sizeStr.Replace(",", "."));
+
+ release.Seeders = ParseUtil.CoerceInt(qRow.Find("table tbody tr:eq(1) td:eq(1) b:eq(0) font").Text().Trim());
+ release.Peers = ParseUtil.CoerceInt(qRow.Find("table tbody tr:eq(1) td:eq(1) b:eq(1) font").Text().Trim()) + release.Seeders;
+
+ var catId = qRow.Find("td:eq(0) a").First().Attr("href").Split('=')[1];
+ release.Category = MapTrackerCatToNewznab(catId);
+
+ releases.Add(release);
+ }
+ }
+ catch (Exception ex)
+ {
+ OnParseError(results, ex);
+ }
+
+ return releases;
+ }
+ }
+}
+
diff --git a/src/Jackett/Indexers/PirateTheNet.cs b/src/Jackett/Indexers/PirateTheNet.cs
new file mode 100644
index 000000000..188ec12ad
--- /dev/null
+++ b/src/Jackett/Indexers/PirateTheNet.cs
@@ -0,0 +1,211 @@
+using CsQuery;
+using Jackett.Models;
+using Jackett.Services;
+using Jackett.Utils;
+using Jackett.Utils.Clients;
+using Newtonsoft.Json.Linq;
+using NLog;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Jackett.Models.IndexerConfig;
+using System.Collections.Specialized;
+using System.Globalization;
+
+namespace Jackett.Indexers
+{
+ public class PirateTheNet : BaseIndexer, IIndexer
+ {
+ private string SearchUrl { get { return SiteLink + "torrentsutils.php"; } }
+ private string LoginUrl { get { return SiteLink + "takelogin.php"; } }
+ private string CaptchaUrl { get { return SiteLink + "simpleCaptcha.php?numImages=1"; } }
+ TimeZoneInfo germanyTz = TimeZoneInfo.FindSystemTimeZoneById("W. Europe Standard Time");
+ private readonly List categories = new List() { "1080P", "720P", "BDRip", "BluRay", "BRRip", "DVDR", "DVDRip", "FLAC", "MP3", "MP4", "Packs", "R5", "Remux", "TVRip", "WebRip" };
+
+ new ConfigurationDataBasicLoginWithRSSAndDisplay configData
+ {
+ get { return (ConfigurationDataBasicLoginWithRSSAndDisplay)base.configData; }
+ set { base.configData = value; }
+ }
+
+ public PirateTheNet(IIndexerManagerService i, Logger l, IWebClient w, IProtectionService ps)
+ : base(name: "PirateTheNet",
+ description: "A movie tracker",
+ link: "http://piratethe.net/",
+ caps: new TorznabCapabilities(),
+ manager: i,
+ client: w,
+ logger: l,
+ p: ps,
+ configData: new ConfigurationDataBasicLoginWithRSSAndDisplay())
+ {
+ this.configData.DisplayText.Value = "Only the results from the first search result page are shown, adjust your profile settings to show the maximum.";
+ this.configData.DisplayText.Name = "Notice";
+
+ AddCategoryMapping("1080P", TorznabCatType.MoviesHD);
+ AddCategoryMapping("720P", TorznabCatType.MoviesHD);
+ AddCategoryMapping("BDRip", TorznabCatType.MoviesSD);
+ AddCategoryMapping("BluRay", TorznabCatType.MoviesBluRay);
+ AddCategoryMapping("BRRip", TorznabCatType.MoviesSD);
+ AddCategoryMapping("DVDR", TorznabCatType.MoviesDVD);
+ AddCategoryMapping("DVDRip", TorznabCatType.MoviesSD);
+ AddCategoryMapping("FLAC", TorznabCatType.AudioLossless);
+ AddCategoryMapping("MP3", TorznabCatType.AudioMP3);
+ AddCategoryMapping("MP4", TorznabCatType.AudioOther);
+ AddCategoryMapping("Packs", TorznabCatType.Movies);
+ AddCategoryMapping("R5", TorznabCatType.MoviesDVD);
+ AddCategoryMapping("Remux", TorznabCatType.Movies);
+ AddCategoryMapping("TVRip", TorznabCatType.MoviesOther);
+ AddCategoryMapping("WebRip", TorznabCatType.MoviesWEBDL);
+ }
+
+ public async Task ApplyConfiguration(JToken configJson)
+ {
+ configData.LoadValuesFromJson(configJson);
+
+ var result1 = await RequestStringWithCookies(CaptchaUrl);
+ var json1 = JObject.Parse(result1.Content);
+ var captchaSelection = json1["images"][0]["hash"];
+
+ var pairs = new Dictionary {
+ { "username", configData.Username.Value },
+ { "password", configData.Password.Value },
+ { "captchaSelection", (string)captchaSelection }
+ };
+
+ var result2 = await RequestLoginAndFollowRedirect(LoginUrl, pairs, result1.Cookies, true, null, null, true);
+
+ await ConfigureIfOK(result2.Cookies, result2.Content.Contains("logout.php"), () =>
+ {
+ var errorMessage = "Login Failed";
+ throw new ExceptionWithConfigData(errorMessage, configData);
+ });
+ return IndexerConfigurationStatus.RequiresTesting;
+ }
+
+ public async Task> PerformQuery(TorznabQuery query)
+ {
+ List releases = new List();
+
+ var searchString = query.GetQueryString();
+ var searchUrl = SearchUrl;
+ var queryCollection = new NameValueCollection();
+ queryCollection.Add("action", "torrentstable");
+ queryCollection.Add("viewtype", "0");
+ queryCollection.Add("visiblecategories", "Action,Adventure,Animation,Biography,Comedy,Crime,Documentary,Drama,Eastern,Family,Fantasy,History,Holiday,Horror,Kids,Musical,Mystery,Romance,Sci-Fi,Short,Sports,Thriller,War,Western");
+ queryCollection.Add("page", "1");
+ queryCollection.Add("visibility", "showall");
+ queryCollection.Add("compression", "showall");
+ queryCollection.Add("sort", "added");
+ queryCollection.Add("order", "DESC");
+ queryCollection.Add("titleonly", "true");
+ queryCollection.Add("packs", "showall");
+ queryCollection.Add("bookmarks", "showall");
+ queryCollection.Add("subscriptions", "showall");
+ queryCollection.Add("skw", "showall");
+ queryCollection.Add("advancedsearchparameters", "");
+
+ if (!string.IsNullOrWhiteSpace(searchString))
+ {
+ // search keywords use OR by default and it seems like there's no way to change it, expect unwanted results
+ queryCollection.Add("searchstring", searchString);
+ }
+
+ var cats = MapTorznabCapsToTrackers(query);
+ var hiddenqualities = "";
+ if (cats.Count > 0)
+ {
+ hiddenqualities = String.Join(",", categories.Where(cat => !cats.Contains(cat)));
+ }
+ queryCollection.Add("hiddenqualities", hiddenqualities);
+
+ searchUrl += "?" + queryCollection.GetQueryString();
+
+ var results = await RequestStringWithCookiesAndRetry(searchUrl);
+ try
+ {
+ CQ dom = results.Content;
+ /*
+ // parse logic for viewtype=1, unfortunately it's missing the release time so we can't use it
+ var movieBlocks = dom["table.main"];
+ foreach (var movieBlock in movieBlocks)
+ {
+ var qMovieBlock = movieBlock.Cq();
+
+ var movieLink = qMovieBlock.Find("tr > td[class=colhead] > a").First();
+ var movieName = movieLink.Text();
+
+ var qDetailsBlock = qMovieBlock.Find("tr > td.torrentstd > table > tbody > tr");
+ var qDetailsHeader = qDetailsBlock.ElementAt(0);
+ var qDetailsTags = qDetailsBlock.ElementAt(1);
+ var qTorrents = qDetailsBlock.Find("td.moviestorrentstd > table > tbody > tr:eq(0)");
+
+ foreach (var torrent in qTorrents)
+ {
+ var qTorrent = torrent.Cq();
+ var qCatIcon = qTorrent.Find("td:eq(0) > img");
+ var qDetailsLink = qTorrent.Find("td:eq(1) > a:eq(0)");
+ var qSeeders = qTorrent.Find("td:eq(1) > b > a[alt=\"Number of Seeders\"]");
+ var qLeechers = qTorrent.Find("td:eq(1) > span[alt=\"Number of Leechers\"]");
+ var qDownloadLink = qTorrent.Find("td:eq(1) > a:has(img[alt=\"Download Torrent\"])");
+ }
+ }
+ */
+
+ var rows = dom["table.main > tbody > tr"];
+ foreach (var row in rows.Skip(1))
+ {
+ var release = new ReleaseInfo();
+ release.MinimumRatio = 1;
+ release.MinimumSeedTime = 72 * 60 * 60;
+
+ var qRow = row.Cq();
+
+ var qCatIcon = qRow.Find("td:eq(0) > img");
+ var qDetailsLink = qRow.Find("td:eq(1) > a:eq(0)"); // link to the movie, not the actual torrent
+ var qSeeders = qRow.Find("td:eq(8)");
+ var qLeechers = qRow.Find("td:eq(9)");
+ var qDownloadLink = qRow.Find("td > a:has(img[alt=\"Download Torrent\"])");
+ var qPudDate = qRow.Find("td:eq(5) > nobr");
+ var qSize = qRow.Find("td:eq(6)");
+
+ var catStr = qCatIcon.Attr("alt");
+ release.Category = MapTrackerCatToNewznab(catStr);
+
+ release.Link = new Uri(SiteLink + qDownloadLink.Attr("href").Substring(1));
+ release.Title = qDetailsLink.Text();
+ release.Comments = new Uri(SiteLink + qDetailsLink.Attr("href"));
+ release.Guid = release.Link;
+
+ var dateStr = qPudDate.Text().Trim();
+ DateTime pubDateUtc;
+ var Timeparts = dateStr.Split(new char[] { ' ' }, 2)[1];
+ if (dateStr.StartsWith("Today "))
+ pubDateUtc = DateTime.SpecifyKind(DateTime.UtcNow.Date, DateTimeKind.Unspecified) + DateTime.ParseExact(dateStr.Split(new char[] { ' ' }, 2)[1], "hh:mm tt", System.Globalization.CultureInfo.InvariantCulture).TimeOfDay;
+ else if (dateStr.StartsWith("Yesterday "))
+ pubDateUtc = DateTime.SpecifyKind(DateTime.UtcNow.Date, DateTimeKind.Unspecified) +
+ DateTime.ParseExact(dateStr.Split(new char[] { ' ' }, 2)[1], "hh:mm tt", System.Globalization.CultureInfo.InvariantCulture).TimeOfDay - TimeSpan.FromDays(1);
+ else
+ pubDateUtc = DateTime.SpecifyKind(DateTime.ParseExact(dateStr, "MMM d yyyy hh:mm tt", CultureInfo.InvariantCulture), DateTimeKind.Unspecified);
+
+ release.PublishDate = pubDateUtc.ToLocalTime();
+
+ var sizeStr = qSize.Text();
+ release.Size = ReleaseInfo.GetBytes(sizeStr);
+
+ release.Seeders = ParseUtil.CoerceInt(qSeeders.Text());
+ release.Peers = ParseUtil.CoerceInt(qLeechers.Text()) + release.Seeders;
+
+ releases.Add(release);
+ }
+ }
+ catch (Exception ex)
+ {
+ OnParseError(results.Content, ex);
+ }
+
+ return releases;
+ }
+ }
+}
diff --git a/src/Jackett/Indexers/TorrentSyndikat.cs b/src/Jackett/Indexers/TorrentSyndikat.cs
new file mode 100644
index 000000000..1cd653f2c
--- /dev/null
+++ b/src/Jackett/Indexers/TorrentSyndikat.cs
@@ -0,0 +1,202 @@
+using CsQuery;
+using Jackett.Models;
+using Jackett.Services;
+using Jackett.Utils;
+using Jackett.Utils.Clients;
+using Newtonsoft.Json.Linq;
+using NLog;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Jackett.Models.IndexerConfig;
+using System.Collections.Specialized;
+using System.Globalization;
+using System.Text.RegularExpressions;
+
+namespace Jackett.Indexers
+{
+ public class TorrentSyndikat : BaseIndexer, IIndexer
+ {
+ private string SearchUrl { get { return SiteLink + "browse.php"; } }
+ private string LoginUrl { get { return SiteLink + "eing2.php"; } }
+ private string CaptchaUrl { get { return SiteLink + "simpleCaptcha.php?numImages=1"; } }
+ TimeZoneInfo germanyTz = TimeZoneInfo.FindSystemTimeZoneById("W. Europe Standard Time");
+
+ new ConfigurationDataBasicLoginWithRSSAndDisplay configData
+ {
+ get { return (ConfigurationDataBasicLoginWithRSSAndDisplay)base.configData; }
+ set { base.configData = value; }
+ }
+
+ public TorrentSyndikat(IIndexerManagerService i, Logger l, IWebClient w, IProtectionService ps)
+ : base(name: "Torrent-Syndikat",
+ description: "A German general tracker",
+ link: "https://torrent-syndikat.org/",
+ caps: new TorznabCapabilities(),
+ manager: i,
+ client: w,
+ logger: l,
+ p: ps,
+ configData: new ConfigurationDataBasicLoginWithRSSAndDisplay())
+ {
+ this.configData.DisplayText.Value = "Only the results from the first search result page are shown, adjust your profile settings to show the maximum.";
+ this.configData.DisplayText.Name = "Notice";
+
+ AddCategoryMapping(2, TorznabCatType.PC); // Apps / Windows
+ AddCategoryMapping(13, TorznabCatType.PC); // Apps / Linux
+ AddCategoryMapping(4, TorznabCatType.PCMac); // Apps / Mac
+ AddCategoryMapping(6, TorznabCatType.PC); // Apps / Misc
+
+ AddCategoryMapping(12, TorznabCatType.PCGames); // Spiele / PC
+ AddCategoryMapping(8, TorznabCatType.ConsolePSP); // Spiele / PSX/PSP
+ AddCategoryMapping(7, TorznabCatType.ConsoleWii); // Spiele / Wii
+ AddCategoryMapping(32, TorznabCatType.ConsoleXbox); // Spiele / XBOX
+ AddCategoryMapping(41, TorznabCatType.ConsoleNDS); // Spiele / Nintendo DS
+
+ AddCategoryMapping(22, TorznabCatType.Movies3D); // Filme / 3D
+ AddCategoryMapping(3, TorznabCatType.MoviesBluRay); // Filme / BluRay
+ AddCategoryMapping(11, TorznabCatType.MoviesOther); // Filme / REMUX
+ AddCategoryMapping(42, TorznabCatType.MoviesHD); // Filme / 2160p
+ AddCategoryMapping(9, TorznabCatType.MoviesHD); // Filme / 1080p
+ AddCategoryMapping(20, TorznabCatType.MoviesHD); // Filme / 720p
+ AddCategoryMapping(21, TorznabCatType.MoviesDVD); // Filme / DVD
+ AddCategoryMapping(10, TorznabCatType.MoviesSD); // Filme / SD
+ AddCategoryMapping(31, TorznabCatType.MoviesOther); // Filme / Anime
+ AddCategoryMapping(37, TorznabCatType.MoviesForeign); // Filme / Englisch
+
+ AddCategoryMapping(16, TorznabCatType.TVHD); // TV / Serien/HD
+ AddCategoryMapping(15, TorznabCatType.TVSD); // TV / Serien/SD
+ AddCategoryMapping(44, TorznabCatType.TVHD); // TV / Packs/UHD
+ AddCategoryMapping(23, TorznabCatType.TVHD); // TV / Packs/HD
+ AddCategoryMapping(27, TorznabCatType.TVSD); // TV / Packs/SD
+ AddCategoryMapping(28, TorznabCatType.TVDocumentary); // TV / Dokus/SD
+ AddCategoryMapping(29, TorznabCatType.TVDocumentary); // TV / Dokus/HD
+ AddCategoryMapping(30, TorznabCatType.TVSport); // TV / Sport
+ AddCategoryMapping(40, TorznabCatType.TVAnime); // TV / Anime
+ AddCategoryMapping(36, TorznabCatType.TVFOREIGN); // TV / Englisch
+
+ AddCategoryMapping(24, TorznabCatType.AudioLossless); // Audio / FLAC
+ AddCategoryMapping(25, TorznabCatType.AudioMP3); // Audio / MP3
+ AddCategoryMapping(35, TorznabCatType.AudioOther); // Audio / Other
+ AddCategoryMapping(26, TorznabCatType.Audio); // Audio / Packs
+ AddCategoryMapping(18, TorznabCatType.AudioAudiobook); // Audio / aBooks
+ AddCategoryMapping(33, TorznabCatType.AudioVideo); // Audio / Videos
+
+ AddCategoryMapping(17, TorznabCatType.Books); // Misc / eBooks
+ AddCategoryMapping(5, TorznabCatType.PCPhoneOther); // Misc / Mobile
+ AddCategoryMapping(39, TorznabCatType.Other); // Misc / Bildung
+ }
+
+ public async Task ApplyConfiguration(JToken configJson)
+ {
+ configData.LoadValuesFromJson(configJson);
+
+ var result1 = await RequestStringWithCookies(CaptchaUrl);
+ var json1 = JObject.Parse(result1.Content);
+ var captchaSelection = json1["images"][0]["hash"];
+
+ var pairs = new Dictionary {
+ { "username", configData.Username.Value },
+ { "password", configData.Password.Value },
+ { "captchaSelection", (string)captchaSelection },
+ { "submitme", "X" }
+ };
+
+ var result2 = await RequestLoginAndFollowRedirect(LoginUrl, pairs, result1.Cookies, true, null, null, true);
+
+ await ConfigureIfOK(result2.Cookies, result2.Content.Contains("/logout.php"), () =>
+ {
+ var errorMessage = result2.Content;
+ throw new ExceptionWithConfigData(errorMessage, configData);
+ });
+ return IndexerConfigurationStatus.RequiresTesting;
+ }
+
+ public async Task> PerformQuery(TorznabQuery query)
+ {
+ List releases = new List();
+
+ var searchString = query.GetQueryString();
+ var searchUrl = SearchUrl;
+ var queryCollection = new NameValueCollection();
+ queryCollection.Add("searchin", "title");
+ queryCollection.Add("incldead", "1");
+ queryCollection.Add("rel_type", "0"); // Alle
+ if (!string.IsNullOrWhiteSpace(searchString))
+ {
+ // use AND+wildcard operator to avoid getting to many useless results
+ var searchStringArray = Regex.Split(searchString.Trim(), "[ _.-]+", RegexOptions.Compiled).ToList();
+ searchStringArray = searchStringArray.Where(x => x.Length >= 3).ToList(); // remove words with less than 3 characters
+ searchStringArray = searchStringArray.Select(x => "+" + x + "*").ToList(); // add AND operators+wildcards
+ var searchStringFinal = String.Join(" ", searchStringArray);
+ queryCollection.Add("search", searchStringFinal);
+ }
+
+ foreach (var cat in MapTorznabCapsToTrackers(query))
+ {
+ queryCollection.Add("c" + cat, "1");
+ }
+
+ searchUrl += "?" + queryCollection.GetQueryString();
+
+ var results = await RequestStringWithCookiesAndRetry(searchUrl);
+ try
+ {
+ CQ dom = results.Content;
+ var rows = dom["table.torrent_table > tbody > tr"];
+ foreach (var row in rows.Skip(1))
+ {
+ var release = new ReleaseInfo();
+ release.MinimumRatio = 1;
+ release.MinimumSeedTime = 96*60*60;
+
+ var qRow = row.Cq();
+
+ var catStr = row.ChildElements.ElementAt(0).FirstElementChild.GetAttribute("href").Split('=')[1];
+ release.Category = MapTrackerCatToNewznab(catStr);
+
+ var qLink = row.ChildElements.ElementAt(2).FirstElementChild.Cq();
+ release.Link = new Uri(SiteLink + qLink.Attr("href"));
+ var torrentId = qLink.Attr("href").Split('=').Last();
+
+ var descCol = row.ChildElements.ElementAt(1);
+ var qCommentLink = descCol.FirstElementChild.Cq();
+ var torrentTag = descCol.Cq().Find("span.torrent-tag");
+ var torrentTags = torrentTag.Elements.Select(x => x.InnerHTML).ToList();
+ release.Title = qCommentLink.Text();
+ release.Description = String.Join(", ", torrentTags);
+ release.Comments = new Uri(SiteLink + "/" + qCommentLink.Attr("href").Replace("&hit=1", ""));
+ release.Guid = release.Comments;
+
+ var torrent_details = descCol.ChildElements.Last();
+ var dateStr = torrent_details.ChildNodes.ElementAt(torrent_details.ChildNodes.Length-3).Cq().Text().Replace(" von ", "").Trim();
+ DateTime dateGerman;
+ if (dateStr.StartsWith("Heute "))
+ dateGerman = DateTime.SpecifyKind(DateTime.UtcNow.Date, DateTimeKind.Unspecified) + TimeSpan.Parse(dateStr.Split(' ')[1]);
+ else if (dateStr.StartsWith("Gestern "))
+ dateGerman = DateTime.SpecifyKind(DateTime.UtcNow.Date, DateTimeKind.Unspecified) + TimeSpan.Parse(dateStr.Split(' ')[1]) - TimeSpan.FromDays(1);
+ else
+ 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();
+
+ var sizeStr = row.ChildElements.ElementAt(5).Cq().Text();
+ release.Size = ReleaseInfo.GetBytes(sizeStr);
+
+ release.Seeders = ParseUtil.CoerceInt(row.ChildElements.ElementAt(7).Cq().Text());
+ release.Peers = ParseUtil.CoerceInt(row.ChildElements.ElementAt(8).Cq().Text()) + release.Seeders;
+
+ releases.Add(release);
+ }
+ }
+ catch (Exception ex)
+ {
+ OnParseError(results.Content, ex);
+ }
+
+ return releases;
+ }
+ }
+}
diff --git a/src/Jackett/Jackett.csproj b/src/Jackett/Jackett.csproj
index 5688686d3..dedd70ba4 100644
--- a/src/Jackett/Jackett.csproj
+++ b/src/Jackett/Jackett.csproj
@@ -156,10 +156,13 @@
+
+
+
@@ -428,6 +431,12 @@
PreserveNewest
+
+ PreserveNewest
+
+
+ PreserveNewest
+
PreserveNewest
@@ -596,6 +605,9 @@
PreserveNewest
+
+ PreserveNewest
+
TextTemplatingFileGenerator
TorznabCatType.generated.cs