bobsong
/
jellyfin-plugin-metashark
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Optimize special season identity

This commit is contained in:
cxfksword 2022-11-08 13:03:43 +08:00
parent cdbb451743
commit 367dcf882c
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Jellyfin.Plugin.MetaShark/Providers/EpisodeImageProvider.cs
View File

@ -69,7 +69,7 @@ namespace Jellyfin.Plugin.MetaShark.Providers
var seasonNumber = episode.ParentIndexNumber;
var episodeNumber = episode.IndexNumber;
if (!seasonNumber.HasValue || !episodeNumber.HasValue)
if (seasonNumber is null or 0 || episodeNumber is null or 0)
{
this.Log($"[GetEpisodeImages] The seasonNumber or episodeNumber is empty! seasonNumber: {seasonNumber} episodeNumber: {episodeNumber}");
return Enumerable.Empty<RemoteImageInfo>();

2
Jellyfin.Plugin.MetaShark/Providers/EpisodeProvider.cs
View File

@ -75,7 +75,7 @@ namespace Jellyfin.Plugin.MetaShark.Providers
seasonNumber = season.IndexNumber;
}
// 没有season级目录或目录不命名不规范时，会为null
if (seasonNumber is null or 0)
if (seasonNumber is null)
{
this.Log("FixSeasionNumber: season number is null, set to default 1");
seasonNumber = 1;

8
Jellyfin.Plugin.MetaShark/Providers/SeasonProvider.cs
View File

@ -50,7 +50,7 @@ namespace Jellyfin.Plugin.MetaShark.Providers
info.SeriesProviderIds.TryGetValue(MetadataProvider.Tmdb.ToString(), out var seriesTmdbId);
info.SeriesProviderIds.TryGetValue(Plugin.ProviderId, out var metaSource);
info.SeriesProviderIds.TryGetValue(DoubanProviderId, out var sid);
var seasonNumber = info.IndexNumber;
var seasonNumber = info.IndexNumber; // S00/Season 00特典目录会为0
var seasonSid = info.GetProviderId(DoubanProviderId);
this.Log($"GetSeasonMetaData of [name]: {info.Name} number: {info.IndexNumber} seriesTmdbId: {seriesTmdbId} sid: {sid} metaSource: {metaSource}");
@ -68,7 +68,7 @@ namespace Jellyfin.Plugin.MetaShark.Providers
if (string.IsNullOrEmpty(seasonSid))
{
var seasonYear = 0;
if (!string.IsNullOrEmpty(seriesTmdbId) && seasonNumber.HasValue)
if (!string.IsNullOrEmpty(seriesTmdbId) && (seasonNumber.HasValue && seasonNumber > 0))
{
var season = await this._tmdbApi
.GetSeasonAsync(seriesTmdbId.ToInt(), seasonNumber.Value, info.MetadataLanguage, info.MetadataLanguage, cancellationToken)
@ -121,7 +121,7 @@ namespace Jellyfin.Plugin.MetaShark.Providers
// tmdb有数据，豆瓣找不到，尝试获取tmdb的季数据
if (string.IsNullOrEmpty(seasonSid) && !string.IsNullOrWhiteSpace(seriesTmdbId) && seasonNumber.HasValue)
if (string.IsNullOrEmpty(seasonSid) && !string.IsNullOrWhiteSpace(seriesTmdbId) && (seasonNumber.HasValue && seasonNumber > 0))
{
var tmdbResult = await this.GetMetadataByTmdb(info, seriesTmdbId, seasonNumber.Value, cancellationToken).ConfigureAwait(false);
if (tmdbResult != null)
@ -152,7 +152,7 @@ namespace Jellyfin.Plugin.MetaShark.Providers
// series使用TMDB元数据来源
// tmdb季级没有对应id，只通过indexNumber区分
if (!string.IsNullOrWhiteSpace(seriesTmdbId) && seasonNumber.HasValue)
if (!string.IsNullOrWhiteSpace(seriesTmdbId) && (seasonNumber.HasValue && seasonNumber > 0))
{
var tmdbResult = await this.GetMetadataByTmdb(info, seriesTmdbId, seasonNumber.Value, cancellationToken).ConfigureAwait(false);
if (tmdbResult != null)