update images

4 files changed, 62 insertions, 136 deletions

diff --git a/MediaBrowser.Server.Implementations/LiveTv/ChannelImageProvider.cs b/MediaBrowser.Server.Implementations/LiveTv/ChannelImageProvider.cs
index 2204535a2..24d38a63e 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/ChannelImageProvider.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/ChannelImageProvider.cs
@@ -39,58 +39,23 @@ namespace MediaBrowser.Server.Implementations.LiveTv
 
             var imageResponse = new DynamicImageResponse();
 
-            if (!string.IsNullOrEmpty(liveTvItem.ExternalImagePath))
+            var service = _liveTvManager.Services.FirstOrDefault(i => string.Equals(i.Name, liveTvItem.ServiceName, StringComparison.OrdinalIgnoreCase));
+
+            if (service != null)
             {
-                if (liveTvItem.ExternalImagePath.StartsWith("http", StringComparison.OrdinalIgnoreCase))
+                try
                 {
-                    var options = new HttpRequestOptions
-                    {
-                        CancellationToken = cancellationToken,
-                        Url = liveTvItem.ExternalImagePath,
-
-                        // Some image hosts require a user agent to be specified.
-                        UserAgent = "Emby Server/" + _appHost.ApplicationVersion
-                    };
-
-                    var response = await _httpClient.GetResponse(options).ConfigureAwait(false);
+                    var response = await service.GetChannelImageAsync(liveTvItem.ExternalId, cancellationToken).ConfigureAwait(false);
 
-                    if (response.ContentType.StartsWith("image/", StringComparison.OrdinalIgnoreCase))
+                    if (response != null)
                     {
                         imageResponse.HasImage = true;
-                        imageResponse.Stream = response.Content;
-                        imageResponse.SetFormatFromMimeType(response.ContentType);
+                        imageResponse.Stream = response.Stream;
+                        imageResponse.Format = response.Format;
                     }
-                    else
-                    {
-                        _logger.Error("Provider did not return an image content type.");
-                    }
-                }
-                else
-                {
-                    imageResponse.Path = liveTvItem.ExternalImagePath;
-                    imageResponse.HasImage = true;
                 }
-            }
-            else 
-            {
-                var service = _liveTvManager.Services.FirstOrDefault(i => string.Equals(i.Name, liveTvItem.ServiceName, StringComparison.OrdinalIgnoreCase));
-
-                if (service != null)
+                catch (NotImplementedException)
                 {
-                    try
-                    {
-                        var response = await service.GetChannelImageAsync(liveTvItem.ExternalId, cancellationToken).ConfigureAwait(false);
-
-                        if (response != null)
-                        {
-                            imageResponse.HasImage = true;
-                            imageResponse.Stream = response.Stream;
-                            imageResponse.Format = response.Format;
-                        }
-                    }
-                    catch (NotImplementedException)
-                    {
-                    }
                 }
             }
 
diff --git a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
index be9d81354..edfca0d6c 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
@@ -577,7 +577,14 @@ namespace MediaBrowser.Server.Implementations.LiveTv
             //    replaceImages.Add(ImageType.Primary);
             //}
 
