Ver código fonte

Merge pull request #6501 from crobibero/schedules-direct

Claus Vium 3 anos atrás
pai
commit
8fc4a48070
45 arquivos alterados com 534 adições e 245 exclusões
  1. 55 44
      Emby.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs
  2. 4 6
      Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/BroadcasterDto.cs
  3. 2 4
      Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/CaptionDto.cs
  4. 6 8
      Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/CastDto.cs
  5. 4 5
      Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/ChannelDto.cs
  6. 2 4
      Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/ContentRatingDto.cs
  7. 5 7
      Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/CrewDto.cs
  8. 4 13
      Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/DayDto.cs
  9. 2 4
      Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/Description1000Dto.cs
  10. 2 4
      Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/Description100Dto.cs
  11. 3 4
      Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/DescriptionsProgramDto.cs
  12. 1 3
      Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/EventDetailsDto.cs
  13. 0 2
      Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/GracenoteDto.cs
  14. 5 6
      Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/HeadendsDto.cs
  15. 10 12
      Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/ImageDataDto.cs
  16. 11 7
      Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/LineupDto.cs
  17. 4 5
      Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/LineupsDto.cs
  18. 2 4
      Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/LogoDto.cs
  19. 15 5
      Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/MapDto.cs
  20. 3 5
      Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/MetadataDto.cs
  21. 2 4
      Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/MetadataProgramsDto.cs
  22. 5 6
      Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/MetadataScheduleDto.cs
  23. 3 4
      Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/MovieDto.cs
  24. 0 2
      Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/MultipartDto.cs
  25. 24 25
      Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/ProgramDetailsDto.cs
  26. 10 11
      Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/ProgramDto.cs
  27. 5 7
      Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/QualityRatingDto.cs
  28. 2 4
      Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/RatingDto.cs
  29. 2 4
      Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/RecommendationDto.cs
  30. 3 4
      Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/RequestScheduleForChannelDto.cs
  31. 3 4
      Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/ShowImagesDto.cs
  32. 9 10
      Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/StationDto.cs
  33. 1 3
      Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/TitleDto.cs
  34. 16 5
      Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/TokenDto.cs
  35. 61 0
      src/Jellyfin.Extensions/ReadOnlyListExtension.cs
  36. 240 0
      tests/Jellyfin.Server.Implementations.Tests/LiveTv/SchedulesDirect/SchedulesDirectDeserializeTests.cs
  37. 1 0
      tests/Jellyfin.Server.Implementations.Tests/Test Data/SchedulesDirect/headends_response.json
  38. 1 0
      tests/Jellyfin.Server.Implementations.Tests/Test Data/SchedulesDirect/lineup_response.json
  39. 1 0
      tests/Jellyfin.Server.Implementations.Tests/Test Data/SchedulesDirect/lineups_response.json
  40. 1 0
      tests/Jellyfin.Server.Implementations.Tests/Test Data/SchedulesDirect/metadata_programs_response.json
  41. 0 0
      tests/Jellyfin.Server.Implementations.Tests/Test Data/SchedulesDirect/programs_response.json
  42. 1 0
      tests/Jellyfin.Server.Implementations.Tests/Test Data/SchedulesDirect/schedules_request.json
  43. 1 0
      tests/Jellyfin.Server.Implementations.Tests/Test Data/SchedulesDirect/schedules_response.json
  44. 1 0
      tests/Jellyfin.Server.Implementations.Tests/Test Data/SchedulesDirect/token_live_response.json
  45. 1 0
      tests/Jellyfin.Server.Implementations.Tests/Test Data/SchedulesDirect/token_offline_response.json

+ 55 - 44
Emby.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs

@@ -9,14 +9,15 @@ using System.Globalization;
 using System.Linq;
 using System.Linq;
 using System.Net;
 using System.Net;
 using System.Net.Http;
 using System.Net.Http;
+using System.Net.Http.Headers;
 using System.Net.Mime;
 using System.Net.Mime;
 using System.Text;
 using System.Text;
 using System.Text.Json;
 using System.Text.Json;
 using System.Threading;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Threading.Tasks;
 using Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos;
 using Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos;
+using Jellyfin.Extensions;
 using Jellyfin.Extensions.Json;
 using Jellyfin.Extensions.Json;
-using MediaBrowser.Common;
 using MediaBrowser.Common.Net;
 using MediaBrowser.Common.Net;
 using MediaBrowser.Controller.LiveTv;
 using MediaBrowser.Controller.LiveTv;
 using MediaBrowser.Model.Cryptography;
 using MediaBrowser.Model.Cryptography;
@@ -34,7 +35,6 @@ namespace Emby.Server.Implementations.LiveTv.Listings
         private readonly ILogger<SchedulesDirect> _logger;
         private readonly ILogger<SchedulesDirect> _logger;
         private readonly IHttpClientFactory _httpClientFactory;
         private readonly IHttpClientFactory _httpClientFactory;
         private readonly SemaphoreSlim _tokenSemaphore = new SemaphoreSlim(1, 1);
         private readonly SemaphoreSlim _tokenSemaphore = new SemaphoreSlim(1, 1);
-        private readonly IApplicationHost _appHost;
         private readonly ICryptoProvider _cryptoProvider;
         private readonly ICryptoProvider _cryptoProvider;
 
 
         private readonly ConcurrentDictionary<string, NameValuePair> _tokens = new ConcurrentDictionary<string, NameValuePair>();
         private readonly ConcurrentDictionary<string, NameValuePair> _tokens = new ConcurrentDictionary<string, NameValuePair>();
@@ -44,12 +44,10 @@ namespace Emby.Server.Implementations.LiveTv.Listings
         public SchedulesDirect(
         public SchedulesDirect(
             ILogger<SchedulesDirect> logger,
             ILogger<SchedulesDirect> logger,
             IHttpClientFactory httpClientFactory,
             IHttpClientFactory httpClientFactory,
-            IApplicationHost appHost,
             ICryptoProvider cryptoProvider)
             ICryptoProvider cryptoProvider)
         {
         {
             _logger = logger;
             _logger = logger;
             _httpClientFactory = httpClientFactory;
             _httpClientFactory = httpClientFactory;
-            _appHost = appHost;
             _cryptoProvider = cryptoProvider;
             _cryptoProvider = cryptoProvider;
         }
         }
 
 
@@ -114,18 +112,29 @@ namespace Emby.Server.Implementations.LiveTv.Listings
             options.Headers.TryAddWithoutValidation("token", token);
             options.Headers.TryAddWithoutValidation("token", token);
             using var response = await Send(options, true, info, cancellationToken).ConfigureAwait(false);
             using var response = await Send(options, true, info, cancellationToken).ConfigureAwait(false);
             await using var responseStream = await response.Content.ReadAsStreamAsync(cancellationToken).ConfigureAwait(false);
             await using var responseStream = await response.Content.ReadAsStreamAsync(cancellationToken).ConfigureAwait(false);
-            var dailySchedules = await JsonSerializer.DeserializeAsync<List<DayDto>>(responseStream, _jsonOptions, cancellationToken).ConfigureAwait(false);
+            var dailySchedules = await JsonSerializer.DeserializeAsync<IReadOnlyList<DayDto>>(responseStream, _jsonOptions, cancellationToken).ConfigureAwait(false);
+            if (dailySchedules == null)
+            {
+                return Array.Empty<ProgramInfo>();
+            }
+
             _logger.LogDebug("Found {ScheduleCount} programs on {ChannelID} ScheduleDirect", dailySchedules.Count, channelId);
             _logger.LogDebug("Found {ScheduleCount} programs on {ChannelID} ScheduleDirect", dailySchedules.Count, channelId);
 
 
             using var programRequestOptions = new HttpRequestMessage(HttpMethod.Post, ApiUrl + "/programs");
             using var programRequestOptions = new HttpRequestMessage(HttpMethod.Post, ApiUrl + "/programs");
             programRequestOptions.Headers.TryAddWithoutValidation("token", token);
             programRequestOptions.Headers.TryAddWithoutValidation("token", token);
 
 
-            var programsID = dailySchedules.SelectMany(d => d.Programs.Select(s => s.ProgramId)).Distinct();
-            programRequestOptions.Content = new StringContent("[\"" + string.Join("\", \"", programsID) + "\"]", Encoding.UTF8, MediaTypeNames.Application.Json);
+            var programIds = dailySchedules.SelectMany(d => d.Programs.Select(s => s.ProgramId)).Distinct();
+            programRequestOptions.Content = new ByteArrayContent(JsonSerializer.SerializeToUtf8Bytes(programIds, _jsonOptions));
+            programRequestOptions.Content.Headers.ContentType = MediaTypeHeaderValue.Parse(MediaTypeNames.Application.Json);
 
 
             using var innerResponse = await Send(programRequestOptions, true, info, cancellationToken).ConfigureAwait(false);
             using var innerResponse = await Send(programRequestOptions, true, info, cancellationToken).ConfigureAwait(false);
             await using var innerResponseStream = await innerResponse.Content.ReadAsStreamAsync(cancellationToken).ConfigureAwait(false);
             await using var innerResponseStream = await innerResponse.Content.ReadAsStreamAsync(cancellationToken).ConfigureAwait(false);
-            var programDetails = await JsonSerializer.DeserializeAsync<List<ProgramDetailsDto>>(innerResponseStream, _jsonOptions, cancellationToken).ConfigureAwait(false);
+            var programDetails = await JsonSerializer.DeserializeAsync<IReadOnlyList<ProgramDetailsDto>>(innerResponseStream, _jsonOptions, cancellationToken).ConfigureAwait(false);
+            if (programDetails == null)
+            {
+                return Array.Empty<ProgramInfo>();
+            }
+
             var programDict = programDetails.ToDictionary(p => p.ProgramId, y => y);
             var programDict = programDetails.ToDictionary(p => p.ProgramId, y => y);
 
 
             var programIdsWithImages = programDetails
             var programIdsWithImages = programDetails
@@ -142,6 +151,11 @@ namespace Emby.Server.Implementations.LiveTv.Listings
                 //              schedule.ProgramId + " which says it has images? " +
                 //              schedule.ProgramId + " which says it has images? " +
                 //              programDict[schedule.ProgramId].hasImageArtwork);
                 //              programDict[schedule.ProgramId].hasImageArtwork);
 
 
