aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Server.Implementations/Library/Resolvers/Audio
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2015-01-09 20:38:01 -0500
committerLuke Pulverenti <luke.pulverenti@gmail.com>2015-01-09 20:38:01 -0500
commit0024aa44ee1f316dc2c9d7d41d9306dd168159ea (patch)
tree9f6c9a2499f6f588dbec4e87e946d175348525c1 /MediaBrowser.Server.Implementations/Library/Resolvers/Audio
parent064c9a02f7a12291d6c60962943a1a3be5c622e6 (diff)
update series resolving
Diffstat (limited to 'MediaBrowser.Server.Implementations/Library/Resolvers/Audio')
-rw-r--r--MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs23
1 files changed, 16 insertions, 7 deletions
diff --git a/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs b/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs
index a1c762283..d1a6cbbf8 100644
--- a/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs
+++ b/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs
@@ -129,17 +129,26 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Audio
{
var path = fileSystemInfo.FullName;
var isMultiDisc = IsMultiDiscFolder(path);
- var hasMusic = ContainsMusic(directoryService.GetFileSystemEntries(path), false, directoryService, logger, fileSystem, libraryManager);
- if (isMultiDisc && hasMusic)
+ if (isMultiDisc)
{
- logger.Debug("Found multi-disc folder: " + path);
- discSubfolderCount++;
+ var hasMusic = ContainsMusic(directoryService.GetFileSystemEntries(path), false, directoryService, logger, fileSystem, libraryManager);
+
+ if (hasMusic)
+ {
+ logger.Debug("Found multi-disc folder: " + path);
+ discSubfolderCount++;
+ }
}
- else if (hasMusic)
+ else
{
- // If there are folders underneath with music that are not multidisc, then this can't be a multi-disc album
- notMultiDisc = true;
+ var hasMusic = ContainsMusic(directoryService.GetFileSystemEntries(path), false, directoryService, logger, fileSystem, libraryManager);
+
+ if (hasMusic)
+ {
+ // If there are folders underneath with music that are not multidisc, then this can't be a multi-disc album
+ notMultiDisc = true;
+ }
}
}
}