dlna fixes

MediaBrowser.Api/UserService.cs

@@ -406,7 +406,7 @@ namespace MediaBrowser.Api
 
             Task.WaitAll(task);
 
-            user.UpdateConfiguration(dtoUser.Configuration, _xmlSerializer);
+            user.UpdateConfiguration(dtoUser.Configuration);
         }
 
         /// <summary>
@@ -420,7 +420,7 @@ namespace MediaBrowser.Api
 
             var newUser = _userManager.CreateUser(dtoUser.Name).Result;
 
-            newUser.UpdateConfiguration(dtoUser.Configuration, _xmlSerializer);
+            newUser.UpdateConfiguration(dtoUser.Configuration);
 
             var result = _dtoService.GetUserDto(newUser);
 

MediaBrowser.Common.Implementations/ScheduledTasks/Tasks/DeleteCacheFileTask.cs

@@ -74,7 +74,7 @@ namespace MediaBrowser.Common.Implementations.ScheduledTasks.Tasks
 
             progress.Report(90);
 
-            minDateModified = DateTime.UtcNow.AddDays(-3);
+            minDateModified = DateTime.UtcNow.AddDays(-2);
 
             try
             {

MediaBrowser.Controller/Entities/BasePluginFolder.cs

@@ -12,7 +12,7 @@ namespace MediaBrowser.Controller.Entities
             DisplayMediaType = "CollectionFolder";
         }
 
-        public string CollectionType
+        public virtual string CollectionType
         {
             get { return Model.Entities.CollectionType.BoxSets; }
         }

MediaBrowser.Controller/Entities/User.cs

@@ -4,7 +4,6 @@ using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Configuration;
 using MediaBrowser.Model.Serialization;
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Runtime.Serialization;
 using System.Threading;
@@ -221,23 +220,12 @@ namespace MediaBrowser.Controller.Entities
             }
         }
 
-        /// <summary>
-        /// Saves the current configuration to the file system
-        /// </summary>
-        public void SaveConfiguration()
-        {
-            var xmlPath = ConfigurationFilePath;
-            Directory.CreateDirectory(System.IO.Path.GetDirectoryName(xmlPath));
-            XmlSerializer.SerializeToFile(Configuration, xmlPath);
-        }
-
         /// <summary>
         /// Updates the configuration.
         /// </summary>
         /// <param name="config">The config.</param>
-        /// <param name="serializer">The serializer.</param>
         /// <exception cref="System.ArgumentNullException">config</exception>
-        public void UpdateConfiguration(UserConfiguration config, IXmlSerializer serializer)
+        public void UpdateConfiguration(UserConfiguration config)
         {
             if (config == null)
             {
@@ -245,7 +233,7 @@ namespace MediaBrowser.Controller.Entities
             }
 
             Configuration = config;
-            SaveConfiguration();
+            UserManager.UpdateConfiguration(this, Configuration);
         }
     }
 }

MediaBrowser.Controller/Library/IUserManager.cs

@@ -1,4 +1,5 @@
 using MediaBrowser.Controller.Entities;
+using MediaBrowser.Model.Configuration;
 using MediaBrowser.Model.Events;
 using System;
 using System.Collections.Generic;
@@ -29,6 +30,14 @@ namespace MediaBrowser.Controller.Library
         event EventHandler<GenericEventArgs<User>> UserDeleted;
 
         event EventHandler<GenericEventArgs<User>> UserCreated;
+        event EventHandler<GenericEventArgs<User>> UserConfigurationUpdated;
+
+        /// <summary>
+        /// Updates the configuration.
+        /// </summary>
+        /// <param name="user">The user.</param>
+        /// <param name="newConfiguration">The new configuration.</param>
+        void UpdateConfiguration(User user, UserConfiguration newConfiguration);
         
         /// <summary>
         /// Gets a User by Id

MediaBrowser.Dlna/ConnectionManager/ControlHandler.cs