+                if (string.IsNullOrEmpty(schedule.ProgramId))
+                {
+                    continue;
+                }
+
                 if (images != null)
                 if (images != null)
                 {
                 {
                     var imageIndex = images.FindIndex(i => i.ProgramId == schedule.ProgramId[..10]);
                     var imageIndex = images.FindIndex(i => i.ProgramId == schedule.ProgramId[..10]);
@@ -149,7 +163,7 @@ namespace Emby.Server.Implementations.LiveTv.Listings
                     {
                     {
                         var programEntry = programDict[schedule.ProgramId];
                         var programEntry = programDict[schedule.ProgramId];
 
 
-                        var allImages = images[imageIndex].Data ?? new List<ImageDataDto>();
+                        var allImages = images[imageIndex].Data;
                         var imagesWithText = allImages.Where(i => string.Equals(i.Text, "yes", StringComparison.OrdinalIgnoreCase));
                         var imagesWithText = allImages.Where(i => string.Equals(i.Text, "yes", StringComparison.OrdinalIgnoreCase));
                         var imagesWithoutText = allImages.Where(i => string.Equals(i.Text, "no", StringComparison.OrdinalIgnoreCase));
                         var imagesWithoutText = allImages.Where(i => string.Equals(i.Text, "no", StringComparison.OrdinalIgnoreCase));
 
 
@@ -217,7 +231,12 @@ namespace Emby.Server.Implementations.LiveTv.Listings
 
 
         private ProgramInfo GetProgram(string channelId, ProgramDto programInfo, ProgramDetailsDto details)
         private ProgramInfo GetProgram(string channelId, ProgramDto programInfo, ProgramDetailsDto details)
         {
         {
-            var startAt = GetDate(programInfo.AirDateTime);
+            if (programInfo.AirDateTime == null)
+            {
+                return null;
+            }
+
+            var startAt = programInfo.AirDateTime.Value;
             var endAt = startAt.AddSeconds(programInfo.Duration);
             var endAt = startAt.AddSeconds(programInfo.Duration);
             var audioType = ProgramAudio.Stereo;
             var audioType = ProgramAudio.Stereo;
 
 
@@ -225,21 +244,21 @@ namespace Emby.Server.Implementations.LiveTv.Listings
 
 
             string newID = programId + "T" + startAt.Ticks + "C" + channelId;
             string newID = programId + "T" + startAt.Ticks + "C" + channelId;
 
 
-            if (programInfo.AudioProperties != null)
+            if (programInfo.AudioProperties.Count != 0)
             {
             {
-                if (programInfo.AudioProperties.Exists(item => string.Equals(item, "atmos", StringComparison.OrdinalIgnoreCase)))
+                if (programInfo.AudioProperties.Contains("atmos", StringComparer.OrdinalIgnoreCase))
                 {
                 {
                     audioType = ProgramAudio.Atmos;
                     audioType = ProgramAudio.Atmos;
                 }
                 }
-                else if (programInfo.AudioProperties.Exists(item => string.Equals(item, "dd 5.1", StringComparison.OrdinalIgnoreCase)))
+                else if (programInfo.AudioProperties.Contains("dd 5.1", StringComparer.OrdinalIgnoreCase))
                 {
                 {
                     audioType = ProgramAudio.DolbyDigital;
                     audioType = ProgramAudio.DolbyDigital;
                 }
                 }
-                else if (programInfo.AudioProperties.Exists(item => string.Equals(item, "dd", StringComparison.OrdinalIgnoreCase)))
+                else if (programInfo.AudioProperties.Contains("dd", StringComparer.OrdinalIgnoreCase))
                 {
                 {
                     audioType = ProgramAudio.DolbyDigital;
                     audioType = ProgramAudio.DolbyDigital;
                 }
                 }
-                else if (programInfo.AudioProperties.Exists(item => string.Equals(item, "stereo", StringComparison.OrdinalIgnoreCase)))
+                else if (programInfo.AudioProperties.Contains("stereo", StringComparer.OrdinalIgnoreCase))
                 {
                 {
                     audioType = ProgramAudio.Stereo;
                     audioType = ProgramAudio.Stereo;
                 }
                 }
@@ -355,9 +374,9 @@ namespace Emby.Server.Implementations.LiveTv.Listings
                 }
                 }
             }
             }
 
 
-            if (!string.IsNullOrWhiteSpace(details.OriginalAirDate))
+            if (details.OriginalAirDate != null)
             {
             {
-                info.OriginalAirDate = DateTime.Parse(details.OriginalAirDate, CultureInfo.InvariantCulture);
+                info.OriginalAirDate = details.OriginalAirDate;
                 info.ProductionYear = info.OriginalAirDate.Value.Year;
                 info.ProductionYear = info.OriginalAirDate.Value.Year;
             }
             }
 
 
@@ -384,18 +403,6 @@ namespace Emby.Server.Implementations.LiveTv.Listings
             return info;
             return info;
         }
         }
 
 
-        private static DateTime GetDate(string value)
-        {
-            var date = DateTime.ParseExact(value, "yyyy'-'MM'-'dd'T'HH':'mm':'ss'Z'", CultureInfo.InvariantCulture);
-
-            if (date.Kind != DateTimeKind.Utc)
-            {
-                date = DateTime.SpecifyKind(date, DateTimeKind.Utc);
-            }
-
-            return date;
-        }
-
         private string GetProgramImage(string apiUrl, IEnumerable<ImageDataDto> images, bool returnDefaultImage, double desiredAspect)
         private string GetProgramImage(string apiUrl, IEnumerable<ImageDataDto> images, bool returnDefaultImage, double desiredAspect)
         {
         {
             var match = images
             var match = images
@@ -449,14 +456,14 @@ namespace Emby.Server.Implementations.LiveTv.Listings
             return result;
             return result;
         }
         }
 
 
-        private async Task<List<ShowImagesDto>> GetImageForPrograms(
+        private async Task<IReadOnlyList<ShowImagesDto>> GetImageForPrograms(
             ListingsProviderInfo info,
             ListingsProviderInfo info,
             IReadOnlyList<string> programIds,
             IReadOnlyList<string> programIds,
             CancellationToken cancellationToken)
             CancellationToken cancellationToken)
         {
         {
             if (programIds.Count == 0)
             if (programIds.Count == 0)
             {
             {
-                return new List<ShowImagesDto>();
+                return Array.Empty<ShowImagesDto>();
             }
             }
 
 
             StringBuilder str = new StringBuilder("[", 1 + (programIds.Count * 13));
             StringBuilder str = new StringBuilder("[", 1 + (programIds.Count * 13));
@@ -480,13 +487,13 @@ namespace Emby.Server.Implementations.LiveTv.Listings
             {
             {
                 using var innerResponse2 = await Send(message, true, info, cancellationToken).ConfigureAwait(false);
                 using var innerResponse2 = await Send(message, true, info, cancellationToken).ConfigureAwait(false);
                 await using var response = await innerResponse2.Content.ReadAsStreamAsync(cancellationToken).ConfigureAwait(false);
                 await using var response = await innerResponse2.Content.ReadAsStreamAsync(cancellationToken).ConfigureAwait(false);
-                return await JsonSerializer.DeserializeAsync<List<ShowImagesDto>>(response, _jsonOptions, cancellationToken).ConfigureAwait(false);
+                return await JsonSerializer.DeserializeAsync<IReadOnlyList<ShowImagesDto>>(response, _jsonOptions, cancellationToken).ConfigureAwait(false);
             }
             }
             catch (Exception ex)
             catch (Exception ex)
             {
             {
                 _logger.LogError(ex, "Error getting image info from schedules direct");
                 _logger.LogError(ex, "Error getting image info from schedules direct");
 
 
-                return new List<ShowImagesDto>();
+                return Array.Empty<ShowImagesDto>();
             }
             }
         }
         }
 
 
@@ -509,7 +516,7 @@ namespace Emby.Server.Implementations.LiveTv.Listings
                 using var httpResponse = await Send(options, false, info, cancellationToken).ConfigureAwait(false);
                 using var httpResponse = await Send(options, false, info, cancellationToken).ConfigureAwait(false);
                 await using var response = await httpResponse.Content.ReadAsStreamAsync(cancellationToken).ConfigureAwait(false);
                 await using var response = await httpResponse.Content.ReadAsStreamAsync(cancellationToken).ConfigureAwait(false);
 
 
-                var root = await JsonSerializer.DeserializeAsync<List<HeadendsDto>>(response, _jsonOptions, cancellationToken).ConfigureAwait(false);
+                var root = await JsonSerializer.DeserializeAsync<IReadOnlyList<HeadendsDto>>(response, _jsonOptions, cancellationToken).ConfigureAwait(false);
 
 
                 if (root != null)
                 if (root != null)
                 {
                 {
@@ -520,7 +527,7 @@ namespace Emby.Server.Implementations.LiveTv.Listings
                             lineups.Add(new NameIdPair
                             lineups.Add(new NameIdPair
                             {
                             {
                                 Name = string.IsNullOrWhiteSpace(lineup.Name) ? lineup.Lineup : lineup.Name,
                                 Name = string.IsNullOrWhiteSpace(lineup.Name) ? lineup.Lineup : lineup.Name,
-                                Id = lineup.Uri[18..]
+                                Id = lineup.Uri?[18..]
                             });
                             });
                         }
                         }
                     }
                     }
@@ -651,7 +658,7 @@ namespace Emby.Server.Implementations.LiveTv.Listings
             response.EnsureSuccessStatusCode();
             response.EnsureSuccessStatusCode();
             await using var stream = await response.Content.ReadAsStreamAsync(cancellationToken).ConfigureAwait(false);
             await using var stream = await response.Content.ReadAsStreamAsync(cancellationToken).ConfigureAwait(false);
             var root = await JsonSerializer.DeserializeAsync<TokenDto>(stream, _jsonOptions, cancellationToken).ConfigureAwait(false);
             var root = await JsonSerializer.DeserializeAsync<TokenDto>(stream, _jsonOptions, cancellationToken).ConfigureAwait(false);
