From 683d8455c6ce75bcefc8749fe5a5d15d90a28625 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Wed, 19 Mar 2014 00:59:45 -0400 Subject: #712 - Group multiple versions --- .../Dto/DtoService.cs | 2 +- .../Library/LibraryManager.cs | 24 ++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) (limited to 'MediaBrowser.Server.Implementations') diff --git a/MediaBrowser.Server.Implementations/Dto/DtoService.cs b/MediaBrowser.Server.Implementations/Dto/DtoService.cs index 3aaf6eb80..a66cb148f 100644 --- a/MediaBrowser.Server.Implementations/Dto/DtoService.cs +++ b/MediaBrowser.Server.Implementations/Dto/DtoService.cs @@ -651,7 +651,7 @@ namespace MediaBrowser.Server.Implementations.Dto /// The chapter info. /// The item. /// ChapterInfoDto. - private ChapterInfoDto GetChapterInfoDto(ChapterInfo chapterInfo, BaseItem item) + public ChapterInfoDto GetChapterInfoDto(ChapterInfo chapterInfo, BaseItem item) { var dto = new ChapterInfoDto { diff --git a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs index 0b1947d4c..91abb6b4f 100644 --- a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs +++ b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs @@ -26,6 +26,7 @@ using System.IO; using System.Linq; using System.Threading; using System.Threading.Tasks; +using MoreLinq; using SortOrder = MediaBrowser.Model.Entities.SortOrder; namespace MediaBrowser.Server.Implementations.Library @@ -540,6 +541,29 @@ namespace MediaBrowser.Server.Implementations.Library return item; } + public IEnumerable ReplaceVideosWithPrimaryVersions(IEnumerable items) + { + return items.Select(i => + { + var video = i as Video; + + if (video != null) + { + if (video.PrimaryVersionId.HasValue) + { + var primary = GetItemById(video.PrimaryVersionId.Value) as Video; + + if (primary != null) + { + return primary; + } + } + } + + return i; + + }).DistinctBy(i => i.Id); + } /// /// Ensure supplied item has only one instance throughout -- cgit v1.2.3