aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Server.Implementations/Library
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2014-08-26 23:25:39 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2014-08-26 23:25:39 -0400
commit809e4629c09821e7373bff79e0d0be86df11ce2c (patch)
treeed735029b8cecc448df9e553b0d40e9c84d4c2de /MediaBrowser.Server.Implementations/Library
parent6780e146a0bbea7065f478f957642a8ce50a6643 (diff)
update translations
Diffstat (limited to 'MediaBrowser.Server.Implementations/Library')
-rw-r--r--MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs15
1 files changed, 7 insertions, 8 deletions
diff --git a/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs b/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs
index 7f533d416..1f9dc56f9 100644
--- a/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs
+++ b/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs
@@ -114,11 +114,11 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Audio
/// <param name="logger">The logger.</param>
/// <param name="fileSystem">The file system.</param>
/// <returns><c>true</c> if the specified list contains music; otherwise, <c>false</c>.</returns>
- private static bool ContainsMusic(IEnumerable<FileSystemInfo> list,
+ private static bool ContainsMusic(IEnumerable<FileSystemInfo> list,
bool isMusicMediaFolder,
- bool allowSubfolders,
- IDirectoryService directoryService,
- ILogger logger,
+ bool allowSubfolders,
+ IDirectoryService directoryService,
+ ILogger logger,
IFileSystem fileSystem)
{
// If list contains at least 2 audio files or at least one and no video files consider it to contain music
@@ -154,7 +154,7 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Audio
}
else if (EntityResolutionHelper.IsVideoFile(fullName)) return false;
else if (EntityResolutionHelper.IsVideoPlaceHolder(fullName)) return false;
-
+
if (foundAudio >= 2)
{
return true;
@@ -179,10 +179,9 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Audio
return false;
}
- private static bool IsMultiDiscFolder(string path)
+ public static bool IsMultiDiscFolder(string path)
{
- return false;
- //return EntityResolutionHelper.IsMultiPartFolder(path);
+ return EntityResolutionHelper.IsMultiDiscAlbumFolder(path);
}
private static bool IsAdditionalSubfolderAllowed(FileSystemInfo directory)