Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-05-31 04:05:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Backport pull request #13611 from jellyfin/release-10.10.z

Browse Source 
Remove empty ParentIndexNumber workaround

Original-merge: 1daf761aece5114a6ac3b7b938f114e70b83d99e

Merged-by: Bond-009 <bond.009@outlook.com>

Backported-by: Bond_009 <bond.009@outlook.com>
This commit is contained in:
Shadowghost 2025-02-25 15:26:47 -05:00 committed by Bond_009
parent 068bc68764
commit 06be4998e1
4 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Emby.Server.Implementations/Library/LibraryManager.cs
View File

@ -2630,15 +2630,6 @@ namespace Emby.Server.Implementations.Library
{ {
episode.ParentIndexNumber = season.IndexNumber; episode.ParentIndexNumber = season.IndexNumber;
} }
else
{
/*
Anime series don't generally have a season in their file name, however,
TVDb needs a season to correctly get the metadata.
Hence, a null season needs to be filled with something. */
// FIXME perhaps this would be better for TVDb parser to ask for season 1 if no season is specified
episode.ParentIndexNumber = 1;
}
if (episode.ParentIndexNumber.HasValue) if (episode.ParentIndexNumber.HasValue)
{ {

5
MediaBrowser.Providers/Plugins/Omdb/OmdbEpisodeProvider.cs
View File

@ -55,13 +55,12 @@ namespace MediaBrowser.Providers.Plugins.Omdb
if (info.SeriesProviderIds.TryGetValue(MetadataProvider.Imdb.ToString(), out string? seriesImdbId) if (info.SeriesProviderIds.TryGetValue(MetadataProvider.Imdb.ToString(), out string? seriesImdbId)
&& !string.IsNullOrEmpty(seriesImdbId) && !string.IsNullOrEmpty(seriesImdbId)
&& info.IndexNumber.HasValue && info.IndexNumber.HasValue)
&& info.ParentIndexNumber.HasValue)
{ {
result.HasMetadata = await _omdbProvider.FetchEpisodeData( result.HasMetadata = await _omdbProvider.FetchEpisodeData(
result, result,
info.IndexNumber.Value, info.IndexNumber.Value,
info.ParentIndexNumber.Value, info.ParentIndexNumber ?? 1,
info.GetProviderId(MetadataProvider.Imdb), info.GetProviderId(MetadataProvider.Imdb),
seriesImdbId, seriesImdbId,
info.MetadataLanguage, info.MetadataLanguage,

6
MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbEpisodeImageProvider.cs
View File

@ -63,10 +63,10 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
return Enumerable.Empty<RemoteImageInfo>(); return Enumerable.Empty<RemoteImageInfo>();
} }
var seasonNumber = episode.ParentIndexNumber; var seasonNumber = episode.ParentIndexNumber ?? 1;
var episodeNumber = episode.IndexNumber; var episodeNumber = episode.IndexNumber;
if (!seasonNumber.HasValue || !episodeNumber.HasValue) if (!episodeNumber.HasValue)
{ {
return Enumerable.Empty<RemoteImageInfo>(); return Enumerable.Empty<RemoteImageInfo>();
} }
@ -75,7 +75,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
// TODO use image languages if All Languages isn't toggled, but there's currently no way to get that value in here // TODO use image languages if All Languages isn't toggled, but there's currently no way to get that value in here
var episodeResult = await _tmdbClientManager var episodeResult = await _tmdbClientManager
.GetEpisodeAsync(seriesTmdbId, seasonNumber.Value, episodeNumber.Value, series.DisplayOrder, null, null, cancellationToken) .GetEpisodeAsync(seriesTmdbId, seasonNumber, episodeNumber.Value, series.DisplayOrder, null, null, cancellationToken)
.ConfigureAwait(false); .ConfigureAwait(false);
var stills = episodeResult?.Images?.Stills; var stills = episodeResult?.Images?.Stills;

10
MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbEpisodeProvider.cs
View File

@ -47,7 +47,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
public async Task<IEnumerable<RemoteSearchResult>> GetSearchResults(EpisodeInfo searchInfo, CancellationToken cancellationToken) public async Task<IEnumerable<RemoteSearchResult>> GetSearchResults(EpisodeInfo searchInfo, CancellationToken cancellationToken)
{ {
// The search query must either provide an episode number or date // The search query must either provide an episode number or date
if (!searchInfo.IndexNumber.HasValue || !searchInfo.ParentIndexNumber.HasValue) if (!searchInfo.IndexNumber.HasValue)
{ {
return Enumerable.Empty<RemoteSearchResult>(); return Enumerable.Empty<RemoteSearchResult>();
} }
@ -96,10 +96,10 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
return metadataResult; return metadataResult;
} }
var seasonNumber = info.ParentIndexNumber; var seasonNumber = info.ParentIndexNumber ?? 1;
var episodeNumber = info.IndexNumber; var episodeNumber = info.IndexNumber;
if (!seasonNumber.HasValue || !episodeNumber.HasValue) if (!episodeNumber.HasValue)
{ {
return metadataResult; return metadataResult;
} }
@ -112,7 +112,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
List<TvEpisode>? result = null; List<TvEpisode>? result = null;
for (int? episode = startindex; episode <= endindex; episode++) 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); var episodeInfo = await _tmdbClientManager.GetEpisodeAsync(seriesTmdbId, seasonNumber, episode.Value, info.SeriesDisplayOrder, info.MetadataLanguage, TmdbUtils.GetImageLanguagesParam(info.MetadataLanguage), cancellationToken).ConfigureAwait(false);
if (episodeInfo is not null) if (episodeInfo is not null)
{ {
(result ??= new List<TvEpisode>()).Add(episodeInfo); (result ??= new List<TvEpisode>()).Add(episodeInfo);
@ -156,7 +156,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
else else
{ {
episodeResult = await _tmdbClientManager episodeResult = await _tmdbClientManager
.GetEpisodeAsync(seriesTmdbId, seasonNumber.Value, episodeNumber.Value, info.SeriesDisplayOrder, info.MetadataLanguage, TmdbUtils.GetImageLanguagesParam(info.MetadataLanguage), cancellationToken) .GetEpisodeAsync(seriesTmdbId, seasonNumber, episodeNumber.Value, info.SeriesDisplayOrder, info.MetadataLanguage, TmdbUtils.GetImageLanguagesParam(info.MetadataLanguage), cancellationToken)
.ConfigureAwait(false); .ConfigureAwait(false);
} }