Merge pull request #5 from jellyfin/dev

Dev

4 files changed, 193 insertions, 330 deletions

diff --git a/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs b/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
index ef96510bd..59f9fe86f 100644
--- a/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
+++ b/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
@@ -1,9 +1,16 @@
-using MediaBrowser.Common;
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Xml;
 using MediaBrowser.Common.Configuration;
 using MediaBrowser.Common.Net;
-using MediaBrowser.Common.Security;
 using MediaBrowser.Controller.Configuration;
-using MediaBrowser.Controller.Drawing;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.LiveTv;
 using MediaBrowser.Controller.MediaEncoding;
@@ -14,25 +21,13 @@ using MediaBrowser.Model.Events;
 using MediaBrowser.Model.LiveTv;
 using Microsoft.Extensions.Logging;
 using MediaBrowser.Model.Serialization;
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Xml;
 using MediaBrowser.Model.IO;
-using MediaBrowser.Common.Events;
 using MediaBrowser.Common.Extensions;
 using MediaBrowser.Common.Progress;
 using MediaBrowser.Controller;
 using MediaBrowser.Controller.Dto;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.TV;
-using MediaBrowser.Controller.IO;
 using MediaBrowser.Model.Configuration;
 using MediaBrowser.Model.Diagnostics;
 using MediaBrowser.Model.System;
diff --git a/Emby.Server.Implementations/LiveTv/EmbyTV/TimerManager.cs b/Emby.Server.Implementations/LiveTv/EmbyTV/TimerManager.cs
index 5618579f6..76a044c02 100644
--- a/Emby.Server.Implementations/LiveTv/EmbyTV/TimerManager.cs
+++ b/Emby.Server.Implementations/LiveTv/EmbyTV/TimerManager.cs
@@ -1,15 +1,11 @@
-using MediaBrowser.Common.Events;
+using System;
+using System.Collections.Concurrent;
+using System.Globalization;
+using System.Linq;
 using MediaBrowser.Controller.LiveTv;
 using MediaBrowser.Model.Events;
 using Microsoft.Extensions.Logging;
 using MediaBrowser.Model.Serialization;
-using System;
-using System.Collections.Concurrent;
-using System.Globalization;
-using System.Linq;
-using System.Threading;
-
-using MediaBrowser.Controller.IO;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.LiveTv;
 using MediaBrowser.Model.Threading;
@@ -122,7 +118,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
 
             if (startDate < now)
             {
-                EventHelper.FireEventIfNotNull(TimerFired, this, new GenericEventArgs<TimerInfo> { Argument = item }, base.Logger);
+                TimerFired?.Invoke(this, new GenericEventArgs<TimerInfo> { Argument = item });
                 return;
             }
 
@@ -178,7 +174,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             var timer = GetAll().FirstOrDefault(i => string.Equals(i.Id, timerId, StringComparison.OrdinalIgnoreCase));
             if (timer != null)
             {
-                EventHelper.FireEventIfNotNull(TimerFired, this, new GenericEventArgs<TimerInfo> { Argument = timer }, base.Logger);
+                TimerFired?.Invoke(this, new GenericEventArgs<TimerInfo> { Argument = timer });
             }
         }
 
diff --git a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs
index 8fb3af211..e8ffd0caa 100644
--- a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs
+++ b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs
@@ -16,8 +16,6 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using MediaBrowser.Model.Extensions;
-using MediaBrowser.Controller.Entities.TV;
-using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Entities;
 
 namespace Emby.Server.Implementations.LiveTv.Listings
@@ -32,9 +30,6 @@ namespace Emby.Server.Implementations.LiveTv.Listings
 
         private const string ApiUrl = "https://json.schedulesdirect.org/20141201";
 
-        private readonly Dictionary<string, Dictionary<string, ScheduleDirect.Station>> _channelPairingCache =
-            new Dictionary<string, Dictionary<string, ScheduleDirect.Station>>(StringComparer.OrdinalIgnoreCase);
-
         public SchedulesDirect(ILogger logger, IJsonSerializer jsonSerializer, IHttpClient httpClient, IApplicationHost appHost)
         {
             _logger = logger;
@@ -74,33 +69,29 @@ namespace Emby.Server.Implementations.LiveTv.Listings
             // Normalize incoming input
             channelId = channelId.Replace(".json.schedulesdirect.org", string.Empty, StringComparison.OrdinalIgnoreCase).TrimStart('I');
 
-            List<ProgramInfo> programsInfo = new List<ProgramInfo>();
-
             var token = await GetToken(info, cancellationToken).ConfigureAwait(false);
 
             if (string.IsNullOrEmpty(token))
             {
                 _logger.LogWarning("SchedulesDirect token is empty, returning empty program list");
-                return programsInfo;
+
+                return Enumerable.Empty<ProgramInfo>();
             }
 
             var dates = GetScheduleRequestDates(startDateUtc, endDateUtc);
 
-            string stationID = channelId;
-
-            _logger.LogInformation("Channel Station ID is: " + stationID);
-            List<ScheduleDirect.RequestScheduleForChannel> requestList =
-                new List<ScheduleDirect.RequestScheduleForChannel>()
+            _logger.LogInformation("Channel Station ID is: {ChannelID}", channelId);
+            var requestList = new List<ScheduleDirect.RequestScheduleForChannel>()
+                {
+                    new ScheduleDirect.RequestScheduleForChannel()
                     {
-                        new ScheduleDirect.RequestScheduleForChannel()
-                        {
-                            stationID = stationID,
-                            date = dates
-                        }
-                    };
+                        stationID = channelId,
+                        date = dates
+                    }
+                };
 
             var requestString = _jsonSerializer.SerializeToString(requestList);