@@ -4,6 +4,7 @@ using MediaBrowser.Dlna.Server;
 using MediaBrowser.Dlna.Service;
 using MediaBrowser.Model.Dlna;
 using MediaBrowser.Model.Logging;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 
@@ -22,9 +23,21 @@ namespace MediaBrowser.Dlna.ConnectionManager
 
         protected override IEnumerable<KeyValuePair<string, string>> GetResult(string methodName, Headers methodParams)
         {
-            var deviceId = "test";
+            if (string.Equals(methodName, "GetProtocolInfo", StringComparison.OrdinalIgnoreCase))
+            {
+                return HandleGetProtocolInfo();
+            }
 
             throw new ResourceNotFoundException("Unexpected control request name: " + methodName);
         }
+
+        private IEnumerable<KeyValuePair<string, string>> HandleGetProtocolInfo()
+        {
+            return new Headers(true)
+            {
+                { "Source", _profile.ProtocolInfo },
+                { "Sink", "" }
+            };
+        }
     }
 }

MediaBrowser.Dlna/ContentDirectory/ControlHandler.cs

@@ -103,12 +103,12 @@ namespace MediaBrowser.Dlna.ContentDirectory
 
         private IEnumerable<KeyValuePair<string, string>> HandleGetSearchCapabilities()
         {
-            return new Headers { { "SearchCaps", string.Empty } };
+            return new Headers(true) { { "SearchCaps", "upnp:class,dc:title,upnp:artist" } };
         }
 
         private IEnumerable<KeyValuePair<string, string>> HandleGetSortCapabilities()
         {
-            return new Headers { { "SortCaps", string.Empty } };
+            return new Headers(true) { { "SortCaps", string.Empty } };
         }
 
         private IEnumerable<KeyValuePair<string, string>> HandleGetSystemUpdateID()
@@ -120,7 +120,7 @@ namespace MediaBrowser.Dlna.ContentDirectory
 
         private IEnumerable<KeyValuePair<string, string>> HandleXGetFeatureList()
         {
-            return new Headers { { "FeatureList", GetFeatureListXml() } };
+            return new Headers(true) { { "FeatureList", GetFeatureListXml() } };
         }
 
         private string GetFeatureListXml()
@@ -386,7 +386,21 @@ namespace MediaBrowser.Dlna.ContentDirectory
                  || string.Equals(id, "1", StringComparison.OrdinalIgnoreCase)
 
                  ? user.RootFolder
-                 : _libraryManager.GetItemById(new Guid(id));
+                 : ParseItemId(id, user);
+        }
+
+        private BaseItem ParseItemId(string id, User user)
+        {
+            Guid itemId;
+
+            if (Guid.TryParse(id, out itemId))
+            {
+                return _libraryManager.GetItemById(itemId);
+            }
+
+            Logger.Error("Error parsing item Id: {0}. Returning user root folder.", id);
+
+            return user.RootFolder;
         }
     }
 }

MediaBrowser.Dlna/PlayTo/PlayToController.cs

@@ -132,7 +132,7 @@ namespace MediaBrowser.Dlna.PlayTo
             }
         }
 
-        void _device_MediaChanged(object sender, MediaChangedEventArgs e)
+        async void _device_MediaChanged(object sender, MediaChangedEventArgs e)
         {
             var streamInfo = StreamParams.ParseFromUrl(e.OldMediaInfo.Url, _libraryManager);
             var progress = GetProgressInfo(e.OldMediaInfo, streamInfo);
@@ -140,6 +140,18 @@ namespace MediaBrowser.Dlna.PlayTo
             var positionTicks = progress.PositionTicks;
 
             ReportPlaybackStopped(e.OldMediaInfo, streamInfo, positionTicks);
+
+            try
+            {
+                streamInfo = StreamParams.ParseFromUrl(e.NewMediaInfo.Url, _libraryManager);
+                progress = GetProgressInfo(e.NewMediaInfo, streamInfo);
+
+                await _sessionManager.OnPlaybackStart(progress).ConfigureAwait(false);
+            }
+            catch (Exception ex)
+            {
+                _logger.ErrorException("Error reporting progress", ex);
+            }
         }
 
         async void _device_PlaybackStopped(object sender, PlaybackStoppedEventArgs e)