-            if (string.Equals(root.Message, "OK", StringComparison.Ordinal))
+            if (string.Equals(root?.Message, "OK", StringComparison.Ordinal))
             {
             {
                 _logger.LogInformation("Authenticated with Schedules Direct token: {Token}", root.Token);
                 _logger.LogInformation("Authenticated with Schedules Direct token: {Token}", root.Token);
                 return root.Token;
                 return root.Token;
@@ -708,12 +715,12 @@ namespace Emby.Server.Implementations.LiveTv.Listings
                 using var response = httpResponse.Content;
                 using var response = httpResponse.Content;
                 var root = await JsonSerializer.DeserializeAsync<LineupsDto>(stream, _jsonOptions, cancellationToken).ConfigureAwait(false);
                 var root = await JsonSerializer.DeserializeAsync<LineupsDto>(stream, _jsonOptions, cancellationToken).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)) ?? false;
             }
             }
             catch (HttpRequestException ex)
             catch (HttpRequestException ex)
             {
             {
                 // SchedulesDirect returns 400 if no lineups are configured.
                 // SchedulesDirect returns 400 if no lineups are configured.
-                if (ex.StatusCode.HasValue && ex.StatusCode.Value == HttpStatusCode.BadRequest)
+                if (ex.StatusCode is HttpStatusCode.BadRequest)
                 {
                 {
                     return false;
                     return false;
                 }
                 }
@@ -779,10 +786,15 @@ namespace Emby.Server.Implementations.LiveTv.Listings
             using var httpResponse = await Send(options, true, info, cancellationToken).ConfigureAwait(false);
             using var httpResponse = await Send(options, true, info, cancellationToken).ConfigureAwait(false);
             await using var stream = await httpResponse.Content.ReadAsStreamAsync(cancellationToken).ConfigureAwait(false);
             await using var stream = await httpResponse.Content.ReadAsStreamAsync(cancellationToken).ConfigureAwait(false);
             var root = await JsonSerializer.DeserializeAsync<ChannelDto>(stream, _jsonOptions, cancellationToken).ConfigureAwait(false);
             var root = await JsonSerializer.DeserializeAsync<ChannelDto>(stream, _jsonOptions, cancellationToken).ConfigureAwait(false);
+            if (root == null)
+            {
+                return new List<ChannelInfo>();
+            }
+
             _logger.LogInformation("Found {ChannelCount} channels on the lineup on ScheduleDirect", root.Map.Count);
             _logger.LogInformation("Found {ChannelCount} channels on the lineup on ScheduleDirect", root.Map.Count);
             _logger.LogInformation("Mapping Stations to Channel");
             _logger.LogInformation("Mapping Stations to Channel");
 
 
-            var allStations = root.Stations ?? new List<StationDto>();
+            var allStations = root.Stations;
 
 
             var map = root.Map;
             var map = root.Map;
             var list = new List<ChannelInfo>(map.Count);
             var list = new List<ChannelInfo>(map.Count);
@@ -790,11 +802,10 @@ namespace Emby.Server.Implementations.LiveTv.Listings
             {
             {
                 var channelNumber = GetChannelNumber(channel);
                 var channelNumber = GetChannelNumber(channel);
 
 
-                var station = allStations.Find(item => string.Equals(item.StationId, channel.StationId, StringComparison.OrdinalIgnoreCase))
-                    ?? new StationDto
-                    {
-                        StationId = channel.StationId
-                    };
+                var stationIndex = allStations.FindIndex(item => string.Equals(item.StationId, channel.StationId, StringComparison.OrdinalIgnoreCase));
+                var station = stationIndex == -1
+                    ? new StationDto { StationId = channel.StationId }
+                    : allStations[stationIndex];
 
 
                 var channelInfo = new ChannelInfo
                 var channelInfo = new ChannelInfo
                 {
                 {

+ 4 - 6
Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/BroadcasterDto.cs

@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.Text.Json.Serialization;
 using System.Text.Json.Serialization;
 
 
 namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
 namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
@@ -13,24 +11,24 @@ namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
         /// Gets or sets the city.
         /// Gets or sets the city.
         /// </summary>
         /// </summary>
         [JsonPropertyName("city")]
         [JsonPropertyName("city")]
-        public string City { get; set; }
+        public string? City { get; set; }
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the state.
         /// Gets or sets the state.
         /// </summary>
         /// </summary>
         [JsonPropertyName("state")]
         [JsonPropertyName("state")]
-        public string State { get; set; }
+        public string? State { get; set; }
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the postal code.
         /// Gets or sets the postal code.
         /// </summary>
         /// </summary>
         [JsonPropertyName("postalCode")]
         [JsonPropertyName("postalCode")]
-        public string Postalcode { get; set; }
+        public string? Postalcode { get; set; }
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the country.
         /// Gets or sets the country.
         /// </summary>
         /// </summary>
         [JsonPropertyName("country")]
         [JsonPropertyName("country")]
-        public string Country { get; set; }
+        public string? Country { get; set; }
     }
     }
 }
 }

+ 2 - 4
Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/CaptionDto.cs

@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.Text.Json.Serialization;
 using System.Text.Json.Serialization;
 
 
 namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
 namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
@@ -13,12 +11,12 @@ namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
         /// Gets or sets the content.
         /// Gets or sets the content.
         /// </summary>
         /// </summary>
         [JsonPropertyName("content")]
         [JsonPropertyName("content")]
-        public string Content { get; set; }
+        public string? Content { get; set; }
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the lang.
         /// Gets or sets the lang.
         /// </summary>
         /// </summary>
         [JsonPropertyName("lang")]
         [JsonPropertyName("lang")]
-        public string Lang { get; set; }
+        public string? Lang { get; set; }
     }
     }
 }
 }

+ 6 - 8
Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/CastDto.cs

@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.Text.Json.Serialization;
 using System.Text.Json.Serialization;
 
 
 namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
 namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
@@ -13,36 +11,36 @@ namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
         /// Gets or sets the billing order.
         /// Gets or sets the billing order.
         /// </summary>
         /// </summary>
         [JsonPropertyName("billingOrder")]
         [JsonPropertyName("billingOrder")]
-        public string BillingOrder { get; set; }
+        public string? BillingOrder { get; set; }
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the role.
         /// Gets or sets the role.
         /// </summary>
         /// </summary>
         [JsonPropertyName("role")]
         [JsonPropertyName("role")]
-        public string Role { get; set; }
+        public string? Role { get; set; }
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the name id.
         /// Gets or sets the name id.
         /// </summary>
         /// </summary>
         [JsonPropertyName("nameId")]
         [JsonPropertyName("nameId")]
-        public string NameId { get; set; }
+        public string? NameId { get; set; }
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the person id.
         /// Gets or sets the person id.
         /// </summary>
         /// </summary>
         [JsonPropertyName("personId")]
         [JsonPropertyName("personId")]
-        public string PersonId { get; set; }
+        public string? PersonId { get; set; }
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the name.
         /// Gets or sets the name.
         /// </summary>
         /// </summary>
         [JsonPropertyName("name")]
         [JsonPropertyName("name")]
-        public string Name { get; set; }
+        public string? Name { get; set; }
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the character name.
         /// Gets or sets the character name.
         /// </summary>
         /// </summary>
         [JsonPropertyName("characterName")]
         [JsonPropertyName("characterName")]
-        public string CharacterName { get; set; }
+        public string? CharacterName { get; set; }
     }
     }
 }
 }

+ 4 - 5
Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/ChannelDto.cs

@@ -1,5 +1,4 @@
-#nullable disable
-
+using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 using System.Text.Json.Serialization;
 
 
@@ -14,18 +13,18 @@ namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
         /// Gets or sets the list of maps.
         /// Gets or sets the list of maps.
         /// </summary>
         /// </summary>
         [JsonPropertyName("map")]
         [JsonPropertyName("map")]
-        public List<MapDto> Map { get; set; }
+        public IReadOnlyList<MapDto> Map { get; set; } = Array.Empty<MapDto>();
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the list of stations.
         /// Gets or sets the list of stations.
         /// </summary>
         /// </summary>
         [JsonPropertyName("stations")]
         [JsonPropertyName("stations")]
-        public List<StationDto> Stations { get; set; }
+        public IReadOnlyList<StationDto> Stations { get; set; } = Array.Empty<StationDto>();
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the metadata.
         /// Gets or sets the metadata.
         /// </summary>
         /// </summary>
         [JsonPropertyName("metadata")]
         [JsonPropertyName("metadata")]
-        public MetadataDto Metadata { get; set; }
+        public MetadataDto? Metadata { get; set; }
     }
     }
 }
 }

+ 2 - 4
Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/ContentRatingDto.cs

@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.Text.Json.Serialization;
 using System.Text.Json.Serialization;
 
 
 namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
 namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
@@ -13,12 +11,12 @@ namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
         /// Gets or sets the body.
         /// Gets or sets the body.
         /// </summary>
         /// </summary>
         [JsonPropertyName("body")]
         [JsonPropertyName("body")]
-        public string Body { get; set; }
+        public string? Body { get; set; }
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the code.
         /// Gets or sets the code.
         /// </summary>
         /// </summary>
         [JsonPropertyName("code")]
         [JsonPropertyName("code")]
-        public string Code { get; set; }
+        public string? Code { get; set; }
     }
     }
 }
 }

+ 5 - 7
Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/CrewDto.cs

@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.Text.Json.Serialization;
 using System.Text.Json.Serialization;
 
 
 namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
 namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
@@ -13,30 +11,30 @@ namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
         /// Gets or sets the billing order.
         /// Gets or sets the billing order.
         /// </summary>
         /// </summary>
         [JsonPropertyName("billingOrder")]
         [JsonPropertyName("billingOrder")]
-        public string BillingOrder { get; set; }
+        public string? BillingOrder { get; set; }
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the role.
         /// Gets or sets the role.
         /// </summary>
         /// </summary>
         [JsonPropertyName("role")]
         [JsonPropertyName("role")]
-        public string Role { get; set; }
+        public string? Role { get; set; }
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the name id.
         /// Gets or sets the name id.
         /// </summary>
         /// </summary>
         [JsonPropertyName("nameId")]
         [JsonPropertyName("nameId")]
-        public string NameId { get; set; }
+        public string? NameId { get; set; }
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the person id.
         /// Gets or sets the person id.
         /// </summary>
         /// </summary>
         [JsonPropertyName("personId")]
         [JsonPropertyName("personId")]
-        public string PersonId { get; set; }
+        public string? PersonId { get; set; }
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the name.
         /// Gets or sets the name.
         /// </summary>
         /// </summary>
         [JsonPropertyName("name")]
         [JsonPropertyName("name")]
-        public string Name { get; set; }
+        public string? Name { get; set; }
     }
     }
 }
 }

+ 4 - 13
Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/DayDto.cs

@@ -1,5 +1,4 @@
-#nullable disable
-
+using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 using System.Text.Json.Serialization;
 
 
@@ -10,30 +9,22 @@ namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
     /// </summary>
     /// </summary>
     public class DayDto
     public class DayDto
     {
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DayDto"/> class.
-        /// </summary>
-        public DayDto()
-        {
-            Programs = new List<ProgramDto>();
-        }
-
         /// <summary>
         /// <summary>
         /// Gets or sets the station id.
         /// Gets or sets the station id.
         /// </summary>
         /// </summary>
         [JsonPropertyName("stationID")]
         [JsonPropertyName("stationID")]
-        public string StationId { get; set; }
+        public string? StationId { get; set; }
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the list of programs.
         /// Gets or sets the list of programs.
         /// </summary>
         /// </summary>
         [JsonPropertyName("programs")]
         [JsonPropertyName("programs")]
-        public List<ProgramDto> Programs { get; set; }
+        public IReadOnlyList<ProgramDto> Programs { get; set; } = Array.Empty<ProgramDto>();
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the metadata schedule.
         /// Gets or sets the metadata schedule.
         /// </summary>
         /// </summary>
         [JsonPropertyName("metadata")]
         [JsonPropertyName("metadata")]
-        public MetadataScheduleDto Metadata { get; set; }
+        public MetadataScheduleDto? Metadata { get; set; }
     }
     }
 }
 }

+ 2 - 4
Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/Description1000Dto.cs

@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.Text.Json.Serialization;
 using System.Text.Json.Serialization;
 
 
 namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
 namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
@@ -13,12 +11,12 @@ namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
         /// Gets or sets the description language.
         /// Gets or sets the description language.
         /// </summary>
         /// </summary>
         [JsonPropertyName("descriptionLanguage")]
         [JsonPropertyName("descriptionLanguage")]
-        public string DescriptionLanguage { get; set; }
+        public string? DescriptionLanguage { get; set; }
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the description.
         /// Gets or sets the description.
         /// </summary>
         /// </summary>
         [JsonPropertyName("description")]
         [JsonPropertyName("description")]
-        public string Description { get; set; }
+        public string? Description { get; set; }
     }
     }
 }
 }

+ 2 - 4
Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/Description100Dto.cs

@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.Text.Json.Serialization;
 using System.Text.Json.Serialization;
 
 
 namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
 namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
@@ -13,12 +11,12 @@ namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
         /// Gets or sets the description language.
         /// Gets or sets the description language.
         /// </summary>
         /// </summary>
         [JsonPropertyName("descriptionLanguage")]
         [JsonPropertyName("descriptionLanguage")]
-        public string DescriptionLanguage { get; set; }
+        public string? DescriptionLanguage { get; set; }
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the description.
         /// Gets or sets the description.
         /// </summary>
         /// </summary>
         [JsonPropertyName("description")]
         [JsonPropertyName("description")]
-        public string Description { get; set; }
+        public string? Description { get; set; }
     }
     }
 }
 }

+ 3 - 4
Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/DescriptionsProgramDto.cs

