aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicArtistResolver.cs
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2014-07-29 23:31:35 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2014-07-29 23:31:35 -0400
commit51e964dae394ae4a211482d562dbc28e79c00c3c (patch)
tree8cc6f351eeb9ceb2343cd818e84b26a94f072a62 /MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicArtistResolver.cs
parent063675bb07f78f99738a3ada061f3e2c16c9cda0 (diff)
support channels with dlna
Diffstat (limited to 'MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicArtistResolver.cs')
-rw-r--r--MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicArtistResolver.cs8
1 files changed, 5 insertions, 3 deletions
diff --git a/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicArtistResolver.cs b/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicArtistResolver.cs
index 19a284d15c..2417d5dcb8 100644
--- a/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicArtistResolver.cs
+++ b/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicArtistResolver.cs
@@ -62,9 +62,11 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Audio
var collectionType = args.GetCollectionType();
+ var isMusicMediaFolder = string.Equals(collectionType, CollectionType.Music,
+ StringComparison.OrdinalIgnoreCase);
+
// If there's a collection type and it's not music, it can't be a series
- if (!string.IsNullOrEmpty(collectionType) &&
- !string.Equals(collectionType, CollectionType.Music, StringComparison.OrdinalIgnoreCase))
+ if (!isMusicMediaFolder)
{
return null;
}
@@ -72,7 +74,7 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Audio
var directoryService = args.DirectoryService;
// If we contain an album assume we are an artist folder
- return args.FileSystemChildren.Where(i => (i.Attributes & FileAttributes.Directory) == FileAttributes.Directory).Any(i => MusicAlbumResolver.IsMusicAlbum(i.FullName, directoryService, _logger, _fileSystem)) ? new MusicArtist() : null;
+ return args.FileSystemChildren.Where(i => (i.Attributes & FileAttributes.Directory) == FileAttributes.Directory).Any(i => MusicAlbumResolver.IsMusicAlbum(i.FullName, isMusicMediaFolder, directoryService, _logger, _fileSystem)) ? new MusicArtist() : null;
}
}