-            _logger.LogDebug("Request string for schedules is: " + requestString);
+            _logger.LogDebug("Request string for schedules is: {RequestString}", requestString);
 
             var httpOptions = new HttpRequestOptions()
             {
@@ -109,18 +100,17 @@ namespace Emby.Server.Implementations.LiveTv.Listings
                 CancellationToken = cancellationToken,
                 // The data can be large so give it some extra time
                 TimeoutMs = 60000,
-                LogErrorResponseBody = true
+                LogErrorResponseBody = true,
+                RequestContent = requestString
             };
 
             httpOptions.RequestHeaders["token"] = token;
 
-            httpOptions.RequestContent = requestString;
             using (var response = await Post(httpOptions, true, info).ConfigureAwait(false))
+            using (StreamReader reader = new StreamReader(response.Content))
             {
-                StreamReader reader = new StreamReader(response.Content);
-                string responseString = reader.ReadToEnd();
-                var dailySchedules = _jsonSerializer.DeserializeFromString<List<ScheduleDirect.Day>>(responseString);
-                _logger.LogDebug("Found " + dailySchedules.Count + " programs on " + stationID + " ScheduleDirect");
+                var dailySchedules = await _jsonSerializer.DeserializeFromStreamAsync<List<ScheduleDirect.Day>>(response.Content).ConfigureAwait(false);
+                _logger.LogDebug("Found {ScheduleCount} programs on {ChannelID} ScheduleDirect", dailySchedules.Count, channelId);
 
                 httpOptions = new HttpRequestOptions()
                 {
@@ -134,22 +124,13 @@ namespace Emby.Server.Implementations.LiveTv.Listings
 
                 httpOptions.RequestHeaders["token"] = token;
 
-                List<string> programsID = new List<string>();
-                programsID = dailySchedules.SelectMany(d => d.programs.Select(s => s.programID)).Distinct().ToList();
-                var requestBody = "[\"" + string.Join("\", \"", programsID) + "\"]";
-                httpOptions.RequestContent = requestBody;
-
-                double wideAspect = 1.77777778;
-                var primaryImageCategory = "Logo";
+                var programsID = dailySchedules.SelectMany(d => d.programs.Select(s => s.programID)).Distinct();
+                httpOptions.RequestContent = "[\"" + string.Join("\", \"", programsID) + "\"]";
 
                 using (var innerResponse = await Post(httpOptions, true, info).ConfigureAwait(false))
+                using (StreamReader innerReader = new StreamReader(innerResponse.Content))
                 {
-                    StreamReader innerReader = new StreamReader(innerResponse.Content);
-                    responseString = innerReader.ReadToEnd();
-
-                    var programDetails =
-                        _jsonSerializer.DeserializeFromString<List<ScheduleDirect.ProgramDetails>>(
-                            responseString);
+                    var programDetails = await _jsonSerializer.DeserializeFromStreamAsync<List<ScheduleDirect.ProgramDetails>>(innerResponse.Content).ConfigureAwait(false);
                     var programDict = programDetails.ToDictionary(p => p.programID, y => y);
 
                     var programIdsWithImages =
@@ -158,8 +139,8 @@ namespace Emby.Server.Implementations.LiveTv.Listings
 
                     var images = await GetImageForPrograms(info, programIdsWithImages, cancellationToken).ConfigureAwait(false);
 
-                    var schedules = dailySchedules.SelectMany(d => d.programs);
-                    foreach (ScheduleDirect.Program schedule in schedules)
+                    List<ProgramInfo> programsInfo = new List<ProgramInfo>();
+                    foreach (ScheduleDirect.Program schedule in dailySchedules.SelectMany(d => d.programs))
                     {
                         //_logger.LogDebug("Proccesing Schedule for statio ID " + stationID +
                         //              " which corresponds to channel " + channelNumber + " and program id " +
@@ -173,15 +154,17 @@ namespace Emby.Server.Implementations.LiveTv.Listings
                             {
                                 var programEntry = programDict[schedule.programID];
 
-                                var allImages = (images[imageIndex].data ?? new List<ScheduleDirect.ImageData>()).ToList();
-                                var imagesWithText = allImages.Where(i => string.Equals(i.text, "yes", StringComparison.OrdinalIgnoreCase)).ToList();
-                                var imagesWithoutText = allImages.Where(i => string.Equals(i.text, "no", StringComparison.OrdinalIgnoreCase)).ToList();
+                                var allImages = images[imageIndex].data ?? new List<ScheduleDirect.ImageData>();
+                                var imagesWithText = allImages.Where(i => string.Equals(i.text, "yes", StringComparison.OrdinalIgnoreCase));
+                                var imagesWithoutText = allImages.Where(i => string.Equals(i.text, "no", StringComparison.OrdinalIgnoreCase));
 
-                                double desiredAspect = 0.666666667;
+                                const double desiredAspect = 0.666666667;
 
                                 programEntry.primaryImage = GetProgramImage(ApiUrl, imagesWithText, true, desiredAspect) ??
                                     GetProgramImage(ApiUrl, allImages, true, desiredAspect);
 
+                                const double wideAspect = 1.77777778;
+
                                 programEntry.thumbImage = GetProgramImage(ApiUrl, imagesWithText, true, wideAspect);
 
                                 // Don't supply the same image twice
@@ -201,18 +184,16 @@ namespace Emby.Server.Implementations.LiveTv.Listings
 
                         programsInfo.Add(GetProgram(channelId, schedule, programDict[schedule.programID]));
                     }
+                    return programsInfo;
                 }
             }
-
-            return programsInfo;
         }
 
         private int GetSizeOrder(ScheduleDirect.ImageData image)
         {
             if (!string.IsNullOrWhiteSpace(image.height))
             {
-                int value;
-                if (int.TryParse(image.height, out value))
+                if (int.TryParse(image.height, out int value))
                 {
                     return value;
                 }
@@ -233,9 +214,8 @@ namespace Emby.Server.Implementations.LiveTv.Listings
             {
                 channelNumber = map.atscMajor + "." + map.atscMinor;
             }
-            channelNumber = channelNumber.TrimStart('0');
 
-            return channelNumber;
+            return channelNumber.TrimStart('0');
         }
 
         private bool IsMovie(ScheduleDirect.ProgramDetails programInfo)
@@ -390,8 +370,7 @@ namespace Emby.Server.Implementations.LiveTv.Listings
 
             if (details.movie != null)
             {
-                int year;
-                if (!string.IsNullOrEmpty(details.movie.year) && int.TryParse(details.movie.year, out year))
+                if (!string.IsNullOrEmpty(details.movie.year) && int.TryParse(details.movie.year, out int year))
                 {
                     info.ProductionYear = year;
                 }
@@ -422,18 +401,12 @@ namespace Emby.Server.Implementations.LiveTv.Listings
             return date;
         }
 
-        private string GetProgramImage(string apiUrl, List<ScheduleDirect.ImageData> images, bool returnDefaultImage, double desiredAspect)
+        private string GetProgramImage(string apiUrl, IEnumerable<ScheduleDirect.ImageData> images, bool returnDefaultImage, double desiredAspect)
         {
-            string url = null;
-
-            var matches = images;
-
-            matches = matches
-                .OrderBy(i => Math.Abs(desiredAspect - GetApsectRatio(i)))
+            var match = images
+                .OrderBy(i => Math.Abs(desiredAspect - GetAspectRatio(i)))
                 .ThenByDescending(GetSizeOrder)
-                .ToList();
-
-            var match = matches.FirstOrDefault();
+                .FirstOrDefault();
 
             if (match == null)
             {
@@ -442,22 +415,21 @@ namespace Emby.Server.Implementations.LiveTv.Listings
 
             var uri = match.uri;
 
-            if (!string.IsNullOrWhiteSpace(uri))
+            if (string.IsNullOrWhiteSpace(uri))
             {
-                if (uri.IndexOf("http", StringComparison.OrdinalIgnoreCase) != -1)
-                {
-                    url = uri;
-                }
-                else
-                {
-                    url = apiUrl + "/image/" + uri;
-                }
+                return null;
+            }
+            else if (uri.IndexOf("http", StringComparison.OrdinalIgnoreCase) != -1)
+            {
+                return uri;
+            }
+            else
+            {
+                return apiUrl + "/image/" + uri;
             }
-            //_logger.LogDebug("URL for image is : " + url);
-            return url;
         }
 
-        private double GetApsectRatio(ScheduleDirect.ImageData i)
+        private double GetAspectRatio(ScheduleDirect.ImageData i)
         {
             int width = 0;
             int height = 0;
@@ -622,8 +594,7 @@ namespace Emby.Server.Implementations.LiveTv.Listings
 
             if (!string.IsNullOrEmpty(savedToken.Name) && !string.IsNullOrEmpty(savedToken.Value))
             {
-                long ticks;
-                if (long.TryParse(savedToken.Value, NumberStyles.Any, CultureInfo.InvariantCulture, out ticks))
+                if (long.TryParse(savedToken.Value, NumberStyles.Any, CultureInfo.InvariantCulture, out long ticks))
                 {
                     // If it's under 24 hours old we can still use it
                     if (DateTime.UtcNow.Ticks - ticks < TimeSpan.FromHours(20).Ticks)
@@ -693,8 +664,7 @@ namespace Emby.Server.Implementations.LiveTv.Listings
                 }
             }
 
-            var newToken = await GetToken(providerInfo, options.CancellationToken).ConfigureAwait(false);
-            options.RequestHeaders["token"] = newToken;
+            options.RequestHeaders["token"] = await GetToken(providerInfo, options.CancellationToken).ConfigureAwait(false);;
             return await Post(options, false, providerInfo).ConfigureAwait(false);
         }
 
@@ -732,8 +702,7 @@ namespace Emby.Server.Implementations.LiveTv.Listings
                 }
             }
 
-            var newToken = await GetToken(providerInfo, options.CancellationToken).ConfigureAwait(false);
-            options.RequestHeaders["token"] = newToken;
+            options.RequestHeaders["token"] = await GetToken(providerInfo, options.CancellationToken).ConfigureAwait(false);
             return await Get(options, false, providerInfo).ConfigureAwait(false);
         }
 
