From 85d7eb917f1cd7530e28fb0565564c79ddb910ed Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Mon, 16 Sep 2013 22:44:06 -0400 Subject: made dtoservice synchronous --- MediaBrowser.Server.Implementations/Dto/DtoService.cs | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'MediaBrowser.Server.Implementations/Dto') diff --git a/MediaBrowser.Server.Implementations/Dto/DtoService.cs b/MediaBrowser.Server.Implementations/Dto/DtoService.cs index eda6d9c130..feadc488f1 100644 --- a/MediaBrowser.Server.Implementations/Dto/DtoService.cs +++ b/MediaBrowser.Server.Implementations/Dto/DtoService.cs @@ -19,7 +19,6 @@ using System; using System.Collections.Generic; using System.IO; using System.Linq; -using System.Threading.Tasks; namespace MediaBrowser.Server.Implementations.Dto { @@ -49,7 +48,7 @@ namespace MediaBrowser.Server.Implementations.Dto /// The owner. /// Task{DtoBaseItem}. /// item - public async Task GetBaseItemDto(BaseItem item, List fields, User user = null, BaseItem owner = null) + public BaseItemDto GetBaseItemDto(BaseItem item, List fields, User user = null, BaseItem owner = null) { if (item == null) { @@ -72,7 +71,7 @@ namespace MediaBrowser.Server.Implementations.Dto { try { - await AttachPrimaryImageAspectRatio(dto, item).ConfigureAwait(false); + AttachPrimaryImageAspectRatio(dto, item); } catch (Exception ex) { @@ -189,7 +188,7 @@ namespace MediaBrowser.Server.Implementations.Dto } } - public async Task GetUserDto(User user) + public UserDto GetUserDto(User user) { if (user == null) { @@ -214,7 +213,7 @@ namespace MediaBrowser.Server.Implementations.Dto try { - await AttachPrimaryImageAspectRatio(dto, user).ConfigureAwait(false); + AttachPrimaryImageAspectRatio(dto, user); } catch (Exception ex) { @@ -1132,9 +1131,8 @@ namespace MediaBrowser.Server.Implementations.Dto /// /// The dto. /// The item. - /// The _logger. /// Task. - private async Task AttachPrimaryImageAspectRatio(IItemDto dto, BaseItem item) + private void AttachPrimaryImageAspectRatio(IItemDto dto, BaseItem item) { var path = item.PrimaryImagePath; @@ -1152,7 +1150,7 @@ namespace MediaBrowser.Server.Implementations.Dto try { - size = await Kernel.Instance.ImageManager.GetImageSize(path, dateModified).ConfigureAwait(false); + size = Kernel.Instance.ImageManager.GetImageSize(path, dateModified); } catch (FileNotFoundException) { -- cgit v1.2.3