Merge upstream/master

7 files changed, 36 insertions, 7 deletions

diff --git a/MediaBrowser.Controller/Channels/ChannelAudioItem.cs b/MediaBrowser.Controller/Channels/ChannelAudioItem.cs
index 269a95456..6f3398f52 100644
--- a/MediaBrowser.Controller/Channels/ChannelAudioItem.cs
+++ b/MediaBrowser.Controller/Channels/ChannelAudioItem.cs
@@ -2,7 +2,7 @@
 
 namespace MediaBrowser.Controller.Channels
 {
-    public class ChannelAudioItem : Audio, IChannelItem
+    public class ChannelAudioItem : Audio, IChannelMediaItem
     {
         public string ExternalId { get; set; }
 
diff --git a/MediaBrowser.Controller/Channels/ChannelCategoryItem.cs b/MediaBrowser.Controller/Channels/ChannelCategoryItem.cs
index 11e56ee07..61b38c2b1 100644
--- a/MediaBrowser.Controller/Channels/ChannelCategoryItem.cs
+++ b/MediaBrowser.Controller/Channels/ChannelCategoryItem.cs
@@ -2,7 +2,12 @@
 
 namespace MediaBrowser.Controller.Channels
 {
-    public class ChannelCategoryItem : Folder
+    public class ChannelCategoryItem : Folder, IChannelItem
     {
+        public string ExternalId { get; set; }
+
+        public ChannelItemType ChannelItemType { get; set; }
+
+        public string OriginalImageUrl { get; set; }
     }
 }
diff --git a/MediaBrowser.Controller/Channels/ChannelVideoItem.cs b/MediaBrowser.Controller/Channels/ChannelVideoItem.cs
index baa4c2a17..83b85794d 100644
--- a/MediaBrowser.Controller/Channels/ChannelVideoItem.cs
+++ b/MediaBrowser.Controller/Channels/ChannelVideoItem.cs
@@ -2,7 +2,7 @@
 
 namespace MediaBrowser.Controller.Channels
 {
-    public class ChannelVideoItem : Video, IChannelItem
+    public class ChannelVideoItem : Video, IChannelMediaItem
     {
         public string ExternalId { get; set; }
 
diff --git a/MediaBrowser.Controller/Channels/IChannelItem.cs b/MediaBrowser.Controller/Channels/IChannelItem.cs
index ffef532a9..a05ef8e29 100644
--- a/MediaBrowser.Controller/Channels/IChannelItem.cs
+++ b/MediaBrowser.Controller/Channels/IChannelItem.cs
@@ -8,10 +8,13 @@ namespace MediaBrowser.Controller.Channels
 
         ChannelItemType ChannelItemType { get; set; }
 
+        string OriginalImageUrl { get; set; }
+    }
+
+    public interface IChannelMediaItem : IChannelItem
+    {
         bool IsInfiniteStream { get; set; }
 
         ChannelMediaContentType ContentType { get; set; }
-
-        string OriginalImageUrl { get; set; }
     }
 }
diff --git a/MediaBrowser.Controller/Dto/IDtoService.cs b/MediaBrowser.Controller/Dto/IDtoService.cs
index 606b51628..03039dc83 100644
--- a/MediaBrowser.Controller/Dto/IDtoService.cs
+++ b/MediaBrowser.Controller/Dto/IDtoService.cs
@@ -85,6 +85,14 @@ namespace MediaBrowser.Controller.Dto
             where T : BaseItem, IItemByName;
 
         /// <summary>
+        /// Gets the chapter information dto.
+        /// </summary>
+        /// <param name="chapterInfo">The chapter information.</param>
+        /// <param name="item">The item.</param>
+        /// <returns>ChapterInfoDto.</returns>
+        ChapterInfoDto GetChapterInfoDto(ChapterInfo chapterInfo, BaseItem item);
+
+        /// <summary>
         /// Gets the item by name dto.
         /// </summary>
         /// <param name="item">The item.</param>
diff --git a/MediaBrowser.Controller/Entities/Video.cs b/MediaBrowser.Controller/Entities/Video.cs
index 18db21f38..25f47aead 100644
--- a/MediaBrowser.Controller/Entities/Video.cs
+++ b/MediaBrowser.Controller/Entities/Video.cs
@@ -51,19 +51,25 @@ namespace MediaBrowser.Controller.Entities
         /// Gets the linked children.
         /// </summary>
         /// <returns>IEnumerable{BaseItem}.</returns>
-        public IEnumerable<BaseItem> GetAlternateVersions()
+        public IEnumerable<Video> GetAlternateVersions()
         {
             var filesWithinSameDirectory = LocalAlternateVersionIds
                 .Select(i => LibraryManager.GetItemById(i))
                 .Where(i => i != null)
                 .OfType<Video>();
 
+            return filesWithinSameDirectory.Concat(GetLinkedAlternateVersions())
+                .OrderBy(i => i.SortName);
+        }
+
+        public IEnumerable<Video> GetLinkedAlternateVersions()
+        {
             var linkedVersions = LinkedAlternateVersions
                 .Select(GetLinkedChild)
                 .Where(i => i != null)
                 .OfType<Video>();
 
-            return filesWithinSameDirectory.Concat(linkedVersions)
+            return linkedVersions
                 .OrderBy(i => i.SortName);
         }
 
diff --git a/MediaBrowser.Controller/Library/ILibraryManager.cs b/MediaBrowser.Controller/Library/ILibraryManager.cs
index 9bde9aa29..680317237 100644
--- a/MediaBrowser.Controller/Library/ILibraryManager.cs
+++ b/MediaBrowser.Controller/Library/ILibraryManager.cs
@@ -324,6 +324,13 @@ namespace MediaBrowser.Controller.Library
         /// <param name="options">The options.</param>
         /// <returns>Task.</returns>
         Task DeleteItem(BaseItem item, DeleteOptions options);
+
+        /// <summary>
+        /// Replaces the videos with primary versions.
+        /// </summary>
+        /// <param name="items">The items.</param>
+        /// <returns>IEnumerable{BaseItem}.</returns>
+        IEnumerable<BaseItem> ReplaceVideosWithPrimaryVersions(IEnumerable<BaseItem> items);
     }
 
     public static class LibraryManagerExtensions