From cf61ac0264883e53f024088a88148b87cbbf89a7 Mon Sep 17 00:00:00 2001 From: LukePulverenti Date: Sun, 17 Mar 2013 23:10:21 -0400 Subject: fixed client type display for ios. also fixed display preferences saving. --- .../HttpServer/BaseRestService.cs | 2 +- .../Library/LibraryManager.cs | 8 ++++---- .../Library/UserManager.cs | 20 ++++++++++---------- .../Sqlite/SQLiteDisplayPreferencesRepository.cs | 14 +++++++------- 4 files changed, 22 insertions(+), 22 deletions(-) (limited to 'MediaBrowser.Server.Implementations') diff --git a/MediaBrowser.Server.Implementations/HttpServer/BaseRestService.cs b/MediaBrowser.Server.Implementations/HttpServer/BaseRestService.cs index e301f0496..4799bf0b8 100644 --- a/MediaBrowser.Server.Implementations/HttpServer/BaseRestService.cs +++ b/MediaBrowser.Server.Implementations/HttpServer/BaseRestService.cs @@ -466,7 +466,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer /// Gets the routes. /// /// IEnumerable{RouteInfo}. - public IEnumerable GetRoutes() + public virtual IEnumerable GetRoutes() { return new RouteInfo[] {}; } 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 /// Task. 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() - .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); } /// 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 /// Name of the device. /// Task. /// user - 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 /// Name of the device. /// The item. /// The current position ticks. - 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 /// The device id. /// Name of the device. /// The item. - 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 /// The device id. /// Name of the device. /// The last activity date. - 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 /// The device id. /// Name of the device. /// ClientConnectionInfo. - 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 /// The device id. /// Name of the device. /// - 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 /// Name of the device. /// Task. /// - 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 /// Name of the device. /// Task. /// - 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) { diff --git a/MediaBrowser.Server.Implementations/Sqlite/SQLiteDisplayPreferencesRepository.cs b/MediaBrowser.Server.Implementations/Sqlite/SQLiteDisplayPreferencesRepository.cs index ddf44d407..baa38cde0 100644 --- a/MediaBrowser.Server.Implementations/Sqlite/SQLiteDisplayPreferencesRepository.cs +++ b/MediaBrowser.Server.Implementations/Sqlite/SQLiteDisplayPreferencesRepository.cs @@ -97,7 +97,7 @@ namespace MediaBrowser.Server.Implementations.Sqlite /// The cancellation token. /// Task. /// item - public Task SaveDisplayPrefs(Folder item, CancellationToken cancellationToken) + public Task SaveDisplayPreferences(Folder item, CancellationToken cancellationToken) { if (item == null) { @@ -116,17 +116,17 @@ namespace MediaBrowser.Server.Implementations.Sqlite var cmd = connection.CreateCommand(); cmd.CommandText = "delete from display_prefs where item_id = @guid"; - cmd.AddParam("@guid", item.DisplayPrefsId); + cmd.AddParam("@guid", item.DisplayPreferencesId); QueueCommand(cmd); - if (item.DisplayPrefs != null) + if (item.DisplayPreferences != null) { - foreach (var data in item.DisplayPrefs) + foreach (var data in item.DisplayPreferences) { cmd = connection.CreateCommand(); cmd.CommandText = "insert into display_prefs (item_id, user_id, data) values (@1, @2, @3)"; - cmd.AddParam("@1", item.DisplayPrefsId); + cmd.AddParam("@1", item.DisplayPreferencesId); cmd.AddParam("@2", data.UserId); cmd.AddParam("@3", _protobufSerializer.SerializeToBytes(data)); @@ -143,7 +143,7 @@ namespace MediaBrowser.Server.Implementations.Sqlite /// The item. /// IEnumerable{DisplayPreferences}. /// - public IEnumerable RetrieveDisplayPrefs(Folder item) + public IEnumerable RetrieveDisplayPreferences(Folder item) { if (item == null) { @@ -153,7 +153,7 @@ namespace MediaBrowser.Server.Implementations.Sqlite var cmd = connection.CreateCommand(); cmd.CommandText = "select data from display_prefs where item_id = @guid"; var guidParam = cmd.Parameters.Add("@guid", DbType.Guid); - guidParam.Value = item.DisplayPrefsId; + guidParam.Value = item.DisplayPreferencesId; using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult)) { -- cgit v1.2.3