MediaBrowser.Dlna/PlayTo/PlayToManager.cs

@@ -118,7 +118,7 @@ namespace MediaBrowser.Dlna.PlayTo
 
                     socket.Bind(endPoint);
 
-                    _logger.Info("Creating SSDP listener");
+                    _logger.Info("Creating SSDP listener on {0}, network interface index {1}", localIp, networkInterfaceIndex);
 
                     var receiveBuffer = new byte[64000];
 
@@ -210,6 +210,33 @@ namespace MediaBrowser.Dlna.PlayTo
             });
         }
 
+        private void CreateNotifier(IPAddress localIp)
+        {
+            Task.Factory.StartNew(async (o) =>
+            {
+                try
+                {
+                    while (true)
+                    {
+                        _ssdpHandler.SendRendererSearchMessage(new IPEndPoint(localIp, 1900));
+
+                        var delay = _config.Configuration.DlnaOptions.ClientDiscoveryIntervalSeconds * 1000;
+
+                        await Task.Delay(delay, _tokenSource.Token).ConfigureAwait(false);
+                    }
+                }
+                catch (OperationCanceledException)
+                {
+                }
+                catch (Exception ex)
+                {
+                    _logger.ErrorException("Error in notifier", ex);
+                }
+
+            }, _tokenSource.Token, TaskCreationOptions.LongRunning);
+
+        }
+
         private void CreateNotifier(Socket socket)
         {
             Task.Factory.StartNew(async (o) =>

MediaBrowser.Dlna/PlayTo/SsdpHttpClient.cs

@@ -1,7 +1,6 @@
 using MediaBrowser.Common.Net;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Dlna.Common;
-using System;
 using System.Globalization;
 using System.IO;
 using System.Text;
@@ -68,34 +67,7 @@ namespace MediaBrowser.Dlna.PlayTo
             options.RequestHeaders["NT"] = "upnp:event";
             options.RequestHeaders["TIMEOUT"] = "Second-" + timeOut.ToString(_usCulture);
 
-            // TODO: Method should be SUBSCRIBE
-            // https://github.com/stormboy/node-upnp-controlpoint/blob/master/lib/upnp-service.js#L106
-            using (await _httpClient.Get(options).ConfigureAwait(false))
-            {
-            }
-        }
-
-        public async Task RespondAsync(Uri url, 
-            string ip, 
-            int port, 
-            string localIp,
-            int eventport,
-            int timeOut = 3600)
-        {
-            var options = new HttpRequestOptions
-            {
-                Url = url.ToString(),
-                UserAgent = USERAGENT
-            };
-
-            options.RequestHeaders["HOST"] = ip + ":" + port.ToString(_usCulture);
-            options.RequestHeaders["CALLBACK"] = "<" + localIp + ":" + eventport.ToString(_usCulture) + ">";
-            options.RequestHeaders["NT"] = "upnp:event";
-            options.RequestHeaders["TIMEOUT"] = "Second-" + timeOut.ToString(_usCulture);
-
-            using (await _httpClient.Get(options).ConfigureAwait(false))
-            {
-            }
+            await _httpClient.SendAsync(options, "SUBSCRIBE").ConfigureAwait(false);
         }
 
         public async Task<XDocument> GetDataAsync(string url)

MediaBrowser.Dlna/Service/BaseControlHandler.cs

@@ -1,4 +1,5 @@
-using MediaBrowser.Controller.Configuration;
+using System.Security;
+using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Dlna;
 using MediaBrowser.Dlna.Server;
 using MediaBrowser.Model.Logging;
@@ -63,7 +64,7 @@ namespace MediaBrowser.Dlna.Service
 
             Logger.Debug("Received control request {0}", method.LocalName);
 
-            IEnumerable<KeyValuePair<string, string>> result = GetResult(method.LocalName, sparams);
+            var result = GetResult(method.LocalName, sparams);
 
             var env = new XmlDocument();
             env.AppendChild(env.CreateXmlDeclaration("1.0", "utf-8", string.Empty));
@@ -84,12 +85,14 @@ namespace MediaBrowser.Dlna.Service
                 response.AppendChild(ri);
             }
 
