diff options
Diffstat (limited to 'MediaBrowser.Server.Implementations/Library')
| -rw-r--r-- | MediaBrowser.Server.Implementations/Library/LibraryManager.cs | 8 | ||||
| -rw-r--r-- | MediaBrowser.Server.Implementations/Library/UserManager.cs | 20 |
2 files changed, 14 insertions, 14 deletions
diff --git a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs index 71fe6e125..7b12201f7 100644 --- a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs +++ b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs @@ -664,15 +664,15 @@ namespace MediaBrowser.Server.Implementations.Library /// <returns>Task.</returns> public Task SaveDisplayPreferencesForFolder(User user, Folder folder, DisplayPreferences data) { - // Need to update all items with the same DisplayPrefsId + // Need to update all items with the same DisplayPreferencesId foreach (var child in RootFolder.GetRecursiveChildren(user) .OfType<Folder>() - .Where(i => i.DisplayPrefsId == folder.DisplayPrefsId)) + .Where(i => i.DisplayPreferencesId == folder.DisplayPreferencesId)) { - child.AddOrUpdateDisplayPrefs(user, data); + child.AddOrUpdateDisplayPreferences(user, data); } - return Kernel.DisplayPreferencesRepository.SaveDisplayPrefs(folder, CancellationToken.None); + return Kernel.DisplayPreferencesRepository.SaveDisplayPreferences(folder, CancellationToken.None); } /// <summary> diff --git a/MediaBrowser.Server.Implementations/Library/UserManager.cs b/MediaBrowser.Server.Implementations/Library/UserManager.cs index 1ebf99b6a..5cfd01ee0 100644 --- a/MediaBrowser.Server.Implementations/Library/UserManager.cs +++ b/MediaBrowser.Server.Implementations/Library/UserManager.cs @@ -226,7 +226,7 @@ namespace MediaBrowser.Server.Implementations.Library /// <param name="deviceName">Name of the device.</param> /// <returns>Task.</returns> /// <exception cref="System.ArgumentNullException">user</exception> - public Task LogUserActivity(User user, ClientType clientType, string deviceId, string deviceName) + public Task LogUserActivity(User user, string clientType, string deviceId, string deviceName) { if (user == null) { @@ -252,7 +252,7 @@ namespace MediaBrowser.Server.Implementations.Library /// <param name="deviceName">Name of the device.</param> /// <param name="item">The item.</param> /// <param name="currentPositionTicks">The current position ticks.</param> - private void UpdateNowPlayingItemId(User user, ClientType clientType, string deviceId, string deviceName, BaseItem item, long? currentPositionTicks = null) + private void UpdateNowPlayingItemId(User user, string clientType, string deviceId, string deviceName, BaseItem item, long? currentPositionTicks = null) { var conn = GetConnection(user.Id, clientType, deviceId, deviceName); @@ -269,7 +269,7 @@ namespace MediaBrowser.Server.Implementations.Library /// <param name="deviceId">The device id.</param> /// <param name="deviceName">Name of the device.</param> /// <param name="item">The item.</param> - private void RemoveNowPlayingItemId(User user, ClientType clientType, string deviceId, string deviceName, BaseItem item) + private void RemoveNowPlayingItemId(User user, string clientType, string deviceId, string deviceName, BaseItem item) { var conn = GetConnection(user.Id, clientType, deviceId, deviceName); @@ -288,7 +288,7 @@ namespace MediaBrowser.Server.Implementations.Library /// <param name="deviceId">The device id.</param> /// <param name="deviceName">Name of the device.</param> /// <param name="lastActivityDate">The last activity date.</param> - private void LogConnection(Guid userId, ClientType clientType, string deviceId, string deviceName, DateTime lastActivityDate) + private void LogConnection(Guid userId, string clientType, string deviceId, string deviceName, DateTime lastActivityDate) { GetConnection(userId, clientType, deviceId, deviceName).LastActivityDate = lastActivityDate; } @@ -301,18 +301,18 @@ namespace MediaBrowser.Server.Implementations.Library /// <param name="deviceId">The device id.</param> /// <param name="deviceName">Name of the device.</param> /// <returns>ClientConnectionInfo.</returns> - private ClientConnectionInfo GetConnection(Guid userId, ClientType clientType, string deviceId, string deviceName) + private ClientConnectionInfo GetConnection(Guid userId, string clientType, string deviceId, string deviceName) { lock (_activeConnections) { - var conn = _activeConnections.FirstOrDefault(c => c.ClientType == clientType && string.Equals(deviceId, c.DeviceId)); + var conn = _activeConnections.FirstOrDefault(c => string.Equals(c.Client, clientType, StringComparison.OrdinalIgnoreCase) && string.Equals(deviceId, c.DeviceId)); if (conn == null) { conn = new ClientConnectionInfo { UserId = userId, - ClientType = clientType, + Client = clientType, DeviceName = deviceName, DeviceId = deviceId }; @@ -541,7 +541,7 @@ namespace MediaBrowser.Server.Implementations.Library /// <param name="deviceId">The device id.</param> /// <param name="deviceName">Name of the device.</param> /// <exception cref="System.ArgumentNullException"></exception> - public void OnPlaybackStart(User user, BaseItem item, ClientType clientType, string deviceId, string deviceName) + public void OnPlaybackStart(User user, BaseItem item, string clientType, string deviceId, string deviceName) { if (user == null) { @@ -574,7 +574,7 @@ namespace MediaBrowser.Server.Implementations.Library /// <param name="deviceName">Name of the device.</param> /// <returns>Task.</returns> /// <exception cref="System.ArgumentNullException"></exception> - public async Task OnPlaybackProgress(User user, BaseItem item, long? positionTicks, ClientType clientType, string deviceId, string deviceName) + public async Task OnPlaybackProgress(User user, BaseItem item, long? positionTicks, string clientType, string deviceId, string deviceName) { if (user == null) { @@ -614,7 +614,7 @@ namespace MediaBrowser.Server.Implementations.Library /// <param name="deviceName">Name of the device.</param> /// <returns>Task.</returns> /// <exception cref="System.ArgumentNullException"></exception> - public async Task OnPlaybackStopped(User user, BaseItem item, long? positionTicks, ClientType clientType, string deviceId, string deviceName) + public async Task OnPlaybackStopped(User user, BaseItem item, long? positionTicks, string clientType, string deviceId, string deviceName) { if (user == null) { |