open-source-mirrors
/
Ombi
mirror of https://github.com/Ombi-app/Ombi
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Some small tweaks to improve the memory alloc

Browse Source
pull/470/head
tidusjar 9 years ago
parent 5d18877b49
commit 7f6c70d7b2
5 changed files with 147 additions and 150 deletions
Show Stats Download Patch File Download Diff File

261
PlexRequests.Helpers/MemoryCacheProvider.cs
Unescape View File

@ -1,130 +1,133 @@
#region Copyright #region Copyright
// /************************************************************************ // /************************************************************************
// Copyright (c) 2016 Jamie Rees // Copyright (c) 2016 Jamie Rees
// File: MemoryCacheProvider.cs // File: MemoryCacheProvider.cs
// Created By: Jamie Rees // Created By: Jamie Rees
// //
// Permission is hereby granted, free of charge, to any person obtaining // Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the // a copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including // "Software"), to deal in the Software without restriction, including
// without limitation the rights to use, copy, modify, merge, publish, // without limitation the rights to use, copy, modify, merge, publish,
// distribute, sublicense, and/or sell copies of the Software, and to // distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to // permit persons to whom the Software is furnished to do so, subject to
// the following conditions: // the following conditions:
// //
// The above copyright notice and this permission notice shall be // The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software. // included in all copies or substantial portions of the Software.
// //
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF // EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND // MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE // NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION // LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// ************************************************************************/ // ************************************************************************/
#endregion #endregion
using System; using System;
using System.Linq; using System.Linq;
using System.Runtime.Caching; using System.Runtime.Caching;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace PlexRequests.Helpers namespace PlexRequests.Helpers
{ {
public class MemoryCacheProvider : ICacheProvider public class MemoryCacheProvider : ICacheProvider
{ {
private ObjectCache Cache => MemoryCache.Default; private ObjectCache Cache => MemoryCache.Default;
private readonly object _lock = new object();
/// <summary>
/// Gets the item from the cache, if the item is not present /// <summary>
/// then we will get that item and store it in the cache. /// Gets the item from the cache, if the item is not present
/// </summary> /// then we will get that item and store it in the cache.
/// <typeparam name="T">Type to store in the cache.</typeparam> /// </summary>
/// <param name="key">The key.</param> /// <typeparam name="T">Type to store in the cache.</typeparam>
/// <param name="itemCallback">The item callback. This will be called if the item is not present in the cache. /// <param name="key">The key.</param>
/// </param> /// <param name="itemCallback">The item callback. This will be called if the item is not present in the cache.
/// <param name="cacheTime">The amount of time we want to cache the object.</param> /// </param>
/// <returns>A copy of the cached object.</returns> /// <param name="cacheTime">The amount of time we want to cache the object.</param>
/// <remarks>If the <c><![CDATA[Func<T>]]> itemCallback</c> is null and the item is not in the cache it will throw a <see cref="NullReferenceException"/>. /// <returns>A copy of the cached object.</returns>
/// <para>If you do not want to change the object in the cache (since it's a copy returned and not a reference) you will need to <see cref="Remove"/> /// <remarks>If the <c><![CDATA[Func<T>]]> itemCallback</c> is null and the item is not in the cache it will throw a <see cref="NullReferenceException"/>.
/// the cached item and then <see cref="Set"/> it, or just call this method.</para></remarks> /// <para>If you do not want to change the object in the cache (since it's a copy returned and not a reference) you will need to <see cref="Remove"/>
public T GetOrSet<T>(string key, Func<T> itemCallback, int cacheTime = 20) where T : class /// the cached item and then <see cref="Set"/> it, or just call this method.</para></remarks>
{ public T GetOrSet<T>(string key, Func<T> itemCallback, int cacheTime = 20) where T : class
var item = Get<T>(key); {
if (item == null) var item = Get<T>(key);
{ if (item == null)
item = itemCallback(); {
if (item != null) item = itemCallback();
{ if (item != null)
Set(key, item, cacheTime); {
} Set(key, item, cacheTime);
} }
}
// Return a copy, not the stored cache reference
// The cached object will not change // Return a copy, not the stored cache reference
// If we // The cached object will not change
return item.CloneJson(); // If we
} return item.CloneJson();
}
public async Task<T> GetOrSetAsync<T>(string key, Func<Task<T>> itemCallback, int cacheTime = 20) where T : class
{ public async Task<T> GetOrSetAsync<T>(string key, Func<Task<T>> itemCallback, int cacheTime = 20) where T : class
var item = Get<T>(key); {
if (item == null) var item = Get<T>(key);
{ if (item == null)
item = await itemCallback(); {
if (item != null) item = await itemCallback();
{ if (item != null)
Set(key, item, cacheTime); {
} Set(key, item, cacheTime);
} }
}
// Return a copy, not the stored cache reference
// The cached object will not change // Return a copy, not the stored cache reference
return item.CloneJson(); // The cached object will not change
} return item.CloneJson();
}
/// <summary>
/// Gets the specified item from the cache. /// <summary>
/// </summary> /// Gets the specified item from the cache.
/// <typeparam name="T">Type to get from the cache</typeparam> /// </summary>
/// <param name="key">The key.</param> /// <typeparam name="T">Type to get from the cache</typeparam>
/// <returns></returns> /// <param name="key">The key.</param>
public T Get<T>(string key) where T : class /// <returns></returns>
{ public T Get<T>(string key) where T : class
lock (key) {
return Cache.Get(key) as T; lock (_lock)
} {
return Cache.Get(key) as T;
/// <summary> }
/// Set/Store the specified object in the cache }
/// </summary>
/// <param name="key">The key.</param> /// <summary>
/// <param name="data">The object we want to store.</param> /// Set/Store the specified object in the cache
/// <param name="cacheTime">The amount of time we want to cache the object.</param> /// </summary>
public void Set(string key, object data, int cacheTime = 20) /// <param name="key">The key.</param>
{ /// <param name="data">The object we want to store.</param>
var policy = new CacheItemPolicy { AbsoluteExpiration = DateTime.Now + TimeSpan.FromMinutes(cacheTime) }; /// <param name="cacheTime">The amount of time we want to cache the object.</param>
lock (key) public void Set(string key, object data, int cacheTime = 20)
{ {
Cache.Remove(key); var policy = new CacheItemPolicy { AbsoluteExpiration = DateTime.Now + TimeSpan.FromMinutes(cacheTime) };
Cache.Add(new CacheItem(key, data), policy); lock (_lock)
} {
} Cache.Remove(key);
Cache.Add(new CacheItem(key, data), policy);
/// <summary> }
/// Removes the specified object from the cache. }
/// </summary>
/// <param name="key">The key.</param> /// <summary>
public void Remove(string key) /// Removes the specified object from the cache.
{ /// </summary>
var keys = Cache.Where(x => x.Key.Contains(key)); /// <param name="key">The key.</param>
foreach (var k in keys) public void Remove(string key)
{ {
lock (key) var keys = Cache.Where(x => x.Key.Contains(key));
{ foreach (var k in keys)
Cache.Remove(k.Key); {
} lock (_lock)
} {
} Cache.Remove(k.Key);
} }
}
}
}
} }

2
PlexRequests.Services/Interfaces/IAvailabilityChecker.cs
Unescape View File

@ -43,7 +43,7 @@ namespace PlexRequests.Services.Interfaces
/// Gets the episode's stored in the cache. /// Gets the episode's stored in the cache.
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
IEnumerable<PlexEpisodeModel> GetEpisodeCache(); HashSet<PlexEpisodeModel> GetEpisodeCache();
/// <summary> /// <summary>
/// Gets the episode's stored in the cache and then filters on the TheTvDBId. /// Gets the episode's stored in the cache and then filters on the TheTvDBId.
/// </summary> /// </summary>

8
PlexRequests.Services/Jobs/PlexAvailabilityChecker.cs
Unescape View File

@ -241,7 +241,7 @@ namespace PlexRequests.Services.Jobs
public bool IsEpisodeAvailable(string theTvDbId, int season, int episode) public bool IsEpisodeAvailable(string theTvDbId, int season, int episode)
{ {
var episodes = Cache.Get<List<PlexEpisodeModel>>(CacheKeys.PlexEpisodes); var episodes = Cache.Get<HashSet<PlexEpisodeModel>>(CacheKeys.PlexEpisodes);
if (episodes == null) if (episodes == null)
{ {
Log.Info("Episode cache info is not available. tvdbid: {0}, season: {1}, episode: {2}",theTvDbId, season, episode); Log.Info("Episode cache info is not available. tvdbid: {0}, season: {1}, episode: {2}",theTvDbId, season, episode);
@ -261,13 +261,13 @@ namespace PlexRequests.Services.Jobs
/// Gets the episode's stored in the cache. /// Gets the episode's stored in the cache.
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
public IEnumerable<PlexEpisodeModel> GetEpisodeCache() public HashSet<PlexEpisodeModel> GetEpisodeCache()
{ {
var episodes = Cache.Get<List<PlexEpisodeModel>>(CacheKeys.PlexEpisodes); var episodes = Cache.Get<HashSet<PlexEpisodeModel>>(CacheKeys.PlexEpisodes);
if (episodes == null) if (episodes == null)
{ {
Log.Info("Episode cache info is not available."); Log.Info("Episode cache info is not available.");
return new List<PlexEpisodeModel>(); return new HashSet<PlexEpisodeModel>();
} }
return episodes; return episodes;
} }

25
PlexRequests.Services/Jobs/PlexEpisodeCacher.cs
Unescape View File

@ -65,6 +65,7 @@ namespace PlexRequests.Services.Jobs
public void CacheEpisodes() public void CacheEpisodes()
{ {
var results = new PlexSearch(); var results = new PlexSearch();
var videoHashset = new HashSet<Video>();
var settings = Plex.GetSettings(); var settings = Plex.GetSettings();
if (string.IsNullOrEmpty(settings.PlexAuthToken)) if (string.IsNullOrEmpty(settings.PlexAuthToken))
{ {
@ -85,32 +86,26 @@ namespace PlexRequests.Services.Jobs
currentPosition += ResultCount; currentPosition += ResultCount;
while (currentPosition < totalSize) while (currentPosition < totalSize)
{ {
results.Video.AddRange(PlexApi.GetAllEpisodes(settings.PlexAuthToken, settings.FullUri, tvSectionId, currentPosition, ResultCount).Video); videoHashset.UnionWith(PlexApi.GetAllEpisodes(settings.PlexAuthToken, settings.FullUri, tvSectionId, currentPosition, ResultCount).Video
.Where(x => x.Type.Equals(PlexType, StringComparison.InvariantCultureIgnoreCase)));
currentPosition += ResultCount; currentPosition += ResultCount;
} }
var filteredList = results.Video.Where(x => x.Type.Equals(PlexType, StringComparison.InvariantCultureIgnoreCase)); var episodesModel = new HashSet<PlexEpisodeModel>();
var episodesModel = new List<PlexEpisodeModel>();
var metadataList = new List<PlexEpisodeMetadata>();
foreach (var video in filteredList) foreach (var video in videoHashset)
{ {
var ratingKey = video.RatingKey; var ratingKey = video.RatingKey;
var metadata = PlexApi.GetEpisodeMetaData(settings.PlexAuthToken, settings.FullUri, ratingKey); var metadata = PlexApi.GetEpisodeMetaData(settings.PlexAuthToken, settings.FullUri, ratingKey);
metadataList.Add(metadata);
}
foreach (var m in metadataList) foreach (var metadataVideo in metadata.Video)
{
foreach (var video in m.Video)
{ {
episodesModel.Add(new PlexEpisodeModel episodesModel.Add(new PlexEpisodeModel
{ {
RatingKey = video.RatingKey, RatingKey = metadataVideo.RatingKey,
EpisodeTitle = video.Title, EpisodeTitle = metadataVideo.Title,
Guid = video.Guid, Guid = metadataVideo.Guid,
ShowTitle = video.GrandparentTitle ShowTitle = metadataVideo.GrandparentTitle
}); });
} }
} }

1
PlexRequests.UI/Views/Admin/Plex.cshtml
Unescape View File

@ -130,7 +130,6 @@
generateNotify(response.message, "success"); generateNotify(response.message, "success");
$('#spinner').attr("class", "fa fa-check"); $('#spinner').attr("class", "fa fa-check");
$('#authToken').val(response.authToken);
} else { } else {
generateNotify(response.message, "warning"); generateNotify(response.message, "warning");
$('#spinner').attr("class", "fa fa-times"); $('#spinner').attr("class", "fa fa-times");

Write Preview
Loading…
Cancel
Save