From 915fb1d68ed1652ac167484dd79bc5604de35d4c Mon Sep 17 00:00:00 2001 From: Kilian Cavalotti Date: Fri, 8 Feb 2019 23:15:11 -0800 Subject: [PATCH 1/2] Update hush.yml add new categories and attempt to fix no-results (#4593) * Update hush.yml Fix categories & "no results" errors. * Update hush.yml untested (as I don't have a login), but the uploadvolumefactor is missing an else-match-all case, which may be the reason your are seeing no results. please test and report back. thanks. --- src/Jackett.Common/Definitions/hush.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/Jackett.Common/Definitions/hush.yml b/src/Jackett.Common/Definitions/hush.yml index f83a88aa1..fc6883902 100644 --- a/src/Jackett.Common/Definitions/hush.yml +++ b/src/Jackett.Common/Definitions/hush.yml @@ -10,9 +10,12 @@ caps: categorymappings: - - {id: 1, cat: Movies, desc: "Movies"} - - {id: 2, cat: TV, desc: "TV"} - - {id: 3, cat: Movies, desc: "FANRES"} + - {id: 1, cat: Movies, desc: "Film"} + - {id: 2, cat: TV, desc: "Serie"} + - {id: 3, cat: Movies, desc: "Doc"} + - {id: 4, cat: Movies, desc: "Dessin Anime"} + - {id: 5, cat: Movies, desc: "Rlz Hush"} + - {id: 6, cat: Movies, desc: "Media"} modes: search: [q] @@ -106,4 +109,5 @@ uploadvolumefactor: case: "i[data-original-title=\"Double upload\"]": "2" # Single Torrent Double Upload - "i[data-original-title=\"Double Upload\"]": "2" # Global Double Upload + "i[data-original-title=\"Double Upload\"]": "2" # Global Double Upload + "*": "1" From 8d8e9056a1f501892f5ce9f03c833bc37910cda1 Mon Sep 17 00:00:00 2001 From: snamds Date: Sun, 10 Feb 2019 01:41:50 +0100 Subject: [PATCH 2/2] Newpct - Redirect, link match (#4630) * btdb.to domain gone. using proxy https://btdb.unblocked.app/ until we're sure its not comming back. * katcrs: new domain plus followredirect * gktorrent: forcing https * - Allow download from mirrors (#4298) * HDTorrent.it (#4310) Update regex to handle better seasons and multiple episode Freelech torrent support Minor fix * IPTorrents: fix error handling * RoDVD: update URL * Torrent9 clone (torrents9.pw): update URL * TorrentCCF: update URL * - follow redirects - download link match changed --- src/Jackett.Common/Indexers/Newpct.cs | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/Jackett.Common/Indexers/Newpct.cs b/src/Jackett.Common/Indexers/Newpct.cs index ac58e178c..2d01f8a83 100644 --- a/src/Jackett.Common/Indexers/Newpct.cs +++ b/src/Jackett.Common/Indexers/Newpct.cs @@ -79,6 +79,7 @@ namespace Jackett.Common.Indexers private Regex _titleListRegex = new Regex(@"Serie( *Descargar)?(.+?)(Temporada(.+?)(\d+)(.+?))?Capitulos?(.+?)(\d+)((.+?)(\d+))?(.+?)-(.+?)Calidad(.*)", RegexOptions.IgnoreCase); private Regex _titleClassicRegex = new Regex(@"(\[[^\]]*\])?\[Cap\.(\d{1,2})(\d{2})([_-](\d{1,2})(\d{2}))?\]", RegexOptions.IgnoreCase); private Regex _titleClassicTvQualityRegex = new Regex(@"\[([^\]]*HDTV[^\]]*)", RegexOptions.IgnoreCase); + private Regex _downloadMatchRegex = new Regex("[^\"]*/descargar-torrent/[^\"]*"); private int _maxDailyPages = 7; private int _maxMoviesPages = 30; @@ -173,11 +174,11 @@ namespace Jackett.Common.Indexers try { - var results = await RequestStringWithCookies(link); + var results = await RequestStringWithCookiesAndRetry(link); + await FollowIfRedirect(results); var content = results.Content; - Regex regex = new Regex("[^\"]*/descargar-torrent/\\d+_[^\"]*"); - Match match = regex.Match(content); + Match match = _downloadMatchRegex.Match(content); if (match.Success) result = await base.Download(new Uri(match.Groups[0].Value)); } @@ -210,7 +211,8 @@ namespace Jackett.Common.Indexers while (pg <= _maxDailyPages) { Uri url = new Uri(siteLink, string.Format(_dailyUrl, pg)); - var results = await RequestStringWithCookies(url.AbsoluteUri); + var results = await RequestStringWithCookiesAndRetry(url.AbsoluteUri); + await FollowIfRedirect(results); var items = ParseDailyContent(results.Content); if (items == null || !items.Any()) @@ -328,7 +330,8 @@ namespace Jackett.Common.Indexers private async Task> GetReleasesFromUri(Uri uri, string seriesName) { var newpctReleases = new List(); - var results = await RequestStringWithCookies(uri.AbsoluteUri); + var results = await RequestStringWithCookiesAndRetry(uri.AbsoluteUri); + await FollowIfRedirect(results); //Episodes list string seriesEpisodesUrl = ParseSeriesListContent(results.Content, seriesName); @@ -338,7 +341,8 @@ namespace Jackett.Common.Indexers while (pg < _maxEpisodesListPages) { Uri episodesListUrl = new Uri(string.Format(_seriesUrl, seriesEpisodesUrl, pg)); - results = await RequestStringWithCookies(episodesListUrl.AbsoluteUri); + results = await RequestStringWithCookiesAndRetry(episodesListUrl.AbsoluteUri); + await FollowIfRedirect(results); var items = ParseEpisodesListContent(results.Content); if (items == null || !items.Any())