@@ -1,5 +1,4 @@
-#nullable disable
-
+using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 using System.Text.Json.Serialization;
 
 
@@ -14,12 +13,12 @@ namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
         /// Gets or sets the list of description 100.
         /// Gets or sets the list of description 100.
         /// </summary>
         /// </summary>
         [JsonPropertyName("description100")]
         [JsonPropertyName("description100")]
-        public List<Description100Dto> Description100 { get; set; }
+        public IReadOnlyList<Description100Dto> Description100 { get; set; } = Array.Empty<Description100Dto>();
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the list of description1000.
         /// Gets or sets the list of description1000.
         /// </summary>
         /// </summary>
         [JsonPropertyName("description1000")]
         [JsonPropertyName("description1000")]
-        public List<Description1000Dto> Description1000 { get; set; }
+        public IReadOnlyList<Description1000Dto> Description1000 { get; set; } = Array.Empty<Description1000Dto>();
     }
     }
 }
 }

+ 1 - 3
Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/EventDetailsDto.cs

@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.Text.Json.Serialization;
 using System.Text.Json.Serialization;
 
 
 namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
 namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
@@ -13,6 +11,6 @@ namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
         /// Gets or sets the sub type.
         /// Gets or sets the sub type.
         /// </summary>
         /// </summary>
         [JsonPropertyName("subType")]
         [JsonPropertyName("subType")]
-        public string SubType { get; set; }
+        public string? SubType { get; set; }
     }
     }
 }
 }

+ 0 - 2
Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/GracenoteDto.cs

@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.Text.Json.Serialization;
 using System.Text.Json.Serialization;
 
 
 namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
 namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos

+ 5 - 6
Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/HeadendsDto.cs

@@ -1,5 +1,4 @@
-#nullable disable
-
+using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 using System.Text.Json.Serialization;
 
 
@@ -14,24 +13,24 @@ namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
         /// Gets or sets the headend.
         /// Gets or sets the headend.
         /// </summary>
         /// </summary>
         [JsonPropertyName("headend")]
         [JsonPropertyName("headend")]
-        public string Headend { get; set; }
+        public string? Headend { get; set; }
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the transport.
         /// Gets or sets the transport.
         /// </summary>
         /// </summary>
         [JsonPropertyName("transport")]
         [JsonPropertyName("transport")]
-        public string Transport { get; set; }
+        public string? Transport { get; set; }
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the location.
         /// Gets or sets the location.
         /// </summary>
         /// </summary>
         [JsonPropertyName("location")]
         [JsonPropertyName("location")]
-        public string Location { get; set; }
+        public string? Location { get; set; }
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the list of lineups.
         /// Gets or sets the list of lineups.
         /// </summary>
         /// </summary>
         [JsonPropertyName("lineups")]
         [JsonPropertyName("lineups")]
-        public List<LineupDto> Lineups { get; set; }
+        public IReadOnlyList<LineupDto> Lineups { get; set; } = Array.Empty<LineupDto>();
     }
     }
 }
 }

+ 10 - 12
Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/ImageDataDto.cs

@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.Text.Json.Serialization;
 using System.Text.Json.Serialization;
 
 
 namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
 namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
@@ -13,60 +11,60 @@ namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
         /// Gets or sets the width.
         /// Gets or sets the width.
         /// </summary>
         /// </summary>
         [JsonPropertyName("width")]
         [JsonPropertyName("width")]
-        public string Width { get; set; }
+        public string? Width { get; set; }
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the height.
         /// Gets or sets the height.
         /// </summary>
         /// </summary>
         [JsonPropertyName("height")]
         [JsonPropertyName("height")]
-        public string Height { get; set; }
+        public string? Height { get; set; }
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the uri.
         /// Gets or sets the uri.
         /// </summary>
         /// </summary>
         [JsonPropertyName("uri")]
         [JsonPropertyName("uri")]
-        public string Uri { get; set; }
+        public string? Uri { get; set; }
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the size.
         /// Gets or sets the size.
         /// </summary>
         /// </summary>
         [JsonPropertyName("size")]
         [JsonPropertyName("size")]
-        public string Size { get; set; }
+        public string? Size { get; set; }
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the aspect.
         /// Gets or sets the aspect.
         /// </summary>
         /// </summary>
         [JsonPropertyName("aspect")]
         [JsonPropertyName("aspect")]
-        public string Aspect { get; set; }
+        public string? Aspect { get; set; }
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the category.
         /// Gets or sets the category.
         /// </summary>
         /// </summary>
         [JsonPropertyName("category")]
         [JsonPropertyName("category")]
-        public string Category { get; set; }
+        public string? Category { get; set; }
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the text.
         /// Gets or sets the text.
         /// </summary>
         /// </summary>
         [JsonPropertyName("text")]
         [JsonPropertyName("text")]
-        public string Text { get; set; }
+        public string? Text { get; set; }
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the primary.
         /// Gets or sets the primary.
         /// </summary>
         /// </summary>
         [JsonPropertyName("primary")]
         [JsonPropertyName("primary")]
-        public string Primary { get; set; }
+        public string? Primary { get; set; }
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the tier.
         /// Gets or sets the tier.
         /// </summary>
         /// </summary>
         [JsonPropertyName("tier")]
         [JsonPropertyName("tier")]
-        public string Tier { get; set; }
+        public string? Tier { get; set; }
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the caption.
         /// Gets or sets the caption.
         /// </summary>
         /// </summary>
         [JsonPropertyName("caption")]
         [JsonPropertyName("caption")]
-        public CaptionDto Caption { get; set; }
+        public CaptionDto? Caption { get; set; }
     }
     }
 }
 }

+ 11 - 7
Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/LineupDto.cs

@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.Text.Json.Serialization;
 using System.Text.Json.Serialization;
 
 
 namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
 namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
@@ -13,30 +11,36 @@ namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
         /// Gets or sets the linup.
         /// Gets or sets the linup.
         /// </summary>
         /// </summary>
         [JsonPropertyName("lineup")]
         [JsonPropertyName("lineup")]
-        public string Lineup { get; set; }
+        public string? Lineup { get; set; }
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the lineup name.
         /// Gets or sets the lineup name.
         /// </summary>
         /// </summary>
         [JsonPropertyName("name")]
         [JsonPropertyName("name")]
-        public string Name { get; set; }
+        public string? Name { get; set; }
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the transport.
         /// Gets or sets the transport.
         /// </summary>
         /// </summary>
         [JsonPropertyName("transport")]
         [JsonPropertyName("transport")]
-        public string Transport { get; set; }
+        public string? Transport { get; set; }
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the location.
         /// Gets or sets the location.
         /// </summary>
         /// </summary>
         [JsonPropertyName("location")]
         [JsonPropertyName("location")]
-        public string Location { get; set; }
+        public string? Location { get; set; }
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the uri.
         /// Gets or sets the uri.
         /// </summary>
         /// </summary>
         [JsonPropertyName("uri")]
         [JsonPropertyName("uri")]
-        public string Uri { get; set; }
+        public string? Uri { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether this lineup was deleted.
+        /// </summary>
+        [JsonPropertyName("isDeleted")]
+        public bool? IsDeleted { get; set; }
     }
     }
 }
 }

+ 4 - 5
Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/LineupsDto.cs

@@ -1,5 +1,4 @@
-#nullable disable
-
+using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 using System.Text.Json.Serialization;
 
 
@@ -20,18 +19,18 @@ namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
         /// Gets or sets the server id.
         /// Gets or sets the server id.
         /// </summary>
         /// </summary>
         [JsonPropertyName("serverID")]
         [JsonPropertyName("serverID")]
-        public string ServerId { get; set; }
+        public string? ServerId { get; set; }
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the datetime.
         /// Gets or sets the datetime.
         /// </summary>
         /// </summary>
         [JsonPropertyName("datetime")]
         [JsonPropertyName("datetime")]
-        public string Datetime { get; set; }
+        public DateTime? LineupTimestamp { get; set; }
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the list of lineups.
         /// Gets or sets the list of lineups.
         /// </summary>
         /// </summary>
         [JsonPropertyName("lineups")]
         [JsonPropertyName("lineups")]
-        public List<LineupDto> Lineups { get; set; }
+        public IReadOnlyList<LineupDto> Lineups { get; set; } = Array.Empty<LineupDto>();
     }
     }
 }
 }

+ 2 - 4
Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/LogoDto.cs

@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.Text.Json.Serialization;
 using System.Text.Json.Serialization;
 
 
 namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
 namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
@@ -13,7 +11,7 @@ namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
         /// Gets or sets the url.
         /// Gets or sets the url.
         /// </summary>
         /// </summary>
         [JsonPropertyName("URL")]
         [JsonPropertyName("URL")]
-        public string Url { get; set; }
+        public string? Url { get; set; }
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the height.
         /// Gets or sets the height.
@@ -31,6 +29,6 @@ namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
         /// Gets or sets the md5.
         /// Gets or sets the md5.
         /// </summary>
         /// </summary>
         [JsonPropertyName("md5")]
         [JsonPropertyName("md5")]
-        public string Md5 { get; set; }
+        public string? Md5 { get; set; }
     }
     }
 }
 }

+ 15 - 5
Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/MapDto.cs

@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.Text.Json.Serialization;
 using System.Text.Json.Serialization;
 
 
 namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
 namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
@@ -13,19 +11,25 @@ namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
         /// Gets or sets the station id.
         /// Gets or sets the station id.
         /// </summary>
         /// </summary>
         [JsonPropertyName("stationID")]
         [JsonPropertyName("stationID")]
-        public string StationId { get; set; }
+        public string? StationId { get; set; }
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the channel.
         /// Gets or sets the channel.
         /// </summary>
         /// </summary>
         [JsonPropertyName("channel")]
         [JsonPropertyName("channel")]
-        public string Channel { get; set; }
+        public string? Channel { get; set; }
+
+        /// <summary>
+        /// Gets or sets the provider callsign.
+        /// </summary>
+        [JsonPropertyName("providerCallsign")]
+        public string? ProvderCallsign { get; set; }
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the logical channel number.
         /// Gets or sets the logical channel number.
         /// </summary>
         /// </summary>
         [JsonPropertyName("logicalChannelNumber")]
         [JsonPropertyName("logicalChannelNumber")]
-        public string LogicalChannelNumber { get; set; }
+        public string? LogicalChannelNumber { get; set; }
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the uhfvhf.
         /// Gets or sets the uhfvhf.
@@ -44,5 +48,11 @@ namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
         /// </summary>
         /// </summary>
         [JsonPropertyName("atscMinor")]
         [JsonPropertyName("atscMinor")]
         public int AtscMinor { get; set; }
         public int AtscMinor { get; set; }
+
+        /// <summary>
+        /// Gets or sets the match type.
+        /// </summary>
+        [JsonPropertyName("matchType")]
+        public string? MatchType { get; set; }
     }
     }
 }
 }

+ 3 - 5
Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/MetadataDto.cs

@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.Text.Json.Serialization;
 using System.Text.Json.Serialization;
 
 
 namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
 namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
@@ -13,18 +11,18 @@ namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
         /// Gets or sets the linup.
         /// Gets or sets the linup.
         /// </summary>
         /// </summary>
         [JsonPropertyName("lineup")]
         [JsonPropertyName("lineup")]
