diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-12-13 10:48:48 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-12-13 10:48:48 -0500 |
| commit | 2884920f0f4a298fb1e8a275f017144fc05fd366 (patch) | |
| tree | ad6d619142457f847aef38df275d914f5887766a /MediaBrowser.Server.Implementations/LiveTv | |
| parent | d00178d8f0002638d47174c0bd73ebcf1ac5f6fd (diff) | |
added HasImage to live tv objects
Diffstat (limited to 'MediaBrowser.Server.Implementations/LiveTv')
| -rw-r--r-- | MediaBrowser.Server.Implementations/LiveTv/ChannelImageProvider.cs | 22 | ||||
| -rw-r--r-- | MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs | 3 |
2 files changed, 15 insertions, 10 deletions
diff --git a/MediaBrowser.Server.Implementations/LiveTv/ChannelImageProvider.cs b/MediaBrowser.Server.Implementations/LiveTv/ChannelImageProvider.cs index e16430e69..3a2413540 100644 --- a/MediaBrowser.Server.Implementations/LiveTv/ChannelImageProvider.cs +++ b/MediaBrowser.Server.Implementations/LiveTv/ChannelImageProvider.cs @@ -44,20 +44,24 @@ namespace MediaBrowser.Server.Implementations.LiveTv return true; } - try - { - await DownloadImage(item, cancellationToken).ConfigureAwait(false); - } - catch (HttpException ex) + var channel = (Channel)item; + + if (channel.HasProviderImage ?? true) { - // Don't fail the provider on a 404 - if (!ex.StatusCode.HasValue || ex.StatusCode.Value != HttpStatusCode.NotFound) + try { - throw; + await DownloadImage(item, cancellationToken).ConfigureAwait(false); + } + catch (HttpException ex) + { + // Don't fail the provider on a 404 + if (!ex.StatusCode.HasValue || ex.StatusCode.Value != HttpStatusCode.NotFound) + { + throw; + } } } - SetLastRefreshed(item, DateTime.UtcNow, providerInfo); return true; } diff --git a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs index b2796bc68..4cd18a523 100644 --- a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs +++ b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs @@ -269,7 +269,8 @@ namespace MediaBrowser.Server.Implementations.LiveTv Path = path, ChannelId = channelInfo.Id, ChannelNumber = channelInfo.Number, - ServiceName = serviceName + ServiceName = serviceName, + HasProviderImage = channelInfo.HasImage }; isNew = true; |