-            item.ExternalImagePath = string.IsNullOrWhiteSpace(channelInfo.ImageUrl) ? channelInfo.ImagePath : channelInfo.ImageUrl;
+            if (!string.IsNullOrWhiteSpace(channelInfo.ImagePath))
+            {
+                item.SetImagePath(ImageType.Primary, channelInfo.ImagePath);
+            }
+            else if (!string.IsNullOrWhiteSpace(channelInfo.ImageUrl))
+            {
+                item.SetImagePath(ImageType.Primary, channelInfo.ImageUrl);
+            }
 
             if (string.IsNullOrEmpty(item.Name))
             {
@@ -636,7 +643,6 @@ namespace MediaBrowser.Server.Implementations.LiveTv
             item.Name = info.Name;
             item.OfficialRating = item.OfficialRating ?? info.OfficialRating;
             item.Overview = item.Overview ?? info.Overview;
-            item.ExternalImagePath = string.IsNullOrWhiteSpace(info.ImagePath) ? info.ImageUrl : info.ImagePath;
             item.RunTimeTicks = (info.EndDate - info.StartDate).Ticks;
             item.StartDate = info.StartDate;
             item.HomePageUrl = info.HomePageUrl;
@@ -647,6 +653,15 @@ namespace MediaBrowser.Server.Implementations.LiveTv
             item.IndexNumber = info.EpisodeNumber;
             item.ParentIndexNumber = info.SeasonNumber;
 
+            if (!string.IsNullOrWhiteSpace(info.ImagePath))
+            {
+                item.SetImagePath(ImageType.Primary, info.ImagePath);
+            }
+            else if (!string.IsNullOrWhiteSpace(info.ImageUrl))
+            {
+                item.SetImagePath(ImageType.Primary, info.ImageUrl);
+            }
+            
             if (isNew)
             {
                 await _libraryManager.CreateItem(item, cancellationToken).ConfigureAwait(false);
@@ -722,7 +737,6 @@ namespace MediaBrowser.Server.Implementations.LiveTv
             recording.Audio = info.Audio;
             recording.EndDate = info.EndDate;
             recording.EpisodeTitle = info.EpisodeTitle;
-            recording.ExternalImagePath = string.IsNullOrWhiteSpace(info.ImagePath) ? info.ImageUrl : info.ImagePath;
             recording.IsHD = info.IsHD;
             recording.IsKids = info.IsKids;
             recording.IsLive = info.IsLive;
@@ -735,6 +749,15 @@ namespace MediaBrowser.Server.Implementations.LiveTv
             recording.SeriesTimerId = info.SeriesTimerId;
             recording.StartDate = info.StartDate;
 
+            if (!string.IsNullOrWhiteSpace(info.ImagePath))
+            {
+                item.SetImagePath(ImageType.Primary, info.ImagePath);
+            }
+            else if (!string.IsNullOrWhiteSpace(info.ImageUrl))
+            {
+                item.SetImagePath(ImageType.Primary, info.ImageUrl);
+            }
+            
             var statusChanged = info.Status != recording.Status;
 
             recording.Status = info.Status;
@@ -1830,7 +1853,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
                     OriginalAirDate = program.PremiereDate,
                     Overview = program.Overview,
                     StartDate = program.StartDate,
-                    ImagePath = program.ExternalImagePath,
+                    //ImagePath = program.ExternalImagePath,
                     Name = program.Name,
                     OfficialRating = program.OfficialRating
                 };
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;
diff --git a/MediaBrowser.Server.Implementations/LiveTv/RecordingImageProvider.cs b/MediaBrowser.Server.Implementations/LiveTv/RecordingImageProvider.cs
index d8f22e351..fce3223ea 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/RecordingImageProvider.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/RecordingImageProvider.cs
@@ -1,9 +1,7 @@
-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;
@@ -15,14 +13,10 @@ namespace MediaBrowser.Server.Implementations.LiveTv
     public class RecordingImageProvider : IDynamicImageProvider, IHasItemChangeMonitor
     {
         private readonly ILiveTvManager _liveTvManager;
-        private readonly IHttpClient _httpClient;
-        private readonly ILogger _logger;
 
-        public RecordingImageProvider(ILiveTvManager liveTvManager, IHttpClient httpClient, ILogger logger)
+        public RecordingImageProvider(ILiveTvManager liveTvManager)
         {
             _liveTvManager = liveTvManager;
-            _httpClient = httpClient;
-            _logger = logger;
         }
 
         public IEnumerable<ImageType> GetSupportedImages(IHasImages item)
@@ -36,55 +30,23 @@ namespace MediaBrowser.Server.Implementations.LiveTv
 
             var imageResponse = new DynamicImageResponse();
 
-            if (!string.IsNullOrEmpty(liveTvItem.ExternalImagePath))
+            var service = _liveTvManager.Services.FirstOrDefault(i => string.Equals(i.Name, liveTvItem.ServiceName, StringComparison.OrdinalIgnoreCase));
+
+            if (service != null)
             {
-                if (liveTvItem.ExternalImagePath.StartsWith("http", StringComparison.OrdinalIgnoreCase))
+                try
                 {
-                    var options = new HttpRequestOptions
-                    {
-                        CancellationToken = cancellationToken,
-                        Url = liveTvItem.ExternalImagePath
-                    };
+                    var response = await service.GetRecordingImageAsync(liveTvItem.ExternalId, cancellationToken).ConfigureAwait(false);
 
-                    var response = await _httpClient.GetResponse(options).ConfigureAwait(false);
-
-                    if (response.ContentType.StartsWith("image/", StringComparison.OrdinalIgnoreCase))
+                    if (response != null)
                     {
                         imageResponse.HasImage = true;
-                        imageResponse.Stream = response.Content;
-                        imageResponse.SetFormatFromMimeType(response.ContentType);
-                    }
-                    else
-                    {
-                        _logger.Error("Provider did not return an image content type.");
+                        imageResponse.Stream = response.Stream;
+                        imageResponse.Format = response.Format;
                     }
                 }
-                else
+                catch (NotImplementedException)
                 {
-                    imageResponse.Path = liveTvItem.ExternalImagePath;
-                    imageResponse.HasImage = true;
-                }
-            }
-            else
-            {
-                var service = _liveTvManager.Services.FirstOrDefault(i => string.Equals(i.Name, liveTvItem.ServiceName, StringComparison.OrdinalIgnoreCase));
-
-                if (service != null)
-                {
-                    try
-                    {
-                        var response = await service.GetRecordingImageAsync(liveTvItem.ExternalId, cancellationToken).ConfigureAwait(false);
-
-                        if (response != null)
-                        {
-                            imageResponse.HasImage = true;
-                            imageResponse.Stream = response.Stream;
-                            imageResponse.Format = response.Format;
-                        }
-                    }
-                    catch (NotImplementedException)
-                    {
-                    }
                 }
             }