@@ -751,9 +720,9 @@ namespace Emby.Server.Implementations.LiveTv.Listings
             //_logger.LogInformation("Obtaining token from Schedules Direct from addres: " + httpOptions.Url + " with body " +
             // httpOptions.RequestContent);
 
-            using (var responce = await Post(httpOptions, false, null).ConfigureAwait(false))
+            using (var response = await Post(httpOptions, false, null).ConfigureAwait(false))
             {
-                var root = await _jsonSerializer.DeserializeFromStreamAsync<ScheduleDirect.Token>(responce.Content).ConfigureAwait(false);
+                var root = await _jsonSerializer.DeserializeFromStreamAsync<ScheduleDirect.Token>(response.Content).ConfigureAwait(false);
                 if (root.message == "OK")
                 {
                     _logger.LogInformation("Authenticated with Schedules Direct token: " + root.token);
@@ -836,13 +805,11 @@ namespace Emby.Server.Implementations.LiveTv.Listings
             try
             {
                 using (var httpResponse = await Get(options, false, null).ConfigureAwait(false))
+                using (var response = httpResponse.Content)
                 {
-                    using (var response = httpResponse.Content)
-                    {
-                        var root = await _jsonSerializer.DeserializeFromStreamAsync<ScheduleDirect.Lineups>(response).ConfigureAwait(false);
+                    var root = await _jsonSerializer.DeserializeFromStreamAsync<ScheduleDirect.Lineups>(response).ConfigureAwait(false);
 
-                        return root.lineups.Any(i => string.Equals(info.ListingsId, i.lineup, StringComparison.OrdinalIgnoreCase));
-                    }
+                    return root.lineups.Any(i => string.Equals(info.ListingsId, i.lineup, StringComparison.OrdinalIgnoreCase));
                 }
             }
             catch (HttpException ex)
@@ -921,54 +888,41 @@ namespace Emby.Server.Implementations.LiveTv.Listings
             var list = new List<ChannelInfo>();
 
             using (var httpResponse = await Get(httpOptions, true, info).ConfigureAwait(false))
+            using (var response = httpResponse.Content)
             {
-                using (var response = httpResponse.Content)
-                {
-                    var root = await _jsonSerializer.DeserializeFromStreamAsync<ScheduleDirect.Channel>(response).ConfigureAwait(false);
-                    _logger.LogInformation("Found " + root.map.Count + " channels on the lineup on ScheduleDirect");
-                    _logger.LogInformation("Mapping Stations to Channel");
-
-                    var allStations = root.stations ?? new List<ScheduleDirect.Station>();
+                var root = await _jsonSerializer.DeserializeFromStreamAsync<ScheduleDirect.Channel>(response).ConfigureAwait(false);
+                _logger.LogInformation("Found {ChannelCount} channels on the lineup on ScheduleDirect", root.map.Count);
+                _logger.LogInformation("Mapping Stations to Channel");
 
-                    foreach (ScheduleDirect.Map map in root.map)
-                    {
-                        var channelNumber = GetChannelNumber(map);
+                var allStations = root.stations ?? Enumerable.Empty<ScheduleDirect.Station>();
 
-                        var station = allStations.FirstOrDefault(item => string.Equals(item.stationID, map.stationID, StringComparison.OrdinalIgnoreCase));
-                        if (station == null)
-                        {
-                            station = new ScheduleDirect.Station
-                            {
-                                stationID = map.stationID
-                            };
-                        }
-
-                        var name = channelNumber;
+                foreach (ScheduleDirect.Map map in root.map)
+                {
+                    var channelNumber = GetChannelNumber(map);
 
-                        var channelInfo = new ChannelInfo
+                    var station = allStations.FirstOrDefault(item => string.Equals(item.stationID, map.stationID, StringComparison.OrdinalIgnoreCase));
+                    if (station == null)
+                    {
+                        station = new ScheduleDirect.Station
                         {
-                            Number = channelNumber,
-                            Name = name
+                            stationID = map.stationID
                         };
+                    }
 
-                        if (station != null)
-                        {
-                            if (!string.IsNullOrWhiteSpace(station.name))
-                            {
-                                channelInfo.Name = station.name;
-                            }
-
-                            channelInfo.Id = station.stationID;
-                            channelInfo.CallSign = station.callsign;
-
-                            if (station.logo != null)
-                            {
-                                channelInfo.ImageUrl = station.logo.URL;
-                            }
-                        }
+                    var channelInfo = new ChannelInfo
+                    {
+                        Id = station.stationID,
+                        CallSign = station.callsign,
+                        Number = channelNumber,
+                        Name = string.IsNullOrWhiteSpace(station.name) ? channelNumber : station.name
+                    };
 
-                        list.Add(channelInfo);
+                    if (station.logo != null)
+                    {
+                        channelInfo.ImageUrl = station.logo.URL;
                     }
+
+                    list.Add(channelInfo);
                 }
             }
 
diff --git a/Emby.Server.Implementations/LiveTv/LiveTvManager.cs b/Emby.Server.Implementations/LiveTv/LiveTvManager.cs
index ee2a9fe4b..b597a935a 100644
--- a/Emby.Server.Implementations/LiveTv/LiveTvManager.cs
+++ b/Emby.Server.Implementations/LiveTv/LiveTvManager.cs
@@ -22,7 +22,6 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using MediaBrowser.Model.IO;
-using MediaBrowser.Common.Events;
 using MediaBrowser.Common.Security;
 using MediaBrowser.Controller.Entities.Movies;
 using MediaBrowser.Controller.Entities.TV;
@@ -132,9 +131,7 @@ namespace Emby.Server.Implementations.LiveTv
             {
                 service.DataSourceChanged += service_DataSourceChanged;
 
-                var embyTv = service as EmbyTV.EmbyTV;
-
-                if (embyTv != null)
+                if (service is EmbyTV.EmbyTV embyTv)
                 {
                     embyTv.TimerCreated += EmbyTv_TimerCreated;
                     embyTv.TimerCancelled += EmbyTv_TimerCancelled;
@@ -146,13 +143,13 @@ namespace Emby.Server.Implementations.LiveTv
         {
             var timerId = e.Argument;
 
-            EventHelper.FireEventIfNotNull(TimerCancelled, this, new GenericEventArgs<TimerEventInfo>
+            TimerCancelled?.Invoke(this, new GenericEventArgs<TimerEventInfo>
             {
                 Argument = new TimerEventInfo
                 {
                     Id = timerId
                 }
-            }, _logger);
+            });
         }
 
         private void EmbyTv_TimerCreated(object sender, GenericEventArgs<TimerInfo> e)
@@ -160,14 +157,14 @@ namespace Emby.Server.Implementations.LiveTv
             var timer = e.Argument;
             var service = sender as ILiveTvService;
 
-            EventHelper.FireEventIfNotNull(TimerCreated, this, new GenericEventArgs<TimerEventInfo>
+            TimerCreated?.Invoke(this, new GenericEventArgs<TimerEventInfo>
             {
                 Argument = new TimerEventInfo
                 {
                     ProgramId = _tvDtoService.GetInternalProgramId(timer.ProgramId),
                     Id = timer.Id
                 }
-            }, _logger);
+            });
         }
 
         public ITunerHost[] TunerHosts
@@ -251,18 +248,15 @@ namespace Emby.Server.Implementations.LiveTv
                 mediaSourceId = null;
             }
 
-            MediaSourceInfo info;
-            bool isVideo;
-            ILiveTvService service;
-            ILiveStream liveStream;
-
             var channel = (LiveTvChannel)_libraryManager.GetItemById(id);
-            isVideo = channel.ChannelType == ChannelType.TV;
-            service = GetService(channel);
+
+            bool isVideo = channel.ChannelType == ChannelType.TV;
+            ILiveTvService service = GetService(channel);
             _logger.LogInformation("Opening channel stream from {0}, external channel Id: {1}", service.Name, channel.ExternalId);
 
-            var supportsManagedStream = service as ISupportsDirectStreamProvider;
-            if (supportsManagedStream != null)
+            MediaSourceInfo info;
+            ILiveStream liveStream;
+            if (service is ISupportsDirectStreamProvider supportsManagedStream)
             {
                 liveStream = await supportsManagedStream.GetChannelStreamWithDirectStreamProvider(channel.ExternalId, mediaSourceId, currentLiveStreams, cancellationToken).ConfigureAwait(false);
                 info = liveStream.MediaSource;
@@ -303,14 +297,12 @@ namespace Emby.Server.Implementations.LiveTv
                 throw new NotImplementedException();
             }
 
-            var list = sources.ToList();
-
-            foreach (var source in list)
+            foreach (var source in sources)
             {
                 Normalize(source, service, baseItem.ChannelType == ChannelType.TV);
             }
 
-            return list;
+            return sources;
         }
 
         private ILiveTvService GetService(LiveTvChannel item)
@@ -542,13 +534,11 @@ namespace Emby.Server.Implementations.LiveTv
         {
             var id = _tvDtoService.GetInternalProgramId(info.Id);
 
-            LiveTvProgram item = null;
-            allExistingPrograms.TryGetValue(id, out item);
-
             var isNew = false;
             var forceUpdate = false;
 
-            if (item == null)
+            LiveTvProgram item;
+            if (!allExistingPrograms.TryGetValue(id, out item))
             {
                 isNew = true;
                 item = new LiveTvProgram
@@ -783,11 +773,9 @@ namespace Emby.Server.Implementations.LiveTv
 
             var dto = _dtoService.GetBaseItemDto(program, new DtoOptions(), user);
 
-            var list = new List<Tuple<BaseItemDto, string, string>>();
-
-            var externalSeriesId = program.ExternalSeriesId;
-
-            list.Add(new Tuple<BaseItemDto, string, string>(dto, program.ExternalId, externalSeriesId));
+            var list = new List<Tuple<BaseItemDto, string, string>>() {
+                new Tuple<BaseItemDto, string, string>(dto, program.ExternalId, program.ExternalSeriesId)
+            };
 
             await AddRecordingInfo(list, cancellationToken).ConfigureAwait(false);
 
@@ -928,13 +916,11 @@ namespace Emby.Server.Implementations.LiveTv
                 programs = programs.Take(query.Limit.Value);
             }
 
-            var result = new QueryResult<BaseItem>
-            {
-                Items = programs.ToArray(),
-                TotalRecordCount = totalCount
-            };
-
-            return result;
+            return new QueryResult<BaseItem>
+                {
+                    Items = programs.ToArray(),
+                    TotalRecordCount = totalCount
+                };
         }
 
         public QueryResult<BaseItemDto> GetRecommendedPrograms(InternalItemsQuery query, DtoOptions options, CancellationToken cancellationToken)
@@ -948,17 +934,11 @@ namespace Emby.Server.Implementations.LiveTv
 
             var internalResult = GetRecommendedProgramsInternal(query, options, cancellationToken);
 
-            var user = query.User;
-
-            var returnArray = _dtoService.GetBaseItemDtos(internalResult.Items, options, user);
-
-            var result = new QueryResult<BaseItemDto>
-            {
-                Items = returnArray,
-                TotalRecordCount = internalResult.TotalRecordCount
-            };
-
-            return result;
+            return new QueryResult<BaseItemDto>
+                {
+                    Items = _dtoService.GetBaseItemDtos(internalResult.Items, options, query.User),
+                    TotalRecordCount = internalResult.TotalRecordCount
+                };
         }
 
         private int GetRecommendationScore(LiveTvProgram program, User user, bool factorChannelWatchCount)
