Optimize season meta fetch

cxfksword · Oct 30, 2022 · be91a0a · be91a0a
1 parent 02db679
commit be91a0a
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 7 deletions.
diff --git a/Jellyfin.Plugin.MetaShark/Providers/EpisodeImageProvider.cs b/Jellyfin.Plugin.MetaShark/Providers/EpisodeImageProvider.cs
@@ -34,7 +34,7 @@ public class EpisodeImageProvider : BaseProvider, IRemoteImageProvider
         /// <param name="logger">Instance of the <see cref="ILogger{OddbImageProvider}"/> interface.</param>
         /// <param name="doubanApi">Instance of <see cref="DoubanApi"/>.</param>
         public EpisodeImageProvider(IHttpClientFactory httpClientFactory, ILoggerFactory loggerFactory, ILibraryManager libraryManager, DoubanApi doubanApi, TmdbApi tmdbApi, OmdbApi omdbApi)
-            : base(httpClientFactory, loggerFactory.CreateLogger<SeriesProvider>(), libraryManager, doubanApi, tmdbApi, omdbApi)
+            : base(httpClientFactory, loggerFactory.CreateLogger<EpisodeImageProvider>(), libraryManager, doubanApi, tmdbApi, omdbApi)
         {
         }
 

diff --git a/Jellyfin.Plugin.MetaShark/Providers/MovieImageProvider.cs b/Jellyfin.Plugin.MetaShark/Providers/MovieImageProvider.cs
@@ -31,7 +31,7 @@ public class MovieImageProvider : BaseProvider, IRemoteImageProvider
         /// <param name="logger">Instance of the <see cref="ILogger{OddbImageProvider}"/> interface.</param>
         /// <param name="doubanApi">Instance of <see cref="DoubanApi"/>.</param>
         public MovieImageProvider(IHttpClientFactory httpClientFactory, ILoggerFactory loggerFactory, ILibraryManager libraryManager, DoubanApi doubanApi, TmdbApi tmdbApi, OmdbApi omdbApi)
-            : base(httpClientFactory, loggerFactory.CreateLogger<SeriesProvider>(), libraryManager, doubanApi, tmdbApi, omdbApi)
+            : base(httpClientFactory, loggerFactory.CreateLogger<MovieImageProvider>(), libraryManager, doubanApi, tmdbApi, omdbApi)
         {
         }
 

diff --git a/Jellyfin.Plugin.MetaShark/Providers/MovieProvider.cs b/Jellyfin.Plugin.MetaShark/Providers/MovieProvider.cs
@@ -32,7 +32,7 @@ namespace Jellyfin.Plugin.MetaShark.Providers
     public class MovieProvider : BaseProvider, IRemoteMetadataProvider<Movie, MovieInfo>
     {
         public MovieProvider(IHttpClientFactory httpClientFactory, ILoggerFactory loggerFactory, ILibraryManager libraryManager, DoubanApi doubanApi, TmdbApi tmdbApi, OmdbApi omdbApi)
-            : base(httpClientFactory, loggerFactory.CreateLogger<SeriesProvider>(), libraryManager, doubanApi, tmdbApi, omdbApi)
+            : base(httpClientFactory, loggerFactory.CreateLogger<MovieProvider>(), libraryManager, doubanApi, tmdbApi, omdbApi)
         {
         }
 

diff --git a/Jellyfin.Plugin.MetaShark/Providers/SeasonImageProvider.cs b/Jellyfin.Plugin.MetaShark/Providers/SeasonImageProvider.cs
@@ -32,7 +32,7 @@ public class SeasonImageProvider : BaseProvider, IRemoteImageProvider
         /// <param name="logger">Instance of the <see cref="ILogger{OddbImageProvider}"/> interface.</param>
         /// <param name="doubanApi">Instance of <see cref="DoubanApi"/>.</param>
         public SeasonImageProvider(IHttpClientFactory httpClientFactory, ILoggerFactory loggerFactory, ILibraryManager libraryManager, DoubanApi doubanApi, TmdbApi tmdbApi, OmdbApi omdbApi)
-            : base(httpClientFactory, loggerFactory.CreateLogger<SeriesProvider>(), libraryManager, doubanApi, tmdbApi, omdbApi)
+            : base(httpClientFactory, loggerFactory.CreateLogger<SeasonImageProvider>(), libraryManager, doubanApi, tmdbApi, omdbApi)
         {
         }
 

diff --git a/Jellyfin.Plugin.MetaShark/Providers/SeriesImageProvider.cs b/Jellyfin.Plugin.MetaShark/Providers/SeriesImageProvider.cs
@@ -31,7 +31,7 @@ public class SeriesImageProvider : BaseProvider, IRemoteImageProvider
         /// <param name="logger">Instance of the <see cref="ILogger{OddbImageProvider}"/> interface.</param>
         /// <param name="doubanApi">Instance of <see cref="DoubanApi"/>.</param>
         public SeriesImageProvider(IHttpClientFactory httpClientFactory, ILoggerFactory loggerFactory, ILibraryManager libraryManager, DoubanApi doubanApi, TmdbApi tmdbApi, OmdbApi omdbApi)
-            : base(httpClientFactory, loggerFactory.CreateLogger<SeriesProvider>(), libraryManager, doubanApi, tmdbApi, omdbApi)
+            : base(httpClientFactory, loggerFactory.CreateLogger<SeriesImageProvider>(), libraryManager, doubanApi, tmdbApi, omdbApi)
         {
         }
 

diff --git a/Jellyfin.Plugin.MetaShark/Providers/SeriesProvider.cs b/Jellyfin.Plugin.MetaShark/Providers/SeriesProvider.cs
@@ -119,6 +119,8 @@ public async Task<MetadataResult<Series>> GetMetadata(SeriesInfo info, Cancellat
                     // ProductionLocations = [x?.Country],
                     PremiereDate = subject.ScreenTime,
                 };
+
+                // 通过imdb获取tmdbId
                 if (!string.IsNullOrEmpty(subject.Imdb))
                 {
                     item.SetProviderId(MetadataProvider.Imdb, subject.Imdb);
@@ -131,13 +133,24 @@ public async Task<MetadataResult<Series>> GetMetadata(SeriesInfo info, Cancellat
                             var findResult = await this._tmdbApi.FindByExternalIdAsync(omdbItem.ImdbID, FindExternalSource.Imdb, info.MetadataLanguage, cancellationToken).ConfigureAwait(false);
                             if (findResult?.TvResults != null && findResult.TvResults.Count > 0)
                             {
-                                this.Log($"GetSeriesMetadata found tmdb [id]: {findResult.TvResults[0].Id} by imdb id: {subject.Imdb}");
-                                item.SetProviderId(MetadataProvider.Tmdb, $"{findResult.TvResults[0].Id}");
+                                tmdbId = $"{findResult.TvResults[0].Id}";
+                                this.Log($"GetSeriesMetadata found tmdb [id]: {tmdbId} by imdb id: {subject.Imdb}");
+                                item.SetProviderId(MetadataProvider.Tmdb, tmdbId);
                             }
                         }
                     }
                 }
 
+                // 尝试通过搜索匹配获取tmdbId
+                if (string.IsNullOrEmpty(tmdbId))
+                {
+                    tmdbId = await this.GuestByTmdbAsync(info, cancellationToken).ConfigureAwait(false);
+                    if (!string.IsNullOrEmpty(tmdbId))
+                    {
+                        item.SetProviderId(MetadataProvider.Tmdb, tmdbId);
+                    }
+                }
+
 
                 result.Item = item;
                 result.QueriedById = true;