-        public string Lineup { get; set; }
+        public string? Lineup { get; set; }
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the modified timestamp.
         /// Gets or sets the modified timestamp.
         /// </summary>
         /// </summary>
         [JsonPropertyName("modified")]
         [JsonPropertyName("modified")]
-        public string Modified { get; set; }
+        public string? Modified { get; set; }
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the transport.
         /// Gets or sets the transport.
         /// </summary>
         /// </summary>
         [JsonPropertyName("transport")]
         [JsonPropertyName("transport")]
-        public string Transport { get; set; }
+        public string? Transport { get; set; }
     }
     }
 }
 }

+ 2 - 4
Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/MetadataProgramsDto.cs

@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.Text.Json.Serialization;
 using System.Text.Json.Serialization;
 
 
 namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
 namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
@@ -12,7 +10,7 @@ namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
         /// <summary>
         /// <summary>
         /// Gets or sets the gracenote object.
         /// Gets or sets the gracenote object.
         /// </summary>
         /// </summary>
-        [JsonPropertyName("gracenote")]
-        public GracenoteDto Gracenote { get; set; }
+        [JsonPropertyName("Gracenote")]
+        public GracenoteDto? Gracenote { get; set; }
     }
     }
 }
 }

+ 5 - 6
Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/MetadataScheduleDto.cs

@@ -1,5 +1,4 @@
-#nullable disable
-
+using System;
 using System.Text.Json.Serialization;
 using System.Text.Json.Serialization;
 
 
 namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
 namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
@@ -13,25 +12,25 @@ namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
         /// Gets or sets the modified timestamp.
         /// Gets or sets the modified timestamp.
         /// </summary>
         /// </summary>
         [JsonPropertyName("modified")]
         [JsonPropertyName("modified")]
-        public string Modified { get; set; }
+        public string? Modified { get; set; }
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the md5.
         /// Gets or sets the md5.
         /// </summary>
         /// </summary>
         [JsonPropertyName("md5")]
         [JsonPropertyName("md5")]
-        public string Md5 { get; set; }
+        public string? Md5 { get; set; }
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the start date.
         /// Gets or sets the start date.
         /// </summary>
         /// </summary>
         [JsonPropertyName("startDate")]
         [JsonPropertyName("startDate")]
-        public string StartDate { get; set; }
+        public DateTime? StartDate { get; set; }
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the end date.
         /// Gets or sets the end date.
         /// </summary>
         /// </summary>
         [JsonPropertyName("endDate")]
         [JsonPropertyName("endDate")]
-        public string EndDate { get; set; }
+        public DateTime? EndDate { get; set; }
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the days count.
         /// Gets or sets the days count.

+ 3 - 4
Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/MovieDto.cs

@@ -1,5 +1,4 @@
-#nullable disable
-
+using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 using System.Text.Json.Serialization;
 
 
@@ -14,7 +13,7 @@ namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
         /// Gets or sets the year.
         /// Gets or sets the year.
         /// </summary>
         /// </summary>
         [JsonPropertyName("year")]
         [JsonPropertyName("year")]
-        public string Year { get; set; }
+        public string? Year { get; set; }
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the duration.
         /// Gets or sets the duration.
@@ -26,6 +25,6 @@ namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
         /// Gets or sets the list of quality rating.
         /// Gets or sets the list of quality rating.
         /// </summary>
         /// </summary>
         [JsonPropertyName("qualityRating")]
         [JsonPropertyName("qualityRating")]
-        public List<QualityRatingDto> QualityRating { get; set; }
+        public IReadOnlyList<QualityRatingDto> QualityRating { get; set; } = Array.Empty<QualityRatingDto>();
     }
     }
 }
 }

+ 0 - 2
Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/MultipartDto.cs

@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.Text.Json.Serialization;
 using System.Text.Json.Serialization;
 
 
 namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
 namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos

+ 24 - 25
Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/ProgramDetailsDto.cs

@@ -1,5 +1,4 @@
-#nullable disable
-
+using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 using System.Text.Json.Serialization;
 
 
@@ -14,85 +13,85 @@ namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
         /// Gets or sets the audience.
         /// Gets or sets the audience.
         /// </summary>
         /// </summary>
         [JsonPropertyName("audience")]
         [JsonPropertyName("audience")]
-        public string Audience { get; set; }
+        public string? Audience { get; set; }
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the program id.
         /// Gets or sets the program id.
         /// </summary>
         /// </summary>
         [JsonPropertyName("programID")]
         [JsonPropertyName("programID")]
-        public string ProgramId { get; set; }
+        public string? ProgramId { get; set; }
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the list of titles.
         /// Gets or sets the list of titles.
         /// </summary>
         /// </summary>
         [JsonPropertyName("titles")]
         [JsonPropertyName("titles")]
-        public List<TitleDto> Titles { get; set; }
+        public IReadOnlyList<TitleDto> Titles { get; set; } = Array.Empty<TitleDto>();
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the event details object.
         /// Gets or sets the event details object.
         /// </summary>
         /// </summary>
         [JsonPropertyName("eventDetails")]
         [JsonPropertyName("eventDetails")]
-        public EventDetailsDto EventDetails { get; set; }
+        public EventDetailsDto? EventDetails { get; set; }
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the descriptions.
         /// Gets or sets the descriptions.
         /// </summary>
         /// </summary>
         [JsonPropertyName("descriptions")]
         [JsonPropertyName("descriptions")]
-        public DescriptionsProgramDto Descriptions { get; set; }
+        public DescriptionsProgramDto? Descriptions { get; set; }
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the original air date.
         /// Gets or sets the original air date.
         /// </summary>
         /// </summary>
         [JsonPropertyName("originalAirDate")]
         [JsonPropertyName("originalAirDate")]
-        public string OriginalAirDate { get; set; }
+        public DateTime? OriginalAirDate { get; set; }
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the list of genres.
         /// Gets or sets the list of genres.
         /// </summary>
         /// </summary>
         [JsonPropertyName("genres")]
         [JsonPropertyName("genres")]
-        public List<string> Genres { get; set; }
+        public IReadOnlyList<string> Genres { get; set; } = Array.Empty<string>();
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the episode title.
         /// Gets or sets the episode title.
         /// </summary>
         /// </summary>
         [JsonPropertyName("episodeTitle150")]
         [JsonPropertyName("episodeTitle150")]
-        public string EpisodeTitle150 { get; set; }
+        public string? EpisodeTitle150 { get; set; }
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the list of metadata.
         /// Gets or sets the list of metadata.
         /// </summary>
         /// </summary>
         [JsonPropertyName("metadata")]
         [JsonPropertyName("metadata")]
-        public List<MetadataProgramsDto> Metadata { get; set; }
+        public IReadOnlyList<MetadataProgramsDto> Metadata { get; set; } = Array.Empty<MetadataProgramsDto>();
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the list of content raitings.
         /// Gets or sets the list of content raitings.
         /// </summary>
         /// </summary>
         [JsonPropertyName("contentRating")]
         [JsonPropertyName("contentRating")]
-        public List<ContentRatingDto> ContentRating { get; set; }
+        public IReadOnlyList<ContentRatingDto> ContentRating { get; set; } = Array.Empty<ContentRatingDto>();
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the list of cast.
         /// Gets or sets the list of cast.
         /// </summary>
         /// </summary>
         [JsonPropertyName("cast")]
         [JsonPropertyName("cast")]
-        public List<CastDto> Cast { get; set; }
+        public IReadOnlyList<CastDto> Cast { get; set; } = Array.Empty<CastDto>();
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the list of crew.
         /// Gets or sets the list of crew.
         /// </summary>
         /// </summary>
         [JsonPropertyName("crew")]
         [JsonPropertyName("crew")]
-        public List<CrewDto> Crew { get; set; }
+        public IReadOnlyList<CrewDto> Crew { get; set; } = Array.Empty<CrewDto>();
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the entity type.
         /// Gets or sets the entity type.
         /// </summary>
         /// </summary>
         [JsonPropertyName("entityType")]
         [JsonPropertyName("entityType")]
-        public string EntityType { get; set; }
+        public string? EntityType { get; set; }
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the show type.
         /// Gets or sets the show type.
         /// </summary>
         /// </summary>
         [JsonPropertyName("showType")]
         [JsonPropertyName("showType")]
-        public string ShowType { get; set; }
+        public string? ShowType { get; set; }
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets a value indicating whether there is image artwork.
         /// Gets or sets a value indicating whether there is image artwork.
@@ -104,54 +103,54 @@ namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
         /// Gets or sets the primary image.
         /// Gets or sets the primary image.
         /// </summary>
         /// </summary>
         [JsonPropertyName("primaryImage")]
         [JsonPropertyName("primaryImage")]
-        public string PrimaryImage { get; set; }
+        public string? PrimaryImage { get; set; }
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the thumb image.
         /// Gets or sets the thumb image.
         /// </summary>
         /// </summary>
         [JsonPropertyName("thumbImage")]
         [JsonPropertyName("thumbImage")]
-        public string ThumbImage { get; set; }
+        public string? ThumbImage { get; set; }
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the backdrop image.
         /// Gets or sets the backdrop image.
         /// </summary>
         /// </summary>
         [JsonPropertyName("backdropImage")]
         [JsonPropertyName("backdropImage")]
-        public string BackdropImage { get; set; }
+        public string? BackdropImage { get; set; }
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the banner image.
         /// Gets or sets the banner image.
         /// </summary>
         /// </summary>
         [JsonPropertyName("bannerImage")]
         [JsonPropertyName("bannerImage")]
-        public string BannerImage { get; set; }
+        public string? BannerImage { get; set; }
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the image id.
         /// Gets or sets the image id.
         /// </summary>
         /// </summary>
         [JsonPropertyName("imageID")]
         [JsonPropertyName("imageID")]
-        public string ImageId { get; set; }
+        public string? ImageId { get; set; }
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the md5.
         /// Gets or sets the md5.
         /// </summary>
         /// </summary>
         [JsonPropertyName("md5")]
         [JsonPropertyName("md5")]
-        public string Md5 { get; set; }
+        public string? Md5 { get; set; }
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the list of content advisory.
         /// Gets or sets the list of content advisory.
         /// </summary>
         /// </summary>
         [JsonPropertyName("contentAdvisory")]
         [JsonPropertyName("contentAdvisory")]
-        public List<string> ContentAdvisory { get; set; }
+        public IReadOnlyList<string> ContentAdvisory { get; set; } = Array.Empty<string>();
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the movie object.
         /// Gets or sets the movie object.
         /// </summary>
         /// </summary>
         [JsonPropertyName("movie")]
         [JsonPropertyName("movie")]
-        public MovieDto Movie { get; set; }
+        public MovieDto? Movie { get; set; }
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the list of recommendations.
         /// Gets or sets the list of recommendations.
         /// </summary>
         /// </summary>
         [JsonPropertyName("recommendations")]
         [JsonPropertyName("recommendations")]
-        public List<RecommendationDto> Recommendations { get; set; }
+        public IReadOnlyList<RecommendationDto> Recommendations { get; set; } = Array.Empty<RecommendationDto>();
     }
     }
 }
 }

+ 10 - 11
Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/ProgramDto.cs

@@ -1,5 +1,4 @@
-#nullable disable
-
+using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 using System.Text.Json.Serialization;
 
 
@@ -14,13 +13,13 @@ namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
         /// Gets or sets the program id.
         /// Gets or sets the program id.
         /// </summary>
         /// </summary>
         [JsonPropertyName("programID")]
         [JsonPropertyName("programID")]
