From 9e809b06c4132514cfdbba29c2121035d4555247 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Tue, 20 Jan 2015 16:32:48 -0500
Subject: separate task buttons script

---
 .../ScheduledTasks/ScheduledTaskService.cs         | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

(limited to 'MediaBrowser.Api/ScheduledTasks/ScheduledTaskService.cs')

diff --git a/MediaBrowser.Api/ScheduledTasks/ScheduledTaskService.cs b/MediaBrowser.Api/ScheduledTasks/ScheduledTaskService.cs
index a05be024e..f5b3d173b 100644
--- a/MediaBrowser.Api/ScheduledTasks/ScheduledTaskService.cs
+++ b/MediaBrowser.Api/ScheduledTasks/ScheduledTaskService.cs
@@ -32,6 +32,9 @@ namespace MediaBrowser.Api.ScheduledTasks
     {
         [ApiMember(Name = "IsHidden", Description = "Optional filter tasks that are hidden, or not.", IsRequired = false, DataType = "bool", ParameterType = "query", Verb = "GET")]
         public bool? IsHidden { get; set; }
+
+        [ApiMember(Name = "IsEnabled", Description = "Optional filter tasks that are enabled, or not.", IsRequired = false, DataType = "bool", ParameterType = "query", Verb = "GET")]
+        public bool? IsEnabled { get; set; }
     }
 
     /// <summary>
@@ -132,6 +135,25 @@ namespace MediaBrowser.Api.ScheduledTasks
                 });
             }
 
+            if (request.IsEnabled.HasValue)
+            {
+                var val = request.IsEnabled.Value;
+
+                result = result.Where(i =>
+                {
+                    var isEnabled = false;
+
+                    var configurableTask = i.ScheduledTask as IConfigurableScheduledTask;
+
+                    if (configurableTask != null)
+                    {
+                        isEnabled = configurableTask.IsEnabled;
+                    }
+
+                    return isEnabled == val;
+                });
+            }
+            
             var infos = result
                 .Select(ScheduledTaskHelpers.GetTaskInfo)
                 .ToList();
-- 
cgit v1.2.3


From f636c10e24a6f26f1c8e41ba6d3751334d6dcb90 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Tue, 20 Jan 2015 22:54:45 -0500
Subject: sync updates

---
 .../Library/LibraryStructureService.cs             | 32 +-------
 .../ScheduledTasks/ScheduledTaskService.cs         |  2 +-
 MediaBrowser.Api/StartupWizardService.cs           |  1 +
 MediaBrowser.Api/Sync/SyncService.cs               | 28 +++++++
 MediaBrowser.Controller/Channels/Channel.cs        | 14 +++-
 MediaBrowser.Controller/Entities/Folder.cs         | 21 +++++-
 MediaBrowser.Controller/Library/ILibraryManager.cs |  9 +--
 MediaBrowser.Controller/Sync/ISyncManager.cs       | 19 +++++
 .../Configuration/ServerConfiguration.cs           |  1 +
 MediaBrowser.Model/Sync/SyncJobItem.cs             |  2 +
 .../Configuration/ServerConfigurationManager.cs    | 12 ++-
 .../Library/LibraryManager.cs                      | 12 +--
 .../Library/UserManager.cs                         | 88 +---------------------
 .../Localization/JavaScript/javascript.json        |  5 ++
 .../Sync/SyncJobProcessor.cs                       | 20 +++--
 .../Sync/SyncManager.cs                            | 83 +++++++++++++++++++-
 .../Sync/SyncRepository.cs                         | 12 ++-
 .../ApplicationHost.cs                             |  2 +-
 18 files changed, 206 insertions(+), 157 deletions(-)

(limited to 'MediaBrowser.Api/ScheduledTasks/ScheduledTaskService.cs')

diff --git a/MediaBrowser.Api/Library/LibraryStructureService.cs b/MediaBrowser.Api/Library/LibraryStructureService.cs
index 23f4e4e5c..27944a4ea 100644
--- a/MediaBrowser.Api/Library/LibraryStructureService.cs
+++ b/MediaBrowser.Api/Library/LibraryStructureService.cs
@@ -3,7 +3,6 @@ using MediaBrowser.Controller;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Net;
 using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.Logging;
 using ServiceStack;
 using System;
 using System.Collections.Generic;
@@ -18,7 +17,6 @@ namespace MediaBrowser.Api.Library
     /// Class GetDefaultVirtualFolders
     /// </summary>
     [Route("/Library/VirtualFolders", "GET")]
