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/LiveTv/ILiveTvRecording.cs | 8 +---- .../LiveTv/LiveTvAudioRecording.cs | 11 ------- MediaBrowser.Controller/LiveTv/LiveTvChannel.cs | 24 --------------- MediaBrowser.Controller/LiveTv/LiveTvProgram.cs | 36 +--------------------- .../LiveTv/LiveTvVideoRecording.cs | 12 +------- 5 files changed, 3 insertions(+), 88 deletions(-) (limited to 'MediaBrowser.Controller/LiveTv') diff --git a/MediaBrowser.Controller/LiveTv/ILiveTvRecording.cs b/MediaBrowser.Controller/LiveTv/ILiveTvRecording.cs index ba0b82a0b6..0d63ae7164 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 a34860c52e..03c05ec69b 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 cb10003ed8..4702aea4f8 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 8f032c5224..e4b52fd994 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 4218e4911e..77404cfe8e 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