-        public string ProgramId { get; set; }
+        public string? ProgramId { get; set; }
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the air date time.
         /// Gets or sets the air date time.
         /// </summary>
         /// </summary>
         [JsonPropertyName("airDateTime")]
         [JsonPropertyName("airDateTime")]
-        public string AirDateTime { get; set; }
+        public DateTime? AirDateTime { get; set; }
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the duration.
         /// Gets or sets the duration.
@@ -32,25 +31,25 @@ namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
         /// Gets or sets the md5.
         /// Gets or sets the md5.
         /// </summary>
         /// </summary>
         [JsonPropertyName("md5")]
         [JsonPropertyName("md5")]
-        public string Md5 { get; set; }
+        public string? Md5 { get; set; }
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the list of audio properties.
         /// Gets or sets the list of audio properties.
         /// </summary>
         /// </summary>
         [JsonPropertyName("audioProperties")]
         [JsonPropertyName("audioProperties")]
-        public List<string> AudioProperties { get; set; }
+        public IReadOnlyList<string> AudioProperties { get; set; } = Array.Empty<string>();
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the list of video properties.
         /// Gets or sets the list of video properties.
         /// </summary>
         /// </summary>
         [JsonPropertyName("videoProperties")]
         [JsonPropertyName("videoProperties")]
-        public List<string> VideoProperties { get; set; }
+        public IReadOnlyList<string> VideoProperties { get; set; } = Array.Empty<string>();
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the list of ratings.
         /// Gets or sets the list of ratings.
         /// </summary>
         /// </summary>
         [JsonPropertyName("ratings")]
         [JsonPropertyName("ratings")]
-        public List<RatingDto> Ratings { get; set; }
+        public IReadOnlyList<RatingDto> Ratings { get; set; } = Array.Empty<RatingDto>();
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets a value indicating whether this program is new.
         /// Gets or sets a value indicating whether this program is new.
@@ -62,13 +61,13 @@ namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
         /// Gets or sets the multipart object.
         /// Gets or sets the multipart object.
         /// </summary>
         /// </summary>
         [JsonPropertyName("multipart")]
         [JsonPropertyName("multipart")]
-        public MultipartDto Multipart { get; set; }
+        public MultipartDto? Multipart { get; set; }
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the live tape delay.
         /// Gets or sets the live tape delay.
         /// </summary>
         /// </summary>
         [JsonPropertyName("liveTapeDelay")]
         [JsonPropertyName("liveTapeDelay")]
-        public string LiveTapeDelay { get; set; }
+        public string? LiveTapeDelay { get; set; }
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets a value indicating whether this is the premiere.
         /// Gets or sets a value indicating whether this is the premiere.
@@ -86,6 +85,6 @@ namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
         /// Gets or sets the premiere or finale.
         /// Gets or sets the premiere or finale.
         /// </summary>
         /// </summary>
         [JsonPropertyName("isPremiereOrFinale")]
         [JsonPropertyName("isPremiereOrFinale")]
-        public string IsPremiereOrFinale { get; set; }
+        public string? IsPremiereOrFinale { get; set; }
     }
     }
 }
 }

+ 5 - 7
Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/QualityRatingDto.cs

@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.Text.Json.Serialization;
 using System.Text.Json.Serialization;
 
 
 namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
 namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
@@ -13,30 +11,30 @@ namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
         /// Gets or sets the ratings body.
         /// Gets or sets the ratings body.
         /// </summary>
         /// </summary>
         [JsonPropertyName("ratingsBody")]
         [JsonPropertyName("ratingsBody")]
-        public string RatingsBody { get; set; }
+        public string? RatingsBody { get; set; }
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the rating.
         /// Gets or sets the rating.
         /// </summary>
         /// </summary>
         [JsonPropertyName("rating")]
         [JsonPropertyName("rating")]
-        public string Rating { get; set; }
+        public string? Rating { get; set; }
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the min rating.
         /// Gets or sets the min rating.
         /// </summary>
         /// </summary>
         [JsonPropertyName("minRating")]
         [JsonPropertyName("minRating")]
-        public string MinRating { get; set; }
+        public string? MinRating { get; set; }
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the max rating.
         /// Gets or sets the max rating.
         /// </summary>
         /// </summary>
         [JsonPropertyName("maxRating")]
         [JsonPropertyName("maxRating")]
-        public string MaxRating { get; set; }
+        public string? MaxRating { get; set; }
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the increment.
         /// Gets or sets the increment.
         /// </summary>
         /// </summary>
         [JsonPropertyName("increment")]
         [JsonPropertyName("increment")]
-        public string Increment { get; set; }
+        public string? Increment { get; set; }
     }
     }
 }
 }

+ 2 - 4
Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/RatingDto.cs

@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.Text.Json.Serialization;
 using System.Text.Json.Serialization;
 
 
 namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
 namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
@@ -13,12 +11,12 @@ namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
         /// Gets or sets the body.
         /// Gets or sets the body.
         /// </summary>
         /// </summary>
         [JsonPropertyName("body")]
         [JsonPropertyName("body")]
-        public string Body { get; set; }
+        public string? Body { get; set; }
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the code.
         /// Gets or sets the code.
         /// </summary>
         /// </summary>
         [JsonPropertyName("code")]
         [JsonPropertyName("code")]
-        public string Code { get; set; }
+        public string? Code { get; set; }
     }
     }
 }
 }

+ 2 - 4
Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/RecommendationDto.cs

@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.Text.Json.Serialization;
 using System.Text.Json.Serialization;
 
 
 namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
 namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
@@ -13,12 +11,12 @@ namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
         /// Gets or sets the program id.
         /// Gets or sets the program id.
         /// </summary>
         /// </summary>
         [JsonPropertyName("programID")]
         [JsonPropertyName("programID")]
-        public string ProgramId { get; set; }
+        public string? ProgramId { get; set; }
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the title.
         /// Gets or sets the title.
         /// </summary>
         /// </summary>
         [JsonPropertyName("title120")]
         [JsonPropertyName("title120")]
-        public string Title120 { get; set; }
+        public string? Title120 { get; set; }
     }
     }
 }
 }

+ 3 - 4
Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/RequestScheduleForChannelDto.cs

@@ -1,5 +1,4 @@
-#nullable disable
-
+using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 using System.Text.Json.Serialization;
 
 
@@ -14,12 +13,12 @@ namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
         /// Gets or sets the station id.
         /// Gets or sets the station id.
         /// </summary>
         /// </summary>
         [JsonPropertyName("stationID")]
         [JsonPropertyName("stationID")]
-        public string StationId { get; set; }
+        public string? StationId { get; set; }
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the list of dates.
         /// Gets or sets the list of dates.
         /// </summary>
         /// </summary>
         [JsonPropertyName("date")]
         [JsonPropertyName("date")]
-        public List<string> Date { get; set; }
+        public IReadOnlyList<string> Date { get; set; } = Array.Empty<string>();
     }
     }
 }
 }

+ 3 - 4
Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/ShowImagesDto.cs

@@ -1,5 +1,4 @@
-#nullable disable
-
+using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 using System.Text.Json.Serialization;
 
 
@@ -14,12 +13,12 @@ namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
         /// Gets or sets the program id.
         /// Gets or sets the program id.
         /// </summary>
         /// </summary>
         [JsonPropertyName("programID")]
         [JsonPropertyName("programID")]
-        public string ProgramId { get; set; }
+        public string? ProgramId { get; set; }
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the list of data.
         /// Gets or sets the list of data.
         /// </summary>
         /// </summary>
         [JsonPropertyName("data")]
         [JsonPropertyName("data")]
-        public List<ImageDataDto> Data { get; set; }
+        public IReadOnlyList<ImageDataDto> Data { get; set; } = Array.Empty<ImageDataDto>();
     }
     }
 }
 }

+ 9 - 10
Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/StationDto.cs

@@ -1,5 +1,4 @@
-#nullable disable
-
+using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 using System.Text.Json.Serialization;
 
 
@@ -14,49 +13,49 @@ namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
         /// Gets or sets the station id.
         /// Gets or sets the station id.
         /// </summary>
         /// </summary>
         [JsonPropertyName("stationID")]
         [JsonPropertyName("stationID")]
-        public string StationId { get; set; }
+        public string? StationId { get; set; }
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the name.
         /// Gets or sets the name.
         /// </summary>
         /// </summary>
         [JsonPropertyName("name")]
         [JsonPropertyName("name")]
-        public string Name { get; set; }
+        public string? Name { get; set; }
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the callsign.
         /// Gets or sets the callsign.
         /// </summary>
         /// </summary>
         [JsonPropertyName("callsign")]
         [JsonPropertyName("callsign")]
-        public string Callsign { get; set; }
+        public string? Callsign { get; set; }
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the broadcast language.
         /// Gets or sets the broadcast language.
         /// </summary>
         /// </summary>
         [JsonPropertyName("broadcastLanguage")]
         [JsonPropertyName("broadcastLanguage")]
-        public List<string> BroadcastLanguage { get; set; }
+        public IReadOnlyList<string> BroadcastLanguage { get; set; } = Array.Empty<string>();
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the description language.
         /// Gets or sets the description language.
         /// </summary>
         /// </summary>
         [JsonPropertyName("descriptionLanguage")]
         [JsonPropertyName("descriptionLanguage")]
-        public List<string> DescriptionLanguage { get; set; }
+        public IReadOnlyList<string> DescriptionLanguage { get; set; } = Array.Empty<string>();
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the broadcaster.
         /// Gets or sets the broadcaster.
         /// </summary>
         /// </summary>
         [JsonPropertyName("broadcaster")]
         [JsonPropertyName("broadcaster")]
-        public BroadcasterDto Broadcaster { get; set; }
+        public BroadcasterDto? Broadcaster { get; set; }
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the affiliate.
         /// Gets or sets the affiliate.
         /// </summary>
         /// </summary>
         [JsonPropertyName("affiliate")]
         [JsonPropertyName("affiliate")]
-        public string Affiliate { get; set; }
+        public string? Affiliate { get; set; }
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the logo.
         /// Gets or sets the logo.
         /// </summary>
         /// </summary>
         [JsonPropertyName("logo")]
         [JsonPropertyName("logo")]
-        public LogoDto Logo { get; set; }
+        public LogoDto? Logo { get; set; }
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets a value indicating whether it is commercial free.
         /// Gets or sets a value indicating whether it is commercial free.

+ 1 - 3
Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/TitleDto.cs

@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.Text.Json.Serialization;
 using System.Text.Json.Serialization;
 
 
 namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
 namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
@@ -13,6 +11,6 @@ namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
         /// Gets or sets the title.
         /// Gets or sets the title.
         /// </summary>
         /// </summary>
         [JsonPropertyName("title120")]
         [JsonPropertyName("title120")]
-        public string Title120 { get; set; }
+        public string? Title120 { get; set; }
     }
     }
 }
 }

+ 16 - 5
Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/TokenDto.cs

@@ -1,5 +1,4 @@
-#nullable disable
-
+using System;
 using System.Text.Json.Serialization;
 using System.Text.Json.Serialization;
 
 
 namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
 namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
@@ -19,18 +18,30 @@ namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
         /// Gets or sets the response message.
         /// Gets or sets the response message.
         /// </summary>
         /// </summary>
         [JsonPropertyName("message")]
         [JsonPropertyName("message")]
