mirror
/
Sonarr
mirror of https://github.com/Sonarr/Sonarr
1
0
Fork 0
Code Issues Releases Wiki Activity

Added caching to SAB

This commit is contained in:
Mark McDowall 2013-09-06 17:45:13 -07:00
parent 739188a577
commit 1454f158f5
2 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NzbDrone.Core/DataAugmentation/Scene/SceneMappingService.cs
View File

@ -18,7 +18,6 @@ namespace NzbDrone.Core.DataAugmentation.Scene
IHandleAsync<ApplicationStartedEvent>, IHandleAsync<ApplicationStartedEvent>,
IExecute<UpdateSceneMappingCommand> IExecute<UpdateSceneMappingCommand>
{ {
private readonly ISceneMappingRepository _repository; private readonly ISceneMappingRepository _repository;
private readonly ISceneMappingProxy _sceneMappingProxy; private readonly ISceneMappingProxy _sceneMappingProxy;
private readonly Logger _logger; private readonly Logger _logger;

44
NzbDrone.Core/Download/Clients/Sabnzbd/SabnzbdClient.cs
View File

@ -6,6 +6,7 @@ using Newtonsoft.Json;
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
using NLog; using NLog;
using NzbDrone.Common; using NzbDrone.Common;
using NzbDrone.Common.Cache;
using NzbDrone.Core.Configuration; using NzbDrone.Core.Configuration;
using NzbDrone.Core.Parser.Model; using NzbDrone.Core.Parser.Model;
using RestSharp; using RestSharp;
@ -53,12 +54,14 @@ namespace NzbDrone.Core.Download.Clients.Sabnzbd
{ {
private readonly IConfigService _configService; private readonly IConfigService _configService;
private readonly IHttpProvider _httpProvider; private readonly IHttpProvider _httpProvider;
private readonly ICached<IEnumerable<QueueItem>> _queueCache;
private readonly Logger _logger; private readonly Logger _logger;
public SabnzbdClient(IConfigService configService, IHttpProvider httpProvider, Logger logger) public SabnzbdClient(IConfigService configService, IHttpProvider httpProvider, ICacheManger cacheManger, Logger logger)
{ {
_configService = configService; _configService = configService;
_httpProvider = httpProvider; _httpProvider = httpProvider;
_queueCache = cacheManger.GetCache<IEnumerable<QueueItem>>(GetType(), "queue");
_logger = logger; _logger = logger;
} }
@ -97,24 +100,31 @@ namespace NzbDrone.Core.Download.Clients.Sabnzbd
public IEnumerable<QueueItem> GetQueue() public IEnumerable<QueueItem> GetQueue()
{ {
string action = String.Format("mode=queue&output=json&start={0}&limit={1}", 0, 0); return _queueCache.Get("queue", () =>
string request = GetSabRequest(action);
string response = _httpProvider.DownloadString(request);
CheckForError(response);
var sabQueue = JsonConvert.DeserializeObject<SabQueue>(JObject.Parse(response).SelectToken("queue").ToString()).Items;
foreach (var sabQueueItem in sabQueue)
{ {
var queueItem = new QueueItem(); string action = String.Format("mode=queue&output=json&start={0}&limit={1}", 0, 0);
queueItem.Id = sabQueueItem.Id; string request = GetSabRequest(action);
queueItem.Title = sabQueueItem.Title; string response = _httpProvider.DownloadString(request);
queueItem.Size = sabQueueItem.Size;
queueItem.SizeLeft = sabQueueItem.Size;
yield return queueItem; CheckForError(response);
}
var sabQueue = JsonConvert.DeserializeObject<SabQueue>(JObject.Parse(response).SelectToken("queue").ToString()).Items;
var queueItems = new List<QueueItem>();
foreach (var sabQueueItem in sabQueue)
{
var queueItem = new QueueItem();
queueItem.Id = sabQueueItem.Id;
queueItem.Title = sabQueueItem.Title;
queueItem.Size = sabQueueItem.Size;
queueItem.SizeLeft = sabQueueItem.Size;
queueItems.Add( queueItem);
}
return queueItems;
}, TimeSpan.FromSeconds(10));
} }
public virtual List<SabHistoryItem> GetHistory(int start = 0, int limit = 0) public virtual List<SabHistoryItem> GetHistory(int start = 0, int limit = 0)