@@ -977,28 +957,26 @@ namespace Emby.Server.Implementations.LiveTv
 
             var channel = _libraryManager.GetItemById(program.ChannelId);
 
-            if (channel != null)
+            if (channel == null)
             {
-                var channelUserdata = _userDataManager.GetUserData(user, channel);
+                return score;
+            }
 
-                if (channelUserdata.Likes ?? false)
-                {
-                    score += 2;
-                }
-                else if (!(channelUserdata.Likes ?? true))
-                {
-                    score -= 2;
-                }
+            var channelUserdata = _userDataManager.GetUserData(user, channel);
 
-                if (channelUserdata.IsFavorite)
-                {
-                    score += 3;
-                }
+            if (channelUserdata.Likes.HasValue)
+            {
+                score += channelUserdata.Likes.Value ? 2 : -2;
+            }
 
-                if (factorChannelWatchCount)
-                {
-                    score += channelUserdata.PlayCount;
-                }
+            if (channelUserdata.IsFavorite)
+            {
+                score += 3;
+            }
+
+            if (factorChannelWatchCount)
+            {
+                score += channelUserdata.PlayCount;
             }
 
             return score;
@@ -1153,7 +1131,6 @@ namespace Emby.Server.Implementations.LiveTv
 
             var numComplete = 0;
             var parentFolder = GetInternalLiveTvFolder(cancellationToken);
