The Free Software Media System - Server Backend & API
Cleanup and fix version ordering
Shadowghostedc6caf255da
diff --git a/Emby.Server.Implementations/Playlists/PlaylistsFolder.cs b/Emby.Server.Implementations/Playlists/PlaylistsFolder.csindex a5be2b616e..3bbbdd43a0 100644--- a/Emby.Server.Implementations/Playlists/PlaylistsFolder.cs+++ b/Emby.Server.Implementations/Playlists/PlaylistsFolder.cs@@ -43,8 +43,9 @@ namespace Emby.Server.Implementations.Playlists}query.Recursive = true;- query.IncludeItemTypes = new[] { BaseItemKind.Playlist };- return QueryWithPostFiltering2(query);+ query.IncludeItemTypes = [BaseItemKind.Playlist];++ return QueryWithPostFiltering(query);}public override string GetClientTypeName()diff --git a/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs b/Jellyfin.Server.Implementations/Item/BaseItemRepository.csindex c962979b17..46564b24cb 100644--- a/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs+++ b/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs@@ -1719,6 +1719,7 @@ public sealed class BaseItemRepository: [];// Add or update LinkedChildren entries+ int sortOrder = 0;foreach (var (childId, childType) in newLinkedChildren){if (!existingChildIds.Contains(childId))@@ -1739,14 +1740,17 @@ public sealed class BaseItemRepositoryParentId = video.Id,ChildId = childId,ChildType = (DbLinkedChildType)childType,- SortOrder = null+ SortOrder = sortOrder});}else{existingLink.ChildType = (DbLinkedChildType)childType;+ existingLink.SortOrder = sortOrder;existingLinkedChildren.Remove(existingLink);}++ sortOrder++;}// Remove orphaned alternate version links and their items@@ -3953,6 +3957,7 @@ public sealed class BaseItemRepository}return query+ .OrderBy(lc => lc.SortOrder).Select(lc => lc.ChildId).ToList();}diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.csindex 0c0558b4c1..4916ead69a 100644--- a/MediaBrowser.Controller/Entities/Folder.cs+++ b/MediaBrowser.Controller/Entities/Folder.cs@@ -730,7 +730,7 @@ namespace MediaBrowser.Controller.Entitiespublic QueryResult<BaseItem> QueryRecursive(InternalItemsQuery query){- if (!query.ForceDirect && RequiresPostFiltering(query))+ if (!query.ForceDirect && CollapseBoxSetItems(query, this, query.User, ConfigurationManager)){query.CollapseBoxSetItems = true;SetCollapseBoxSetItemTypes(query);@@ -743,15 +743,15 @@ namespace MediaBrowser.Controller.Entitiesquery.Parent = this;}- if (RequiresPostFiltering2(query))+ if (query.IncludeItemTypes.Length == 1 && query.IncludeItemTypes[0] == BaseItemKind.BoxSet){- return QueryWithPostFiltering2(query);+ return QueryWithPostFiltering(query);}return LibraryManager.GetItemsResult(query);}- protected QueryResult<BaseItem> QueryWithPostFiltering2(InternalItemsQuery query)+ protected QueryResult<BaseItem> QueryWithPostFiltering(InternalItemsQuery query){var startIndex = query.StartIndex;var limit = query.Limit;@@ -797,28 +797,6 @@ namespace MediaBrowser.Controller.EntitiesreturnItems.ToArray());}- private bool RequiresPostFiltering2(InternalItemsQuery query)- {- if (query.IncludeItemTypes.Length == 1 && query.IncludeItemTypes[0] == BaseItemKind.BoxSet)- {- Logger.LogDebug("Query requires post-filtering due to BoxSet query");- return true;- }-- return false;- }-- private bool RequiresPostFiltering(InternalItemsQuery query)- {- if (CollapseBoxSetItems(query, this, query.User, ConfigurationManager))- {- Logger.LogDebug("Query requires post-filtering due to CollapseBoxSetItems");- return true;- }-- return false;- }-private static BaseItem[] SortItemsByRequest(InternalItemsQuery query, IReadOnlyList<BaseItem> items){return items.OrderBy(i => Array.IndexOf(query.ItemIds, i.Id)).ToArray();diff --git a/MediaBrowser.Controller/Entities/InternalItemsQuery.cs b/MediaBrowser.Controller/Entities/InternalItemsQuery.csindex 2824fb6954..23fce3f368 100644--- a/MediaBrowser.Controller/Entities/InternalItemsQuery.cs+++ b/MediaBrowser.Controller/Entities/InternalItemsQuery.cs@@ -17,46 +17,45 @@ namespace MediaBrowser.Controller.Entities{public InternalItemsQuery(){- AlbumArtistIds = Array.Empty<Guid>();- AlbumIds = Array.Empty<Guid>();- AncestorIds = Array.Empty<Guid>();- ArtistIds = Array.Empty<Guid>();- BlockUnratedItems = Array.Empty<UnratedItem>();- BoxSetLibraryFolders = Array.Empty<Guid>();- ChannelIds = Array.Empty<Guid>();- ContributingArtistIds = Array.Empty<Guid>();+ AlbumArtistIds = [];+ AlbumIds = [];+ AncestorIds = [];+ ArtistIds = [];+ BlockUnratedItems = [];+ BoxSetLibraryFolders = [];+ ChannelIds = [];+ ContributingArtistIds = [];DtoOptions = new DtoOptions();EnableTotalRecordCount = true;- ExcludeArtistIds = Array.Empty<Guid>();- ExcludeInheritedTags = Array.Empty<string>();- IncludeInheritedTags = Array.Empty<string>();- ExcludeItemIds = Array.Empty<Guid>();- ExcludeItemTypes = Array.Empty<BaseItemKind>();- ExcludeTags = Array.Empty<string>();- ExtraTypes = Array.Empty<ExtraType>();- GenreIds = Array.Empty<Guid>();- Genres = Array.Empty<string>();+ ExcludeArtistIds = [];+ ExcludeInheritedTags = [];+ IncludeInheritedTags = [];+ ExcludeItemIds = [];+ ExcludeItemTypes = [];+ ExcludeTags = [];+ GenreIds = [];+ Genres = [];GroupByPresentationUniqueKey = true;- ImageTypes = Array.Empty<ImageType>();- IncludeItemTypes = Array.Empty<BaseItemKind>();- ItemIds = Array.Empty<Guid>();- OwnerIds = Array.Empty<Guid>();- ExtraTypes = Array.Empty<ExtraType>();- MediaTypes = Array.Empty<MediaType>();- OfficialRatings = Array.Empty<string>();- OrderBy = Array.Empty<(ItemSortBy, SortOrder)>();- OwnerIds = Array.Empty<Guid>();- PersonIds = Array.Empty<Guid>();- PersonTypes = Array.Empty<string>();- PresetViews = Array.Empty<CollectionType?>();- SeriesStatuses = Array.Empty<SeriesStatus>();- SourceTypes = Array.Empty<SourceType>();- StudioIds = Array.Empty<Guid>();- Tags = Array.Empty<string>();- TopParentIds = Array.Empty<Guid>();- TrailerTypes = Array.Empty<TrailerType>();- VideoTypes = Array.Empty<VideoType>();- Years = Array.Empty<int>();+ ImageTypes = [];+ IncludeItemTypes = [];+ ItemIds = [];+ OwnerIds = [];+ ExtraTypes = [];+ MediaTypes = [];+ OfficialRatings = [];+ OrderBy = [];+ OwnerIds = [];+ PersonIds = [];+ PersonTypes = [];+ PresetViews = [];+ SeriesStatuses = [];+ SourceTypes = [];+ StudioIds = [];+ Tags = [];+ TopParentIds = [];+ TrailerTypes = [];+ VideoTypes = [];+ Years = [];SkipDeserialization = false;}