From 06c611dd50d37b786a957cea7308fb30e926a919 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Tue, 17 Sep 2013 11:14:22 -0400 Subject: [PATCH] updated nuget --- MediaBrowser.Api/LibraryService.cs | 14 ++++---- .../Persistence/IItemRepository.cs | 2 +- .../Persistence/SqliteItemRepository.cs | 33 ++++++++----------- Nuget/MediaBrowser.Common.Internal.nuspec | 4 +-- Nuget/MediaBrowser.Common.nuspec | 2 +- Nuget/MediaBrowser.Server.Core.nuspec | 4 +-- 6 files changed, 27 insertions(+), 32 deletions(-) diff --git a/MediaBrowser.Api/LibraryService.cs b/MediaBrowser.Api/LibraryService.cs index 96d6d3273d..68a2258b80 100644 --- a/MediaBrowser.Api/LibraryService.cs +++ b/MediaBrowser.Api/LibraryService.cs @@ -20,7 +20,7 @@ namespace MediaBrowser.Api { [Route("/Items/{Id}/File", "GET")] [Api(Description = "Gets the original file of an item")] - public class GetFile + public class GetFile { /// /// Gets or sets the id. @@ -29,7 +29,7 @@ namespace MediaBrowser.Api [ApiMember(Name = "Id", Description = "Item Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "GET")] public string Id { get; set; } } - + /// /// Class GetCriticReviews /// @@ -174,7 +174,7 @@ namespace MediaBrowser.Api [ApiMember(Name = "Id", Description = "Item Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "GET")] public string Id { get; set; } } - + /// /// Class LibraryService /// @@ -217,7 +217,7 @@ namespace MediaBrowser.Api return ToStaticFileResult(item.Path); } - + /// /// Gets the specified request. /// @@ -301,7 +301,7 @@ namespace MediaBrowser.Api /// System.Object. public object Get(GetCriticReviews request) { - var result = GetCriticReviewsAsync(request).Result; + var result = GetCriticReviews(request); return ToOptimizedResult(result); } @@ -430,9 +430,9 @@ namespace MediaBrowser.Api /// /// The request. /// Task{ItemReviewsResult}. - private async Task GetCriticReviewsAsync(GetCriticReviews request) + private ItemReviewsResult GetCriticReviews(GetCriticReviews request) { - var reviews = await _itemRepo.GetCriticReviews(new Guid(request.Id)).ConfigureAwait(false); + var reviews = _itemRepo.GetCriticReviews(new Guid(request.Id)); var reviewsArray = reviews.ToArray(); diff --git a/MediaBrowser.Controller/Persistence/IItemRepository.cs b/MediaBrowser.Controller/Persistence/IItemRepository.cs index 2cf4bbd553..8960b5dfb1 100644 --- a/MediaBrowser.Controller/Persistence/IItemRepository.cs +++ b/MediaBrowser.Controller/Persistence/IItemRepository.cs @@ -32,7 +32,7 @@ namespace MediaBrowser.Controller.Persistence /// /// The item id. /// Task{IEnumerable{ItemReview}}. - Task> GetCriticReviews(Guid itemId); + IEnumerable GetCriticReviews(Guid itemId); /// /// Saves the critic reviews. diff --git a/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs b/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs index a90835c6af..f4f5f08e48 100644 --- a/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs +++ b/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs @@ -24,7 +24,7 @@ namespace MediaBrowser.Server.Implementations.Persistence private readonly ILogger _logger; - private TypeMapper _typeMapper = new TypeMapper(); + private readonly TypeMapper _typeMapper = new TypeMapper(); /// /// Gets the name of the repository @@ -307,27 +307,22 @@ namespace MediaBrowser.Server.Implementations.Persistence /// /// The item id. /// Task{IEnumerable{ItemReview}}. - public Task> GetCriticReviews(Guid itemId) + public IEnumerable GetCriticReviews(Guid itemId) { - return Task.Run>(() => + try { + var path = Path.Combine(_criticReviewsPath, itemId + ".json"); - try - { - var path = Path.Combine(_criticReviewsPath, itemId + ".json"); - - return _jsonSerializer.DeserializeFromFile>(path); - } - catch (DirectoryNotFoundException) - { - return new List(); - } - catch (FileNotFoundException) - { - return new List(); - } - - }); + return _jsonSerializer.DeserializeFromFile>(path); + } + catch (DirectoryNotFoundException) + { + return new List(); + } + catch (FileNotFoundException) + { + return new List(); + } } /// diff --git a/Nuget/MediaBrowser.Common.Internal.nuspec b/Nuget/MediaBrowser.Common.Internal.nuspec index 88ea3d2dee..94dc4e7f4c 100644 --- a/Nuget/MediaBrowser.Common.Internal.nuspec +++ b/Nuget/MediaBrowser.Common.Internal.nuspec @@ -2,7 +2,7 @@ MediaBrowser.Common.Internal - 3.0.199 + 3.0.200 MediaBrowser.Common.Internal Luke ebr,Luke,scottisafool @@ -12,7 +12,7 @@ Contains common components shared by Media Browser Theater and Media Browser Server. Not intended for plugin developer consumption. Copyright © Media Browser 2013 - + diff --git a/Nuget/MediaBrowser.Common.nuspec b/Nuget/MediaBrowser.Common.nuspec index 48fad7b3a4..5981b66004 100644 --- a/Nuget/MediaBrowser.Common.nuspec +++ b/Nuget/MediaBrowser.Common.nuspec @@ -2,7 +2,7 @@ MediaBrowser.Common - 3.0.199 + 3.0.200 MediaBrowser.Common Media Browser Team ebr,Luke,scottisafool diff --git a/Nuget/MediaBrowser.Server.Core.nuspec b/Nuget/MediaBrowser.Server.Core.nuspec index 7ab55bbe30..c6e579d1ae 100644 --- a/Nuget/MediaBrowser.Server.Core.nuspec +++ b/Nuget/MediaBrowser.Server.Core.nuspec @@ -2,7 +2,7 @@ MediaBrowser.Server.Core - 3.0.199 + 3.0.200 Media Browser.Server.Core Media Browser Team ebr,Luke,scottisafool @@ -12,7 +12,7 @@ Contains core components required to build plugins for Media Browser Server. Copyright © Media Browser 2013 - +