diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-10-25 13:13:30 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-10-25 13:13:30 -0400 |
| commit | 32babe2b941d2f43d9e1c61ceaa58d6d31a9d60f (patch) | |
| tree | d305cff911f90539dca426005cd9f3a6067f51aa /MediaBrowser.Controller | |
| parent | 492f897f818abc1a1eee0352864ce4c06de4de1c (diff) | |
update images
Diffstat (limited to 'MediaBrowser.Controller')
| -rw-r--r-- | MediaBrowser.Controller/Channels/IChannelItem.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Entities/BaseItem.cs | 7 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Entities/IHasImages.cs | 13 | ||||
| -rw-r--r-- | MediaBrowser.Controller/LiveTv/ILiveTvRecording.cs | 2 |
4 files changed, 12 insertions, 12 deletions
diff --git a/MediaBrowser.Controller/Channels/IChannelItem.cs b/MediaBrowser.Controller/Channels/IChannelItem.cs index 4b7a73584..9b5f0359b 100644 --- a/MediaBrowser.Controller/Channels/IChannelItem.cs +++ b/MediaBrowser.Controller/Channels/IChannelItem.cs @@ -7,7 +7,5 @@ namespace MediaBrowser.Controller.Channels string ChannelId { get; set; } string ExternalId { get; set; } - - string ExternalImagePath { get; set; } } } diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs index 3812ff860..7d0e07b0d 100644 --- a/MediaBrowser.Controller/Entities/BaseItem.cs +++ b/MediaBrowser.Controller/Entities/BaseItem.cs @@ -186,13 +186,6 @@ namespace MediaBrowser.Controller.Entities } /// <summary> - /// Supply the image path if it can be accessed directly from the file system - /// </summary> - /// <value>The image path.</value> - [IgnoreDataMember] - public string ExternalImagePath { get; set; } - - /// <summary> /// Gets or sets the etag. /// </summary> /// <value>The etag.</value> diff --git a/MediaBrowser.Controller/Entities/IHasImages.cs b/MediaBrowser.Controller/Entities/IHasImages.cs index da729176d..28835168a 100644 --- a/MediaBrowser.Controller/Entities/IHasImages.cs +++ b/MediaBrowser.Controller/Entities/IHasImages.cs @@ -247,7 +247,18 @@ namespace MediaBrowser.Controller.Entities /// <param name="file">The file.</param> public static void SetImagePath(this IHasImages item, ImageType imageType, string file) { - item.SetImagePath(imageType, BaseItem.FileSystem.GetFileInfo(file)); + if (file.StartsWith("http", System.StringComparison.OrdinalIgnoreCase)) + { + item.SetImage(new ItemImageInfo + { + Path = file, + Type = imageType + }, 0); + } + else + { + item.SetImagePath(imageType, BaseItem.FileSystem.GetFileInfo(file)); + } } } } diff --git a/MediaBrowser.Controller/LiveTv/ILiveTvRecording.cs b/MediaBrowser.Controller/LiveTv/ILiveTvRecording.cs index 0d63ae716..5dc5f68cd 100644 --- a/MediaBrowser.Controller/LiveTv/ILiveTvRecording.cs +++ b/MediaBrowser.Controller/LiveTv/ILiveTvRecording.cs @@ -30,8 +30,6 @@ namespace MediaBrowser.Controller.LiveTv bool CanDelete(User user); - string ExternalImagePath { get; set; } - string SeriesTimerId { get; set; } RecordingStatus Status { get; set; } DateTime? EndDate { get; set; } |
