Merge pull request #1409 from MediaBrowser/beta

merge from beta

6 files changed, 108 insertions, 470 deletions

diff --git a/MediaBrowser.Server.Implementations/LiveTv/Listings/Emby/EmbyListings.cs b/MediaBrowser.Server.Implementations/LiveTv/Listings/Emby/EmbyListings.cs
deleted file mode 100644
index ae441b44e0..0000000000
--- a/MediaBrowser.Server.Implementations/LiveTv/Listings/Emby/EmbyListings.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-using MediaBrowser.Common.Net;
-using MediaBrowser.Controller.LiveTv;
-using MediaBrowser.Model.Dto;
-using MediaBrowser.Model.LiveTv;
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-using MediaBrowser.Model.Serialization;
-
-namespace MediaBrowser.Server.Implementations.LiveTv.Listings.Emby
-{
-    public class EmbyGuide : IListingsProvider
-    {
-        private readonly IHttpClient _httpClient;
-        private readonly IJsonSerializer _jsonSerializer;
-
-        public EmbyGuide(IHttpClient httpClient, IJsonSerializer jsonSerializer)
-        {
-            _httpClient = httpClient;
-            _jsonSerializer = jsonSerializer;
-        }
-
-        public string Name
-        {
-            get { return "Emby Guide"; }
-        }
-
-        public string Type
-        {
-            get { return "emby"; }
-        }
-
-        public Task<IEnumerable<ProgramInfo>> GetProgramsAsync(ListingsProviderInfo info, string channelNumber, string channelName, DateTime startDateUtc, DateTime endDateUtc, CancellationToken cancellationToken)
-        {
-            return GetListingsProvider(info.Country).GetProgramsAsync(info, channelNumber, startDateUtc, endDateUtc, cancellationToken);
-        }
-
-        public Task AddMetadata(ListingsProviderInfo info, List<ChannelInfo> channels, CancellationToken cancellationToken)
-        {
-            return GetListingsProvider(info.Country).AddMetadata(info, channels, cancellationToken);
-        }
-
-        public Task Validate(ListingsProviderInfo info, bool validateLogin, bool validateListings)
-        {
-            return GetListingsProvider(info.Country).Validate(info, validateLogin, validateListings);
-        }
-
-        public Task<List<NameIdPair>> GetLineups(ListingsProviderInfo info, string country, string location)
-        {
-            return GetListingsProvider(country).GetLineups(country, location);
-        }
-
-        private IEmbyListingProvider GetListingsProvider(string country)
-        {
-            return new EmbyListingsNorthAmerica(_httpClient, _jsonSerializer);
-        }
-    }
-}
diff --git a/MediaBrowser.Server.Implementations/LiveTv/Listings/Emby/EmbyListingsNorthAmerica.cs b/MediaBrowser.Server.Implementations/LiveTv/Listings/Emby/EmbyListingsNorthAmerica.cs
deleted file mode 100644
index 2993740d63..0000000000
--- a/MediaBrowser.Server.Implementations/LiveTv/Listings/Emby/EmbyListingsNorthAmerica.cs
+++ /dev/null
@@ -1,366 +0,0 @@
-using MediaBrowser.Common.Net;
-using MediaBrowser.Controller.LiveTv;
-using MediaBrowser.Model.Dto;
-using MediaBrowser.Model.LiveTv;
-using MediaBrowser.Model.Serialization;
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace MediaBrowser.Server.Implementations.LiveTv.Listings.Emby
-{
-    public class EmbyListingsNorthAmerica : IEmbyListingProvider
-    {
-        private readonly IHttpClient _httpClient;
-        private readonly IJsonSerializer _jsonSerializer;
-
-        public EmbyListingsNorthAmerica(IHttpClient httpClient, IJsonSerializer jsonSerializer)
-        {
-            _httpClient = httpClient;
-            _jsonSerializer = jsonSerializer;
-        }
-
-        public async Task<IEnumerable<ProgramInfo>> GetProgramsAsync(ListingsProviderInfo info, string channelNumber, DateTime startDateUtc, DateTime endDateUtc, CancellationToken cancellationToken)
-        {
-            channelNumber = NormalizeNumber(channelNumber);
-
-            var url = "https://data.emby.media/service/listings?id=" + info.ListingsId;
-
-            // Normalize
-            startDateUtc = startDateUtc.Date;
-            endDateUtc = startDateUtc.AddDays(7);
-
-            url += "&start=" + startDateUtc.ToString("s", CultureInfo.InvariantCulture) + "Z";
-            url += "&end=" + endDateUtc.ToString("s", CultureInfo.InvariantCulture) + "Z";
-
-            var response = await GetResponse<ListingInfo[]>(url).ConfigureAwait(false);
-
-            return response.Where(i => IncludeInResults(i, channelNumber)).Select(GetProgramInfo).OrderBy(i => i.StartDate);
-        }
-
-        private ProgramInfo GetProgramInfo(ListingInfo info)
-        {
-            var showType = info.showType ?? string.Empty;
-
-            var program = new ProgramInfo
-            {
-                Id = info.listingID.ToString(CultureInfo.InvariantCulture),
-                Name = GetStringValue(info.showName),
-                HomePageUrl = GetStringValue(info.webLink),
-                Overview = info.description,
-                IsHD = info.hd,
-                IsLive = info.live,
-                IsPremiere = info.seasonPremiere || info.seriesPremiere,
-                IsMovie = showType.IndexOf("Movie", StringComparison.OrdinalIgnoreCase) != -1,
-                IsKids = showType.IndexOf("Children", StringComparison.OrdinalIgnoreCase) != -1,
-                IsNews = showType.IndexOf("News", StringComparison.OrdinalIgnoreCase) != -1,
-                IsSports = showType.IndexOf("Sports", StringComparison.OrdinalIgnoreCase) != -1
-            };
-
-            if (!string.IsNullOrWhiteSpace(info.listDateTime))
-            {
-                program.StartDate = DateTime.ParseExact(info.listDateTime, "yyyy'-'MM'-'dd' 'HH':'mm':'ss", CultureInfo.InvariantCulture);
-                program.StartDate = DateTime.SpecifyKind(program.StartDate, DateTimeKind.Utc);
-                program.EndDate = program.StartDate.AddMinutes(info.duration);
-            }
-
-            if (info.starRating > 0)
-            {
-                program.CommunityRating = info.starRating*2;
-            }
-
-            if (!string.IsNullOrWhiteSpace(info.rating))
-            {
-                // They don't have dashes so try to normalize
-                program.OfficialRating = info.rating.Replace("TV", "TV-").Replace("--", "-");
-
-                var invalid = new[] { "N/A", "Approved", "Not Rated" };
-                if (invalid.Contains(program.OfficialRating, StringComparer.OrdinalIgnoreCase))
-                {
-                    program.OfficialRating = null;
-                }
-            }
-
-            if (!string.IsNullOrWhiteSpace(info.year))
-            {
-                program.ProductionYear = int.Parse(info.year, CultureInfo.InvariantCulture);
-            }
-
-            if (info.showID > 0)
-            {
-                program.ShowId = info.showID.ToString(CultureInfo.InvariantCulture);
-            }
-
-            if (info.seriesID > 0)
-            {
-                program.SeriesId = info.seriesID.ToString(CultureInfo.InvariantCulture);
-                program.IsSeries = true;
-                program.IsRepeat = info.repeat;
-
-                program.EpisodeTitle = GetStringValue(info.episodeTitle);
-
-                if (string.Equals(program.Name, program.EpisodeTitle, StringComparison.OrdinalIgnoreCase))
-                {
-                    program.EpisodeTitle = null;
-                }
-            }
-
-            if (info.starRating > 0)
-            {
-                program.CommunityRating = info.starRating * 2;
-            }
-
-            if (string.Equals(info.showName, "Movie", StringComparison.OrdinalIgnoreCase))
-            {
-                // Sometimes the movie title will be in here
-                if (!string.IsNullOrWhiteSpace(info.episodeTitle))
-                {
-                    program.Name = info.episodeTitle;
-                }
-            }
-
-            return program;
-        }
-
-        private string GetStringValue(string s)
-        {
-            return string.IsNullOrWhiteSpace(s) ? null : s;
-        }
-
-        private bool IncludeInResults(ListingInfo info, string itemNumber)
-        {
-            if (string.Equals(itemNumber, NormalizeNumber(info.number), StringComparison.OrdinalIgnoreCase))
-            {
-                return true;
-            }
-
-            var channelNumber = info.channelNumber.ToString(CultureInfo.InvariantCulture);
-            if (info.subChannelNumber > 0)
-            {
-                channelNumber += "." + info.subChannelNumber.ToString(CultureInfo.InvariantCulture);
-            }
-
-            return string.Equals(channelNumber, itemNumber, StringComparison.OrdinalIgnoreCase);
-        }
-
-        public async Task AddMetadata(ListingsProviderInfo info, List<ChannelInfo> channels, CancellationToken cancellationToken)
-        {
-            var response = await GetResponse<LineupDetailResponse>("https://data.emby.media/service/lineups?id=" + info.ListingsId).ConfigureAwait(false);
-
-            foreach (var channel in channels)
-            {
-                var station = response.stations.FirstOrDefault(i =>
-                {
-                    var itemNumber = NormalizeNumber(channel.Number);
-
-                    if (string.Equals(itemNumber, NormalizeNumber(i.number), StringComparison.OrdinalIgnoreCase))
-                    {
-                        return true;
-                    }
-
-                    var channelNumber = i.channelNumber.ToString(CultureInfo.InvariantCulture);
-                    if (i.subChannelNumber > 0)
-                    {
-                        channelNumber += "." + i.subChannelNumber.ToString(CultureInfo.InvariantCulture);
-                    }
-
-                    return string.Equals(channelNumber, itemNumber, StringComparison.OrdinalIgnoreCase);
-                });
-
-                if (station != null)
-                {
-                    //channel.Name = station.name;
-
-                    if (!string.IsNullOrWhiteSpace(station.logoFilename))
-                    {
-                        channel.HasImage = true;
-                        channel.ImageUrl = "http://cdn.tvpassport.com/image/station/100x100/" + station.logoFilename;
-                    }
-                }
-            }
-        }
-
-        private string NormalizeNumber(string number)
-        {
-            return number.Replace('-', '.');
-        }
-
-        public Task Validate(ListingsProviderInfo info, bool validateLogin, bool validateListings)
-        {
-            return Task.FromResult(true);
-        }
-
-        public async Task<List<NameIdPair>> GetLineups(string country, string location)
-        {
-            // location = postal code
-            var response = await GetResponse<LineupInfo[]>("https://data.emby.media/service/lineups?postalCode=" + location).ConfigureAwait(false);
-
-            return response.Select(i => new NameIdPair
-            {
-                Name = GetName(i),
-                Id = i.lineupID
-
-            }).OrderBy(i => i.Name).ToList();
-        }
-
-        private string GetName(LineupInfo info)
-        {
-            var name = info.lineupName;
-
-            if (string.Equals(info.lineupType, "cab", StringComparison.OrdinalIgnoreCase))
-            {
-                name += " - Cable";
-            }
-            else if (string.Equals(info.lineupType, "sat", StringComparison.OrdinalIgnoreCase))
-            {
-                name += " - SAT";
-            }
-            else if (string.Equals(info.lineupType, "ota", StringComparison.OrdinalIgnoreCase))
-            {
-                name += " - OTA";
-            }
-
-            return name;
-        }
-
-        private async Task<T> GetResponse<T>(string url, Func<string, string> filter = null)
-            where T : class
-        {
-            using (var stream = await _httpClient.Get(new HttpRequestOptions
-            {
-                Url = url,
-                CacheLength = TimeSpan.FromDays(1),
-                CacheMode = CacheMode.Unconditional
-
-            }).ConfigureAwait(false))
-            {
-                using (var reader = new StreamReader(stream))
-                {
-                    var path = await reader.ReadToEndAsync().ConfigureAwait(false);
-
-                    using (var secondStream = await _httpClient.Get(new HttpRequestOptions
-                    {
-                        Url = "https://www.mb3admin.com" + path,
-                        CacheLength = TimeSpan.FromDays(1),
-                        CacheMode = CacheMode.Unconditional
-
-                    }).ConfigureAwait(false))
-                    {
-                        return ParseResponse<T>(secondStream, filter);
-                    }
-                }
-            }
-        }
-
-        private T ParseResponse<T>(Stream response, Func<string,string> filter)
-        {
-            using (var reader = new StreamReader(response))
-            {
-                var json = reader.ReadToEnd();
-
-                if (filter != null)
-                {
-                    json = filter(json);
-                }
-
-                return _jsonSerializer.DeserializeFromString<T>(json);
-            }
-        }
-
-        private class LineupInfo
-        {
-            public string lineupID { get; set; }
-            public string lineupName { get; set; }
-            public string lineupType { get; set; }
-            public string providerID { get; set; }
-            public string providerName { get; set; }
-            public string serviceArea { get; set; }
-            public string country { get; set; }
-        }
-
-        private class Station
-        {
-            public string number { get; set; }
-            public int channelNumber { get; set; }
-            public int subChannelNumber { get; set; }
-            public int stationID { get; set; }
-            public string name { get; set; }
-            public string callsign { get; set; }
-            public string network { get; set; }
-            public string stationType { get; set; }
-            public int NTSC_TSID { get; set; }
-            public int DTV_TSID { get; set; }
-            public string webLink { get; set; }
-            public string logoFilename { get; set; }
-        }
-
-        private class LineupDetailResponse
-        {
-            public string lineupID { get; set; }
-            public string lineupName { get; set; }
-            public string lineupType { get; set; }
-            public string providerID { get; set; }
-            public string providerName { get; set; }
-            public string serviceArea { get; set; }
-            public string country { get; set; }
-            public List<Station> stations { get; set; }
-        }
-
-        private class ListingInfo
-        {
-            public string number { get; set; }
-            public int channelNumber { get; set; }
-            public int subChannelNumber { get; set; }
-            public int stationID { get; set; }
-            public string name { get; set; }
-            public string callsign { get; set; }
-            public string network { get; set; }
-            public string stationType { get; set; }
-            public string webLink { get; set; }
-            public string logoFilename { get; set; }
-            public int listingID { get; set; }
-            public string listDateTime { get; set; }
-            public int duration { get; set; }
-            public int showID { get; set; }
-            public int seriesID { get; set; }
-            public string showName { get; set; }
-            public string episodeTitle { get; set; }
-            public string episodeNumber { get; set; }
-            public int parts { get; set; }
-            public int partNum { get; set; }
-            public bool seriesPremiere { get; set; }
-            public bool seasonPremiere { get; set; }
-            public bool seriesFinale { get; set; }
-            public bool seasonFinale { get; set; }
-            public bool repeat { get; set; }
-            public bool @new { get; set; }
-            public string rating { get; set; }
-            public bool captioned { get; set; }
-            public bool educational { get; set; }
-            public bool blackWhite { get; set; }
-            public bool subtitled { get; set; }
-            public bool live { get; set; }
-            public bool hd { get; set; }
-            public bool descriptiveVideo { get; set; }
-            public bool inProgress { get; set; }
-            public string showTypeID { get; set; }
-            public int breakoutLevel { get; set; }
-            public string showType { get; set; }
-            public string year { get; set; }
-            public string guest { get; set; }
-            public string cast { get; set; }
-            public string director { get; set; }
-            public int starRating { get; set; }
-            public string description { get; set; }
-            public string league { get; set; }
-            public string team1 { get; set; }
-            public string team2 { get; set; }
-            public string @event { get; set; }
-            public string location { get; set; }
-        }
-    }
-}
diff --git a/MediaBrowser.Server.Implementations/LiveTv/Listings/Emby/IEmbyListingProvider.cs b/MediaBrowser.Server.Implementations/LiveTv/Listings/Emby/IEmbyListingProvider.cs
deleted file mode 100644
index 95c22b9869..0000000000
--- a/MediaBrowser.Server.Implementations/LiveTv/Listings/Emby/IEmbyListingProvider.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using MediaBrowser.Controller.LiveTv;
-using MediaBrowser.Model.Dto;
-using MediaBrowser.Model.LiveTv;
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace MediaBrowser.Server.Implementations.LiveTv.Listings.Emby
-{
-    public interface IEmbyListingProvider
-    {
-        Task<IEnumerable<ProgramInfo>> GetProgramsAsync(ListingsProviderInfo info, string channelNumber, DateTime startDateUtc, DateTime endDateUtc, CancellationToken cancellationToken);
-        Task AddMetadata(ListingsProviderInfo info, List<ChannelInfo> channels, CancellationToken cancellationToken);
-        Task Validate(ListingsProviderInfo info, bool validateLogin, bool validateListings);
-        Task<List<NameIdPair>> GetLineups(string country, string location);
-    }
-}
diff --git a/MediaBrowser.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs b/MediaBrowser.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs
index 85d3ffdbaa..87d7ff3eba 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs
@@ -114,7 +114,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.Listings
             var requestString = _jsonSerializer.SerializeToString(requestList);
             _logger.Debug("Request string for schedules is: " + requestString);
             httpOptions.RequestContent = requestString;
