Merge pull request #1222 from MediaBrowser/dev

3.0.5768.7

8 files changed, 16 insertions, 52 deletions

diff --git a/MediaBrowser.Controller/Channels/Channel.cs b/MediaBrowser.Controller/Channels/Channel.cs
index f0328a1d88..839b7d68f5 100644
--- a/MediaBrowser.Controller/Channels/Channel.cs
+++ b/MediaBrowser.Controller/Channels/Channel.cs
@@ -10,8 +10,6 @@ namespace MediaBrowser.Controller.Channels
 {
     public class Channel : Folder
     {
-        public string OriginalChannelName { get; set; }
-
         public override bool IsVisible(User user)
         {
             if (user.Policy.BlockedChannels != null)
diff --git a/MediaBrowser.Controller/Channels/ChannelAudioItem.cs b/MediaBrowser.Controller/Channels/ChannelAudioItem.cs
index aa4b6731c7..653cec9016 100644
--- a/MediaBrowser.Controller/Channels/ChannelAudioItem.cs
+++ b/MediaBrowser.Controller/Channels/ChannelAudioItem.cs
@@ -7,24 +7,15 @@ using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Users;
 using System.Collections.Generic;
 using System.Linq;
+using System.Runtime.Serialization;
 using System.Threading;
 
 namespace MediaBrowser.Controller.Channels
 {
     public class ChannelAudioItem : Audio, IChannelMediaItem
     {
-        public string ExternalId { get; set; }
-
-        public string DataVersion { get; set; }
-
-        public ChannelItemType ChannelItemType { get; set; }
-
-        public bool IsInfiniteStream { get; set; }
-
         public ChannelMediaContentType ContentType { get; set; }
 
-        public string OriginalImageUrl { get; set; }
-
         public List<ChannelMediaInfo> ChannelMediaSources { get; set; }
 
         protected override bool GetBlockUnratedValue(UserPolicy config)
@@ -37,6 +28,7 @@ namespace MediaBrowser.Controller.Channels
             return ExternalId;
         }
 
+        [IgnoreDataMember]
         public override bool SupportsLocalMetadata
         {
             get
@@ -55,6 +47,7 @@ namespace MediaBrowser.Controller.Channels
             ChannelMediaSources = new List<ChannelMediaInfo>();
         }
 
+        [IgnoreDataMember]
         public override LocationType LocationType
         {
             get
diff --git a/MediaBrowser.Controller/Channels/ChannelFolderItem.cs b/MediaBrowser.Controller/Channels/ChannelFolderItem.cs
index 7e9da52a92..9010470f8f 100644
--- a/MediaBrowser.Controller/Channels/ChannelFolderItem.cs
+++ b/MediaBrowser.Controller/Channels/ChannelFolderItem.cs
@@ -3,28 +3,24 @@ using MediaBrowser.Model.Channels;
 using MediaBrowser.Model.Querying;
 using MediaBrowser.Model.Users;
 using System;
+using System.Runtime.Serialization;
 using System.Threading;
 using System.Threading.Tasks;
+using MediaBrowser.Model.Entities;
 
 namespace MediaBrowser.Controller.Channels
 {
     public class ChannelFolderItem : Folder, IChannelItem
     {
-        public string ExternalId { get; set; }
-
-        public string DataVersion { get; set; }
-
-        public ChannelItemType ChannelItemType { get; set; }
         public ChannelFolderType ChannelFolderType { get; set; }
 
-        public string OriginalImageUrl { get; set; }
-
         protected override bool GetBlockUnratedValue(UserPolicy config)
         {
             // Don't block. 
             return false;
         }
 
+        [IgnoreDataMember]
         public override bool SupportsLocalMetadata
         {
             get
diff --git a/MediaBrowser.Controller/Channels/ChannelVideoItem.cs b/MediaBrowser.Controller/Channels/ChannelVideoItem.cs
index ca5e343f8c..fb545e57aa 100644
--- a/MediaBrowser.Controller/Channels/ChannelVideoItem.cs
+++ b/MediaBrowser.Controller/Channels/ChannelVideoItem.cs
@@ -8,24 +8,15 @@ using MediaBrowser.Model.Users;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
+using System.Runtime.Serialization;
 using System.Threading;
 
 namespace MediaBrowser.Controller.Channels
 {
     public class ChannelVideoItem : Video, IChannelMediaItem, IHasLookupInfo<ChannelItemLookupInfo>
     {
-        public string ExternalId { get; set; }
-
-        public string DataVersion { get; set; }
-
-        public ChannelItemType ChannelItemType { get; set; }
-
-        public bool IsInfiniteStream { get; set; }
-
         public ChannelMediaContentType ContentType { get; set; }
 
-        public string OriginalImageUrl { get; set; }
-
         public List<ChannelMediaInfo> ChannelMediaSources { get; set; }
 
         protected override string CreateUserDataKey()
@@ -56,6 +47,7 @@ namespace MediaBrowser.Controller.Channels
             return config.BlockUnratedItems.Contains(UnratedItem.ChannelContent);
         }
 
+        [IgnoreDataMember]
         public override bool SupportsLocalMetadata
         {
             get
@@ -74,6 +66,7 @@ namespace MediaBrowser.Controller.Channels
             ChannelMediaSources = new List<ChannelMediaInfo>();
         }
 
+        [IgnoreDataMember]
         public override LocationType LocationType
         {
             get
@@ -115,7 +108,11 @@ namespace MediaBrowser.Controller.Channels
             var info = GetItemLookupInfo<ChannelItemLookupInfo>();
 
             info.ContentType = ContentType;
-            info.ExtraType = ExtraType;
+
+            if (ExtraType.HasValue)
+            {
+                info.ExtraType = ExtraType.Value;
+            }
 
             return info;
         }
diff --git a/MediaBrowser.Controller/Channels/IChannelFactory.cs b/MediaBrowser.Controller/Channels/IChannelFactory.cs
deleted file mode 100644
index c7ed925866..0000000000
--- a/MediaBrowser.Controller/Channels/IChannelFactory.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System.Collections.Generic;
-
-namespace MediaBrowser.Controller.Channels
-{
-    public interface IChannelFactory
-    {
-        IEnumerable<IChannel> GetChannels();
-    }
-
-    public interface IFactoryChannel
-    {
-        
-    }
-}
\ No newline at end of file
diff --git a/MediaBrowser.Controller/Channels/IChannelItem.cs b/MediaBrowser.Controller/Channels/IChannelItem.cs
index 7eb865b5bd..9b5f0359bd 100644
--- a/MediaBrowser.Controller/Channels/IChannelItem.cs
+++ b/MediaBrowser.Controller/Channels/IChannelItem.cs
@@ -7,11 +7,5 @@ namespace MediaBrowser.Controller.Channels
         string ChannelId { get; set; }
 
         string ExternalId { get; set; }
-
-        ChannelItemType ChannelItemType { get; set; }
-
-        string OriginalImageUrl { get; set; }
-
-        string DataVersion { get; set; }
     }
 }
diff --git a/MediaBrowser.Controller/Channels/IChannelManager.cs b/MediaBrowser.Controller/Channels/IChannelManager.cs
index 8d3e0f5962..fec550df8b 100644
--- a/MediaBrowser.Controller/Channels/IChannelManager.cs
+++ b/MediaBrowser.Controller/Channels/IChannelManager.cs
@@ -16,7 +16,7 @@ namespace MediaBrowser.Controller.Channels
         /// </summary>
         /// <param name="channels">The channels.</param>
         /// <param name="factories">The factories.</param>
-        void AddParts(IEnumerable<IChannel> channels, IEnumerable<IChannelFactory> factories);
+        void AddParts(IEnumerable<IChannel> channels);
 
         /// <summary>
         /// Gets the channel download path.
diff --git a/MediaBrowser.Controller/Channels/IChannelMediaItem.cs b/MediaBrowser.Controller/Channels/IChannelMediaItem.cs
index 50df07e72b..60a29da90b 100644
--- a/MediaBrowser.Controller/Channels/IChannelMediaItem.cs
+++ b/MediaBrowser.Controller/Channels/IChannelMediaItem.cs
@@ -11,7 +11,7 @@ namespace MediaBrowser.Controller.Channels
 
         ChannelMediaContentType ContentType { get; set; }
 
-        ExtraType ExtraType { get; set; }
+        ExtraType? ExtraType { get; set; }
 
         List<ChannelMediaInfo> ChannelMediaSources { get; set; }
     }