Merge pull request #54 from Musi13/fix-anidb-searching

dkanada · web-flow · commit 5272775d5c48 · 2020-03-16T01:16:38.000+09:00
Fix metadata 403's and Add images to search results
diff --git a/Jellyfin.Plugin.Anime/Constants.cs b/Jellyfin.Plugin.Anime/Constants.cs
@@ -0,0 +1,7 @@
+namespace Jellyfin.Plugin.Anime
+{
+    static class Constants
+    {
+        public const string UserAgent = "jellyfin-plugin-anime";
+    }
+}
diff --git a/Jellyfin.Plugin.Anime/Jellyfin.Plugin.Anime.csproj b/Jellyfin.Plugin.Anime/Jellyfin.Plugin.Anime.csproj
@@ -3,8 +3,8 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.1</TargetFramework>
     <RootNamespace>Jellyfin.Plugin.Anime</RootNamespace>
-    <AssemblyVersion>4.0.0</AssemblyVersion>
-    <FileVersion>4.0.0</FileVersion>
+    <AssemblyVersion>5.0.0</AssemblyVersion>
+    <FileVersion>5.0.0</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/Jellyfin.Plugin.Anime/Providers/AniDB/Identity/AniDbTitleDownloader.cs b/Jellyfin.Plugin.Anime/Providers/AniDB/Identity/AniDbTitleDownloader.cs
@@ -18,7 +18,7 @@ public class AniDbTitleDownloader : IAniDbTitleDownloader
         /// <summary>
         /// The URL for retrieving a list of all anime titles and their AniDB IDs.
         /// </summary>
-        private const string TitlesUrl = "http://anidb.net/api/animetitles.xml.gz";
+        private const string TitlesUrl = "http://anidb.net/api/anime-titles.xml.gz";
 
         private readonly IApplicationPaths _paths;
         private readonly ILogger _logger;
@@ -79,17 +79,7 @@ public async Task Load(CancellationToken cancellationToken)
         private async Task DownloadTitles(string titlesFile)
         {
             _logger.LogDebug("Downloading new AniDB titles file.");
-
-            var client = new WebClient();
-
-            await AniDbSeriesProvider.RequestLimiter.Tick().ConfigureAwait(false);
-            await Task.Delay(Plugin.Instance.Configuration.AniDB_wait_time).ConfigureAwait(false);
-            using (var stream = await client.OpenReadTaskAsync(TitlesUrl))
-            using (var unzipped = new GZipStream(stream, CompressionMode.Decompress))
-            using (var writer = File.Open(titlesFile, FileMode.Create, FileAccess.Write))
-            {
-                await unzipped.CopyToAsync(writer).ConfigureAwait(false);
-            }
+            await DownloadTitles_static(titlesFile);
         }
 
         /// <summary>
