shpaq/Jackett-Jackett
1
0
Fork 0
mirror of https://github.com/Jackett/Jackett.git synced 2025-10-01 07:53:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

beyond-hd-api: fix categories and types filtering

Browse Source
This commit is contained in:
Bogdan
2023-11-04 17:15:44 +02:00
parent 83f8721d66
commit b393deeb7d
1 changed files with 30 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/Jackett.Common/Indexers/BeyondHDAPI.cs
View File

@@ -64,8 +64,8 @@ namespace Jackett.Common.Indexers
} }
}; };
caps.Categories.AddCategoryMapping("Movies", TorznabCatType.Movies); caps.Categories.AddCategoryMapping(1, TorznabCatType.Movies, "Movies");
caps.Categories.AddCategoryMapping("TV", TorznabCatType.TV); caps.Categories.AddCategoryMapping(2, TorznabCatType.TV, "TV");
return caps; return caps;
} }
@@ -118,7 +118,7 @@ namespace Jackett.Common.Indexers
var apiKey = configData.ApiKey.Value; var apiKey = configData.ApiKey.Value;
var apiUrl = $"{APIBASE}{apiKey}"; var apiUrl = $"{APIBASE}{apiKey}";
var postData = new Dictionary<string, string> var postData = new Dictionary<string, object>
{ {
{ BHDParams.action, "search" }, { BHDParams.action, "search" },
{ BHDParams.rsskey, configData.RSSKey.Value }, { BHDParams.rsskey, configData.RSSKey.Value },
@@ -127,36 +127,34 @@ namespace Jackett.Common.Indexers
if (configData.FilterFreeleech.Value) if (configData.FilterFreeleech.Value)
{ {
postData.Add(BHDParams.freeleech, "1"); postData.Add(BHDParams.freeleech, 1);
} }
if (configData.FilterLimited.Value) if (configData.FilterLimited.Value)
{ {
postData.Add(BHDParams.limited, "1"); postData.Add(BHDParams.limited, 1);
} }
if (configData.FilterRefund.Value) if (configData.FilterRefund.Value)
{ {
postData.Add(BHDParams.refund, "1"); postData.Add(BHDParams.refund, 1);
} }
if (configData.FilterRewind.Value) if (configData.FilterRewind.Value)
{ {
postData.Add(BHDParams.rewind, "1"); postData.Add(BHDParams.rewind, 1);
} }
if (configData.SearchTypes.Values.Any()) if (configData.SearchTypes.Values.Any())
{ {
postData.Add(BHDParams.types, string.Join(",", configData.SearchTypes.Values)); postData.Add(BHDParams.types, configData.SearchTypes.Values.ToArray());
} }
if (query.IsTVSearch) var categories = MapTorznabCapsToTrackers(query);
if (categories.Any())
{ {
postData.Add(BHDParams.categories, "TV"); postData.Add(BHDParams.categories, categories.Select(int.Parse).ToArray());
}
else if (query.IsMovieSearch)
{
postData.Add(BHDParams.categories, "Movies");
} }
if (query.IsImdbQuery) if (query.IsImdbQuery)
@@ -175,16 +173,16 @@ namespace Jackett.Common.Indexers
} }
var bhdResponse = await GetBHDResponse(apiUrl, postData); var bhdResponse = await GetBHDResponse(apiUrl, postData);
var releaseInfos = bhdResponse.results.Select(mapToReleaseInfo); var releaseInfos = bhdResponse.results.Select(MapToReleaseInfo);
return releaseInfos; return releaseInfos;
} }
private ReleaseInfo mapToReleaseInfo(BHDResult bhdResult) private ReleaseInfo MapToReleaseInfo(BHDResult bhdResult)
{ {
var downloadUri = new Uri(bhdResult.download_url); var downloadUri = new Uri(bhdResult.download_url);
var title = getTitle(bhdResult); var title = GetReleaseTitle(bhdResult);
var releaseInfo = new ReleaseInfo var releaseInfo = new ReleaseInfo
{ {
@@ -198,7 +196,7 @@ namespace Jackett.Common.Indexers
Grabs = bhdResult.times_completed, Grabs = bhdResult.times_completed,
PublishDate = bhdResult.created_at, PublishDate = bhdResult.created_at,
Size = bhdResult.size, Size = bhdResult.size,
Category = MapTrackerCatToNewznab(bhdResult.category) Category = MapTrackerCatDescToNewznab(bhdResult.category)
}; };
if (!string.IsNullOrEmpty(bhdResult.imdb_id)) if (!string.IsNullOrEmpty(bhdResult.imdb_id))
@@ -219,7 +217,7 @@ namespace Jackett.Common.Indexers
return releaseInfo; return releaseInfo;
} }
private string getTitle(BHDResult bhdResult) private string GetReleaseTitle(BHDResult bhdResult)
{ {
var title = bhdResult.name.Trim(); var title = bhdResult.name.Trim();
@@ -258,13 +256,18 @@ namespace Jackett.Common.Indexers
return title; return title;
} }
private async Task<BHDResponse> GetBHDResponse(string apiUrl, Dictionary<string, string> postData) private async Task<BHDResponse> GetBHDResponse(string apiUrl, Dictionary<string, object> postData)
{ {
var request = new WebRequest var request = new WebRequest
{ {
PostData = postData, Url = apiUrl,
Type = RequestType.POST, Type = RequestType.POST,
Url = apiUrl Headers = new Dictionary<string, string>
{
{ "Accept", "application/json" },
{ "Content-Type", "application/json" }
},
RawBody = JsonConvert.SerializeObject(postData)
}; };
var response = await webclient.GetResultAsync(request); var response = await webclient.GetResultAsync(request);
@@ -274,9 +277,14 @@ namespace Jackett.Common.Indexers
logger.Warn(response.ContentString); logger.Warn(response.ContentString);
throw new Exception("The response was not JSON"); throw new Exception("The response was not JSON");
} }
var bhdresponse = JsonConvert.DeserializeObject<BHDResponse>(response.ContentString); var bhdresponse = JsonConvert.DeserializeObject<BHDResponse>(response.ContentString);
if (bhdresponse.status_code == 0) if (bhdresponse.status_code == 0)
{
throw new Exception(bhdresponse.status_message); throw new Exception(bhdresponse.status_message);
}
return bhdresponse; return bhdresponse;
} }