From b07193e1bc76555e6c7eaa1111115694d4988c86 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Tue, 12 Nov 2013 10:36:25 -0500
Subject: [PATCH] added image processor error handling

---
 MediaBrowser.Api/LiveTv/LiveTvService.cs               |  4 ++--
 .../Drawing/ImageProcessor.cs                          | 10 +++++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/MediaBrowser.Api/LiveTv/LiveTvService.cs b/MediaBrowser.Api/LiveTv/LiveTvService.cs
index 0af7df2228..6c3fcbac15 100644
--- a/MediaBrowser.Api/LiveTv/LiveTvService.cs
+++ b/MediaBrowser.Api/LiveTv/LiveTvService.cs
@@ -85,7 +85,7 @@ namespace MediaBrowser.Api.LiveTv
         {
             var result = GetChannelsAsync(request).Result;
 
-            return ToOptimizedResult(result);
+            return ToOptimizedResult(result.ToList());
         }
 
         private async Task<IEnumerable<ChannelInfoDto>> GetChannelsAsync(GetChannels request)
@@ -105,7 +105,7 @@ namespace MediaBrowser.Api.LiveTv
         {
             var result = GetRecordingsAsync(request).Result;
 
-            return ToOptimizedResult(result);
+            return ToOptimizedResult(result.ToList());
         }
 
         private async Task<IEnumerable<RecordingInfo>> GetRecordingsAsync(GetRecordings request)
diff --git a/MediaBrowser.Server.Implementations/Drawing/ImageProcessor.cs b/MediaBrowser.Server.Implementations/Drawing/ImageProcessor.cs
index fd980abc87..bcbbe3b9e1 100644
--- a/MediaBrowser.Server.Implementations/Drawing/ImageProcessor.cs
+++ b/MediaBrowser.Server.Implementations/Drawing/ImageProcessor.cs
@@ -53,7 +53,6 @@ namespace MediaBrowser.Server.Implementations.Drawing
         private readonly IJsonSerializer _jsonSerializer;
         private readonly IServerApplicationPaths _appPaths;
 
-        private readonly string _imageSizeCachePath;
         private readonly string _croppedWhitespaceImageCachePath;
         private readonly string _enhancedImageCachePath;
         private readonly string _resizedImageCachePath;
@@ -65,7 +64,6 @@ namespace MediaBrowser.Server.Implementations.Drawing
             _jsonSerializer = jsonSerializer;
             _appPaths = appPaths;
 
-            _imageSizeCachePath = Path.Combine(appPaths.ImageCachePath, "image-sizes");
             _croppedWhitespaceImageCachePath = Path.Combine(appPaths.ImageCachePath, "cropped-images");
             _enhancedImageCachePath = Path.Combine(appPaths.ImageCachePath, "enhanced-images");
             _resizedImageCachePath = Path.Combine(appPaths.ImageCachePath, "resized-images");
@@ -78,11 +76,17 @@ namespace MediaBrowser.Server.Implementations.Drawing
             {
                 sizeDictionary = jsonSerializer.DeserializeFromFile<Dictionary<Guid, ImageSize>>(ImageSizeFile);
             }
-            catch (IOException)
+            catch (FileNotFoundException)
             {
                 // No biggie
                 sizeDictionary = new Dictionary<Guid, ImageSize>();
             }
+            catch (Exception ex)
+            {
+                logger.ErrorException("Error parsing image size cache file", ex);
+
+                sizeDictionary = new Dictionary<Guid, ImageSize>();
+            }
 
             _cachedImagedSizes = new ConcurrentDictionary<Guid, ImageSize>(sizeDictionary);
         }