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 --- .../LiveTv/ChannelImageProvider.cs | 45 +++++++++++----------- 1 file changed, 23 insertions(+), 22 deletions(-) (limited to 'MediaBrowser.Server.Implementations/LiveTv/ChannelImageProvider.cs') diff --git a/MediaBrowser.Server.Implementations/LiveTv/ChannelImageProvider.cs b/MediaBrowser.Server.Implementations/LiveTv/ChannelImageProvider.cs index f205da70d..2204535a2 100644 --- a/MediaBrowser.Server.Implementations/LiveTv/ChannelImageProvider.cs +++ b/MediaBrowser.Server.Implementations/LiveTv/ChannelImageProvider.cs @@ -39,38 +39,39 @@ namespace MediaBrowser.Server.Implementations.LiveTv var imageResponse = new DynamicImageResponse(); - if (!string.IsNullOrEmpty(liveTvItem.ProviderImagePath)) + if (!string.IsNullOrEmpty(liveTvItem.ExternalImagePath)) { - imageResponse.Path = liveTvItem.ProviderImagePath; - imageResponse.HasImage = true; - } - else if (!string.IsNullOrEmpty(liveTvItem.ProviderImageUrl)) - { - var options = new HttpRequestOptions + if (liveTvItem.ExternalImagePath.StartsWith("http", StringComparison.OrdinalIgnoreCase)) { - CancellationToken = cancellationToken, - Url = liveTvItem.ProviderImageUrl, - - // Some image hosts require a user agent to be specified. - UserAgent = "Emby Server/" + _appHost.ApplicationVersion - }; + var options = new HttpRequestOptions + { + CancellationToken = cancellationToken, + Url = liveTvItem.ExternalImagePath, - var response = await _httpClient.GetResponse(options).ConfigureAwait(false); + // Some image hosts require a user agent to be specified. + UserAgent = "Emby Server/" + _appHost.ApplicationVersion + }; - var contentType = response.ContentType; + var response = await _httpClient.GetResponse(options).ConfigureAwait(false); - if (contentType.StartsWith("image/", StringComparison.OrdinalIgnoreCase)) - { - imageResponse.HasImage = true; - imageResponse.Stream = response.Content; - imageResponse.SetFormatFromMimeType(contentType); + if (response.ContentType.StartsWith("image/", StringComparison.OrdinalIgnoreCase)) + { + imageResponse.HasImage = true; + imageResponse.Stream = response.Content; + imageResponse.SetFormatFromMimeType(response.ContentType); + } + else + { + _logger.Error("Provider did not return an image content type."); + } } else { - _logger.Error("Provider did not return an image content type."); + imageResponse.Path = liveTvItem.ExternalImagePath; + imageResponse.HasImage = true; } } - else if (liveTvItem.HasProviderImage ?? true) + else { var service = _liveTvManager.Services.FirstOrDefault(i => string.Equals(i.Name, liveTvItem.ServiceName, StringComparison.OrdinalIgnoreCase)); -- cgit v1.2.3