-            var parentFolderId = parentFolder.Id;
 
             foreach (var channelInfo in allChannelsList)
             {
@@ -1239,30 +1216,11 @@ namespace Emby.Server.Implementations.LiveTv
 
                         programs.Add(programItem.Id);
 
-                        if (program.IsMovie)
-                        {
-                            isMovie = true;
-                        }
-
-                        if (program.IsSeries)
-                        {
-                            iSSeries = true;
-                        }
-
-                        if (program.IsSports)
-                        {
-                            isSports = true;
-                        }
-
-                        if (program.IsNews)
-                        {
-                            isNews = true;
-                        }
-
-                        if (program.IsKids)
-                        {
-                            isKids = true;
-                        }
+                        isMovie |= program.IsMovie;
+                        iSSeries |= program.IsSeries;
+                        isSports |= program.IsSports;
+                        isNews |= program.IsNews;
+                        isKids |= program.IsKids;
                     }
 
                     _logger.LogDebug("Channel {0} has {1} new programs and {2} updated programs", currentChannel.Name, newPrograms.Count, updatedPrograms.Count);
@@ -1304,8 +1262,7 @@ namespace Emby.Server.Implementations.LiveTv
                 }
 
                 numComplete++;
-                double percent = numComplete;
-                percent /= allChannelsList.Count;
+                double percent = numComplete / allChannelsList.Count;
 
                 progress.Report(85 * percent + 15);
             }