+            var xml = env.OuterXml.Replace("xmlns:m=", "xmlns:u=");
+            
             var controlResponse = new ControlResponse
             {
-                Xml = env.OuterXml,
+                Xml = xml,
                 IsSuccessful = true
             };
-
+            Logger.Debug(xml);
             controlResponse.Headers.Add("EXT", string.Empty);
 
             return controlResponse;

MediaBrowser.Dlna/Ssdp/Datagram.cs

@@ -9,7 +9,7 @@ namespace MediaBrowser.Dlna.Ssdp
     public class Datagram
     {
         public IPEndPoint ToEndPoint { get; private set; }
-        public IPAddress FromEndPoint { get; private set; }
+        public IPEndPoint FromEndPoint { get; private set; }
         public string Message { get; private set; }
 
         /// <summary>
@@ -24,7 +24,7 @@ namespace MediaBrowser.Dlna.Ssdp
 
         private readonly ILogger _logger;
 
-        public Datagram(IPEndPoint toEndPoint, IPAddress fromEndPoint, ILogger logger, string message, int totalSendCount)
+        public Datagram(IPEndPoint toEndPoint, IPEndPoint fromEndPoint, ILogger logger, string message, int totalSendCount)
         {
             Message = message;
             _logger = logger;
@@ -42,7 +42,7 @@ namespace MediaBrowser.Dlna.Ssdp
 
                 if (FromEndPoint != null)
                 {
-                    client.Bind(new IPEndPoint(FromEndPoint, 0));
+                    client.Bind(FromEndPoint);
                 }
 
                 client.BeginSendTo(msg, 0, msg.Length, SocketFlags.None, ToEndPoint, result =>
@@ -53,7 +53,7 @@ namespace MediaBrowser.Dlna.Ssdp
                     }
                     catch (Exception ex)
                     {
-                        _logger.ErrorException("Error sending Datagram", ex);
+                        _logger.ErrorException("Error sending Datagram to {0} from {1}: " + Message, ex, ToEndPoint, FromEndPoint == null ? "" : FromEndPoint.ToString());
                     }
                     finally
                     {
@@ -69,7 +69,7 @@ namespace MediaBrowser.Dlna.Ssdp
             }
             catch (Exception ex)
             {
-                _logger.ErrorException("Error sending Datagram", ex);
+                _logger.ErrorException("Error sending Datagram: " + Message, ex);
             }
             ++SendCount;
         }

MediaBrowser.Dlna/Ssdp/SsdpHandler.cs

@@ -1,4 +1,5 @@
-using MediaBrowser.Common.Events;
+using System.Text;
+using MediaBrowser.Common.Events;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Dlna.Server;
 using MediaBrowser.Model.Logging;
@@ -79,9 +80,27 @@ namespace MediaBrowser.Dlna.Ssdp
             ReloadAliveNotifier();
         }
 
