lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use mbz id for last fm searches when we have it

Browse Source
This commit is contained in:
Luke Pulverenti 2013-09-04 09:19:03 -04:00
parent 8204d8938a
commit 981973a028
2 changed files with 4 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,4 @@
using MediaBrowser.Model.Entities; using System.Linq;
using System.Collections.Generic;
using System.Linq;
using System.Runtime.Serialization; using System.Runtime.Serialization;
namespace MediaBrowser.Controller.Entities.Audio namespace MediaBrowser.Controller.Entities.Audio
@ -53,35 +51,6 @@ namespace MediaBrowser.Controller.Entities.Audio
get { return Parent as MusicArtist ?? UnknwonArtist; } get { return Parent as MusicArtist ?? UnknwonArtist; }
} }
/// <summary>
/// Gets or sets the images.
/// </summary>
/// <value>The images.</value>
public override Dictionary<ImageType, string> Images
{
get
{
var images = base.Images;
string primaryImagePath;
if (!images.TryGetValue(ImageType.Primary, out primaryImagePath))
{
var image = Children.Select(c => c.PrimaryImagePath).FirstOrDefault(c => !string.IsNullOrEmpty(c));
if (!string.IsNullOrEmpty(image))
{
images[ImageType.Primary] = image;
}
}
return images;
}
set
{
base.Images = value;
}
}
/// <summary> /// <summary>
/// Determines whether the specified artist has artist. /// Determines whether the specified artist has artist.
/// </summary> /// </summary>

6
MediaBrowser.Controller/Entities/BaseItem.cs
View File

@ -27,7 +27,7 @@ namespace MediaBrowser.Controller.Entities
/// MusicAlbums in the library that are the soundtrack for this item /// MusicAlbums in the library that are the soundtrack for this item
/// </summary> /// </summary>
public List<Guid> SoundtrackIds { get; set; } public List<Guid> SoundtrackIds { get; set; }
protected BaseItem() protected BaseItem()
{ {
Genres = new List<string>(); Genres = new List<string>();
@ -63,7 +63,7 @@ namespace MediaBrowser.Controller.Entities
public const string XbmcTrailerFileSuffix = "-trailer"; public const string XbmcTrailerFileSuffix = "-trailer";
public bool IsInMixedFolder { get; set; } public bool IsInMixedFolder { get; set; }
private string _name; private string _name;
/// <summary> /// <summary>
/// Gets or sets the name. /// Gets or sets the name.
@ -151,7 +151,7 @@ namespace MediaBrowser.Controller.Entities
/// Gets or sets the images. /// Gets or sets the images.
/// </summary> /// </summary>
/// <value>The images.</value> /// <value>The images.</value>
public virtual Dictionary<ImageType, string> Images { get; set; } public Dictionary<ImageType, string> Images { get; set; }
/// <summary> /// <summary>
/// Gets or sets the date created. /// Gets or sets the date created.