From d0babf322dad6624ee15622d11db52e58db5197f Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Thu, 3 Nov 2016 18:56:28 -0400
Subject: move live tv classes

---
 .../Emby.Server.Implementations.csproj             |  3 +
 .../LiveTv/ChannelImageProvider.cs                 | 85 +++++++++++++++++++++
 .../LiveTv/ProgramImageProvider.cs                 | 88 ++++++++++++++++++++++
 .../LiveTv/RecordingImageProvider.cs               | 82 ++++++++++++++++++++
 .../LiveTv/ChannelImageProvider.cs                 | 85 ---------------------
 .../LiveTv/ProgramImageProvider.cs                 | 88 ----------------------
 .../LiveTv/RecordingImageProvider.cs               | 82 --------------------
 .../MediaBrowser.Server.Implementations.csproj     |  3 -
 8 files changed, 258 insertions(+), 258 deletions(-)
 create mode 100644 Emby.Server.Implementations/LiveTv/ChannelImageProvider.cs
 create mode 100644 Emby.Server.Implementations/LiveTv/ProgramImageProvider.cs
 create mode 100644 Emby.Server.Implementations/LiveTv/RecordingImageProvider.cs
 delete mode 100644 MediaBrowser.Server.Implementations/LiveTv/ChannelImageProvider.cs
 delete mode 100644 MediaBrowser.Server.Implementations/LiveTv/ProgramImageProvider.cs
 delete mode 100644 MediaBrowser.Server.Implementations/LiveTv/RecordingImageProvider.cs

diff --git a/Emby.Server.Implementations/Emby.Server.Implementations.csproj b/Emby.Server.Implementations/Emby.Server.Implementations.csproj
index 7829193c53..322b6773fc 100644
--- a/Emby.Server.Implementations/Emby.Server.Implementations.csproj
+++ b/Emby.Server.Implementations/Emby.Server.Implementations.csproj
@@ -109,6 +109,9 @@
     <Compile Include="Library\Validators\StudiosPostScanTask.cs" />
     <Compile Include="Library\Validators\StudiosValidator.cs" />
     <Compile Include="Library\Validators\YearsPostScanTask.cs" />
+    <Compile Include="LiveTv\ChannelImageProvider.cs" />
+    <Compile Include="LiveTv\ProgramImageProvider.cs" />
+    <Compile Include="LiveTv\RecordingImageProvider.cs" />
     <Compile Include="Logging\PatternsLogger.cs" />
     <Compile Include="MediaEncoder\EncodingManager.cs" />
     <Compile Include="News\NewsEntryPoint.cs" />