+        public void SendRendererSearchMessage(IPEndPoint localIp)
+        {
+            SendSearchMessage("urn:schemas-upnp-org:device:MediaRenderer:1", "3", localIp);
+        }
+
+        public void SendSearchMessage(string deviceSearchType, string mx, IPEndPoint localIp)
+        {
+            var values = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+
+            values["HOST"] = "239.255.255.250:1900";
+            values["USER-AGENT"] = "UPnP/1.0 DLNADOC/1.50 Platinum/1.0.4.2";
+            values["ST"] = deviceSearchType;
+            values["MAN"] = "\"ssdp:discover\"";
+            values["MX"] = mx;
+
+            SendDatagram("M-SEARCH * HTTP/1.1", values, localIp);
+        }
+
         public void SendDatagram(string header,
             Dictionary<string, string> values,
-            IPAddress localAddress,
+            IPEndPoint localAddress,
             int sendCount = 1)
         {
             SendDatagram(header, values, _ssdpEndp, localAddress, sendCount);
@@ -90,7 +109,7 @@ namespace MediaBrowser.Dlna.Ssdp
         public void SendDatagram(string header,
             Dictionary<string, string> values,
             IPEndPoint endpoint,
-            IPAddress localAddress,
+            IPEndPoint localAddress,
             int sendCount = 1)
         {
             var msg = new SsdpMessageBuilder().BuildMessage(header, values);
@@ -116,7 +135,7 @@ namespace MediaBrowser.Dlna.Ssdp
                 if (string.Equals(deviceType, "ssdp:all", StringComparison.OrdinalIgnoreCase) ||
                     string.Equals(deviceType, d.Type, StringComparison.OrdinalIgnoreCase))
                 {
-                    SendDatagram(header, values, endpoint, d.Address);
+                    SendDatagram(header, values, endpoint, new IPEndPoint(d.Address, 0));
                 }
             }
         }
@@ -231,9 +250,16 @@ namespace MediaBrowser.Dlna.Ssdp
             try
             {
                 EndPoint endpoint = new IPEndPoint(IPAddress.Any, SSDPPort);
-                var receivedCount = _socket.EndReceiveFrom(result, ref endpoint);
+
+                var length = _socket.EndReceiveFrom(result, ref endpoint);
+
                 var received = (byte[])result.AsyncState;
 
+                if (_config.Configuration.DlnaOptions.EnableDebugLogging)
+                {
+                    _logger.Debug(Encoding.ASCII.GetString(received));
+                }
+
                 var args = SsdpHelper.ParseSsdpResponse(received, (IPEndPoint)endpoint);
 
                 if (_config.Configuration.DlnaOptions.EnableDebugLogging)
@@ -341,7 +367,7 @@ namespace MediaBrowser.Dlna.Ssdp
                 _logger.Debug("{0} said {1}", dev.USN, type);
             }
 
-            SendDatagram(header, values, dev.Address, sendCount);
+            SendDatagram(header, values, new IPEndPoint(dev.Address, 0), sendCount);
         }
 
         public void RegisterNotification(Guid uuid, Uri descriptionUri, IPAddress address, IEnumerable<string> services)

MediaBrowser.MediaEncoding/Subtitles/SrtWriter.cs

@@ -20,7 +20,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
                     cancellationToken.ThrowIfCancellationRequested();
 
                     writer.WriteLine(index.ToString(CultureInfo.InvariantCulture));
-                    writer.WriteLine(@"{0:hh\:mm\:ss\.fff} --> {1:hh\:mm\:ss\.fff}", TimeSpan.FromTicks(trackEvent.StartPositionTicks), TimeSpan.FromTicks(trackEvent.EndPositionTicks));
+                    writer.WriteLine(@"{0:hh\:mm\:ss\,fff} --> {1:hh\:mm\:ss\,fff}", TimeSpan.FromTicks(trackEvent.StartPositionTicks), TimeSpan.FromTicks(trackEvent.EndPositionTicks));
 
                     var text = trackEvent.Text;
 

MediaBrowser.Model/Dlna/Filter.cs

@@ -27,7 +27,9 @@ namespace MediaBrowser.Model.Dlna
 
         public bool Contains(string field)
         {
-            return _all || ListHelper.ContainsIgnoreCase(_fields, field);
+            // Don't bother with this. Some clients (media monkey) use the filter and then don't display very well when very little data comes back.
+            return true;
+            //return _all || ListHelper.ContainsIgnoreCase(_fields, field);
         }
     }
 }

MediaBrowser.Providers/FolderImages/DefaultImageProvider.cs

@@ -111,7 +111,7 @@ namespace MediaBrowser.Providers.FolderImages
 
         public bool Supports(IHasImages item)
         {
-            return item is UserView || item is CollectionFolder;
+            return item is UserView || item is ICollectionFolder;
         }
 
         public Task<HttpResponseInfo> GetImageResponse(string url, CancellationToken cancellationToken)