-        public string Message { get; set; }
+        public string? Message { get; set; }
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the server id.
         /// Gets or sets the server id.
         /// </summary>
         /// </summary>
         [JsonPropertyName("serverID")]
         [JsonPropertyName("serverID")]
-        public string ServerId { get; set; }
+        public string? ServerId { get; set; }
 
 
         /// <summary>
         /// <summary>
         /// Gets or sets the token.
         /// Gets or sets the token.
         /// </summary>
         /// </summary>
         [JsonPropertyName("token")]
         [JsonPropertyName("token")]
-        public string Token { get; set; }
+        public string? Token { get; set; }
+
+        /// <summary>
+        /// Gets or sets the current datetime.
+        /// </summary>
+        [JsonPropertyName("datetime")]
+        public DateTime? TokenTimestamp { get; set; }
+
+        /// <summary>
+        /// Gets or sets the response message.
+        /// </summary>
+        [JsonPropertyName("response")]
+        public string? Response { get; set; }
     }
     }
 }
 }

+ 61 - 0
src/Jellyfin.Extensions/ReadOnlyListExtension.cs

@@ -0,0 +1,61 @@
+using System;
+using System.Collections.Generic;
+
+namespace Jellyfin.Extensions
+{
+    /// <summary>
+    /// Static extensions for the <see cref="IReadOnlyList{T}"/> interface.
+    /// </summary>
+    public static class ReadOnlyListExtension
+    {
+        /// <summary>
+        /// Finds the index of the desired item.
+        /// </summary>
+        /// <param name="source">The source list.</param>
+        /// <param name="value">The value to fine.</param>
+        /// <typeparam name="T">The type of item to find.</typeparam>
+        /// <returns>Index if found, else -1.</returns>
+        public static int IndexOf<T>(this IReadOnlyList<T> source, T value)
+        {
+            if (source is IList<T> list)
+            {
+                return list.IndexOf(value);
+            }
+
+            for (int i = 0; i < source.Count; i++)
+            {
+                if (Equals(value, source[i]))
+                {
+                    return i;
+                }
+            }
+
+            return -1;
+        }
+
+        /// <summary>
+        /// Finds the index of the predicate.
+        /// </summary>
+        /// <param name="source">The source list.</param>
+        /// <param name="match">The value to find.</param>
+        /// <typeparam name="T">The type of item to find.</typeparam>
+        /// <returns>Index if found, else -1.</returns>
+        public static int FindIndex<T>(this IReadOnlyList<T> source, Predicate<T> match)
+        {
+            if (source is List<T> list)
+            {
+                return list.FindIndex(match);
+            }
+
+            for (int i = 0; i < source.Count; i++)
+            {
+                if (match(source[i]))
+                {
+                    return i;
+                }
+            }
+
+            return -1;
+        }
+    }
+}

+ 240 - 0
tests/Jellyfin.Server.Implementations.Tests/LiveTv/SchedulesDirect/SchedulesDirectDeserializeTests.cs

@@ -0,0 +1,240 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text.Json;
+using Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos;
+using Jellyfin.Extensions.Json;
+using Xunit;
+
+namespace Jellyfin.Server.Implementations.Tests.LiveTv.SchedulesDirect
+{
+    public class SchedulesDirectDeserializeTests
+    {
+        private readonly JsonSerializerOptions _jsonOptions;
+
+        public SchedulesDirectDeserializeTests()
+        {
+            _jsonOptions = JsonDefaults.Options;
+        }
+
+        /// <summary>
+        /// /token reponse.
+        /// </summary>
+        [Fact]
+        public void Deserialize_Token_Response_Live_Success()
+        {
+            var bytes = File.ReadAllBytes("Test Data/SchedulesDirect/token_live_response.json");
+            var tokenDto = JsonSerializer.Deserialize<TokenDto>(bytes, _jsonOptions);
+
+            Assert.NotNull(tokenDto);
+            Assert.Equal(0, tokenDto!.Code);
+            Assert.Equal("OK", tokenDto.Message);
+            Assert.Equal("AWS-SD-web.1", tokenDto.ServerId);
+            Assert.Equal(new DateTime(2016, 08, 23, 13, 55, 25, DateTimeKind.Utc), tokenDto.TokenTimestamp);
+            Assert.Equal("f3fca79989cafe7dead71beefedc812b", tokenDto.Token);
+        }
+
+        /// <summary>
+        /// /token response.
+        /// </summary>
+        [Fact]
+        public void Deserialize_Token_Response_Offline_Success()
+        {
+            var bytes = File.ReadAllBytes("Test Data/SchedulesDirect/token_offline_response.json");
+            var tokenDto = JsonSerializer.Deserialize<TokenDto>(bytes, _jsonOptions);
+
+            Assert.NotNull(tokenDto);
+            Assert.Equal(3_000, tokenDto!.Code);
+            Assert.Equal("Server offline for maintenance.", tokenDto.Message);
+            Assert.Equal("20141201.web.1", tokenDto.ServerId);
+            Assert.Equal(new DateTime(2015, 04, 23, 00, 03, 32, DateTimeKind.Utc), tokenDto.TokenTimestamp);
+            Assert.Equal("CAFEDEADBEEFCAFEDEADBEEFCAFEDEADBEEFCAFE", tokenDto.Token);
+            Assert.Equal("SERVICE_OFFLINE", tokenDto.Response);
+        }
+
+        /// <summary>
+        /// /schedules request.
+        /// </summary>
+        [Fact]
+        public void Serialize_Schedule_Request_Success()
+        {
+            var expectedString = File.ReadAllText("Test Data/SchedulesDirect/schedules_request.json").Trim();
+
+            var requestObject = new RequestScheduleForChannelDto[]
+            {
+                new RequestScheduleForChannelDto
+                {
+                    StationId = "20454",
+                    Date = new[]
+                    {
+                        "2015-03-13",
+                        "2015-03-17"
+                    }
+                },
+                new RequestScheduleForChannelDto
+                {
+                    StationId = "10021",
+                    Date = new[]
+                    {
+                        "2015-03-12",
+                        "2015-03-13"
+                    }
+                }
+            };
+
+            var requestString = JsonSerializer.Serialize(requestObject, _jsonOptions);
+            Assert.Equal(expectedString, requestString);
+        }
+
+        /// <summary>
+        /// /schedules response.
+        /// </summary>
+        [Fact]
+        public void Deserialize_Schedule_Response_Success()
+        {
+            var bytes = File.ReadAllBytes("Test Data/SchedulesDirect/schedules_response.json");
+            var days = JsonSerializer.Deserialize<IReadOnlyList<DayDto>>(bytes, _jsonOptions);
+
+            Assert.NotNull(days);
+            Assert.Equal(1, days!.Count);
+
+            var dayDto = days[0];
+            Assert.Equal("20454", dayDto.StationId);
+            Assert.Equal(2, dayDto.Programs.Count);
+
+            Assert.Equal("SH005371070000", dayDto.Programs[0].ProgramId);
+            Assert.Equal(new DateTime(2015, 03, 03, 00, 00, 00, DateTimeKind.Utc), dayDto.Programs[0].AirDateTime);
+            Assert.Equal(1_800, dayDto.Programs[0].Duration);
+            Assert.Equal("Sy8HEMBPcuiAx3FBukUhKQ", dayDto.Programs[0].Md5);
+            Assert.True(dayDto.Programs[0].New);
+            Assert.Equal(2, dayDto.Programs[0].AudioProperties.Count);
+            Assert.Equal("stereo", dayDto.Programs[0].AudioProperties[0]);
+            Assert.Equal("cc", dayDto.Programs[0].AudioProperties[1]);
+            Assert.Equal(1, dayDto.Programs[0].VideoProperties.Count);
+            Assert.Equal("hdtv", dayDto.Programs[0].VideoProperties[0]);
+        }
+
+        /// <summary>
+        /// /programs response.
+        /// </summary>
+        [Fact]
+        public void Deserialize_Program_Response_Success()
+        {
+            var bytes = File.ReadAllBytes("Test Data/SchedulesDirect/programs_response.json");
+            var programDtos = JsonSerializer.Deserialize<IReadOnlyList<ProgramDetailsDto>>(bytes, _jsonOptions);
+
+            Assert.NotNull(programDtos);
+            Assert.Equal(2, programDtos!.Count);
+            Assert.Equal("EP000000060003", programDtos[0].ProgramId);
+            Assert.Equal(1, programDtos[0].Titles.Count);
+            Assert.Equal("'Allo 'Allo!", programDtos[0].Titles[0].Title120);
+            Assert.Equal("Series", programDtos[0].EventDetails?.SubType);
+            Assert.Equal("en", programDtos[0].Descriptions?.Description1000[0].DescriptionLanguage);
+            Assert.Equal("A disguised British Intelligence officer is sent to help the airmen.", programDtos[0].Descriptions?.Description1000[0].Description);
+            Assert.Equal(new DateTime(1985, 11, 04), programDtos[0].OriginalAirDate);
+            Assert.Equal(1, programDtos[0].Genres.Count);
+            Assert.Equal("Sitcom", programDtos[0].Genres[0]);
+            Assert.Equal("The Poloceman Cometh", programDtos[0].EpisodeTitle150);
+            Assert.Equal(2, programDtos[0].Metadata[0].Gracenote?.Season);
+            Assert.Equal(3, programDtos[0].Metadata[0].Gracenote?.Episode);
+            Assert.Equal(13, programDtos[0].Cast.Count);
+            Assert.Equal("383774", programDtos[0].Cast[0].PersonId);
+            Assert.Equal("392649", programDtos[0].Cast[0].NameId);
+            Assert.Equal("Gorden Kaye", programDtos[0].Cast[0].Name);
+            Assert.Equal("Actor", programDtos[0].Cast[0].Role);
+            Assert.Equal("01", programDtos[0].Cast[0].BillingOrder);
+            Assert.Equal(3, programDtos[0].Crew.Count);
+            Assert.Equal("354407", programDtos[0].Crew[0].PersonId);
+            Assert.Equal("363281", programDtos[0].Crew[0].NameId);
+            Assert.Equal("David Croft", programDtos[0].Crew[0].Name);
+            Assert.Equal("Director", programDtos[0].Crew[0].Role);
+            Assert.Equal("01", programDtos[0].Crew[0].BillingOrder);
+        }
+
+        /// <summary>
+        /// /metadata/programs response.
+        /// </summary>
+        [Fact]
+        public void Deserialize_Metadata_Programs_Response_Success()
+        {
+            var bytes = File.ReadAllBytes("Test Data/SchedulesDirect/metadata_programs_response.json");
+            var showImagesDtos = JsonSerializer.Deserialize<IReadOnlyList<ShowImagesDto>>(bytes, _jsonOptions);
+
+            Assert.NotNull(showImagesDtos);
+            Assert.Equal(1, showImagesDtos!.Count);
+            Assert.Equal("SH00712240", showImagesDtos[0].ProgramId);
+            Assert.Equal(4, showImagesDtos[0].Data.Count);
+            Assert.Equal("135", showImagesDtos[0].Data[0].Width);
+            Assert.Equal("180", showImagesDtos[0].Data[0].Height);
+            Assert.Equal("assets/p282288_b_v2_aa.jpg", showImagesDtos[0].Data[0].Uri);
+            Assert.Equal("Sm", showImagesDtos[0].Data[0].Size);
+            Assert.Equal("3x4", showImagesDtos[0].Data[0].Aspect);
+            Assert.Equal("Banner-L3", showImagesDtos[0].Data[0].Category);
+            Assert.Equal("yes", showImagesDtos[0].Data[0].Text);
+            Assert.Equal("true", showImagesDtos[0].Data[0].Primary);
+            Assert.Equal("Series", showImagesDtos[0].Data[0].Tier);
+        }
+
+        /// <summary>
+        /// /headends response.
+        /// </summary>
+        [Fact]
+        public void Deserialize_Headends_Response_Success()
+        {
+            var bytes = File.ReadAllBytes("Test Data/SchedulesDirect/headends_response.json");
+            var headendsDtos = JsonSerializer.Deserialize<IReadOnlyList<HeadendsDto>>(bytes, _jsonOptions);
+
+            Assert.NotNull(headendsDtos);
+            Assert.Equal(8, headendsDtos!.Count);
+            Assert.Equal("CA00053", headendsDtos[0].Headend);
+            Assert.Equal("Cable", headendsDtos[0].Transport);
+            Assert.Equal("Beverly Hills", headendsDtos[0].Location);
+            Assert.Equal(2, headendsDtos[0].Lineups.Count);
+            Assert.Equal("Time Warner Cable - Cable", headendsDtos[0].Lineups[0].Name);
+            Assert.Equal("USA-CA00053-DEFAULT", headendsDtos[0].Lineups[0].Lineup);
+            Assert.Equal("/20141201/lineups/USA-CA00053-DEFAULT", headendsDtos[0].Lineups[0].Uri);
+        }
+
+        /// <summary>
+        /// /lineups response.
+        /// </summary>
+        [Fact]
+        public void Deserialize_Lineups_Response_Success()
+        {
+            var bytes = File.ReadAllBytes("Test Data/SchedulesDirect/lineups_response.json");
+            var lineupsDto = JsonSerializer.Deserialize<LineupsDto>(bytes, _jsonOptions);
+
+            Assert.NotNull(lineupsDto);
+            Assert.Equal(0, lineupsDto!.Code);
+            Assert.Equal("20141201.web.1", lineupsDto.ServerId);
+            Assert.Equal(new DateTime(2015, 04, 17, 14, 22, 17, DateTimeKind.Utc), lineupsDto.LineupTimestamp);
+            Assert.Equal(5, lineupsDto.Lineups.Count);
+            Assert.Equal("GBR-0001317-DEFAULT", lineupsDto.Lineups[0].Lineup);
+            Assert.Equal("Freeview - Carlton - LWT (Southeast)", lineupsDto.Lineups[0].Name);
+            Assert.Equal("DVB-T", lineupsDto.Lineups[0].Transport);
+            Assert.Equal("London", lineupsDto.Lineups[0].Location);
+            Assert.Equal("/20141201/lineups/GBR-0001317-DEFAULT", lineupsDto.Lineups[0].Uri);
+
+            Assert.Equal("DELETED LINEUP", lineupsDto.Lineups[4].Name);
+            Assert.True(lineupsDto.Lineups[4].IsDeleted);
+        }
+
+        /// <summary>
+        /// /lineup/:id response.
+        /// </summary>
+        [Fact]
+        public void Deserialize_Lineup_Response_Success()
+        {
+            var bytes = File.ReadAllBytes("Test Data/SchedulesDirect/lineup_response.json");
+            var channelDto = JsonSerializer.Deserialize<ChannelDto>(bytes, _jsonOptions);
+
+            Assert.NotNull(channelDto);
+            Assert.Equal(2, channelDto!.Map.Count);
+            Assert.Equal("24326", channelDto.Map[0].StationId);
+            Assert.Equal("001", channelDto.Map[0].Channel);
+            Assert.Equal("BBC ONE South", channelDto.Map[0].ProvderCallsign);
+            Assert.Equal("1", channelDto.Map[0].LogicalChannelNumber);
+            Assert.Equal("providerCallsign", channelDto.Map[0].MatchType);
+        }
+    }
+}