diff --git a/Emby.Server.Implementations/LiveTv/ChannelImageProvider.cs b/Emby.Server.Implementations/LiveTv/ChannelImageProvider.cs
new file mode 100644
index 0000000000..95cefd9990
--- /dev/null
+++ b/Emby.Server.Implementations/LiveTv/ChannelImageProvider.cs
@@ -0,0 +1,85 @@
+using MediaBrowser.Common;
+using MediaBrowser.Common.Net;
+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;
+
+namespace Emby.Server.Implementations.LiveTv
+{
+    public class ChannelImageProvider : IDynamicImageProvider, IHasItemChangeMonitor
+    {
+        private readonly ILiveTvManager _liveTvManager;
+        private readonly IHttpClient _httpClient;
+        private readonly ILogger _logger;
+        private readonly IApplicationHost _appHost;
+
+        public ChannelImageProvider(ILiveTvManager liveTvManager, IHttpClient httpClient, ILogger logger, IApplicationHost appHost)
+        {
+            _liveTvManager = liveTvManager;
+            _httpClient = httpClient;
+            _logger = logger;
+            _appHost = appHost;
+        }
+
+        public IEnumerable<ImageType> GetSupportedImages(IHasImages item)
+        {
+            return new[] { ImageType.Primary };
+        }
+
+        public async Task<DynamicImageResponse> GetImage(IHasImages item, ImageType type, CancellationToken cancellationToken)
+        {
+            var liveTvItem = (LiveTvChannel)item;
+
+            var imageResponse = new DynamicImageResponse();
+
+            var service = _liveTvManager.Services.FirstOrDefault(i => string.Equals(i.Name, liveTvItem.ServiceName, StringComparison.OrdinalIgnoreCase));
+
+            if (service != null && !item.HasImage(ImageType.Primary))
+            {
+                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)
+                {
+                }
+            }
+
+            return imageResponse;
+        }
+
+        public string Name
+        {
+            get { return "Live TV Service Provider"; }
+        }
+
+        public bool Supports(IHasImages item)
+        {
+            return item is LiveTvChannel;
+        }
+
+        public int Order
+        {
+            get { return 0; }
+        }
+
+        public bool HasChanged(IHasMetadata item, IDirectoryService directoryService)
+        {
+            return GetSupportedImages(item).Any(i => !item.HasImage(i));
+        }
+    }
+}
diff --git a/Emby.Server.Implementations/LiveTv/ProgramImageProvider.cs b/Emby.Server.Implementations/LiveTv/ProgramImageProvider.cs
new file mode 100644
index 0000000000..f5d298af4c
--- /dev/null
+++ b/Emby.Server.Implementations/LiveTv/ProgramImageProvider.cs
@@ -0,0 +1,88 @@
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.LiveTv;
+using MediaBrowser.Controller.Providers;
+using MediaBrowser.Model.Entities;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Emby.Server.Implementations.LiveTv
+{
+    public class ProgramImageProvider : IDynamicImageProvider, IHasItemChangeMonitor, IHasOrder
+    {
+        private readonly ILiveTvManager _liveTvManager;
+
+        public ProgramImageProvider(ILiveTvManager liveTvManager)
+        {
+            _liveTvManager = liveTvManager;
+        }
+
+        public IEnumerable<ImageType> GetSupportedImages(IHasImages item)
+        {
+            return new[] { ImageType.Primary };
+        }
+
+        public async Task<DynamicImageResponse> GetImage(IHasImages item, ImageType type, CancellationToken cancellationToken)
+        {
+            var liveTvItem = (LiveTvProgram)item;
+
+            var imageResponse = new DynamicImageResponse();
+
+            var service = _liveTvManager.Services.FirstOrDefault(i => string.Equals(i.Name, liveTvItem.ServiceName, StringComparison.OrdinalIgnoreCase));
+
+            if (service != null)
+            {
+                try
+                {
+                    var channel = _liveTvManager.GetInternalChannel(liveTvItem.ChannelId);
+
+                    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)
+                {
+                }
+            }
+
+            return imageResponse;
+        }
+
+        public string Name
+        {
+            get { return "Live TV Service Provider"; }
+        }
+
+        public bool Supports(IHasImages item)
+        {
+            return item is LiveTvProgram;
+        }
+
+        public int Order
+        {
+            get
+            {
+                // Let the better providers run first
+                return 100;
+            }
+        }
+
+        public bool HasChanged(IHasMetadata item, IDirectoryService directoryService)
+        {
+            var liveTvItem = item as LiveTvProgram;
+
+            if (liveTvItem != null)
+            {
+                return !liveTvItem.HasImage(ImageType.Primary);
+            }
+            return false;
+        }
+    }
+}
diff --git a/Emby.Server.Implementations/LiveTv/RecordingImageProvider.cs b/Emby.Server.Implementations/LiveTv/RecordingImageProvider.cs
new file mode 100644
index 0000000000..47663bdbc5
--- /dev/null
+++ b/Emby.Server.Implementations/LiveTv/RecordingImageProvider.cs
@@ -0,0 +1,82 @@
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.LiveTv;
+using MediaBrowser.Controller.Providers;
+using MediaBrowser.Model.Entities;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Emby.Server.Implementations.LiveTv
+{
+    public class RecordingImageProvider : IDynamicImageProvider, IHasItemChangeMonitor
+    {
+        private readonly ILiveTvManager _liveTvManager;
+
+        public RecordingImageProvider(ILiveTvManager liveTvManager)
+        {
+            _liveTvManager = liveTvManager;
+        }
+
+        public IEnumerable<ImageType> GetSupportedImages(IHasImages item)
+        {
+            return new[] { ImageType.Primary };
+        }
+
+        public async Task<DynamicImageResponse> GetImage(IHasImages item, ImageType type, CancellationToken cancellationToken)
+        {
+            var liveTvItem = (ILiveTvRecording)item;
+
+            var imageResponse = new DynamicImageResponse();
+
+            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)
+                {
+                }
+            }
+
+            return imageResponse;
+        }
+
+        public string Name
+        {
+            get { return "Live TV Service Provider"; }
+        }
+
+        public bool Supports(IHasImages item)
+        {
+            return item is ILiveTvRecording;
+        }
+
+        public int Order
+        {
+            get { return 0; }
+        }
+
+        public bool HasChanged(IHasMetadata item, IDirectoryService directoryService)
+        {
+            var liveTvItem = item as ILiveTvRecording;
+
+            if (liveTvItem != null)
+            {
+                return !liveTvItem.HasImage(ImageType.Primary);
+            }
+            return false;
+        }
+    }
+}
diff --git a/MediaBrowser.Server.Implementations/LiveTv/ChannelImageProvider.cs b/MediaBrowser.Server.Implementations/LiveTv/ChannelImageProvider.cs
deleted file mode 100644
index 23560b1aa1..0000000000
--- a/MediaBrowser.Server.Implementations/LiveTv/ChannelImageProvider.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-using MediaBrowser.Common;
-using MediaBrowser.Common.Net;
-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;
-
-namespace MediaBrowser.Server.Implementations.LiveTv
-{
-    public class ChannelImageProvider : IDynamicImageProvider, IHasItemChangeMonitor
-    {
-        private readonly ILiveTvManager _liveTvManager;
-        private readonly IHttpClient _httpClient;
-        private readonly ILogger _logger;
-        private readonly IApplicationHost _appHost;
-
-        public ChannelImageProvider(ILiveTvManager liveTvManager, IHttpClient httpClient, ILogger logger, IApplicationHost appHost)
-        {
-            _liveTvManager = liveTvManager;
-            _httpClient = httpClient;
-            _logger = logger;
-            _appHost = appHost;
-        }
-
-        public IEnumerable<ImageType> GetSupportedImages(IHasImages item)
-        {
-            return new[] { ImageType.Primary };
-        }
-
-        public async Task<DynamicImageResponse> GetImage(IHasImages item, ImageType type, CancellationToken cancellationToken)
-        {
-            var liveTvItem = (LiveTvChannel)item;
-
-            var imageResponse = new DynamicImageResponse();
-
-            var service = _liveTvManager.Services.FirstOrDefault(i => string.Equals(i.Name, liveTvItem.ServiceName, StringComparison.OrdinalIgnoreCase));
-
-            if (service != null && !item.HasImage(ImageType.Primary))
-            {
-                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)
-                {
-                }
-            }
-
-            return imageResponse;
-        }
-
-        public string Name
-        {
-            get { return "Live TV Service Provider"; }
-        }
-
-        public bool Supports(IHasImages item)
-        {
-            return item is LiveTvChannel;
-        }
-
-        public int Order
-        {
-            get { return 0; }
-        }
-
-        public bool HasChanged(IHasMetadata item, IDirectoryService directoryService)
-        {
-            return GetSupportedImages(item).Any(i => !item.HasImage(i));
-        }
-    }
-}
diff --git a/MediaBrowser.Server.Implementations/LiveTv/ProgramImageProvider.cs b/MediaBrowser.Server.Implementations/LiveTv/ProgramImageProvider.cs
deleted file mode 100644
index 3f0538bd0b..0000000000
--- a/MediaBrowser.Server.Implementations/LiveTv/ProgramImageProvider.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-using MediaBrowser.Controller.Entities;
-using MediaBrowser.Controller.LiveTv;
-using MediaBrowser.Controller.Providers;
-using MediaBrowser.Model.Entities;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace MediaBrowser.Server.Implementations.LiveTv
-{
-    public class ProgramImageProvider : IDynamicImageProvider, IHasItemChangeMonitor, IHasOrder
-    {
-        private readonly ILiveTvManager _liveTvManager;
-
-        public ProgramImageProvider(ILiveTvManager liveTvManager)
-        {
-            _liveTvManager = liveTvManager;
-        }
-
-        public IEnumerable<ImageType> GetSupportedImages(IHasImages item)
-        {
-            return new[] { ImageType.Primary };
-        }
-
-        public async Task<DynamicImageResponse> GetImage(IHasImages item, ImageType type, CancellationToken cancellationToken)
-        {
-            var liveTvItem = (LiveTvProgram)item;
-
-            var imageResponse = new DynamicImageResponse();
-
-            var service = _liveTvManager.Services.FirstOrDefault(i => string.Equals(i.Name, liveTvItem.ServiceName, StringComparison.OrdinalIgnoreCase));
-
-            if (service != null)
-            {
-                try
-                {
-                    var channel = _liveTvManager.GetInternalChannel(liveTvItem.ChannelId);
-
-                    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)
-                {
-                }
-            }
-
-            return imageResponse;
-        }
-
-        public string Name
-        {
-            get { return "Live TV Service Provider"; }
-        }
-
-        public bool Supports(IHasImages item)
-        {
-            return item is LiveTvProgram;
-        }
-
-        public int Order
-        {
-            get
-            {
-                // Let the better providers run first
-                return 100;
-            }
-        }
-
-        public bool HasChanged(IHasMetadata item, IDirectoryService directoryService)
-        {
-            var liveTvItem = item as LiveTvProgram;
-
-            if (liveTvItem != null)
-            {
-                return !liveTvItem.HasImage(ImageType.Primary);
-            }
-            return false;
-        }
-    }
-}
diff --git a/MediaBrowser.Server.Implementations/LiveTv/RecordingImageProvider.cs b/MediaBrowser.Server.Implementations/LiveTv/RecordingImageProvider.cs
deleted file mode 100644
index 25678c29d3..0000000000
--- a/MediaBrowser.Server.Implementations/LiveTv/RecordingImageProvider.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-using MediaBrowser.Controller.Entities;
-using MediaBrowser.Controller.LiveTv;
-using MediaBrowser.Controller.Providers;
-using MediaBrowser.Model.Entities;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace MediaBrowser.Server.Implementations.LiveTv
-{
-    public class RecordingImageProvider : IDynamicImageProvider, IHasItemChangeMonitor
-    {
-        private readonly ILiveTvManager _liveTvManager;
-
-        public RecordingImageProvider(ILiveTvManager liveTvManager)
-        {
-            _liveTvManager = liveTvManager;
-        }
-
-        public IEnumerable<ImageType> GetSupportedImages(IHasImages item)
-        {
-            return new[] { ImageType.Primary };
-        }
-
-        public async Task<DynamicImageResponse> GetImage(IHasImages item, ImageType type, CancellationToken cancellationToken)
-        {
-            var liveTvItem = (ILiveTvRecording)item;
-
-            var imageResponse = new DynamicImageResponse();
-
-            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)
-                {
-                }
-            }
-
-            return imageResponse;
-        }
-
-        public string Name
-        {
-            get { return "Live TV Service Provider"; }
-        }
-
-        public bool Supports(IHasImages item)
-        {
-            return item is ILiveTvRecording;
-        }
-
-        public int Order
-        {
-            get { return 0; }
-        }
-
-        public bool HasChanged(IHasMetadata item, IDirectoryService directoryService)
-        {
-            var liveTvItem = item as ILiveTvRecording;
-
-            if (liveTvItem != null)
-            {
-                return !liveTvItem.HasImage(ImageType.Primary);
-            }
-            return false;
-        }
-    }
-}
diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
index adc5d68792..9289f3506b 100644
--- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
+++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
@@ -144,7 +144,6 @@
     <Compile Include="IO\FileRefresher.cs" />
     <Compile Include="IO\LibraryMonitor.cs" />
     <Compile Include="IO\MemoryStreamProvider.cs" />
-    <Compile Include="LiveTv\ChannelImageProvider.cs" />
     <Compile Include="LiveTv\EmbyTV\DirectRecorder.cs" />
     <Compile Include="LiveTv\EmbyTV\EmbyTV.cs" />
     <Compile Include="LiveTv\EmbyTV\EmbyTVRegistration.cs" />
@@ -168,8 +167,6 @@
     <Compile Include="LiveTv\TunerHosts\HdHomerun\HdHomerunLiveStream.cs" />
     <Compile Include="LiveTv\TunerHosts\M3uParser.cs" />
     <Compile Include="LiveTv\TunerHosts\M3UTunerHost.cs" />
-    <Compile Include="LiveTv\ProgramImageProvider.cs" />
-    <Compile Include="LiveTv\RecordingImageProvider.cs" />
     <Compile Include="LiveTv\RefreshChannelsScheduledTask.cs" />
     <Compile Include="LiveTv\TunerHosts\MulticastStream.cs" />
     <Compile Include="LiveTv\TunerHosts\QueueStream.cs" />
-- 
cgit v1.2.3