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

fix #14: old tmdb plugin meta bug

This commit is contained in:
cxfksword 2023-02-18 15:45:41 +08:00
parent 7bf1ea9970
commit 641102baa7
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Jellyfin.Plugin.MetaShark/Providers/MovieProvider.cs
View File

@ -92,10 +92,14 @@ namespace Jellyfin.Plugin.MetaShark.Providers
this.Log($"GetMovieMetadata of [name]: {info.Name}"); this.Log($"GetMovieMetadata of [name]: {info.Name}");
var result = new MetadataResult<Movie>(); var result = new MetadataResult<Movie>();
// 使用刷新元数据时，providerIds会保留旧有值，只有识别/新增才会没值
var sid = info.GetProviderId(DoubanProviderId); var sid = info.GetProviderId(DoubanProviderId);
var tmdbId = info.GetProviderId(MetadataProvider.Tmdb); var tmdbId = info.GetProviderId(MetadataProvider.Tmdb);
var metaSource = info.GetProviderId(Plugin.ProviderId); // 刷新元数据时会有值 var metaSource = info.GetProviderId(Plugin.ProviderId);
if (string.IsNullOrEmpty(sid) && string.IsNullOrEmpty(tmdbId)) // 注意：会存在元数据有tmdbId，但metaSource没值的情况（之前由TMDB插件刮削导致）
var hasTmdbMeta = metaSource == MetaSource.Tmdb && !string.IsNullOrEmpty(tmdbId);
var hasDoubanMeta = metaSource != MetaSource.Tmdb && !string.IsNullOrEmpty(sid);
if (!hasDoubanMeta && !hasTmdbMeta)
{ {
// 自动扫描搜索匹配元数据 // 自动扫描搜索匹配元数据
sid = await this.GuessByDoubanAsync(info, cancellationToken).ConfigureAwait(false); sid = await this.GuessByDoubanAsync(info, cancellationToken).ConfigureAwait(false);
@ -145,13 +149,18 @@ namespace Jellyfin.Plugin.MetaShark.Providers
// 通过imdb获取电影系列信息 // 通过imdb获取电影系列信息
if (this.config.EnableTmdbCollection && !string.IsNullOrEmpty(tmdbId)) if (this.config.EnableTmdbCollection && !string.IsNullOrEmpty(tmdbId))
{ {
var movieResult = await _tmdbApi try
.GetMovieAsync(Convert.ToInt32(tmdbId, CultureInfo.InvariantCulture), info.MetadataLanguage, info.MetadataLanguage, cancellationToken)
.ConfigureAwait(false);
if (movieResult != null && movieResult.BelongsToCollection != null)
{ {
movie.CollectionName = movieResult.BelongsToCollection.Name; var movieResult = await _tmdbApi
.GetMovieAsync(Convert.ToInt32(tmdbId, CultureInfo.InvariantCulture), info.MetadataLanguage, info.MetadataLanguage, cancellationToken)
.ConfigureAwait(false);
if (movieResult != null && movieResult.BelongsToCollection != null)
{
movie.CollectionName = movieResult.BelongsToCollection.Name;
}
} }
catch (Exception ex)
{ }
} }

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

@ -84,10 +84,14 @@ namespace Jellyfin.Plugin.MetaShark.Providers
this.Log($"GetSeriesMetadata of [name]: {info.Name} [providerIds]: {info.ProviderIds.ToJson()}"); this.Log($"GetSeriesMetadata of [name]: {info.Name} [providerIds]: {info.ProviderIds.ToJson()}");
var result = new MetadataResult<Series>(); var result = new MetadataResult<Series>();
// 使用刷新元数据时，providerIds会保留旧有值，只有识别/新增才会没值
var sid = info.GetProviderId(DoubanProviderId); var sid = info.GetProviderId(DoubanProviderId);
var tmdbId = info.GetProviderId(MetadataProvider.Tmdb); var tmdbId = info.GetProviderId(MetadataProvider.Tmdb);
var metaSource = info.GetProviderId(Plugin.ProviderId); // 刷新元数据时会有值 var metaSource = info.GetProviderId(Plugin.ProviderId);
if (string.IsNullOrEmpty(sid) && string.IsNullOrEmpty(tmdbId)) // 注意：会存在元数据有tmdbId，但metaSource没值的情况（之前由TMDB插件刮削导致）
var hasTmdbMeta = metaSource == MetaSource.Tmdb && !string.IsNullOrEmpty(tmdbId);
var hasDoubanMeta = metaSource != MetaSource.Tmdb && !string.IsNullOrEmpty(sid);
if (!hasDoubanMeta && !hasTmdbMeta)
{ {
// 自动扫描搜索匹配元数据 // 自动扫描搜索匹配元数据
sid = await this.GuessByDoubanAsync(info, cancellationToken).ConfigureAwait(false); sid = await this.GuessByDoubanAsync(info, cancellationToken).ConfigureAwait(false);