add reel

4 files changed, 17 insertions, 27 deletions

diff --git a/MediaBrowser.Server.Implementations/Configuration/ServerConfigurationManager.cs b/MediaBrowser.Server.Implementations/Configuration/ServerConfigurationManager.cs
index 206ba5922..1370b2bf2 100644
--- a/MediaBrowser.Server.Implementations/Configuration/ServerConfigurationManager.cs
+++ b/MediaBrowser.Server.Implementations/Configuration/ServerConfigurationManager.cs
@@ -3,8 +3,6 @@ using MediaBrowser.Common.Events;
 using MediaBrowser.Common.Implementations.Configuration;
 using MediaBrowser.Controller;
 using MediaBrowser.Controller.Configuration;
-using MediaBrowser.Controller.Entities;
-using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Entities.Movies;
 using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Model.Configuration;
@@ -215,9 +213,7 @@ namespace MediaBrowser.Server.Implementations.Configuration
         {
             DisableMetadataService(typeof(Movie), Configuration, service);
             DisableMetadataService(typeof(Episode), Configuration, service);
-            DisableMetadataService(typeof(Season), Configuration, service);
             DisableMetadataService(typeof(Series), Configuration, service);
-            DisableMetadataService(typeof(Video), Configuration, service);
         }
 
         private void DisableMetadataService(Type type, ServerConfiguration config, string service)
diff --git a/MediaBrowser.Server.Implementations/Dto/DtoService.cs b/MediaBrowser.Server.Implementations/Dto/DtoService.cs
index 366a5558b..3393876fc 100644
--- a/MediaBrowser.Server.Implementations/Dto/DtoService.cs
+++ b/MediaBrowser.Server.Implementations/Dto/DtoService.cs
@@ -72,22 +72,9 @@ namespace MediaBrowser.Server.Implementations.Dto
 
             if (byName != null && !(item is LiveTvChannel))
             {
-                IEnumerable<BaseItem> libraryItems;
-
-                var artist = item as MusicArtist;
-
-                if (artist == null || artist.IsAccessedByName)
-                {
-                    libraryItems = user != null ?
-                       user.RootFolder.GetRecursiveChildren(user) :
-                       _libraryManager.RootFolder.RecursiveChildren;
-                }
-                else
-                {
-                    libraryItems = user != null ?
-                       artist.GetRecursiveChildren(user) :
-                       artist.RecursiveChildren;
-                }
+                var libraryItems = user != null ?
+                   user.RootFolder.GetRecursiveChildren(user) :
+                   _libraryManager.RootFolder.RecursiveChildren;
 
                 SetItemByNameInfo(item, dto, byName.GetTaggedItems(libraryItems).ToList(), user);
 
@@ -398,7 +385,7 @@ namespace MediaBrowser.Server.Implementations.Dto
             }
 
             dto.Album = item.Album;
-            dto.Artists = string.IsNullOrEmpty(item.Artist) ? new List<string>() : new List<string> { item.Artist };
+            dto.Artists = item.Artists;
         }
 
         private void SetGameProperties(BaseItemDto dto, Game item)
@@ -1232,6 +1219,12 @@ namespace MediaBrowser.Server.Implementations.Dto
                 dto.ChannelId = channelItem.ChannelId;
                 dto.ChannelName = _channelManagerFactory().GetChannel(channelItem.ChannelId).Name;
             }
+
+            var channelMediaItem = item as IChannelMediaItem;
+            if (channelMediaItem != null)
+            {
+                dto.ExtraType = channelMediaItem.ExtraType;
+            }
         }
 
         private void AttachLinkedChildImages(BaseItemDto dto, Folder folder, User user)
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/server.json b/MediaBrowser.Server.Implementations/Localization/Server/server.json
index 6c2d756e4..575b38c53 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/server.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/server.json
@@ -1247,5 +1247,10 @@
     "OptionWeekdays": "Weekdays",
     "OptionWeekends": "Weekends",
     "MessageProfileInfoSynced": "User profile information synced with Media Browser Connect.",
-    "HeaderOptionalLinkMediaBrowserAccount": "Optional: Link your Media Browser account"
+    "HeaderOptionalLinkMediaBrowserAccount": "Optional: Link your Media Browser account",
+    "ButtonTrailerReel": "Trailer reel",
+    "HeaderTrailerReel": "Trailer Reel",
+    "OptionPlayUnwatchedTrailersOnly": "Play only unwatched trailers",
+    "HeaderTrailerReelHelp": "Start a trailer reel to play a long running playlist of trailers.",
+    "MessageNoTrailersFound": "No trailers found. Install the Trailer channel plugin to import a library of internet trailers."
 }
diff --git a/MediaBrowser.Server.Implementations/Session/SessionManager.cs b/MediaBrowser.Server.Implementations/Session/SessionManager.cs
index cf204a5ba..a0cd60067 100644
--- a/MediaBrowser.Server.Implementations/Session/SessionManager.cs
+++ b/MediaBrowser.Server.Implementations/Session/SessionManager.cs
@@ -1546,11 +1546,7 @@ namespace MediaBrowser.Server.Implementations.Session
             if (musicVideo != null)
             {
                 info.Album = musicVideo.Album;
-
-                if (!string.IsNullOrWhiteSpace(musicVideo.Artist))
-                {
-                    info.Artists.Add(musicVideo.Artist);
-                }
+                info.Artists = musicVideo.Artists.ToList();
             }
 
             var backropItem = item.HasImage(ImageType.Backdrop) ? item : null;