-    [Route("/Users/{UserId}/VirtualFolders", "GET")]
     public class GetVirtualFolders : IReturn<List<VirtualFolderInfo>>
     {
         /// <summary>
@@ -143,11 +141,6 @@ namespace MediaBrowser.Api.Library
         /// </summary>
         private readonly IServerApplicationPaths _appPaths;
 
-        /// <summary>
-        /// The _user manager
-        /// </summary>
-        private readonly IUserManager _userManager;
-
         /// <summary>
         /// The _library manager
         /// </summary>
@@ -156,27 +149,21 @@ namespace MediaBrowser.Api.Library
         private readonly ILibraryMonitor _libraryMonitor;
 
         private readonly IFileSystem _fileSystem;
-        private readonly ILogger _logger;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="LibraryStructureService"/> class.
+        /// Initializes a new instance of the <see cref="LibraryStructureService" /> class.
         /// </summary>
-        /// <param name="appPaths">The app paths.</param>
-        /// <param name="userManager">The user manager.</param>
-        /// <param name="libraryManager">The library manager.</param>
-        public LibraryStructureService(IServerApplicationPaths appPaths, IUserManager userManager, ILibraryManager libraryManager, ILibraryMonitor libraryMonitor, IFileSystem fileSystem, ILogger logger)
+        public LibraryStructureService(IServerApplicationPaths appPaths, ILibraryManager libraryManager, ILibraryMonitor libraryMonitor, IFileSystem fileSystem)
         {
             if (appPaths == null)
             {
                 throw new ArgumentNullException("appPaths");
             }
 
-            _userManager = userManager;
             _appPaths = appPaths;
             _libraryManager = libraryManager;
             _libraryMonitor = libraryMonitor;
             _fileSystem = fileSystem;
-            _logger = logger;
         }
 
         /// <summary>
@@ -186,20 +173,9 @@ namespace MediaBrowser.Api.Library
         /// <returns>System.Object.</returns>
         public object Get(GetVirtualFolders request)
         {
-            if (string.IsNullOrEmpty(request.UserId))
-            {
-                var result = _libraryManager.GetDefaultVirtualFolders().OrderBy(i => i.Name).ToList();
+            var result = _libraryManager.GetVirtualFolders().OrderBy(i => i.Name).ToList();
 
-                return ToOptimizedSerializedResultUsingCache(result);
-            }
-            else
-            {
-                var user = _userManager.GetUserById(request.UserId);
-
-                var result = _libraryManager.GetVirtualFolders(user).OrderBy(i => i.Name).ToList();
-
-                return ToOptimizedSerializedResultUsingCache(result);
-            }
+            return ToOptimizedSerializedResultUsingCache(result);
         }
 
         /// <summary>
diff --git a/MediaBrowser.Api/ScheduledTasks/ScheduledTaskService.cs b/MediaBrowser.Api/ScheduledTasks/ScheduledTaskService.cs
index f5b3d173b..947b99d35 100644
--- a/MediaBrowser.Api/ScheduledTasks/ScheduledTaskService.cs
+++ b/MediaBrowser.Api/ScheduledTasks/ScheduledTaskService.cs
@@ -141,7 +141,7 @@ namespace MediaBrowser.Api.ScheduledTasks
 
                 result = result.Where(i =>
                 {
-                    var isEnabled = false;
+                    var isEnabled = true;
 
                     var configurableTask = i.ScheduledTask as IConfigurableScheduledTask;
 
diff --git a/MediaBrowser.Api/StartupWizardService.cs b/MediaBrowser.Api/StartupWizardService.cs
index 97401bbf8..cb0c54674 100644
--- a/MediaBrowser.Api/StartupWizardService.cs
+++ b/MediaBrowser.Api/StartupWizardService.cs
@@ -63,6 +63,7 @@ namespace MediaBrowser.Api
             _config.Configuration.IsStartupWizardCompleted = true;
             _config.Configuration.EnableLocalizedGuids = true;
             _config.Configuration.StoreArtistsInMetadata = true;
+            _config.Configuration.EnableStandaloneMetadata = true;
             _config.Configuration.EnableLibraryMetadataSubFolder = true;
             _config.SaveConfiguration();
         }
diff --git a/MediaBrowser.Api/Sync/SyncService.cs b/MediaBrowser.Api/Sync/SyncService.cs
index 8d5ec824f..c763aa8df 100644
--- a/MediaBrowser.Api/Sync/SyncService.cs
+++ b/MediaBrowser.Api/Sync/SyncService.cs
@@ -37,6 +37,20 @@ namespace MediaBrowser.Api.Sync
     {
     }
 
+    [Route("/Sync/JobItems/{Id}/Enable", "POST", Summary = "Enables a cancelled or queued sync job item")]
+    public class EnableSyncJobItem : IReturnVoid
+    {
+        [ApiMember(Name = "Id", Description = "Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")]
+        public string Id { get; set; }
+    }
+
+    [Route("/Sync/JobItems/{Id}", "DELETE", Summary = "Cancels a sync job item")]
+    public class CancelSyncJobItem : IReturnVoid
+    {
+        [ApiMember(Name = "Id", Description = "Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "DELETE")]
+        public string Id { get; set; }
+    }
+
     [Route("/Sync/Jobs", "GET", Summary = "Gets sync jobs.")]
     public class GetSyncJobs : SyncJobQuery, IReturn<QueryResult<SyncJob>>
     {
@@ -271,5 +285,19 @@ namespace MediaBrowser.Api.Sync
 
             return ToStaticFileResult(file.Path);
         }
+
+        public void Post(EnableSyncJobItem request)
+        {
+            var task = _syncManager.ReEnableJobItem(request.Id);
+
+            Task.WaitAll(task);
+        }
+
+        public void Delete(CancelSyncJobItem request)
+        {
+            var task = _syncManager.CancelJobItem(request.Id);
+
+            Task.WaitAll(task);
+        }
     }
 }
diff --git a/MediaBrowser.Controller/Channels/Channel.cs b/MediaBrowser.Controller/Channels/Channel.cs
index 6ee6fe006..32ad2ff12 100644
--- a/MediaBrowser.Controller/Channels/Channel.cs
+++ b/MediaBrowser.Controller/Channels/Channel.cs
@@ -14,9 +14,19 @@ namespace MediaBrowser.Controller.Channels
 
         public override bool IsVisible(User user)
         {
-            if (!user.Policy.EnableAllChannels && !user.Policy.EnabledChannels.Contains(Id.ToString("N"), StringComparer.OrdinalIgnoreCase))
+            if (user.Policy.BlockedChannels != null)
             {
-                return false;
+                if (user.Policy.BlockedChannels.Contains(Id.ToString("N"), StringComparer.OrdinalIgnoreCase))
+                {
+                    return false;
+                }
+            }
+            else
+            {
+                if (!user.Policy.EnableAllChannels && !user.Policy.EnabledChannels.Contains(Id.ToString("N"), StringComparer.OrdinalIgnoreCase))
+                {
+                    return false;
+                }
             }
             
             return base.IsVisible(user);
diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs
index 8faab4c36..005f263f7 100644
--- a/MediaBrowser.Controller/Entities/Folder.cs
+++ b/MediaBrowser.Controller/Entities/Folder.cs
@@ -303,9 +303,22 @@ namespace MediaBrowser.Controller.Entities
         {
             if (this is ICollectionFolder)
             {
-                if (!user.Policy.EnableAllFolders && !user.Policy.EnabledFolders.Contains(Id.ToString("N"), StringComparer.OrdinalIgnoreCase))
+                if (user.Policy.BlockedMediaFolders != null)
                 {
-                    return false;
+                    if (user.Policy.BlockedMediaFolders.Contains(Id.ToString("N"), StringComparer.OrdinalIgnoreCase) ||
+
+                        // Backwards compatibility
+                        user.Policy.BlockedMediaFolders.Contains(Name, StringComparer.OrdinalIgnoreCase))
+                    {
+                        return false;
+                    }
+                }
+                else
+                {
+                    if (!user.Policy.EnableAllFolders && !user.Policy.EnabledFolders.Contains(Id.ToString("N"), StringComparer.OrdinalIgnoreCase))
+                    {
+                        return false;
+                    }
                 }
             }
 
@@ -675,12 +688,12 @@ namespace MediaBrowser.Controller.Entities
                 path = System.IO.Path.GetDirectoryName(path);
             }
 
-            if (ContainsPath(LibraryManager.GetDefaultVirtualFolders(), originalPath))
+            if (ContainsPath(LibraryManager.GetVirtualFolders(), originalPath))
             {
                 return true;
             }
 
-            return UserManager.Users.Any(user => ContainsPath(LibraryManager.GetVirtualFolders(user), originalPath));
+            return ContainsPath(LibraryManager.GetVirtualFolders(), originalPath);
         }
 
         /// <summary>
diff --git a/MediaBrowser.Controller/Library/ILibraryManager.cs b/MediaBrowser.Controller/Library/ILibraryManager.cs
index 2ebd1cab9..9871ef3c5 100644
--- a/MediaBrowser.Controller/Library/ILibraryManager.cs
+++ b/MediaBrowser.Controller/Library/ILibraryManager.cs
@@ -123,14 +123,7 @@ namespace MediaBrowser.Controller.Library
         /// Gets the default view.
         /// </summary>
         /// <returns>IEnumerable{VirtualFolderInfo}.</returns>
-        IEnumerable<VirtualFolderInfo> GetDefaultVirtualFolders();
-
-        /// <summary>
-        /// Gets the view.
-        /// </summary>
-        /// <param name="user">The user.</param>
-        /// <returns>IEnumerable{VirtualFolderInfo}.</returns>
-        IEnumerable<VirtualFolderInfo> GetVirtualFolders(User user);
+        IEnumerable<VirtualFolderInfo> GetVirtualFolders();
 
         /// <summary>
         /// Gets the item by id.
diff --git a/MediaBrowser.Controller/Sync/ISyncManager.cs b/MediaBrowser.Controller/Sync/ISyncManager.cs
index 59136c0e6..8e4b6a44a 100644
--- a/MediaBrowser.Controller/Sync/ISyncManager.cs
+++ b/MediaBrowser.Controller/Sync/ISyncManager.cs
@@ -1,8 +1,10 @@
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Model.Dlna;
+using MediaBrowser.Model.Events;
 using MediaBrowser.Model.Querying;
 using MediaBrowser.Model.Sync;
 using MediaBrowser.Model.Users;
+using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
@@ -10,6 +12,9 @@ namespace MediaBrowser.Controller.Sync
 {
     public interface ISyncManager
     {
+        event EventHandler<GenericEventArgs<SyncJob>> SyncJobCreated;
+        event EventHandler<GenericEventArgs<SyncJob>> SyncJobCancelled;
+          
         /// <summary>
         /// Creates the job.
         /// </summary>
@@ -44,6 +49,20 @@ namespace MediaBrowser.Controller.Sync
         /// <returns>Task.</returns>
         Task UpdateJob(SyncJob job);
 
+        /// <summary>
+        /// Res the enable job item.
+        /// </summary>
+        /// <param name="id">The identifier.</param>
+        /// <returns>Task.</returns>
+        Task ReEnableJobItem(string id);
+
+        /// <summary>
+        /// Cnacels the job item.
+        /// </summary>
+        /// <param name="id">The identifier.</param>
+        /// <returns>Task.</returns>
+        Task CancelJobItem(string id);
+        
         /// <summary>
         /// Cancels the job.
         /// </summary>
diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index 71580f353..c641edff7 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -169,6 +169,7 @@ namespace MediaBrowser.Model.Configuration
         public string DashboardSourcePath { get; set; }
 
         public bool StoreArtistsInMetadata { get; set; }
+        public bool EnableStandaloneMetadata { get; set; }
 
         /// <summary>
         /// Gets or sets the image saving convention.
diff --git a/MediaBrowser.Model/Sync/SyncJobItem.cs b/MediaBrowser.Model/Sync/SyncJobItem.cs
index 943014c0d..133065bf9 100644
--- a/MediaBrowser.Model/Sync/SyncJobItem.cs
+++ b/MediaBrowser.Model/Sync/SyncJobItem.cs
@@ -88,6 +88,8 @@ namespace MediaBrowser.Model.Sync
         public string TemporaryPath { get; set; }
         public List<ItemFileInfo> AdditionalFiles { get; set; }
 
+        public bool IsMarkedForRemoval { get; set; }
+
         public SyncJobItem()
         {
             AdditionalFiles = new List<ItemFileInfo>();
diff --git a/MediaBrowser.Server.Implementations/Configuration/ServerConfigurationManager.cs b/MediaBrowser.Server.Implementations/Configuration/ServerConfigurationManager.cs
index b3b8ccbd8..5f7ccec4b 100644
--- a/MediaBrowser.Server.Implementations/Configuration/ServerConfigurationManager.cs
+++ b/MediaBrowser.Server.Implementations/Configuration/ServerConfigurationManager.cs
@@ -99,10 +99,20 @@ namespace MediaBrowser.Server.Implementations.Configuration
         private void UpdateMetadataPath()
         {
             ((ServerApplicationPaths)ApplicationPaths).InternalMetadataPath = string.IsNullOrEmpty(Configuration.MetadataPath) ?
-                null :
+                GetInternalMetadataPath() :
                 Configuration.MetadataPath;
         }
 
+        private string GetInternalMetadataPath()
+        {
+            if (Configuration.EnableStandaloneMetadata)
+            {
+                return Path.Combine(ApplicationPaths.ProgramDataPath, "metadata");
+            }
+
+            return null;
+        }
+
         /// <summary>
         /// Updates the transcoding temporary path.
         /// </summary>
diff --git a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
index eaab469f5..b28c98728 100644
--- a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
@@ -1124,21 +1124,11 @@ namespace MediaBrowser.Server.Implementations.Library
         /// Gets the default view.
         /// </summary>
         /// <returns>IEnumerable{VirtualFolderInfo}.</returns>
-        public IEnumerable<VirtualFolderInfo> GetDefaultVirtualFolders()
+        public IEnumerable<VirtualFolderInfo> GetVirtualFolders()
         {
             return GetView(ConfigurationManager.ApplicationPaths.DefaultUserViewsPath);
         }
 
-        /// <summary>
-        /// Gets the view.
-        /// </summary>
-        /// <param name="user">The user.</param>
-        /// <returns>IEnumerable{VirtualFolderInfo}.</returns>
-        public IEnumerable<VirtualFolderInfo> GetVirtualFolders(User user)
-        {
-            return GetDefaultVirtualFolders();
-        }
-
         /// <summary>
         /// Gets the view.
         /// </summary>
diff --git a/MediaBrowser.Server.Implementations/Library/UserManager.cs b/MediaBrowser.Server.Implementations/Library/UserManager.cs
index 3020a224d..c4c0e5395 100644
--- a/MediaBrowser.Server.Implementations/Library/UserManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/UserManager.cs
@@ -3,7 +3,6 @@ using MediaBrowser.Common.Extensions;
 using MediaBrowser.Common.IO;
 using MediaBrowser.Common.Net;
 using MediaBrowser.Controller;
-using MediaBrowser.Controller.Channels;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Connect;
 using MediaBrowser.Controller.Drawing;
@@ -13,7 +12,6 @@ using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Net;
 using MediaBrowser.Controller.Persistence;
 using MediaBrowser.Controller.Providers;
-using MediaBrowser.Model.Channels;
 using MediaBrowser.Model.Configuration;
 using MediaBrowser.Model.Connect;
 using MediaBrowser.Model.Dto;
@@ -72,12 +70,10 @@ namespace MediaBrowser.Server.Implementations.Library
         private readonly Func<IImageProcessor> _imageProcessorFactory;
         private readonly Func<IDtoService> _dtoServiceFactory;
         private readonly Func<IConnectManager> _connectFactory;
-        private readonly Func<IChannelManager> _channelManager;
-        private readonly Func<ILibraryManager> _libraryManager;
         private readonly IServerApplicationHost _appHost;
         private readonly IFileSystem _fileSystem;
 
-        public UserManager(ILogger logger, IServerConfigurationManager configurationManager, IUserRepository userRepository, IXmlSerializer xmlSerializer, INetworkManager networkManager, Func<IImageProcessor> imageProcessorFactory, Func<IDtoService> dtoServiceFactory, Func<IConnectManager> connectFactory, IServerApplicationHost appHost, IJsonSerializer jsonSerializer, IFileSystem fileSystem, Func<IChannelManager> channelManager, Func<ILibraryManager> libraryManager)
+        public UserManager(ILogger logger, IServerConfigurationManager configurationManager, IUserRepository userRepository, IXmlSerializer xmlSerializer, INetworkManager networkManager, Func<IImageProcessor> imageProcessorFactory, Func<IDtoService> dtoServiceFactory, Func<IConnectManager> connectFactory, IServerApplicationHost appHost, IJsonSerializer jsonSerializer, IFileSystem fileSystem)
         {
             _logger = logger;
             UserRepository = userRepository;
@@ -89,8 +85,6 @@ namespace MediaBrowser.Server.Implementations.Library
             _appHost = appHost;
             _jsonSerializer = jsonSerializer;
             _fileSystem = fileSystem;
-            _channelManager = channelManager;
-            _libraryManager = libraryManager;
             ConfigurationManager = configurationManager;
             Users = new List<User>();
 
@@ -174,8 +168,6 @@ namespace MediaBrowser.Server.Implementations.Library
             foreach (var user in users)
             {
                 await DoPolicyMigration(user).ConfigureAwait(false);
-                await DoChannelMigration(user).ConfigureAwait(false);
-                await DoLibraryMigration(user).ConfigureAwait(false);
             }
 
             // If there are no local users with admin rights, make them all admins
@@ -354,84 +346,6 @@ namespace MediaBrowser.Server.Implementations.Library
             }
         }
 
-        private async Task DoChannelMigration(User user)
-        {
-            if (user.Policy.BlockedChannels != null)
-            {
-                if (user.Policy.BlockedChannels.Length > 0)
-                {
-                    user.Policy.EnableAllChannels = false;
-
-                    try
-                    {
-                        var channelResult = await _channelManager().GetChannelsInternal(new ChannelQuery
-                        {
-                            UserId = user.Id.ToString("N")
-
-                        }, CancellationToken.None).ConfigureAwait(false);
-
-                        user.Policy.EnabledChannels = channelResult.Items
-                            .Select(i => i.Id.ToString("N"))
-                            .Except(user.Policy.BlockedChannels)
-                            .ToArray();
-                    }
-                    catch
-                    {
-                        user.Policy.EnabledChannels = new string[] { };
-                    }
-                }
-                else
-                {
-                    user.Policy.EnableAllChannels = true;
-                    user.Policy.EnabledChannels = new string[] { };
-                }
-
-                user.Policy.BlockedChannels = null;
-
-                await UpdateUserPolicy(user, user.Policy, false);
-            }
-        }
-
-        private async Task DoLibraryMigration(User user)
-        {
-            if (user.Policy.BlockedMediaFolders != null)
-            {
-                if (user.Policy.BlockedMediaFolders.Length > 0)
-                {
-                    user.Policy.EnableAllFolders = false;
-
-                    try
-                    {
-                        user.Policy.EnabledFolders = _libraryManager().RootFolder
-                            .Children
-                            .Where(i => !user.Policy.BlockedMediaFolders.Contains(i.Name, StringComparer.OrdinalIgnoreCase) && !user.Policy.BlockedMediaFolders.Contains(i.Id.ToString("N"), StringComparer.OrdinalIgnoreCase))
-                            .Select(i => i.Id.ToString("N"))
-                            .ToArray();
-                    }
-                    catch
-                    {
-                        user.Policy.EnabledFolders = new string[] { };
-                        user.Policy.EnableAllFolders = true;
-                    }
-                }
-                else
-                {
-                    user.Policy.EnableAllFolders = true;
-                    user.Policy.EnabledFolders = new string[] { };
-                }
-
-                // Just to be safe
-                if (user.Policy.EnabledFolders.Length == 0)
-                {
-                    user.Policy.EnableAllFolders = true;
-                }
-
-                user.Policy.BlockedMediaFolders = null;
-
-                await UpdateUserPolicy(user, user.Policy, false);
-            }
-        }
-
         public UserDto GetUserDto(User user, string remoteEndPoint = null)
         {
             if (user == null)
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
index afc9bff62..e4d20d3a1 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
@@ -56,6 +56,9 @@
     "HeaderChannelAccess": "Channel Access",
     "HeaderDeviceAccess": "Device Access",
     "HeaderSelectDevices": "Select Devices",
+    "ButtonCancelItem": "Cancel item",
+    "ButtonQueueForRetry": "Queue for retry",
+    "ButtonReenable": "Re-enable",
     "LabelAbortedByServerShutdown": "(Aborted by server shutdown)",
     "LabelScheduledTaskLastRan": "Last ran {0}, taking {1}.",
     "HeaderDeleteTaskTrigger": "Delete Task Trigger",
@@ -71,6 +74,8 @@
     "LabelForcedStream": "(Forced)",
     "LabelDefaultForcedStream": "(Default/Forced)",
     "LabelUnknownLanguage": "Unknown language",
+    "HeaderConfirmation": "Confirmation",
+    "MessageConfirmSyncJobItemCancellation": "Are you sure you wish to cancel this item?",
     "ButtonMute": "Mute",
     "ButtonUnmute": "Unmute",
     "ButtonStop": "Stop",
diff --git a/MediaBrowser.Server.Implementations/Sync/SyncJobProcessor.cs b/MediaBrowser.Server.Implementations/Sync/SyncJobProcessor.cs
index cf0138a29..67f9d363e 100644
--- a/MediaBrowser.Server.Implementations/Sync/SyncJobProcessor.cs
+++ b/MediaBrowser.Server.Implementations/Sync/SyncJobProcessor.cs
@@ -1,5 +1,4 @@
-using System.Globalization;
-using MediaBrowser.Common.Configuration;
+using MediaBrowser.Common.Configuration;
 using MediaBrowser.Common.IO;
 using MediaBrowser.Common.Progress;
 using MediaBrowser.Controller.Entities;
@@ -361,11 +360,20 @@ namespace MediaBrowser.Server.Implementations.Sync
                 var innerProgress = new ActionableProgress<double>();
                 innerProgress.RegisterAction(p => progress.Report(startingPercent + (percentPerItem * p)));
 
-                var job = _syncRepo.GetJob(item.JobId);
-                await ProcessJobItem(job, item, enableConversion, innerProgress, cancellationToken).ConfigureAwait(false);
+                // Pull it fresh from the db just to make sure it wasn't deleted or cancelled while another item was converting
+                var jobItem = enableConversion ? _syncRepo.GetJobItem(item.Id) : item;
 
-                job = _syncRepo.GetJob(item.JobId);
-                await UpdateJobStatus(job).ConfigureAwait(false);
+                if (jobItem != null)
+                {
+                    var job = _syncRepo.GetJob(jobItem.JobId);
+                    if (jobItem.Status != SyncJobItemStatus.Cancelled)
+                    {
+                        await ProcessJobItem(job, jobItem, enableConversion, innerProgress, cancellationToken).ConfigureAwait(false);
+                    }
+
+                    job = _syncRepo.GetJob(jobItem.JobId);
+                    await UpdateJobStatus(job).ConfigureAwait(false);
+                }
 
                 numComplete++;
                 double percent = numComplete;
diff --git a/MediaBrowser.Server.Implementations/Sync/SyncManager.cs b/MediaBrowser.Server.Implementations/Sync/SyncManager.cs
index b8d884cee..7e4455ab3 100644
--- a/MediaBrowser.Server.Implementations/Sync/SyncManager.cs
+++ b/MediaBrowser.Server.Implementations/Sync/SyncManager.cs
@@ -1,5 +1,6 @@
 using MediaBrowser.Common;
 using MediaBrowser.Common.Configuration;
+using MediaBrowser.Common.Events;
 using MediaBrowser.Common.Extensions;
 using MediaBrowser.Common.IO;
 using MediaBrowser.Controller.Channels;
@@ -16,6 +17,7 @@ using MediaBrowser.Controller.TV;
 using MediaBrowser.Model.Dlna;
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Events;
 using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.Querying;
 using MediaBrowser.Model.Sync;
@@ -47,6 +49,9 @@ namespace MediaBrowser.Server.Implementations.Sync
 
         private ISyncProvider[] _providers = { };
 
+        public event EventHandler<GenericEventArgs<SyncJob>> SyncJobCreated;
+        public event EventHandler<GenericEventArgs<SyncJob>> SyncJobCancelled;
+
         public SyncManager(ILibraryManager libraryManager, ISyncRepository repo, IImageProcessor imageProcessor, ILogger logger, IUserManager userManager, Func<IDtoService> dtoService, IApplicationHost appHost, ITVSeriesManager tvSeriesManager, Func<IMediaEncoder> mediaEncoder, IFileSystem fileSystem, Func<ISubtitleEncoder> subtitleEncoder, IConfigurationManager config)
         {
             _libraryManager = libraryManager;
@@ -144,6 +149,15 @@ namespace MediaBrowser.Server.Implementations.Sync
             await processor.SyncJobItems(jobItemsResult.Items, false, new Progress<double>(), CancellationToken.None)
                     .ConfigureAwait(false);
 
+            if (SyncJobCreated != null)
+            {
+                EventHelper.FireEventIfNotNull(SyncJobCreated, this, new GenericEventArgs<SyncJob>
+                {
+                    Argument = job
+
+                }, _logger);
+            }
+
             return new SyncJobCreationResult
             {
                 Job = GetJob(jobId)
@@ -275,9 +289,25 @@ namespace MediaBrowser.Server.Implementations.Sync
             }
         }
 
-        public Task CancelJob(string id)
+        public async Task CancelJob(string id)
         {
-            return _repo.DeleteJob(id);
+            var job = GetJob(id);
+
+            if (job == null)
+            {
+                throw new ArgumentException("Job not found.");
+            }
+
+            await _repo.DeleteJob(id).ConfigureAwait(false);
+
+            if (SyncJobCancelled != null)
+            {
+                EventHelper.FireEventIfNotNull(SyncJobCancelled, this, new GenericEventArgs<SyncJob>
+                {
+                    Argument = job
+
+                }, _logger);
+            }
         }
 
         public SyncJob GetJob(string id)
@@ -496,7 +526,7 @@ namespace MediaBrowser.Server.Implementations.Sync
                .FirstOrDefault(i => string.Equals(i.Id, jobItem.MediaSourceId));
 
             syncedItem.Item.MediaSources = new List<MediaSourceInfo>();
-            
+
             // This will be null for items that are not audio/video
             if (mediaSource == null)
             {
@@ -545,7 +575,12 @@ namespace MediaBrowser.Server.Implementations.Sync
                     var job = _repo.GetJob(jobItem.JobId);
                     var user = _userManager.GetUserById(job.UserId);
 
-                    if (user == null)
+                    if (jobItem.IsMarkedForRemoval)
+                    {
+                        // Tell the device to remove it since it has been marked for removal
+                        response.ItemIdsToRemove.Add(jobItem.ItemId);
+                    }
+                    else if (user == null)
                     {
                         // Tell the device to remove it since the user is gone now
                         response.ItemIdsToRemove.Add(jobItem.ItemId);
@@ -609,5 +644,45 @@ namespace MediaBrowser.Server.Implementations.Sync
 
             return true;
         }
+
+        public async Task ReEnableJobItem(string id)
+        {
+            var jobItem = _repo.GetJobItem(id);
+
+            if (jobItem.Status != SyncJobItemStatus.Failed && jobItem.Status != SyncJobItemStatus.Cancelled)
+            {
+                throw new ArgumentException("Operation is not valid for this job item");
+            }
+
+            jobItem.Status = SyncJobItemStatus.Queued;
+            jobItem.Progress = 0;
+            jobItem.IsMarkedForRemoval = false;
+
+            await _repo.Update(jobItem).ConfigureAwait(false);
+
+            var processor = GetSyncJobProcessor();
+
+            await processor.UpdateJobStatus(jobItem.JobId).ConfigureAwait(false);
+        }
+
+        public async Task CancelJobItem(string id)
+        {
+            var jobItem = _repo.GetJobItem(id);
+
+            if (jobItem.Status != SyncJobItemStatus.Queued && jobItem.Status != SyncJobItemStatus.Transferring && jobItem.Status != SyncJobItemStatus.Converting)
+            {
+                throw new ArgumentException("Operation is not valid for this job item");
+            }
+
+            jobItem.Status = SyncJobItemStatus.Cancelled;
+            jobItem.Progress = 0;
+            jobItem.IsMarkedForRemoval = true;
+
+            await _repo.Update(jobItem).ConfigureAwait(false);
+
+            var processor = GetSyncJobProcessor();
+
+            await processor.UpdateJobStatus(jobItem.JobId).ConfigureAwait(false);
+        }
     }
 }
diff --git a/MediaBrowser.Server.Implementations/Sync/SyncRepository.cs b/MediaBrowser.Server.Implementations/Sync/SyncRepository.cs
index ae9143710..1cd8e8a9d 100644
--- a/MediaBrowser.Server.Implementations/Sync/SyncRepository.cs
+++ b/MediaBrowser.Server.Implementations/Sync/SyncRepository.cs
@@ -41,7 +41,7 @@ namespace MediaBrowser.Server.Implementations.Sync
 
         public async Task Initialize()
         {
-            var dbFile = Path.Combine(_appPaths.DataPath, "sync12.db");
+            var dbFile = Path.Combine(_appPaths.DataPath, "sync13.db");
 
             _connection = await SqliteExtensions.ConnectToDb(dbFile, _logger).ConfigureAwait(false);
 
@@ -50,7 +50,7 @@ namespace MediaBrowser.Server.Implementations.Sync
                                 "create table if not exists SyncJobs (Id GUID PRIMARY KEY, TargetId TEXT NOT NULL, Name TEXT NOT NULL, Quality TEXT NOT NULL, Status TEXT NOT NULL, Progress FLOAT, UserId TEXT NOT NULL, ItemIds TEXT NOT NULL, Category TEXT, ParentId TEXT, UnwatchedOnly BIT, ItemLimit INT, SyncNewContent BIT, DateCreated DateTime, DateLastModified DateTime, ItemCount int)",
                                 "create index if not exists idx_SyncJobs on SyncJobs(Id)",
 
-                                "create table if not exists SyncJobItems (Id GUID PRIMARY KEY, ItemId TEXT, ItemName TEXT, MediaSourceId TEXT, JobId TEXT, TemporaryPath TEXT, OutputPath TEXT, Status TEXT, TargetId TEXT, DateCreated DateTime, Progress FLOAT, AdditionalFiles TEXT, MediaSource TEXT)",
+                                "create table if not exists SyncJobItems (Id GUID PRIMARY KEY, ItemId TEXT, ItemName TEXT, MediaSourceId TEXT, JobId TEXT, TemporaryPath TEXT, OutputPath TEXT, Status TEXT, TargetId TEXT, DateCreated DateTime, Progress FLOAT, AdditionalFiles TEXT, MediaSource TEXT, IsMarkedForRemoval BIT)",
                                 "create index if not exists idx_SyncJobItems on SyncJobs(Id)",
 
                                 //pragmas
@@ -95,7 +95,7 @@ namespace MediaBrowser.Server.Implementations.Sync
             _saveJobCommand.Parameters.Add(_saveJobCommand, "@ItemCount");
 
             _saveJobItemCommand = _connection.CreateCommand();
-            _saveJobItemCommand.CommandText = "replace into SyncJobItems (Id, ItemId, ItemName, MediaSourceId, JobId, TemporaryPath, OutputPath, Status, TargetId, DateCreated, Progress, AdditionalFiles, MediaSource) values (@Id, @ItemId, @ItemName, @MediaSourceId, @JobId, @TemporaryPath, @OutputPath, @Status, @TargetId, @DateCreated, @Progress, @AdditionalFiles, @MediaSource)";
+            _saveJobItemCommand.CommandText = "replace into SyncJobItems (Id, ItemId, ItemName, MediaSourceId, JobId, TemporaryPath, OutputPath, Status, TargetId, DateCreated, Progress, AdditionalFiles, MediaSource, IsMarkedForRemoval) values (@Id, @ItemId, @ItemName, @MediaSourceId, @JobId, @TemporaryPath, @OutputPath, @Status, @TargetId, @DateCreated, @Progress, @AdditionalFiles, @MediaSource, @IsMarkedForRemoval)";
 
             _saveJobItemCommand.Parameters.Add(_saveJobItemCommand, "@Id");
             _saveJobItemCommand.Parameters.Add(_saveJobItemCommand, "@ItemId");
@@ -110,10 +110,11 @@ namespace MediaBrowser.Server.Implementations.Sync
             _saveJobItemCommand.Parameters.Add(_saveJobItemCommand, "@Progress");
             _saveJobItemCommand.Parameters.Add(_saveJobItemCommand, "@AdditionalFiles");
             _saveJobItemCommand.Parameters.Add(_saveJobItemCommand, "@MediaSource");
+            _saveJobItemCommand.Parameters.Add(_saveJobItemCommand, "@IsMarkedForRemoval");
         }
 
         private const string BaseJobSelectText = "select Id, TargetId, Name, Quality, Status, Progress, UserId, ItemIds, Category, ParentId, UnwatchedOnly, ItemLimit, SyncNewContent, DateCreated, DateLastModified, ItemCount from SyncJobs";
-        private const string BaseJobItemSelectText = "select Id, ItemId, ItemName, MediaSourceId, JobId, TemporaryPath, OutputPath, Status, TargetId, DateCreated, Progress, AdditionalFiles, MediaSource from SyncJobItems";
+        private const string BaseJobItemSelectText = "select Id, ItemId, ItemName, MediaSourceId, JobId, TemporaryPath, OutputPath, Status, TargetId, DateCreated, Progress, AdditionalFiles, MediaSource, IsMarkedForRemoval from SyncJobItems";
 
         public SyncJob GetJob(string id)
         {
@@ -572,6 +573,7 @@ namespace MediaBrowser.Server.Implementations.Sync
                 _saveJobItemCommand.GetParameter(index++).Value = jobItem.Progress;
                 _saveJobItemCommand.GetParameter(index++).Value = _json.SerializeToString(jobItem.AdditionalFiles);
                 _saveJobItemCommand.GetParameter(index++).Value = jobItem.MediaSource == null ? null : _json.SerializeToString(jobItem.MediaSource);
+                _saveJobItemCommand.GetParameter(index++).Value = jobItem.IsMarkedForRemoval;
 
                 _saveJobItemCommand.Transaction = transaction;
 
@@ -673,6 +675,8 @@ namespace MediaBrowser.Server.Implementations.Sync
                 }
             }
 
+            info.IsMarkedForRemoval = reader.GetBoolean(13);
+            
             return info;
         }
 
diff --git a/MediaBrowser.Server.Startup.Common/ApplicationHost.cs b/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
index f481a902d..7eb68187a 100644
--- a/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
+++ b/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
@@ -407,7 +407,7 @@ namespace MediaBrowser.Server.Startup.Common
             SyncRepository = await GetSyncRepository().ConfigureAwait(false);
             RegisterSingleInstance(SyncRepository);
 
-            UserManager = new UserManager(LogManager.GetLogger("UserManager"), ServerConfigurationManager, UserRepository, XmlSerializer, NetworkManager, () => ImageProcessor, () => DtoService, () => ConnectManager, this, JsonSerializer, FileSystemManager, () => ChannelManager, () => LibraryManager);
+            UserManager = new UserManager(LogManager.GetLogger("UserManager"), ServerConfigurationManager, UserRepository, XmlSerializer, NetworkManager, () => ImageProcessor, () => DtoService, () => ConnectManager, this, JsonSerializer, FileSystemManager);
             RegisterSingleInstance(UserManager);
 
             LibraryManager = new LibraryManager(Logger, TaskManager, UserManager, ServerConfigurationManager, UserDataManager, () => LibraryMonitor, FileSystemManager, () => ProviderManager);
-- 
cgit v1.2.3


From b7e5e21c975cc4953764d48c1dacbcd4dc149de9 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Thu, 22 Jan 2015 11:41:34 -0500
Subject: update task buttons

---
 MediaBrowser.Api/BaseApiService.cs                 |  20 ++-
 MediaBrowser.Api/ConfigurationService.cs           |   3 +-
 MediaBrowser.Api/Dlna/DlnaServerService.cs         |   3 +-
 MediaBrowser.Api/Images/ImageService.cs            |  16 +--
 MediaBrowser.Api/Playback/BaseStreamingService.cs  |   2 +-
 MediaBrowser.Api/PluginService.cs                  |   3 +-
 .../ScheduledTasks/ScheduledTaskService.cs         |   3 +-
 MediaBrowser.Api/UserService.cs                    |   3 +-
 MediaBrowser.Controller/Entities/Folder.cs         |   2 +-
 .../Entities/ISupportsBoxSetGrouping.cs            |   9 +-
 MediaBrowser.Controller/Entities/Movies/BoxSet.cs  |   2 +-
 MediaBrowser.Controller/Entities/Movies/Movie.cs   |   7 -
 MediaBrowser.Dlna/DlnaManager.cs                   |  31 ++--
 .../MediaBrowser.Model.Portable.csproj             |   3 -
 .../MediaBrowser.Model.net35.csproj                |   3 -
 MediaBrowser.Model/ApiClient/IApiClient.cs         |  18 ---
 MediaBrowser.Model/Dto/VideoStreamOptions.cs       | 158 ---------------------
 MediaBrowser.Model/MediaBrowser.Model.csproj       |   1 -
 .../Collections/CollectionManager.cs               |  64 ++++-----
 .../Library/Validators/BoxSetPostScanTask.cs       |  50 -------
 .../Localization/JavaScript/javascript.json        |   8 +-
 .../MediaBrowser.Server.Implementations.csproj     |   1 -
 22 files changed, 86 insertions(+), 324 deletions(-)
 delete mode 100644 MediaBrowser.Model/Dto/VideoStreamOptions.cs
 delete mode 100644 MediaBrowser.Server.Implementations/Library/Validators/BoxSetPostScanTask.cs

(limited to 'MediaBrowser.Api/ScheduledTasks/ScheduledTaskService.cs')

diff --git a/MediaBrowser.Api/BaseApiService.cs b/MediaBrowser.Api/BaseApiService.cs
index 297a13155..e90969655 100644
--- a/MediaBrowser.Api/BaseApiService.cs
+++ b/MediaBrowser.Api/BaseApiService.cs
@@ -4,6 +4,7 @@ using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Net;
 using MediaBrowser.Controller.Session;
 using MediaBrowser.Model.Logging;
+using ServiceStack.Text.Controller;
 using ServiceStack.Web;
 using System;
 using System.Collections.Generic;
@@ -21,7 +22,7 @@ namespace MediaBrowser.Api
         /// </summary>
         /// <value>The logger.</value>
         public ILogger Logger { get; set; }
-        
+
         /// <summary>
         /// Gets or sets the HTTP result factory.
         /// </summary>
@@ -143,7 +144,7 @@ namespace MediaBrowser.Api
         {
             if (!string.IsNullOrEmpty(parentId))
             {
-                var folder = (Folder) libraryManager.GetItemById(new Guid(parentId));
+                var folder = (Folder)libraryManager.GetItemById(new Guid(parentId));
 
                 if (userId.HasValue)
                 {
@@ -287,6 +288,20 @@ namespace MediaBrowser.Api
                 }) ?? name;
         }
 
+        protected string GetPathValue(int index)
+        {
+            var pathInfo = PathInfo.Parse(Request.PathInfo);
+            var first = pathInfo.GetArgumentValue<string>(0);
+
+            // backwards compatibility
+            if (string.Equals(first, "mediabrowser", StringComparison.OrdinalIgnoreCase))
+            {
+                index++;
+            }
+
+            return pathInfo.GetArgumentValue<string>(index);
+        }
+
         /// <summary>
         /// Gets the name of the item by.
         /// </summary>
@@ -294,7 +309,6 @@ namespace MediaBrowser.Api
         /// <param name="type">The type.</param>
         /// <param name="libraryManager">The library manager.</param>
         /// <returns>Task{BaseItem}.</returns>
-        /// <exception cref="System.ArgumentException"></exception>
         protected BaseItem GetItemByName(string name, string type, ILibraryManager libraryManager)
         {
             BaseItem item;
diff --git a/MediaBrowser.Api/ConfigurationService.cs b/MediaBrowser.Api/ConfigurationService.cs
index 3eb0296fc..d0abd18c2 100644
--- a/MediaBrowser.Api/ConfigurationService.cs
+++ b/MediaBrowser.Api/ConfigurationService.cs
@@ -143,8 +143,7 @@ namespace MediaBrowser.Api
 
         public void Post(UpdateNamedConfiguration request)
         {
-            var pathInfo = PathInfo.Parse(Request.PathInfo);
-            var key = pathInfo.GetArgumentValue<string>(2);
+            var key = GetPathValue(2);
 
             var configurationType = _configurationManager.GetConfigurationType(key);
             var configuration = _jsonSerializer.DeserializeFromStream(request.RequestStream, configurationType);
diff --git a/MediaBrowser.Api/Dlna/DlnaServerService.cs b/MediaBrowser.Api/Dlna/DlnaServerService.cs
index 94d6e25b0..2383017c6 100644
--- a/MediaBrowser.Api/Dlna/DlnaServerService.cs
+++ b/MediaBrowser.Api/Dlna/DlnaServerService.cs
@@ -120,8 +120,7 @@ namespace MediaBrowser.Api.Dlna
 
         private async Task<ControlResponse> PostAsync(Stream requestStream, IUpnpService service)
         {
-            var pathInfo = PathInfo.Parse(Request.PathInfo);
-            var id = pathInfo.GetArgumentValue<string>(2);
+            var id = GetPathValue(2);
 
             using (var reader = new StreamReader(requestStream))
             {
diff --git a/MediaBrowser.Api/Images/ImageService.cs b/MediaBrowser.Api/Images/ImageService.cs
index f2586b043..f141d9df9 100644
--- a/MediaBrowser.Api/Images/ImageService.cs
+++ b/MediaBrowser.Api/Images/ImageService.cs
@@ -396,8 +396,7 @@ namespace MediaBrowser.Api.Images
 
         public object Get(GetItemByNameImage request)
         {
-            var pathInfo = PathInfo.Parse(Request.PathInfo);
-            var type = pathInfo.GetArgumentValue<string>(0);
+            var type = GetPathValue(0);
 
             var item = GetItemByName(request.Name, type, _libraryManager);
 
@@ -406,8 +405,7 @@ namespace MediaBrowser.Api.Images
 
         public object Head(GetItemByNameImage request)
         {
-            var pathInfo = PathInfo.Parse(Request.PathInfo);
-            var type = pathInfo.GetArgumentValue<string>(0);
+            var type = GetPathValue(0);
 
             var item = GetItemByName(request.Name, type, _libraryManager);
 
@@ -420,10 +418,9 @@ namespace MediaBrowser.Api.Images
         /// <param name="request">The request.</param>
         public void Post(PostUserImage request)
         {
-            var pathInfo = PathInfo.Parse(Request.PathInfo);
-            var id = new Guid(pathInfo.GetArgumentValue<string>(1));
+            var id = new Guid(GetPathValue(1));
 
-            request.Type = (ImageType)Enum.Parse(typeof(ImageType), pathInfo.GetArgumentValue<string>(3), true);
+            request.Type = (ImageType)Enum.Parse(typeof(ImageType), GetPathValue(3), true);
 
             var item = _userManager.GetUserById(id);
 
@@ -438,10 +435,9 @@ namespace MediaBrowser.Api.Images
         /// <param name="request">The request.</param>
         public void Post(PostItemImage request)
         {
-            var pathInfo = PathInfo.Parse(Request.PathInfo);
-            var id = new Guid(pathInfo.GetArgumentValue<string>(1));
+            var id = new Guid(GetPathValue(1));
 
-            request.Type = (ImageType)Enum.Parse(typeof(ImageType), pathInfo.GetArgumentValue<string>(3), true);
+            request.Type = (ImageType)Enum.Parse(typeof(ImageType), GetPathValue(3), true);
 
             var item = _libraryManager.GetItemById(id);
 
diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs
index b3610bc38..77f6dc103 100644
--- a/MediaBrowser.Api/Playback/BaseStreamingService.cs
+++ b/MediaBrowser.Api/Playback/BaseStreamingService.cs
@@ -824,7 +824,7 @@ namespace MediaBrowser.Api.Playback
         {
             get
             {
-                return false;
+                return true;
             }
         }
 
diff --git a/MediaBrowser.Api/PluginService.cs b/MediaBrowser.Api/PluginService.cs
index 62aa1e755..f9098f5bf 100644
--- a/MediaBrowser.Api/PluginService.cs
+++ b/MediaBrowser.Api/PluginService.cs
@@ -236,8 +236,7 @@ namespace MediaBrowser.Api
         {
             // We need to parse this manually because we told service stack not to with IRequiresRequestStream
             // https://code.google.com/p/servicestack/source/browse/trunk/Common/ServiceStack.Text/ServiceStack.Text/Controller/PathInfo.cs
-            var pathInfo = PathInfo.Parse(Request.PathInfo);
-            var id = new Guid(pathInfo.GetArgumentValue<string>(1));
+            var id = new Guid(GetPathValue(1));
 
             var plugin = _appHost.Plugins.First(p => p.Id == id);
 
diff --git a/MediaBrowser.Api/ScheduledTasks/ScheduledTaskService.cs b/MediaBrowser.Api/ScheduledTasks/ScheduledTaskService.cs
index 947b99d35..e3722b4a7 100644
--- a/MediaBrowser.Api/ScheduledTasks/ScheduledTaskService.cs
+++ b/MediaBrowser.Api/ScheduledTasks/ScheduledTaskService.cs
@@ -224,8 +224,7 @@ namespace MediaBrowser.Api.ScheduledTasks
         {
             // We need to parse this manually because we told service stack not to with IRequiresRequestStream
             // https://code.google.com/p/servicestack/source/browse/trunk/Common/ServiceStack.Text/ServiceStack.Text/Controller/PathInfo.cs
-            var pathInfo = PathInfo.Parse(Request.PathInfo);
-            var id = pathInfo.GetArgumentValue<string>(1);
+            var id = GetPathValue(1);
 
             var task = TaskManager.ScheduledTasks.FirstOrDefault(i => string.Equals(i.Id, id));
 
diff --git a/MediaBrowser.Api/UserService.cs b/MediaBrowser.Api/UserService.cs
index 51a7584b8..37553e4a4 100644
--- a/MediaBrowser.Api/UserService.cs
+++ b/MediaBrowser.Api/UserService.cs
@@ -449,8 +449,7 @@ namespace MediaBrowser.Api
         {
             // We need to parse this manually because we told service stack not to with IRequiresRequestStream
             // https://code.google.com/p/servicestack/source/browse/trunk/Common/ServiceStack.Text/ServiceStack.Text/Controller/PathInfo.cs
-            var pathInfo = PathInfo.Parse(Request.PathInfo);
-            var id = new Guid(pathInfo.GetArgumentValue<string>(1));
+            var id = new Guid(GetPathValue(1));
 
             var dtoUser = request;
 
diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs
index 005f263f7..ff6e8e85b 100644
--- a/MediaBrowser.Controller/Entities/Folder.cs
+++ b/MediaBrowser.Controller/Entities/Folder.cs
@@ -301,7 +301,7 @@ namespace MediaBrowser.Controller.Entities
 
         public override bool IsVisible(User user)
         {
-            if (this is ICollectionFolder)
+            if (this is ICollectionFolder && !(this is BasePluginFolder))
             {
                 if (user.Policy.BlockedMediaFolders != null)
                 {
diff --git a/MediaBrowser.Controller/Entities/ISupportsBoxSetGrouping.cs b/MediaBrowser.Controller/Entities/ISupportsBoxSetGrouping.cs
index 0fd463155..fbe5a06d0 100644
--- a/MediaBrowser.Controller/Entities/ISupportsBoxSetGrouping.cs
+++ b/MediaBrowser.Controller/Entities/ISupportsBoxSetGrouping.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-
+
 namespace MediaBrowser.Controller.Entities
 {
     /// <summary>
@@ -10,10 +8,5 @@ namespace MediaBrowser.Controller.Entities
     /// </summary>
     public interface ISupportsBoxSetGrouping
     {
-        /// <summary>
-        /// Gets or sets the box set identifier list.
-        /// </summary>
-        /// <value>The box set identifier list.</value>
-        List<Guid> BoxSetIdList { get; set; }
     }
 }
diff --git a/MediaBrowser.Controller/Entities/Movies/BoxSet.cs b/MediaBrowser.Controller/Entities/Movies/BoxSet.cs
index e48b8d845..63690661a 100644
--- a/MediaBrowser.Controller/Entities/Movies/BoxSet.cs
+++ b/MediaBrowser.Controller/Entities/Movies/BoxSet.cs
@@ -4,13 +4,13 @@ using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Configuration;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Querying;
+using MediaBrowser.Model.Users;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.Serialization;
 using System.Threading;
 using System.Threading.Tasks;
-using MediaBrowser.Model.Users;
 
 namespace MediaBrowser.Controller.Entities.Movies
 {
diff --git a/MediaBrowser.Controller/Entities/Movies/Movie.cs b/MediaBrowser.Controller/Entities/Movies/Movie.cs
index b3774cfe0..2fa5fc6e1 100644
--- a/MediaBrowser.Controller/Entities/Movies/Movie.cs
+++ b/MediaBrowser.Controller/Entities/Movies/Movie.cs
@@ -25,12 +25,6 @@ namespace MediaBrowser.Controller.Entities.Movies
         public List<Guid> ThemeVideoIds { get; set; }
         public List<string> ProductionLocations { get; set; }
 
-        /// <summary>
-        /// This is just a cache to enable quick access by Id
-        /// </summary>
-        [IgnoreDataMember]
-        public List<Guid> BoxSetIdList { get; set; }
-
         public Movie()
         {
             SpecialFeatureIds = new List<Guid>();
@@ -40,7 +34,6 @@ namespace MediaBrowser.Controller.Entities.Movies
             RemoteTrailerIds = new List<Guid>();
             ThemeSongIds = new List<Guid>();
             ThemeVideoIds = new List<Guid>();
-            BoxSetIdList = new List<Guid>();
             Taglines = new List<string>();
             Keywords = new List<string>();
             ProductionLocations = new List<string>();
diff --git a/MediaBrowser.Dlna/DlnaManager.cs b/MediaBrowser.Dlna/DlnaManager.cs
index 31f1e0a88..2c22abd4d 100644
--- a/MediaBrowser.Dlna/DlnaManager.cs
+++ b/MediaBrowser.Dlna/DlnaManager.cs
@@ -132,61 +132,74 @@ namespace MediaBrowser.Dlna
         {
             if (!string.IsNullOrWhiteSpace(profileInfo.DeviceDescription))
             {
-                if (deviceInfo.DeviceDescription == null || !Regex.IsMatch(deviceInfo.DeviceDescription, profileInfo.DeviceDescription))
+                if (deviceInfo.DeviceDescription == null || !IsRegexMatch(deviceInfo.DeviceDescription, profileInfo.DeviceDescription))
                     return false;
             }
 
             if (!string.IsNullOrWhiteSpace(profileInfo.FriendlyName))
             {
-                if (deviceInfo.FriendlyName == null || !Regex.IsMatch(deviceInfo.FriendlyName, profileInfo.FriendlyName))
+                if (deviceInfo.FriendlyName == null || !IsRegexMatch(deviceInfo.FriendlyName, profileInfo.FriendlyName))
                     return false;
             }
 
             if (!string.IsNullOrWhiteSpace(profileInfo.Manufacturer))
             {
-                if (deviceInfo.Manufacturer == null || !Regex.IsMatch(deviceInfo.Manufacturer, profileInfo.Manufacturer))
+                if (deviceInfo.Manufacturer == null || !IsRegexMatch(deviceInfo.Manufacturer, profileInfo.Manufacturer))
                     return false;
             }
 
             if (!string.IsNullOrWhiteSpace(profileInfo.ManufacturerUrl))
             {
-                if (deviceInfo.ManufacturerUrl == null || !Regex.IsMatch(deviceInfo.ManufacturerUrl, profileInfo.ManufacturerUrl))
+                if (deviceInfo.ManufacturerUrl == null || !IsRegexMatch(deviceInfo.ManufacturerUrl, profileInfo.ManufacturerUrl))
                     return false;
             }
 
             if (!string.IsNullOrWhiteSpace(profileInfo.ModelDescription))
             {
-                if (deviceInfo.ModelDescription == null || !Regex.IsMatch(deviceInfo.ModelDescription, profileInfo.ModelDescription))
+                if (deviceInfo.ModelDescription == null || !IsRegexMatch(deviceInfo.ModelDescription, profileInfo.ModelDescription))
                     return false;
             }
 
             if (!string.IsNullOrWhiteSpace(profileInfo.ModelName))
             {
-                if (deviceInfo.ModelName == null || !Regex.IsMatch(deviceInfo.ModelName, profileInfo.ModelName))
+                if (deviceInfo.ModelName == null || !IsRegexMatch(deviceInfo.ModelName, profileInfo.ModelName))
                     return false;
             }
 
             if (!string.IsNullOrWhiteSpace(profileInfo.ModelNumber))
             {
-                if (deviceInfo.ModelNumber == null || !Regex.IsMatch(deviceInfo.ModelNumber, profileInfo.ModelNumber))
+                if (deviceInfo.ModelNumber == null || !IsRegexMatch(deviceInfo.ModelNumber, profileInfo.ModelNumber))
                     return false;
             }
 
             if (!string.IsNullOrWhiteSpace(profileInfo.ModelUrl))
             {
-                if (deviceInfo.ModelUrl == null || !Regex.IsMatch(deviceInfo.ModelUrl, profileInfo.ModelUrl))
+                if (deviceInfo.ModelUrl == null || !IsRegexMatch(deviceInfo.ModelUrl, profileInfo.ModelUrl))
                     return false;
             }
 
             if (!string.IsNullOrWhiteSpace(profileInfo.SerialNumber))
             {
-                if (deviceInfo.SerialNumber == null || !Regex.IsMatch(deviceInfo.SerialNumber, profileInfo.SerialNumber))
+                if (deviceInfo.SerialNumber == null || !IsRegexMatch(deviceInfo.SerialNumber, profileInfo.SerialNumber))
                     return false;
             }
 
             return true;
         }
 
+        private bool IsRegexMatch(string input, string pattern)
+        {
+            try
+            {
+                return Regex.IsMatch(input, pattern);
+            }
+            catch (ArgumentException ex)
+            {
+                _logger.ErrorException("Error evaluating regex pattern {0}", ex, pattern);
+                return false;
+            }
+        }
+
         public DeviceProfile GetProfile(IDictionary<string, string> headers)
         {
             if (headers == null)
diff --git a/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj b/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj
index 91d0e15f8..0a350f517 100644
--- a/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj
+++ b/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj
@@ -497,9 +497,6 @@
     <Compile Include="..\MediaBrowser.Model\Dto\UserItemDataDto.cs">
       <Link>Dto\UserItemDataDto.cs</Link>
     </Compile>
-    <Compile Include="..\MediaBrowser.Model\Dto\VideoStreamOptions.cs">
-      <Link>Dto\VideoStreamOptions.cs</Link>
-    </Compile>
     <Compile Include="..\MediaBrowser.Model\Entities\BaseItemInfo.cs">
       <Link>Entities\BaseItemInfo.cs</Link>
     </Compile>
diff --git a/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj b/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj
index 47e019051..0c5946d12 100644
--- a/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj
+++ b/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj
@@ -462,9 +462,6 @@
     <Compile Include="..\MediaBrowser.Model\Dto\UserItemDataDto.cs">
       <Link>Dto\UserItemDataDto.cs</Link>
     </Compile>
-    <Compile Include="..\MediaBrowser.Model\Dto\VideoStreamOptions.cs">
-      <Link>Dto\VideoStreamOptions.cs</Link>
-    </Compile>
     <Compile Include="..\MediaBrowser.Model\Entities\BaseItemInfo.cs">
       <Link>Entities\BaseItemInfo.cs</Link>
     </Compile>
diff --git a/MediaBrowser.Model/ApiClient/IApiClient.cs b/MediaBrowser.Model/ApiClient/IApiClient.cs
index b6938b217..0e69bb91f 100644
--- a/MediaBrowser.Model/ApiClient/IApiClient.cs
+++ b/MediaBrowser.Model/ApiClient/IApiClient.cs
@@ -1316,24 +1316,6 @@ namespace MediaBrowser.Model.ApiClient
         /// <returns>Task&lt;QueryResult&lt;BaseItemDto&gt;&gt;.</returns>
         Task<QueryResult<BaseItemDto>> GetPlaylistItems(PlaylistItemQuery query);
 
-        /// <summary>
-        /// Gets the url needed to stream a video file
-        /// </summary>
-        /// <param name="options">The options.</param>
-        /// <returns>System.String.</returns>
-        /// <exception cref="ArgumentNullException">options</exception>
-        [Obsolete]
-        string GetVideoStreamUrl(VideoStreamOptions options);
-
-        /// <summary>
-        /// Formulates a url for streaming video using the HLS protocol
-        /// </summary>
-        /// <param name="options">The options.</param>
-        /// <returns>System.String.</returns>
-        /// <exception cref="ArgumentNullException">options</exception>
-        [Obsolete]
-        string GetHlsVideoStreamUrl(VideoStreamOptions options);
-
         /// <summary>
         /// Sends the context message asynchronous.
         /// </summary>
diff --git a/MediaBrowser.Model/Dto/VideoStreamOptions.cs b/MediaBrowser.Model/Dto/VideoStreamOptions.cs
deleted file mode 100644
index e9a83bd12..000000000
--- a/MediaBrowser.Model/Dto/VideoStreamOptions.cs
+++ /dev/null
@@ -1,158 +0,0 @@
-using System;
-
-namespace MediaBrowser.Model.Dto
-{
-    /// <summary>
-    /// Class VideoStreamOptions
-    /// </summary>
-    [Obsolete]
-    public class VideoStreamOptions
-    {
-        /// <summary>
-        /// Gets or sets the audio bit rate.
-        /// </summary>
-        /// <value>The audio bit rate.</value>
-        public int? AudioBitRate { get; set; }
-
-        /// <summary>
-        /// Gets or sets the audio codec.
-        /// Omit to copy the original stream
-        /// </summary>
-        /// <value>The audio encoding format.</value>
-        public string AudioCodec { get; set; }
-
-        /// <summary>
-        /// Gets or sets the item id.
-        /// </summary>
-        /// <value>The item id.</value>
-        public string ItemId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the max audio channels.
-        /// </summary>
-        /// <value>The max audio channels.</value>
-        public int? MaxAudioChannels { get; set; }
-
-        /// <summary>
-        /// Gets or sets the max audio sample rate.
-        /// </summary>
-        /// <value>The max audio sample rate.</value>
-        public int? MaxAudioSampleRate { get; set; }
-
-        /// <summary>
-        /// Gets or sets the start time ticks.
-        /// </summary>
-        /// <value>The start time ticks.</value>
-        public long? StartTimeTicks { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether the original media should be served statically
-        /// Only used with progressive streaming
-        /// </summary>
-        /// <value><c>true</c> if static; otherwise, <c>false</c>.</value>
-        public bool? Static { get; set; }
-
-        /// <summary>
-        /// Gets or sets the output file extension.
-        /// </summary>
-        /// <value>The output file extension.</value>
-        public string OutputFileExtension { get; set; }
-
-        /// <summary>
-        /// Gets or sets the device id.
-        /// </summary>
-        /// <value>The device id.</value>
-        public string DeviceId { get; set; }
-        
-        /// <summary>
-        /// Gets or sets the video codec.
-        /// Omit to copy
-        /// </summary>
-        /// <value>The video codec.</value>
-        public string VideoCodec { get; set; }
-
-        /// <summary>
-        /// Gets or sets the video bit rate.
-        /// </summary>
-        /// <value>The video bit rate.</value>
-        public int? VideoBitRate { get; set; }
-
-        /// <summary>
-        /// Gets or sets the width.
-        /// </summary>
-        /// <value>The width.</value>
-        public int? Width { get; set; }
-
-        /// <summary>
-        /// Gets or sets the height.
-        /// </summary>
-        /// <value>The height.</value>
-        public int? Height { get; set; }
-
-        /// <summary>
-        /// Gets or sets the width of the max.
-        /// </summary>
-        /// <value>The width of the max.</value>
-        public int? MaxWidth { get; set; }
-
-        /// <summary>
-        /// Gets or sets the height of the max.
-        /// </summary>
-        /// <value>The height of the max.</value>
-        public int? MaxHeight { get; set; }
-
-        /// <summary>
-        /// Gets or sets the frame rate.
-        /// </summary>
-        /// <value>The frame rate.</value>
-        public double? FrameRate { get; set; }
-
-        /// <summary>
-        /// Gets or sets the index of the audio stream.
-        /// </summary>
-        /// <value>The index of the audio stream.</value>
-        public int? AudioStreamIndex { get; set; }
-
-        /// <summary>
-        /// Gets or sets the index of the video stream.
-        /// </summary>
-        /// <value>The index of the video stream.</value>
-        public int? VideoStreamIndex { get; set; }
-
-        /// <summary>
-        /// Gets or sets the index of the subtitle stream.
-        /// </summary>
-        /// <value>The index of the subtitle stream.</value>
-        public int? SubtitleStreamIndex { get; set; }
-
-        /// <summary>
-        /// Gets or sets the profile.
-        /// </summary>
-        /// <value>The profile.</value>
-        public string Profile { get; set; }
-
-        /// <summary>
-        /// Gets or sets the level.
-        /// </summary>
-        /// <value>The level.</value>
-        public string Level { get; set; }
-
-        /// <summary>
-        /// Gets or sets the baseline stream audio bit rate.
-        /// </summary>
-        /// <value>The baseline stream audio bit rate.</value>
-        public int? BaselineStreamAudioBitRate { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether [append baseline stream].
-        /// </summary>
-        /// <value><c>true</c> if [append baseline stream]; otherwise, <c>false</c>.</value>
-        public bool AppendBaselineStream { get; set; }
-
-        /// <summary>
-        /// Gets or sets the time stamp offset ms. Only used with HLS.
-        /// </summary>
-        /// <value>The time stamp offset ms.</value>
-        public int? TimeStampOffsetMs { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj
index 36d22347f..bad17abae 100644
--- a/MediaBrowser.Model/MediaBrowser.Model.csproj
+++ b/MediaBrowser.Model/MediaBrowser.Model.csproj
@@ -135,7 +135,6 @@
     <Compile Include="Dto\NameValuePair.cs" />
     <Compile Include="MediaInfo\LiveMediaInfoResult.cs" />
     <Compile Include="Dto\MediaSourceType.cs" />
-    <Compile Include="Dto\VideoStreamOptions.cs" />
     <Compile Include="Configuration\DynamicDayOfWeek.cs" />
     <Compile Include="Entities\ExtraType.cs" />
     <Compile Include="Entities\SupporterInfo.cs" />
diff --git a/MediaBrowser.Server.Implementations/Collections/CollectionManager.cs b/MediaBrowser.Server.Implementations/Collections/CollectionManager.cs
index d92db34e3..6100e3f5d 100644
--- a/MediaBrowser.Server.Implementations/Collections/CollectionManager.cs
+++ b/MediaBrowser.Server.Implementations/Collections/CollectionManager.cs
@@ -167,18 +167,6 @@ namespace MediaBrowser.Server.Implementations.Collections
                 }
 
                 list.Add(LinkedChild.Create(item));
-
-                var supportsGrouping = item as ISupportsBoxSetGrouping;
-
-                if (supportsGrouping != null)
-                {
-                    var boxsetIdList = supportsGrouping.BoxSetIdList.ToList();
-                    if (!boxsetIdList.Contains(collectionId))
-                    {
-                        boxsetIdList.Add(collectionId);
-                    }
-                    supportsGrouping.BoxSetIdList = boxsetIdList;
-                }
             }
 
             collection.LinkedChildren.AddRange(list);
@@ -228,15 +216,6 @@ namespace MediaBrowser.Server.Implementations.Collections
                 {
                     itemList.Add(childItem);
                 }
-
-                var supportsGrouping = childItem as ISupportsBoxSetGrouping;
-
-                if (supportsGrouping != null)
-                {
-                    var boxsetIdList = supportsGrouping.BoxSetIdList.ToList();
-                    boxsetIdList.Remove(collectionId);
-                    supportsGrouping.BoxSetIdList = boxsetIdList;
-                }
             }
 
             var shortcutFiles = Directory
@@ -289,29 +268,40 @@ namespace MediaBrowser.Server.Implementations.Collections
 
         public IEnumerable<BaseItem> CollapseItemsWithinBoxSets(IEnumerable<BaseItem> items, User user)
         {
-            var itemsToCollapse = new List<ISupportsBoxSetGrouping>();
-            var boxsets = new List<BaseItem>();
+            var results = new Dictionary<Guid, BaseItem>();
+            var allBoxsets = new List<BoxSet>();
 
-            var list = items.ToList();
-
-            foreach (var item in list.OfType<ISupportsBoxSetGrouping>())
+            foreach (var item in items)
             {
-                var currentBoxSets = item.BoxSetIdList
-                    .Select(i => _libraryManager.GetItemById(i))
-                    .Where(i => i != null && i.IsVisible(user))
-                    .ToList();
+                var grouping = item as ISupportsBoxSetGrouping;
 
-                if (currentBoxSets.Count > 0)
+                if (grouping == null)
+                {
+                    results[item.Id] = item;
+                }
+                else
                 {
-                    itemsToCollapse.Add(item);
-                    boxsets.AddRange(currentBoxSets);
+                    var itemId = item.Id;
+
+                    var currentBoxSets = allBoxsets
+                        .Where(i => i.GetLinkedChildren().Any(j => j.Id == itemId))
+                        .ToList();
+
+                    if (currentBoxSets.Count > 0)
+                    {
+                        foreach (var boxset in currentBoxSets)
+                        {
+                            results[boxset.Id] = boxset;
+                        }
+                    }
+                    else
+                    {
+                        results[item.Id] = item;
+                    }
                 }
             }
 
-            return list
-                .Except(itemsToCollapse.Cast<BaseItem>())
-                .Concat(boxsets)
-                .DistinctBy(i => i.Id);
+            return results.Values;
         }
     }
 }
diff --git a/MediaBrowser.Server.Implementations/Library/Validators/BoxSetPostScanTask.cs b/MediaBrowser.Server.Implementations/Library/Validators/BoxSetPostScanTask.cs
deleted file mode 100644
index 86d88f7e0..000000000
--- a/MediaBrowser.Server.Implementations/Library/Validators/BoxSetPostScanTask.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-using MediaBrowser.Controller.Entities;
-using MediaBrowser.Controller.Entities.Movies;
-using MediaBrowser.Controller.Library;
-using System;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace MediaBrowser.Server.Implementations.Library.Validators
-{
-    public class BoxSetPostScanTask : ILibraryPostScanTask
-    {
-        private readonly ILibraryManager _libraryManager;
-
-        public BoxSetPostScanTask(ILibraryManager libraryManager)
-        {
-            _libraryManager = libraryManager;
-        }
-
-        public Task Run(IProgress<double> progress, CancellationToken cancellationToken)
-        {
-            var items = _libraryManager.RootFolder.RecursiveChildren.ToList();
-
-            var boxsets = items.OfType<BoxSet>().ToList();
-
-            var numComplete = 0;
-
-            foreach (var boxset in boxsets)
-            {
-                foreach (var child in boxset.Children.Concat(boxset.GetLinkedChildren()).OfType<ISupportsBoxSetGrouping>())
-                {
-                    var boxsetIdList = child.BoxSetIdList.ToList();
-                    if (!boxsetIdList.Contains(boxset.Id))
-                    {
-                        boxsetIdList.Add(boxset.Id);
-                    }
-                    child.BoxSetIdList = boxsetIdList;
-                }
-
-                numComplete++;
-                double percent = numComplete;
-                percent /= boxsets.Count;
-                progress.Report(percent * 100);
-            }
-
-            progress.Report(100);
-            return Task.FromResult(true);
-        }
-    }
-}
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
index 62619a567..4206ccf59 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
@@ -45,6 +45,8 @@
     "ButtonHelp": "Help",
     "ButtonSave": "Save",
     "HeaderDevices": "Devices",
+    "ButtonScheduledTasks": "Scheduled tasks",
+    "ConfirmMessageScheduledTaskButton": "This operation normally runs automatically as a scheduled task. It can also be run manually here. To configure the scheduled task, see:",
     "HeaderSupporterBenefit": "A supporter membership provides additional benefits such as access to premium plugins, internet channel content, and more. {0}Learn more{1}.",
     "HeaderWelcomeToMediaBrowserServerDashboard": "Welcome to the Media Browser Dashboard",
     "HeaderWelcomeToMediaBrowserWebClient": "Welcome to the Media Browser Web Client",
@@ -59,7 +61,7 @@
     "ButtonCancelItem": "Cancel item",
     "ButtonQueueForRetry": "Queue for retry",
     "ButtonReenable": "Re-enable",
-    "SyncJobItemStatusSyncedMarkForRemoval":  "Marked for removal",
+    "SyncJobItemStatusSyncedMarkForRemoval": "Marked for removal",
     "LabelAbortedByServerShutdown": "(Aborted by server shutdown)",
     "LabelScheduledTaskLastRan": "Last ran {0}, taking {1}.",
     "HeaderDeleteTaskTrigger": "Delete Task Trigger",
@@ -71,8 +73,8 @@
     "LabelFree": "Free",
     "HeaderSelectAudio": "Select Audio",
     "HeaderSelectSubtitles": "Select Subtitles",
-    "ButtonMarkForRemoval":  "Mark for removal from device",
-    "ButtonUnmarkForRemoval":  "Unmark for removal from device",
+    "ButtonMarkForRemoval": "Mark for removal from device",
+    "ButtonUnmarkForRemoval": "Unmark for removal from device",
     "LabelDefaultStream": "(Default)",
     "LabelForcedStream": "(Forced)",
     "LabelDefaultForcedStream": "(Default/Forced)",
diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
index 548ac07aa..fe5642dbc 100644
--- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
+++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
@@ -209,7 +209,6 @@
     <Compile Include="Library\UserViewManager.cs" />
     <Compile Include="Library\Validators\ArtistsPostScanTask.cs" />
     <Compile Include="Library\Validators\ArtistsValidator.cs" />
-    <Compile Include="Library\Validators\BoxSetPostScanTask.cs" />
     <Compile Include="Library\Validators\GameGenresPostScanTask.cs" />
     <Compile Include="Library\Validators\GameGenresValidator.cs" />
     <Compile Include="Library\Validators\GenresPostScanTask.cs" />
-- 
cgit v1.2.3