From ee00f8bf726ae5498d64cff0086b9b7e638936ea Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sat, 24 Jan 2015 14:03:55 -0500
Subject: [PATCH] added HasSyncJob

---
 MediaBrowser.Api/BaseApiService.cs            | 36 ++++++-
 MediaBrowser.Api/GamesService.cs              |  4 +-
 MediaBrowser.Api/IHasDtoOptions.cs            | 29 +-----
 MediaBrowser.Api/ItemLookupService.cs         |  3 +-
 MediaBrowser.Api/Library/LibraryService.cs    | 16 +--
 MediaBrowser.Api/Movies/CollectionService.cs  |  2 +-
 MediaBrowser.Api/Movies/MoviesService.cs      | 14 +--
 MediaBrowser.Api/Movies/TrailersService.cs    |  8 +-
 MediaBrowser.Api/Music/AlbumsService.cs       |  4 +-
 MediaBrowser.Api/Music/InstantMixService.cs   |  7 +-
 MediaBrowser.Api/PlaylistService.cs           |  7 +-
 MediaBrowser.Api/SimilarItemsHelper.cs        |  5 +-
 MediaBrowser.Api/Sync/SyncService.cs          |  7 +-
 MediaBrowser.Api/TvShowsService.cs            | 22 +++--
 .../UserLibrary/ArtistsService.cs             |  2 +-
 .../UserLibrary/BaseItemsByNameService.cs     |  2 +-
 .../UserLibrary/GameGenresService.cs          |  2 +-
 MediaBrowser.Api/UserLibrary/GenresService.cs |  2 +-
 MediaBrowser.Api/UserLibrary/ItemsService.cs  |  6 +-
 .../UserLibrary/MusicGenresService.cs         |  2 +-
 .../UserLibrary/PersonsService.cs             |  2 +-
 .../UserLibrary/StudiosService.cs             |  2 +-
 .../UserLibrary/UserLibraryService.cs         | 16 +--
 MediaBrowser.Api/UserLibrary/YearsService.cs  |  2 +-
 MediaBrowser.Api/VideosService.cs             |  2 +-
 .../Networking/BaseNetworkManager.cs          | 53 ++++++++++
 .../ScheduledTasks/ScheduledTaskWorker.cs     |  6 ++
 MediaBrowser.Common/Net/INetworkManager.cs    |  1 -
 .../Collections/ICollectionManager.cs         |  7 ++
 MediaBrowser.Controller/Dto/DtoOptions.cs     |  1 +
 MediaBrowser.Controller/Dto/IDtoService.cs    | 11 +++
 .../IServerApplicationHost.cs                 | 12 ++-
 MediaBrowser.Controller/Sync/ISyncManager.cs  |  7 ++
 .../Sync/ISyncRepository.cs                   |  7 ++
 MediaBrowser.Dlna/Ssdp/DeviceDiscovery.cs     |  2 +-
 .../Configuration/ServerConfiguration.cs      |  2 +
 MediaBrowser.Model/Dto/BaseItemDto.cs         |  3 +-
 MediaBrowser.Model/Tasks/TaskResult.cs        |  6 ++
 .../Channels/ChannelManager.cs                |  8 +-
 .../Collections/CollectionManager.cs          | 12 ++-
 .../Connect/ConnectManager.cs                 |  4 +-
 .../Dto/DtoService.cs                         | 99 +++++++++++++++++--
 .../Library/LibraryManager.cs                 |  2 +-
 .../Library/UserManager.cs                    |  3 +-
 .../Library/UserViewManager.cs                | 38 ++++---
 .../Localization/Server/server.json           |  4 +-
 .../Sync/SyncManager.cs                       |  5 +
 .../Sync/SyncRepository.cs                    | 27 +++--
 .../Udp/UdpServer.cs                          | 14 ++-
 .../ApplicationHost.cs                        | 41 ++++----
 MediaBrowser.sln                              |  5 +
 51 files changed, 419 insertions(+), 165 deletions(-)

diff --git a/MediaBrowser.Api/BaseApiService.cs b/MediaBrowser.Api/BaseApiService.cs
index e909696553..2aaec8627a 100644
--- a/MediaBrowser.Api/BaseApiService.cs
+++ b/MediaBrowser.Api/BaseApiService.cs
@@ -1,8 +1,10 @@
-using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Dto;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Net;
 using MediaBrowser.Controller.Session;
+using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Logging;
 using ServiceStack.Text.Controller;
 using ServiceStack.Web;
@@ -36,6 +38,7 @@ namespace MediaBrowser.Api
         public IRequest Request { get; set; }
 
         public ISessionContext SessionContext { get; set; }
+        public IAuthorizationContext AuthorizationContext { get; set; }
 
         public string GetHeader(string name)
         {
@@ -110,6 +113,37 @@ namespace MediaBrowser.Api
         private readonly char[] _dashReplaceChars = { '?', '/', '&' };
         private const char SlugChar = '-';
 
+        protected DtoOptions GetDtoOptions(object request)
+        {
+            var options = new DtoOptions();
+
+            options.DeviceId = AuthorizationContext.GetAuthorizationInfo(Request).DeviceId;
+
+            var hasFields = request as IHasItemFields;
+            if (hasFields != null)
+            {
+                options.Fields = hasFields.GetItemFields().ToList();
+            }
+
+            var hasDtoOptions = request as IHasDtoOptions;
+            if (hasDtoOptions != null)
+            {
+                options.EnableImages = hasDtoOptions.EnableImages ?? true;
+
+                if (hasDtoOptions.ImageTypeLimit.HasValue)
+                {
+                    options.ImageTypeLimit = hasDtoOptions.ImageTypeLimit.Value;
+                }
+
+                if (!string.IsNullOrWhiteSpace(hasDtoOptions.EnableImageTypes))
+                {
+                    options.ImageTypes = (hasDtoOptions.EnableImageTypes ?? string.Empty).Split(',').Where(i => !string.IsNullOrWhiteSpace(i)).Select(v => (ImageType)Enum.Parse(typeof(ImageType), v, true)).ToList();
+                }
+            }
+
+            return options;
+        }
+
         protected MusicArtist GetArtist(string name, ILibraryManager libraryManager)
         {
             return libraryManager.GetArtist(DeSlugArtistName(name, libraryManager));
diff --git a/MediaBrowser.Api/GamesService.cs b/MediaBrowser.Api/GamesService.cs
index 9aba2b0652..39e357f498 100644
--- a/MediaBrowser.Api/GamesService.cs
+++ b/MediaBrowser.Api/GamesService.cs
@@ -172,7 +172,9 @@ namespace MediaBrowser.Api
         /// <returns>System.Object.</returns>
         public object Get(GetSimilarGames request)
         {
-            var result = SimilarItemsHelper.GetSimilarItemsResult(_userManager,
+            var dtoOptions = GetDtoOptions(request);
+
+            var result = SimilarItemsHelper.GetSimilarItemsResult(dtoOptions, _userManager,
                 _itemRepo,
                 _libraryManager,
                 _userDataRepository,
diff --git a/MediaBrowser.Api/IHasDtoOptions.cs b/MediaBrowser.Api/IHasDtoOptions.cs
index 7fe47c4a1e..dac366113c 100644
--- a/MediaBrowser.Api/IHasDtoOptions.cs
+++ b/MediaBrowser.Api/IHasDtoOptions.cs
@@ -1,8 +1,4 @@
-using MediaBrowser.Controller.Dto;
-using MediaBrowser.Model.Entities;
-using System;
-using System.Linq;
-
+
 namespace MediaBrowser.Api
 {
     public interface IHasDtoOptions : IHasItemFields
@@ -13,27 +9,4 @@ namespace MediaBrowser.Api
 
         string EnableImageTypes { get; set; }
     }
-
-    public static class HasDtoOptionsExtensions
-    {
-        public static DtoOptions GetDtoOptions(this IHasDtoOptions request)
-        {
-            var options = new DtoOptions();
-
-            options.Fields = request.GetItemFields().ToList();
-            options.EnableImages = request.EnableImages ?? true;
-
-            if (request.ImageTypeLimit.HasValue)
-            {
-                options.ImageTypeLimit = request.ImageTypeLimit.Value;
-            }
-
-            if (!string.IsNullOrWhiteSpace(request.EnableImageTypes))
-            {
-                options.ImageTypes = (request.EnableImageTypes ?? string.Empty).Split(',').Where(i => !string.IsNullOrWhiteSpace(i)).Select(v => (ImageType)Enum.Parse(typeof(ImageType), v, true)).ToList();
-            }
-
-            return options;
-        }
-    }
 }
diff --git a/MediaBrowser.Api/ItemLookupService.cs b/MediaBrowser.Api/ItemLookupService.cs
index 9a97022b67..d6b4da8bea 100644
--- a/MediaBrowser.Api/ItemLookupService.cs
+++ b/MediaBrowser.Api/ItemLookupService.cs
@@ -205,7 +205,8 @@ namespace MediaBrowser.Api
                 Logger = Logger,
                 Request = Request,
                 ResultFactory = ResultFactory,
-                SessionContext = SessionContext
+                SessionContext = SessionContext,
+                AuthorizationContext = AuthorizationContext
             };
 
             service.Post(new RefreshItem
diff --git a/MediaBrowser.Api/Library/LibraryService.cs b/MediaBrowser.Api/Library/LibraryService.cs
index 5e1619672f..bac6f6a397 100644
--- a/MediaBrowser.Api/Library/LibraryService.cs
+++ b/MediaBrowser.Api/Library/LibraryService.cs
@@ -272,7 +272,7 @@ namespace MediaBrowser.Api.Library
                 items = items.Where(i => i.IsHidden == val).ToList();
             }
 
-            var dtoOptions = new DtoOptions();
+            var dtoOptions = GetDtoOptions(request);
             
             var result = new ItemsResult
             {
@@ -344,7 +344,7 @@ namespace MediaBrowser.Api.Library
 
             var user = request.UserId.HasValue ? _userManager.GetUserById(request.UserId.Value) : null;
 
-            var dtoOptions = new DtoOptions();
+            var dtoOptions = GetDtoOptions(request);
 
             BaseItem parent = item.Parent;
             
@@ -544,7 +544,7 @@ namespace MediaBrowser.Api.Library
                 ThemeSongsResult = themeSongs,
                 ThemeVideosResult = themeVideos,
 
-                SoundtrackSongsResult = GetSoundtrackSongs(request.Id, request.UserId, request.InheritFromParent)
+                SoundtrackSongsResult = GetSoundtrackSongs(request, request.Id, request.UserId, request.InheritFromParent)
             });
         }
 
@@ -597,7 +597,7 @@ namespace MediaBrowser.Api.Library
                 }
             }
 
