michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

removed null checks that are no longer needed

Browse Source
This commit is contained in:
Luke Pulverenti 2013-06-11 23:00:23 -04:00
parent b96ef2ffae
commit 7d411c3c91
3 changed files with 10 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
MediaBrowser.Controller/Dto/DtoBuilder.cs
View File

@ -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);

5
MediaBrowser.Providers/ImageFromMediaLocationProvider.cs
View File

@ -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 =>
{

21
MediaBrowser.Server.Implementations/ScheduledTasks/ImageCleanupTask.cs
View File

@ -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;