MediaBrowser.Server.Implementations/Channels/ChannelDownloadScheduledTask.cs

@@ -232,12 +232,23 @@ namespace MediaBrowser.Server.Implementations.Channels
             }
             else
             {
+                File.Delete(response.TempFilePath);
+
                 throw new ApplicationException("Unexpected response type encountered: " + response.ContentType);
             }
 
             File.Move(response.TempFilePath, destination);
 
             await RefreshMediaSourceItem(destination, cancellationToken).ConfigureAwait(false);
+
+            try
+            {
+                File.Delete(response.TempFilePath);
+            }
+            catch
+            {
+                
+            }
         }
 
         private async Task RefreshMediaSourceItems(IEnumerable<MediaSourceInfo> items, CancellationToken cancellationToken)
@@ -265,7 +276,7 @@ namespace MediaBrowser.Server.Implementations.Channels
         {
             return new ITaskTrigger[]
                 {
-                    new IntervalTrigger{ Interval = TimeSpan.FromHours(4)},
+                    new IntervalTrigger{ Interval = TimeSpan.FromHours(6)},
                 };
         }
 

MediaBrowser.Server.Implementations/Collections/ManualCollectionsFolder.cs

@@ -27,5 +27,10 @@ namespace MediaBrowser.Server.Implementations.Collections
                 return !ActualChildren.Any() || base.IsHidden;
             }
         }
+
+        public override string CollectionType
+        {
+            get { return Model.Entities.CollectionType.BoxSets; }
+        }
     }
 }

MediaBrowser.Server.Implementations/EntryPoints/ServerEventNotifier.cs

@@ -9,7 +9,6 @@ using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Plugins;
 using MediaBrowser.Controller.Session;
 using MediaBrowser.Model.Events;
-using MediaBrowser.Model.Tasks;
 using System;
 using System.Threading;
 
@@ -74,6 +73,7 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
         {
             _userManager.UserDeleted += userManager_UserDeleted;
             _userManager.UserUpdated += userManager_UserUpdated;
+            _userManager.UserConfigurationUpdated += _userManager_UserConfigurationUpdated;
 
             _appHost.HasPendingRestartChanged += kernel_HasPendingRestartChanged;
 
@@ -86,6 +86,13 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
             _taskManager.TaskCompleted += _taskManager_TaskCompleted;
         }
 
+        void _userManager_UserConfigurationUpdated(object sender, GenericEventArgs<User> e)
+        {
+            var dto = _dtoService.GetUserDto(e.Argument);
+
+            _serverManager.SendWebSocketMessage("UserConfigurationUpdated", dto);
+        }
+
         void _installationManager_PackageInstalling(object sender, InstallationEventArgs e)
         {
             _serverManager.SendWebSocketMessage("PackageInstalling", e.InstallationInfo);
@@ -171,6 +178,7 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
             {
                 _userManager.UserDeleted -= userManager_UserDeleted;
                 _userManager.UserUpdated -= userManager_UserUpdated;
+                _userManager.UserConfigurationUpdated -= _userManager_UserConfigurationUpdated;
 
                 _installationManager.PluginUninstalled -= InstallationManager_PluginUninstalled;
                 _installationManager.PackageInstalling -= _installationManager_PackageInstalling;

MediaBrowser.Server.Implementations/Library/UserManager.cs

@@ -5,8 +5,10 @@ using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Persistence;
 using MediaBrowser.Controller.Providers;
+using MediaBrowser.Model.Configuration;
 using MediaBrowser.Model.Events;
 using MediaBrowser.Model.Logging;
+using MediaBrowser.Model.Serialization;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -46,16 +48,19 @@ namespace MediaBrowser.Server.Implementations.Library
         /// <value>The user repository.</value>
         private IUserRepository UserRepository { get; set; }
 
+        private readonly IXmlSerializer _xmlSerializer;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="UserManager" /> class.
         /// </summary>
         /// <param name="logger">The logger.</param>
         /// <param name="configurationManager">The configuration manager.</param>
         /// <param name="userRepository">The user repository.</param>
-        public UserManager(ILogger logger, IServerConfigurationManager configurationManager, IUserRepository userRepository)
+        public UserManager(ILogger logger, IServerConfigurationManager configurationManager, IUserRepository userRepository, IXmlSerializer xmlSerializer)
         {
             _logger = logger;
             UserRepository = userRepository;
+            _xmlSerializer = xmlSerializer;
             ConfigurationManager = configurationManager;
             Users = new List<User>();
         }
@@ -65,6 +70,7 @@ namespace MediaBrowser.Server.Implementations.Library
         /// Occurs when [user updated].
         /// </summary>
         public event EventHandler<GenericEventArgs<User>> UserUpdated;
+        public event EventHandler<GenericEventArgs<User>> UserConfigurationUpdated;
         
         /// <summary>
         /// Called when [user updated].
@@ -408,6 +414,13 @@ namespace MediaBrowser.Server.Implementations.Library
             };
         }
 
