From 35bb6ca0863fd9351c15d7fb5fc58de774deaa18 Mon Sep 17 00:00:00 2001 From: Harshith Mohan <26010946+harshithmohan@users.noreply.github.com> Date: Thu, 8 Aug 2024 00:38:33 +0530 Subject: [PATCH] Fix models for latest server daily --- Shokofin/API/Models/Image.cs | 16 +++++++++++++--- Shokofin/API/Models/Images.cs | 2 +- Shokofin/API/Models/Series.cs | 17 +++++++++++------ Shokofin/Providers/ImageProvider.cs | 2 +- 4 files changed, 26 insertions(+), 11 deletions(-) diff --git a/Shokofin/API/Models/Image.cs b/Shokofin/API/Models/Image.cs index 6bc33cbe..b20c9bae 100644 --- a/Shokofin/API/Models/Image.cs +++ b/Shokofin/API/Models/Image.cs @@ -19,7 +19,7 @@ public class Image /// The image's id. Usually an int, but in the case of resources /// then it is the resource name. /// - public string ID { get; set; } = string.Empty; + public int ID { get; set; } = 0; /// @@ -123,7 +123,12 @@ public enum ImageType /// /// /// - Fanart = 4, + Backdrop = 4, + + /// + /// + /// + Fanart = Backdrop, /// /// @@ -135,8 +140,13 @@ public enum ImageType /// Staff = 6, + /// + /// Clear-text logo. + /// + Logo = 7, + /// /// Static resources are only valid if the is set to . /// Static = 100 -} \ No newline at end of file +} diff --git a/Shokofin/API/Models/Images.cs b/Shokofin/API/Models/Images.cs index eeda6d2b..894faf56 100644 --- a/Shokofin/API/Models/Images.cs +++ b/Shokofin/API/Models/Images.cs @@ -6,7 +6,7 @@ public class Images { public List Posters { get; set; } = new List(); - public List Fanarts { get; set; } = new List(); + public List Backdrops { get; set; } = new List(); public List Banners { get; set; } = new List(); } diff --git a/Shokofin/API/Models/Series.cs b/Shokofin/API/Models/Series.cs index 179799dd..7288cdcc 100644 --- a/Shokofin/API/Models/Series.cs +++ b/Shokofin/API/Models/Series.cs @@ -7,7 +7,7 @@ namespace Shokofin.API.Models; public class Series { public string Name { get; set; } = string.Empty; - + public int Size { get; set; } /// @@ -40,7 +40,7 @@ public class Series /// [JsonPropertyName("TvDB")] public List TvDBEntityList { get; set; }= new(); - + public SeriesSizes Sizes { get; set; } = new(); /// @@ -106,7 +106,7 @@ public class AniDB public int? EpisodeCount { get; set; } /// - /// The average rating for the anime. Only available on + /// The average rating for the anime. Only available on /// public Rating? Rating { get; set; } @@ -135,7 +135,7 @@ public class AniDBWithDate : AniDB public new List Titles { get; set; } = new(); /// <summary> - /// The average rating for the anime. Only available on + /// The average rating for the anime. Only available on /// </summary> public new Rating Rating { get; set; } = new(); @@ -210,13 +210,18 @@ public class SeriesIDs : IDs public List<int> TvDB { get; set; } = new List<int>(); - public List<int> TMDB { get; set; } = new List<int>(); + public TmdbSeriesIDs TMDB { get; set; } = new(); public List<int> MAL { get; set; } = new List<int>(); public List<string> TraktTv { get; set; } = new List<string>(); - public List<int> AniList { get; set; } = new List<int>(); + public class TmdbSeriesIDs + { + public List<int> Movie { get; init; } = new List<int>(); + + public List<int> Show { get; init; } = new List<int>(); + } } /// <summary> diff --git a/Shokofin/Providers/ImageProvider.cs b/Shokofin/Providers/ImageProvider.cs index ce5884c3..e42a06ac 100644 --- a/Shokofin/Providers/ImageProvider.cs +++ b/Shokofin/Providers/ImageProvider.cs @@ -148,7 +148,7 @@ private static void AddImagesForSeries(ref List<RemoteImageInfo> list, API.Model { foreach (var image in images.Posters.OrderByDescending(image => image.IsDefault)) AddImage(ref list, ImageType.Primary, image); - foreach (var image in images.Fanarts.OrderByDescending(image => image.IsDefault)) + foreach (var image in images.Backdrops.OrderByDescending(image => image.IsDefault)) AddImage(ref list, ImageType.Backdrop, image); foreach (var image in images.Banners.OrderByDescending(image => image.IsDefault)) AddImage(ref list, ImageType.Banner, image);