From fa884f3fead68522b45276661528ba39d42dcad1 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Tue, 2 Apr 2013 22:59:27 -0400
Subject: #62 - File locking problem in cache

---
 MediaBrowser.Controller/Library/DtoBuilder.cs | 56 +++++++++++++--------------
 1 file changed, 28 insertions(+), 28 deletions(-)

(limited to 'MediaBrowser.Controller/Library')

diff --git a/MediaBrowser.Controller/Library/DtoBuilder.cs b/MediaBrowser.Controller/Library/DtoBuilder.cs
index d9244c64c2..e87282c1fb 100644
--- a/MediaBrowser.Controller/Library/DtoBuilder.cs
+++ b/MediaBrowser.Controller/Library/DtoBuilder.cs
@@ -59,11 +59,21 @@ namespace MediaBrowser.Controller.Library
 
             var tasks = new List<Task>();
 
+            if (fields.Contains(ItemFields.Studios))
+            {
+                dto.Studios = item.Studios;
+            }
+
+            if (fields.Contains(ItemFields.People))
+            {
+                tasks.Add(AttachPeople(dto, item));
+            }
+
             if (fields.Contains(ItemFields.PrimaryImageAspectRatio))
             {
                 try
                 {
-                    tasks.Add(AttachPrimaryImageAspectRatio(dto, item));
+                    AttachPrimaryImageAspectRatio(dto, item);
                 }
                 catch (Exception ex)
                 {
@@ -72,16 +82,6 @@ namespace MediaBrowser.Controller.Library
                 }
             }
 
-            if (fields.Contains(ItemFields.Studios))
-            {
-                dto.Studios = item.Studios;
-            }
-
-            if (fields.Contains(ItemFields.People))
-            {
-                tasks.Add(AttachPeople(dto, item));
-            }
-
             AttachBasicFields(dto, item, fields);
 
             // Make sure all the tasks we kicked off have completed.
@@ -120,19 +120,6 @@ namespace MediaBrowser.Controller.Library
 
             var tasks = new List<Task>();
 
-            if (fields.Contains(ItemFields.PrimaryImageAspectRatio))
-            {
-                try
-                {
-                    tasks.Add(AttachPrimaryImageAspectRatio(dto, item));
-                }
-                catch (Exception ex)
-                {
-                    // Have to use a catch-all unfortunately because some .net image methods throw plain Exceptions
-                    _logger.ErrorException("Error generating PrimaryImageAspectRatio for {0}", ex, item.Name);
-                }
-            }
-
             if (fields.Contains(ItemFields.Studios))
             {
                 dto.Studios = item.Studios;
@@ -145,6 +132,19 @@ namespace MediaBrowser.Controller.Library
 
             tasks.Add(AttachUserSpecificInfo(dto, item, user, fields));
 
+            if (fields.Contains(ItemFields.PrimaryImageAspectRatio))
+            {
+                try
+                {
+                    AttachPrimaryImageAspectRatio(dto, item);
+                }
+                catch (Exception ex)
+                {
+                    // Have to use a catch-all unfortunately because some .net image methods throw plain Exceptions
+                    _logger.ErrorException("Error generating PrimaryImageAspectRatio for {0}", ex, item.Name);
+                }
+            }
+
             AttachBasicFields(dto, item, fields);
 
             // Make sure all the tasks we kicked off have completed.
@@ -199,7 +199,7 @@ namespace MediaBrowser.Controller.Library
         /// <param name="dto">The dto.</param>
         /// <param name="item">The item.</param>
         /// <returns>Task.</returns>
-        private async Task AttachPrimaryImageAspectRatio(IItemDto dto, BaseItem item)
+        private void AttachPrimaryImageAspectRatio(IItemDto dto, BaseItem item)
         {
             var path = item.PrimaryImagePath;
 
@@ -217,7 +217,7 @@ namespace MediaBrowser.Controller.Library
 
             try
             {
-                size = await Kernel.Instance.ImageManager.GetImageSize(path, dateModified).ConfigureAwait(false);
+                size = Kernel.Instance.ImageManager.GetImageSize(path, dateModified);
             }
             catch (FileNotFoundException)
             {
@@ -771,7 +771,7 @@ namespace MediaBrowser.Controller.Library
         /// <param name="user">The user.</param>
         /// <returns>DtoUser.</returns>
         /// <exception cref="System.ArgumentNullException">user</exception>
-        public async Task<UserDto> GetUserDto(User user)
+        public UserDto GetUserDto(User user)
         {
             if (user == null)
             {
@@ -796,7 +796,7 @@ namespace MediaBrowser.Controller.Library
 
                 try
                 {
-                    await AttachPrimaryImageAspectRatio(dto, user).ConfigureAwait(false);
+                    AttachPrimaryImageAspectRatio(dto, user);
                 }
                 catch (Exception ex)
                 {
-- 
cgit v1.2.3