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

#105 - MusicAlbum items give no PrimaryImage in API when one exists

Browse Source
This commit is contained in:
Luke Pulverenti 2013-04-05 00:10:23 -04:00
parent cb6170712d
commit 3314a0f69a
1 changed files with 34 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs
View File

@ -1,6 +1,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Runtime.Serialization;
using MediaBrowser.Model.Entities;
namespace MediaBrowser.Controller.Entities.Audio
{
@ -52,30 +53,6 @@ namespace MediaBrowser.Controller.Entities.Audio
get { return Parent as MusicArtist ?? UnknwonArtist; }
}
/// <summary>
/// Override to point to first child (song) if not explicitly defined
/// </summary>
/// <value>The primary image path.</value>
[IgnoreDataMember]
public override string PrimaryImagePath
{
get
{
if (base.PrimaryImagePath == null)
{
var child = Children.FirstOrDefault();
return child == null ? base.PrimaryImagePath : child.PrimaryImagePath;
}
return base.PrimaryImagePath;
}
set
{
base.PrimaryImagePath = value;
}
}
/// <summary>
/// Override to point to first child (song)
/// </summary>
@ -130,6 +107,39 @@ namespace MediaBrowser.Controller.Entities.Audio
}
}
/// <summary>
/// Gets or sets the images.
/// </summary>
/// <value>The images.</value>
public override Dictionary<string, string> Images
{
get
{
var images = base.Images;
string primaryImagePath;
if (images == null || !images.TryGetValue(ImageType.Primary.ToString(), out primaryImagePath))
{
var image = Children.Select(c => c.PrimaryImagePath).FirstOrDefault(c => !string.IsNullOrEmpty(c));
if (!string.IsNullOrEmpty(image))
{
if (images == null)
{
images = new Dictionary<string, string>();
}
images[ImageType.Primary.ToString()] = image;
}
}
return images;
}
set
{
base.Images = value;
}
}
/// <summary>
/// Creates the name of the sort.
/// </summary>