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.Server.Implementations/LiveTv/ProgramImageProvider.cs | |
| parent | 492f897f818abc1a1eee0352864ce4c06de4de1c (diff) | |
update images
Diffstat (limited to 'MediaBrowser.Server.Implementations/LiveTv/ProgramImageProvider.cs')
| -rw-r--r-- | MediaBrowser.Server.Implementations/LiveTv/ProgramImageProvider.cs | 54 |
1 files changed, 15 insertions, 39 deletions
diff --git a/MediaBrowser.Server.Implementations/LiveTv/ProgramImageProvider.cs b/MediaBrowser.Server.Implementations/LiveTv/ProgramImageProvider.cs index e0d90d349..ab8ec720b 100644 --- a/MediaBrowser.Server.Implementations/LiveTv/ProgramImageProvider.cs +++ b/MediaBrowser.Server.Implementations/LiveTv/ProgramImageProvider.cs @@ -1,29 +1,22 @@ -using MediaBrowser.Common.Net; -using MediaBrowser.Controller.Entities; +using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.LiveTv; using MediaBrowser.Controller.Providers; using MediaBrowser.Model.Entities; -using MediaBrowser.Model.Logging; using System; using System.Collections.Generic; using System.Linq; using System.Threading; using System.Threading.Tasks; -using MediaBrowser.Model.MediaInfo; namespace MediaBrowser.Server.Implementations.LiveTv { public class ProgramImageProvider : IDynamicImageProvider, IHasItemChangeMonitor, IHasOrder { private readonly ILiveTvManager _liveTvManager; - private readonly IHttpClient _httpClient; - private readonly ILogger _logger; - public ProgramImageProvider(ILiveTvManager liveTvManager, IHttpClient httpClient, ILogger logger) + public ProgramImageProvider(ILiveTvManager liveTvManager) { _liveTvManager = liveTvManager; - _httpClient = httpClient; - _logger = logger; } public IEnumerable<ImageType> GetSupportedImages(IHasImages item) @@ -37,43 +30,26 @@ namespace MediaBrowser.Server.Implementations.LiveTv var imageResponse = new DynamicImageResponse(); - if (!string.IsNullOrEmpty(liveTvItem.ExternalImagePath)) - { - if (liveTvItem.ExternalImagePath.StartsWith("http", StringComparison.OrdinalIgnoreCase)) - { - imageResponse.Path = liveTvItem.ExternalImagePath; - imageResponse.Protocol = MediaProtocol.Http; - imageResponse.HasImage = true; - } - else - { - imageResponse.Path = liveTvItem.ExternalImagePath; - imageResponse.HasImage = true; - } - } - else - { - var service = _liveTvManager.Services.FirstOrDefault(i => string.Equals(i.Name, liveTvItem.ServiceName, StringComparison.OrdinalIgnoreCase)); + var service = _liveTvManager.Services.FirstOrDefault(i => string.Equals(i.Name, liveTvItem.ServiceName, StringComparison.OrdinalIgnoreCase)); - if (service != null) + if (service != null) + { + try { - try - { - var channel = _liveTvManager.GetInternalChannel(liveTvItem.ChannelId); + var channel = _liveTvManager.GetInternalChannel(liveTvItem.ChannelId); - var response = await service.GetProgramImageAsync(liveTvItem.ExternalId, channel.ExternalId, cancellationToken).ConfigureAwait(false); + var response = await service.GetProgramImageAsync(liveTvItem.ExternalId, channel.ExternalId, cancellationToken).ConfigureAwait(false); - if (response != null) - { - imageResponse.HasImage = true; - imageResponse.Stream = response.Stream; - imageResponse.Format = response.Format; - } - } - catch (NotImplementedException) + if (response != null) { + imageResponse.HasImage = true; + imageResponse.Stream = response.Stream; + imageResponse.Format = response.Format; } } + catch (NotImplementedException) + { + } } return imageResponse; |
