Merge pull request #10078 from scampower3/master
Combine Title and Overview for multi-episodes files for the TMDB provider
This commit is contained in:
commit
5e48278e2a
|
@ -170,6 +170,7 @@
|
||||||
- [TheTyrius](https://github.com/TheTyrius)
|
- [TheTyrius](https://github.com/TheTyrius)
|
||||||
- [tallbl0nde](https://github.com/tallbl0nde)
|
- [tallbl0nde](https://github.com/tallbl0nde)
|
||||||
- [sleepycatcoding](https://github.com/sleepycatcoding)
|
- [sleepycatcoding](https://github.com/sleepycatcoding)
|
||||||
|
- [scampower3](https://github.com/scampower3)
|
||||||
|
|
||||||
# Emby Contributors
|
# Emby Contributors
|
||||||
|
|
||||||
|
|
|
@ -3,6 +3,7 @@ using System.Collections.Generic;
|
||||||
using System.Globalization;
|
using System.Globalization;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Net.Http;
|
using System.Net.Http;
|
||||||
|
using System.Text;
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using Jellyfin.Data.Enums;
|
using Jellyfin.Data.Enums;
|
||||||
|
@ -13,6 +14,7 @@ using MediaBrowser.Controller.Entities.TV;
|
||||||
using MediaBrowser.Controller.Providers;
|
using MediaBrowser.Controller.Providers;
|
||||||
using MediaBrowser.Model.Entities;
|
using MediaBrowser.Model.Entities;
|
||||||
using MediaBrowser.Model.Providers;
|
using MediaBrowser.Model.Providers;
|
||||||
|
using TMDbLib.Objects.TvShows;
|
||||||
|
|
||||||
namespace MediaBrowser.Providers.Plugins.Tmdb.TV
|
namespace MediaBrowser.Providers.Plugins.Tmdb.TV
|
||||||
{
|
{
|
||||||
|
@ -102,9 +104,61 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
|
||||||
return metadataResult;
|
return metadataResult;
|
||||||
}
|
}
|
||||||
|
|
||||||
var episodeResult = await _tmdbClientManager
|
TvEpisode? episodeResult = null;
|
||||||
|
if (info.IndexNumberEnd.HasValue)
|
||||||
|
{
|
||||||
|
var startindex = episodeNumber;
|
||||||
|
var endindex = info.IndexNumberEnd;
|
||||||
|
List<TvEpisode>? result = null;
|
||||||
|
for (int? episode = startindex; episode <= endindex; episode++)
|
||||||
|
{
|
||||||
|
var episodeInfo = await _tmdbClientManager.GetEpisodeAsync(seriesTmdbId, seasonNumber.Value, episode.Value, info.SeriesDisplayOrder, info.MetadataLanguage, TmdbUtils.GetImageLanguagesParam(info.MetadataLanguage), cancellationToken).ConfigureAwait(false);
|
||||||
|
if (episodeInfo is not null)
|
||||||
|
{
|
||||||
|
(result ??= new List<TvEpisode>()).Add(episodeInfo);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (result is not null)
|
||||||
|
{
|
||||||
|
// Forces a deep copy of the first TvEpisode, so we don't modify the original because it's cached
|
||||||
|
episodeResult = new TvEpisode()
|
||||||
|
{
|
||||||
|
Name = result[0].Name,
|
||||||
|
Overview = result[0].Overview,
|
||||||
|
AirDate = result[0].AirDate,
|
||||||
|
VoteAverage = result[0].VoteAverage,
|
||||||
|
ExternalIds = result[0].ExternalIds,
|
||||||
|
Videos = result[0].Videos,
|
||||||
|
Credits = result[0].Credits
|
||||||
|
};
|
||||||
|
|
||||||
|
if (result.Count > 1)
|
||||||
|
{
|
||||||
|
var name = new StringBuilder(episodeResult.Name);
|
||||||
|
var overview = new StringBuilder(episodeResult.Overview);
|
||||||
|
|
||||||
|
for (int i = 1; i < result.Count; i++)
|
||||||
|
{
|
||||||
|
name.Append(" / ").Append(result[i].Name);
|
||||||
|
overview.Append(" / ").Append(result[i].Overview);
|
||||||
|
}
|
||||||
|
|
||||||
|
episodeResult.Name = name.ToString();
|
||||||
|
episodeResult.Overview = overview.ToString();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
return metadataResult;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
episodeResult = await _tmdbClientManager
|
||||||
.GetEpisodeAsync(seriesTmdbId, seasonNumber.Value, episodeNumber.Value, info.SeriesDisplayOrder, info.MetadataLanguage, TmdbUtils.GetImageLanguagesParam(info.MetadataLanguage), cancellationToken)
|
.GetEpisodeAsync(seriesTmdbId, seasonNumber.Value, episodeNumber.Value, info.SeriesDisplayOrder, info.MetadataLanguage, TmdbUtils.GetImageLanguagesParam(info.MetadataLanguage), cancellationToken)
|
||||||
.ConfigureAwait(false);
|
.ConfigureAwait(false);
|
||||||
|
}
|
||||||
|
|
||||||
if (episodeResult is null)
|
if (episodeResult is null)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue
Block a user