From c7f3ef544e0cd9dfea374e662b8d7833af1ec390 Mon Sep 17 00:00:00 2001 From: Garfield69 Date: Sat, 12 Oct 2019 20:05:40 +1300 Subject: [PATCH] tvchaosuk: switch to unit3d 1.9.4 resolves #6132 --- src/Jackett.Common/Definitions/tvchaosuk.yml | 154 +++++++++ src/Jackett.Common/Indexers/TVChaosUK.cs | 340 ------------------- 2 files changed, 154 insertions(+), 340 deletions(-) create mode 100644 src/Jackett.Common/Definitions/tvchaosuk.yml delete mode 100644 src/Jackett.Common/Indexers/TVChaosUK.cs diff --git a/src/Jackett.Common/Definitions/tvchaosuk.yml b/src/Jackett.Common/Definitions/tvchaosuk.yml new file mode 100644 index 000000000..1ccfc97f3 --- /dev/null +++ b/src/Jackett.Common/Definitions/tvchaosuk.yml @@ -0,0 +1,154 @@ +--- + site: tvchaosuk + name: TVChaosUK + description: "TV Chaos UK (TVCUK) is a Private Torrent Tracker for UK TV" + language: en-uk + type: private + encoding: UTF-8 + links: + - https://tvchaosuk.com/ + + caps: + categorymappings: + - {id: 4, cat: PC, desc: "Applications"} + - {id: 29, cat: TV, desc: "Comedy"} + - {id: 5, cat: TV/Documentary, desc: "Documentary"} + - {id: 11, cat: TV, desc: "Drama"} + - {id: 14, cat: TV, desc: "Entertainment"} + - {id: 19, cat: TV, desc: "Factual"} + - {id: 43, cat: TV, desc: "Foreign"} + - {id: 32, cat: TV, desc: "Kids/Family"} + - {id: 44, cat: Movies, desc: "Movies"} + - {id: 45, cat: TV, desc: "News & Current Affairs"} + - {id: 51, cat: Audio, desc: "Radio"} + - {id: 30, cat: TV, desc: "Soaps"} + - {id: 33, cat: TV, desc: "Sci-Fi"} + - {id: 42, cat: TV/Sport, desc: "Sport"} + + modes: + search: [q] + tv-search: [q, season, ep, imdbid] + movie-search: [q, imdbid] + + login: + path: login + method: form + inputs: + username: "{{ .Config.username }}" + password: "{{ .Config.password }}" + remember: 1 + error: + - selector: script[nonce]:contains("Error") + message: + selector: script[nonce]:contains("Error") + test: + path: torrents + selector: a[href$="/logout"] + + ratio: + path: torrents + selector: li:has(i.fa-sync-alt) + filters: + - name: regexp + args: "Ratio : (\\d+)" + + search: + paths: + - path: filterTorrents + inputs: + $raw: "{{range .Categories}}categories[]={{.}}&{{end}}" + search: "{{if .Query.IMDBID}}{{else}}{{ .Keywords }}{{end}}" + description: "" + uploader: "" + imdb: "{{ .Query.IMDBIDShort }}" + tvdb: "" + tmdb: "" + mal: "" + igdb: "" + sort: created_at + direction: desc + qty: 100 + rows: + selector: table > tbody > tr + fields: + category: + selector: a[href*="/categories/"] + attribute: href + filters: + - name: regexp + args: "/categories/.*?\\.(\\d+)" + title: + selector: a.view-torrent + download: + selector: a[href*="/download/"] + attribute: href + details: + selector: a.view-torrent + attribute: href + banner: + optional: true + selector: div.torrent-poster img + attribute: src + filters: + - name: replace + args: ["https://via.placeholder.com/600x900", ""] + comments: + selector: a[href*="#comments"] + attribute: href + size: + selector: td:nth-last-child(4) + seeders: + selector: td:nth-last-child(3) + leechers: + selector: td:nth-last-child(2) + grabs: + selector: td:nth-last-child(1) + filters: + - name: regexp + args: ([\d\.]+) + imdb: + optional: true + selector: a[href*="www.imdb.com/title/tt"] + attribute: href + date: + selector: time + filters: + # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portoguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch + - name: re_replace + args: ["(önce|tagasi|geleden|fa|temu|siden|atrás|nazpět|назад|acum|hace|il y a|vor|преди)", "ago"] + - name: re_replace + args: ["(dakika|minut|minuto|minuta|minutt|минута|Minute|minuut)", "minute"] + - name: re_replace + args: ["(dakika|minutit|minutter|minuti|minuty|minutos|минуты|минут|Minuten|минути|minuten)", "minutes"] + - name: re_replace + args: ["(saat|tund|time|ora|godzina|hora|hodina|час|oră|heure|Stunde|uur)", "hour"] + - name: re_replace + args: ["(saat|tundi|timer|ore|godziny|horas|hodiny|hoden|часа|часов|ore|heures|Stunden)", "hours"] + - name: re_replace + args: ["(gün|päev|dag|giorno|dzień|dia|den|день|zi|día|jour|Tag|ден)", "day"] + - name: re_replace + args: ["(gün|päeva|dage|giorni|dni|dias|dny|дня|дней|zile|días|jours|Tagen|дни|dagen)", "days"] + - name: re_replace + args: ["(hafta|nädal|uge|settimana|tydzień|uke|semana|týden|неделю|săptămână|semaine|Woche|седмица)", "week"] + - name: re_replace + args: ["(hafta|nädalat|uger|settimane|tygodnie|uker|semanas|týdny|недели|недель|săptămâni|semaines|Wochen|седмици|weken)", "weeks"] + - name: re_replace + args: [" (ay|kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|mois|Monat|месец|maand)", "month"] + - name: re_replace + args: [" (ay|kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden)", "months"] + downloadvolumefactor: + case: + "i[data-original-title=\"Personal Freeleech\"]": "0" # 24 Hour FreeLeech From BON Store + "i[data-original-title=\"Special Freeleech\"]": "0" # Special FreeLeech For Certain User Groups + "i[data-original-title=\"Freeleech Token\"]": "0" # Freeleech From Token + "i[data-original-title=\"Global Freeleech\"]": "0" # Global Freeleech + "i[data-original-title=\"Freeleech\"]": "0" # Freeleech + "i[data-original-title=\"Featured\"]": "0" # Featured Torrent + "*": "1" + uploadvolumefactor: + case: + "i[data-original-title=\"Double Upload\"]": "2" # Single Torrent Double Upload + "i[data-original-title=\"Global Double Upload\"]": "2" # Global Double Upload + "i[data-original-title=\"Featured\"]": "2" # Featured Torrent + "*": "1" +# UNIT3D 1.9.4 diff --git a/src/Jackett.Common/Indexers/TVChaosUK.cs b/src/Jackett.Common/Indexers/TVChaosUK.cs deleted file mode 100644 index fe5ce0eb3..000000000 --- a/src/Jackett.Common/Indexers/TVChaosUK.cs +++ /dev/null @@ -1,340 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Globalization; -using System.Linq; -using System.Text; -using System.Text.RegularExpressions; -using System.Threading.Tasks; -using System.Xml.Linq; -using CsQuery; -using Jackett.Common.Models; -using Jackett.Common.Models.IndexerConfig; -using Jackett.Common.Services.Interfaces; -using Jackett.Common.Utils; -using Jackett.Common.Utils.Clients; -using static Jackett.Common.Utils.ParseUtil; -using Newtonsoft.Json.Linq; -using NLog; - -namespace Jackett.Common.Indexers -{ - public class TVChaosUK : BaseWebIndexer - { - private string LoginUrl { get { return SiteLink + "takelogin.php"; } } - private string GetRSSKeyUrl { get { return SiteLink + "getrss.php"; } } - private string SearchUrl { get { return SiteLink + "browse.php"; } } - private string RSSUrl { get { return SiteLink + "rss.php?secret_key={0}&feedtype=download&timezone=0&showrows=50&categories=all"; } } - private string CommentUrl { get { return SiteLink + "details.php?id={0}"; } } - private string DownloadUrl { get { return SiteLink + "download.php?id={0}"; } } - - private new ConfigurationDataBasicLoginWithRSS configData - { - get { return (ConfigurationDataBasicLoginWithRSS)base.configData; } - set { base.configData = value; } - } - - public TVChaosUK(IIndexerConfigurationService configService, WebClient wc, Logger l, IProtectionService ps) - : base(name: "TV Chaos", - description: "Total Chaos", - link: "https://www.tvchaosuk.com/", - caps: TorznabUtil.CreateDefaultTorznabTVCaps(), - configService: configService, - client: wc, - logger: l, - p: ps, - configData: new ConfigurationDataBasicLoginWithRSS()) - { - Encoding = Encoding.UTF8; - Language = "en-uk"; - Type = "private"; - - AddCategoryMapping(72, TorznabCatType.PC, "Appz"); - - AddCategoryMapping(115, TorznabCatType.TV, "Classic TV"); - AddCategoryMapping(139, TorznabCatType.TV, "Classic Comedy"); - AddCategoryMapping(141, TorznabCatType.TV, "Classic Comedy Drama"); - AddCategoryMapping(140, TorznabCatType.TV, "Classic Crime Drama"); - AddCategoryMapping(118, TorznabCatType.TV, "Classic Documentary"); - AddCategoryMapping(138, TorznabCatType.TV, "Classic Drama"); - AddCategoryMapping(149, TorznabCatType.TV, "Classic Kids/Family"); - AddCategoryMapping(142, TorznabCatType.TV, "Classic Sci-fi"); - AddCategoryMapping(148, TorznabCatType.TV, "Classic Soap"); - - AddCategoryMapping(78, TorznabCatType.TV, "Comedy"); - AddCategoryMapping(187, TorznabCatType.TV, "Comedy Panel/Talk show"); - AddCategoryMapping(172, TorznabCatType.TVHD, "HD Comedy"); - AddCategoryMapping(107, TorznabCatType.TV, "Stand-up Comedy"); - - AddCategoryMapping(75, TorznabCatType.TVDocumentary, "Documentary & News"); - AddCategoryMapping(189, TorznabCatType.TVDocumentary, "Docudrama"); - AddCategoryMapping(224, TorznabCatType.TVDocumentary, "Documentary"); - AddCategoryMapping(174, TorznabCatType.TVDocumentary, "HD Documentary"); - AddCategoryMapping(113, TorznabCatType.TVDocumentary, "Historical"); - AddCategoryMapping(218, TorznabCatType.TVDocumentary, "News and Current Affairs"); - AddCategoryMapping(100, TorznabCatType.TVDocumentary, "True Crime"); - AddCategoryMapping(98, TorznabCatType.TVDocumentary, "Wildlife/Nature"); - - AddCategoryMapping(74, TorznabCatType.TV, "Drama"); - AddCategoryMapping(180, TorznabCatType.TV, "Comedy-Drama"); - AddCategoryMapping(76, TorznabCatType.TV, "Crime Drama"); - AddCategoryMapping(99, TorznabCatType.TV, "Cult Drama"); - AddCategoryMapping(175, TorznabCatType.TVHD, "HD Drama"); - - AddCategoryMapping(91, TorznabCatType.TV, "Entertainment"); - AddCategoryMapping(212, TorznabCatType.TV, "Chat Shows"); - AddCategoryMapping(223, TorznabCatType.TVHD, "HD Entertainment"); - AddCategoryMapping(188, TorznabCatType.TV, "Musical TV"); - AddCategoryMapping(217, TorznabCatType.TV, "Quiz, Panel & Game Shows"); - AddCategoryMapping(101, TorznabCatType.TV, "Special Interest"); - - AddCategoryMapping(106, TorznabCatType.TV, "Factual & Reality"); - AddCategoryMapping(103, TorznabCatType.TV, "Cookery, Food and Drink"); - AddCategoryMapping(114, TorznabCatType.TV, "Factual TV"); - AddCategoryMapping(221, TorznabCatType.TVHD, "HD Factual/Reality"); - AddCategoryMapping(215, TorznabCatType.TV, "Home and Garden"); - AddCategoryMapping(219, TorznabCatType.TV, "Motoring"); - AddCategoryMapping(216, TorznabCatType.TV, "Reality TV"); - - AddCategoryMapping(184, TorznabCatType.TV, "Full Series Packs"); - AddCategoryMapping(194, TorznabCatType.TV, "Classic Comedy"); - AddCategoryMapping(193, TorznabCatType.TV, "Classic Drama"); - AddCategoryMapping(196, TorznabCatType.TV, "Classic Kids/Family"); - AddCategoryMapping(170, TorznabCatType.TV, "Comedy"); - AddCategoryMapping(168, TorznabCatType.TV, "Comedy Drama"); - AddCategoryMapping(228, TorznabCatType.TV, "Commonwealth"); - AddCategoryMapping(190, TorznabCatType.TV, "Crime Drama"); - AddCategoryMapping(166, TorznabCatType.TV, "Documentary"); - AddCategoryMapping(185, TorznabCatType.TV, "Drama"); - AddCategoryMapping(191, TorznabCatType.TV, "Entertainment"); - AddCategoryMapping(210, TorznabCatType.TV, "Factual"); - AddCategoryMapping(226, TorznabCatType.TV, "Foreign"); - AddCategoryMapping(167, TorznabCatType.TV, "Kids/Family"); - AddCategoryMapping(186, TorznabCatType.TV, "Sci-fi"); - - AddCategoryMapping(82, TorznabCatType.TV, "Kids/Family"); - - AddCategoryMapping(198, TorznabCatType.TVFOREIGN, "Non-UK"); - AddCategoryMapping(201, TorznabCatType.TVFOREIGN, "Comedy"); - AddCategoryMapping(208, TorznabCatType.TVFOREIGN, "Documentary"); - AddCategoryMapping(200, TorznabCatType.TVFOREIGN, "Drama"); - AddCategoryMapping(209, TorznabCatType.TVFOREIGN, "Entertainment"); - AddCategoryMapping(203, TorznabCatType.TVFOREIGN, "Factual/Reality"); - AddCategoryMapping(227, TorznabCatType.TVFOREIGN, "Foreign"); - AddCategoryMapping(202, TorznabCatType.TVFOREIGN, "Sci-fi"); - AddCategoryMapping(199, TorznabCatType.TVFOREIGN, "Soaps"); - AddCategoryMapping(204, TorznabCatType.TVFOREIGN, "Special Interest"); - - AddCategoryMapping(86, TorznabCatType.Audio, "Radio/Audio"); - AddCategoryMapping(87, TorznabCatType.AudioAudiobook, "Audio Books"); - AddCategoryMapping(88, TorznabCatType.Audio, "Radio Comedy"); - - AddCategoryMapping(90, TorznabCatType.TVSD, "Sci-Fi"); - AddCategoryMapping(183, TorznabCatType.TVSD, "Fantasy"); - AddCategoryMapping(176, TorznabCatType.TVHD, "HD Sci-Fi"); - AddCategoryMapping(173, TorznabCatType.TV, "Supernatural/fantasy"); - - AddCategoryMapping(220, TorznabCatType.TV, "Soaps"); - AddCategoryMapping(229, TorznabCatType.TV, "Monthly Archives"); - AddCategoryMapping(177, TorznabCatType.TVHD, "Soap HD"); - AddCategoryMapping(230, TorznabCatType.TVSD, "Soap SD"); - - AddCategoryMapping(92, TorznabCatType.TVSport, "Sport"); - AddCategoryMapping(222, TorznabCatType.TVSport, "HD Sport"); - - AddCategoryMapping(83, TorznabCatType.Movies, "TV Aired Movies"); - AddCategoryMapping(171, TorznabCatType.Movies, "Classic Movies"); - AddCategoryMapping(178, TorznabCatType.MoviesHD, "HD TV Aired Movies"); - AddCategoryMapping(181, TorznabCatType.Movies, "Made for TV"); - AddCategoryMapping(182, TorznabCatType.Movies, "TV Aired Movies"); - } - - public override async Task ApplyConfiguration(JToken configJson) - { - LoadValuesFromJson(configJson); - var pairs = new Dictionary { - { "username", configData.Username.Value }, - { "password", configData.Password.Value } - }; - - var result = await RequestLoginAndFollowRedirect(LoginUrl, pairs, null, true, SearchUrl, SiteLink); - await ConfigureIfOK(result.Cookies, result.Content != null && result.Content.Contains("logout.php"), () => - { - CQ dom = result.Content; - var errorMessage = dom[".left_side table:eq(0) tr:eq(1)"].Text().Trim().Replace("\n\t", " "); - throw new ExceptionWithConfigData(errorMessage, configData); - }); - - try - { - // Get RSS key - var rssParams = new Dictionary { - { "feedtype", "download" }, - { "timezone", "0" }, - { "showrows", "50" } - }; - var rssPage = await PostDataWithCookies(GetRSSKeyUrl, rssParams, result.Cookies); - var match = Regex.Match(rssPage.Content, "(?<=secret_key\\=)([a-zA-z0-9]*)"); - configData.RSSKey.Value = match.Success ? match.Value : string.Empty; - if (string.IsNullOrWhiteSpace(configData.RSSKey.Value)) - throw new Exception("Failed to get RSS Key"); - SaveConfig(); - } - catch (Exception e) - { - IsConfigured = false; - throw e; - } - return IndexerConfigurationStatus.RequiresTesting; - } - - protected override async Task> PerformQuery(TorznabQuery query) - { - var releases = new List(); - var searchString = query.GetQueryString(); - - // If we have no query use the RSS Page as their server is slow enough at times! - if (query.IsTest || string.IsNullOrWhiteSpace(searchString)) - { - var rssPage = await RequestStringWithCookiesAndRetry(string.Format(RSSUrl, configData.RSSKey.Value)); - rssPage.Content = RemoveInvalidXmlChars(rssPage.Content); - var rssDoc = XDocument.Parse(rssPage.Content); - - foreach (var item in rssDoc.Descendants("item")) - { - var title = item.Descendants("title").First().Value; - var description = item.Descendants("description").First().Value; - var link = item.Descendants("link").First().Value; - var category = item.Descendants("category").First().Value; - var date = item.Descendants("pubDate").First().Value; - - var torrentIdMatch = Regex.Match(link, "(?<=id=)(\\d)*"); - var torrentId = torrentIdMatch.Success ? torrentIdMatch.Value : string.Empty; - if (string.IsNullOrWhiteSpace(torrentId)) - throw new Exception("Missing torrent id"); - - var infoMatch = Regex.Match(description, @"Category:\W(?.*)\W\/\WSeeders:\W(?[\d,]*)\W\/\WLeechers:\W(?[\d,]*)\W\/\WSize:\W(?[\d\.]*\W\S*)\W\/\WSnatched:\W(?[\d,]*) x times"); - if (!infoMatch.Success) - throw new Exception(string.Format("Unable to find info in {0}: ", description)); - - var release = new ReleaseInfo() - { - Title = title, - Description = description, - Guid = new Uri(string.Format(DownloadUrl, torrentId)), - Comments = new Uri(string.Format(CommentUrl, torrentId)), - PublishDate = DateTime.ParseExact(date, "yyyy-MM-dd H:mm:ss", CultureInfo.InvariantCulture), //2015-08-08 21:20:31 - Link = new Uri(string.Format(DownloadUrl, torrentId)), - Seeders = ParseUtil.CoerceInt(infoMatch.Groups["seeders"].Value), - Peers = ParseUtil.CoerceInt(infoMatch.Groups["leechers"].Value), - Grabs = ParseUtil.CoerceInt(infoMatch.Groups["snatched"].Value), - Size = ReleaseInfo.GetBytes(infoMatch.Groups["size"].Value), - Category = MapTrackerCatDescToNewznab(infoMatch.Groups["cat"].Value) - }; - - release.Peers += release.Seeders; - releases.Add(release); - } - } - if (query.IsTest || !string.IsNullOrWhiteSpace(searchString)) - { - // The TVChaos UK search requires an exact match of the search string. - // But it seems like they just send the unfiltered search to the SQL server in a like query (LIKE '%$searchstring%'). - // So we replace any whitespace/special character with % to make the search more usable. - Regex ReplaceRegex = new Regex("[^a-zA-Z0-9]+"); - searchString = ReplaceRegex.Replace(searchString, "%"); - - var searchParams = new Dictionary { - { "do", "search" }, - { "keywords", searchString }, - { "search_type", "t_name" }, - { "category", "0" }, - { "include_dead_torrents", "no" } - }; - - var searchPage = await PostDataWithCookiesAndRetry(SearchUrl, searchParams); - if (searchPage.IsRedirect) - { - // re-login - await ApplyConfiguration(null); - searchPage = await PostDataWithCookiesAndRetry(SearchUrl, searchParams); - } - - try - { - CQ dom = searchPage.Content; - var rows = dom["#listtorrents tbody tr"]; - foreach (var row in rows.Skip(1)) - { - var release = new ReleaseInfo(); - var qRow = row.Cq(); - - release.Title = qRow.Find("td:eq(1) .tooltip-content div:eq(0)").Text(); - - if (string.IsNullOrWhiteSpace(release.Title)) - continue; - - var tooltip = qRow.Find("div.tooltip-content"); - var banner = tooltip.Find("img"); - release.Description = tooltip.Text(); - if (banner.Any()) - release.BannerUrl = new Uri(banner.Attr("src")); - release.Guid = new Uri(qRow.Find("td:eq(2) a").Attr("href")); - release.Link = release.Guid; - release.Comments = new Uri(qRow.Find("td:eq(1) .tooltip-target a").Attr("href")); - var qDate = qRow.Find("td:eq(1) div").Last(); - var date = qDate.Text().Trim(); - if (date.StartsWith("Pre Release Time:")) // in some cases the pre time is shown - { - date = date.Replace("Pre Release Time:", ""); - date = date.Split(new string[] { "Uploaded:" }, StringSplitOptions.None)[0]; - date = date.Trim(); - } - release.PublishDate = DateTime.ParseExact(date, "dd-MM-yyyy H:mm", CultureInfo.InvariantCulture); //08-08-2015 12:51 - release.Seeders = ParseUtil.CoerceInt(qRow.Find("td:eq(6)").Text()); - release.Peers = release.Seeders + ParseUtil.CoerceInt(qRow.Find("td:eq(7)").Text().Trim()); - release.Size = ReleaseInfo.GetBytes(qRow.Find("td:eq(4)").Text().Trim()); - - var cat = row.Cq().Find("td:eq(0) a").First().Attr("href"); - var catSplit = cat.LastIndexOf('='); - if (catSplit > -1) - cat = cat.Substring(catSplit + 1); - release.Category = MapTrackerCatToNewznab(cat); - - var grabs = qRow.Find("td:nth-child(6)").Text(); - release.Grabs = ParseUtil.CoerceInt(grabs); - - if (qRow.Find("img[alt*=\"Free Torrent\"]").Length >= 1) - release.DownloadVolumeFactor = 0; - else - release.DownloadVolumeFactor = 1; - - if (qRow.Find("img[alt*=\"x2 Torrent\"]").Length >= 1) - release.UploadVolumeFactor = 2; - else - release.UploadVolumeFactor = 1; - - releases.Add(release); - } - } - catch (Exception ex) - { - OnParseError(searchPage.Content, ex); - } - } - - return releases; - } - - public override async Task Download(Uri link) - { - var response = await base.Download(link); - if (response.Length >= 1 && response[0] == '<') // issue #4395 - { - // relogin - await ApplyConfiguration(null); - response = await base.Download(link); - } - return response; - } - } -}