jellyfin/TMDbLib
1
0
Fork 0
mirror of https://github.com/jellyfin/TMDbLib.git synced 2024-11-23 05:40:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #435 from angyanmark/feature/extend-media-type

Browse Source 
Extend MediaType
This commit is contained in:
Claus Vium 2023-09-22 22:05:48 +02:00 committed by GitHub
commit 17674ca867
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 39 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
TMDbLib/Objects/General/MediaType.cs
View File

@ -19,6 +19,15 @@ namespace TMDbLib.Objects.General
Person = 3,
[EnumValue("episode")]
Episode = 4
Episode = 4,
[EnumValue("tv_episode")]
TvEpisode = 5,
[EnumValue("season")]
Season = 6,
[EnumValue("tv_season")]
TvSeason = 7
}
}

11
TMDbLib/Objects/Search/SearchTvSeason.cs
View File

@ -1,19 +1,22 @@
using System;
using Newtonsoft.Json;
using TMDbLib.Objects.General;
namespace TMDbLib.Objects.Search
{
public class SearchTvSeason
public class SearchTvSeason : SearchBase
{
public SearchTvSeason()
{
MediaType = MediaType.Season;
}
[JsonProperty("air_date")]
public DateTime? AirDate { get; set; }
[JsonProperty("episode_count")]
public int EpisodeCount { get; set; }
[JsonProperty("id")]
public int Id { get; set; }
[JsonProperty("name")]
public string Name { get; set; }

26
TMDbLib/Utilities/Converters/SearchBaseConverter.cs
View File

@ -28,23 +28,17 @@ namespace TMDbLib.Utilities.Converters
// Determine the type based on the media_type
MediaType mediaType = jObject["media_type"].ToObject<MediaType>();
switch (mediaType)
result = mediaType switch
{
case MediaType.Movie:
result = new SearchMovie();
break;
case MediaType.Tv:
result = new SearchTv();
break;
case MediaType.Person:
result = new SearchPerson();
break;
case MediaType.Episode:
result = new SearchTvEpisode();
break;
default:
throw new ArgumentOutOfRangeException();
}
MediaType.Movie => new SearchMovie(),
MediaType.Tv => new SearchTv(),
MediaType.Person => new SearchPerson(),
MediaType.Episode => new SearchTvEpisode(),
MediaType.TvEpisode => new SearchTvEpisode(),
MediaType.Season => new SearchTvSeason(),
MediaType.TvSeason => new SearchTvSeason(),
_ => throw new ArgumentOutOfRangeException(),
};
}
// Populate the result

21
TMDbLib/Utilities/Converters/TaggedImageConverter.cs
View File

@ -24,21 +24,14 @@ namespace TMDbLib.Utilities.Converters
serializer.Populate(jsonReader, result);
JToken mediaJson = jObject["media"];
switch (result.MediaType)
result.Media = result.MediaType switch
{
case MediaType.Movie:
result.Media = mediaJson.ToObject<SearchMovie>();
break;
case MediaType.Tv:
result.Media = mediaJson.ToObject<SearchTv>();
break;
case MediaType.Episode:
result.Media = mediaJson.ToObject<SearchTvEpisode>();
break;
default:
throw new ArgumentOutOfRangeException();
}
MediaType.Movie => mediaJson.ToObject<SearchMovie>(),
MediaType.Tv => mediaJson.ToObject<SearchTv>(),
MediaType.Episode => mediaJson.ToObject<SearchTvEpisode>(),
MediaType.Season => mediaJson.ToObject<SearchTvSeason>(),
_ => throw new ArgumentOutOfRangeException(),
};
return result;
}

1
TMDbLibTests/Helpers/IdHelper.cs
View File

@ -51,6 +51,7 @@
public const int TomHanks = 31;
public const string ImdbBruceWillis = "nm0000246";
public const int JoshACagan = 129305;
public const int AnnaTorv = 30084;
// Collections
public const int JamesBondCollection = 645;

3
TMDbLibTests/UtilityTests/TaggedImageConverterTest.cs
View File

@ -59,6 +59,7 @@ namespace TMDbLibTests.UtilityTests
[Theory]
[InlineData(IdHelper.HughLaurie)] // Has Movie media
[InlineData(IdHelper.TomHanks)] // Has Episode media
[InlineData(IdHelper.AnnaTorv)] // Has Tv, Season media
public async Task TestJsonTaggedImageConverter(int personId)
{
// Get images
@ -77,6 +78,8 @@ namespace TMDbLibTests.UtilityTests
Assert.IsType<SearchTv>(item.Media);
else if (item.MediaType == MediaType.Episode)
Assert.IsType<SearchTvEpisode>(item.Media);
else if (item.MediaType == MediaType.Season)
Assert.IsType<SearchTvSeason>(item.Media);
else
Assert.False(true, $"Unexpected type {item.GetType().Name}");
});