From 874577ed8b6c4b591eeea63c23ed3f4687756a19 Mon Sep 17 00:00:00 2001 From: softworkz Date: Mon, 13 Jun 2016 02:45:15 +0200 Subject: Channel item sort must not default to name sorting when all sort fields are cleared --- MediaBrowser.Server.Implementations/Channels/ChannelManager.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'MediaBrowser.Server.Implementations') diff --git a/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs b/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs index aac5ddcaf..0cdb76345 100644 --- a/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs +++ b/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs @@ -1172,8 +1172,7 @@ namespace MediaBrowser.Server.Implementations.Channels { items = ApplyFilters(items, query.Filters, user); - var sortBy = query.SortBy.Length == 0 ? new[] { ItemSortBy.SortName } : query.SortBy; - items = _libraryManager.Sort(items, user, sortBy, query.SortOrder ?? SortOrder.Ascending); + items = _libraryManager.Sort(items, user, query.SortBy, query.SortOrder ?? SortOrder.Ascending); var all = items.ToList(); var totalCount = totalCountFromProvider ?? all.Count; -- cgit v1.2.3 From 71f8588b3abded917ac4f1ba753bf8a2d60df306 Mon Sep 17 00:00:00 2001 From: softworkz Date: Wed, 22 Jun 2016 23:23:50 +0200 Subject: ChannelManager: Update Name and CommunityRating values when changed --- .../Channels/ChannelManager.cs | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'MediaBrowser.Server.Implementations') diff --git a/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs b/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs index aac5ddcaf..41b4eb82c 100644 --- a/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs +++ b/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs @@ -1313,6 +1313,20 @@ namespace MediaBrowser.Server.Implementations.Channels item.Tags = info.Tags; item.HomePageUrl = info.HomePageUrl; } + else + { + if (item.Name != info.Name) + { + item.Name = info.Name; + forceUpdate = true; + } + + if (item.CommunityRating != info.CommunityRating) + { + item.CommunityRating = info.CommunityRating; + forceUpdate = true; + } + } var hasArtists = item as IHasArtist; if (hasArtists != null) -- cgit v1.2.3 From cb9079e0bd611e811d5f6b4be9bc59ffada6addc Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Fri, 24 Jun 2016 12:51:13 -0400 Subject: continue jquery removal --- MediaBrowser.Api/UserLibrary/ItemsService.cs | 4 ---- .../Persistence/SqliteUserDataRepository.cs | 2 ++ 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'MediaBrowser.Server.Implementations') diff --git a/MediaBrowser.Api/UserLibrary/ItemsService.cs b/MediaBrowser.Api/UserLibrary/ItemsService.cs index 51ca2d5ca..a7fc646a9 100644 --- a/MediaBrowser.Api/UserLibrary/ItemsService.cs +++ b/MediaBrowser.Api/UserLibrary/ItemsService.cs @@ -34,7 +34,6 @@ namespace MediaBrowser.Api.UserLibrary /// The _user manager /// private readonly IUserManager _userManager; - private readonly IUserDataManager _userDataRepository; /// /// The _library manager @@ -43,7 +42,6 @@ namespace MediaBrowser.Api.UserLibrary private readonly ILocalizationManager _localization; private readonly IDtoService _dtoService; - private readonly ICollectionManager _collectionManager; /// /// Initializes a new instance of the class. @@ -58,10 +56,8 @@ namespace MediaBrowser.Api.UserLibrary { _userManager = userManager; _libraryManager = libraryManager; - _userDataRepository = userDataRepository; _localization = localization; _dtoService = dtoService; - _collectionManager = collectionManager; } /// diff --git a/MediaBrowser.Server.Implementations/Persistence/SqliteUserDataRepository.cs b/MediaBrowser.Server.Implementations/Persistence/SqliteUserDataRepository.cs index 90dbd7770..812e0aa48 100644 --- a/MediaBrowser.Server.Implementations/Persistence/SqliteUserDataRepository.cs +++ b/MediaBrowser.Server.Implementations/Persistence/SqliteUserDataRepository.cs @@ -71,6 +71,8 @@ namespace MediaBrowser.Server.Implementations.Persistence "create unique index if not exists UserDataDb.userdataindex on userdata (key, userId)", "create index if not exists UserDataDb.userdataindex2 on userdata (key, userId, played)", + "create index if not exists UserDataDb.userdataindex3 on userdata (key, userId, playbackPositionTicks)", + "create index if not exists UserDataDb.userdataindex4 on userdata (key, userId, isFavorite)", //pragmas "pragma temp_store = memory", -- cgit v1.2.3 From db5ac92dd276425c9269eb56dbc43eeb7cc5c710 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Fri, 24 Jun 2016 16:07:45 -0400 Subject: update login --- .../Channels/ChannelManager.cs | 23 +++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'MediaBrowser.Server.Implementations') diff --git a/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs b/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs index 8efc600e9..e01468d17 100644 --- a/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs +++ b/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs @@ -1322,17 +1322,18 @@ namespace MediaBrowser.Server.Implementations.Channels } else { - if (item.Name != info.Name) - { - item.Name = info.Name; - forceUpdate = true; - } - - if (item.CommunityRating != info.CommunityRating) - { - item.CommunityRating = info.CommunityRating; - forceUpdate = true; - } + // Can't do this right now due to channels that utilize the server's metadata services + //if (item.Name != info.Name) + //{ + // item.Name = info.Name; + // forceUpdate = true; + //} + + //if (item.CommunityRating != info.CommunityRating) + //{ + // item.CommunityRating = info.CommunityRating; + // forceUpdate = true; + //} } var hasArtists = item as IHasArtist; -- cgit v1.2.3