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. --- .../Entities/CollectionFolder.cs | 2 +- MediaBrowser.Controller/Entities/Folder.cs | 38 +++++++++++----------- MediaBrowser.Controller/Library/DtoBuilder.cs | 2 +- MediaBrowser.Controller/Library/IUserManager.cs | 8 ++--- .../Persistence/IDisplayPreferencesRepository.cs | 4 +-- 5 files changed, 27 insertions(+), 27 deletions(-) (limited to 'MediaBrowser.Controller') diff --git a/MediaBrowser.Controller/Entities/CollectionFolder.cs b/MediaBrowser.Controller/Entities/CollectionFolder.cs index 091cbdc3b..c64f001c1 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 9e5096920..48d7cbd89 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 02d8eb16f..48aa67f79 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 910ba13b2..229e4cb76 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 b820f54a8..6f03810c2 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); } } -- cgit v1.2.3