From 2884920f0f4a298fb1e8a275f017144fc05fd366 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Fri, 13 Dec 2013 10:48:48 -0500
Subject: added HasImage to live tv objects

---
 .../LiveTv/ChannelImageProvider.cs                 | 22 +++++++++++++---------
 .../LiveTv/LiveTvManager.cs                        |  3 ++-
 2 files changed, 15 insertions(+), 10 deletions(-)

(limited to 'MediaBrowser.Server.Implementations/LiveTv')

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;
-- 
cgit v1.2.3