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/Entities/BaseItem.cs | 33 ++++++++++++++++++++++ .../Entities/UserViewBuilder.cs | 2 +- MediaBrowser.Controller/Entities/Video.cs | 2 -- 3 files changed, 34 insertions(+), 3 deletions(-) (limited to 'MediaBrowser.Controller/Entities') 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. /// -- cgit v1.2.3