-            var dtoOptions = new DtoOptions();
+            var dtoOptions = GetDtoOptions(request);
 
             var dtos = themeSongIds.Select(_libraryManager.GetItemById)
                             .OrderBy(i => i.SortName)
@@ -667,7 +667,7 @@ namespace MediaBrowser.Api.Library
                 }
             }
 
-            var dtoOptions = new DtoOptions();
+            var dtoOptions = GetDtoOptions(request);
 
             var dtos = themeVideoIds.Select(_libraryManager.GetItemById)
                             .OrderBy(i => i.SortName)
@@ -732,17 +732,17 @@ namespace MediaBrowser.Api.Library
             return ToOptimizedSerializedResultUsingCache(lookup);
         }
 
-        public ThemeMediaResult GetSoundtrackSongs(string id, Guid? userId, bool inheritFromParent)
+        public ThemeMediaResult GetSoundtrackSongs(GetThemeMedia request, string id, Guid? userId, bool inheritFromParent)
         {
             var user = userId.HasValue ? _userManager.GetUserById(userId.Value) : null;
 
             var item = string.IsNullOrEmpty(id)
                            ? (userId.HasValue
                                   ? user.RootFolder
-                                  : (Folder)_libraryManager.RootFolder)
+                                  : _libraryManager.RootFolder)
                            : _libraryManager.GetItemById(id);
 
-            var dtoOptions = new DtoOptions();
+            var dtoOptions = GetDtoOptions(request);
 
             var dtos = GetSoundtrackSongIds(item, inheritFromParent)
                 .Select(_libraryManager.GetItemById)
diff --git a/MediaBrowser.Api/Movies/CollectionService.cs b/MediaBrowser.Api/Movies/CollectionService.cs
index 97c6cd87da..e6277e39a2 100644
--- a/MediaBrowser.Api/Movies/CollectionService.cs
+++ b/MediaBrowser.Api/Movies/CollectionService.cs
@@ -71,7 +71,7 @@ namespace MediaBrowser.Api.Movies
 
             }).ConfigureAwait(false);
 
-            var dtoOptions = new DtoOptions();
+            var dtoOptions = GetDtoOptions(request);
 
             var dto = _dtoService.GetBaseItemDto(item, dtoOptions);
 
diff --git a/MediaBrowser.Api/Movies/MoviesService.cs b/MediaBrowser.Api/Movies/MoviesService.cs
index ba3c15a90b..0b8bb4036d 100644
--- a/MediaBrowser.Api/Movies/MoviesService.cs
+++ b/MediaBrowser.Api/Movies/MoviesService.cs
@@ -157,7 +157,7 @@ namespace MediaBrowser.Api.Movies
                 .DistinctBy(i => i.GetProviderId(MetadataProviders.Imdb) ?? Guid.NewGuid().ToString(), StringComparer.OrdinalIgnoreCase)
                 .ToList();
 
-            var dtoOptions = new DtoOptions();
+            var dtoOptions = GetDtoOptions(request);
 
             dtoOptions.Fields = request.GetItemFields().ToList();
             
@@ -174,8 +174,6 @@ namespace MediaBrowser.Api.Movies
                 (request.UserId.HasValue ? user.RootFolder :
                 _libraryManager.RootFolder) : _libraryManager.GetItemById(request.Id);
 
-            var fields = request.GetItemFields().ToList();
-
             var inputItems = user == null
                                  ? _libraryManager.RootFolder.GetRecursiveChildren().Where(i => i.Id != item.Id)
                                  : user.RootFolder.GetRecursiveChildren(user).Where(i => i.Id != item.Id);
@@ -225,10 +223,12 @@ namespace MediaBrowser.Api.Movies
             {
                 returnItems = returnItems.Take(request.Limit.Value);
             }
+
+            var dtoOptions = GetDtoOptions(request);
           
             var result = new ItemsResult
             {
-                Items = returnItems.Select(i => _dtoService.GetBaseItemDto(i, fields, user)).ToArray(),
+                Items = _dtoService.GetBaseItemDtos(returnItems, dtoOptions, user).ToArray(),
 
                 TotalRecordCount = items.Count
             };
@@ -351,7 +351,7 @@ namespace MediaBrowser.Api.Movies
                         BaselineItemName = director,
                         CategoryId = director.GetMD5().ToString("N"),
                         RecommendationType = type,
-                        Items = items.Select(i => _dtoService.GetBaseItemDto(i, dtoOptions, user)).ToArray()
+                        Items = _dtoService.GetBaseItemDtos(items, dtoOptions, user).ToArray()
                     };
                 }
             }
@@ -375,7 +375,7 @@ namespace MediaBrowser.Api.Movies
                         BaselineItemName = name,
                         CategoryId = name.GetMD5().ToString("N"),
                         RecommendationType = type,
-                        Items = items.Select(i => _dtoService.GetBaseItemDto(i, dtoOptions, user)).ToArray()
+                        Items = _dtoService.GetBaseItemDtos(items, dtoOptions, user).ToArray()
                     };
                 }
             }
@@ -399,7 +399,7 @@ namespace MediaBrowser.Api.Movies
                         BaselineItemName = item.Name,
                         CategoryId = item.Id.ToString("N"),
                         RecommendationType = type,
-                        Items = similar.Select(i => _dtoService.GetBaseItemDto(i, dtoOptions, user)).ToArray()
+                        Items = _dtoService.GetBaseItemDtos(similar, dtoOptions, user).ToArray()
                     };
                 }
             }
