aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Controller/Entities/Audio
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2015-01-26 17:47:16 -0500
committerLuke Pulverenti <luke.pulverenti@gmail.com>2015-01-26 17:47:16 -0500
commitf5919990c9ef80bff28ec8a590acb2f72a806678 (patch)
treed11e30ee6534ffd7ac829c1a14d61f8853991471 /MediaBrowser.Controller/Entities/Audio
parent63f3cf97dada179fc6e9e3a177504d3e7b36321c (diff)
fix failing scan
Diffstat (limited to 'MediaBrowser.Controller/Entities/Audio')
-rw-r--r--MediaBrowser.Controller/Entities/Audio/MusicArtist.cs18
-rw-r--r--MediaBrowser.Controller/Entities/Audio/MusicGenre.cs9
2 files changed, 14 insertions, 13 deletions
diff --git a/MediaBrowser.Controller/Entities/Audio/MusicArtist.cs b/MediaBrowser.Controller/Entities/Audio/MusicArtist.cs
index 4cc3f18927..038aa98aae 100644
--- a/MediaBrowser.Controller/Entities/Audio/MusicArtist.cs
+++ b/MediaBrowser.Controller/Entities/Audio/MusicArtist.cs
@@ -20,6 +20,7 @@ namespace MediaBrowser.Controller.Entities.Audio
public bool IsAccessedByName { get; set; }
public List<string> ProductionLocations { get; set; }
+ [IgnoreDataMember]
public override bool IsFolder
{
get
@@ -78,6 +79,7 @@ namespace MediaBrowser.Controller.Entities.Audio
/// If the item is a folder, it returns the folder itself
/// </summary>
/// <value>The containing folder path.</value>
+ [IgnoreDataMember]
public override string ContainingFolderPath
{
get
@@ -90,6 +92,7 @@ namespace MediaBrowser.Controller.Entities.Audio
/// Gets a value indicating whether this instance is owned item.
/// </summary>
/// <value><c>true</c> if this instance is owned item; otherwise, <c>false</c>.</value>
+ [IgnoreDataMember]
public override bool IsOwnedItem
{
get
@@ -177,19 +180,16 @@ namespace MediaBrowser.Controller.Entities.Audio
public IEnumerable<BaseItem> GetTaggedItems(IEnumerable<BaseItem> inputItems)
{
- return inputItems.Where(ItemFilter);
+ return inputItems.Where(GetItemFilter());
}
- public Func<BaseItem, bool> ItemFilter
+ public Func<BaseItem, bool> GetItemFilter()
{
- get
+ return i =>
{
- return i =>
- {
- var hasArtist = i as IHasArtist;
- return hasArtist != null && hasArtist.HasArtist(Name);
- };
- }
+ var hasArtist = i as IHasArtist;
+ return hasArtist != null && hasArtist.HasArtist(Name);
+ };
}
}
}
diff --git a/MediaBrowser.Controller/Entities/Audio/MusicGenre.cs b/MediaBrowser.Controller/Entities/Audio/MusicGenre.cs
index b2c2a1b484..9689d7cce2 100644
--- a/MediaBrowser.Controller/Entities/Audio/MusicGenre.cs
+++ b/MediaBrowser.Controller/Entities/Audio/MusicGenre.cs
@@ -30,6 +30,7 @@ namespace MediaBrowser.Controller.Entities.Audio
/// If the item is a folder, it returns the folder itself
/// </summary>
/// <value>The containing folder path.</value>
+ [IgnoreDataMember]
public override string ContainingFolderPath
{
get
@@ -42,6 +43,7 @@ namespace MediaBrowser.Controller.Entities.Audio
/// Gets a value indicating whether this instance is owned item.
/// </summary>
/// <value><c>true</c> if this instance is owned item; otherwise, <c>false</c>.</value>
+ [IgnoreDataMember]
public override bool IsOwnedItem
{
get
@@ -52,13 +54,12 @@ namespace MediaBrowser.Controller.Entities.Audio
public IEnumerable<BaseItem> GetTaggedItems(IEnumerable<BaseItem> inputItems)
{
- return inputItems.Where(ItemFilter);
+ return inputItems.Where(GetItemFilter());
}
-
- public Func<BaseItem, bool> ItemFilter
+ public Func<BaseItem, bool> GetItemFilter()
{
- get { return i => (i is IHasMusicGenres) && i.Genres.Contains(Name, StringComparer.OrdinalIgnoreCase); }
+ return i => (i is IHasMusicGenres) && i.Genres.Contains(Name, StringComparer.OrdinalIgnoreCase);
}
}
}