mirror/Jackett
1
0
Fork 0
mirror of https://github.com/Jackett/Jackett synced 2025-02-23 23:00:51 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' of https://github.com/Jackett/Jackett

Browse source
This commit is contained in:
Garfield69 2019-02-10 15:52:50 +13:00
commit 99d294cc79
2 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/Jackett.Common/Definitions/hush.yml
View file

@ -10,9 +10,12 @@
caps: caps:
categorymappings: categorymappings:
- {id: 1, cat: Movies, desc: "Movies"} - {id: 1, cat: Movies, desc: "Film"}
- {id: 2, cat: TV, desc: "TV"} - {id: 2, cat: TV, desc: "Serie"}
- {id: 3, cat: Movies, desc: "FANRES"} - {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: modes:
search: [q] search: [q]
@ -106,4 +109,5 @@
uploadvolumefactor: uploadvolumefactor:
case: case:
"i[data-original-title=\"Double upload\"]": "2" # Single Torrent Double Upload "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"

16
src/Jackett.Common/Indexers/Newpct.cs
View file

@ -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 _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 _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 _titleClassicTvQualityRegex = new Regex(@"\[([^\]]*HDTV[^\]]*)", RegexOptions.IgnoreCase);
private Regex _downloadMatchRegex = new Regex("[^\"]*/descargar-torrent/[^\"]*");
private int _maxDailyPages = 7; private int _maxDailyPages = 7;
private int _maxMoviesPages = 30; private int _maxMoviesPages = 30;
@ -173,11 +174,11 @@ namespace Jackett.Common.Indexers
try try
{ {
var results = await RequestStringWithCookies(link); var results = await RequestStringWithCookiesAndRetry(link);
await FollowIfRedirect(results);
var content = results.Content; var content = results.Content;
Regex regex = new Regex("[^\"]*/descargar-torrent/\\d+_[^\"]*"); Match match = _downloadMatchRegex.Match(content);
Match match = regex.Match(content);
if (match.Success) if (match.Success)
result = await base.Download(new Uri(match.Groups[0].Value)); result = await base.Download(new Uri(match.Groups[0].Value));
} }
@ -210,7 +211,8 @@ namespace Jackett.Common.Indexers
while (pg <= _maxDailyPages) while (pg <= _maxDailyPages)
{ {
Uri url = new Uri(siteLink, string.Format(_dailyUrl, pg)); 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); var items = ParseDailyContent(results.Content);
if (items == null || !items.Any()) if (items == null || !items.Any())
@ -328,7 +330,8 @@ namespace Jackett.Common.Indexers
private async Task<IEnumerable<ReleaseInfo>> GetReleasesFromUri(Uri uri, string seriesName) private async Task<IEnumerable<ReleaseInfo>> GetReleasesFromUri(Uri uri, string seriesName)
{ {
var newpctReleases = new List<ReleaseInfo>(); var newpctReleases = new List<ReleaseInfo>();
var results = await RequestStringWithCookies(uri.AbsoluteUri); var results = await RequestStringWithCookiesAndRetry(uri.AbsoluteUri);
await FollowIfRedirect(results);
//Episodes list //Episodes list
string seriesEpisodesUrl = ParseSeriesListContent(results.Content, seriesName); string seriesEpisodesUrl = ParseSeriesListContent(results.Content, seriesName);
@ -338,7 +341,8 @@ namespace Jackett.Common.Indexers
while (pg < _maxEpisodesListPages) while (pg < _maxEpisodesListPages)
{ {
Uri episodesListUrl = new Uri(string.Format(_seriesUrl, seriesEpisodesUrl, pg)); 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); var items = ParseEpisodesListContent(results.Content);
if (items == null || !items.Any()) if (items == null || !items.Any())