@@ -1320,7 +1277,6 @@ namespace Emby.Server.Implementations.LiveTv
             {
                 IncludeItemTypes = validTypes,
                 DtoOptions = new DtoOptions(false)
-
             });
 
             var numComplete = 0;
@@ -1351,8 +1307,7 @@ namespace Emby.Server.Implementations.LiveTv
                 }
 
                 numComplete++;
-                double percent = numComplete;
-                percent /= list.Count;
+                double percent = numComplete / list.Count;
 
                 progress.Report(100 * percent);
             }
@@ -1414,28 +1369,22 @@ namespace Emby.Server.Implementations.LiveTv
                     excludeItemTypes.Add(typeof(Episode).Name);
                 }
             }
-            if (query.IsSports.HasValue)
+            if (query.IsSports ?? false)
             {
-                if (query.IsSports.Value)
-                {
-                    genres.Add("Sports");
-                }
+                genres.Add("Sports");
             }
-            if (query.IsKids.HasValue)
+            if (query.IsKids ?? false)
             {
-                if (query.IsKids.Value)
-                {
-                    genres.Add("Kids");
-                    genres.Add("Children");
-                    genres.Add("Family");
-                }
+                genres.Add("Kids");
+                genres.Add("Children");
+                genres.Add("Family");
             }
 
             var limit = query.Limit;
 
