基于自定义规则的番剧采集APP,支持流媒体在线观看,支持弹幕,支持实时超分辨率。
refactor: bangumi api interceptor
Prediditc2886dfd9dfa
diff --git a/lib/request/api.dart b/lib/request/api.dartindex 573320bf..e696fd59 100644--- a/lib/request/api.dart+++ b/lib/request/api.dart@@ -1,44 +1,61 @@class Api {- // 当前版本+ /// 当前版本static const String version = '1.7.7';- // 规则API级别+ /// 规则API级别static const int apiLevel = 4;- // 项目主页+ /// 项目主页static const String sourceUrl = "https://github.com/Predidit/Kazumi";- // 图标作者+ /// 图标作者static const String iconUrl = "https://www.pixiv.net/users/66219277";- // 规则仓库+ /// 规则仓库static const String pluginShop = 'https://raw.githubusercontent.com/Predidit/KazumiRules/main/';- // 在线升级+ /// 在线升级static const String latestApp ='https://api.github.com/repos/Predidit/Kazumi/releases/latest';- // Github镜像+ /// Github镜像static const String gitMirror = 'https://ghfast.top/';- // 每日放送- static const String bangumiCalendar = 'https://next.bgm.tv/p1/calendar';- // Bangumi 主页- static const String bangumiIndex = 'https://bangumi.tv/';- // 番剧检索 (弃用)- static const String bangumiSearch = 'https://api.bgm.tv/search/subject/';- // 条目搜索- static const String bangumiRankSearch = 'https://api.bgm.tv/v0/search/subjects?limit={0}&offset={1}';- // 从条目ID获取详细信息- static const String bangumiInfoByID = 'https://api.bgm.tv/v0/subjects/';- // 从条目ID获取剧集ID- static const String bangumiEpisodeByID = 'https://api.bgm.tv/v0/episodes';- // Next条目API- static const String bangumiTrendsNext = 'https://next.bgm.tv/p1/trending/subjects';- static const String bangumiInfoByIDNext = 'https://next.bgm.tv/p1/subjects/';- static const String characterInfoByCharacterIDNext = 'https://next.bgm.tv/p1/characters/{0}';- static const String bangumiEpisodeByIDNext = 'https://next.bgm.tv/p1/episodes/';- static const String bangumiCharacterByIDNext = 'https://next.bgm.tv/p1/characters/';- static const String bangumiStaffByIDNext = 'https://next.bgm.tv/p1/subjects/{0}/staffs/persons';- // 弹弹Play+ /// 弹弹官网static const String dandanIndex = 'https://www.dandanplay.com/';+ /// Bangumi 官网+ static const String bangumiIndex = 'https://bangumi.tv/';++ /// bangumi API Domain+ static const String bangumiAPIDomain = 'https://api.bgm.tv';+ /// 条目搜索+ static const String bangumiRankSearch = '/v0/search/subjects?limit={0}&offset={1}';+ /// 从条目ID获取角色信息+ static const String bangumiCharacterByID = '/v0/subjects/{0}/characters';+ /// 从条目ID获取剧集ID+ static const String bangumiEpisodeByID = '/v0/episodes';++ /// Bangumi Next API Domain+ static const String bangumiAPINextDomain = 'https://next.bgm.tv';+ /// 每日放送+ static const String bangumiCalendar = '/p1/calendar';+ /// 番剧趋势+ static const String bangumiTrendsNext = '/p1/trending/subjects';+ /// 番剧信息+ static const String bangumiInfoByIDNext = '/p1/subjects/{0}';+ /// 番剧评论+ static const String bangumiCommentsByIDNext = '/p1/subjects/{0}/comments?limit={1}&offset={2}';+ /// 番剧剧集评论+ static const String bangumiEpisodeCommentsByIDNext = '/p1/episodes/{0}/comments';+ /// 番剧角色信息+ static const String bangumiCharacterInfoByCharacterIDNext = '/p1/characters/{0}';+ /// 番剧角色评论+ static const String bangumiCharacterCommentsByIDNext = '/p1/characters/{0}/comments';+ /// 番剧工作人员信息+ static const String bangumiStaffByIDNext = '/p1/subjects/{0}/staffs/persons';++ /// DanDanPlay API Domainstatic const String dandanAPIDomain = 'https://api.dandanplay.net';+ /// 获取弹幕static const String dandanAPIComment = "/api/v2/comment/";+ /// 检索弹弹番剧元数据static const String dandanAPISearch = "/api/v2/search/anime";+ /// 获取弹弹番剧元数据static const String dandanAPIInfo = "/api/v2/bangumi/";+ /// 获取弹弹番剧元数据(通过BGM番剧ID)static const String dandanAPIInfoByBgmBangumiId = "/api/v2/bangumi/bgmtv/{0}";static String formatUrl(String url, List<dynamic> params) {diff --git a/lib/request/bangumi.dart b/lib/request/bangumi.dartindex d1bbfa62..714ddaa2 100644--- a/lib/request/bangumi.dart+++ b/lib/request/bangumi.dart@@ -1,7 +1,5 @@import 'package:logger/logger.dart';import 'package:kazumi/utils/logger.dart';-import 'package:kazumi/utils/constants.dart';-import 'package:dio/dio.dart';import 'package:kazumi/request/api.dart';import 'package:kazumi/request/request.dart';import 'package:kazumi/modules/bangumi/bangumi_item.dart';@@ -17,8 +15,9 @@ class BangumiHTTP {static Future<List<List<BangumiItem>>> getCalendar() async {List<List<BangumiItem>> bangumiCalendar = [];try {- var res = await Request().get(Api.bangumiCalendar,- options: Options(headers: bangumiHTTPHeader));+ var res = await Request().get(+ Api.bangumiAPINextDomain + Api.bangumiCalendar,+ );final jsonData = res.data;for (int i = 1; i <= 7; i++) {List<BangumiItem> bangumiList = [];@@ -57,11 +56,12 @@ class BangumiHTTP {}};try {- final url = Api.formatUrl(Api.bangumiRankSearch, [limit, offset]);- final res = await Request().post(url,- data: params,- options: Options(- headers: bangumiHTTPHeader, contentType: 'application/json'));+ final url = Api.formatUrl(+ Api.bangumiAPIDomain + Api.bangumiRankSearch, [limit, offset]);+ final res = await Request().post(+ url,+ data: params,+ );final jsonData = res.data;final jsonList = jsonData['data'];for (dynamic jsonItem in jsonList) {@@ -119,10 +119,9 @@ class BangumiHTTP {}try {final res = await Request().post(- Api.formatUrl(Api.bangumiRankSearch, [100, 0]),- data: params,- options: Options(- headers: bangumiHTTPHeader, contentType: 'application/json'));+ Api.formatUrl(Api.bangumiAPIDomain + Api.bangumiRankSearch, [100, 0]),+ data: params,+ );final jsonData = res.data;final jsonList = jsonData['data'];for (dynamic jsonItem in jsonList) {@@ -146,10 +145,10 @@ class BangumiHTTP {'offset': offset,};try {- final res = await Request().get(Api.bangumiTrendsNext,- data: params,- options: Options(- headers: bangumiHTTPHeader, contentType: 'application/json'));+ final res = await Request().get(+ Api.bangumiAPINextDomain + Api.bangumiTrendsNext,+ data: params,+ );final jsonData = res.data;final jsonList = jsonData['data'];for (dynamic jsonItem in jsonList) {@@ -164,7 +163,10 @@ class BangumiHTTP {return bangumiList;}- static Future<List<BangumiItem>> bangumiSearch(String keyword, {List<String> tags = const [], int offset = 0, String sort = 'heat'}) async {+ static Future<List<BangumiItem>> bangumiSearch(String keyword,+ {List<String> tags = const [],+ int offset = 0,+ String sort = 'heat'}) async {List<BangumiItem> bangumiList = [];var params = <String, dynamic>{@@ -180,10 +182,10 @@ class BangumiHTTP {try {final res = await Request().post(- Api.formatUrl(Api.bangumiRankSearch, [20, offset]),- data: params,- options: Options(- headers: bangumiHTTPHeader, contentType: 'application/json'));+ Api.formatUrl(+ Api.bangumiAPIDomain + Api.bangumiRankSearch, [20, offset]),+ data: params,+ );final jsonData = res.data;final jsonList = jsonData['data'];for (dynamic jsonItem in jsonList) {@@ -207,8 +209,9 @@ class BangumiHTTP {static Future<BangumiItem?> getBangumiInfoByID(int id) async {try {- final res = await Request().get(Api.bangumiInfoByID + id.toString(),- options: Options(headers: bangumiHTTPHeader));+ final res = await Request().get(+ Api.formatUrl(Api.bangumiAPINextDomain + Api.bangumiInfoByIDNext, [id]),+ );return BangumiItem.fromJson(res.data);} catch (e) {KazumiLogger()@@ -225,8 +228,10 @@ class BangumiHTTP {'limit': 1};try {- final res = await Request().get(Api.bangumiEpisodeByID,- data: params, options: Options(headers: bangumiHTTPHeader));+ final res = await Request().get(+ Api.bangumiAPIDomain + Api.bangumiEpisodeByID,+ data: params,+ );final jsonData = res.data['data'][0];episodeInfo = EpisodeInfo.fromJson(jsonData);} catch (e) {@@ -241,8 +246,9 @@ class BangumiHTTP {CommentResponse commentResponse = CommentResponse.fromTemplate();try {final res = await Request().get(- '${Api.bangumiInfoByIDNext}$id/comments?offset=$offset&limit=20',- options: Options(headers: bangumiHTTPHeader));+ Api.formatUrl(Api.bangumiAPINextDomain + Api.bangumiCommentsByIDNext,+ [id, 20, offset]),+ );final jsonData = res.data;commentResponse = CommentResponse.fromJson(jsonData);} catch (e) {@@ -258,8 +264,10 @@ class BangumiHTTP {EpisodeCommentResponse.fromTemplate();try {final res = await Request().get(- '${Api.bangumiEpisodeByIDNext}$id/comments',- options: Options(headers: bangumiHTTPHeader));+ Api.formatUrl(+ Api.bangumiAPINextDomain + Api.bangumiEpisodeCommentsByIDNext,+ [id]),+ );final jsonData = res.data;commentResponse = EpisodeCommentResponse.fromJson(jsonData);} catch (e) {@@ -275,8 +283,10 @@ class BangumiHTTP {CharacterCommentResponse.fromTemplate();try {final res = await Request().get(- '${Api.bangumiCharacterByIDNext}$id/comments',- options: Options(headers: bangumiHTTPHeader));+ Api.formatUrl(+ Api.bangumiAPINextDomain + Api.bangumiCharacterCommentsByIDNext,+ [id]),+ );final jsonData = res.data;commentResponse = CharacterCommentResponse.fromJson(jsonData);} catch (e) {@@ -289,8 +299,10 @@ class BangumiHTTP {static Future<StaffResponse> getBangumiStaffByID(int id) async {StaffResponse staffResponse = StaffResponse.fromTemplate();try {- final res = await Request().get(Api.formatUrl(Api.bangumiStaffByIDNext, [id]),- options: Options(headers: bangumiHTTPHeader));+ final res = await Request().get(+ Api.formatUrl(+ Api.bangumiAPINextDomain + Api.bangumiStaffByIDNext, [id]),+ );final jsonData = res.data;staffResponse = StaffResponse.fromJson(jsonData);} catch (e) {@@ -303,8 +315,9 @@ class BangumiHTTP {static Future<CharactersResponse> getCharatersByBangumiID(int id) async {CharactersResponse charactersResponse = CharactersResponse.fromTemplate();try {- final res = await Request().get('${Api.bangumiInfoByID}$id/characters',- options: Options(headers: bangumiHTTPHeader));+ final res = await Request().get(+ Api.formatUrl(Api.bangumiAPIDomain + Api.bangumiCharacterByID, [id]),+ );final jsonData = res.data;charactersResponse = CharactersResponse.fromJson(jsonData);} catch (e) {@@ -318,8 +331,11 @@ class BangumiHTTP {CharacterFullItem characterFullItem = CharacterFullItem.fromTemplate();try {final res = await Request().get(- Api.formatUrl(Api.characterInfoByCharacterIDNext, [id]),- options: Options(headers: bangumiHTTPHeader));+ Api.formatUrl(+ Api.bangumiAPINextDomain ++ Api.bangumiCharacterInfoByCharacterIDNext,+ [id]),+ );final jsonData = res.data;characterFullItem = CharacterFullItem.fromJson(jsonData);} catch (e) {diff --git a/lib/request/interceptor.dart b/lib/request/interceptor.dartindex 167ca596..1c81326d 100644--- a/lib/request/interceptor.dart+++ b/lib/request/interceptor.dart@@ -6,6 +6,7 @@ import 'package:kazumi/bean/dialog/dialog_helper.dart';import 'package:connectivity_plus/connectivity_plus.dart';import 'package:kazumi/utils/utils.dart';import 'package:kazumi/utils/mortis.dart';+import 'package:kazumi/utils/constants.dart';class ApiInterceptor extends Interceptor {static Box setting = GStorage.setting;@@ -30,6 +31,9 @@ class ApiInterceptor extends Interceptor {'X-Signature': Utils.generateDandanSignature(Uri.parse(options.path).path, timestamp),};}+ if (options.path.contains(Api.bangumiAPIDomain) || options.path.contains(Api.bangumiAPINextDomain)) {+ options.headers = bangumiHTTPHeader;+ }handler.next(options);}diff --git a/lib/utils/constants.dart b/lib/utils/constants.dartindex 09e14ed8..e0d16c73 100644--- a/lib/utils/constants.dart+++ b/lib/utils/constants.dart@@ -90,6 +90,7 @@ Map<String, String> bangumiHTTPHeader = {'user-agent':'Predidit/Kazumi/${Api.version} (Android) (https://github.com/Predidit/Kazumi)','referer': '',+ 'content-type': 'application/json'};/// 可选硬件解码器