Support searching by DoubanID

Libitum · Feb 20, 2020 · 240751b · 240751b
1 parent c4da482
commit 240751b
Show file tree

Hide file tree

Showing 5 changed files with 83 additions and 52 deletions.
diff --git a/Jellyfin.Plugin.Douban.Tests/Jellyfin.Plugin.Douban.Tests.csproj b/Jellyfin.Plugin.Douban.Tests/Jellyfin.Plugin.Douban.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>

diff --git a/Jellyfin.Plugin.Douban.Tests/MovieProviderTest.cs b/Jellyfin.Plugin.Douban.Tests/MovieProviderTest.cs
@@ -1,34 +1,34 @@
-using System;
-using System.Net.Http;
-using System.Threading;
-
-using MediaBrowser.Controller.Providers;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using Xunit;
-
-using Jellyfin.Plugin.Douban.Tests.Mock;
-
-namespace Jellyfin.Plugin.Douban.Tests
-{
-    public class MovieProviderTest
-    {
-        private readonly MovieProvider _doubanProvider;
-        private readonly IServiceProvider _serviceProvider;
-
-        public MovieProviderTest()
-        {
-            _serviceProvider = new ServiceCollection().AddLogging(builder => builder.AddConsole())
-                                                      .BuildServiceProvider();
-            var loggerFactory = _serviceProvider.GetService<ILoggerFactory>();
-            var logger = loggerFactory.CreateLogger("test");
-
-            var httpClient = new MockHttpClient();
-            var jsonSerializer = new MockJsonSerializer();
-            _doubanProvider = new MovieProvider(httpClient, jsonSerializer, logger);
-        }
-
-        [Fact]
+using System;
+using System.Net.Http;
+using System.Threading;
+
+using MediaBrowser.Controller.Providers;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Xunit;
+
+using Jellyfin.Plugin.Douban.Tests.Mock;
+
+namespace Jellyfin.Plugin.Douban.Tests
+{
+    public class MovieProviderTest
+    {
+        private readonly MovieProvider _doubanProvider;
+        private readonly IServiceProvider _serviceProvider;
+
+        public MovieProviderTest()
+        {
+            _serviceProvider = new ServiceCollection().AddLogging(builder => builder.AddConsole())
+                                                      .BuildServiceProvider();
+            var loggerFactory = _serviceProvider.GetService<ILoggerFactory>();
+            var logger = loggerFactory.CreateLogger("test");
+
+            var httpClient = new MockHttpClient();
+            var jsonSerializer = new MockJsonSerializer();
+            _doubanProvider = new MovieProvider(httpClient, jsonSerializer, logger);
+        }
+
+        [Fact]
         public void TestGetMetadata()
         {
             MovieInfo info = new MovieInfo()
@@ -64,10 +64,10 @@ public void TestGetMetadata()
             info = new MovieInfo()
             {
                 MetadataLanguage = "zh",
-                Name = "亮剑"
+                Name = "三国演义"
             };
             meta = _doubanProvider.GetMetadata(info, CancellationToken.None).Result;
             Assert.False(meta.HasMetadata);
-        }
-    }
-}
+        }
+    }
+}
diff --git a/Jellyfin.Plugin.Douban/BaseProvider.cs b/Jellyfin.Plugin.Douban/BaseProvider.cs
@@ -18,7 +18,7 @@ namespace Jellyfin.Plugin.Douban
 {
     public abstract class BaseProvider
     {
-        protected const string ProviderID = "DoubanID";
+        internal const string ProviderID = "DoubanID";
 
         protected IHttpClient _httpClient;
         protected IJsonSerializer _jsonSerializer;
@@ -111,7 +111,7 @@ protected async Task<MetadataResult<T>> GetMetaFromDouban<T>(string sid,
             var data = await GetDoubanSubject(sid, cancellationToken);
             if (!String.IsNullOrEmpty(type) && data.Subtype != type)
             {
-                _logger.LogInformation("Douban: Sid {1}'s type is {2}, " +
+                _logger.LogInformation("Douban: Sid {1}'s type is {2}, " +
                     "but require {3}", sid, data.Subtype, type);
                 return result;
             }
@@ -135,7 +135,7 @@ protected async Task<MetadataResult<T>> GetMetaFromDouban<T>(string sid,
         internal async Task<Response.Subject> GetDoubanSubject(string sid,
                                          CancellationToken cancellationToken)
         {
-            _logger.LogInformation("Douban: Trying to get douban subject by " +
+            _logger.LogInformation("Douban: Trying to get douban subject by " +
                 "sid: {0}", sid);
             cancellationToken.ThrowIfCancellationRequested();
 
@@ -145,7 +145,7 @@ protected async Task<MetadataResult<T>> GetMetaFromDouban<T>(string sid,
             }
 
             String apikey = _config.ApiKey;
-            var url = String.Format("http://api.douban.com/v2/movie/subject" +
+            var url = String.Format("http://api.douban.com/v2/movie/subject" +
                 "/{0}?apikey={1}", sid, apikey);
             var options = new HttpRequestOptions
             {

diff --git a/Jellyfin.Plugin.Douban/MovieProvider.cs b/Jellyfin.Plugin.Douban/MovieProvider.cs
@@ -86,8 +86,23 @@ public async Task<IEnumerable<RemoteSearchResult>> GetSearchResults(
                 return results;
             }
 
-            var sidList = await SearchSidByName(info.Name, cancellationToken).
-                ConfigureAwait(false);
+            IEnumerable<string> sidList;
+
+            string doubanId = info.GetProviderId(ProviderID);
+            _logger.LogInformation("douban id is {0}", doubanId);
+            if (!string.IsNullOrEmpty(doubanId))
+            {
+                sidList = new List<string>
+                {
+                    doubanId
+                };
+            }
+            else
+            {
+                sidList = await SearchSidByName(info.Name, cancellationToken).
+                    ConfigureAwait(false);
+            }
+
             foreach (String sid in sidList)
             {
                 var subject = await GetDoubanSubject(sid, cancellationToken).

diff --git a/Jellyfin.Plugin.Douban/TVProvider.cs b/Jellyfin.Plugin.Douban/TVProvider.cs
@@ -44,11 +44,11 @@ public async Task<MetadataResult<Series>> GetMetadata(SeriesInfo info,
             _logger.LogInformation($"Douban:GetMetadata name: {info.Name}");
 
 
-            // Only handle it when launguage is "zh"
+            // Only handle it when language is "zh"
             if (info.MetadataLanguage != "zh")
             {
-                _logger.LogInformation("DoubanProvider: the required " +
-                    "launguage is not zh, so just bypass DoubanProvider");
+                _logger.LogInformation("DoubanProvider: the required " +
+                    "language is not zh, so just bypass DoubanProvider");
                 return new MetadataResult<Series>();
             }
 
@@ -77,6 +77,7 @@ public async Task<MetadataResult<Series>> GetMetadata(SeriesInfo info,
             if (result.HasMetadata)
             {
                 info.SetProviderId(ProviderID, sid);
+                result.QueriedById = true;
             }
 
             return result;
@@ -89,16 +90,31 @@ public async Task<IEnumerable<RemoteSearchResult>> GetSearchResults(
 
             var results = new List<RemoteSearchResult>();
 
-            // Only handle it when launguage is "zh"
+            // Only handle it when language is "zh"
             if (info.MetadataLanguage != "zh")
             {
-                _logger.LogInformation("DoubanProvider: the required " +
-                    "launguage is not zh, so just bypass DoubanProvider");
+                _logger.LogInformation("DoubanProvider: the required " +
+                    "language is not zh, so just bypass DoubanProvider");
                 return results;
             }
 
-            var sidList = await SearchSidByName(info.Name, cancellationToken).
-                ConfigureAwait(false);
+            IEnumerable<string> sidList;
+
+            string doubanId = info.GetProviderId(ProviderID);
+            _logger.LogInformation("douban id is {0}", doubanId);
+            if (!string.IsNullOrEmpty(doubanId))
+            {
+                sidList = new List<string>
+                {
+                    doubanId
+                };
+            }
+            else
+            {
+                sidList = await SearchSidByName(info.Name, cancellationToken).
+                    ConfigureAwait(false);
+            }
+
             foreach (String sid in sidList)
             {
                 var subject = await GetDoubanSubject(sid, cancellationToken).
@@ -190,12 +206,12 @@ public async Task<MetadataResult<Episode>> GetMetadata(EpisodeInfo info,
 
             if (!info.IndexNumber.HasValue)
             {
-                _logger.LogInformation("No episode num found, please check " +
+                _logger.LogInformation("No episode num found, please check " +
                     "the format of file name");
                 return result;
             }
             // Start to get information from douban
-            var url = String.Format("https://movie.douban.com/subject/{0}" +
+            var url = String.Format("https://movie.douban.com/subject/{0}" +
                 "/episode/{1}/", sid, info.IndexNumber);
             var options = new HttpRequestOptions
             {