mirror/Jackett
1
0
Fork 0
mirror of https://github.com/Jackett/Jackett synced 2025-01-04 06:22:45 +00:00
Code Issues Releases Wiki Activity

rarbg: add sort configuration. resolves #6949 (#6989)

Browse source
This commit is contained in:
Diego Heras 2020-01-21 03:25:19 +01:00 committed by garfield69
parent 65ac2c8339
commit 40a0cc70bf
1 changed files with 30 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
src/Jackett.Common/Indexers/Rarbg.cs
View file

@ -13,6 +13,7 @@ using Jackett.Common.Utils;
using Jackett.Common.Utils.Clients; using Jackett.Common.Utils.Clients;
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
using NLog; using NLog;
using static Jackett.Common.Models.IndexerConfig.ConfigurationData;
namespace Jackett.Common.Indexers namespace Jackett.Common.Indexers
{ {
@ -38,7 +39,8 @@ namespace Jackett.Common.Indexers
private DateTime lastTokenFetch; private DateTime lastTokenFetch;
private string token; private string token;
private string app_id; private string app_id;
private bool provideTorrentLink = false; private bool _provideTorrentLink;
private string _sort;
private readonly TimeSpan TOKEN_DURATION = TimeSpan.FromMinutes(10); private readonly TimeSpan TOKEN_DURATION = TimeSpan.FromMinutes(10);
@ -59,7 +61,15 @@ namespace Jackett.Common.Indexers
Language = "en-us"; Language = "en-us";
Type = "public"; Type = "public";
var provideTorrentLinkItem = new ConfigurationData.BoolItem { Value = false }; var sort = new SelectItem(new Dictionary<string, string>
{
{"last", "created"},
{"seeders", "seeders"},
{"leechers", "leechers"}
}) {Name = "Sort requested from site", Value = "last"};
configData.AddDynamic("sort", sort);
var provideTorrentLinkItem = new BoolItem { Value = false };
provideTorrentLinkItem.Name = "Generate torrent download link additionally to magnet (not recommended due to DDoS protection)."; provideTorrentLinkItem.Name = "Generate torrent download link additionally to magnet (not recommended due to DDoS protection).";
configData.AddDynamic("providetorrentlink", provideTorrentLinkItem); configData.AddDynamic("providetorrentlink", provideTorrentLinkItem);
@ -99,11 +109,11 @@ namespace Jackett.Common.Indexers
{ {
base.LoadValuesFromJson(jsonConfig, useProtectionService); base.LoadValuesFromJson(jsonConfig, useProtectionService);
var provideTorrentLinkItem = (ConfigurationData.BoolItem)configData.GetDynamic("providetorrentlink"); var sort = (SelectItem) configData.GetDynamic("sort");
if (provideTorrentLinkItem != null) _sort = sort != null ? sort.Value : "last";
{
provideTorrentLink = provideTorrentLinkItem.Value; var provideTorrentLinkItem = (BoolItem)configData.GetDynamic("providetorrentlink");
} _provideTorrentLink = provideTorrentLinkItem != null && provideTorrentLinkItem.Value;
} }
private async Task CheckToken() private async Task CheckToken()
@ -113,7 +123,6 @@ namespace Jackett.Common.Indexers
var queryCollection = new NameValueCollection(); var queryCollection = new NameValueCollection();
queryCollection.Add("get_token", "get_token"); queryCollection.Add("get_token", "get_token");
queryCollection.Add("app_id", app_id); queryCollection.Add("app_id", app_id);
var tokenUrl = ApiEndpoint + "?" + queryCollection.GetQueryString(); var tokenUrl = ApiEndpoint + "?" + queryCollection.GetQueryString();
@ -129,10 +138,8 @@ namespace Jackett.Common.Indexers
LoadValuesFromJson(configJson); LoadValuesFromJson(configJson);
var releases = await PerformQuery(new TorznabQuery()); var releases = await PerformQuery(new TorznabQuery());
await ConfigureIfOK(string.Empty, releases.Count() > 0, () => await ConfigureIfOK(string.Empty, releases.Any(), () =>
{ throw new Exception("Could not find releases from this URL"));
throw new Exception("Could not find releases from this URL");
});
return IndexerConfigurationStatus.Completed; return IndexerConfigurationStatus.Completed;
} }
@ -142,7 +149,7 @@ namespace Jackett.Common.Indexers
return await PerformQuery(query, 0); return await PerformQuery(query, 0);
} }
public async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query, int attempts) private async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query, int attempts)
{ {
await CheckToken(); await CheckToken();
var releases = new List<ReleaseInfo>(); var releases = new List<ReleaseInfo>();
@ -154,6 +161,7 @@ namespace Jackett.Common.Indexers
queryCollection.Add("app_id", app_id); queryCollection.Add("app_id", app_id);
queryCollection.Add("limit", "100"); queryCollection.Add("limit", "100");
queryCollection.Add("ranked", "0"); queryCollection.Add("ranked", "0");
queryCollection.Add("sort", _sort);
if (query.ImdbID != null) if (query.ImdbID != null)
{ {
@ -179,6 +187,7 @@ namespace Jackett.Common.Indexers
else else
{ {
queryCollection.Add("mode", "list"); queryCollection.Add("mode", "list");
queryCollection.Remove("sort");
} }
var querycats = MapTorznabCapsToTrackers(query); var querycats = MapTorznabCapsToTrackers(query);
@ -194,7 +203,7 @@ namespace Jackett.Common.Indexers
{ {
var jsonContent = JObject.Parse(response.Content); var jsonContent = JObject.Parse(response.Content);
int errorCode = jsonContent.Value<int>("error_code"); var errorCode = jsonContent.Value<int>("error_code");
if (errorCode == 20) // no results found if (errorCode == 20) // no results found
{ {
return releases.ToArray(); return releases.ToArray();
@ -234,19 +243,19 @@ namespace Jackett.Common.Indexers
release.InfoHash = release.MagnetUri.ToString().Split(':')[3].Split('&')[0]; release.InfoHash = release.MagnetUri.ToString().Split(':')[3].Split('&')[0];
// append app_id to prevent api server returning 403 forbidden // append app_id to prevent api server returning 403 forbidden
release.Comments = new Uri(item.Value<string>("info_page") + "&app_id=" + app_id); release.Comments = new Uri(item.Value<string>("info_page") + "&app_id=" + app_id);
if (provideTorrentLink) if (_provideTorrentLink)
release.Link = release.Comments; // in case of a torrent download we grab the link from the details page in Download() release.Link = release.Comments; // in case of a torrent download we grab the link from the details page in Download()
release.Guid = release.MagnetUri; release.Guid = release.MagnetUri;
var episode_info = item.Value<JToken>("episode_info"); var episodeInfo = item.Value<JToken>("episode_info");
if (episode_info.HasValues) if (episodeInfo.HasValues)
{ {
var imdb = episode_info.Value<string>("imdb"); var imdb = episodeInfo.Value<string>("imdb");
release.Imdb = ParseUtil.GetImdbID(imdb); release.Imdb = ParseUtil.GetImdbID(imdb);
release.TVDBId = episode_info.Value<long?>("tvdb"); release.TVDBId = episodeInfo.Value<long?>("tvdb");
release.RageID = episode_info.Value<long?>("tvrage"); release.RageID = episodeInfo.Value<long?>("tvrage");
release.TMDb = episode_info.Value<long?>("themoviedb"); release.TMDb = episodeInfo.Value<long?>("themoviedb");
} }
// ex: 2015-08-16 21:25:08 +0000 // ex: 2015-08-16 21:25:08 +0000