newpct: improve latest releases. resolves #9785 (#9822)

This commit is contained in:
Diego Heras 2020-10-12 23:35:13 +02:00 committed by GitHub
parent 886de069a7
commit 2f7c86dede
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 13 deletions

View File

@ -80,7 +80,7 @@ namespace Jackett.Common.Indexers
},
};
//private readonly int _maxDailyPages = 4;
private readonly int _maxDailyPages = 1;
private readonly int _maxMoviesPages = 6;
private readonly int[] _allTvCategories = (new [] {TorznabCatType.TV }).Concat(TorznabCatType.TV.SubCategories).Select(c => c.ID).ToArray();
private readonly int[] _allMoviesCategories = (new [] { TorznabCatType.Movies }).Concat(TorznabCatType.Movies.SubCategories).Select(c => c.ID).ToArray();
@ -92,7 +92,7 @@ namespace Jackett.Common.Indexers
private DateTime _dailyNow;
private int _dailyResultIdx;
//private readonly string _dailyUrl = "ultimas-descargas/pg/{0}";
private readonly string _dailyUrl = "ultimas-descargas/pg/{0}";
private readonly string _searchJsonUrl = "get/result/";
private readonly string[] _seriesLetterUrls = { "series/letter/{0}", "series-hd/letter/{0}" };
private readonly string[] _seriesVoLetterUrls = { "series-vo/letter/{0}" };
@ -207,11 +207,6 @@ namespace Jackett.Common.Indexers
if (rssMode)
{
// Temporary fix until they restore "last uploads" page. Only returns movies
// https://pctmix.com/ultimas-descargas/
releases.AddRange(await MovieSearch(new TorznabQuery{ SearchTerm = "a" }, false));
/*
var pg = 1;
while (pg <= _maxDailyPages)
{
@ -227,7 +222,6 @@ namespace Jackett.Common.Indexers
releases.AddRange(items);
pg++;
}
*/
}
else
{
@ -239,7 +233,7 @@ namespace Jackett.Common.Indexers
var isMovieSearch = query.Categories == null || query.Categories.Length == 0 ||
query.Categories.Any(c => _allMoviesCategories.Contains(c));
if (isMovieSearch)
releases.AddRange(await MovieSearch(query, _filterMovies));
releases.AddRange(await MovieSearch(query));
}
// Database lost on 2018/04/05, all previous torrents don't have download links
@ -345,12 +339,12 @@ namespace Jackett.Common.Indexers
try
{
var rows = doc.QuerySelectorAll("ul.noticias-series > li");
var rows = doc.QuerySelectorAll("div.page-box > ul > li");
foreach (var row in rows)
{
var qDiv = row.QuerySelector("div.info");
var title = qDiv.QuerySelector("h2").TextContent.Trim();
var detailsUrl = qDiv.QuerySelector("a").GetAttribute("href");
var detailsUrl = SiteLink + qDiv.QuerySelector("a").GetAttribute("href").TrimStart('/');
// TODO: move this check to GetReleaseFromData to apply all releases
if (!_includeVo && _voUrls.Any(vo => detailsUrl.ToLower().Contains(vo.ToLower())))
@ -439,7 +433,7 @@ namespace Jackett.Common.Indexers
return releases;
}
private async Task<IEnumerable<ReleaseInfo>> MovieSearch(TorznabQuery query, bool filterMovies)
private async Task<IEnumerable<ReleaseInfo>> MovieSearch(TorznabQuery query)
{
var releases = new List<NewpctRelease>();
@ -481,7 +475,7 @@ namespace Jackett.Common.Indexers
ScoreReleases(releases, searchStr);
if (filterMovies)
if (_filterMovies)
releases = releases.Where(r => r.Score < _wordNotFoundScore).ToList();
return releases;