From 7d411c3c911c087848ca0ac5e7586b8fbe6ea129 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Tue, 11 Jun 2013 23:00:23 -0400
Subject: [PATCH] removed null checks that are no longer needed

---
 MediaBrowser.Controller/Dto/DtoBuilder.cs     | 13 +++++-------
 .../ImageFromMediaLocationProvider.cs         |  5 -----
 .../ScheduledTasks/ImageCleanupTask.cs        | 21 +++++--------------
 3 files changed, 10 insertions(+), 29 deletions(-)

diff --git a/MediaBrowser.Controller/Dto/DtoBuilder.cs b/MediaBrowser.Controller/Dto/DtoBuilder.cs
index 981c2e5b44..2543d70374 100644
--- a/MediaBrowser.Controller/Dto/DtoBuilder.cs
+++ b/MediaBrowser.Controller/Dto/DtoBuilder.cs
@@ -280,16 +280,13 @@ namespace MediaBrowser.Controller.Dto
                 dto.Genres = item.Genres;
             }
 
-            if (item.Images != null)
+            dto.ImageTags = new Dictionary<ImageType, Guid>();
+
+            foreach (var image in item.Images)
             {
-                dto.ImageTags = new Dictionary<ImageType, Guid>();
+                var type = image.Key;
 
-                foreach (var image in item.Images)
-                {
-                    var type = image.Key;
-
-                    dto.ImageTags[type] = Kernel.Instance.ImageManager.GetImageCacheTag(item, type, image.Value);
-                }
+                dto.ImageTags[type] = Kernel.Instance.ImageManager.GetImageCacheTag(item, type, image.Value);
             }
 
             dto.Id = GetClientItemId(item);
diff --git a/MediaBrowser.Providers/ImageFromMediaLocationProvider.cs b/MediaBrowser.Providers/ImageFromMediaLocationProvider.cs
index 49dd1bddd8..160c171e35 100644
--- a/MediaBrowser.Providers/ImageFromMediaLocationProvider.cs
+++ b/MediaBrowser.Providers/ImageFromMediaLocationProvider.cs
@@ -86,11 +86,6 @@ namespace MediaBrowser.Providers
         /// <param name="item">The item.</param>
         private void ValidateImages(BaseItem item)
         {
-            if (item.Images == null)
-            {
-                return;
-            }
-
             // Only validate paths from the same directory - need to copy to a list because we are going to potentially modify the collection below
             var deletedKeys = item.Images.ToList().Where(image =>
             {
diff --git a/MediaBrowser.Server.Implementations/ScheduledTasks/ImageCleanupTask.cs b/MediaBrowser.Server.Implementations/ScheduledTasks/ImageCleanupTask.cs
index 0e78824c1e..058789665d 100644
--- a/MediaBrowser.Server.Implementations/ScheduledTasks/ImageCleanupTask.cs
+++ b/MediaBrowser.Server.Implementations/ScheduledTasks/ImageCleanupTask.cs
@@ -125,22 +125,11 @@ namespace MediaBrowser.Server.Implementations.ScheduledTasks
         /// <returns>IEnumerable{System.String}.</returns>
         private IEnumerable<string> GetPathsInUse(BaseItem item)
         {
-            IEnumerable<string> images = new List<string>();
+            IEnumerable<string> images = item.Images.Values.ToList();
 
-            if (item.Images != null)
-            {
-                images = images.Concat(item.Images.Values);
-            }
+            images = images.Concat(item.BackdropImagePaths);
 
-            if (item.BackdropImagePaths != null)
-            {
-                images = images.Concat(item.BackdropImagePaths);
-            }
-
-            if (item.ScreenshotImagePaths != null)
-            {
-                images = images.Concat(item.ScreenshotImagePaths);
-            }
+            images = images.Concat(item.ScreenshotImagePaths);
 
             var localTrailers = _itemRepo.GetItems(item.LocalTrailerIds).ToList();
             images = localTrailers.Aggregate(images, (current, subItem) => current.Concat(GetPathsInUse(subItem)));
@@ -162,8 +151,8 @@ namespace MediaBrowser.Server.Implementations.ScheduledTasks
 
             if (movie != null)
             {
-                var specialFeattures = _itemRepo.GetItems(movie.SpecialFeatureIds).ToList();
-                images = specialFeattures.Aggregate(images, (current, subItem) => current.Concat(GetPathsInUse(subItem)));
+                var specialFeatures = _itemRepo.GetItems(movie.SpecialFeatureIds).ToList();
+                images = specialFeatures.Aggregate(images, (current, subItem) => current.Concat(GetPathsInUse(subItem)));
             }
 
             return images;