aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Server.Implementations/LiveTv/ChannelImageProvider.cs
diff options
context:
space:
mode:
Diffstat (limited to 'MediaBrowser.Server.Implementations/LiveTv/ChannelImageProvider.cs')
-rw-r--r--MediaBrowser.Server.Implementations/LiveTv/ChannelImageProvider.cs18
1 files changed, 8 insertions, 10 deletions
diff --git a/MediaBrowser.Server.Implementations/LiveTv/ChannelImageProvider.cs b/MediaBrowser.Server.Implementations/LiveTv/ChannelImageProvider.cs
index d04ebe32d..f1e10e175 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/ChannelImageProvider.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/ChannelImageProvider.cs
@@ -76,22 +76,20 @@ namespace MediaBrowser.Server.Implementations.LiveTv
private async Task<bool> DownloadImage(LiveTvChannel item, CancellationToken cancellationToken)
{
- var channelInfo = item.ChannelInfo;
-
Stream imageStream = null;
string contentType = null;
- if (!string.IsNullOrEmpty(channelInfo.ImagePath))
+ if (!string.IsNullOrEmpty(item.ProviderImagePath))
{
- contentType = "image/" + Path.GetExtension(channelInfo.ImagePath).ToLower();
- imageStream = _fileSystem.GetFileStream(channelInfo.ImagePath, FileMode.Open, FileAccess.Read, FileShare.Read, true);
+ contentType = "image/" + Path.GetExtension(item.ProviderImagePath).ToLower();
+ imageStream = _fileSystem.GetFileStream(item.ProviderImagePath, FileMode.Open, FileAccess.Read, FileShare.Read, true);
}
- else if (!string.IsNullOrEmpty(channelInfo.ImageUrl))
+ else if (!string.IsNullOrEmpty(item.ProviderImageUrl))
{
var options = new HttpRequestOptions
{
CancellationToken = cancellationToken,
- Url = channelInfo.ImageUrl
+ Url = item.ProviderImageUrl
};
var response = await _httpClient.GetResponse(options).ConfigureAwait(false);
@@ -105,7 +103,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
imageStream = response.Content;
contentType = response.ContentType;
}
- else if (channelInfo.HasImage ?? true)
+ else if (item.HasProviderImage ?? true)
{
var service = _liveTvManager.Services.FirstOrDefault(i => string.Equals(i.Name, item.ServiceName, StringComparison.OrdinalIgnoreCase));
@@ -113,7 +111,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
{
try
{
- var response = await service.GetChannelImageAsync(channelInfo.Id, cancellationToken).ConfigureAwait(false);
+ var response = await service.GetChannelImageAsync(item.ExternalId, cancellationToken).ConfigureAwait(false);
if (response != null)
{
@@ -131,7 +129,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
if (imageStream != null)
{
// Dummy up the original url
- var url = item.ServiceName + channelInfo.Id;
+ var url = item.ServiceName + item.ExternalId;
await _providerManager.SaveImage(item, imageStream, contentType, ImageType.Primary, null, url, cancellationToken).ConfigureAwait(false);
return true;