Fix search only return one result

Author: cxfksword

Jellyfin.Plugin.MetaShark.Test/MovieProviderTest.cs

@@ -42,9 +42,9 @@ public void TestGetMetadata()
 
             Task.Run(async () =>
             {
-                var info = new MovieInfo() { Name = "南极料理人", MetadataLanguage = "zh" };
+                var info = new MovieInfo() { Name = "我", MetadataLanguage = "zh" };
                 var provider = new MovieProvider(httpClientFactory, loggerFactory, libraryManagerStub.Object, httpContextAccessorStub.Object, doubanApi, tmdbApi, omdbApi);
-                var result = await provider.GetMetadata(info, CancellationToken.None);
+                var result = await provider.GetSearchResults(info, CancellationToken.None);
                 Assert.IsNotNull(result);
 
                 var str = result.ToJson();

Jellyfin.Plugin.MetaShark/Providers/MovieProvider.cs

@@ -52,13 +52,14 @@ public async Task<IEnumerable<RemoteSearchResult>> GetSearchResults(MovieInfo in
             }
 
             // 从douban搜索
+            // BUG注意：ProviderIds传多个meta值，会导致识别搜索时只返回一个结果
             var res = await this._doubanApi.SearchAsync(info.Name, cancellationToken).ConfigureAwait(false);
             result.AddRange(res.Take(Configuration.PluginConfiguration.MAX_SEARCH_RESULT).Select(x =>
             {
                 return new RemoteSearchResult
                 {
                     SearchProviderName = DoubanProviderName,
-                    ProviderIds = new Dictionary<string, string> { { DoubanProviderId, x.Sid }, { Plugin.ProviderId, MetaSource.Douban } },
+                    ProviderIds = new Dictionary<string, string> { { DoubanProviderId, x.Sid } },
                     ImageUrl = this.GetProxyImageUrl(x.Img),
                     ProductionYear = x.Year,
                     Name = x.Name,
@@ -75,7 +76,7 @@ public async Task<IEnumerable<RemoteSearchResult>> GetSearchResults(MovieInfo in
                     return new RemoteSearchResult
                     {
                         SearchProviderName = TmdbProviderName,
-                        ProviderIds = new Dictionary<string, string> { { MetadataProvider.Tmdb.ToString(), x.Id.ToString(CultureInfo.InvariantCulture) }, { Plugin.ProviderId, MetaSource.Tmdb } },
+                        ProviderIds = new Dictionary<string, string> { { MetadataProvider.Tmdb.ToString(), x.Id.ToString(CultureInfo.InvariantCulture) } },
                         Name = string.Format("[TMDB]{0}", x.Title ?? x.OriginalTitle),
                         ImageUrl = this._tmdbApi.GetPosterUrl(x.PosterPath),
                         Overview = x.Overview,
@@ -97,6 +98,11 @@ public async Task<MetadataResult<Movie>> GetMetadata(MovieInfo info, Cancellatio
             var sid = info.GetProviderId(DoubanProviderId);
             var tmdbId = info.GetProviderId(MetadataProvider.Tmdb);
             var metaSource = info.GetProviderId(Plugin.ProviderId);
+            // 用于修正识别时指定tmdb，没法读取tmdb数据的BUG。。。两个合在一起太难了。。。
+            if (string.IsNullOrEmpty(metaSource) && info.Name.StartsWith("[TMDB]"))
+            {
+                metaSource = MetaSource.Tmdb;
+            }
             // 注意：会存在元数据有tmdbId，但metaSource没值的情况（之前由TMDB插件刮削导致）
             var hasTmdbMeta = metaSource == MetaSource.Tmdb && !string.IsNullOrEmpty(tmdbId);
             var hasDoubanMeta = metaSource != MetaSource.Tmdb && !string.IsNullOrEmpty(sid);

Jellyfin.Plugin.MetaShark/Providers/SeriesProvider.cs

@@ -50,7 +50,7 @@ public async Task<IEnumerable<RemoteSearchResult>> GetSearchResults(SeriesInfo i
                 return new RemoteSearchResult
                 {
                     SearchProviderName = DoubanProviderName,
-                    ProviderIds = new Dictionary<string, string> { { DoubanProviderId, x.Sid }, { Plugin.ProviderId, MetaSource.Douban } },
+                    ProviderIds = new Dictionary<string, string> { { DoubanProviderId, x.Sid } },
                     ImageUrl = this.GetProxyImageUrl(x.Img),
                     ProductionYear = x.Year,
                     Name = x.Name,
@@ -66,7 +66,7 @@ public async Task<IEnumerable<RemoteSearchResult>> GetSearchResults(SeriesInfo i
                     return new RemoteSearchResult
                     {
                         SearchProviderName = TmdbProviderName,
-                        ProviderIds = new Dictionary<string, string> { { MetadataProvider.Tmdb.ToString(), x.Id.ToString(CultureInfo.InvariantCulture) }, { Plugin.ProviderId, MetaSource.Tmdb } },
+                        ProviderIds = new Dictionary<string, string> { { MetadataProvider.Tmdb.ToString(), x.Id.ToString(CultureInfo.InvariantCulture) } },
                         Name = string.Format("[TMDB]{0}", x.Name ?? x.OriginalName),
                         ImageUrl = this._tmdbApi.GetPosterUrl(x.PosterPath),
                         Overview = x.Overview,
@@ -87,6 +87,11 @@ public async Task<MetadataResult<Series>> GetMetadata(SeriesInfo info, Cancellat
             var sid = info.GetProviderId(DoubanProviderId);
             var tmdbId = info.GetProviderId(MetadataProvider.Tmdb);
             var metaSource = info.GetProviderId(Plugin.ProviderId);
+            // 用于修正识别时指定tmdb，没法读取tmdb数据的BUG。。。两个合在一起太难了。。。
+            if (string.IsNullOrEmpty(metaSource) && info.Name.StartsWith("[TMDB]"))
+            {
+                metaSource = MetaSource.Tmdb;
+            }
             // 注意：会存在元数据有tmdbId，但metaSource没值的情况（之前由TMDB插件刮削导致）
             var hasTmdbMeta = metaSource == MetaSource.Tmdb && !string.IsNullOrEmpty(tmdbId);
             var hasDoubanMeta = metaSource != MetaSource.Tmdb && !string.IsNullOrEmpty(sid);