From 7d411c3c911c087848ca0ac5e7586b8fbe6ea129 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Tue, 11 Jun 2013 23:00:23 -0400 Subject: removed null checks that are no longer needed --- .../ScheduledTasks/ImageCleanupTask.cs | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) (limited to 'MediaBrowser.Server.Implementations') diff --git a/MediaBrowser.Server.Implementations/ScheduledTasks/ImageCleanupTask.cs b/MediaBrowser.Server.Implementations/ScheduledTasks/ImageCleanupTask.cs index 0e78824c1..058789665 100644 --- a/MediaBrowser.Server.Implementations/ScheduledTasks/ImageCleanupTask.cs +++ b/MediaBrowser.Server.Implementations/ScheduledTasks/ImageCleanupTask.cs @@ -125,22 +125,11 @@ namespace MediaBrowser.Server.Implementations.ScheduledTasks /// IEnumerable{System.String}. private IEnumerable GetPathsInUse(BaseItem item) { - IEnumerable images = new List(); + IEnumerable 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; -- cgit v1.2.3