Merge upstream/master

1 files changed, 24 insertions, 0 deletions

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<BaseItem> ReplaceVideosWithPrimaryVersions(IEnumerable<BaseItem> 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);
+        }
 
         /// <summary>
         /// Ensure supplied item has only one instance throughout