diff --git a/MediaBrowser.Api/Movies/TrailersService.cs b/MediaBrowser.Api/Movies/TrailersService.cs
index 8e1704af73..3bee59a869 100644
--- a/MediaBrowser.Api/Movies/TrailersService.cs
+++ b/MediaBrowser.Api/Movies/TrailersService.cs
@@ -84,7 +84,9 @@ namespace MediaBrowser.Api.Movies
         /// <returns>System.Object.</returns>
         public object Get(GetSimilarTrailers request)
         {
-            var result = SimilarItemsHelper.GetSimilarItemsResult(_userManager,
+            var dtoOptions = GetDtoOptions(request);
+
+            var result = SimilarItemsHelper.GetSimilarItemsResult(dtoOptions, _userManager,
                 _itemRepo,
                 _libraryManager,
                 _userDataRepository,
@@ -119,9 +121,9 @@ namespace MediaBrowser.Api.Movies
 
             var pagedItems = ApplyPaging(request, itemsArray);
 
-            var fields = request.GetItemFields().ToList();
+            var dtoOptions = GetDtoOptions(request);
 
-            var returnItems = pagedItems.Select(i => _dtoService.GetBaseItemDto(i, fields, user)).ToArray();
+            var returnItems = _dtoService.GetBaseItemDtos(pagedItems, dtoOptions, user).ToArray();
 
             return new ItemsResult
             {
diff --git a/MediaBrowser.Api/Music/AlbumsService.cs b/MediaBrowser.Api/Music/AlbumsService.cs
index 34a933dee3..4cfb3c7d44 100644
--- a/MediaBrowser.Api/Music/AlbumsService.cs
+++ b/MediaBrowser.Api/Music/AlbumsService.cs
@@ -50,7 +50,9 @@ namespace MediaBrowser.Api.Music
         /// <returns>System.Object.</returns>
         public object Get(GetSimilarAlbums request)
         {
-            var result = SimilarItemsHelper.GetSimilarItemsResult(_userManager,
+            var dtoOptions = GetDtoOptions(request);
+
+            var result = SimilarItemsHelper.GetSimilarItemsResult(dtoOptions, _userManager,
                 _itemRepo,
                 _libraryManager,
                 _userDataRepository,
diff --git a/MediaBrowser.Api/Music/InstantMixService.cs b/MediaBrowser.Api/Music/InstantMixService.cs
index 43fd0894b9..cfb826a134 100644
--- a/MediaBrowser.Api/Music/InstantMixService.cs
+++ b/MediaBrowser.Api/Music/InstantMixService.cs
@@ -146,8 +146,6 @@ namespace MediaBrowser.Api.Music
 
         private object GetResult(IEnumerable<Audio> items, User user, BaseGetSimilarItems request)
         {
-            var fields = request.GetItemFields().ToList();
-
             var list = items.ToList();
 
             var result = new ItemsResult
@@ -155,10 +153,9 @@ namespace MediaBrowser.Api.Music
                 TotalRecordCount = list.Count
             };
 
-            var dtos = list.Take(request.Limit ?? list.Count)
-                .Select(i => _dtoService.GetBaseItemDto(i, fields, user));
+            var dtoOptions = GetDtoOptions(request);
 
-            result.Items = dtos.ToArray();
+            result.Items = _dtoService.GetBaseItemDtos(list.Take(request.Limit ?? list.Count), dtoOptions, user).ToArray();
 
             return ToOptimizedResult(result);
         }
diff --git a/MediaBrowser.Api/PlaylistService.cs b/MediaBrowser.Api/PlaylistService.cs
index 7f7717f71b..e16ca1ee8f 100644
--- a/MediaBrowser.Api/PlaylistService.cs
+++ b/MediaBrowser.Api/PlaylistService.cs
@@ -151,9 +151,10 @@ namespace MediaBrowser.Api
             {
                 items = items.Take(request.Limit.Value).ToArray();
             }
-            
-            var dtos = items
-                   .Select(i => _dtoService.GetBaseItemDto(i.Item2, request.GetItemFields().ToList(), user))
+
+            var dtoOptions = GetDtoOptions(request);
+
+            var dtos = _dtoService.GetBaseItemDtos(items.Select(i => i.Item2), dtoOptions, user)
                    .ToArray();
 
             var index = 0;
diff --git a/MediaBrowser.Api/SimilarItemsHelper.cs b/MediaBrowser.Api/SimilarItemsHelper.cs
index 2da29928b2..150aebf508 100644
--- a/MediaBrowser.Api/SimilarItemsHelper.cs
+++ b/MediaBrowser.Api/SimilarItemsHelper.cs
@@ -57,6 +57,7 @@ namespace MediaBrowser.Api
         /// <summary>
         /// Gets the similar items.
         /// </summary>
+        /// <param name="dtoOptions">The dto options.</param>
         /// <param name="userManager">The user manager.</param>
         /// <param name="itemRepository">The item repository.</param>
         /// <param name="libraryManager">The library manager.</param>
@@ -67,7 +68,7 @@ namespace MediaBrowser.Api
         /// <param name="includeInSearch">The include in search.</param>
         /// <param name="getSimilarityScore">The get similarity score.</param>
         /// <returns>ItemsResult.</returns>
-        internal static ItemsResult GetSimilarItemsResult(IUserManager userManager, IItemRepository itemRepository, ILibraryManager libraryManager, IUserDataManager userDataRepository, IDtoService dtoService, ILogger logger, BaseGetSimilarItemsFromItem request, Func<BaseItem, bool> includeInSearch, Func<BaseItem, BaseItem, int> getSimilarityScore)
+        internal static ItemsResult GetSimilarItemsResult(DtoOptions dtoOptions, IUserManager userManager, IItemRepository itemRepository, ILibraryManager libraryManager, IUserDataManager userDataRepository, IDtoService dtoService, ILogger logger, BaseGetSimilarItemsFromItem request, Func<BaseItem, bool> includeInSearch, Func<BaseItem, BaseItem, int> getSimilarityScore)
         {
             var user = request.UserId.HasValue ? userManager.GetUserById(request.UserId.Value) : null;
 
@@ -93,7 +94,7 @@ namespace MediaBrowser.Api
 
             var result = new ItemsResult
             {
-                Items = returnItems.Select(i => dtoService.GetBaseItemDto(i, fields, user)).ToArray(),
+                Items = dtoService.GetBaseItemDtos(returnItems, dtoOptions, user).ToArray(),
 
                 TotalRecordCount = items.Count
             };
diff --git a/MediaBrowser.Api/Sync/SyncService.cs b/MediaBrowser.Api/Sync/SyncService.cs
index b30df572b6..93d8a8d0a9 100644
--- a/MediaBrowser.Api/Sync/SyncService.cs
+++ b/MediaBrowser.Api/Sync/SyncService.cs
@@ -235,10 +235,11 @@ namespace MediaBrowser.Api.Sync
                     }
                 };
 
-                var dtos = request.ItemIds.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries)
+                var items = request.ItemIds.Split(new[] {','}, StringSplitOptions.RemoveEmptyEntries)
                     .Select(_libraryManager.GetItemById)
-                    .Where(i => i != null)
-                    .Select(i => _dtoService.GetBaseItemDto(i, dtoOptions))
+                    .Where(i => i != null);
+
+                var dtos = _dtoService.GetBaseItemDtos(items, dtoOptions)
                     .ToList();
 
                 result.Options = SyncHelper.GetSyncOptions(dtos);
diff --git a/MediaBrowser.Api/TvShowsService.cs b/MediaBrowser.Api/TvShowsService.cs
index d1464cd262..79db6cbe5a 100644
--- a/MediaBrowser.Api/TvShowsService.cs
+++ b/MediaBrowser.Api/TvShowsService.cs
@@ -238,7 +238,9 @@ namespace MediaBrowser.Api
         /// <returns>System.Object.</returns>
         public object Get(GetSimilarShows request)
         {
-            var result = SimilarItemsHelper.GetSimilarItemsResult(_userManager,
+            var dtoOptions = GetDtoOptions(request);
+
+            var result = SimilarItemsHelper.GetSimilarItemsResult(dtoOptions, _userManager,
                 _itemRepo,
                 _libraryManager,
                 _userDataManager,
@@ -270,9 +272,9 @@ namespace MediaBrowser.Api
 
             var pagedItems = ApplyPaging(previousEpisodes, request.StartIndex, request.Limit);
 
-            var options = request.GetDtoOptions();
+            var options = GetDtoOptions(request);
 
-            var returnItems = pagedItems.Select(i => _dtoService.GetBaseItemDto(i, options, user)).ToArray();
+            var returnItems = _dtoService.GetBaseItemDtos(pagedItems, options, user).ToArray();
 
             var result = new ItemsResult
             {
@@ -301,9 +303,9 @@ namespace MediaBrowser.Api
 
             var user = _userManager.GetUserById(request.UserId);
 
-            var options = request.GetDtoOptions();
+            var options = GetDtoOptions(request);
 
-            var returnItems = result.Items.Select(i => _dtoService.GetBaseItemDto(i, options, user)).ToArray();
+            var returnItems = _dtoService.GetBaseItemDtos(result.Items, options, user).ToArray();
 
             return ToOptimizedSerializedResultUsingCache(new ItemsResult
             {
@@ -365,9 +367,9 @@ namespace MediaBrowser.Api
                     .Cast<Season>();
             }
 
-            var fields = request.GetItemFields().ToList();
+            var dtoOptions = GetDtoOptions(request);
 
-            var returnItems = seasons.Select(i => _dtoService.GetBaseItemDto(i, fields, user))
+            var returnItems = _dtoService.GetBaseItemDtos(seasons, dtoOptions, user)
                 .ToArray();
 
             return new ItemsResult
@@ -455,11 +457,11 @@ namespace MediaBrowser.Api
                     .Cast<Episode>();
             }
 
-            var fields = request.GetItemFields().ToList();
-
             episodes = _libraryManager.ReplaceVideosWithPrimaryVersions(episodes).Cast<Episode>();
 
-            var returnItems = episodes.Select(i => _dtoService.GetBaseItemDto(i, fields, user))
+            var dtoOptions = GetDtoOptions(request);
+
+            var returnItems = _dtoService.GetBaseItemDtos(episodes, dtoOptions, user)
                 .ToArray();
 
             return new ItemsResult
diff --git a/MediaBrowser.Api/UserLibrary/ArtistsService.cs b/MediaBrowser.Api/UserLibrary/ArtistsService.cs
index 1284232388..2ab08fd8d3 100644
--- a/MediaBrowser.Api/UserLibrary/ArtistsService.cs
+++ b/MediaBrowser.Api/UserLibrary/ArtistsService.cs
@@ -83,7 +83,7 @@ namespace MediaBrowser.Api.UserLibrary
         {
             var item = GetArtist(request.Name, LibraryManager);
 
-            var dtoOptions = new DtoOptions();
+            var dtoOptions = GetDtoOptions(request);
 
             if (request.UserId.HasValue)
             {
diff --git a/MediaBrowser.Api/UserLibrary/BaseItemsByNameService.cs b/MediaBrowser.Api/UserLibrary/BaseItemsByNameService.cs
index 9d211a4199..e0747b5478 100644
--- a/MediaBrowser.Api/UserLibrary/BaseItemsByNameService.cs
+++ b/MediaBrowser.Api/UserLibrary/BaseItemsByNameService.cs
@@ -129,7 +129,7 @@ namespace MediaBrowser.Api.UserLibrary
 
             var tuples = ibnItems.Select(i => new Tuple<TItemType, List<BaseItem>>(i, i.GetTaggedItems(libraryItems).ToList()));
 
-            var dtoOptions = request.GetDtoOptions();
+            var dtoOptions = GetDtoOptions(request);
 
             var dtos = tuples.Select(i => GetDto(i.Item1, user, dtoOptions, i.Item2));
 
diff --git a/MediaBrowser.Api/UserLibrary/GameGenresService.cs b/MediaBrowser.Api/UserLibrary/GameGenresService.cs
index 2f1c73acef..3063e19c72 100644
--- a/MediaBrowser.Api/UserLibrary/GameGenresService.cs
+++ b/MediaBrowser.Api/UserLibrary/GameGenresService.cs
@@ -69,7 +69,7 @@ namespace MediaBrowser.Api.UserLibrary
         {
             var item = GetGameGenre(request.Name, LibraryManager);
 
-            var dtoOptions = new DtoOptions();
+            var dtoOptions = GetDtoOptions(request);
 
             if (request.UserId.HasValue)
             {
diff --git a/MediaBrowser.Api/UserLibrary/GenresService.cs b/MediaBrowser.Api/UserLibrary/GenresService.cs
index db0b0fe612..c659852de8 100644
--- a/MediaBrowser.Api/UserLibrary/GenresService.cs
+++ b/MediaBrowser.Api/UserLibrary/GenresService.cs
@@ -74,7 +74,7 @@ namespace MediaBrowser.Api.UserLibrary
         {
             var item = GetGenre(request.Name, LibraryManager);
 
-            var dtoOptions = new DtoOptions();
+            var dtoOptions = GetDtoOptions(request);
 
             if (request.UserId.HasValue)
             {
diff --git a/MediaBrowser.Api/UserLibrary/ItemsService.cs b/MediaBrowser.Api/UserLibrary/ItemsService.cs
index cf9b0b4387..6f6bd2dff6 100644
--- a/MediaBrowser.Api/UserLibrary/ItemsService.cs
+++ b/MediaBrowser.Api/UserLibrary/ItemsService.cs
@@ -321,14 +321,14 @@ namespace MediaBrowser.Api.UserLibrary
             var result = await GetItemsToSerialize(request, user, parentItem).ConfigureAwait(false);
 
             var isFiltered = result.Item2;
-            var dtoOptions = request.GetDtoOptions();
+            var dtoOptions = GetDtoOptions(request);
 
             if (isFiltered)
             {
                 return new ItemsResult
                 {
                     TotalRecordCount = result.Item1.TotalRecordCount,
-                    Items = result.Item1.Items.Select(i => _dtoService.GetBaseItemDto(i, dtoOptions, user)).ToArray()
+                    Items = _dtoService.GetBaseItemDtos(result.Item1.Items, dtoOptions, user).ToArray()
                 };
             }
 
@@ -362,7 +362,7 @@ namespace MediaBrowser.Api.UserLibrary
 
             var pagedItems = ApplyPaging(request, itemsArray);
 
-            var returnItems = pagedItems.Select(i => _dtoService.GetBaseItemDto(i, dtoOptions, user)).ToArray();
+            var returnItems = _dtoService.GetBaseItemDtos(pagedItems, dtoOptions, user).ToArray();
 
             return new ItemsResult
             {
diff --git a/MediaBrowser.Api/UserLibrary/MusicGenresService.cs b/MediaBrowser.Api/UserLibrary/MusicGenresService.cs
index f8575aa7c7..3733128f04 100644
--- a/MediaBrowser.Api/UserLibrary/MusicGenresService.cs
+++ b/MediaBrowser.Api/UserLibrary/MusicGenresService.cs
@@ -69,7 +69,7 @@ namespace MediaBrowser.Api.UserLibrary
         {
             var item = GetMusicGenre(request.Name, LibraryManager);
 
-            var dtoOptions = new DtoOptions();
+            var dtoOptions = GetDtoOptions(request);
 
             if (request.UserId.HasValue)
             {
diff --git a/MediaBrowser.Api/UserLibrary/PersonsService.cs b/MediaBrowser.Api/UserLibrary/PersonsService.cs
index 33ce6cd803..b424c93138 100644
--- a/MediaBrowser.Api/UserLibrary/PersonsService.cs
+++ b/MediaBrowser.Api/UserLibrary/PersonsService.cs
@@ -86,7 +86,7 @@ namespace MediaBrowser.Api.UserLibrary
         {
             var item = GetPerson(request.Name, LibraryManager);
 
-            var dtoOptions = new DtoOptions();
+            var dtoOptions = GetDtoOptions(request);
 
             if (request.UserId.HasValue)
             {
diff --git a/MediaBrowser.Api/UserLibrary/StudiosService.cs b/MediaBrowser.Api/UserLibrary/StudiosService.cs
index 272134b70f..a4ebef6846 100644
--- a/MediaBrowser.Api/UserLibrary/StudiosService.cs
+++ b/MediaBrowser.Api/UserLibrary/StudiosService.cs
@@ -73,7 +73,7 @@ namespace MediaBrowser.Api.UserLibrary
         {
             var item = GetStudio(request.Name, LibraryManager);
 
-            var dtoOptions = new DtoOptions();
+            var dtoOptions = GetDtoOptions(request);
 
             if (request.UserId.HasValue)
             {
diff --git a/MediaBrowser.Api/UserLibrary/UserLibraryService.cs b/MediaBrowser.Api/UserLibrary/UserLibraryService.cs
index 45a330a501..3fc42c6b1a 100644
--- a/MediaBrowser.Api/UserLibrary/UserLibraryService.cs
+++ b/MediaBrowser.Api/UserLibrary/UserLibraryService.cs
@@ -371,7 +371,7 @@ namespace MediaBrowser.Api.UserLibrary
                 }
             }
 
-            var options = request.GetDtoOptions();
+            var options = GetDtoOptions(request);
 
             var dtos = list.Select(i =>
             {
@@ -420,7 +420,7 @@ namespace MediaBrowser.Api.UserLibrary
 
             var folders = await _userViewManager.GetUserViews(query, CancellationToken.None).ConfigureAwait(false);
 
-            var dtoOptions = new DtoOptions();
+            var dtoOptions = GetDtoOptions(request);
 
             var dtos = folders.Select(i => _dtoService.GetBaseItemDto(i, dtoOptions, user))
                 .ToArray();
@@ -447,7 +447,7 @@ namespace MediaBrowser.Api.UserLibrary
             // Get them from the child tree
             if (series != null)
             {
-                var dtoOptions = new DtoOptions();
+                var dtoOptions = GetDtoOptions(request);
 
                 // Avoid implicitly captured closure
                 var currentUser = user;
@@ -479,7 +479,7 @@ namespace MediaBrowser.Api.UserLibrary
             // Get them from the db
             if (movie != null)
             {
-                var dtoOptions = new DtoOptions();
+                var dtoOptions = GetDtoOptions(request);
 
                 var dtos = movie.SpecialFeatureIds
                     .Select(_libraryManager.GetItemById)
@@ -518,7 +518,7 @@ namespace MediaBrowser.Api.UserLibrary
                 trailerIds = hasTrailers.GetTrailerIds();
             }
 
-            var dtoOptions = new DtoOptions();
+            var dtoOptions = GetDtoOptions(request);
 
             var dtos = trailerIds
                 .Select(_libraryManager.GetItemById)
@@ -539,7 +539,7 @@ namespace MediaBrowser.Api.UserLibrary
 
             var item = string.IsNullOrEmpty(request.Id) ? user.RootFolder : _libraryManager.GetItemById(request.Id);
 
-            var dtoOptions = new DtoOptions();
+            var dtoOptions = GetDtoOptions(request);
 
             var result = _dtoService.GetBaseItemDto(item, dtoOptions, user);
 
@@ -557,7 +557,7 @@ namespace MediaBrowser.Api.UserLibrary
 
             var item = user.RootFolder;
 
-            var dtoOptions = new DtoOptions();
+            var dtoOptions = GetDtoOptions(request);
 
             var result = _dtoService.GetBaseItemDto(item, dtoOptions, user);
 
@@ -577,7 +577,7 @@ namespace MediaBrowser.Api.UserLibrary
 
             var items = await _libraryManager.GetIntros(item, user).ConfigureAwait(false);
 
-            var dtoOptions = new DtoOptions();
+            var dtoOptions = GetDtoOptions(request);
 
             var dtos = items.Select(i => _dtoService.GetBaseItemDto(i, dtoOptions, user))
                 .ToArray();
diff --git a/MediaBrowser.Api/UserLibrary/YearsService.cs b/MediaBrowser.Api/UserLibrary/YearsService.cs
index b1b0aeb636..d95496333a 100644
--- a/MediaBrowser.Api/UserLibrary/YearsService.cs
+++ b/MediaBrowser.Api/UserLibrary/YearsService.cs
@@ -73,7 +73,7 @@ namespace MediaBrowser.Api.UserLibrary
         {
             var item = LibraryManager.GetYear(request.Year);
 
-            var dtoOptions = new DtoOptions();
+            var dtoOptions = GetDtoOptions(request);
 
             if (request.UserId.HasValue)
             {
diff --git a/MediaBrowser.Api/VideosService.cs b/MediaBrowser.Api/VideosService.cs
index 28db46b986..442bed06ff 100644
--- a/MediaBrowser.Api/VideosService.cs
+++ b/MediaBrowser.Api/VideosService.cs
@@ -80,7 +80,7 @@ namespace MediaBrowser.Api
                                   : _libraryManager.RootFolder)
                            : _libraryManager.GetItemById(request.Id);
 
-            var dtoOptions = new DtoOptions();
+            var dtoOptions = GetDtoOptions(request);
 
             var video = (Video)item;
 
diff --git a/MediaBrowser.Common.Implementations/Networking/BaseNetworkManager.cs b/MediaBrowser.Common.Implementations/Networking/BaseNetworkManager.cs
index bf6ebf7ef7..660ac09f93 100644
--- a/MediaBrowser.Common.Implementations/Networking/BaseNetworkManager.cs
+++ b/MediaBrowser.Common.Implementations/Networking/BaseNetworkManager.cs
@@ -18,11 +18,64 @@ namespace MediaBrowser.Common.Implementations.Networking
             Logger = logger;
         }
 
+        private volatile List<string> _localIpAddresses;
+        private readonly object _localIpAddressSyncLock = new object();
+
         /// <summary>
         /// Gets the machine's local ip address
         /// </summary>
         /// <returns>IPAddress.</returns>
         public IEnumerable<string> GetLocalIpAddresses()
+        {
+            if (_localIpAddresses == null)
+            {
+                lock (_localIpAddressSyncLock)
+                {
+                    if (_localIpAddresses == null)
+                    {
+                        var addresses = GetLocalIpAddressesInternal().ToList();
+
+                        _localIpAddresses = addresses;
+                        BindEvents();
+
+                        return addresses;
+                    }
+                }
+            }
+
+            return _localIpAddresses;
+        }
+
+        private void BindEvents()
+        {
+            NetworkChange.NetworkAddressChanged -= NetworkChange_NetworkAddressChanged;
+            NetworkChange.NetworkAvailabilityChanged -= NetworkChange_NetworkAvailabilityChanged;
+            
+            NetworkChange.NetworkAddressChanged += NetworkChange_NetworkAddressChanged;
+            NetworkChange.NetworkAvailabilityChanged += NetworkChange_NetworkAvailabilityChanged;
+        }
+
+        void NetworkChange_NetworkAvailabilityChanged(object sender, NetworkAvailabilityEventArgs e)
+        {
+            Logger.Debug("NetworkAvailabilityChanged fired. Resetting cached network info.");
+
+            lock (_localIpAddressSyncLock)
+            {
+                _localIpAddresses = null;
+            }
+        }
+
+        void NetworkChange_NetworkAddressChanged(object sender, EventArgs e)
+        {
+            Logger.Debug("NetworkAddressChanged fired. Resetting cached network info.");
+
+            lock (_localIpAddressSyncLock)
+            {
+                _localIpAddresses = null;
+            }
+        }
+
+        private IEnumerable<string> GetLocalIpAddressesInternal()
         {
             var list = GetIPsDefault()
                 .Where(i => !IPAddress.IsLoopback(i))
diff --git a/MediaBrowser.Common.Implementations/ScheduledTasks/ScheduledTaskWorker.cs b/MediaBrowser.Common.Implementations/ScheduledTasks/ScheduledTaskWorker.cs
index 0dc67f8c00..5e90385005 100644
--- a/MediaBrowser.Common.Implementations/ScheduledTasks/ScheduledTaskWorker.cs
+++ b/MediaBrowser.Common.Implementations/ScheduledTasks/ScheduledTaskWorker.cs
@@ -544,6 +544,12 @@ namespace MediaBrowser.Common.Implementations.ScheduledTasks
                 Id = Id
             };
 
+            var hasKey = ScheduledTask as IHasKey;
+            if (hasKey != null)
+            {
+                result.Key = hasKey.Key;
+            }
+
             if (ex != null)
             {
                 result.ErrorMessage = ex.Message;
diff --git a/MediaBrowser.Common/Net/INetworkManager.cs b/MediaBrowser.Common/Net/INetworkManager.cs
index 6b8136d872..8fc947e8fe 100644
--- a/MediaBrowser.Common/Net/INetworkManager.cs
+++ b/MediaBrowser.Common/Net/INetworkManager.cs
@@ -2,7 +2,6 @@ using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Net;
 using System.Collections.Generic;
 using System.Net;
-using MediaBrowser.Model.Logging;
 
 namespace MediaBrowser.Common.Net
 {
diff --git a/MediaBrowser.Controller/Collections/ICollectionManager.cs b/MediaBrowser.Controller/Collections/ICollectionManager.cs
index 9130f68d43..89e505579d 100644
--- a/MediaBrowser.Controller/Collections/ICollectionManager.cs
+++ b/MediaBrowser.Controller/Collections/ICollectionManager.cs
@@ -60,5 +60,12 @@ namespace MediaBrowser.Controller.Collections
         /// <param name="userId">The user identifier.</param>
         /// <returns>Folder.</returns>
         Folder GetCollectionsFolder(string userId);
+
+        /// <summary>
+        /// Gets the collections.
+        /// </summary>
+        /// <param name="user">The user.</param>
+        /// <returns>IEnumerable&lt;BoxSet&gt;.</returns>
+        IEnumerable<BoxSet> GetCollections(User user);
     }
 }
diff --git a/MediaBrowser.Controller/Dto/DtoOptions.cs b/MediaBrowser.Controller/Dto/DtoOptions.cs
index eeb4fc1143..a8d1b1862b 100644
--- a/MediaBrowser.Controller/Dto/DtoOptions.cs
+++ b/MediaBrowser.Controller/Dto/DtoOptions.cs
@@ -17,6 +17,7 @@ namespace MediaBrowser.Controller.Dto
         public List<ImageType> ImageTypes { get; set; }
         public int ImageTypeLimit { get; set; }
         public bool EnableImages { get; set; }
+        public string DeviceId { get; set; }
 
         public DtoOptions()
         {
diff --git a/MediaBrowser.Controller/Dto/IDtoService.cs b/MediaBrowser.Controller/Dto/IDtoService.cs
index 7c7ec56d50..ea311d9937 100644
--- a/MediaBrowser.Controller/Dto/IDtoService.cs
+++ b/MediaBrowser.Controller/Dto/IDtoService.cs
@@ -44,6 +44,17 @@ namespace MediaBrowser.Controller.Dto
         /// <param name="owner">The owner.</param>
         /// <returns>BaseItemDto.</returns>
         BaseItemDto GetBaseItemDto(BaseItem item, DtoOptions options, User user = null, BaseItem owner = null);
+
+        /// <summary>
+        /// Gets the base item dtos.
+        /// </summary>
+        /// <param name="items">The items.</param>
+        /// <param name="options">The options.</param>
+        /// <param name="user">The user.</param>
+        /// <param name="owner">The owner.</param>
+        /// <returns>IEnumerable&lt;BaseItemDto&gt;.</returns>
+        IEnumerable<BaseItemDto> GetBaseItemDtos(IEnumerable<BaseItem> items, DtoOptions options, User user = null,
+            BaseItem owner = null);
         
         /// <summary>
         /// Gets the chapter information dto.
diff --git a/MediaBrowser.Controller/IServerApplicationHost.cs b/MediaBrowser.Controller/IServerApplicationHost.cs
index 0b0f6d8287..105e4e2f03 100644
--- a/MediaBrowser.Controller/IServerApplicationHost.cs
+++ b/MediaBrowser.Controller/IServerApplicationHost.cs
@@ -55,9 +55,15 @@ namespace MediaBrowser.Controller
         string FriendlyName { get; }
 
         /// <summary>
-        /// Gets the HTTP server ip addresses.
+        /// Gets the local ip address.
         /// </summary>
-        /// <value>The HTTP server ip addresses.</value>
-        IEnumerable<string> HttpServerIpAddresses { get; }
+        /// <value>The local ip address.</value>
+        string LocalIpAddress { get; }
+
+        /// <summary>
+        /// Gets the local API URL.
+        /// </summary>
+        /// <value>The local API URL.</value>
+        string LocalApiUrl { get; }
     }
 }
diff --git a/MediaBrowser.Controller/Sync/ISyncManager.cs b/MediaBrowser.Controller/Sync/ISyncManager.cs
index 62b6a3a379..9edc708ee0 100644
--- a/MediaBrowser.Controller/Sync/ISyncManager.cs
+++ b/MediaBrowser.Controller/Sync/ISyncManager.cs
@@ -142,5 +142,12 @@ namespace MediaBrowser.Controller.Sync
         /// <param name="id">The identifier.</param>
         /// <returns>Task.</returns>
         Task UnmarkJobItemForRemoval(string id);
+
+        /// <summary>
+        /// Gets the library item ids.
+        /// </summary>
+        /// <param name="query">The query.</param>
+        /// <returns>QueryResult&lt;System.String&gt;.</returns>
+        QueryResult<string> GetLibraryItemIds(SyncJobItemQuery query);
     }
 }
diff --git a/MediaBrowser.Controller/Sync/ISyncRepository.cs b/MediaBrowser.Controller/Sync/ISyncRepository.cs
index f1bcd7f07e..315f5f5414 100644
--- a/MediaBrowser.Controller/Sync/ISyncRepository.cs
+++ b/MediaBrowser.Controller/Sync/ISyncRepository.cs
@@ -68,5 +68,12 @@ namespace MediaBrowser.Controller.Sync
         /// <param name="query">The query.</param>
         /// <returns>IEnumerable&lt;SyncJobItem&gt;.</returns>
         QueryResult<SyncJobItem> GetJobItems(SyncJobItemQuery query);
+
+        /// <summary>
+        /// Gets the library item ids.
+        /// </summary>
+        /// <param name="query">The query.</param>
+        /// <returns>QueryResult&lt;System.String&gt;.</returns>
+        QueryResult<string> GetLibraryItemIds(SyncJobItemQuery query);
     }
 }
diff --git a/MediaBrowser.Dlna/Ssdp/DeviceDiscovery.cs b/MediaBrowser.Dlna/Ssdp/DeviceDiscovery.cs
index adc2d731ac..a90c6dc01e 100644
--- a/MediaBrowser.Dlna/Ssdp/DeviceDiscovery.cs
+++ b/MediaBrowser.Dlna/Ssdp/DeviceDiscovery.cs
@@ -86,7 +86,7 @@ namespace MediaBrowser.Dlna.Ssdp
 
             try
             {
-                var ip = _appHost.HttpServerIpAddresses.FirstOrDefault();
+                var ip = _appHost.LocalIpAddress;
 
                 if (!string.IsNullOrWhiteSpace(ip))
                 {
diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index c641edff7f..f62cf88b7d 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -203,6 +203,8 @@ namespace MediaBrowser.Model.Configuration
         public bool EnableAudioArchiveFiles { get; set; }
         public bool EnableVideoArchiveFiles { get; set; }
 
+        public bool EnableLegacyCollections { get; set; }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="ServerConfiguration" /> class.
         /// </summary>
diff --git a/MediaBrowser.Model/Dto/BaseItemDto.cs b/MediaBrowser.Model/Dto/BaseItemDto.cs
index 6f8af072f6..c1a34a7f61 100644
--- a/MediaBrowser.Model/Dto/BaseItemDto.cs
+++ b/MediaBrowser.Model/Dto/BaseItemDto.cs
@@ -69,7 +69,8 @@ namespace MediaBrowser.Model.Dto
         public int? AnimeSeriesIndex { get; set; }
 
         public bool? SupportsSync { get; set; }
-        
+        public bool? HasSyncJob { get; set; }
+
         /// <summary>
         /// Gets or sets the DVD season number.
         /// </summary>
diff --git a/MediaBrowser.Model/Tasks/TaskResult.cs b/MediaBrowser.Model/Tasks/TaskResult.cs
index 956d68ae4d..39eacdf664 100644
--- a/MediaBrowser.Model/Tasks/TaskResult.cs
+++ b/MediaBrowser.Model/Tasks/TaskResult.cs
@@ -31,6 +31,12 @@ namespace MediaBrowser.Model.Tasks
         /// <value>The name.</value>
         public string Name { get; set; }
 
+        /// <summary>
+        /// Gets or sets the key.
+        /// </summary>
+        /// <value>The key.</value>
+        public string Key { get; set; }
+        
         /// <summary>
         /// Gets or sets the id.
         /// </summary>
diff --git a/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs b/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs
index 99ca0b5dac..37536a4ee9 100644
--- a/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs
+++ b/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs
@@ -180,7 +180,7 @@ namespace MediaBrowser.Server.Implementations.Channels
 
             var dtoOptions = new DtoOptions();
 
-            var returnItems = internalResult.Items.Select(i => _dtoService.GetBaseItemDto(i, dtoOptions, user))
+            var returnItems = _dtoService.GetBaseItemDtos(internalResult.Items, dtoOptions, user)
                 .ToArray();
 
             var result = new QueryResult<BaseItemDto>
@@ -556,7 +556,7 @@ namespace MediaBrowser.Server.Implementations.Channels
 
             var dtoOptions = new DtoOptions();
 
-            var returnItems = items.Select(i => _dtoService.GetBaseItemDto(i, dtoOptions, user))
+            var returnItems = _dtoService.GetBaseItemDtos(items, dtoOptions, user)
                 .ToArray();
 
             var result = new QueryResult<BaseItemDto>
@@ -823,7 +823,7 @@ namespace MediaBrowser.Server.Implementations.Channels
 
             var dtoOptions = new DtoOptions();
 
-            var returnItems = internalResult.Items.Select(i => _dtoService.GetBaseItemDto(i, dtoOptions, user))
+            var returnItems = _dtoService.GetBaseItemDtos(internalResult.Items, dtoOptions, user)
                 .ToArray();
 
             var result = new QueryResult<BaseItemDto>
@@ -972,7 +972,7 @@ namespace MediaBrowser.Server.Implementations.Channels
 
             var dtoOptions = new DtoOptions();
 
-            var returnItems = internalResult.Items.Select(i => _dtoService.GetBaseItemDto(i, dtoOptions, user))
+            var returnItems = _dtoService.GetBaseItemDtos(internalResult.Items, dtoOptions, user)
                 .ToArray();
 
             var result = new QueryResult<BaseItemDto>
diff --git a/MediaBrowser.Server.Implementations/Collections/CollectionManager.cs b/MediaBrowser.Server.Implementations/Collections/CollectionManager.cs
index 6100e3f5dc..faf73c0592 100644
--- a/MediaBrowser.Server.Implementations/Collections/CollectionManager.cs
+++ b/MediaBrowser.Server.Implementations/Collections/CollectionManager.cs
@@ -6,7 +6,6 @@ using MediaBrowser.Controller.Entities.Movies;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Logging;
-using MoreLinq;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -41,6 +40,14 @@ namespace MediaBrowser.Server.Implementations.Collections
                 .FirstOrDefault();
         }
 
+        public IEnumerable<BoxSet> GetCollections(User user)
+        {
+            var folder = GetCollectionsFolder(user.Id.ToString("N"));
+            return folder == null ?
+                new List<BoxSet>() :
+                folder.GetChildren(user, true).OfType<BoxSet>();
+        }
+
         public async Task<BoxSet> CreateCollection(CollectionCreationOptions options)
         {
             var name = options.Name;
@@ -269,7 +276,8 @@ namespace MediaBrowser.Server.Implementations.Collections
         public IEnumerable<BaseItem> CollapseItemsWithinBoxSets(IEnumerable<BaseItem> items, User user)
         {
             var results = new Dictionary<Guid, BaseItem>();
-            var allBoxsets = new List<BoxSet>();
+
+            var allBoxsets = GetCollections(user).ToList();
 
             foreach (var item in items)
             {
diff --git a/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs b/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs
index bb89f01fa5..e079aaf610 100644
--- a/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs
+++ b/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs
@@ -153,7 +153,7 @@ namespace MediaBrowser.Server.Implementations.Connect
 
             try
             {
-                var localAddress = _appHost.GetSystemInfo().LocalAddress;
+                var localAddress = _appHost.LocalApiUrl;
 
                 var hasExistingRecord = !string.IsNullOrWhiteSpace(ConnectServerId) &&
                                   !string.IsNullOrWhiteSpace(ConnectAccessKey);
@@ -195,7 +195,7 @@ namespace MediaBrowser.Server.Implementations.Connect
         private string _lastReportedIdentifier;
         private string GetConnectReportingIdentifier()
         {
-            return GetConnectReportingIdentifier(_appHost.GetSystemInfo().LocalAddress, WanApiAddress);
+            return GetConnectReportingIdentifier(_appHost.LocalApiUrl, WanApiAddress);
         }
         private string GetConnectReportingIdentifier(string localAddress, string remoteAddress)
         {
diff --git a/MediaBrowser.Server.Implementations/Dto/DtoService.cs b/MediaBrowser.Server.Implementations/Dto/DtoService.cs
index e919336b18..85a31337b8 100644
--- a/MediaBrowser.Server.Implementations/Dto/DtoService.cs
+++ b/MediaBrowser.Server.Implementations/Dto/DtoService.cs
@@ -2,6 +2,7 @@
 using MediaBrowser.Common.IO;
 using MediaBrowser.Controller.Channels;
 using MediaBrowser.Controller.Configuration;
+using MediaBrowser.Controller.Devices;
 using MediaBrowser.Controller.Drawing;
 using MediaBrowser.Controller.Dto;
 using MediaBrowser.Controller.Entities;
@@ -19,6 +20,7 @@ using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.Querying;
+using MediaBrowser.Model.Sync;
 using MoreLinq;
 using System;
 using System.Collections.Generic;
@@ -42,8 +44,9 @@ namespace MediaBrowser.Server.Implementations.Dto
         private readonly Func<IChannelManager> _channelManagerFactory;
         private readonly ISyncManager _syncManager;
         private readonly IApplicationHost _appHost;
+        private readonly Func<IDeviceManager> _deviceManager;
 
-        public DtoService(ILogger logger, ILibraryManager libraryManager, IUserDataManager userDataRepository, IItemRepository itemRepo, IImageProcessor imageProcessor, IServerConfigurationManager config, IFileSystem fileSystem, IProviderManager providerManager, Func<IChannelManager> channelManagerFactory, ISyncManager syncManager, IApplicationHost appHost)
+        public DtoService(ILogger logger, ILibraryManager libraryManager, IUserDataManager userDataRepository, IItemRepository itemRepo, IImageProcessor imageProcessor, IServerConfigurationManager config, IFileSystem fileSystem, IProviderManager providerManager, Func<IChannelManager> channelManagerFactory, ISyncManager syncManager, IApplicationHost appHost, Func<IDeviceManager> deviceManager)
         {
             _logger = logger;
             _libraryManager = libraryManager;
@@ -56,6 +59,7 @@ namespace MediaBrowser.Server.Implementations.Dto
             _channelManagerFactory = channelManagerFactory;
             _syncManager = syncManager;
             _appHost = appHost;
+            _deviceManager = deviceManager;
         }
 
         /// <summary>
@@ -73,10 +77,39 @@ namespace MediaBrowser.Server.Implementations.Dto
             {
                 Fields = fields
             };
-            
+
             return GetBaseItemDto(item, options, user, owner);
         }
 
+        public IEnumerable<BaseItemDto> GetBaseItemDtos(IEnumerable<BaseItem> items, DtoOptions options, User user = null, BaseItem owner = null)
+        {
+            var itemIdsWithSyncJobs = GetItemIdsWithSyncJobs(options).ToList();
+
+            var list = new List<BaseItemDto>();
+
+            foreach (var item in items)
+            {
+                var dto = GetBaseItemDtoInternal(item, options, user, owner);
+
+                var byName = item as IItemByName;
+
+                if (byName != null && !(item is LiveTvChannel))
+                {
+                    var libraryItems = user != null ?
+                       user.RootFolder.GetRecursiveChildren(user) :
+                       _libraryManager.RootFolder.RecursiveChildren;
+
+                    SetItemByNameInfo(item, dto, byName.GetTaggedItems(libraryItems).ToList(), user);
+                }
+
+                FillSyncInfo(dto, item, itemIdsWithSyncJobs, options);
+
+                list.Add(dto);
+            }
+
+            return list;
+        }
+
         public BaseItemDto GetBaseItemDto(BaseItem item, DtoOptions options, User user = null, BaseItem owner = null)
         {
             var dto = GetBaseItemDtoInternal(item, options, user, owner);
@@ -94,9 +127,64 @@ namespace MediaBrowser.Server.Implementations.Dto
                 return dto;
             }
 
+            FillSyncInfo(dto, item, options);
+
             return dto;
         }
 
+        private IEnumerable<string> GetItemIdsWithSyncJobs(DtoOptions options)
+        {
+            if (!options.Fields.Contains(ItemFields.SyncInfo))
+            {
+                return new List<string>();
+            }
+
+            var deviceId = options.DeviceId;
+            if (string.IsNullOrWhiteSpace(deviceId))
+            {
+                return new List<string>();
+            }
+
+            var caps = _deviceManager().GetCapabilities(deviceId);
+            if (caps == null || !caps.SupportsSync)
+            {
+                return new List<string>();
+            }
+
+            var result = _syncManager.GetLibraryItemIds(new SyncJobItemQuery
+            {
+                TargetId = deviceId
+            });
+
+            return result.Items;
+        }
+
+        private void FillSyncInfo(BaseItemDto dto, BaseItem item, DtoOptions options)
+        {
+            if (options.Fields.Contains(ItemFields.SyncInfo))
+            {
+                dto.SupportsSync = _syncManager.SupportsSync(item);
+            }
+
+            if (dto.SupportsSync ?? false)
+            {
+                dto.HasSyncJob = GetItemIdsWithSyncJobs(options).Contains(dto.Id, StringComparer.OrdinalIgnoreCase);
+            }
+        }
+
+        private void FillSyncInfo(BaseItemDto dto, BaseItem item, IEnumerable<string> itemIdsWithSyncJobs, DtoOptions options)
+        {
+            if (options.Fields.Contains(ItemFields.SyncInfo))
+            {
+                dto.SupportsSync = _syncManager.SupportsSync(item);
+            }
+
+            if (dto.SupportsSync ?? false)
+            {
+                dto.HasSyncJob = itemIdsWithSyncJobs.Contains(dto.Id, StringComparer.OrdinalIgnoreCase);
+            }
+        }
+
         private BaseItemDto GetBaseItemDtoInternal(BaseItem item, DtoOptions options, User user = null, BaseItem owner = null)
         {
             var fields = options.Fields;
@@ -167,11 +255,6 @@ namespace MediaBrowser.Server.Implementations.Dto
 
             AttachBasicFields(dto, item, owner, options);
 
-            if (fields.Contains(ItemFields.SyncInfo))
-            {
-                dto.SupportsSync = _syncManager.SupportsSync(item);
-            }
-
             if (fields.Contains(ItemFields.SoundtrackIds))
             {
                 var hasSoundtracks = item as IHasSoundtracks;
@@ -1029,7 +1112,7 @@ namespace MediaBrowser.Server.Implementations.Dto
 
                 //if (fields.Contains(ItemFields.MediaSourceCount))
                 //{
-                    // Songs always have one
+                // Songs always have one
                 //}
             }
 
diff --git a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
index 1306188dad..d93705a518 100644
--- a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
@@ -1575,7 +1575,7 @@ namespace MediaBrowser.Server.Implementations.Library
             CancellationToken cancellationToken)
         {
             var path = Path.Combine(ConfigurationManager.ApplicationPaths.ItemsByNamePath,
-                "views");
+                            "views");
 
             path = Path.Combine(path, _fileSystem.GetValidFilename(type));
 
diff --git a/MediaBrowser.Server.Implementations/Library/UserManager.cs b/MediaBrowser.Server.Implementations/Library/UserManager.cs
index c4c0e53950..6b6f5b1b63 100644
--- a/MediaBrowser.Server.Implementations/Library/UserManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/UserManager.cs
@@ -696,8 +696,7 @@ namespace MediaBrowser.Server.Implementations.Library
 
             var text = new StringBuilder();
 
-            var info = _appHost.GetSystemInfo();
-            var localAddress = info.LocalAddress ?? string.Empty;
+            var localAddress = _appHost.LocalApiUrl ?? string.Empty;
 
             text.AppendLine("Use your web browser to visit:");
             text.AppendLine(string.Empty);
diff --git a/MediaBrowser.Server.Implementations/Library/UserViewManager.cs b/MediaBrowser.Server.Implementations/Library/UserViewManager.cs
index 46c32cc562..bd0f44adc2 100644
--- a/MediaBrowser.Server.Implementations/Library/UserViewManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/UserViewManager.cs
@@ -1,6 +1,6 @@
-using MediaBrowser.Common.IO;
-using MediaBrowser.Controller;
-using MediaBrowser.Controller.Channels;
+using MediaBrowser.Controller.Channels;
+using MediaBrowser.Controller.Collections;
+using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Movies;
 using MediaBrowser.Controller.Library;
@@ -23,24 +23,24 @@ namespace MediaBrowser.Server.Implementations.Library
     {
         private readonly ILibraryManager _libraryManager;
         private readonly ILocalizationManager _localizationManager;
-        private readonly IFileSystem _fileSystem;
         private readonly IUserManager _userManager;
 
         private readonly IChannelManager _channelManager;
         private readonly ILiveTvManager _liveTvManager;
-        private readonly IServerApplicationPaths _appPaths;
         private readonly IPlaylistManager _playlists;
+        private readonly ICollectionManager _collectionManager;
+        private readonly IServerConfigurationManager _config;
 
-        public UserViewManager(ILibraryManager libraryManager, ILocalizationManager localizationManager, IFileSystem fileSystem, IUserManager userManager, IChannelManager channelManager, ILiveTvManager liveTvManager, IServerApplicationPaths appPaths, IPlaylistManager playlists)
+        public UserViewManager(ILibraryManager libraryManager, ILocalizationManager localizationManager, IUserManager userManager, IChannelManager channelManager, ILiveTvManager liveTvManager, IPlaylistManager playlists, ICollectionManager collectionManager, IServerConfigurationManager config)
         {
             _libraryManager = libraryManager;
             _localizationManager = localizationManager;
-            _fileSystem = fileSystem;
             _userManager = userManager;
             _channelManager = channelManager;
             _liveTvManager = liveTvManager;
-            _appPaths = appPaths;
             _playlists = playlists;
+            _collectionManager = collectionManager;
+            _config = config;
         }
 
         public async Task<IEnumerable<Folder>> GetUserViews(UserViewQuery query, CancellationToken cancellationToken)
@@ -88,12 +88,24 @@ namespace MediaBrowser.Server.Implementations.Library
                 list.Add(await GetUserView(CollectionType.Games, string.Empty, cancellationToken).ConfigureAwait(false));
             }
 
-            if (user.Configuration.DisplayCollectionsView &&
-                folders
-                .Except(standaloneFolders)
-                .SelectMany(i => i.GetRecursiveChildren(user, false)).OfType<BoxSet>().Any())
+            if (user.Configuration.DisplayCollectionsView)
             {
-                list.Add(await GetUserView(CollectionType.BoxSets, string.Empty, cancellationToken).ConfigureAwait(false));
+                bool showCollectionView;
+                if (_config.Configuration.EnableLegacyCollections)
+                {
+                    showCollectionView = folders
+                        .Except(standaloneFolders)
+                        .SelectMany(i => i.GetRecursiveChildren(user, false)).OfType<BoxSet>().Any();
+                }
+                else
+                {
+                    showCollectionView = _collectionManager.GetCollections(user).Any();
+                }
+
+                if (showCollectionView)
+                {
+                    list.Add(await GetUserView(CollectionType.BoxSets, string.Empty, cancellationToken).ConfigureAwait(false));
+                }
             }
 
             if (foldersWithViewTypes.Any(i => string.Equals(i.CollectionType, CollectionType.Playlists, StringComparison.OrdinalIgnoreCase)))
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/server.json b/MediaBrowser.Server.Implementations/Localization/Server/server.json
index 576e0493e2..34a0b327d3 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/server.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/server.json
@@ -56,7 +56,7 @@
     "HeaderVideo": "Video",
     "HeaderPaths": "Paths",
     "LabelSyncTempPath": "Temporary file path:",
-    "LabelSyncTempPathHelp": "",
+    "LabelSyncTempPathHelp": "Specify a custom sync working folder. Converted media created during the sync process will be stored here.",
     "LabelCustomCertificatePath": "Custom certificate path:",
     "LabelCustomCertificatePathHelp": "Supply your own ssl certificate. If omitted, the server will create a self-signed certificate.",
     "TitleNotifications": "Notifications",
@@ -891,7 +891,7 @@
     "OptionCommunityMostWatchedSort": "Most Watched",
     "TabNextUp": "Next Up",
     "HeaderBecomeMediaBrowserSupporter": "Become a Media Browser Supporter",
-    "TextAccessPremiumFeatures":  "Enjoy Premium Features",
+    "TextAccessPremiumFeatures": "Enjoy Premium Features",
     "MessageNoMovieSuggestionsAvailable": "No movie suggestions are currently available. Start watching and rating your movies, and then come back to view your recommendations.",
     "MessageNoCollectionsAvailable": "Collections allow you to enjoy personalized groupings of Movies, Series, Albums, Books and Games. Click the + button to start creating Collections.",
     "MessageNoPlaylistsAvailable": "Playlists allow you to create lists of content to play consecutively at a time. To add items to playlists, right click or tap and hold, then select Add to Playlist.",
diff --git a/MediaBrowser.Server.Implementations/Sync/SyncManager.cs b/MediaBrowser.Server.Implementations/Sync/SyncManager.cs
index b5e29533bb..cdbb0d5e5c 100644
--- a/MediaBrowser.Server.Implementations/Sync/SyncManager.cs
+++ b/MediaBrowser.Server.Implementations/Sync/SyncManager.cs
@@ -720,5 +720,10 @@ namespace MediaBrowser.Server.Implementations.Sync
 
             await processor.UpdateJobStatus(jobItem.JobId).ConfigureAwait(false);
         }
+
+        public QueryResult<string> GetLibraryItemIds(SyncJobItemQuery query)
+        {
+            return _repo.GetLibraryItemIds(query);
+        }
     }
 }
diff --git a/MediaBrowser.Server.Implementations/Sync/SyncRepository.cs b/MediaBrowser.Server.Implementations/Sync/SyncRepository.cs
index 0e527ea540..6d77749e03 100644
--- a/MediaBrowser.Server.Implementations/Sync/SyncRepository.cs
+++ b/MediaBrowser.Server.Implementations/Sync/SyncRepository.cs
@@ -459,7 +459,7 @@ namespace MediaBrowser.Server.Implementations.Sync
             return null;
         }
 
-        public QueryResult<SyncJobItem> GetJobItems(SyncJobItemQuery query)
+        private QueryResult<T> GetJobItemReader<T>(SyncJobItemQuery query, string baseSelectText, Func<IDataReader, T> itemFactory)
         {
             if (query == null)
             {
@@ -468,7 +468,7 @@ namespace MediaBrowser.Server.Implementations.Sync
 
             using (var cmd = _connection.CreateCommand())
             {
-                cmd.CommandText = BaseJobItemSelectText;
+                cmd.CommandText = baseSelectText;
 
                 var whereClauses = new List<string>();
 
@@ -515,14 +515,14 @@ namespace MediaBrowser.Server.Implementations.Sync
 
                 cmd.CommandText += "; select count (Id) from SyncJobItems" + whereTextWithoutPaging;
 
-                var list = new List<SyncJobItem>();
+                var list = new List<T>();
                 var count = 0;
 
                 using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess))
                 {
                     while (reader.Read())
                     {
-                        list.Add(GetJobItem(reader));
+                        list.Add(itemFactory(reader));
                     }
 
                     if (reader.NextResult() && reader.Read())
@@ -531,7 +531,7 @@ namespace MediaBrowser.Server.Implementations.Sync
                     }
                 }
 
-                return new QueryResult<SyncJobItem>()
+                return new QueryResult<T>()
                 {
                     Items = list.ToArray(),
                     TotalRecordCount = count
@@ -539,6 +539,16 @@ namespace MediaBrowser.Server.Implementations.Sync
             }
         }
 
+        public QueryResult<string> GetLibraryItemIds(SyncJobItemQuery query)
+        {
+            return GetJobItemReader(query, "select ItemId from SyncJobItems", GetItemId);
+        }
+
+        public QueryResult<SyncJobItem> GetJobItems(SyncJobItemQuery query)
+        {
+            return GetJobItemReader(query, BaseJobItemSelectText, GetJobItem);
+        }
+
         public Task Create(SyncJobItem jobItem)
         {
             return Update(jobItem);
@@ -679,10 +689,15 @@ namespace MediaBrowser.Server.Implementations.Sync
 
             info.IsMarkedForRemoval = reader.GetBoolean(13);
             info.JobItemIndex = reader.GetInt32(14);
-          
+
             return info;
         }
 
+        private string GetItemId(IDataReader reader)
+        {
+            return reader.GetString(0);
+        }
+
         /// <summary>
         /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
         /// </summary>
diff --git a/MediaBrowser.Server.Implementations/Udp/UdpServer.cs b/MediaBrowser.Server.Implementations/Udp/UdpServer.cs
index 91a4940ae3..9dbffa9222 100644
--- a/MediaBrowser.Server.Implementations/Udp/UdpServer.cs
+++ b/MediaBrowser.Server.Implementations/Udp/UdpServer.cs
@@ -83,9 +83,7 @@ namespace MediaBrowser.Server.Implementations.Udp
 
         private async void RespondToV1Message(string endpoint)
         {
-            var info = _appHost.GetSystemInfo();
-
-            var localAddress = info.LocalAddress;
+            var localAddress = _appHost.LocalApiUrl;
 
             if (!string.IsNullOrEmpty(localAddress))
             {
@@ -110,15 +108,15 @@ namespace MediaBrowser.Server.Implementations.Udp
 
         private async void RespondToV2Message(string endpoint)
         {
-            var info = _appHost.GetSystemInfo();
+            var localUrl = _appHost.LocalApiUrl;
 
-            if (!string.IsNullOrEmpty(info.LocalAddress))
+            if (!string.IsNullOrEmpty(localUrl))
             {
                 var response = new ServerDiscoveryInfo
                 {
-                    Address = info.LocalAddress,
-                    Id = info.Id,
-                    Name = info.ServerName
+                    Address = localUrl,
+                    Id = _appHost.SystemId,
+                    Name = _appHost.FriendlyName
                 };
 
                 await SendAsync(Encoding.UTF8.GetBytes(_json.SerializeToString(response)), endpoint);
diff --git a/MediaBrowser.Server.Startup.Common/ApplicationHost.cs b/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
index 439d74ab90..5726e17554 100644
--- a/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
+++ b/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
@@ -446,7 +446,7 @@ namespace MediaBrowser.Server.Startup.Common
             SyncManager = new SyncManager(LibraryManager, SyncRepository, ImageProcessor, LogManager.GetLogger("SyncManager"), UserManager, () => DtoService, this, TVSeriesManager, () => MediaEncoder, FileSystemManager, () => SubtitleEncoder, ServerConfigurationManager);
             RegisterSingleInstance(SyncManager);
 
-            DtoService = new DtoService(Logger, LibraryManager, UserDataManager, ItemRepository, ImageProcessor, ServerConfigurationManager, FileSystemManager, ProviderManager, () => ChannelManager, SyncManager, this);
+            DtoService = new DtoService(Logger, LibraryManager, UserDataManager, ItemRepository, ImageProcessor, ServerConfigurationManager, FileSystemManager, ProviderManager, () => ChannelManager, SyncManager, this, () => DeviceManager);
             RegisterSingleInstance(DtoService);
 
             var encryptionManager = new EncryptionManager();
@@ -490,7 +490,7 @@ namespace MediaBrowser.Server.Startup.Common
             LiveTvManager = new LiveTvManager(this, ServerConfigurationManager, FileSystemManager, Logger, ItemRepository, ImageProcessor, UserDataManager, DtoService, UserManager, LibraryManager, TaskManager, LocalizationManager, JsonSerializer);
             RegisterSingleInstance(LiveTvManager);
 
-            UserViewManager = new UserViewManager(LibraryManager, LocalizationManager, FileSystemManager, UserManager, ChannelManager, LiveTvManager, ApplicationPaths, playlistManager);
+            UserViewManager = new UserViewManager(LibraryManager, LocalizationManager, UserManager, ChannelManager, LiveTvManager, playlistManager, CollectionManager, ServerConfigurationManager);
             RegisterSingleInstance(UserViewManager);
 
             var contentDirectory = new ContentDirectory(dlnaManager, UserDataManager, ImageProcessor, LibraryManager, ServerConfigurationManager, UserManager, LogManager.GetLogger("UpnpContentDirectory"), HttpClient, LocalizationManager, ChannelManager);
@@ -1019,7 +1019,7 @@ namespace MediaBrowser.Server.Startup.Common
                 IsRunningAsService = IsRunningAsService,
                 SupportsRunningAsService = SupportsRunningAsService,
                 ServerName = FriendlyName,
-                LocalAddress = GetLocalIpAddress()
+                LocalAddress = LocalApiUrl
             };
         }
 
@@ -1036,26 +1036,33 @@ namespace MediaBrowser.Server.Startup.Common
             get { return !string.IsNullOrWhiteSpace(HttpServer.CertificatePath); }
         }
 
-        /// <summary>
-        /// Gets the local ip address.
-        /// </summary>
-        /// <returns>System.String.</returns>
-        private string GetLocalIpAddress()
+        public string LocalApiUrl
         {
-            // Return the first matched address, if found, or the first known local address
-            var address = HttpServerIpAddresses.FirstOrDefault();
-
-            if (!string.IsNullOrWhiteSpace(address))
+            get
             {
-                address = string.Format("http://{0}:{1}",
-                    address,
-                    HttpPort.ToString(CultureInfo.InvariantCulture));
+                // Return the first matched address, if found, or the first known local address
+                var address = LocalIpAddress;
+
+                if (!string.IsNullOrWhiteSpace(address))
+                {
+                    address = string.Format("http://{0}:{1}",
+                        address,
+                        HttpPort.ToString(CultureInfo.InvariantCulture));
+                }
+
+                return address;
             }
+        }
 
-            return address;
+        public string LocalIpAddress
+        {
+            get
+            {
+                return HttpServerIpAddresses.FirstOrDefault();
+            }
         }
 
-        public IEnumerable<string> HttpServerIpAddresses
+        private IEnumerable<string> HttpServerIpAddresses
         {
             get
             {
diff --git a/MediaBrowser.sln b/MediaBrowser.sln
index b25eb58ba7..f73971374a 100644
--- a/MediaBrowser.sln
+++ b/MediaBrowser.sln
@@ -10,6 +10,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		Performance1.psess = Performance1.psess
 		Performance19.psess = Performance19.psess
 		Performance2.psess = Performance2.psess
+		Performance3.psess = Performance3.psess
+		Performance4.psess = Performance4.psess
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget (2)", ".nuget (2)", "{E60FB157-87E2-4A41-8B04-27EA49B63B4D}"
@@ -518,4 +520,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(Performance) = preSolution
+		HasPerformanceSessions = true
+	EndGlobalSection
 EndGlobal