diff --git a/Jellyfin.Plugin.Danmu.Test/BilibiliTest.cs b/Jellyfin.Plugin.Danmu.Test/BilibiliTest.cs index a2af429..d01c517 100644 --- a/Jellyfin.Plugin.Danmu.Test/BilibiliTest.cs +++ b/Jellyfin.Plugin.Danmu.Test/BilibiliTest.cs @@ -59,6 +59,39 @@ namespace Jellyfin.Plugin.Danmu.Test } + [TestMethod] + public void TestSearchMediaId() + { + var scraperManager = new ScraperManager(loggerFactory); + scraperManager.register(new Bilibili(loggerFactory)); + + var fileSystemStub = new Mock(); + var directoryServiceStub = new Mock(); + var libraryManagerStub = new Mock(); + var libraryManagerEventsHelper = new LibraryManagerEventsHelper(libraryManagerStub.Object, loggerFactory, fileSystemStub.Object, scraperManager); + + var item = new Season + { + Name = "孤独的美食家", + IndexNumber = 2, + }; + + Task.Run(async () => + { + try + { + var scraper = new Bilibili(loggerFactory); + var result = await scraper.SearchMediaId(item); + Console.WriteLine(result); + } + catch (Exception ex) + { + Console.WriteLine(ex.Message); + } + }).GetAwaiter().GetResult(); + + } + [TestMethod] public void TestAddMovie() diff --git a/Jellyfin.Plugin.Danmu/Scrapers/Bilibili/Bilibili.cs b/Jellyfin.Plugin.Danmu/Scrapers/Bilibili/Bilibili.cs index 809c8de..58e5ea0 100644 --- a/Jellyfin.Plugin.Danmu/Scrapers/Bilibili/Bilibili.cs +++ b/Jellyfin.Plugin.Danmu/Scrapers/Bilibili/Bilibili.cs @@ -1,15 +1,15 @@ -using System.Linq; using System; +using System.Collections.Generic; using System.Net.Http; using System.Text.RegularExpressions; using System.Threading; using System.Threading.Tasks; -using MediaBrowser.Controller.Entities; -using Microsoft.Extensions.Logging; -using Jellyfin.Plugin.Danmu.Scrapers.Entity; -using System.Collections.Generic; using System.Xml; using Jellyfin.Plugin.Danmu.Core.Extensions; +using Jellyfin.Plugin.Danmu.Scrapers.Entity; +using MediaBrowser.Controller.Entities; +using Microsoft.Extensions.Logging; + namespace Jellyfin.Plugin.Danmu.Scrapers.Bilibili; @@ -46,26 +46,25 @@ public class Bilibili : AbstractScraper var searchResult = await _api.SearchAsync(searchName, CancellationToken.None).ConfigureAwait(false); if (searchResult != null && searchResult.Result != null) { - foreach (var result in searchResult.Result) + foreach (var media in searchResult.Result) { - if ((result.ResultType == "media_ft" || result.ResultType == "media_bangumi") && result.Data.Length > 0) + if (media.Type != "media_ft" && media.Type != "media_bangumi") { - foreach (var media in result.Data) - { - var seasonId = media.SeasonId; - var title = media.Title; - var pubYear = Jellyfin.Plugin.Danmu.Core.Utils.UnixTimeStampToDateTime(media.PublishTime).Year; - - list.Add(new ScraperSearchInfo() - { - Id = $"{seasonId}", - Name = title, - Category = media.SeasonTypeName, - Year = pubYear, - EpisodeSize = media.EpisodeSize, - }); - } + continue; } + + var seasonId = media.SeasonId; + var title = media.Title; + var pubYear = Jellyfin.Plugin.Danmu.Core.Utils.UnixTimeStampToDateTime(media.PublishTime).Year; + + list.Add(new ScraperSearchInfo() + { + Id = $"{seasonId}", + Name = title, + Category = media.SeasonTypeName, + Year = pubYear, + EpisodeSize = media.EpisodeSize, + }); } } } @@ -347,50 +346,58 @@ public class Bilibili : AbstractScraper try { var isMovieItemType = item is MediaBrowser.Controller.Entities.Movies.Movie; + var isSeasonItemType = item is MediaBrowser.Controller.Entities.TV.Season; var searchResult = await _api.SearchAsync(searchName, CancellationToken.None).ConfigureAwait(false); if (searchResult != null && searchResult.Result != null) { - foreach (var result in searchResult.Result) + foreach (var media in searchResult.Result) { - if ((result.ResultType == "media_ft" || result.ResultType == "media_bangumi") && result.Data.Length > 0) + if (media.Type != "media_ft" && media.Type != "media_bangumi") { - foreach (var media in result.Data) - { - var seasonId = media.SeasonId; - var title = media.Title; - var pubYear = Jellyfin.Plugin.Danmu.Core.Utils.UnixTimeStampToDateTime(media.PublishTime).Year; - - if (isMovieItemType && media.SeasonTypeName != "电影") - { - continue; - } - - if (!isMovieItemType && media.SeasonTypeName == "电影") - { - continue; - } - - // 检测标题是否相似（越大越相似） - var score = searchName.Distance(title); - if (score < 0.7) - { - log.LogDebug("[{0}] 标题差异太大，忽略处理. 搜索词：{1}, score:　{2}", title, searchName, score); - continue; - } - - // 检测年份是否一致 - var itemPubYear = item.ProductionYear ?? 0; - if (itemPubYear > 0 && pubYear > 0 && itemPubYear != pubYear) - { - log.LogDebug("[{0}] 发行年份不一致，忽略处理. b站：{1} jellyfin: {2}", title, pubYear, itemPubYear); - continue; - } - - log.LogInformation("匹配成功. [{0}] seasonId: {1} score: {2}", title, seasonId, score); - return seasonId; - } + continue; } + + var seasonId = media.SeasonId; + var title = media.Title; + var pubYear = Jellyfin.Plugin.Danmu.Core.Utils.UnixTimeStampToDateTime(media.PublishTime).Year; + + if (isMovieItemType && media.SeasonTypeName != "电影") + { + continue; + } + + if (!isMovieItemType && media.SeasonTypeName == "电影") + { + continue; + } + + // 检测标题是否相似（越大越相似） + var score = searchName.Distance(title); + if (score < 0.7) + { + log.LogDebug("[{0}] 标题差异太大，忽略处理. 搜索词：{1}, score:　{2}", title, searchName, score); + continue; + } + + // 检测年份是否一致 + var itemPubYear = item.ProductionYear ?? 0; + if (itemPubYear > 0 && pubYear > 0 && itemPubYear != pubYear) + { + log.LogDebug("[{0}] 发行年份不一致，忽略处理. b站：{1} jellyfin: {2}", title, pubYear, itemPubYear); + continue; + } + + // 季匹配处理，没有year但有season_number时，判断后缀是否有对应的第几季，如孤独的美食家 + if (isSeasonItemType && itemPubYear == 0 && item.IndexNumber != null && item.IndexNumber.Value > 1 && media.SeasonNumber != item.IndexNumber) + { + log.LogDebug("[{0}] 季号不一致，忽略处理. b站：{1} jellyfin: {2}", title, media.SeasonNumber, item.IndexNumber); + continue; + } + + log.LogInformation("匹配成功. [{0}] seasonId: {1} score: {2}", title, seasonId, score); + return seasonId; } + } } catch (HttpRequestException ex) diff --git a/Jellyfin.Plugin.Danmu/Scrapers/Bilibili/BilibiliApi.cs b/Jellyfin.Plugin.Danmu/Scrapers/Bilibili/BilibiliApi.cs index c79f298..a20b0ff 100644 --- a/Jellyfin.Plugin.Danmu/Scrapers/Bilibili/BilibiliApi.cs +++ b/Jellyfin.Plugin.Danmu/Scrapers/Bilibili/BilibiliApi.cs @@ -1,31 +1,19 @@ -using System.Text.RegularExpressions; using System; using System.Collections.Generic; using System.Linq; -using System.Net.Http; -using System.Text; -using System.Text.Json; -using System.Threading.Tasks; -using Jellyfin.Extensions.Json; -using MediaBrowser.Controller.Library; -using MediaBrowser.Controller; -using Microsoft.Extensions.Logging; -using Jellyfin.Plugin.Danmu.Model; -using System.Threading; -using MediaBrowser.Controller.Entities.Movies; -using MediaBrowser.Common.Net; using System.Net.Http.Json; -using System.Security.Cryptography; -using Microsoft.AspNetCore.Mvc.ApiExplorer; -using System.Net; +using System.Text.RegularExpressions; +using System.Threading; +using System.Threading.Tasks; using System.Web; -using Microsoft.Extensions.Caching.Memory; -using Jellyfin.Plugin.Danmu.Core.Http; -using Jellyfin.Plugin.Danmu.Scrapers.Bilibili.Entity; -using RateLimiter; using ComposableAsync; -using Jellyfin.Plugin.Danmu.Scrapers.Entity; using Jellyfin.Plugin.Danmu.Core.Extensions; +using Jellyfin.Plugin.Danmu.Scrapers.Bilibili.Entity; +using Jellyfin.Plugin.Danmu.Scrapers.Entity; +using Microsoft.Extensions.Caching.Memory; +using Microsoft.Extensions.Logging; +using RateLimiter; + namespace Jellyfin.Plugin.Danmu.Scrapers.Bilibili; @@ -56,28 +44,40 @@ public class BilibiliApi : AbstractApi var cacheKey = $"search_{keyword}"; var expiredOption = new MemoryCacheEntryOptions() { AbsoluteExpirationRelativeToNow = TimeSpan.FromMinutes(5) }; - SearchResult searchResult; - if (_memoryCache.TryGetValue(cacheKey, out searchResult)) + if (this._memoryCache.TryGetValue(cacheKey, out var searchResult)) { return searchResult; } await this.LimitRequestFrequently(); - await EnsureSessionCookie(cancellationToken).ConfigureAwait(false); + await this.EnsureSessionCookie(cancellationToken).ConfigureAwait(false); keyword = HttpUtility.UrlEncode(keyword); - var url = $"http://api.bilibili.com/x/web-interface/search/all/v2?keyword={keyword}"; - var response = await httpClient.GetAsync(url, cancellationToken).ConfigureAwait(false); + + // 搜索影视 + var result = new SearchResult(); + var url = $"https://api.bilibili.com/x/web-interface/search/type?keyword={keyword}&search_type=media_ft"; + var response = await this.httpClient.GetAsync(url, cancellationToken).ConfigureAwait(false); response.EnsureSuccessStatusCode(); - var result = await response.Content.ReadFromJsonAsync>(_jsonOptions, cancellationToken).ConfigureAwait(false); - if (result != null && result.Code == 0 && result.Data != null) + var ftResult = await response.Content.ReadFromJsonAsync>(this._jsonOptions, cancellationToken).ConfigureAwait(false); + if (ftResult != null && ftResult.Code == 0 && ftResult.Data != null) { - _memoryCache.Set(cacheKey, result.Data, expiredOption); - return result.Data; + result = ftResult.Data; } - _memoryCache.Set(cacheKey, new SearchResult(), expiredOption); - return new SearchResult(); + // 搜索番剧 + url = $"https://api.bilibili.com/x/web-interface/search/type?keyword={keyword}&search_type=media_bangumi"; + response = await this.httpClient.GetAsync(url, cancellationToken).ConfigureAwait(false); + response.EnsureSuccessStatusCode(); + var bangumiResult = await response.Content.ReadFromJsonAsync>(this._jsonOptions, cancellationToken).ConfigureAwait(false); + if (bangumiResult != null && bangumiResult.Code == 0 && bangumiResult.Data != null && bangumiResult.Data.Result != null) + { + result.Result.AddRange(bangumiResult.Data.Result); + } + + + this._memoryCache.Set(cacheKey, result, expiredOption); + return result; } /// @@ -97,15 +97,15 @@ public class BilibiliApi : AbstractApi // https://api.bilibili.com/x/v1/dm/list.so?oid={cid} bvid = bvid.Trim(); var pageUrl = $"http://api.bilibili.com/x/player/pagelist?bvid={bvid}"; - var response = await httpClient.GetAsync(pageUrl, cancellationToken).ConfigureAwait(false); + var response = await this.httpClient.GetAsync(pageUrl, cancellationToken).ConfigureAwait(false); response.EnsureSuccessStatusCode(); - var result = await response.Content.ReadFromJsonAsync>(_jsonOptions, cancellationToken).ConfigureAwait(false); + var result = await response.Content.ReadFromJsonAsync>(this._jsonOptions, cancellationToken).ConfigureAwait(false); if (result != null && result.Code == 0 && result.Data != null) { var part = result.Data.FirstOrDefault(); if (part != null) { - return await GetDanmuContentByCidAsync(part.Cid, cancellationToken).ConfigureAwait(false); + return await this.GetDanmuContentByCidAsync(part.Cid, cancellationToken).ConfigureAwait(false); } } @@ -126,10 +126,10 @@ public class BilibiliApi : AbstractApi } - var episode = await GetEpisodeAsync(epId, cancellationToken).ConfigureAwait(false); + var episode = await this.GetEpisodeAsync(epId, cancellationToken).ConfigureAwait(false); if (episode != null) { - return await GetDanmuContentByCidAsync(episode.CId, cancellationToken).ConfigureAwait(false); + return await this.GetDanmuContentByCidAsync(episode.CId, cancellationToken).ConfigureAwait(false); } throw new Exception($"Request fail. epId={epId}"); @@ -143,7 +143,7 @@ public class BilibiliApi : AbstractApi } var url = $"https://api.bilibili.com/x/v1/dm/list.so?oid={cid}"; - var response = await httpClient.GetAsync(url, cancellationToken).ConfigureAwait(false); + var response = await this.httpClient.GetAsync(url, cancellationToken).ConfigureAwait(false); if (!response.IsSuccessStatusCode) { throw new Exception($"Request fail. url={url} status_code={response.StatusCode}"); @@ -171,24 +171,24 @@ public class BilibiliApi : AbstractApi var cacheKey = $"season_{seasonId}"; var expiredOption = new MemoryCacheEntryOptions() { AbsoluteExpirationRelativeToNow = TimeSpan.FromMinutes(30) }; VideoSeason? seasonData; - if (_memoryCache.TryGetValue(cacheKey, out seasonData)) + if (this._memoryCache.TryGetValue(cacheKey, out seasonData)) { return seasonData; } - await EnsureSessionCookie(cancellationToken).ConfigureAwait(false); + await this.EnsureSessionCookie(cancellationToken).ConfigureAwait(false); var url = $"http://api.bilibili.com/pgc/view/web/season?season_id={seasonId}"; - var response = await httpClient.GetAsync(url, cancellationToken).ConfigureAwait(false); + var response = await this.httpClient.GetAsync(url, cancellationToken).ConfigureAwait(false); response.EnsureSuccessStatusCode(); - var result = await response.Content.ReadFromJsonAsync>(_jsonOptions, cancellationToken).ConfigureAwait(false); + var result = await response.Content.ReadFromJsonAsync>(this._jsonOptions, cancellationToken).ConfigureAwait(false); if (result != null && result.Code == 0 && result.Result != null) { - _memoryCache.Set(cacheKey, result.Result, expiredOption); + this._memoryCache.Set(cacheKey, result.Result, expiredOption); return result.Result; } - _memoryCache.Set(cacheKey, null, expiredOption); + this._memoryCache.Set(cacheKey, null, expiredOption); return null; } @@ -202,30 +202,30 @@ public class BilibiliApi : AbstractApi var cacheKey = $"episode_{epId}"; var expiredOption = new MemoryCacheEntryOptions() { AbsoluteExpirationRelativeToNow = TimeSpan.FromMinutes(5) }; VideoEpisode? episodeData; - if (_memoryCache.TryGetValue(cacheKey, out episodeData)) + if (this._memoryCache.TryGetValue(cacheKey, out episodeData)) { return episodeData; } - await EnsureSessionCookie(cancellationToken).ConfigureAwait(false); + await this.EnsureSessionCookie(cancellationToken).ConfigureAwait(false); var url = $"http://api.bilibili.com/pgc/view/web/season?ep_id={epId}"; - var response = await httpClient.GetAsync(url, cancellationToken).ConfigureAwait(false); + var response = await this.httpClient.GetAsync(url, cancellationToken).ConfigureAwait(false); response.EnsureSuccessStatusCode(); - var result = await response.Content.ReadFromJsonAsync>(_jsonOptions, cancellationToken).ConfigureAwait(false); + var result = await response.Content.ReadFromJsonAsync>(this._jsonOptions, cancellationToken).ConfigureAwait(false); if (result != null && result.Code == 0 && result.Result != null && result.Result.Episodes != null) { // 缓存本季的所有episode数据，避免批量更新时重复请求 foreach (var episode in result.Result.Episodes) { cacheKey = $"episode_{episode.Id}"; - _memoryCache.Set(cacheKey, episode, expiredOption); + this._memoryCache.Set(cacheKey, episode, expiredOption); } return result.Result.Episodes.FirstOrDefault(x => x.Id == epId); } - _memoryCache.Set(cacheKey, null, expiredOption); + this._memoryCache.Set(cacheKey, null, expiredOption); return null; } @@ -239,25 +239,25 @@ public class BilibiliApi : AbstractApi var cacheKey = $"video_{bvid}"; var expiredOption = new MemoryCacheEntryOptions() { AbsoluteExpirationRelativeToNow = TimeSpan.FromMinutes(30) }; Video? videoData; - if (_memoryCache.TryGetValue(cacheKey, out videoData)) + if (this._memoryCache.TryGetValue(cacheKey, out videoData)) { return videoData; } - await EnsureSessionCookie(cancellationToken).ConfigureAwait(false); + await this.EnsureSessionCookie(cancellationToken).ConfigureAwait(false); var url = $"https://api.bilibili.com/x/web-interface/view?bvid={bvid}"; - var response = await httpClient.GetAsync(url, cancellationToken).ConfigureAwait(false); + var response = await this.httpClient.GetAsync(url, cancellationToken).ConfigureAwait(false); response.EnsureSuccessStatusCode(); - var result = await response.Content.ReadFromJsonAsync>(_jsonOptions, cancellationToken).ConfigureAwait(false); + var result = await response.Content.ReadFromJsonAsync>(this._jsonOptions, cancellationToken).ConfigureAwait(false); if (result != null && result.Code == 0 && result.Data != null) { - _memoryCache.Set(cacheKey, result.Data, expiredOption); + this._memoryCache.Set(cacheKey, result.Data, expiredOption); return result.Data; } - _memoryCache.Set(cacheKey, null, expiredOption); + this._memoryCache.Set(cacheKey, null, expiredOption); return null; } @@ -272,13 +272,13 @@ public class BilibiliApi : AbstractApi var cacheKey = $"video_{avid}"; var expiredOption = new MemoryCacheEntryOptions() { AbsoluteExpirationRelativeToNow = TimeSpan.FromMinutes(30) }; BiliplusVideo? videoData; - if (_memoryCache.TryGetValue(cacheKey, out videoData)) + if (this._memoryCache.TryGetValue(cacheKey, out videoData)) { return videoData; } var url = $"https://www.biliplus.com/video/{avid}/"; - var response = await httpClient.GetAsync(url, cancellationToken).ConfigureAwait(false); + var response = await this.httpClient.GetAsync(url, cancellationToken).ConfigureAwait(false); response.EnsureSuccessStatusCode(); var body = await response.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); @@ -286,12 +286,12 @@ public class BilibiliApi : AbstractApi if (!string.IsNullOrEmpty(videoJson)) { var videoInfo = videoJson.FromJson(); - _memoryCache.Set(cacheKey, videoInfo, expiredOption); + this._memoryCache.Set(cacheKey, videoInfo, expiredOption); return videoInfo; } - _memoryCache.Set(cacheKey, null, expiredOption); + this._memoryCache.Set(cacheKey, null, expiredOption); return null; } @@ -315,7 +315,7 @@ public class BilibiliApi : AbstractApi { var url = $"https://api.bilibili.com/x/v2/dm/web/seg.so?type=1&oid={cid}&pid={aid}&segment_index={segmentIndex}"; - var bytes = await httpClient.GetByteArrayAsync(url, cancellationToken).ConfigureAwait(false); + var bytes = await this.httpClient.GetByteArrayAsync(url, cancellationToken).ConfigureAwait(false); var danmuReply = Biliproto.Community.Service.Dm.V1.DmSegMobileReply.Parser.ParseFrom(bytes); if (danmuReply == null || danmuReply.Elems == null || danmuReply.Elems.Count <= 0) { @@ -347,7 +347,7 @@ public class BilibiliApi : AbstractApi segmentIndex += 1; // 等待一段时间避免api请求太快 - await _delayExecuteConstraint; + await this._delayExecuteConstraint; } } catch (Exception ex) @@ -360,14 +360,14 @@ public class BilibiliApi : AbstractApi private async Task EnsureSessionCookie(CancellationToken cancellationToken) { var url = "https://www.bilibili.com"; - var cookies = _cookieContainer.GetCookies(new Uri(url, UriKind.Absolute)); + var cookies = this._cookieContainer.GetCookies(new Uri(url, UriKind.Absolute)); var existCookie = cookies.FirstOrDefault(x => x.Name == "buvid3"); if (existCookie != null) { return; } - var response = await httpClient.GetAsync(url, cancellationToken).ConfigureAwait(false); + var response = await this.httpClient.GetAsync(url, cancellationToken).ConfigureAwait(false); response.EnsureSuccessStatusCode(); } diff --git a/Jellyfin.Plugin.Danmu/Scrapers/Bilibili/Entity/Media.cs b/Jellyfin.Plugin.Danmu/Scrapers/Bilibili/Entity/Media.cs index 35e490c..91f7647 100644 --- a/Jellyfin.Plugin.Danmu/Scrapers/Bilibili/Entity/Media.cs +++ b/Jellyfin.Plugin.Danmu/Scrapers/Bilibili/Entity/Media.cs @@ -5,6 +5,7 @@ using System.Text; using System.Text.Json.Serialization; using System.Text.RegularExpressions; using System.Threading.Tasks; +using Jellyfin.Plugin.Danmu.Core.Extensions; using Microsoft.Extensions.FileSystemGlobbing.Internal; namespace Jellyfin.Plugin.Danmu.Scrapers.Bilibili.Entity @@ -12,6 +13,10 @@ namespace Jellyfin.Plugin.Danmu.Scrapers.Bilibili.Entity public class Media { static readonly Regex regHtml = new Regex(@"\<.+?\>"); + static readonly Regex regSeasonNumber = new Regex(@"第([0-9一二三四五六七八九十]+)季"); + + [JsonPropertyName("type")] + public string Type { get; set; } [JsonPropertyName("media_type")] public int MediaType { get; set; } @@ -46,5 +51,16 @@ namespace Jellyfin.Plugin.Danmu.Scrapers.Bilibili.Entity title = value; } } + + + [JsonIgnore] + public int SeasonNumber { + get { + var number = regSeasonNumber.FirstMatchGroup(title); + + // 替换中文数字为阿拉伯数字 + return number.Replace("一", "1").Replace("二", "2").Replace("三", "3").Replace("四", "4").Replace("五", "5").Replace("六", "6").Replace("七", "7").Replace("八", "8").Replace("九", "9").ToInt(); + } + } } } diff --git a/Jellyfin.Plugin.Danmu/Scrapers/Bilibili/Entity/SearchResult.cs b/Jellyfin.Plugin.Danmu/Scrapers/Bilibili/Entity/SearchResult.cs index 8a48cca..da042c3 100644 --- a/Jellyfin.Plugin.Danmu/Scrapers/Bilibili/Entity/SearchResult.cs +++ b/Jellyfin.Plugin.Danmu/Scrapers/Bilibili/Entity/SearchResult.cs @@ -11,7 +11,7 @@ namespace Jellyfin.Plugin.Danmu.Scrapers.Bilibili.Entity public class SearchResult { [JsonPropertyName("result")] - public SearchTypeResult[] Result { get; set; } + public List Result { get; set; } } public class SearchTypeResult @@ -19,6 +19,6 @@ namespace Jellyfin.Plugin.Danmu.Scrapers.Bilibili.Entity [JsonPropertyName("result_type")] public string ResultType { get; set; } [JsonPropertyName("data")] - public Media[] Data { get; set; } + public List Data { get; set; } } }