From 8b85a7bab10cdd69d48c666ea0555d029efc646e Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sat, 31 Aug 2013 15:48:11 -0400 Subject: updated nuget --- .../Library/LuceneSearchEngine.cs | 4 +-- .../Resolvers/Audio/MusicAlbumDiscResolver.cs | 37 ---------------------- 2 files changed, 2 insertions(+), 39 deletions(-) delete mode 100644 MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicAlbumDiscResolver.cs (limited to 'MediaBrowser.Server.Implementations/Library') diff --git a/MediaBrowser.Server.Implementations/Library/LuceneSearchEngine.cs b/MediaBrowser.Server.Implementations/Library/LuceneSearchEngine.cs index f47d6c448..0fd39a25d 100644 --- a/MediaBrowser.Server.Implementations/Library/LuceneSearchEngine.cs +++ b/MediaBrowser.Server.Implementations/Library/LuceneSearchEngine.cs @@ -145,7 +145,7 @@ namespace MediaBrowser.Server.Implementations.Library } // Find genres, from non-audio items - var genres = items.Where(i => !(i is Audio) && !(i is MusicAlbum) && !(i is MusicAlbumDisc) && !(i is MusicArtist) && !(i is MusicVideo) && !(i is Game)) + var genres = items.Where(i => !(i is Audio) && !(i is MusicAlbum) && !(i is MusicArtist) && !(i is MusicVideo) && !(i is Game)) .SelectMany(i => i.Genres) .Where(i => !string.IsNullOrEmpty(i)) .Distinct(StringComparer.OrdinalIgnoreCase) @@ -171,7 +171,7 @@ namespace MediaBrowser.Server.Implementations.Library } // Find music genres - var musicGenres = items.Where(i => (i is Audio) || (i is MusicAlbum) || (i is MusicAlbumDisc) || (i is MusicArtist) || (i is MusicVideo)) + var musicGenres = items.Where(i => (i is Audio) || (i is MusicAlbum) || (i is MusicArtist) || (i is MusicVideo)) .SelectMany(i => i.Genres) .Where(i => !string.IsNullOrEmpty(i)) .Distinct(StringComparer.OrdinalIgnoreCase) diff --git a/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicAlbumDiscResolver.cs b/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicAlbumDiscResolver.cs deleted file mode 100644 index 04b749ec0..000000000 --- a/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicAlbumDiscResolver.cs +++ /dev/null @@ -1,37 +0,0 @@ -using MediaBrowser.Controller.Entities.Audio; -using MediaBrowser.Controller.Library; -using MediaBrowser.Controller.Resolvers; - -namespace MediaBrowser.Server.Implementations.Library.Resolvers.Audio -{ - /// - /// Class MusicAlbumDiscResolver - /// - public class MusicAlbumDiscResolver : ItemResolver - { - /// - /// Gets the priority. - /// - /// The priority. - public override ResolverPriority Priority - { - get { return ResolverPriority.Second; } // we need to be ahead of the generic folder resolver but behind the movie one - } - - /// - /// Resolves the specified args. - /// - /// The args. - /// MusicAlbum. - protected override MusicAlbumDisc Resolve(ItemResolveArgs args) - { - if (!args.IsDirectory) return null; - - return args.Parent is MusicAlbum ? new MusicAlbumDisc - { - DisplayMediaType = "Disc" - - } : null; - } - } -} -- cgit v1.2.3