-            if ((query.IsInProgress ?? false))
+            if (query.IsInProgress ?? false)
             {
-                limit = (query.Limit ?? 10) * 2;
+                // limit = (query.Limit ?? 10) * 2;
                 limit = null;
 
                 //var allActivePaths = EmbyTV.EmbyTV.Current.GetAllActiveRecordings().Select(i => i.Path).ToArray();
@@ -1467,7 +1416,7 @@ namespace Emby.Server.Implementations.LiveTv
                 DtoOptions = dtoOptions
             });
 
-            if ((query.IsInProgress ?? false))
+            if (query.IsInProgress ?? false)
             {
                 result.Items = result
                     .Items
@@ -1494,60 +1443,33 @@ namespace Emby.Server.Implementations.LiveTv
 
                 dto.StartDate = program.StartDate;
                 dto.EpisodeTitle = program.EpisodeTitle;
-
-                if (program.IsRepeat)
-                {
-                    dto.IsRepeat = program.IsRepeat;
-                }
-                if (program.IsMovie)
-                {
-                    dto.IsMovie = program.IsMovie;
-                }
-                if (program.IsSeries)
-                {
-                    dto.IsSeries = program.IsSeries;
-                }
-                if (program.IsSports)
-                {
-                    dto.IsSports = program.IsSports;
-                }
-                if (program.IsLive)
-                {
-                    dto.IsLive = program.IsLive;
-                }
-                if (program.IsNews)
-                {
-                    dto.IsNews = program.IsNews;
-                }
-                if (program.IsKids)
-                {
-                    dto.IsKids = program.IsKids;
-                }
-                if (program.IsPremiere)
-                {
-                    dto.IsPremiere = program.IsPremiere;
-                }
+                dto.IsRepeat |= program.IsRepeat;
+                dto.IsMovie |= program.IsMovie;
+                dto.IsSeries |= program.IsSeries;
+                dto.IsSports |= program.IsSports;
+                dto.IsLive |= program.IsLive;
+                dto.IsNews |= program.IsNews;
+                dto.IsKids |= program.IsKids;
+                dto.IsPremiere |= program.IsPremiere;
 
                 if (hasChannelInfo || hasChannelImage)
                 {
-                    var channel = _libraryManager.GetItemById(program.ChannelId) as LiveTvChannel;
+                    var channel = _libraryManager.GetItemById(program.ChannelId);
 
-                    if (channel != null)
+                    if (channel is LiveTvChannel liveChannel)
                     {
-                        dto.ChannelName = channel.Name;
-                        dto.MediaType = channel.MediaType;
-                        dto.ChannelNumber = channel.Number;
+                        dto.ChannelName = liveChannel.Name;
+                        dto.MediaType = liveChannel.MediaType;
+                        dto.ChannelNumber = liveChannel.Number;
 
-                        if (hasChannelImage && channel.HasImage(ImageType.Primary))
+                        if (hasChannelImage && liveChannel.HasImage(ImageType.Primary))
                         {
-                            dto.ChannelPrimaryImageTag = _tvDtoService.GetImageTag(channel);
+                            dto.ChannelPrimaryImageTag = _tvDtoService.GetImageTag(liveChannel);
                         }
                     }
                 }
 
-                var externalSeriesId = program.ExternalSeriesId;
-
-                programTuples.Add(new Tuple<BaseItemDto, string, string>(dto, program.ExternalId, externalSeriesId));
+                programTuples.Add(new Tuple<BaseItemDto, string, string>(dto, program.ExternalId, program.ExternalSeriesId));
             }
 
             return AddRecordingInfo(programTuples, CancellationToken.None);
