diff options
Diffstat (limited to 'MediaBrowser.Api')
32 files changed, 105 insertions, 92 deletions
diff --git a/MediaBrowser.Api/AlbumsService.cs b/MediaBrowser.Api/AlbumsService.cs index b8a830711a..5787ad180c 100644 --- a/MediaBrowser.Api/AlbumsService.cs +++ b/MediaBrowser.Api/AlbumsService.cs @@ -59,7 +59,7 @@ namespace MediaBrowser.Api request, item => item is MusicAlbum, GetAlbumSimilarityScore); - return ToOptimizedResult(result); + return ToOptimizedSerializedResultUsingCache(result); } /// <summary> diff --git a/MediaBrowser.Api/BaseApiService.cs b/MediaBrowser.Api/BaseApiService.cs index 556f3b57d5..2dd1c77e1e 100644 --- a/MediaBrowser.Api/BaseApiService.cs +++ b/MediaBrowser.Api/BaseApiService.cs @@ -21,7 +21,7 @@ namespace MediaBrowser.Api /// </summary> /// <value>The logger.</value> public ILogger Logger { get; set; } - + /// <summary> /// Gets or sets the HTTP result factory. /// </summary> @@ -58,16 +58,27 @@ namespace MediaBrowser.Api /// <param name="cacheKey">The cache key.</param> /// <param name="lastDateModified">The last date modified.</param> /// <param name="cacheDuration">Duration of the cache.</param> - /// <param name="factoryFn">The factory fn.</param> + /// <param name="factoryFn">The factory function.</param> /// <returns>System.Object.</returns> - /// <exception cref="System.ArgumentNullException">cacheKey</exception> - protected object ToOptimizedResultUsingCache<T>(Guid cacheKey, DateTime lastDateModified, TimeSpan? cacheDuration, Func<T> factoryFn) - where T : class + protected object ToOptimizedResultUsingCache<T>(Guid cacheKey, DateTime? lastDateModified, TimeSpan? cacheDuration, Func<T> factoryFn) + where T : class { return ResultFactory.GetOptimizedResultUsingCache(Request, cacheKey, lastDateModified, cacheDuration, factoryFn); } /// <summary> + /// To the optimized serialized result using cache. + /// </summary> + /// <typeparam name="T"></typeparam> + /// <param name="result">The result.</param> + /// <returns>System.Object.</returns> + protected object ToOptimizedSerializedResultUsingCache<T>(T result) + where T : class + { + return ResultFactory.GetOptimizedSerializedResultUsingCache(Request, result); + } + + /// <summary> /// To the cached result. /// </summary> /// <typeparam name="T"></typeparam> diff --git a/MediaBrowser.Api/ConfigurationService.cs b/MediaBrowser.Api/ConfigurationService.cs index 206d0c265f..b2a5fa7a73 100644 --- a/MediaBrowser.Api/ConfigurationService.cs +++ b/MediaBrowser.Api/ConfigurationService.cs @@ -99,12 +99,12 @@ namespace MediaBrowser.Api public object Get(GetDefaultMetadataOptions request) { - return ToOptimizedResult(new MetadataOptions()); + return ToOptimizedSerializedResultUsingCache(new MetadataOptions()); } public object Get(GetMetadataPlugins request) { - return ToOptimizedResult(_providerManager.GetAllMetadataPlugins().ToList()); + return ToOptimizedSerializedResultUsingCache(_providerManager.GetAllMetadataPlugins().ToList()); } } } diff --git a/MediaBrowser.Api/DefaultTheme/DefaultThemeService.cs b/MediaBrowser.Api/DefaultTheme/DefaultThemeService.cs index 75ef7e54e4..6a91897f2f 100644 --- a/MediaBrowser.Api/DefaultTheme/DefaultThemeService.cs +++ b/MediaBrowser.Api/DefaultTheme/DefaultThemeService.cs @@ -215,7 +215,7 @@ namespace MediaBrowser.Api.DefaultTheme .Select(i => _dtoService.GetBaseItemDto(i, fields, user)) .ToList(); - return ToOptimizedResult(view); + return ToOptimizedSerializedResultUsingCache(view); } public object Get(GetGamesView request) @@ -268,7 +268,7 @@ namespace MediaBrowser.Api.DefaultTheme .Take(1) .ToList(); - return ToOptimizedResult(view); + return ToOptimizedSerializedResultUsingCache(view); } public object Get(GetTvView request) @@ -394,7 +394,7 @@ namespace MediaBrowser.Api.DefaultTheme .Select(i => _dtoService.GetBaseItemDto(i, fields, user)) .ToList(); - return ToOptimizedResult(view); + return ToOptimizedSerializedResultUsingCache(view); } public object Get(GetMovieView request) @@ -569,7 +569,7 @@ namespace MediaBrowser.Api.DefaultTheme .Select(i => _dtoService.GetBaseItemDto(i, fields, user)) .ToList(); - return ToOptimizedResult(view); + return ToOptimizedSerializedResultUsingCache(view); } private IEnumerable<BaseItem> FilterItemsForBackdropDisplay(IEnumerable<BaseItem> items) diff --git a/MediaBrowser.Api/DisplayPreferencesService.cs b/MediaBrowser.Api/DisplayPreferencesService.cs index 39b335316b..f22dc9e39e 100644 --- a/MediaBrowser.Api/DisplayPreferencesService.cs +++ b/MediaBrowser.Api/DisplayPreferencesService.cs @@ -88,7 +88,7 @@ namespace MediaBrowser.Api var result = _displayPreferencesManager.GetDisplayPreferences(displayPreferencesId, request.UserId, request.Client); - return ToOptimizedResult(result); + return ToOptimizedSerializedResultUsingCache(result); } /// <summary> diff --git a/MediaBrowser.Api/EnvironmentService.cs b/MediaBrowser.Api/EnvironmentService.cs index aac7085207..cb104072bd 100644 --- a/MediaBrowser.Api/EnvironmentService.cs +++ b/MediaBrowser.Api/EnvironmentService.cs @@ -135,10 +135,10 @@ namespace MediaBrowser.Api if (path.StartsWith(networkPrefix, StringComparison.OrdinalIgnoreCase) && path.LastIndexOf(UncSeparator) == 1) { - return ToOptimizedResult(GetNetworkShares(path).OrderBy(i => i.Path).ToList()); + return ToOptimizedSerializedResultUsingCache(GetNetworkShares(path).OrderBy(i => i.Path).ToList()); } - return ToOptimizedResult(GetFileSystemEntries(request).OrderBy(i => i.Path).ToList()); + return ToOptimizedSerializedResultUsingCache(GetFileSystemEntries(request).OrderBy(i => i.Path).ToList()); } public object Get(GetNetworkShares request) @@ -147,7 +147,7 @@ namespace MediaBrowser.Api var shares = GetNetworkShares(path).OrderBy(i => i.Path).ToList(); - return ToOptimizedResult(shares); + return ToOptimizedSerializedResultUsingCache(shares); } /// <summary> @@ -159,7 +159,7 @@ namespace MediaBrowser.Api { var result = GetDrives().ToList(); - return ToOptimizedResult(result); + return ToOptimizedSerializedResultUsingCache(result); } /// <summary> @@ -189,7 +189,7 @@ namespace MediaBrowser.Api .OrderBy(i => i.Path) .ToList(); - return ToOptimizedResult(result); + return ToOptimizedSerializedResultUsingCache(result); } /// <summary> diff --git a/MediaBrowser.Api/GamesService.cs b/MediaBrowser.Api/GamesService.cs index ef4fed3d36..d3b7cbe41b 100644 --- a/MediaBrowser.Api/GamesService.cs +++ b/MediaBrowser.Api/GamesService.cs @@ -113,7 +113,7 @@ namespace MediaBrowser.Api .Select(i => GetSummary(i, user)) .ToList(); - return ToOptimizedResult(result); + return ToOptimizedSerializedResultUsingCache(result); } private static readonly CultureInfo UsCulture = new CultureInfo("en-US"); @@ -134,7 +134,7 @@ namespace MediaBrowser.Api }) .ToList(); - return ToOptimizedResult(lookup); + return ToOptimizedSerializedResultUsingCache(lookup); } /// <summary> @@ -182,7 +182,7 @@ namespace MediaBrowser.Api request, item => item is Game, SimilarItemsHelper.GetSimiliarityScore); - return ToOptimizedResult(result); + return ToOptimizedSerializedResultUsingCache(result); } } } diff --git a/MediaBrowser.Api/Images/ImageService.cs b/MediaBrowser.Api/Images/ImageService.cs index 728ceeea96..514e856550 100644 --- a/MediaBrowser.Api/Images/ImageService.cs +++ b/MediaBrowser.Api/Images/ImageService.cs @@ -361,14 +361,14 @@ namespace MediaBrowser.Api.Images var result = GetItemImageInfos(item); - return ToOptimizedResult(result); + return ToOptimizedSerializedResultUsingCache(result); } public object Get(GetItemByNameImageInfos request) { var result = GetItemByNameImageInfos(request); - return ToOptimizedResult(result); + return ToOptimizedSerializedResultUsingCache(result); } /// <summary> diff --git a/MediaBrowser.Api/Images/RemoteImageService.cs b/MediaBrowser.Api/Images/RemoteImageService.cs index 37bf0c1cae..deba146e8c 100644 --- a/MediaBrowser.Api/Images/RemoteImageService.cs +++ b/MediaBrowser.Api/Images/RemoteImageService.cs @@ -176,7 +176,7 @@ namespace MediaBrowser.Api.Images var result = GetImageProviders(item); - return ToOptimizedResult(result); + return ToOptimizedSerializedResultUsingCache(result); } public object Get(GetItemByNameRemoteImageProviders request) @@ -188,7 +188,7 @@ namespace MediaBrowser.Api.Images var result = GetImageProviders(item); - return ToOptimizedResult(result); + return ToOptimizedSerializedResultUsingCache(result); } private List<ImageProviderInfo> GetImageProviders(BaseItem item) @@ -202,7 +202,7 @@ namespace MediaBrowser.Api.Images var result = GetRemoteImageResult(item, request); - return ToOptimizedResult(result); + return ToOptimizedSerializedResultUsingCache(result); } public object Get(GetItemByNameRemoteImages request) diff --git a/MediaBrowser.Api/InstantMixService.cs b/MediaBrowser.Api/InstantMixService.cs index c11f38123d..624137677c 100644 --- a/MediaBrowser.Api/InstantMixService.cs +++ b/MediaBrowser.Api/InstantMixService.cs @@ -57,7 +57,7 @@ namespace MediaBrowser.Api var result = GetInstantMixResult(request, item.Genres); - return ToOptimizedResult(result); + return ToOptimizedSerializedResultUsingCache(result); } public object Get(GetInstantMixFromAlbum request) @@ -73,7 +73,7 @@ namespace MediaBrowser.Api var result = GetInstantMixResult(request, genres); - return ToOptimizedResult(result); + return ToOptimizedSerializedResultUsingCache(result); } public object Get(GetInstantMixFromMusicGenre request) @@ -82,7 +82,7 @@ namespace MediaBrowser.Api var result = GetInstantMixResult(request, new[] { genre.Name }); - return ToOptimizedResult(result); + return ToOptimizedSerializedResultUsingCache(result); } public object Get(GetInstantMixFromArtist request) @@ -99,7 +99,7 @@ namespace MediaBrowser.Api var result = GetInstantMixResult(request, genres); - return ToOptimizedResult(result); + return ToOptimizedSerializedResultUsingCache(result); } private ItemsResult GetInstantMixResult(BaseGetSimilarItems request, IEnumerable<string> genres) diff --git a/MediaBrowser.Api/Library/FileOrganizationService.cs b/MediaBrowser.Api/Library/FileOrganizationService.cs index 44fad6a859..01531a7ae6 100644 --- a/MediaBrowser.Api/Library/FileOrganizationService.cs +++ b/MediaBrowser.Api/Library/FileOrganizationService.cs @@ -95,7 +95,7 @@ namespace MediaBrowser.Api.Library StartIndex = request.StartIndex }); - return ToOptimizedResult(result); + return ToOptimizedSerializedResultUsingCache(result); } public void Delete(DeleteOriginalFile request) diff --git a/MediaBrowser.Api/Library/LibraryService.cs b/MediaBrowser.Api/Library/LibraryService.cs index f3d5824da2..79b2651d5a 100644 --- a/MediaBrowser.Api/Library/LibraryService.cs +++ b/MediaBrowser.Api/Library/LibraryService.cs @@ -77,7 +77,7 @@ namespace MediaBrowser.Api.Library { try { - return c.ResolveArgs.PhysicalLocations; + return c.PhysicalLocations; } catch (Exception ex) { @@ -90,7 +90,7 @@ namespace MediaBrowser.Api.Library }) .ToList(); - return ToOptimizedResult(result); + return ToOptimizedSerializedResultUsingCache(result); } /// <summary> diff --git a/MediaBrowser.Api/Library/LibraryStructureService.cs b/MediaBrowser.Api/Library/LibraryStructureService.cs index 8ea472da30..f08d79c0db 100644 --- a/MediaBrowser.Api/Library/LibraryStructureService.cs +++ b/MediaBrowser.Api/Library/LibraryStructureService.cs @@ -251,7 +251,7 @@ namespace MediaBrowser.Api.Library { var result = _libraryManager.GetDefaultVirtualFolders().OrderBy(i => i.Name).ToList(); - return ToOptimizedResult(result); + return ToOptimizedSerializedResultUsingCache(result); } else { @@ -259,7 +259,7 @@ namespace MediaBrowser.Api.Library var result = _libraryManager.GetVirtualFolders(user).OrderBy(i => i.Name).ToList(); - return ToOptimizedResult(result); + return ToOptimizedSerializedResultUsingCache(result); } } diff --git a/MediaBrowser.Api/LibraryService.cs b/MediaBrowser.Api/LibraryService.cs index d9442b63d5..584bbf9a1a 100644 --- a/MediaBrowser.Api/LibraryService.cs +++ b/MediaBrowser.Api/LibraryService.cs @@ -284,7 +284,7 @@ namespace MediaBrowser.Api { var result = GetAncestors(request); - return ToOptimizedResult(result); + return ToOptimizedSerializedResultUsingCache(result); } /// <summary> @@ -337,7 +337,7 @@ namespace MediaBrowser.Api try { return i.LocationType == LocationType.FileSystem && - i.ResolveArgs.PhysicalLocations.Contains(item.Path); + i.PhysicalLocations.Contains(item.Path); } catch (Exception ex) { @@ -360,7 +360,7 @@ namespace MediaBrowser.Api { var result = GetCriticReviews(request); - return ToOptimizedResult(result); + return ToOptimizedSerializedResultUsingCache(result); } /// <summary> @@ -405,7 +405,7 @@ namespace MediaBrowser.Api UniqueTypes = items.Select(i => i.GetClientTypeName()).Distinct().ToList() }; - return ToOptimizedResult(counts); + return ToOptimizedSerializedResultUsingCache(counts); } private IEnumerable<T> FilterItems<T>(IEnumerable<T> items, GetItemCounts request, Guid userId) @@ -552,7 +552,7 @@ namespace MediaBrowser.Api }); - return ToOptimizedResult(new AllThemeMediaResult + return ToOptimizedSerializedResultUsingCache(new AllThemeMediaResult { ThemeSongsResult = themeSongs, ThemeVideosResult = themeVideos, @@ -570,7 +570,7 @@ namespace MediaBrowser.Api { var result = GetThemeSongs(request); - return ToOptimizedResult(result); + return ToOptimizedSerializedResultUsingCache(result); } private ThemeMediaResult GetThemeSongs(GetThemeSongs request) @@ -638,7 +638,7 @@ namespace MediaBrowser.Api { var result = GetThemeVideos(request); - return ToOptimizedResult(result); + return ToOptimizedSerializedResultUsingCache(result); } public ThemeMediaResult GetThemeVideos(GetThemeVideos request) @@ -748,7 +748,7 @@ namespace MediaBrowser.Api }) .ToList(); - return ToOptimizedResult(lookup); + return ToOptimizedSerializedResultUsingCache(lookup); } public ThemeMediaResult GetSoundtrackSongs(string id, Guid? userId, bool inheritFromParent) diff --git a/MediaBrowser.Api/LiveTv/LiveTvService.cs b/MediaBrowser.Api/LiveTv/LiveTvService.cs index 9d827226c9..569e4b52b9 100644 --- a/MediaBrowser.Api/LiveTv/LiveTvService.cs +++ b/MediaBrowser.Api/LiveTv/LiveTvService.cs @@ -304,7 +304,7 @@ namespace MediaBrowser.Api.LiveTv { var info = _liveTvManager.GetLiveTvInfo(CancellationToken.None).Result; - return ToOptimizedResult(info); + return ToOptimizedSerializedResultUsingCache(info); } public object Get(GetChannels request) @@ -318,7 +318,7 @@ namespace MediaBrowser.Api.LiveTv }, CancellationToken.None).Result; - return ToOptimizedResult(result); + return ToOptimizedSerializedResultUsingCache(result); } public object Get(GetChannel request) @@ -327,7 +327,7 @@ namespace MediaBrowser.Api.LiveTv var result = _liveTvManager.GetChannel(request.Id, CancellationToken.None, user).Result; - return ToOptimizedResult(result); + return ToOptimizedSerializedResultUsingCache(result); } public object Get(GetPrograms request) @@ -360,7 +360,7 @@ namespace MediaBrowser.Api.LiveTv var result = _liveTvManager.GetPrograms(query, CancellationToken.None).Result; - return ToOptimizedResult(result); + return ToOptimizedSerializedResultUsingCache(result); } public object Get(GetRecommendedPrograms request) @@ -375,7 +375,7 @@ namespace MediaBrowser.Api.LiveTv var result = _liveTvManager.GetRecommendedPrograms(query, CancellationToken.None).Result; - return ToOptimizedResult(result); + return ToOptimizedSerializedResultUsingCache(result); } public object Post(GetPrograms request) @@ -398,7 +398,7 @@ namespace MediaBrowser.Api.LiveTv }, CancellationToken.None).Result; - return ToOptimizedResult(result); + return ToOptimizedSerializedResultUsingCache(result); } public object Get(GetRecording request) @@ -407,14 +407,14 @@ namespace MediaBrowser.Api.LiveTv var result = _liveTvManager.GetRecording(request.Id, CancellationToken.None, user).Result; - return ToOptimizedResult(result); + return ToOptimizedSerializedResultUsingCache(result); } public object Get(GetTimer request) { var result = _liveTvManager.GetTimer(request.Id, CancellationToken.None).Result; - return ToOptimizedResult(result); + return ToOptimizedSerializedResultUsingCache(result); } public object Get(GetTimers request) @@ -426,7 +426,7 @@ namespace MediaBrowser.Api.LiveTv }, CancellationToken.None).Result; - return ToOptimizedResult(result); + return ToOptimizedSerializedResultUsingCache(result); } public void Delete(DeleteRecording request) @@ -465,14 +465,14 @@ namespace MediaBrowser.Api.LiveTv }, CancellationToken.None).Result; - return ToOptimizedResult(result); + return ToOptimizedSerializedResultUsingCache(result); } public object Get(GetSeriesTimer request) { var result = _liveTvManager.GetSeriesTimer(request.Id, CancellationToken.None).Result; - return ToOptimizedResult(result); + return ToOptimizedSerializedResultUsingCache(result); } public void Delete(CancelSeriesTimer request) @@ -499,13 +499,13 @@ namespace MediaBrowser.Api.LiveTv { var result = _liveTvManager.GetNewTimerDefaults(CancellationToken.None).Result; - return ToOptimizedResult(result); + return ToOptimizedSerializedResultUsingCache(result); } else { var result = _liveTvManager.GetNewTimerDefaults(request.ProgramId, CancellationToken.None).Result; - return ToOptimizedResult(result); + return ToOptimizedSerializedResultUsingCache(result); } } @@ -515,7 +515,7 @@ namespace MediaBrowser.Api.LiveTv var result = _liveTvManager.GetProgram(request.Id, CancellationToken.None, user).Result; - return ToOptimizedResult(result); + return ToOptimizedSerializedResultUsingCache(result); } public void Post(CreateSeriesTimer request) @@ -544,7 +544,7 @@ namespace MediaBrowser.Api.LiveTv }, CancellationToken.None).Result; - return ToOptimizedResult(result); + return ToOptimizedSerializedResultUsingCache(result); } public object Get(GetRecordingGroup request) @@ -556,7 +556,7 @@ namespace MediaBrowser.Api.LiveTv var group = result.Items.FirstOrDefault(i => string.Equals(i.Id, request.Id, StringComparison.OrdinalIgnoreCase)); - return ToOptimizedResult(group); + return ToOptimizedSerializedResultUsingCache(group); } public object Get(GetGuideInfo request) diff --git a/MediaBrowser.Api/LocalizationService.cs b/MediaBrowser.Api/LocalizationService.cs index 54ac8591ea..b3f6cbd976 100644 --- a/MediaBrowser.Api/LocalizationService.cs +++ b/MediaBrowser.Api/LocalizationService.cs @@ -62,7 +62,7 @@ namespace MediaBrowser.Api { var result = _localization.GetParentalRatings().ToList(); - return ToOptimizedResult(result); + return ToOptimizedSerializedResultUsingCache(result); } /// <summary> @@ -74,7 +74,7 @@ namespace MediaBrowser.Api { var result = _localization.GetCountries().ToList(); - return ToOptimizedResult(result); + return ToOptimizedSerializedResultUsingCache(result); } /// <summary> @@ -86,7 +86,7 @@ namespace MediaBrowser.Api { var result = _localization.GetCultures().ToList(); - return ToOptimizedResult(result); + return ToOptimizedSerializedResultUsingCache(result); } } diff --git a/MediaBrowser.Api/MoviesService.cs b/MediaBrowser.Api/MoviesService.cs index 1b36ec8915..2a99bca8b0 100644 --- a/MediaBrowser.Api/MoviesService.cs +++ b/MediaBrowser.Api/MoviesService.cs @@ -76,7 +76,7 @@ namespace MediaBrowser.Api request, item => item is Movie || (item is Trailer && request.IncludeTrailers), SimilarItemsHelper.GetSimiliarityScore); - return ToOptimizedResult(result); + return ToOptimizedSerializedResultUsingCache(result); } } } diff --git a/MediaBrowser.Api/NewsService.cs b/MediaBrowser.Api/NewsService.cs index efafc9d3f3..99a4d4fa7e 100644 --- a/MediaBrowser.Api/NewsService.cs +++ b/MediaBrowser.Api/NewsService.cs @@ -42,7 +42,7 @@ namespace MediaBrowser.Api }); - return ToOptimizedResult(result); + return ToOptimizedSerializedResultUsingCache(result); } } } diff --git a/MediaBrowser.Api/PluginService.cs b/MediaBrowser.Api/PluginService.cs index de9c89666c..e66f432df8 100644 --- a/MediaBrowser.Api/PluginService.cs +++ b/MediaBrowser.Api/PluginService.cs @@ -166,7 +166,7 @@ namespace MediaBrowser.Api { var result = _appHost.Plugins.OrderBy(p => p.Name).Select(p => p.GetPluginInfo()).ToList(); - return ToOptimizedResult(result); + return ToOptimizedSerializedResultUsingCache(result); } /// <summary> @@ -199,7 +199,7 @@ namespace MediaBrowser.Api LegacyKey = _securityManager.LegacyKey }; - return ToOptimizedResult(result); + return ToOptimizedSerializedResultUsingCache(result); } /// <summary> diff --git a/MediaBrowser.Api/SearchService.cs b/MediaBrowser.Api/SearchService.cs index 8626709a3b..330d7c46f3 100644 --- a/MediaBrowser.Api/SearchService.cs +++ b/MediaBrowser.Api/SearchService.cs @@ -110,7 +110,7 @@ namespace MediaBrowser.Api { var result = GetSearchHintsAsync(request).Result; - return ToOptimizedResult(result); + return ToOptimizedSerializedResultUsingCache(result); } /// <summary> diff --git a/MediaBrowser.Api/TrailersService.cs b/MediaBrowser.Api/TrailersService.cs index 7d137646cc..ca465b5e32 100644 --- a/MediaBrowser.Api/TrailersService.cs +++ b/MediaBrowser.Api/TrailersService.cs @@ -69,7 +69,7 @@ namespace MediaBrowser.Api request, item => item is Movie || item is Trailer, SimilarItemsHelper.GetSimiliarityScore); - return ToOptimizedResult(result); + return ToOptimizedSerializedResultUsingCache(result); } } } diff --git a/MediaBrowser.Api/TvShowsService.cs b/MediaBrowser.Api/TvShowsService.cs index 9521f82cce..629f9b2333 100644 --- a/MediaBrowser.Api/TvShowsService.cs +++ b/MediaBrowser.Api/TvShowsService.cs @@ -183,7 +183,7 @@ namespace MediaBrowser.Api request, item => item is Series, SimilarItemsHelper.GetSimiliarityScore); - return ToOptimizedResult(result); + return ToOptimizedSerializedResultUsingCache(result); } /// <summary> @@ -210,7 +210,7 @@ namespace MediaBrowser.Api Items = returnItems }; - return ToOptimizedResult(result); + return ToOptimizedSerializedResultUsingCache(result); } public IEnumerable<Episode> GetNextUpEpisodes(GetNextUpEpisodes request) diff --git a/MediaBrowser.Api/UserLibrary/GameGenresService.cs b/MediaBrowser.Api/UserLibrary/GameGenresService.cs index 79ee27df62..d282ee091d 100644 --- a/MediaBrowser.Api/UserLibrary/GameGenresService.cs +++ b/MediaBrowser.Api/UserLibrary/GameGenresService.cs @@ -57,7 +57,7 @@ namespace MediaBrowser.Api.UserLibrary { var result = GetItem(request); - return ToOptimizedResult(result); + return ToOptimizedSerializedResultUsingCache(result); } /// <summary> @@ -91,7 +91,7 @@ namespace MediaBrowser.Api.UserLibrary { var result = GetResult(request); - return ToOptimizedResult(result); + return ToOptimizedSerializedResultUsingCache(result); } /// <summary> diff --git a/MediaBrowser.Api/UserLibrary/GenresService.cs b/MediaBrowser.Api/UserLibrary/GenresService.cs index ded9544f8e..092c638822 100644 --- a/MediaBrowser.Api/UserLibrary/GenresService.cs +++ b/MediaBrowser.Api/UserLibrary/GenresService.cs @@ -62,7 +62,7 @@ namespace MediaBrowser.Api.UserLibrary { var result = GetItem(request); - return ToOptimizedResult(result); + return ToOptimizedSerializedResultUsingCache(result); } /// <summary> @@ -96,7 +96,7 @@ namespace MediaBrowser.Api.UserLibrary { var result = GetResult(request); - return ToOptimizedResult(result); + return ToOptimizedSerializedResultUsingCache(result); } /// <summary> diff --git a/MediaBrowser.Api/UserLibrary/ItemsService.cs b/MediaBrowser.Api/UserLibrary/ItemsService.cs index 16243ba6bb..101a379ea7 100644 --- a/MediaBrowser.Api/UserLibrary/ItemsService.cs +++ b/MediaBrowser.Api/UserLibrary/ItemsService.cs @@ -268,7 +268,7 @@ namespace MediaBrowser.Api.UserLibrary { var result = GetItems(request); - return ToOptimizedResult(result); + return ToOptimizedSerializedResultUsingCache(result); } /// <summary> diff --git a/MediaBrowser.Api/UserLibrary/MusicGenresService.cs b/MediaBrowser.Api/UserLibrary/MusicGenresService.cs index 945ac5a670..3f960ccbe9 100644 --- a/MediaBrowser.Api/UserLibrary/MusicGenresService.cs +++ b/MediaBrowser.Api/UserLibrary/MusicGenresService.cs @@ -57,7 +57,7 @@ namespace MediaBrowser.Api.UserLibrary { var result = GetItem(request); - return ToOptimizedResult(result); + return ToOptimizedSerializedResultUsingCache(result); } /// <summary> @@ -91,7 +91,7 @@ namespace MediaBrowser.Api.UserLibrary { var result = GetResult(request); - return ToOptimizedResult(result); + return ToOptimizedSerializedResultUsingCache(result); } /// <summary> diff --git a/MediaBrowser.Api/UserLibrary/PersonsService.cs b/MediaBrowser.Api/UserLibrary/PersonsService.cs index 03e710ae81..32700d21ab 100644 --- a/MediaBrowser.Api/UserLibrary/PersonsService.cs +++ b/MediaBrowser.Api/UserLibrary/PersonsService.cs @@ -74,7 +74,7 @@ namespace MediaBrowser.Api.UserLibrary { var result = GetItem(request); - return ToOptimizedResult(result); + return ToOptimizedSerializedResultUsingCache(result); } /// <summary> @@ -108,7 +108,7 @@ namespace MediaBrowser.Api.UserLibrary { var result = GetResult(request); - return ToOptimizedResult(result); + return ToOptimizedSerializedResultUsingCache(result); } /// <summary> diff --git a/MediaBrowser.Api/UserLibrary/StudiosService.cs b/MediaBrowser.Api/UserLibrary/StudiosService.cs index 8b1eeec0f8..cf4e333e1b 100644 --- a/MediaBrowser.Api/UserLibrary/StudiosService.cs +++ b/MediaBrowser.Api/UserLibrary/StudiosService.cs @@ -62,7 +62,7 @@ namespace MediaBrowser.Api.UserLibrary { var result = GetItem(request); - return ToOptimizedResult(result); + return ToOptimizedSerializedResultUsingCache(result); } /// <summary> @@ -96,7 +96,7 @@ namespace MediaBrowser.Api.UserLibrary { var result = GetResult(request); - return ToOptimizedResult(result); + return ToOptimizedSerializedResultUsingCache(result); } /// <summary> diff --git a/MediaBrowser.Api/UserLibrary/UserLibraryService.cs b/MediaBrowser.Api/UserLibrary/UserLibraryService.cs index d3995ae2b2..c2abc6ad11 100644 --- a/MediaBrowser.Api/UserLibrary/UserLibraryService.cs +++ b/MediaBrowser.Api/UserLibrary/UserLibraryService.cs @@ -1,4 +1,5 @@ -using MediaBrowser.Controller.Dto; +using MediaBrowser.Common.Extensions; +using MediaBrowser.Controller.Dto; using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Entities.Movies; using MediaBrowser.Controller.Entities.TV; @@ -7,6 +8,7 @@ using MediaBrowser.Controller.Session; using MediaBrowser.Model.Dto; using MediaBrowser.Model.Entities; using MediaBrowser.Model.Querying; +using MediaBrowser.Model.Serialization; using ServiceStack; using System; using System.Collections.Generic; @@ -411,7 +413,7 @@ namespace MediaBrowser.Api.UserLibrary { var result = GetAsync(request); - return ToOptimizedResult(result); + return ToOptimizedSerializedResultUsingCache(result); } private List<BaseItemDto> GetAsync(GetSpecialFeatures request) @@ -477,7 +479,7 @@ namespace MediaBrowser.Api.UserLibrary { var result = GetAsync(request); - return ToOptimizedResult(result); + return ToOptimizedSerializedResultUsingCache(result); } private List<BaseItemDto> GetAsync(GetLocalTrailers request) @@ -521,7 +523,7 @@ namespace MediaBrowser.Api.UserLibrary var result = _dtoService.GetBaseItemDto(item, fields, user); - return ToOptimizedResult(result); + return ToOptimizedSerializedResultUsingCache(result); } /// <summary> @@ -540,7 +542,7 @@ namespace MediaBrowser.Api.UserLibrary var result = _dtoService.GetBaseItemDto(item, fields, user); - return ToOptimizedResult(result); + return ToOptimizedSerializedResultUsingCache(result); } /// <summary> @@ -570,7 +572,7 @@ namespace MediaBrowser.Api.UserLibrary TotalRecordCount = dtos.Length }; - return ToOptimizedResult(result); + return ToOptimizedSerializedResultUsingCache(result); } /// <summary> diff --git a/MediaBrowser.Api/UserLibrary/YearsService.cs b/MediaBrowser.Api/UserLibrary/YearsService.cs index 3c54d5b369..7024d52563 100644 --- a/MediaBrowser.Api/UserLibrary/YearsService.cs +++ b/MediaBrowser.Api/UserLibrary/YearsService.cs @@ -62,7 +62,7 @@ namespace MediaBrowser.Api.UserLibrary { var result = GetItem(request); - return ToOptimizedResult(result); + return ToOptimizedSerializedResultUsingCache(result); } /// <summary> @@ -96,7 +96,7 @@ namespace MediaBrowser.Api.UserLibrary { var result = GetResult(request); - return ToOptimizedResult(result); + return ToOptimizedSerializedResultUsingCache(result); } /// <summary> diff --git a/MediaBrowser.Api/UserService.cs b/MediaBrowser.Api/UserService.cs index 254fa6ff1e..80260c83cb 100644 --- a/MediaBrowser.Api/UserService.cs +++ b/MediaBrowser.Api/UserService.cs @@ -225,7 +225,7 @@ namespace MediaBrowser.Api .Select(_dtoService.GetUserDto) .ToList(); - return ToOptimizedResult(result); + return ToOptimizedSerializedResultUsingCache(result); } /// <summary> @@ -244,7 +244,7 @@ namespace MediaBrowser.Api var result = _dtoService.GetUserDto(user); - return ToOptimizedResult(result); + return ToOptimizedSerializedResultUsingCache(result); } /// <summary> diff --git a/MediaBrowser.Api/VideosService.cs b/MediaBrowser.Api/VideosService.cs index d67c290229..fb58e58b7b 100644 --- a/MediaBrowser.Api/VideosService.cs +++ b/MediaBrowser.Api/VideosService.cs @@ -69,7 +69,7 @@ namespace MediaBrowser.Api TotalRecordCount = items.Length }; - return ToOptimizedResult(result); + return ToOptimizedSerializedResultUsingCache(result); } } } |