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 --- .../Channels/ChannelAudioItem.cs | 13 ++------ .../Channels/ChannelFolderItem.cs | 8 ++--- .../Channels/ChannelVideoItem.cs | 11 ++----- MediaBrowser.Controller/Channels/IChannelItem.cs | 6 +--- MediaBrowser.Controller/Entities/BaseItem.cs | 33 ++++++++++++++++++++ .../Entities/UserViewBuilder.cs | 2 +- MediaBrowser.Controller/Entities/Video.cs | 2 -- MediaBrowser.Controller/LiveTv/ILiveTvRecording.cs | 8 +---- .../LiveTv/LiveTvAudioRecording.cs | 11 ------- MediaBrowser.Controller/LiveTv/LiveTvChannel.cs | 24 --------------- MediaBrowser.Controller/LiveTv/LiveTvProgram.cs | 36 +--------------------- .../LiveTv/LiveTvVideoRecording.cs | 12 +------- 12 files changed, 47 insertions(+), 119 deletions(-) (limited to 'MediaBrowser.Controller') diff --git a/MediaBrowser.Controller/Channels/ChannelAudioItem.cs b/MediaBrowser.Controller/Channels/ChannelAudioItem.cs index aa4b6731c..653cec901 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 7e9da52a9..4273a1365 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 3a9c1f9d0..8f27a669e 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 7eb865b5b..4b7a73584 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; } } } diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs index 796ba70ba..59d2a4bc7 100644 --- a/MediaBrowser.Controller/Entities/BaseItem.cs +++ b/MediaBrowser.Controller/Entities/BaseItem.cs @@ -124,6 +124,12 @@ namespace MediaBrowser.Controller.Entities /// The id. public Guid Id { get; set; } + /// + /// Gets or sets a value indicating whether this instance is hd. + /// + /// true if this instance is hd; otherwise, false. + public bool? IsHD { get; set; } + /// /// Return the id that should be used to key display prefs for this item. /// Default is based on the type for everything except actual generic folders. @@ -166,6 +172,33 @@ namespace MediaBrowser.Controller.Entities } } + /// + /// Id of the program. + /// + [IgnoreDataMember] + public string ExternalId + { + get { return this.GetProviderId("ProviderExternalId"); } + set + { + this.SetProviderId("ProviderExternalId", value); + } + } + + /// + /// Supply the image path if it can be accessed directly from the file system + /// + /// The image path. + [IgnoreDataMember] + public string ExternalImagePath { get; set; } + + /// + /// Gets or sets the etag. + /// + /// The etag. + [IgnoreDataMember] + public string ExternalEtag { get; set; } + [IgnoreDataMember] public virtual bool IsHidden { diff --git a/MediaBrowser.Controller/Entities/UserViewBuilder.cs b/MediaBrowser.Controller/Entities/UserViewBuilder.cs index ce9a8903a..f5800ce81 100644 --- a/MediaBrowser.Controller/Entities/UserViewBuilder.cs +++ b/MediaBrowser.Controller/Entities/UserViewBuilder.cs @@ -1397,7 +1397,7 @@ namespace MediaBrowser.Controller.Entities var val = query.IsHD.Value; var video = item as Video; - if (video == null || val != video.IsHD) + if (video == null || !video.IsHD.HasValue || val != video.IsHD) { return false; } diff --git a/MediaBrowser.Controller/Entities/Video.cs b/MediaBrowser.Controller/Entities/Video.cs index 45c497fcf..8beee79bf 100644 --- a/MediaBrowser.Controller/Entities/Video.cs +++ b/MediaBrowser.Controller/Entities/Video.cs @@ -330,8 +330,6 @@ namespace MediaBrowser.Controller.Entities get { return Video3DFormat.HasValue; } } - public bool IsHD { get; set; } - /// /// Gets the type of the media. /// diff --git a/MediaBrowser.Controller/LiveTv/ILiveTvRecording.cs b/MediaBrowser.Controller/LiveTv/ILiveTvRecording.cs index ba0b82a0b..0d63ae716 100644 --- a/MediaBrowser.Controller/LiveTv/ILiveTvRecording.cs +++ b/MediaBrowser.Controller/LiveTv/ILiveTvRecording.cs @@ -12,7 +12,6 @@ namespace MediaBrowser.Controller.LiveTv public interface ILiveTvRecording : IHasImages, IHasMediaSources, IHasUserData, ILiveTvItem, IHasStartDate, IHasProgramAttributes { string ChannelId { get; } - string ProgramId { get; set; } string MediaType { get; } string Container { get; } @@ -31,16 +30,11 @@ namespace MediaBrowser.Controller.LiveTv bool CanDelete(User user); - string ProviderImagePath { get; set; } + string ExternalImagePath { get; set; } - string ProviderImageUrl { get; set; } - - string ExternalId { get; set; } - string EpisodeTitle { get; set; } string SeriesTimerId { get; set; } RecordingStatus Status { get; set; } DateTime? EndDate { get; set; } - ChannelType ChannelType { get; set; } DateTime DateLastSaved { get; set; } DateTime DateCreated { get; set; } DateTime DateModified { get; set; } diff --git a/MediaBrowser.Controller/LiveTv/LiveTvAudioRecording.cs b/MediaBrowser.Controller/LiveTv/LiveTvAudioRecording.cs index a34860c52..03c05ec69 100644 --- a/MediaBrowser.Controller/LiveTv/LiveTvAudioRecording.cs +++ b/MediaBrowser.Controller/LiveTv/LiveTvAudioRecording.cs @@ -14,9 +14,6 @@ namespace MediaBrowser.Controller.LiveTv { public class LiveTvAudioRecording : Audio, ILiveTvRecording { - public string ExternalId { get; set; } - public string ProviderImagePath { get; set; } - public string ProviderImageUrl { get; set; } [IgnoreDataMember] public string EpisodeTitle { get; set; } [IgnoreDataMember] @@ -35,13 +32,10 @@ namespace MediaBrowser.Controller.LiveTv public bool IsRepeat { get; set; } [IgnoreDataMember] public bool IsMovie { get; set; } - public bool? IsHD { get; set; } [IgnoreDataMember] public bool IsLive { get; set; } [IgnoreDataMember] public bool IsPremiere { get; set; } - public ChannelType ChannelType { get; set; } - public string ProgramId { get; set; } public ProgramAudio? Audio { get; set; } /// @@ -52,11 +46,6 @@ namespace MediaBrowser.Controller.LiveTv { var name = GetClientTypeName(); - if (!string.IsNullOrEmpty(ProgramId)) - { - return name + "-" + ProgramId; - } - return name + "-" + Name + (EpisodeTitle ?? string.Empty); } diff --git a/MediaBrowser.Controller/LiveTv/LiveTvChannel.cs b/MediaBrowser.Controller/LiveTv/LiveTvChannel.cs index cb10003ed..4702aea4f 100644 --- a/MediaBrowser.Controller/LiveTv/LiveTvChannel.cs +++ b/MediaBrowser.Controller/LiveTv/LiveTvChannel.cs @@ -46,12 +46,6 @@ namespace MediaBrowser.Controller.LiveTv /// The number. public string Number { get; set; } - /// - /// Gets or sets the external identifier. - /// - /// The external identifier. - public string ExternalId { get; set; } - /// /// Gets or sets the type of the channel. /// @@ -64,24 +58,6 @@ namespace MediaBrowser.Controller.LiveTv /// The name of the service. public string ServiceName { get; set; } - /// - /// Supply the image path if it can be accessed directly from the file system - /// - /// The image path. - public string ProviderImagePath { get; set; } - - /// - /// Supply the image url if it can be downloaded - /// - /// The image URL. - public string ProviderImageUrl { get; set; } - - /// - /// Gets or sets a value indicating whether this instance has image. - /// - /// null if [has image] contains no value, true if [has image]; otherwise, false. - public bool? HasProviderImage { get; set; } - public override LocationType LocationType { get diff --git a/MediaBrowser.Controller/LiveTv/LiveTvProgram.cs b/MediaBrowser.Controller/LiveTv/LiveTvProgram.cs index 8f032c522..e4b52fd99 100644 --- a/MediaBrowser.Controller/LiveTv/LiveTvProgram.cs +++ b/MediaBrowser.Controller/LiveTv/LiveTvProgram.cs @@ -7,6 +7,7 @@ using MediaBrowser.Model.Users; using System; using System.Linq; using System.Runtime.Serialization; +using MediaBrowser.Model.Entities; namespace MediaBrowser.Controller.LiveTv { @@ -30,17 +31,6 @@ namespace MediaBrowser.Controller.LiveTv return GetClientTypeName() + "-" + Name; } - /// - /// Gets or sets the etag. - /// - /// The etag. - public string Etag { get; set; } - - /// - /// Id of the program. - /// - public string ExternalId { get; set; } - /// /// Gets or sets the type of the channel. /// @@ -53,12 +43,6 @@ namespace MediaBrowser.Controller.LiveTv [IgnoreDataMember] public DateTime StartDate { get; set; } - /// - /// Gets or sets a value indicating whether this instance is hd. - /// - /// true if this instance is hd; otherwise, false. - public bool? IsHD { get; set; } - /// /// Gets or sets the audio. /// @@ -85,24 +69,6 @@ namespace MediaBrowser.Controller.LiveTv /// The name of the service. public string ServiceName { get; set; } - /// - /// Supply the image path if it can be accessed directly from the file system - /// - /// The image path. - public string ProviderImagePath { get; set; } - - /// - /// Supply the image url if it can be downloaded - /// - /// The image URL. - public string ProviderImageUrl { get; set; } - - /// - /// Gets or sets a value indicating whether this instance has image. - /// - /// null if [has image] contains no value, true if [has image]; otherwise, false. - public bool? HasProviderImage { get; set; } - /// /// Gets or sets a value indicating whether this instance is movie. /// diff --git a/MediaBrowser.Controller/LiveTv/LiveTvVideoRecording.cs b/MediaBrowser.Controller/LiveTv/LiveTvVideoRecording.cs index 4218e4911..77404cfe8 100644 --- a/MediaBrowser.Controller/LiveTv/LiveTvVideoRecording.cs +++ b/MediaBrowser.Controller/LiveTv/LiveTvVideoRecording.cs @@ -14,9 +14,6 @@ namespace MediaBrowser.Controller.LiveTv { public class LiveTvVideoRecording : Video, ILiveTvRecording { - public string ExternalId { get; set; } - public string ProviderImagePath { get; set; } - public string ProviderImageUrl { get; set; } [IgnoreDataMember] public string EpisodeTitle { get; set; } [IgnoreDataMember] @@ -35,13 +32,10 @@ namespace MediaBrowser.Controller.LiveTv public bool IsRepeat { get; set; } [IgnoreDataMember] public bool IsMovie { get; set; } - public bool? IsHD { get; set; } [IgnoreDataMember] public bool IsLive { get; set; } [IgnoreDataMember] public bool IsPremiere { get; set; } - public ChannelType ChannelType { get; set; } - public string ProgramId { get; set; } public ProgramAudio? Audio { get; set; } /// @@ -62,11 +56,6 @@ namespace MediaBrowser.Controller.LiveTv var name = GetClientTypeName(); - if (!string.IsNullOrEmpty(ProgramId)) - { - return name + "-" + ProgramId; - } - return name + "-" + Name + (EpisodeTitle ?? string.Empty); } @@ -118,6 +107,7 @@ namespace MediaBrowser.Controller.LiveTv return false; } + [IgnoreDataMember] public override bool SupportsLocalMetadata { get -- cgit v1.2.3