+ 1 - 0
tests/Jellyfin.Server.Implementations.Tests/Test Data/SchedulesDirect/headends_response.json

@@ -0,0 +1 @@
+[{"headend":"CA00053","transport":"Cable","location":"Beverly Hills","lineups":[{"name":"Time Warner Cable - Cable","lineup":"USA-CA00053-DEFAULT","uri":"/20141201/lineups/USA-CA00053-DEFAULT"},{"name":"Time Warner Cable - Digital","lineup":"USA-CA00053-X","uri":"/20141201/lineups/USA-CA00053-X"}]},{"headend":"CA61222","transport":"Cable","location":"Beverly Hills","lineups":[{"name":"Mulholland Estates - Cable","lineup":"USA-CA61222-DEFAULT","uri":"/20141201/lineups/USA-CA61222-DEFAULT"}]},{"headend":"CA66511","transport":"Cable","location":"Los Angeles","lineups":[{"name":"AT&T U-verse TV - Digital","lineup":"USA-CA66511-X","uri":"/20141201/lineups/USA-CA66511-X"}]},{"headend":"CA67309","transport":"Cable","location":"Westchester","lineups":[{"name":"Time Warner Cable Sherman Oaks - Cable","lineup":"USA-CA67309-DEFAULT","uri":"/20141201/lineups/USA-CA67309-DEFAULT"},{"name":"Time Warner Cable Sherman Oaks - Digital","lineup":"USA-CA67309-X","uri":"/20141201/lineups/USA-CA67309-X"}]},{"headend":"CA67310","transport":"Cable","location":"Eagle Rock","lineups":[{"name":"Time Warner Cable City of Los Angeles - Cable","lineup":"USA-CA67310-DEFAULT","uri":"/20141201/lineups/USA-CA67310-DEFAULT"},{"name":"Time Warner Cable City of Los Angeles - Digital","lineup":"USA-CA67310-X","uri":"/20141201/lineups/USA-CA67310-X"}]},{"headend":"DISH803","transport":"Satellite","location":"Los Angeles","lineups":[{"name":"DISH Los Angeles - Satellite","lineup":"USA-DISH803-DEFAULT","uri":"/20141201/lineups/USA-DISH803-DEFAULT"}]},{"headend":"DITV803","transport":"Satellite","location":"Los Angeles","lineups":[{"name":"DIRECTV Los Angeles - Satellite","lineup":"USA-DITV803-DEFAULT","uri":"/20141201/lineups/USA-DITV803-DEFAULT"}]},{"headend":"90210","transport":"Antenna","location":"90210","lineups":[{"name":"Antenna","lineup":"USA-OTA-90210","uri":"/20141201/lineups/USA-OTA-90210"}]}]

+ 1 - 0
tests/Jellyfin.Server.Implementations.Tests/Test Data/SchedulesDirect/lineup_response.json

@@ -0,0 +1 @@
+{"map":[{"stationID":"24326","channel":"001","providerCallsign":"BBC ONE South","logicalChannelNumber":"1","matchType":"providerCallsign"},{"stationID":"17154","channel":"002","providerCallsign":"BBC TWO","logicalChannelNumber":"2","matchType":"providerCallsign"}]}

+ 1 - 0
tests/Jellyfin.Server.Implementations.Tests/Test Data/SchedulesDirect/lineups_response.json

@@ -0,0 +1 @@
+{"code":0,"serverID":"20141201.web.1","datetime":"2015-04-17T14:22:17Z","lineups":[{"lineup":"GBR-0001317-DEFAULT","name":"Freeview - Carlton - LWT (Southeast)","transport":"DVB-T","location":"London","uri":"/20141201/lineups/GBR-0001317-DEFAULT"},{"lineup":"USA-IL57303-X","name":"Comcast Waukegan/Lake Forest Area - Digital","transport":"Cable","location":"Lake Forest","uri":"/20141201/lineups/USA-IL57303-X"},{"lineup":"USA-NY67791-X","name":"Verizon Fios Queens - Digital","transport":"Cable","location":"Fresh Meadows","uri":"/20141201/lineups/USA-NY67791-X"},{"lineup":"USA-OTA-60030","name":"Local Over the Air Broadcast","transport":"Antenna","location":"60030","uri":"/20141201/lineups/USA-OTA-60030"},{"lineup":"USA-WI61859-DEFAULT","name":"DELETED LINEUP","isDeleted":true}]}

+ 1 - 0
tests/Jellyfin.Server.Implementations.Tests/Test Data/SchedulesDirect/metadata_programs_response.json

@@ -0,0 +1 @@
+[{"programID":"SH00712240","data":[{"width":"135","height":"180","uri":"assets/p282288_b_v2_aa.jpg","size":"Sm","aspect":"3x4","category":"Banner-L3","text":"yes","primary":"true","tier":"Series"},{"width":"720","height":"540","uri":"assets/p282288_b_h6_aa.jpg","size":"Lg","aspect":"4x3","category":"Banner-L3","text":"yes","primary":"true","tier":"Series"},{"width":"960","height":"1440","uri":"assets/p282288_b_v8_aa.jpg","size":"Ms","aspect":"2x3","category":"Banner-L3","text":"yes","primary":"true","tier":"Series"},{"width":"180","height":"135","uri":"assets/p282288_b_h5_aa.jpg","size":"Sm","aspect":"4x3","category":"Banner-L3","text":"yes","primary":"true","tier":"Series"}]}]

Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
tests/Jellyfin.Server.Implementations.Tests/Test Data/SchedulesDirect/programs_response.json


+ 1 - 0
tests/Jellyfin.Server.Implementations.Tests/Test Data/SchedulesDirect/schedules_request.json

@@ -0,0 +1 @@
+[{"stationID":"20454","date":["2015-03-13","2015-03-17"]},{"stationID":"10021","date":["2015-03-12","2015-03-13"]}]

+ 1 - 0
tests/Jellyfin.Server.Implementations.Tests/Test Data/SchedulesDirect/schedules_response.json

@@ -0,0 +1 @@
+[{"stationID":"20454","programs":[{"programID":"SH005371070000","airDateTime":"2015-03-03T00:00:00Z","duration":1800,"md5":"Sy8HEMBPcuiAx3FBukUhKQ","new":true,"audioProperties":["stereo","cc"],"videoProperties":["hdtv"]},{"programID":"EP000014577244","airDateTime":"2015-03-03T00:30:00Z","duration":1800,"md5":"25DNXVXO192JI7Y9vSW9lQ","new":true,"audioProperties":["stereo","cc"],"videoProperties":["hdtv"]}]}]

+ 1 - 0
tests/Jellyfin.Server.Implementations.Tests/Test Data/SchedulesDirect/token_live_response.json

@@ -0,0 +1 @@
+{"code":0,"message":"OK","serverID":"AWS-SD-web.1","datetime":"2016-08-23T13:55:25Z","token":"f3fca79989cafe7dead71beefedc812b"}

+ 1 - 0
tests/Jellyfin.Server.Implementations.Tests/Test Data/SchedulesDirect/token_offline_response.json

@@ -0,0 +1 @@
+{"response":"SERVICE_OFFLINE","code":3000,"serverID":"20141201.web.1","message":"Server offline for maintenance.","datetime":"2015-04-23T00:03:32Z","token":"CAFEDEADBEEFCAFEDEADBEEFCAFEDEADBEEFCAFE"}

Alguns arquivos não foram mostrados porque muitos arquivos mudaram nesse diff