-            using (var response = await Post(httpOptions).ConfigureAwait(false))
+            using (var response = await Post(httpOptions, true, info).ConfigureAwait(false))
             {
                 StreamReader reader = new StreamReader(response.Content);
                 string responseString = reader.ReadToEnd();
@@ -138,7 +138,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.Listings
                 var requestBody = "[\"" + string.Join("\", \"", programsID) + "\"]";
                 httpOptions.RequestContent = requestBody;
 
-                using (var innerResponse = await Post(httpOptions).ConfigureAwait(false))
+                using (var innerResponse = await Post(httpOptions, true, info).ConfigureAwait(false))
                 {
                     StreamReader innerReader = new StreamReader(innerResponse.Content);
                     responseString = innerReader.ReadToEnd();
@@ -148,7 +148,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.Listings
                             responseString);
                     var programDict = programDetails.ToDictionary(p => p.programID, y => y);
 
-                    var images = await GetImageForPrograms(programDetails.Where(p => p.hasImageArtwork).Select(p => p.programID).ToList(), cancellationToken);
+                    var images = await GetImageForPrograms(info, programDetails.Where(p => p.hasImageArtwork).Select(p => p.programID).ToList(), cancellationToken);
 
                     var schedules = dailySchedules.SelectMany(d => d.programs);
                     foreach (ScheduleDirect.Program schedule in schedules)
@@ -229,7 +229,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.Listings
 
             httpOptions.RequestHeaders["token"] = token;
 
-            using (var response = await Get(httpOptions).ConfigureAwait(false))
+            using (var response = await Get(httpOptions, true, info).ConfigureAwait(false))
             {
                 var root = _jsonSerializer.DeserializeFromStream<ScheduleDirect.Channel>(response);
                 _logger.Info("Found " + root.map.Count() + " channels on the lineup on ScheduleDirect");
@@ -447,7 +447,9 @@ namespace MediaBrowser.Server.Implementations.LiveTv.Listings
             return url;
         }
 
-        private async Task<List<ScheduleDirect.ShowImages>> GetImageForPrograms(List<string> programIds,
+        private async Task<List<ScheduleDirect.ShowImages>> GetImageForPrograms(
+			ListingsProviderInfo info,
+			List<string> programIds,
            CancellationToken cancellationToken)
         {
             var imageIdString = "[";
@@ -472,7 +474,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.Listings
                 TimeoutMs = 60000
             };
             List<ScheduleDirect.ShowImages> images;
-            using (var innerResponse2 = await Post(httpOptions).ConfigureAwait(false))
+            using (var innerResponse2 = await Post(httpOptions, true, info).ConfigureAwait(false))
             {
                 images = _jsonSerializer.DeserializeFromStream<List<ScheduleDirect.ShowImages>>(
                     innerResponse2.Content);
@@ -504,7 +506,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.Listings
 
             try
             {
-                using (Stream responce = await Get(options).ConfigureAwait(false))
+				using (Stream responce = await Get(options, false, info).ConfigureAwait(false))
                 {
                     var root = _jsonSerializer.DeserializeFromStream<List<ScheduleDirect.Headends>>(responce);
 
@@ -606,30 +608,58 @@ namespace MediaBrowser.Server.Implementations.LiveTv.Listings
             }
         }
 
-        private async Task<HttpResponseInfo> Post(HttpRequestOptions options)
+		private async Task<HttpResponseInfo> Post(HttpRequestOptions options, 
+			bool enableRetry,
+			ListingsProviderInfo providerInfo)
         {
             try
             {
                 return await _httpClient.Post(options).ConfigureAwait(false);
-            }
-            catch
-            {
-                _tokens.Clear();
-                throw;
-            }
+			}
+			catch (HttpException ex)
+			{
+				_tokens.Clear();
+
+				if (!ex.StatusCode.HasValue || (int)ex.StatusCode.Value >= 500) 
+				{
+					enableRetry = false;
+				}
+
+				if (!enableRetry) {
+					throw;
+				}
+			}
+
+			var newToken = await GetToken (providerInfo, options.CancellationToken).ConfigureAwait (false);
+			options.RequestHeaders ["token"] = newToken;
+			return await Post (options, false, providerInfo).ConfigureAwait (false);
         }
 
-        private async Task<Stream> Get(HttpRequestOptions options)
+		private async Task<Stream> Get(HttpRequestOptions options, 
+			bool enableRetry,
+			ListingsProviderInfo providerInfo)
         {
             try
             {
                 return await _httpClient.Get(options).ConfigureAwait(false);
-            }
-            catch
-            {
-                _tokens.Clear();
-                throw;
-            }
+			}
+			catch (HttpException ex)
+			{
+				_tokens.Clear();
+
+				if (!ex.StatusCode.HasValue || (int)ex.StatusCode.Value >= 500) 
+				{
+					enableRetry = false;
+				}
+
+				if (!enableRetry) {
+					throw;
+				}
+			}
+
+			var newToken = await GetToken (providerInfo, options.CancellationToken).ConfigureAwait (false);
+			options.RequestHeaders ["token"] = newToken;
+			return await Get (options, false, providerInfo).ConfigureAwait (false);
         }
 
         private async Task<string> GetTokenInternal(string username, string password,
@@ -646,7 +676,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.Listings
             //_logger.Info("Obtaining token from Schedules Direct from addres: " + httpOptions.Url + " with body " +
             // httpOptions.RequestContent);
 
-            using (var responce = await Post(httpOptions).ConfigureAwait(false))
+			using (var responce = await Post(httpOptions, false, null).ConfigureAwait(false))
             {
                 var root = _jsonSerializer.DeserializeFromStream<ScheduleDirect.Token>(responce.Content);
                 if (root.message == "OK")
@@ -728,7 +758,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.Listings
 
             try
             {
-                using (var response = await Get(options).ConfigureAwait(false))
+				using (var response = await Get(options, false, null).ConfigureAwait(false))
                 {
                     var root = _jsonSerializer.DeserializeFromStream<ScheduleDirect.Lineups>(response);
 
diff --git a/MediaBrowser.Server.Implementations/LiveTv/LiveTvDtoService.cs b/MediaBrowser.Server.Implementations/LiveTv/LiveTvDtoService.cs
index 9ffd8a500e..04f99cdce9 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/LiveTvDtoService.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/LiveTvDtoService.cs
@@ -231,10 +231,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
             {
                 dto.ImageTags[ImageType.Primary] = imageTag;
 
-                _dtoService.AttachPrimaryImageAspectRatio(dto, info, new List<ItemFields>
-                    {
-                        ItemFields.PrimaryImageAspectRatio
-                    });
+                _dtoService.AttachPrimaryImageAspectRatio(dto, info);
             }
 
             if (currentProgram != null)
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp.cs b/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp.cs
new file mode 100644
index 0000000000..ecd2864c55
--- /dev/null
+++ b/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp.cs
@@ -0,0 +1,54 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using MediaBrowser.Common.Configuration;
+using MediaBrowser.Controller.LiveTv;
+using MediaBrowser.Controller.MediaEncoding;
+using MediaBrowser.Model.Dto;
+using MediaBrowser.Model.LiveTv;
+using MediaBrowser.Model.Logging;
+using MediaBrowser.Model.Serialization;
+
+namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts
+{
+    public class SatIp : BaseTunerHost
+    {
+        public SatIp(IConfigurationManager config, ILogger logger, IJsonSerializer jsonSerializer, IMediaEncoder mediaEncoder)
+            : base(config, logger, jsonSerializer, mediaEncoder)
+        {
+        }
+
+        protected override Task<IEnumerable<ChannelInfo>> GetChannelsInternal(TunerHostInfo tuner, CancellationToken cancellationToken)
+        {
+            throw new NotImplementedException();
+        }
+
+        public override string Type
+        {
+            get { return "SatIp"; }
+        }
+
+        protected override Task<List<MediaSourceInfo>> GetChannelStreamMediaSources(TunerHostInfo tuner, string channelId, CancellationToken cancellationToken)
+        {
+            throw new NotImplementedException();
+        }
+
+        protected override Task<MediaSourceInfo> GetChannelStream(TunerHostInfo tuner, string channelId, string streamId, CancellationToken cancellationToken)
+        {
+            throw new NotImplementedException();
+        }
+
+        protected override Task<bool> IsAvailableInternal(TunerHostInfo tuner, string channelId, CancellationToken cancellationToken)
+        {
+            throw new NotImplementedException();
+        }
+
+        protected override bool IsValidChannelId(string channelId)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}