+        public void UpdateConfiguration(User user, UserConfiguration newConfiguration)
+        {
+            var xmlPath = user.ConfigurationFilePath;
+            Directory.CreateDirectory(Path.GetDirectoryName(xmlPath));
+            _xmlSerializer.SerializeToFile(newConfiguration, xmlPath);
 
+            EventHelper.FireEventIfNotNull(UserConfigurationUpdated, this, new GenericEventArgs<User> { Argument = user }, _logger);
+        }
     }
 }

MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json

@@ -186,5 +186,6 @@
 	"LabelUnknownLanaguage": "Unknown language",
 	"HeaderCurrentSubtitles": "Current Subtitles",
 	"MessageDownloadQueued": "The download has been queued.",
-	"MessageAreYouSureDeleteSubtitles": "Are you sure you wish to delete this subtitle file?"
+	"MessageAreYouSureDeleteSubtitles": "Are you sure you wish to delete this subtitle file?",
+	"ButtonRemoteControl": "Remote Control"
 }

MediaBrowser.Server.Implementations/Localization/Server/server.json

@@ -832,5 +832,6 @@
 	"LabelSelectFolderGroups": "Automatically group content from the following folders into views such as Movies, Music and TV:",
 	"LabelSelectFolderGroupsHelp": "Folders that are unchecked will be displayed by themselves in their own view.",
 	"OptionDisplayAdultContent": "Display adult content",
-	"OptionLibraryFolders": "Folder view"
+	"OptionLibraryFolders": "Folder view",
+	"TitleRemoteControl": "Remote Control"
 }

MediaBrowser.ServerApplication/ApplicationHost.cs

@@ -462,7 +462,7 @@ namespace MediaBrowser.ServerApplication
             FileOrganizationRepository = await GetFileOrganizationRepository().ConfigureAwait(false);
             RegisterSingleInstance(FileOrganizationRepository);
 
-            UserManager = new UserManager(LogManager.GetLogger("UserManager"), ServerConfigurationManager, UserRepository);
+            UserManager = new UserManager(LogManager.GetLogger("UserManager"), ServerConfigurationManager, UserRepository, XmlSerializer);
             RegisterSingleInstance(UserManager);
 
             LibraryManager = new LibraryManager(Logger, TaskManager, UserManager, ServerConfigurationManager, UserDataManager, () => LibraryMonitor, FileSystemManager, () => ProviderManager);

MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj

@@ -176,6 +176,9 @@
     <Content Include="dashboard-ui\css\images\headersearch.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="dashboard-ui\css\images\icons\remote.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="dashboard-ui\css\images\items\folders\edit.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -278,9 +281,6 @@
     <Content Include="dashboard-ui\css\images\media\tvflyout.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\css\images\remote.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="dashboard-ui\css\librarymenu.css">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -479,9 +479,6 @@
     <Content Include="dashboard-ui\css\images\rotten.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\css\images\currentuserdefaultblack.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="dashboard-ui\css\images\currentuserdefaultwhite.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>