corsaro.red: fix bug in category searches (#6807) resolves #6307

This commit is contained in:
Cory 2020-01-05 11:43:41 -06:00 committed by garfield69
parent 3534cfd3eb
commit 391a4f8fec
1 changed files with 203 additions and 209 deletions

View File

@ -1,256 +1,250 @@
using System;
using System.Collections.Generic;
using System.Collections.Specialized;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Jackett.Common.Models;
using Jackett.Common.Models.IndexerConfig;
using Jackett.Common.Services.Interfaces;
using Jackett.Common.Utils;
using Jackett.Common.Utils.Clients;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using NLog;
using static Jackett.Common.Models.IndexerConfig.ConfigurationData;
namespace Jackett.Common.Indexers
{
public class Corsarored : BaseWebIndexer
{
private string APILatest { get { return SiteLink + "api/latests"; } }
private string APISearch { get { return SiteLink + "api/search"; } }
public class Corsarored : BaseWebIndexer
{
private const int MaxSearchPageLimit = 4;
private const int MaxResultsPerPage = 25;
private Dictionary<string, string> APIHeaders = new Dictionary<string, string>()
{
{"Content-Type", "application/json"},
};
private readonly Dictionary<string, string[]> _apiCategories = new Dictionary<string, string[]>
{
// 0 = Misc. Probably only shows up in search all anyway
["0"] = new[] {"25", "27"},
// 1 = TV
["1"] = new[] {"1", "14", "22", "23", "24", "29", "31"},
// 2 = Movies
["2"] = new[] {"4"},
// 3 = Music/podcasts/audiobooks
["3"] = new[] {"2", "21", "34", "35"},
// 4 = ebooks
["4"] = new[] {"3", "13", "30", "36"},
// 5 = Software
["5"] = new[] {"6", "9", "10", "37"},
// 6 = Video Games
["6"] = new[] {"11", "12", "26", "28", "32"},
// 7 = Anime
["7"] = new[] {"7", "8"}
};
private readonly int MAX_SEARCH_PAGE_LIMIT = 8; // 1page 25 items, 200
private readonly Dictionary<string, string> _apiHeaders = new Dictionary<string, string>
{
["Content-Type"] = "application/json"
};
private new ConfigurationData configData
{
get { return (ConfigurationData)base.configData; }
set { base.configData = value; }
}
public Corsarored(IIndexerConfigurationService configService, WebClient wc, Logger l, IProtectionService ps)
: base("Corsaro.red",
description: "Italian Torrents",
link: "https://corsaro.red/",
caps: new TorznabCapabilities(),
configService: configService,
client: wc,
logger: l,
p: ps,
configData: new ConfigurationData())
{
Encoding = Encoding.UTF8;
Language = "it-it";
Type = "public";
public Corsarored(IIndexerConfigurationService configService, WebClient wc, Logger l, IProtectionService ps)
: base(name: "Corsaro.red",
description: "Italian Torrents",
link: "https://corsaro.red/",
caps: new TorznabCapabilities(),
configService: configService,
client: wc,
logger: l,
p: ps,
configData: new ConfigurationData())
{
Encoding = Encoding.UTF8;
Language = "it-it";
Type = "public";
// TNTVillage cats
AddCategoryMapping(1, TorznabCatType.TV, "TV Movies");
AddCategoryMapping(2, TorznabCatType.Audio, "Music");
AddCategoryMapping(3, TorznabCatType.BooksEbook, "eBooks");
AddCategoryMapping(4, TorznabCatType.Movies, "Movies");
AddCategoryMapping(6, TorznabCatType.PC, "Linux");
AddCategoryMapping(7, TorznabCatType.TVAnime, "Anime");
AddCategoryMapping(8, TorznabCatType.TVAnime, "Cartoons");
AddCategoryMapping(9, TorznabCatType.PC, "Mac Software");
AddCategoryMapping(10, TorznabCatType.PC, "Windows Software");
AddCategoryMapping(11, TorznabCatType.PCGames, "PC Games");
AddCategoryMapping(12, TorznabCatType.Console, "Playstation Games");
AddCategoryMapping(13, TorznabCatType.Books, "Textbooks");
AddCategoryMapping(14, TorznabCatType.TVDocumentary, "Documentaries");
AddCategoryMapping(21, TorznabCatType.AudioVideo, "Music Video");
AddCategoryMapping(22, TorznabCatType.TVSport, "Sport");
AddCategoryMapping(23, TorznabCatType.TV, "Theater");
AddCategoryMapping(24, TorznabCatType.TV, "Wrestling");
AddCategoryMapping(25, TorznabCatType.OtherMisc, "Other");
AddCategoryMapping(26, TorznabCatType.Console, "Xbox Games");
AddCategoryMapping(27, TorznabCatType.Other, "Wallpaper");
AddCategoryMapping(28, TorznabCatType.ConsoleOther, "Other Games");
AddCategoryMapping(29, TorznabCatType.TV, "TV Series");
AddCategoryMapping(30, TorznabCatType.BooksComics, "Comics");
AddCategoryMapping(31, TorznabCatType.TV, "TV");
AddCategoryMapping(32, TorznabCatType.Console, "Nintendo Games");
AddCategoryMapping(34, TorznabCatType.AudioAudiobook, "Audiobook");
AddCategoryMapping(35, TorznabCatType.Audio, "Podcasts");
AddCategoryMapping(36, TorznabCatType.BooksMagazines, "Newspapers");
AddCategoryMapping(37, TorznabCatType.PCPhoneOther, "Phone Apps");
}
//wc.requestDelay = 2.5;
private string ApiLatest => $"{SiteLink}api/latests";
private string ApiSearch => $"{SiteLink}api/search";
// TNTVillage cats
AddCategoryMapping(1, TorznabCatType.TV, "TV");
AddCategoryMapping(2, TorznabCatType.Audio, "Music");
AddCategoryMapping(3, TorznabCatType.BooksEbook, "Books");
AddCategoryMapping(4, TorznabCatType.Movies, "Movies");
AddCategoryMapping(6, TorznabCatType.PC, "Software");
AddCategoryMapping(7, TorznabCatType.TVAnime, "Anime");
AddCategoryMapping(8, TorznabCatType.TVAnime, "Cartoons");
AddCategoryMapping(9, TorznabCatType.PC, "Software");
AddCategoryMapping(10, TorznabCatType.PC0day, "Software");
AddCategoryMapping(11, TorznabCatType.PCGames, "Games");
AddCategoryMapping(12, TorznabCatType.Console, "Games");
AddCategoryMapping(13, TorznabCatType.Books, "Books");
AddCategoryMapping(14, TorznabCatType.TVDocumentary, "Documentaries");
AddCategoryMapping(21, TorznabCatType.AudioVideo, "Music Video");
AddCategoryMapping(22, TorznabCatType.TVSport, "Sport");
AddCategoryMapping(23, TorznabCatType.TV, "TV");
AddCategoryMapping(24, TorznabCatType.TV, "TV");
AddCategoryMapping(26, TorznabCatType.Console, "Games");
AddCategoryMapping(27, TorznabCatType.Other, "Wallpaper");
AddCategoryMapping(29, TorznabCatType.TV, "TV Series");
AddCategoryMapping(30, TorznabCatType.BooksComics, "Comics");
AddCategoryMapping(31, TorznabCatType.TV, "TV");
AddCategoryMapping(32, TorznabCatType.Console, "Games");
AddCategoryMapping(34, TorznabCatType.AudioAudiobook, "Audiobook");
AddCategoryMapping(35, TorznabCatType.Audio, "Music");
AddCategoryMapping(36, TorznabCatType.Books, "Books");
AddCategoryMapping(37, TorznabCatType.PC, "Software");
}
public override async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson)
{
base.LoadValuesFromJson(configJson);
var releases = await PerformQuery(new TorznabQuery());
public override async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson)
{
base.LoadValuesFromJson(configJson);
var releases = await PerformQuery(new TorznabQuery());
await ConfigureIfOK(string.Empty, releases.Any(),
() => throw new Exception("Could not find release from this URL."));
await ConfigureIfOK(String.Empty, releases.Count() > 0, () =>
{
throw new Exception("Could not find release from this URL.");
});
return IndexerConfigurationStatus.Completed;
}
return IndexerConfigurationStatus.Completed;
}
private dynamic CheckResponse(WebClientStringResult result)
{
try
{
var json = JsonConvert.DeserializeObject<dynamic>(result.Content);
private dynamic checkResponse(WebClientStringResult result)
{
try
{
dynamic json = JsonConvert.DeserializeObject<dynamic>(result.Content);
switch (json)
{
case JObject _ when json["ok"] != null && (bool) json["ok"] == false:
throw new Exception("Server error");
default:
return json;
}
}
catch (Exception e)
{
logger.Error("checkResponse() Error: ", e.Message);
throw new ExceptionWithConfigData(result.Content, configData);
}
}
if (json is JObject)
if (json["ok"] != null && ((bool)json["ok"]) == false)
throw new Exception("Server error");
private async Task<dynamic> SendApiRequest(IEnumerable<KeyValuePair<string, string>> data)
{
var result = await PostDataWithCookiesAndRetry(ApiSearch, data, null, SiteLink, _apiHeaders, null, true);
return CheckResponse(result);
}
return json;
}
catch (Exception e)
{
logger.Error("checkResponse() Error: ", e.Message);
throw new ExceptionWithConfigData(result.Content, configData);
}
}
private async Task<dynamic> SendApiRequestLatest()
{
var result = await RequestStringWithCookiesAndRetry(ApiLatest, null, SiteLink, _apiHeaders);
return CheckResponse(result);
}
private async Task<dynamic> SendAPIRequest(List<KeyValuePair<string, string>> data)
{
var jsonData = JsonConvert.SerializeObject(data);
var result = await PostDataWithCookiesAndRetry(APISearch, data, null, SiteLink, APIHeaders, null, true);
return checkResponse(result);
}
private string GetApiCategory(TorznabQuery query)
{
var cats = MapTorznabCapsToTrackers(query);
if (cats.Count == 0) return "0";
string apiCat = null;
foreach (var cat in cats.Select(cat =>
_apiCategories.FirstOrDefault(kvp => kvp.Value.Contains(cat)).Key))
{
if (apiCat == null)
apiCat = cat;
if (apiCat != cat)
return "0";
private async Task<dynamic> SendAPIRequestLatest()
{
var result = await RequestStringWithCookiesAndRetry(APILatest, null, SiteLink, APIHeaders);
return checkResponse(result);
}
}
protected override async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
{
var releases = new List<ReleaseInfo>();
return apiCat;
}
var searchString = query.GetQueryString();
var queryCollection = new List<KeyValuePair<string, string>>();
int page = 0;
protected override async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
{
var releases = new List<ReleaseInfo>();
var searchString = query.GetQueryString();
if (!string.IsNullOrWhiteSpace(searchString))
queryCollection.Add("term", searchString);
else
{
// no term execute latest search
var result = await SendAPIRequestLatest();
if (string.IsNullOrWhiteSpace(searchString))
{
// no term execute latest search
var result = await SendApiRequestLatest();
try
{
// this time is a jarray
JArray json = (JArray)result;
try
{
// this time is a jarray
var json = (JArray) result;
foreach (var torrent in json)
{
// add release
releases.Add(makeRelease(torrent));
}
}
catch (Exception ex)
{
OnParseError(result.ToString(), ex);
}
releases.AddRange(json.Select(MakeRelease));
}
catch (Exception ex)
{
OnParseError(result.ToString(), ex);
}
return releases;
}
return releases;
}
var cats = MapTorznabCapsToTrackers(query);
if (cats.Count > 0)
queryCollection.Add("category", string.Join(",", cats));
else
queryCollection.Add("category", "0"); // set ALL category
var queryCollection = new Dictionary<string, string>
{
["term"] = searchString,
["category"] = GetApiCategory(query)
};
// lazy horrible page initialization
queryCollection.Add("page", page.ToString());
for (var page = 1; page <= MaxSearchPageLimit; page++)
{
// update page number
queryCollection["page"] = page.ToString();
do
{
// update page number
queryCollection.RemoveAt(queryCollection.Count - 1); // remove last elem: page number
queryCollection.Add("page", (++page).ToString());
var result = await SendApiRequest(queryCollection);
try
{
// this time is a jobject
var json = (JObject) result;
var result = await SendAPIRequest(queryCollection);
try
{
// this time is a jobject
JObject json = (JObject)result;
// throws exception if json["results"] is null or not a JArray
if(json["results"] == null)
throw new Exception("Error invalid JSON response");
if (json["results"] == null)
throw new Exception("Error invalid JSON response");
var results = json["results"].Select(MakeRelease).ToList();
releases.AddRange(results);
if (results.Count < MaxResultsPerPage)
break;
}
catch (Exception ex)
{
OnParseError(result.ToString(), ex);
}
}
// check number result
if (((JArray)json["results"]).Count() == 0)
break;
return releases;
}
foreach (var torrent in json["results"])
{
// add release
releases.Add( makeRelease(torrent) );
}
}
catch (Exception ex)
{
OnParseError(result.ToString(), ex);
}
private ReleaseInfo MakeRelease(JToken torrent)
{
//https://corsaro.red/details/E5BB62E2E58C654F4450325046723A3F013CD7A4
var release = new ReleaseInfo
{
Title = (string) torrent["title"],
Grabs = (long) torrent["completed"],
Description = $"{(string) torrent["category"]} {(string) torrent["description"]}",
Seeders = (int) torrent["seeders"],
InfoHash = (string) torrent["hash"],
MagnetUri = new Uri((string) torrent["magnet"]),
Comments = new Uri($"{SiteLink}details/{(string) torrent["hash"]}"),
DownloadVolumeFactor = 0,
UploadVolumeFactor = 1
};
} while (page < MAX_SEARCH_PAGE_LIMIT);
release.Guid = release.Comments;
release.Peers = release.Seeders + (int) torrent["leechers"];
return releases;
}
release.PublishDate = DateTime.Now;
if (torrent["last_updated"] != null)
release.PublishDate = DateTime.Parse((string) torrent["last_updated"]);
private ReleaseInfo makeRelease(JToken torrent)
{
var release = new ReleaseInfo();
var cat = (int) torrent["category"];
release.Category = MapTrackerCatToNewznab(cat.ToString());
release.Title = (String)torrent["title"];
if (torrent["size"] != null)
release.Size = (long) torrent["size"];
//https://corsaro.red/details/E5BB62E2E58C654F4450325046723A3F013CD7A4
release.Comments = new Uri(SiteLink + "details/" + (string)torrent["hash"]);
release.Guid = release.Comments;
//release.Link = release.Comments;
release.PublishDate = DateTime.Now;
if (torrent["last_updated"] != null)
release.PublishDate = DateTime.Parse((string)torrent["last_updated"]);
// TODO: don't know how to map this cats..
int cat = (int)torrent["category"];
release.Category = MapTrackerCatToNewznab(cat.ToString());
if (torrent["size"] != null)
release.Size = (long)torrent["size"];
release.Grabs = (long)torrent["completed"];
release.Description = (string)torrent["category"] + " " + (string)torrent["description"];
/*
RageID = copyFrom.RageID;
Imdb = copyFrom.Imdb;
TMDb = copyFrom.TMDb;
*/
release.Seeders = (int)torrent["seeders"];
release.Peers = release.Seeders + (int)torrent["leechers"];
release.InfoHash = (string)torrent["hash"];
release.MagnetUri = new Uri((string)torrent["magnet"]);
/*
MinimumRatio = copyFrom.MinimumRatio;
MinimumSeedTime = copyFrom.MinimumSeedTime;
*/
release.DownloadVolumeFactor = 0;
release.UploadVolumeFactor = 1;
return release;
}
}
}
return release;
}
}
}