diff options
Diffstat (limited to 'MediaBrowser.Server.Implementations/Library')
4 files changed, 27 insertions, 4 deletions
diff --git a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs index bc122ff6d..faf6d287c 100644 --- a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs +++ b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs @@ -569,7 +569,19 @@ namespace MediaBrowser.Server.Implementations.Library // Add in the plug-in folders foreach (var child in PluginFolderCreators) { - rootFolder.AddVirtualChild(child.GetFolder()); + var folder = child.GetFolder(); + + if (string.IsNullOrEmpty(folder.DisplayMediaType)) + { + folder.DisplayMediaType = "CollectionFolder"; + } + + if (folder.Id == Guid.Empty) + { + folder.Id = (folder.Path ?? folder.Name ?? folder.GetType().Name).GetMBId(folder.GetType()); + } + + rootFolder.AddVirtualChild(folder); } return rootFolder; diff --git a/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/AudioResolver.cs b/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/AudioResolver.cs index 3c6cc654f..485784397 100644 --- a/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/AudioResolver.cs +++ b/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/AudioResolver.cs @@ -30,7 +30,10 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Audio { if (EntityResolutionHelper.IsAudioFile(args.Path)) { - return new Controller.Entities.Audio.Audio(); + return new Controller.Entities.Audio.Audio + { + DisplayMediaType = "Song" + }; } } diff --git a/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicAlbumDiscResolver.cs b/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicAlbumDiscResolver.cs index 393002a6e..04b749ec0 100644 --- a/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicAlbumDiscResolver.cs +++ b/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicAlbumDiscResolver.cs @@ -27,7 +27,11 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Audio { if (!args.IsDirectory) return null; - return args.Parent is MusicAlbum ? new MusicAlbumDisc() : null; + return args.Parent is MusicAlbum ? new MusicAlbumDisc + { + DisplayMediaType = "Disc" + + } : null; } } } diff --git a/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs b/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs index 98e99baa2..4ee62b206 100644 --- a/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs +++ b/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs @@ -35,7 +35,11 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Audio if (args.Parent.IsRoot) return null; if (args.Parent is MusicAlbum) return null; - return IsMusicAlbum(args) ? new MusicAlbum() : null; + return IsMusicAlbum(args) ? new MusicAlbum + { + DisplayMediaType = "Album" + + } : null; } |