@@ -1811,13 +1733,13 @@ namespace Emby.Server.Implementations.LiveTv
 
             if (!(service is EmbyTV.EmbyTV))
             {
-                EventHelper.FireEventIfNotNull(TimerCancelled, this, new GenericEventArgs<TimerEventInfo>
+                TimerCancelled?.Invoke(this, new GenericEventArgs<TimerEventInfo>
                 {
                     Argument = new TimerEventInfo
                     {
                         Id = id
                     }
-                }, _logger);
+                });
             }
         }
 
@@ -1834,13 +1756,13 @@ namespace Emby.Server.Implementations.LiveTv
 
             await service.CancelSeriesTimerAsync(timer.ExternalId, CancellationToken.None).ConfigureAwait(false);
 
-            EventHelper.FireEventIfNotNull(SeriesTimerCancelled, this, new GenericEventArgs<TimerEventInfo>
+            SeriesTimerCancelled?.Invoke(this, new GenericEventArgs<TimerEventInfo>
             {
                 Argument = new TimerEventInfo
                 {
                     Id = id
                 }
-            }, _logger);
+            });
         }
 
         public async Task<TimerInfoDto> GetTimer(string id, CancellationToken cancellationToken)
@@ -2037,19 +1959,13 @@ namespace Emby.Server.Implementations.LiveTv
 
         private async Task<Tuple<SeriesTimerInfo, ILiveTvService>> GetNewTimerDefaultsInternal(CancellationToken cancellationToken, LiveTvProgram program = null)
         {
-            var service = program != null ?
-                GetService(program) :
-                null;
-
-            if (service == null)
-            {
-                service = _services.First();
-            }
-
+            ILiveTvService service = null;
             ProgramInfo programInfo = null;
 
-            if (program != null)
+            if(program != null)
             {
+                service = GetService(program);
+
                 var channel = _libraryManager.GetItemById(program.ChannelId);
 
                 programInfo = new ProgramInfo
@@ -2077,6 +1993,11 @@ namespace Emby.Server.Implementations.LiveTv
                     Name = program.Name,
                     OfficialRating = program.OfficialRating
                 };
+            } 
+
+            if (service == null)
+            {
+                service = _services.First();
             }
 
             var info = await service.GetNewTimerDefaultsAsync(cancellationToken, programInfo).ConfigureAwait(false);
@@ -2147,8 +2068,7 @@ namespace Emby.Server.Implementations.LiveTv
             info.Priority = defaultValues.Priority;
 
             string newTimerId = null;
-            var supportsNewTimerIds = service as ISupportsNewTimerIds;
-            if (supportsNewTimerIds != null)
+            if (service is ISupportsNewTimerIds supportsNewTimerIds)
             {
                 newTimerId = await supportsNewTimerIds.CreateTimer(info, cancellationToken).ConfigureAwait(false);
                 newTimerId = _tvDtoService.GetInternalTimerId(newTimerId);
@@ -2162,14 +2082,14 @@ namespace Emby.Server.Implementations.LiveTv
 
             if (!(service is EmbyTV.EmbyTV))
             {
-                EventHelper.FireEventIfNotNull(TimerCreated, this, new GenericEventArgs<TimerEventInfo>
+                TimerCreated?.Invoke(this, new GenericEventArgs<TimerEventInfo>
                 {
                     Argument = new TimerEventInfo
                     {
                         ProgramId = _tvDtoService.GetInternalProgramId(info.ProgramId),
                         Id = newTimerId
                     }
-                }, _logger);
+                });
             }
         }
 
@@ -2192,8 +2112,7 @@ namespace Emby.Server.Implementations.LiveTv
             info.Priority = defaultValues.Priority;
 
             string newTimerId = null;
-            var supportsNewTimerIds = service as ISupportsNewTimerIds;
-            if (supportsNewTimerIds != null)
+            if (service is ISupportsNewTimerIds supportsNewTimerIds)
             {
                 newTimerId = await supportsNewTimerIds.CreateSeriesTimer(info, cancellationToken).ConfigureAwait(false);
                 newTimerId = _tvDtoService.GetInternalSeriesTimerId(newTimerId).ToString("N");
@@ -2203,14 +2122,14 @@ namespace Emby.Server.Implementations.LiveTv
                 await service.CreateSeriesTimerAsync(info, cancellationToken).ConfigureAwait(false);
             }
 
-            EventHelper.FireEventIfNotNull(SeriesTimerCreated, this, new GenericEventArgs<TimerEventInfo>
+            SeriesTimerCreated?.Invoke(this, new GenericEventArgs<TimerEventInfo>
             {
                 Argument = new TimerEventInfo
                 {
                     ProgramId = _tvDtoService.GetInternalProgramId(info.ProgramId),
                     Id = newTimerId
                 }
-            }, _logger);
+            });
         }
 
         public async Task UpdateTimer(TimerInfoDto timer, CancellationToken cancellationToken)
@@ -2354,8 +2273,7 @@ namespace Emby.Server.Implementations.LiveTv
                 throw new ResourceNotFoundException();
             }
 
-            var configurable = provider as IConfigurableTunerHost;
-            if (configurable != null)
+            if (provider is IConfigurableTunerHost configurable)
             {
                 await configurable.Validate(info).ConfigureAwait(false);
             }