@@ -101,6 +91,7 @@ private async Task DownloadTitles(string titlesFile)
         private static async Task DownloadTitles_static(string titlesFile)
         {
             var client = new WebClient();
+            client.Headers.Add("User-Agent", Constants.UserAgent);
 
             await AniDbSeriesProvider.RequestLimiter.Tick().ConfigureAwait(false);
             await Task.Delay(Plugin.Instance.Configuration.AniDB_wait_time).ConfigureAwait(false);
diff --git a/Jellyfin.Plugin.Anime/Providers/AniDB/Metadata/AniDbEpisodeProvider.cs b/Jellyfin.Plugin.Anime/Providers/AniDB/Metadata/AniDbEpisodeProvider.cs
@@ -154,7 +154,8 @@ await AniDbSeriesProvider.GetSeriesData(
 
         public Task<HttpResponseInfo> GetImageResponse(string url, CancellationToken cancellationToken)
         {
-            throw new NotImplementedException();
+            var imageProvider = new AniDbImageProvider(_httpClient, _configurationManager.ApplicationPaths);
+            return imageProvider.GetImageResponse(url, cancellationToken);
         }
 
         private async Task ParseAdditionalEpisodeXml(FileInfo xml, Episode episode, string metadataLanguage)
diff --git a/Jellyfin.Plugin.Anime/Providers/AniDB/Metadata/AniDbImageProvider.cs b/Jellyfin.Plugin.Anime/Providers/AniDB/Metadata/AniDbImageProvider.cs
@@ -33,6 +33,7 @@ public async Task<HttpResponseInfo> GetImageResponse(string url, CancellationTok
 
             return await _httpClient.GetResponse(new HttpRequestOptions
             {
+                UserAgent = Constants.UserAgent,
                 CancellationToken = cancellationToken,
                 Url = url
             }).ConfigureAwait(false);
diff --git a/Jellyfin.Plugin.Anime/Providers/AniDB/Metadata/AniDbPersonProvider.cs b/Jellyfin.Plugin.Anime/Providers/AniDB/Metadata/AniDbPersonProvider.cs
@@ -102,6 +102,7 @@ public async Task<HttpResponseInfo> GetImageResponse(string url, CancellationTok
 
             return await _httpClient.GetResponse(new HttpRequestOptions
             {
+                UserAgent = Constants.UserAgent,
                 CancellationToken = cancellationToken,
                 Url = url
             }).ConfigureAwait(false);
diff --git a/Jellyfin.Plugin.Anime/Providers/AniDB/Metadata/AniDbSeriesProvider.cs b/Jellyfin.Plugin.Anime/Providers/AniDB/Metadata/AniDbSeriesProvider.cs
@@ -95,11 +95,15 @@ public async Task<IEnumerable<RemoteSearchResult>> GetSearchResults(SeriesInfo s
 
             if (metadata.HasMetadata)
             {
+                var seriesId = metadata.Item.ProviderIds.GetOrDefault(ProviderNames.AniDb);
+                var imageProvider = new AniDbImageProvider(_httpClient, _appPaths);
+                var images = await imageProvider.GetImages(seriesId, cancellationToken);
                 var res = new RemoteSearchResult
                 {
                     Name = metadata.Item.Name,
                     PremiereDate = metadata.Item.PremiereDate,
                     ProductionYear = metadata.Item.ProductionYear,
+                    ImageUrl = images.Any() ? images.First().Url : null,
                     ProviderIds = metadata.Item.ProviderIds,
                     SearchProviderName = Name
                 };
@@ -114,6 +118,7 @@ public Task<HttpResponseInfo> GetImageResponse(string url, CancellationToken can
         {
             return _httpClient.GetResponse(new HttpRequestOptions
             {
+                UserAgent = Constants.UserAgent,
                 CancellationToken = cancellationToken,
                 Url = url
             });
@@ -518,6 +523,7 @@ private static async Task DownloadSeriesData(string aid, string seriesDataPath,
 
             var requestOptions = new HttpRequestOptions
             {
+                UserAgent = Constants.UserAgent,
                 Url = string.Format(SeriesQueryUrl, ClientName, aid),
                 CancellationToken = cancellationToken
             };
diff --git a/Jellyfin.Plugin.Anime/Providers/AniList/AniListApi.cs b/Jellyfin.Plugin.Anime/Providers/AniList/AniListApi.cs
@@ -371,6 +371,7 @@ public async Task<RootObject> WebRequestAPI(string link)
                 string _strContent = "";
                 using (WebClient client = new WebClient())
                 {
+                    client.Headers.Add("User-Agent", Constants.UserAgent);
                     var values = new System.Collections.Specialized.NameValueCollection();
 
                     var response = await Task.Run(() => client.UploadValues(new Uri(link),values));
diff --git a/Jellyfin.Plugin.Anime/Providers/AniList/AniListSeriesProvider.cs b/Jellyfin.Plugin.Anime/Providers/AniList/AniListSeriesProvider.cs
@@ -106,6 +106,7 @@ public Task<HttpResponseInfo> GetImageResponse(string url, CancellationToken can
         {
             return _httpClient.GetResponse(new HttpRequestOptions
             {
+                UserAgent = Constants.UserAgent,
                 CancellationToken = cancellationToken,
                 Url = url
             });
@@ -160,6 +161,7 @@ public Task<HttpResponseInfo> GetImageResponse(string url, CancellationToken can
         {
             return _httpClient.GetResponse(new HttpRequestOptions
             {
+                UserAgent = Constants.UserAgent,
                 CancellationToken = cancellationToken,
                 Url = url
             });
diff --git a/Jellyfin.Plugin.Anime/Providers/AniSearch/AniSearchApi.cs b/Jellyfin.Plugin.Anime/Providers/AniSearch/AniSearchApi.cs
@@ -297,6 +297,7 @@ public static async Task<string> WebRequestAPI(string link)
                 string _strContent = "";
                 using (WebClient client = new WebClient())
                 {
+                    client.Headers.Add("User-Agent", Constants.UserAgent);
                     Task<string> async_content = client.DownloadStringTaskAsync(link);
                     _strContent = await async_content;
                 }
diff --git a/Jellyfin.Plugin.Anime/Providers/AniSearch/AniSearchSeriesProvider.cs b/Jellyfin.Plugin.Anime/Providers/AniSearch/AniSearchSeriesProvider.cs
@@ -98,6 +98,7 @@ public Task<HttpResponseInfo> GetImageResponse(string url, CancellationToken can
         {
             return _httpClient.GetResponse(new HttpRequestOptions
             {
+                UserAgent = Constants.UserAgent,
                 CancellationToken = cancellationToken,
                 Url = url
             });
@@ -151,6 +152,7 @@ public Task<HttpResponseInfo> GetImageResponse(string url, CancellationToken can
         {
             return _httpClient.GetResponse(new HttpRequestOptions
             {
+                UserAgent = Constants.UserAgent,
                 CancellationToken = cancellationToken,
                 Url = url
             });
diff --git a/build.yaml b/build.yaml
@@ -1,7 +1,7 @@
 ---
 name: "jellyfin-plugin-anime"
 guid: "a4df60c5-6ab4-412a-8f79-2cab93fb2bc5"
-version: "4"
+version: "5"
 jellyfin_version: "10.3.0"
 owner: "jellyfin"
 nicename: "Anime"

Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,8 @@ await AniDbSeriesProvider.GetSeriesData(`
`154`	`154`
`155`	`155`	`public Task<HttpResponseInfo> GetImageResponse(string url, CancellationToken cancellationToken)`
`156`	`156`	`{`
`157`		`- throw new NotImplementedException();`
	`157`	`+ var imageProvider = new AniDbImageProvider(_httpClient, _configurationManager.ApplicationPaths);`
	`158`	`+ return imageProvider.GetImageResponse(url, cancellationToken);`
`158`	`159`	`}`
`159`	`160`
`160`	`161`	`private async Task ParseAdditionalEpisodeXml(FileInfo xml, Episode episode, string metadataLanguage)`
Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@ public async Task<HttpResponseInfo> GetImageResponse(string url, CancellationTok`
`33`	`33`
`34`	`34`	`return await _httpClient.GetResponse(new HttpRequestOptions`
`35`	`35`	`{`
	`36`	`+ UserAgent = Constants.UserAgent,`
`36`	`37`	`CancellationToken = cancellationToken,`
`37`	`38`	`Url = url`
`38`	`39`	`}).ConfigureAwait(false);`
Original file line number	Diff line number	Diff line change
`@@ -102,6 +102,7 @@ public async Task<HttpResponseInfo> GetImageResponse(string url, CancellationTok`
`102`	`102`
`103`	`103`	`return await _httpClient.GetResponse(new HttpRequestOptions`
`104`	`104`	`{`
	`105`	`+ UserAgent = Constants.UserAgent,`
`105`	`106`	`CancellationToken = cancellationToken,`
`106`	`107`	`Url = url`
`107`	`108`	`}).ConfigureAwait(false);`
Original file line number	Diff line number	Diff line change
`@@ -95,11 +95,15 @@ public async Task<IEnumerable<RemoteSearchResult>> GetSearchResults(SeriesInfo s`
`95`	`95`
`96`	`96`	`if (metadata.HasMetadata)`
`97`	`97`	`{`
	`98`	`+ var seriesId = metadata.Item.ProviderIds.GetOrDefault(ProviderNames.AniDb);`
	`99`	`+ var imageProvider = new AniDbImageProvider(_httpClient, _appPaths);`
	`100`	`+ var images = await imageProvider.GetImages(seriesId, cancellationToken);`
`98`	`101`	`var res = new RemoteSearchResult`
`99`	`102`	`{`
`100`	`103`	`Name = metadata.Item.Name,`
`101`	`104`	`PremiereDate = metadata.Item.PremiereDate,`
`102`	`105`	`ProductionYear = metadata.Item.ProductionYear,`
	`106`	`+ ImageUrl = images.Any() ? images.First().Url : null,`
`103`	`107`	`ProviderIds = metadata.Item.ProviderIds,`
`104`	`108`	`SearchProviderName = Name`
`105`	`109`	`};`
`@@ -114,6 +118,7 @@ public Task<HttpResponseInfo> GetImageResponse(string url, CancellationToken can`
`114`	`118`	`{`
`115`	`119`	`return _httpClient.GetResponse(new HttpRequestOptions`
`116`	`120`	`{`
	`121`	`+ UserAgent = Constants.UserAgent,`
`117`	`122`	`CancellationToken = cancellationToken,`
`118`	`123`	`Url = url`
`119`	`124`	`});`
`@@ -518,6 +523,7 @@ private static async Task DownloadSeriesData(string aid, string seriesDataPath,`
`518`	`523`
`519`	`524`	`var requestOptions = new HttpRequestOptions`
`520`	`525`	`{`
	`526`	`+ UserAgent = Constants.UserAgent,`
`521`	`527`	`Url = string.Format(SeriesQueryUrl, ClientName, aid),`
`522`	`528`	`CancellationToken = cancellationToken`
`523`	`529`	`};`
Original file line number	Diff line number	Diff line change
`@@ -371,6 +371,7 @@ public async Task<RootObject> WebRequestAPI(string link)`
`371`	`371`	`string _strContent = "";`
`372`	`372`	`using (WebClient client = new WebClient())`
`373`	`373`	`{`
	`374`	`+ client.Headers.Add("User-Agent", Constants.UserAgent);`
`374`	`375`	`var values = new System.Collections.Specialized.NameValueCollection();`
`375`	`376`
`376`	`377`	`var response = await Task.Run(() => client.UploadValues(new Uri(link),values));`
Original file line number	Diff line number	Diff line change
`@@ -106,6 +106,7 @@ public Task<HttpResponseInfo> GetImageResponse(string url, CancellationToken can`
`106`	`106`	`{`
`107`	`107`	`return _httpClient.GetResponse(new HttpRequestOptions`
`108`	`108`	`{`
	`109`	`+ UserAgent = Constants.UserAgent,`
`109`	`110`	`CancellationToken = cancellationToken,`
`110`	`111`	`Url = url`
`111`	`112`	`});`
`@@ -160,6 +161,7 @@ public Task<HttpResponseInfo> GetImageResponse(string url, CancellationToken can`
`160`	`161`	`{`
`161`	`162`	`return _httpClient.GetResponse(new HttpRequestOptions`
`162`	`163`	`{`
	`164`	`+ UserAgent = Constants.UserAgent,`
`163`	`165`	`CancellationToken = cancellationToken,`
`164`	`166`	`Url = url`
`165`	`167`	`});`
Original file line number	Diff line number	Diff line change
`@@ -297,6 +297,7 @@ public static async Task<string> WebRequestAPI(string link)`
`297`	`297`	`string _strContent = "";`
`298`	`298`	`using (WebClient client = new WebClient())`
`299`	`299`	`{`
	`300`	`+ client.Headers.Add("User-Agent", Constants.UserAgent);`
`300`	`301`	`Task<string> async_content = client.DownloadStringTaskAsync(link);`
`301`	`302`	`_strContent = await async_content;`
`302`	`303`	`}`
Original file line number	Diff line number	Diff line change
`@@ -98,6 +98,7 @@ public Task<HttpResponseInfo> GetImageResponse(string url, CancellationToken can`
`98`	`98`	`{`
`99`	`99`	`return _httpClient.GetResponse(new HttpRequestOptions`
`100`	`100`	`{`
	`101`	`+ UserAgent = Constants.UserAgent,`
`101`	`102`	`CancellationToken = cancellationToken,`
`102`	`103`	`Url = url`
`103`	`104`	`});`
`@@ -151,6 +152,7 @@ public Task<HttpResponseInfo> GetImageResponse(string url, CancellationToken can`
`151`	`152`	`{`
`152`	`153`	`return _httpClient.GetResponse(new HttpRequestOptions`
`153`	`154`	`{`
	`155`	`+ UserAgent = Constants.UserAgent,`
`154`	`156`	`CancellationToken = cancellationToken,`
`155`	`157`	`Url = url`
`156`	`158`	`});`