shpaq/Jackett-Jackett
1
0
Fork 0
mirror of https://github.com/Jackett/Jackett.git synced 2025-09-17 17:34:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

HDBitsAPI: Add missing filter options (#7931)

Browse Source
This commit is contained in:
Jonas Stendahl
2020-04-01 21:05:33 +02:00
committed by GitHub
parent 76cbae8da5
commit 09df00aae5
2 changed files with 22 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/Jackett.Common/Indexers/HDBitsApi.cs
View File

@@ -73,7 +73,7 @@ namespace Jackett.Common.Indexers
protected override async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query) protected override async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
{ {
dynamic requestData = new JObject(); var requestData = new JObject();
var queryString = query.GetQueryString(); var queryString = query.GetQueryString();
var imdbId = ParseUtil.GetImdbID(query.ImdbID); var imdbId = ParseUtil.GetImdbID(query.ImdbID);
@@ -89,35 +89,17 @@ namespace Jackett.Common.Indexers
var categories = MapTorznabCapsToTrackers(query); var categories = MapTorznabCapsToTrackers(query);
if (categories.Count > 0) if(categories.Any())
{ requestData.Add("category", JToken.FromObject(categories));
requestData["category"] = new JArray();
foreach (var cat in categories) if(configData.Codecs.Values.Any())
{ requestData.Add("codec", JToken.FromObject(configData.Codecs.Values.Select(int.Parse)));
requestData["category"].Add(new JValue(cat));
}
}
if (configData.Codecs.Values.Length > 0) if(configData.Mediums.Values.Any())
{ requestData.Add("medium", JToken.FromObject(configData.Mediums.Values.Select(int.Parse)));
requestData["codec"] = new JArray();
foreach (var codec in configData.Codecs.Values) if(configData.Origins.Values.Any())
{ requestData.Add("origin", JToken.FromObject(configData.Origins.Values.Select(int.Parse)));
requestData["codec"].Add(new JValue(int.Parse(codec)));
}
}
if (configData.Mediums.Values.Length > 0)
{
requestData["medium"] = new JArray();
foreach (var medium in configData.Mediums.Values)
{
requestData["medium"].Add(new JValue(int.Parse(medium)));
}
}
requestData["limit"] = 100; requestData["limit"] = 100;
@@ -178,6 +160,7 @@ namespace Jackett.Common.Indexers
// 50% Free Leech: all full discs, remuxes, caps and all internal encodes. // 50% Free Leech: all full discs, remuxes, caps and all internal encodes.
if (halfLeechMediums.Contains((int)r["type_medium"]) || (int)r["type_origin"] == 1) if (halfLeechMediums.Contains((int)r["type_medium"]) || (int)r["type_origin"] == 1)
return 0.5; return 0.5;
// 25% Free Leech: all TV content that is not an internal encode.
if ((int)r["type_category"] == 2 && (int)r["type_origin"] != 1) if ((int)r["type_category"] == 2 && (int)r["type_origin"] != 1)
return 0.75; return 0.75;
return 1; return 1;
@@ -215,4 +198,3 @@ namespace Jackett.Common.Indexers
} }
} }
} }

14
src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationHDBitsApi.cs
View File

@@ -6,11 +6,13 @@ namespace Jackett.Common.Models.IndexerConfig.Bespoke
{ {
public CheckboxItem Codecs { get; private set; } public CheckboxItem Codecs { get; private set; }
public CheckboxItem Mediums { get; private set; } public CheckboxItem Mediums { get; private set; }
public CheckboxItem Origins { get; private set; }
public ConfigurationDataHDBitsApi() : base() public ConfigurationDataHDBitsApi() : base()
{ {
Codecs = new CheckboxItem(new Dictionary<string, string>() Codecs = new CheckboxItem(new Dictionary<string, string>()
{ {
{"0", "Undefined"},
{"1", "H.264"}, {"1", "H.264"},
{"5", "HEVC"}, {"5", "HEVC"},
{"2", "MPEG-2"}, {"2", "MPEG-2"},
@@ -18,17 +20,25 @@ namespace Jackett.Common.Models.IndexerConfig.Bespoke
{"6", "VP9"}, {"6", "VP9"},
{"4", "XviD"} {"4", "XviD"}
}) })
{ Name = "Codec", Values = new string[] { "1", "5", "2", "3", "6", "4" } }; { Name = "Codec", Values = new string[] { "0", "1", "5", "2", "3", "6", "4" } };
Mediums = new CheckboxItem(new Dictionary<string, string>() Mediums = new CheckboxItem(new Dictionary<string, string>()
{ {
{"0", "Undefined"},
{"1", "Blu-ray/HD DVD"}, {"1", "Blu-ray/HD DVD"},
{"4", "Capture"}, {"4", "Capture"},
{"3", "Encode"}, {"3", "Encode"},
{"5", "Remux"}, {"5", "Remux"},
{"6", "WEB-DL"} {"6", "WEB-DL"}
}) })
{ Name = "Medium", Values = new string[] { "1", "4", "3", "5", "6" } }; { Name = "Medium", Values = new string[] { "0", "1", "4", "3", "5", "6" } };
Origins = new CheckboxItem(new Dictionary<string, string>()
{
{"0", "Undefined"},
{"1", "Internal"}
})
{ Name = "Origin", Values = new string[] { "0", "1" } };
} }
} }
} }