From 5c613f2dda979f412ffc3eca19f0a933fa2ef942 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sun, 4 Oct 2015 14:10:50 -0400 Subject: update channel db --- MediaBrowser.Controller/Channels/ChannelAudioItem.cs | 13 +++---------- MediaBrowser.Controller/Channels/ChannelFolderItem.cs | 8 +++----- MediaBrowser.Controller/Channels/ChannelVideoItem.cs | 11 +++-------- MediaBrowser.Controller/Channels/IChannelItem.cs | 6 +----- 4 files changed, 10 insertions(+), 28 deletions(-) (limited to 'MediaBrowser.Controller/Channels') 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 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(); } + [IgnoreDataMember] public override LocationType LocationType { get diff --git a/MediaBrowser.Controller/Channels/ChannelFolderItem.cs b/MediaBrowser.Controller/Channels/ChannelFolderItem.cs index 7e9da52a92..4273a13655 100644 --- a/MediaBrowser.Controller/Channels/ChannelFolderItem.cs +++ b/MediaBrowser.Controller/Channels/ChannelFolderItem.cs @@ -3,18 +3,15 @@ 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; } @@ -25,6 +22,7 @@ namespace MediaBrowser.Controller.Channels return false; } + [IgnoreDataMember] public override bool SupportsLocalMetadata { get diff --git a/MediaBrowser.Controller/Channels/ChannelVideoItem.cs b/MediaBrowser.Controller/Channels/ChannelVideoItem.cs index 3a9c1f9d01..8f27a669ee 100644 --- a/MediaBrowser.Controller/Channels/ChannelVideoItem.cs +++ b/MediaBrowser.Controller/Channels/ChannelVideoItem.cs @@ -8,24 +8,17 @@ 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 { - 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 ChannelMediaSources { get; set; } protected override string CreateUserDataKey() @@ -56,6 +49,7 @@ namespace MediaBrowser.Controller.Channels return config.BlockUnratedItems.Contains(UnratedItem.ChannelContent); } + [IgnoreDataMember] public override bool SupportsLocalMetadata { get @@ -74,6 +68,7 @@ namespace MediaBrowser.Controller.Channels ChannelMediaSources = new List(); } + [IgnoreDataMember] public override LocationType LocationType { get diff --git a/MediaBrowser.Controller/Channels/IChannelItem.cs b/MediaBrowser.Controller/Channels/IChannelItem.cs index 7eb865b5bd..4b7a735848 100644 --- a/MediaBrowser.Controller/Channels/IChannelItem.cs +++ b/MediaBrowser.Controller/Channels/IChannelItem.cs @@ -8,10 +8,6 @@ namespace MediaBrowser.Controller.Channels string ExternalId { get; set; } - ChannelItemType ChannelItemType { get; set; } - - string OriginalImageUrl { get; set; } - - string DataVersion { get; set; } + string ExternalImagePath { get; set; } } } -- cgit v1.2.3