aboutsummaryrefslogtreecommitdiff
path: root/Emby.Server.Implementations/Library/Resolvers
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2017-02-08 13:50:33 -0500
committerLuke Pulverenti <luke.pulverenti@gmail.com>2017-02-08 13:50:33 -0500
commit8deb423883cf8a6dcf3588a7707693f14ac6a166 (patch)
tree6a8cc463f33adb8ce67d161690f0a7fb412e14a5 /Emby.Server.Implementations/Library/Resolvers
parent64b56005280a7b19690ce480ef2daf240ffac032 (diff)
restore config settings for now
Diffstat (limited to 'Emby.Server.Implementations/Library/Resolvers')
-rw-r--r--Emby.Server.Implementations/Library/Resolvers/Audio/MusicArtistResolver.cs21
1 files changed, 10 insertions, 11 deletions
diff --git a/Emby.Server.Implementations/Library/Resolvers/Audio/MusicArtistResolver.cs b/Emby.Server.Implementations/Library/Resolvers/Audio/MusicArtistResolver.cs
index 6cf201990..2971405b9 100644
--- a/Emby.Server.Implementations/Library/Resolvers/Audio/MusicArtistResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/Audio/MusicArtistResolver.cs
@@ -74,21 +74,20 @@ namespace Emby.Server.Implementations.Library.Resolvers.Audio
return new MusicArtist();
}
- return null;
- //if (_config.Configuration.EnableSimpleArtistDetection)
- //{
- // return null;
- //}
+ if (_config.Configuration.EnableSimpleArtistDetection)
+ {
+ return null;
+ }
- //// Avoid mis-identifying top folders
- //if (args.Parent.IsRoot) return null;
+ // Avoid mis-identifying top folders
+ if (args.Parent.IsRoot) return null;
- //var directoryService = args.DirectoryService;
+ var directoryService = args.DirectoryService;
- //var albumResolver = new MusicAlbumResolver(_logger, _fileSystem, _libraryManager);
+ var albumResolver = new MusicAlbumResolver(_logger, _fileSystem, _libraryManager);
- //// If we contain an album assume we are an artist folder
- //return args.FileSystemChildren.Where(i => i.IsDirectory).Any(i => albumResolver.IsMusicAlbum(i.FullName, directoryService, args.GetLibraryOptions())) ? new MusicArtist() : null;
+ // If we contain an album assume we are an artist folder
+ return args.FileSystemChildren.Where(i => i.IsDirectory).Any(i => albumResolver.IsMusicAlbum(i.FullName, directoryService, args.GetLibraryOptions())) ? new MusicArtist() : null;
}
}