add system id to remote calls

2 files changed, 11 insertions, 8 deletions

diff --git a/MediaBrowser.Controller/Entities/UserViewBuilder.cs b/MediaBrowser.Controller/Entities/UserViewBuilder.cs
index d17b6a4f8d..d8e0dc7a53 100644
--- a/MediaBrowser.Controller/Entities/UserViewBuilder.cs
+++ b/MediaBrowser.Controller/Entities/UserViewBuilder.cs
@@ -138,7 +138,7 @@ namespace MediaBrowser.Controller.Entities
                 case CollectionType.GameFavorites:
                     return GetFavoriteGames(parent, user, query);
 
-                case CollectionType.ViewTypeTvShowSeries:
+                case CollectionType.TvShowSeries:
                     return GetTvSeries(parent, user, query);
 
                 case CollectionType.TvGenres:
@@ -183,6 +183,9 @@ namespace MediaBrowser.Controller.Entities
                 case CollectionType.MusicArtists:
                     return GetMusicArtists(parent, user, query);
 
+                case CollectionType.MusicSongs:
+                    return GetMusicSongs(parent, user, query);
+
                 case CollectionType.TvFavoriteEpisodes:
                     return GetFavoriteEpisodes(parent, user, query);
 
@@ -213,6 +216,7 @@ namespace MediaBrowser.Controller.Entities
             list.Add(await GetUserView(category, CollectionType.MusicLatest, user, "0", parent).ConfigureAwait(false));
             list.Add(await GetUserView(category, CollectionType.MusicAlbums, user, "1", parent).ConfigureAwait(false));
             list.Add(await GetUserView(category, CollectionType.MusicAlbumArtists, user, "2", parent).ConfigureAwait(false));
+            list.Add(await GetUserView(category, CollectionType.MusicSongs, user, "3", parent).ConfigureAwait(false));
             //list.Add(await GetUserView(CollectionType.MusicArtists, user, "3", parent).ConfigureAwait(false));
             //list.Add(await GetUserView(CollectionType.MusicGenres, user, "5", parent).ConfigureAwait(false));
 
@@ -272,6 +276,11 @@ namespace MediaBrowser.Controller.Entities
             return GetResult(GetRecursiveChildren(parent, user, new[] { CollectionType.Music }).Where(i => i is MusicAlbum), query);
         }
 
+        private QueryResult<BaseItem> GetMusicSongs(Folder parent, User user, UserItemsQuery query)
+        {
+            return GetResult(GetRecursiveChildren(parent, user, new[] { CollectionType.Music }).Where(i => i is Audio.Audio), query);
+        }
+
         private QueryResult<BaseItem> GetMusicLatest(Folder parent, User user, UserItemsQuery query)
         {
             query.SortBy = new[] { ItemSortBy.DateCreated, ItemSortBy.SortName };
@@ -388,7 +397,7 @@ namespace MediaBrowser.Controller.Entities
             list.Add(await GetUserView(category, CollectionType.TvResume, user, "0", parent).ConfigureAwait(false));
             list.Add(await GetUserView(category, CollectionType.TvNextUp, user, "1", parent).ConfigureAwait(false));
             list.Add(await GetUserView(category, CollectionType.TvLatest, user, "2", parent).ConfigureAwait(false));
-            list.Add(await GetUserView(category, CollectionType.ViewTypeTvShowSeries, user, "3", parent).ConfigureAwait(false));
+            list.Add(await GetUserView(category, CollectionType.TvShowSeries, user, "3", parent).ConfigureAwait(false));
             list.Add(await GetUserView(category, CollectionType.TvFavoriteSeries, user, "4", parent).ConfigureAwait(false));
             list.Add(await GetUserView(category, CollectionType.TvFavoriteEpisodes, user, "5", parent).ConfigureAwait(false));
             //list.Add(await GetUserView(CollectionType.TvGenres, user, "5", parent).ConfigureAwait(false));
diff --git a/MediaBrowser.Controller/IServerApplicationHost.cs b/MediaBrowser.Controller/IServerApplicationHost.cs
index 2af37e84dc..a48860b7eb 100644
--- a/MediaBrowser.Controller/IServerApplicationHost.cs
+++ b/MediaBrowser.Controller/IServerApplicationHost.cs
@@ -42,12 +42,6 @@ namespace MediaBrowser.Controller
         bool HasUpdateAvailable { get; }
 
         /// <summary>
-        /// Gets or sets the server identifier.
-        /// </summary>
-        /// <value>The server identifier.</value>
-        string ServerId { get; }
-
-        /// <summary>
         /// Gets the name of the friendly.
         /// </summary>
         /// <value>The name of the friendly.</value>