aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Server.Implementations/ScheduledTasks/ImageCleanupTask.cs
diff options
context:
space:
mode:
Diffstat (limited to 'MediaBrowser.Server.Implementations/ScheduledTasks/ImageCleanupTask.cs')
-rw-r--r--MediaBrowser.Server.Implementations/ScheduledTasks/ImageCleanupTask.cs31
1 files changed, 13 insertions, 18 deletions
diff --git a/MediaBrowser.Server.Implementations/ScheduledTasks/ImageCleanupTask.cs b/MediaBrowser.Server.Implementations/ScheduledTasks/ImageCleanupTask.cs
index 0e78824c1..fe4a34823 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);
- }
-
- if (item.BackdropImagePaths != null)
- {
- images = images.Concat(item.BackdropImagePaths);
- }
+ 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)));
@@ -153,17 +142,23 @@ namespace MediaBrowser.Server.Implementations.ScheduledTasks
var video = item as Video;
- if (video != null && video.Chapters != null)
+ if (video != null)
{
- images = images.Concat(video.Chapters.Where(i => !string.IsNullOrEmpty(i.ImagePath)).Select(i => i.ImagePath));
+ if (video.Chapters != null)
+ {
+ images = images.Concat(video.Chapters.Where(i => !string.IsNullOrEmpty(i.ImagePath)).Select(i => i.ImagePath));
+ }
+
+ var additionalParts = _itemRepo.GetItems(video.AdditionalPartIds).ToList();
+ images = additionalParts.Aggregate(images, (current, subItem) => current.Concat(GetPathsInUse(subItem)));
}
var movie = item as Movie;
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;