Skip to content

Commit 367dcf8

Browse files
committed
Optimize special season identity
1 parent cdbb451 commit 367dcf8

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

Jellyfin.Plugin.MetaShark/Providers/EpisodeImageProvider.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public async Task<IEnumerable<RemoteImageInfo>> GetImages(BaseItem item, Cancell
6969
var seasonNumber = episode.ParentIndexNumber;
7070
var episodeNumber = episode.IndexNumber;
7171

72-
if (!seasonNumber.HasValue || !episodeNumber.HasValue)
72+
if (seasonNumber is null or 0 || episodeNumber is null or 0)
7373
{
7474
this.Log($"[GetEpisodeImages] The seasonNumber or episodeNumber is empty! seasonNumber: {seasonNumber} episodeNumber: {episodeNumber}");
7575
return Enumerable.Empty<RemoteImageInfo>();

Jellyfin.Plugin.MetaShark/Providers/EpisodeProvider.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public async Task<MetadataResult<Episode>> GetMetadata(EpisodeInfo info, Cancell
7575
seasonNumber = season.IndexNumber;
7676
}
7777
// 没有season级目录或目录不命名不规范时,会为null
78-
if (seasonNumber is null or 0)
78+
if (seasonNumber is null)
7979
{
8080
this.Log("FixSeasionNumber: season number is null, set to default 1");
8181
seasonNumber = 1;

Jellyfin.Plugin.MetaShark/Providers/SeasonProvider.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public async Task<MetadataResult<Season>> GetMetadata(SeasonInfo info, Cancellat
5050
info.SeriesProviderIds.TryGetValue(MetadataProvider.Tmdb.ToString(), out var seriesTmdbId);
5151
info.SeriesProviderIds.TryGetValue(Plugin.ProviderId, out var metaSource);
5252
info.SeriesProviderIds.TryGetValue(DoubanProviderId, out var sid);
53-
var seasonNumber = info.IndexNumber;
53+
var seasonNumber = info.IndexNumber; // S00/Season 00特典目录会为0
5454
var seasonSid = info.GetProviderId(DoubanProviderId);
5555
this.Log($"GetSeasonMetaData of [name]: {info.Name} number: {info.IndexNumber} seriesTmdbId: {seriesTmdbId} sid: {sid} metaSource: {metaSource}");
5656

@@ -68,7 +68,7 @@ public async Task<MetadataResult<Season>> GetMetadata(SeasonInfo info, Cancellat
6868
if (string.IsNullOrEmpty(seasonSid))
6969
{
7070
var seasonYear = 0;
71-
if (!string.IsNullOrEmpty(seriesTmdbId) && seasonNumber.HasValue)
71+
if (!string.IsNullOrEmpty(seriesTmdbId) && (seasonNumber.HasValue && seasonNumber > 0))
7272
{
7373
var season = await this._tmdbApi
7474
.GetSeasonAsync(seriesTmdbId.ToInt(), seasonNumber.Value, info.MetadataLanguage, info.MetadataLanguage, cancellationToken)
@@ -121,7 +121,7 @@ public async Task<MetadataResult<Season>> GetMetadata(SeasonInfo info, Cancellat
121121

122122

123123
// tmdb有数据,豆瓣找不到,尝试获取tmdb的季数据
124-
if (string.IsNullOrEmpty(seasonSid) && !string.IsNullOrWhiteSpace(seriesTmdbId) && seasonNumber.HasValue)
124+
if (string.IsNullOrEmpty(seasonSid) && !string.IsNullOrWhiteSpace(seriesTmdbId) && (seasonNumber.HasValue && seasonNumber > 0))
125125
{
126126
var tmdbResult = await this.GetMetadataByTmdb(info, seriesTmdbId, seasonNumber.Value, cancellationToken).ConfigureAwait(false);
127127
if (tmdbResult != null)
@@ -152,7 +152,7 @@ public async Task<MetadataResult<Season>> GetMetadata(SeasonInfo info, Cancellat
152152

153153
// series使用TMDB元数据来源
154154
// tmdb季级没有对应id,只通过indexNumber区分
155-
if (!string.IsNullOrWhiteSpace(seriesTmdbId) && seasonNumber.HasValue)
155+
if (!string.IsNullOrWhiteSpace(seriesTmdbId) && (seasonNumber.HasValue && seasonNumber > 0))
156156
{
157157
var tmdbResult = await this.GetMetadataByTmdb(info, seriesTmdbId, seasonNumber.Value, cancellationToken).ConfigureAwait(false);
158158
if (tmdbResult != null)

0 commit comments

Comments
 (0)