From cf61ac0264883e53f024088a88148b87cbbf89a7 Mon Sep 17 00:00:00 2001 From: LukePulverenti Date: Sun, 17 Mar 2013 23:10:21 -0400 Subject: [PATCH] fixed client type display for ios. also fixed display preferences saving. --- MediaBrowser.Api/BaseApiService.cs | 6 +-- .../UserLibrary/UserLibraryService.cs | 30 +++++--------- .../Entities/CollectionFolder.cs | 2 +- MediaBrowser.Controller/Entities/Folder.cs | 38 ++++++++--------- MediaBrowser.Controller/Library/DtoBuilder.cs | 2 +- .../Library/IUserManager.cs | 8 ++-- .../IDisplayPreferencesRepository.cs | 4 +- .../Connectivity/ClientConnectionInfo.cs | 2 +- MediaBrowser.Model/Connectivity/ClientType.cs | 41 ------------------- .../Entities/DisplayPreferences.cs | 33 +-------------- MediaBrowser.Model/MediaBrowser.Model.csproj | 1 - .../HttpServer/BaseRestService.cs | 2 +- .../Library/LibraryManager.cs | 8 ++-- .../Library/UserManager.cs | 20 ++++----- .../SQLiteDisplayPreferencesRepository.cs | 14 +++---- .../LibraryExplorer.xaml.cs | 10 ++--- .../Html/scripts/DashboardPage.js | 18 ++++---- Nuget/MediaBrowser.Common.Internal.nuspec | 4 +- Nuget/MediaBrowser.Common.nuspec | 2 +- Nuget/MediaBrowser.Server.Core.nuspec | 4 +- 20 files changed, 81 insertions(+), 168 deletions(-) delete mode 100644 MediaBrowser.Model/Connectivity/ClientType.cs diff --git a/MediaBrowser.Api/BaseApiService.cs b/MediaBrowser.Api/BaseApiService.cs index ddc600da91..98e51ec407 100644 --- a/MediaBrowser.Api/BaseApiService.cs +++ b/MediaBrowser.Api/BaseApiService.cs @@ -51,11 +51,7 @@ namespace MediaBrowser.Api { var user = UserManager.GetUserById(new Guid(auth["UserId"])); - ClientType clientType; - - Enum.TryParse(auth["Client"] ?? string.Empty, out clientType); - - UserManager.LogUserActivity(user, clientType, auth["DeviceId"], auth["Device"] ?? string.Empty); + UserManager.LogUserActivity(user, auth["Client"], auth["DeviceId"], auth["Device"] ?? string.Empty); } } diff --git a/MediaBrowser.Api/UserLibrary/UserLibraryService.cs b/MediaBrowser.Api/UserLibrary/UserLibraryService.cs index 3e0c2a960f..8b38f3c106 100644 --- a/MediaBrowser.Api/UserLibrary/UserLibraryService.cs +++ b/MediaBrowser.Api/UserLibrary/UserLibraryService.cs @@ -5,8 +5,7 @@ using MediaBrowser.Model.Connectivity; using MediaBrowser.Model.Dto; using MediaBrowser.Model.Entities; using MediaBrowser.Model.Querying; -using MediaBrowser.Server.Implementations.HttpServer; -using MediaBrowser.Server.Implementations.Library; +using MediaBrowser.Model.Serialization; using ServiceStack.ServiceHost; using ServiceStack.Text.Controller; using System; @@ -356,16 +355,18 @@ namespace MediaBrowser.Api.UserLibrary private readonly IUserManager _userManager; private readonly ILibraryManager _libraryManager; + private readonly IJsonSerializer _jsonSerializer; /// /// Initializes a new instance of the class. /// /// jsonSerializer - public UserLibraryService(IUserManager userManager, ILibraryManager libraryManager) + public UserLibraryService(IUserManager userManager, ILibraryManager libraryManager, IJsonSerializer jsonSerializer) : base() { _userManager = userManager; _libraryManager = libraryManager; + _jsonSerializer = jsonSerializer; } /// @@ -481,7 +482,8 @@ namespace MediaBrowser.Api.UserLibrary var item = (Folder)DtoBuilder.GetItemByClientId(itemId, _userManager, _libraryManager, user.Id); - var displayPreferences = request; + // Serialize to json and then back so that the core doesn't see the request dto type + var displayPreferences = _jsonSerializer.DeserializeFromString(_jsonSerializer.SerializeToString(request)); var task = _libraryManager.SaveDisplayPreferencesForFolder(user, item, displayPreferences); @@ -597,11 +599,7 @@ namespace MediaBrowser.Api.UserLibrary if (auth != null) { - ClientType clientType; - - Enum.TryParse(auth["Client"] ?? string.Empty, out clientType); - - _userManager.OnPlaybackStart(user, item, clientType, auth["DeviceId"], auth["Device"] ?? string.Empty); + _userManager.OnPlaybackStart(user, item, auth["Client"], auth["DeviceId"], auth["Device"] ?? string.Empty); } } @@ -619,11 +617,7 @@ namespace MediaBrowser.Api.UserLibrary if (auth != null) { - ClientType clientType; - - Enum.TryParse(auth["Client"] ?? string.Empty, out clientType); - - var task = _userManager.OnPlaybackProgress(user, item, request.PositionTicks, clientType, auth["DeviceId"], auth["Device"] ?? string.Empty); + var task = _userManager.OnPlaybackProgress(user, item, request.PositionTicks, auth["Client"], auth["DeviceId"], auth["Device"] ?? string.Empty); Task.WaitAll(task); } @@ -633,7 +627,7 @@ namespace MediaBrowser.Api.UserLibrary /// Posts the specified request. /// /// The request. - public void Post(OnPlaybackStopped request) + public void Delete(OnPlaybackStopped request) { var user = _userManager.GetUserById(request.UserId); @@ -643,11 +637,7 @@ namespace MediaBrowser.Api.UserLibrary if (auth != null) { - ClientType clientType; - - Enum.TryParse(auth["Client"] ?? string.Empty, out clientType); - - var task = _userManager.OnPlaybackStopped(user, item, request.PositionTicks, clientType, auth["DeviceId"], auth["Device"] ?? string.Empty); + var task = _userManager.OnPlaybackStopped(user, item, request.PositionTicks, auth["Client"], auth["DeviceId"], auth["Device"] ?? string.Empty); Task.WaitAll(task); } diff --git a/MediaBrowser.Controller/Entities/CollectionFolder.cs b/MediaBrowser.Controller/Entities/CollectionFolder.cs index 091cbdc3b5..c64f001c11 100644 --- a/MediaBrowser.Controller/Entities/CollectionFolder.cs +++ b/MediaBrowser.Controller/Entities/CollectionFolder.cs @@ -35,7 +35,7 @@ namespace MediaBrowser.Controller.Entities /// Allow different display preferences for each collection folder /// /// The display prefs id. - public override Guid DisplayPrefsId + public override Guid DisplayPreferencesId { get { diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs index 9e50969201..48d7cbd89c 100644 --- a/MediaBrowser.Controller/Entities/Folder.cs +++ b/MediaBrowser.Controller/Entities/Folder.cs @@ -64,7 +64,7 @@ namespace MediaBrowser.Controller.Entities /// /// The display prefs id. [IgnoreDataMember] - public virtual Guid DisplayPrefsId + public virtual Guid DisplayPreferencesId { get { @@ -76,35 +76,35 @@ namespace MediaBrowser.Controller.Entities /// /// The _display prefs /// - private IEnumerable _displayPrefs; + private IEnumerable _displayPreferences; /// /// The _display prefs initialized /// - private bool _displayPrefsInitialized; + private bool _displayPreferencesInitialized; /// /// The _display prefs sync lock /// - private object _displayPrefsSyncLock = new object(); + private object _displayPreferencesSyncLock = new object(); /// /// Gets the display prefs. /// /// The display prefs. [IgnoreDataMember] - public IEnumerable DisplayPrefs + public IEnumerable DisplayPreferences { get { // Call ToList to exhaust the stream because we'll be iterating over this multiple times - LazyInitializer.EnsureInitialized(ref _displayPrefs, ref _displayPrefsInitialized, ref _displayPrefsSyncLock, () => Kernel.Instance.DisplayPreferencesRepository.RetrieveDisplayPrefs(this).ToList()); - return _displayPrefs; + LazyInitializer.EnsureInitialized(ref _displayPreferences, ref _displayPreferencesInitialized, ref _displayPreferencesSyncLock, () => Kernel.Instance.DisplayPreferencesRepository.RetrieveDisplayPreferences(this).ToList()); + return _displayPreferences; } private set { - _displayPrefs = value; + _displayPreferences = value; if (value == null) { - _displayPrefsInitialized = false; + _displayPreferencesInitialized = false; } } } @@ -116,29 +116,29 @@ namespace MediaBrowser.Controller.Entities /// if set to true [create if null]. /// DisplayPreferences. /// - public DisplayPreferences GetDisplayPrefs(User user, bool createIfNull) + public DisplayPreferences GetDisplayPreferences(User user, bool createIfNull) { if (user == null) { throw new ArgumentNullException(); } - if (DisplayPrefs == null) + if (DisplayPreferences == null) { if (!createIfNull) { return null; } - AddOrUpdateDisplayPrefs(user, new DisplayPreferences { UserId = user.Id }); + AddOrUpdateDisplayPreferences(user, new DisplayPreferences { UserId = user.Id }); } - var data = DisplayPrefs.FirstOrDefault(u => u.UserId == user.Id); + var data = DisplayPreferences.FirstOrDefault(u => u.UserId == user.Id); if (data == null && createIfNull) { data = new DisplayPreferences { UserId = user.Id }; - AddOrUpdateDisplayPrefs(user, data); + AddOrUpdateDisplayPreferences(user, data); } return data; @@ -150,7 +150,7 @@ namespace MediaBrowser.Controller.Entities /// The user. /// The data. /// - public void AddOrUpdateDisplayPrefs(User user, DisplayPreferences data) + public void AddOrUpdateDisplayPreferences(User user, DisplayPreferences data) { if (user == null) { @@ -164,15 +164,15 @@ namespace MediaBrowser.Controller.Entities data.UserId = user.Id; - if (DisplayPrefs == null) + if (DisplayPreferences == null) { - DisplayPrefs = new[] { data }; + DisplayPreferences = new[] { data }; } else { - var list = DisplayPrefs.Where(u => u.UserId != user.Id).ToList(); + var list = DisplayPreferences.Where(u => u.UserId != user.Id).ToList(); list.Add(data); - DisplayPrefs = list; + DisplayPreferences = list; } } diff --git a/MediaBrowser.Controller/Library/DtoBuilder.cs b/MediaBrowser.Controller/Library/DtoBuilder.cs index 02d8eb16ff..48aa67f794 100644 --- a/MediaBrowser.Controller/Library/DtoBuilder.cs +++ b/MediaBrowser.Controller/Library/DtoBuilder.cs @@ -175,7 +175,7 @@ namespace MediaBrowser.Controller.Library if (item.IsFolder && fields.Contains(ItemFields.DisplayPreferences)) { - dto.DisplayPreferences = ((Folder)item).GetDisplayPrefs(user, false) ?? new DisplayPreferences { UserId = user.Id }; + dto.DisplayPreferences = ((Folder)item).GetDisplayPreferences(user, false) ?? new DisplayPreferences { UserId = user.Id }; } if (item.IsFolder) diff --git a/MediaBrowser.Controller/Library/IUserManager.cs b/MediaBrowser.Controller/Library/IUserManager.cs index 910ba13b28..229e4cb766 100644 --- a/MediaBrowser.Controller/Library/IUserManager.cs +++ b/MediaBrowser.Controller/Library/IUserManager.cs @@ -73,7 +73,7 @@ namespace MediaBrowser.Controller.Library /// Name of the device. /// Task. /// user - Task LogUserActivity(User user, ClientType clientType, string deviceId, string deviceName); + Task LogUserActivity(User user, string clientType, string deviceId, string deviceName); /// /// Refreshes metadata for each user @@ -128,7 +128,7 @@ namespace MediaBrowser.Controller.Library /// The device id. /// Name of the device. /// - void OnPlaybackStart(User user, BaseItem item, ClientType clientType, string deviceId, string deviceName); + void OnPlaybackStart(User user, BaseItem item, string clientType, string deviceId, string deviceName); /// /// Used to report playback progress for an item @@ -141,7 +141,7 @@ namespace MediaBrowser.Controller.Library /// Name of the device. /// Task. /// - Task OnPlaybackProgress(User user, BaseItem item, long? positionTicks, ClientType clientType, string deviceId, string deviceName); + Task OnPlaybackProgress(User user, BaseItem item, long? positionTicks, string clientType, string deviceId, string deviceName); /// /// Used to report that playback has ended for an item @@ -154,7 +154,7 @@ namespace MediaBrowser.Controller.Library /// Name of the device. /// Task. /// - Task OnPlaybackStopped(User user, BaseItem item, long? positionTicks, ClientType clientType, string deviceId, string deviceName); + Task OnPlaybackStopped(User user, BaseItem item, long? positionTicks, string clientType, string deviceId, string deviceName); /// /// Saves user data for an item diff --git a/MediaBrowser.Controller/Persistence/IDisplayPreferencesRepository.cs b/MediaBrowser.Controller/Persistence/IDisplayPreferencesRepository.cs index b820f54a8d..6f03810c23 100644 --- a/MediaBrowser.Controller/Persistence/IDisplayPreferencesRepository.cs +++ b/MediaBrowser.Controller/Persistence/IDisplayPreferencesRepository.cs @@ -17,13 +17,13 @@ namespace MediaBrowser.Controller.Persistence /// The item. /// The cancellation token. /// Task. - Task SaveDisplayPrefs(Folder item, CancellationToken cancellationToken); + Task SaveDisplayPreferences(Folder item, CancellationToken cancellationToken); /// /// Gets display preferences for an item /// /// The item. /// IEnumerable{DisplayPreferences}. - IEnumerable RetrieveDisplayPrefs(Folder item); + IEnumerable RetrieveDisplayPreferences(Folder item); } } diff --git a/MediaBrowser.Model/Connectivity/ClientConnectionInfo.cs b/MediaBrowser.Model/Connectivity/ClientConnectionInfo.cs index a70dddaa65..565ce6ec24 100644 --- a/MediaBrowser.Model/Connectivity/ClientConnectionInfo.cs +++ b/MediaBrowser.Model/Connectivity/ClientConnectionInfo.cs @@ -22,7 +22,7 @@ namespace MediaBrowser.Model.Connectivity /// /// The type of the client. [ProtoMember(2)] - public ClientType ClientType { get; set; } + public string Client { get; set; } /// /// Gets or sets the last activity date. diff --git a/MediaBrowser.Model/Connectivity/ClientType.cs b/MediaBrowser.Model/Connectivity/ClientType.cs deleted file mode 100644 index 3ae3ded21a..0000000000 --- a/MediaBrowser.Model/Connectivity/ClientType.cs +++ /dev/null @@ -1,41 +0,0 @@ -namespace MediaBrowser.Model.Connectivity -{ - /// - /// Enum ClientType - /// - public enum ClientType - { - /// - /// The other - /// - Other, - /// - /// The android - /// - Android, - /// - /// The dashboard - /// - Dashboard, - /// - /// The dlna - /// - Dlna, - /// - /// The ios - /// - Ios, - /// - /// The pc - /// - Pc, - /// - /// The windows phone - /// - WindowsPhone, - /// - /// The windows RT - /// - WindowsRT - } -} diff --git a/MediaBrowser.Model/Entities/DisplayPreferences.cs b/MediaBrowser.Model/Entities/DisplayPreferences.cs index 2fe4ae5646..7331da86d7 100644 --- a/MediaBrowser.Model/Entities/DisplayPreferences.cs +++ b/MediaBrowser.Model/Entities/DisplayPreferences.cs @@ -21,8 +21,6 @@ namespace MediaBrowser.Model.Entities /// public DisplayPreferences() { - ViewType = ViewTypes.Poster; - PrimaryImageType = ImageType.Primary; RememberIndexing = false; PrimaryImageHeight = 250; PrimaryImageWidth = 250; @@ -40,13 +38,7 @@ namespace MediaBrowser.Model.Entities /// /// The type of the view. [ProtoMember(2)] - public ViewTypes ViewType { get; set; } - /// - /// Gets or sets the type of the primary image. - /// - /// The type of the primary image. - [ProtoMember(3)] - public ImageType PrimaryImageType { get; set; } + public string ViewType { get; set; } /// /// Gets or sets the sort by. /// @@ -127,29 +119,6 @@ namespace MediaBrowser.Model.Entities } } - /// - /// Enum ViewTypes - /// - public enum ViewTypes - { - /// - /// The poster - /// - Poster, - /// - /// The cover flow - /// - CoverFlow, - /// - /// The thumb strip - /// - ThumbStrip, - /// - /// The list - /// - List - } - /// /// Enum ScrollDirection /// diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj index 5f76c49cac..a3bc341c34 100644 --- a/MediaBrowser.Model/MediaBrowser.Model.csproj +++ b/MediaBrowser.Model/MediaBrowser.Model.csproj @@ -49,7 +49,6 @@ - diff --git a/MediaBrowser.Server.Implementations/HttpServer/BaseRestService.cs b/MediaBrowser.Server.Implementations/HttpServer/BaseRestService.cs index e301f0496e..4799bf0b86 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 71fe6e125b..7b12201f76 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 1ebf99b6a2..5cfd01ee0d 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 ddf44d4071..baa38cde0c 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)) { diff --git a/MediaBrowser.ServerApplication/LibraryExplorer.xaml.cs b/MediaBrowser.ServerApplication/LibraryExplorer.xaml.cs index 1968bbc7d1..ca69459be6 100644 --- a/MediaBrowser.ServerApplication/LibraryExplorer.xaml.cs +++ b/MediaBrowser.ServerApplication/LibraryExplorer.xaml.cs @@ -89,7 +89,7 @@ namespace MediaBrowser.ServerApplication var currentFolder = folder; Task.Factory.StartNew(() => { - var prefs = ddlProfile.SelectedItem != null ? currentFolder.GetDisplayPrefs(ddlProfile.SelectedItem as User, false) ?? new DisplayPreferences {SortBy = ItemSortBy.SortName} : new DisplayPreferences {SortBy = ItemSortBy.SortName}; + var prefs = ddlProfile.SelectedItem != null ? currentFolder.GetDisplayPreferences(ddlProfile.SelectedItem as User, false) ?? new DisplayPreferences {SortBy = ItemSortBy.SortName} : new DisplayPreferences {SortBy = ItemSortBy.SortName}; var node = new TreeViewItem { Tag = currentFolder }; var subChildren = currentFolder.GetChildren(CurrentUser, prefs.IndexBy); @@ -142,7 +142,7 @@ namespace MediaBrowser.ServerApplication var subFolder = item as Folder; if (subFolder != null) { - var prefs = subFolder.GetDisplayPrefs(user, false) ?? new DisplayPreferences {SortBy = LocalizedStrings.Instance.GetString("NameDispPref")}; + var prefs = subFolder.GetDisplayPreferences(user, false) ?? new DisplayPreferences {SortBy = LocalizedStrings.Instance.GetString("NameDispPref")}; AddChildren(node, OrderBy(subFolder.GetChildren(user), user, prefs.SortBy), user); node.Header = item.Name + " (" + node.Items.Count + ")"; } @@ -196,7 +196,7 @@ namespace MediaBrowser.ServerApplication ItemSortBy.Runtime }; - var prefs = folder.GetDisplayPrefs(ddlProfile.SelectedItem as User, false); + var prefs = folder.GetDisplayPreferences(ddlProfile.SelectedItem as User, false); ddlIndexBy.SelectedItem = prefs != null ? prefs.IndexBy ?? LocalizedStrings.Instance.GetString("NoneDispPref") : LocalizedStrings.Instance.GetString("NoneDispPref"); @@ -354,7 +354,7 @@ namespace MediaBrowser.ServerApplication var folder = treeItem != null ? treeItem.Tag as Folder : null; - var prefs = folder != null ? folder.GetDisplayPrefs(CurrentUser, true) : new DisplayPreferences {SortBy = ItemSortBy.SortName}; + var prefs = folder != null ? folder.GetDisplayPreferences(CurrentUser, true) : new DisplayPreferences {SortBy = ItemSortBy.SortName}; if (folder != null && prefs.IndexBy != ddlIndexBy.SelectedItem as string) { //grab UI context so we can update within the below task @@ -395,7 +395,7 @@ namespace MediaBrowser.ServerApplication var folder = treeItem != null ? treeItem.Tag as Folder : null; - var prefs = folder != null ? folder.GetDisplayPrefs(CurrentUser, true) : new DisplayPreferences(); + var prefs = folder != null ? folder.GetDisplayPreferences(CurrentUser, true) : new DisplayPreferences(); if (folder != null && prefs.SortBy != ddlSortBy.SelectedItem as string) { //grab UI context so we can update within the below task diff --git a/MediaBrowser.WebDashboard/Html/scripts/DashboardPage.js b/MediaBrowser.WebDashboard/Html/scripts/DashboardPage.js index 635553076a..e61febb263 100644 --- a/MediaBrowser.WebDashboard/Html/scripts/DashboardPage.js +++ b/MediaBrowser.WebDashboard/Html/scripts/DashboardPage.js @@ -114,36 +114,36 @@ getClientType: function (connection) { - if (connection.ClientType == "Dashboard") { + if (connection.Client.toLowerCase() == "dashboard") { return "Dashboard"; } - if (connection.ClientType == "Pc") { + if (connection.Client.toLowerCase() == "mediabrowsertheater") { - return "Media Browser"; + return "Media Browser Theater"; } - if (connection.ClientType == "Android") { + if (connection.Client.toLowerCase() == "android") { return "Android"; } - if (connection.ClientType == "Ios") { + if (connection.Client.toLowerCase() == "ios") { return "iOS"; } - if (connection.ClientType == "WindowsRT") { + if (connection.Client.toLowerCase() == "windowsrt") { return "Windows RT"; } - if (connection.ClientType == "WindowsPhone") { + if (connection.Client.toLowerCase() == "windowsphone") { return "Windows Phone"; } - if (connection.ClientType == "Dlna") { + if (connection.Client.toLowerCase() == "dlna") { return "Dlna"; } - return connection.ClientType; + return connection.Client; }, getNowPlayingImage: function (item) { diff --git a/Nuget/MediaBrowser.Common.Internal.nuspec b/Nuget/MediaBrowser.Common.Internal.nuspec index 7be51fb1a1..f24655c848 100644 --- a/Nuget/MediaBrowser.Common.Internal.nuspec +++ b/Nuget/MediaBrowser.Common.Internal.nuspec @@ -2,7 +2,7 @@ MediaBrowser.Common.Internal - 3.0.49 + 3.0.51 MediaBrowser.Common.Internal Luke ebr,Luke,scottisafool @@ -12,7 +12,7 @@ Contains common components shared by Media Browser Theatre and Media Browser Server. Not intended for plugin developer consumption. Copyright © Media Browser 2013 - + diff --git a/Nuget/MediaBrowser.Common.nuspec b/Nuget/MediaBrowser.Common.nuspec index 26737dc73d..12dff529d1 100644 --- a/Nuget/MediaBrowser.Common.nuspec +++ b/Nuget/MediaBrowser.Common.nuspec @@ -2,7 +2,7 @@ MediaBrowser.Common - 3.0.49 + 3.0.51 MediaBrowser.Common Media Browser Team ebr,Luke,scottisafool diff --git a/Nuget/MediaBrowser.Server.Core.nuspec b/Nuget/MediaBrowser.Server.Core.nuspec index a5738419e0..a29bd9e3c8 100644 --- a/Nuget/MediaBrowser.Server.Core.nuspec +++ b/Nuget/MediaBrowser.Server.Core.nuspec @@ -2,7 +2,7 @@ MediaBrowser.Server.Core - 3.0.49 + 3.0.51 Media Browser.Server.Core Media Browser Team ebr,Luke,scottisafool @@ -12,7 +12,7 @@ Contains core components required to build plugins for Media Browser Server. Copyright © Media Browser 2013 - +