Skip to content

基于自定义规则的番剧采集APP,支持流媒体在线观看,支持弹幕,支持实时超分辨率。

refactor: better danmaku match

Predidit55d58265ee6b
diff --git a/lib/modules/danmaku/danmaku_episode_response.dart b/lib/modules/danmaku/danmaku_episode_response.dart
index 1e06d78f..c1b259ca 100644
--- a/lib/modules/danmaku/danmaku_episode_response.dart
+++ b/lib/modules/danmaku/danmaku_episode_response.dart
@@ -23,12 +23,14 @@ class DanmakuEpisode {
}
class DanmakuEpisodeResponse {
+ int bangumiId;
List<DanmakuEpisode> episodes;
int errorCode;
bool success;
String errorMessage;
DanmakuEpisodeResponse({
+ required this.bangumiId,
required this.episodes,
required this.errorCode,
required this.success,
@@ -41,6 +43,7 @@ class DanmakuEpisodeResponse {
list.map((i) => DanmakuEpisode.fromJson(i)).toList();
return DanmakuEpisodeResponse(
+ bangumiId: json['bangumi']['animeId'],
episodes: episodeList,
errorCode: json['errorCode'],
success: json['success'],
@@ -50,6 +53,7 @@ class DanmakuEpisodeResponse {
factory DanmakuEpisodeResponse.fromTemplate() {
return DanmakuEpisodeResponse(
+ bangumiId: 0,
episodes: [],
errorCode: 0,
success: false,
diff --git a/lib/pages/player/episode_comments_sheet.dart b/lib/pages/player/episode_comments_sheet.dart
index 7ba99b80..e3fd86b4 100644
--- a/lib/pages/player/episode_comments_sheet.dart
+++ b/lib/pages/player/episode_comments_sheet.dart
@@ -55,6 +55,9 @@ class _EpisodeCommentsSheetState extends State<EpisodeCommentsSheet> {
});
}
});
+ if (mounted) {
+ setState(() {});
+ }
}
@override
@@ -235,7 +238,6 @@ class _EpisodeCommentsSheetState extends State<EpisodeCommentsSheet> {
),
onRefresh: () async {
await loadComments(ep == 0 ? episode : ep);
- setState(() {});
},
),
);
diff --git a/lib/pages/player/player_controller.dart b/lib/pages/player/player_controller.dart
index 881844fb..ac7c3d16 100644
--- a/lib/pages/player/player_controller.dart
+++ b/lib/pages/player/player_controller.dart
@@ -181,14 +181,7 @@ abstract class _PlayerController with Store {
if (episodeFromTitle == 0) {
episodeFromTitle = videoPageController.currentEpisode;
}
-
- List<String> titleList = [
- videoPageController.title,
- videoPageController.bangumiItem.nameCn,
- videoPageController.bangumiItem.name
- ].where((title) => title.isNotEmpty).toList();
- // 根据标题列表获取弹幕,优先级: 视频源标题 > 番剧中文名 > 番剧日文名
- getDanDanmaku(titleList, episodeFromTitle);
+ getDanDanmakuByBgmBangumiID(videoPageController.bangumiItem.id, episodeFromTitle);
mediaPlayer = await createVideoController(offset: offset);
playerSpeed =
setting.get(SettingBoxKey.defaultPlaySpeed, defaultValue: 1.0);
@@ -354,7 +347,6 @@ abstract class _PlayerController with Store {
}
}
-
Future<void> setVolume(double value) async {
value = value.clamp(0.0, 100.0);
volume = value;
@@ -444,11 +436,12 @@ abstract class _PlayerController with Store {
forwardTime = time;
}
- Future<void> getDanDanmaku(List<String> titleList, int episode) async {
- KazumiLogger().log(Level.info, '尝试获取弹幕 $titleList');
+ Future<void> getDanDanmakuByBgmBangumiID(
+ int bgmBangumiID, int episode) async {
+ KazumiLogger().log(Level.info, '尝试获取弹幕 [BgmBangumiID] $bgmBangumiID');
try {
danDanmakus.clear();
- bangumiID = await DanmakuRequest.getBangumiIDByTitles(titleList);
+ bangumiID = await DanmakuRequest.getDanDanBangumiIDByBgmBangumiID(bgmBangumiID);
var res = await DanmakuRequest.getDanDanmaku(bangumiID, episode);
addDanmakus(res);
} catch (e) {
diff --git a/lib/pages/player/player_item.dart b/lib/pages/player/player_item.dart
index b3349530..838081ec 100644
--- a/lib/pages/player/player_item.dart
+++ b/lib/pages/player/player_item.dart
@@ -424,7 +424,7 @@ class _PlayerItemState extends State<PlayerItem>
KazumiDialog.showLoading(msg: '弹幕检索中');
try {
danmakuEpisodeResponse =
- await DanmakuRequest.getDanDanEpisodesByBangumiID(
+ await DanmakuRequest.getDanDanEpisodesByDanDanBangumiID(
danmakuInfo.animeId);
} catch (e) {
KazumiDialog.dismiss();
diff --git a/lib/request/api.dart b/lib/request/api.dart
index 602f810a..573320bf 100644
--- a/lib/request/api.dart
+++ b/lib/request/api.dart
@@ -39,6 +39,7 @@ class Api {
static const String dandanAPIComment = "/api/v2/comment/";
static const String dandanAPISearch = "/api/v2/search/anime";
static const String dandanAPIInfo = "/api/v2/bangumi/";
+ static const String dandanAPIInfoByBgmBangumiId = "/api/v2/bangumi/bgmtv/{0}";
static String formatUrl(String url, List<dynamic> params) {
for (int i = 0; i < params.length; i++) {
diff --git a/lib/request/damaku.dart b/lib/request/damaku.dart
index 69c2dfee..ef53a6c0 100644
--- a/lib/request/damaku.dart
+++ b/lib/request/damaku.dart
@@ -1,30 +1,27 @@
-import 'package:dio/dio.dart';
import 'package:kazumi/request/request.dart';
import 'package:kazumi/request/api.dart';
-import 'package:kazumi/utils/utils.dart';
import 'package:logger/logger.dart';
import 'package:kazumi/utils/logger.dart';
-import 'package:kazumi/utils/mortis.dart';
import 'package:kazumi/modules/danmaku/danmaku_module.dart';
import 'package:kazumi/modules/danmaku/danmaku_search_response.dart';
import 'package:kazumi/modules/danmaku/danmaku_episode_response.dart';
import 'package:kazumi/utils/string_match.dart';
class DanmakuRequest {
-
- // 从标题列表中获取番剧ID
- static Future<int> getBangumiIDByTitles(List<String> titleList) async {
- for (var title in titleList) {
- int bangumiID = await getBangumiID(title);
- if (bangumiID != 0) {
- return bangumiID;
- }
- }
- return 0;
+ // 从BgmBangumiID获取DanDanBangumiID
+ static Future<int> getDanDanBangumiIDByBgmBangumiID(int bgmBangumiID) async {
+ var path = Api.formatUrl(Api.dandanAPIInfoByBgmBangumiId, [bgmBangumiID]);
+ var endPoint = Api.dandanAPIDomain + path;
+ final res = await Request().get(endPoint,
+ extra: {'customError': '弹幕检索错误: 获取弹幕分集ID失败'});
+ Map<String, dynamic> jsonData = res.data;
+ DanmakuEpisodeResponse danmakuEpisodeResponse =
+ DanmakuEpisodeResponse.fromJson(jsonData);
+ return danmakuEpisodeResponse.bangumiId;
}
- //获取弹弹Play集合,需要进一步处理
- static Future<int> getBangumiID(String title) async {
+ // 从标题获取DanDanBangumiID
+ static Future<int> getBangumiIDByTitle(String title) async {
DanmakuSearchResponse danmakuSearchResponse =
await getDanmakuSearchResponse(title);
@@ -54,22 +51,25 @@ class DanmakuRequest {
return bestAnimeId;
}
- //从BangumiID获取分集ID
- static Future<DanmakuEpisodeResponse> getDanDanEpisodesByBangumiID(
+ // 从BangumiID获取分集ID
+ static Future<DanmakuEpisodeResponse> getDanmakuEpisodesByBangumiID(
+ int bangumiID) async {
+ var path = Api.formatUrl(Api.dandanAPIInfoByBgmBangumiId, [bangumiID]);
+ var endPoint = Api.dandanAPIDomain + path;
+ final res = await Request().get(endPoint,
+ extra: {'customError': '弹幕检索错误: 获取弹幕分集ID失败'});
+ Map<String, dynamic> jsonData = res.data;
+ DanmakuEpisodeResponse danmakuEpisodeResponse =
+ DanmakuEpisodeResponse.fromJson(jsonData);
+ return danmakuEpisodeResponse;
+ }
+
+ // 从DanDanBangumiID获取分集ID
+ static Future<DanmakuEpisodeResponse> getDanDanEpisodesByDanDanBangumiID(
int bangumiID) async {
var path = Api.dandanAPIInfo + bangumiID.toString();
var endPoint = Api.dandanAPIDomain + path;
- var timestamp = DateTime.now().millisecondsSinceEpoch ~/ 1000;
- var httpHeaders = {
- 'user-agent': Utils.getRandomUA(),
- 'referer': '',
- 'X-Auth': 1,
- 'X-AppId': mortis['id'],
- 'X-Timestamp': timestamp.toString(),
- 'X-Signature': Utils.generateDandanSignature(path, timestamp),
- };
final res = await Request().get(endPoint,
- options: Options(headers: httpHeaders),
extra: {'customError': '弹幕检索错误: 获取弹幕分集ID失败'});
Map<String, dynamic> jsonData = res.data;
DanmakuEpisodeResponse danmakuEpisodeResponse =
@@ -77,26 +77,17 @@ class DanmakuRequest {
return danmakuEpisodeResponse;
}
+ // 从标题检索DanDan番剧数据库
static Future<DanmakuSearchResponse> getDanmakuSearchResponse(
String title) async {
var path = Api.dandanAPISearch;
var endPoint = Api.dandanAPIDomain + path;
- var timestamp = DateTime.now().millisecondsSinceEpoch ~/ 1000;
- var httpHeaders = {
- 'user-agent': Utils.getRandomUA(),
- 'referer': '',
- 'X-Auth': 1,
- 'X-AppId': mortis['id'],
- 'X-Timestamp': timestamp.toString(),
- 'X-Signature': Utils.generateDandanSignature(path, timestamp),
- };
Map<String, String> keywordMap = {
'keyword': title,
};
final res = await Request().get(endPoint,
data: keywordMap,
- options: Options(headers: httpHeaders),
extra: {'customError': '弹幕检索错误: 获取弹幕番剧ID失败'});
Map<String, dynamic> jsonData = res.data;
DanmakuSearchResponse danmakuSearchResponse =
@@ -114,22 +105,12 @@ class DanmakuRequest {
bangumiID.toString() +
episode.toString().padLeft(4, '0');
var endPoint = Api.dandanAPIDomain + path;
- var timestamp = DateTime.now().millisecondsSinceEpoch ~/ 1000;
- var httpHeaders = {
- 'user-agent': Utils.getRandomUA(),
- 'referer': '',
- 'X-Auth': 1,
- 'X-AppId': mortis['id'],
- 'X-Timestamp': timestamp.toString(),
- 'X-Signature': Utils.generateDandanSignature(path, timestamp),
- };
Map<String, String> withRelated = {
'withRelated': 'true',
};
KazumiLogger().log(Level.info, "弹幕请求最终URL $endPoint");
final res = await Request().get(endPoint,
data: withRelated,
- options: Options(headers: httpHeaders),
extra: {'customError': '弹幕检索错误: 获取弹幕失败'});
Map<String, dynamic> jsonData = res.data;
@@ -145,22 +126,12 @@ class DanmakuRequest {
static Future<List<Danmaku>> getDanDanmakuByEpisodeID(int episodeID) async {
var path = Api.dandanAPIComment + episodeID.toString();
var endPoint = Api.dandanAPIDomain + path;
- var timestamp = DateTime.now().millisecondsSinceEpoch ~/ 1000;
List<Danmaku> danmakus = [];
- var httpHeaders = {
- 'user-agent': Utils.getRandomUA(),
- 'referer': '',
- 'X-Auth': 1,
- 'X-AppId': mortis['id'],
- 'X-Timestamp': timestamp.toString(),
- 'X-Signature': Utils.generateDandanSignature(path, timestamp),
- };
Map<String, String> withRelated = {
'withRelated': 'true',
};
final res = await Request().get(endPoint,
data: withRelated,
- options: Options(headers: httpHeaders),
extra: {'customError': '弹幕检索错误: 获取弹幕失败'});
Map<String, dynamic> jsonData = res.data;
List<dynamic> comments = jsonData['comments'];
diff --git a/lib/request/interceptor.dart b/lib/request/interceptor.dart
index 3a54935a..167ca596 100644
--- a/lib/request/interceptor.dart
+++ b/lib/request/interceptor.dart
@@ -4,6 +4,8 @@ import 'package:hive/hive.dart';
import 'package:kazumi/utils/storage.dart';
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';
class ApiInterceptor extends Interceptor {
static Box setting = GStorage.setting;
@@ -17,6 +19,17 @@ class ApiInterceptor extends Interceptor {
options.path = Api.gitMirror + options.path;
}
}
+ if (options.path.contains(Api.dandanAPIDomain)) {
+ var timestamp = DateTime.now().millisecondsSinceEpoch ~/ 1000;
+ options.headers = {
+ 'user-agent': Utils.getRandomUA(),
+ 'referer': '',
+ 'X-Auth': 1,
+ 'X-AppId': mortis['id'],
+ 'X-Timestamp': timestamp,
+ 'X-Signature': Utils.generateDandanSignature(Uri.parse(options.path).path, timestamp),
+ };
+ }
handler.next(options);
}
@@ -28,7 +41,8 @@ class ApiInterceptor extends Interceptor {
@override
void onError(DioException err, ErrorInterceptorHandler handler) async {
String url = err.requestOptions.uri.toString();
- if (!url.contains('heartBeat') && err.requestOptions.extra['customError'] != '') {
+ if (!url.contains('heartBeat') &&
+ err.requestOptions.extra['customError'] != '') {
if (err.requestOptions.extra['customError'] == null) {
KazumiDialog.showToast(
message: await dioError(err),
diff --git a/lib/utils/string_match.dart b/lib/utils/string_match.dart
index 0c6c6a53..4e97bf38 100644
--- a/lib/utils/string_match.dart
+++ b/lib/utils/string_match.dart
@@ -1,3 +1,6 @@
+// 计算两个字符串的编辑距离, 曾用于弹幕标题匹配
+// 由于 DanDanPlay 现在直接提供基于 bgmBangumiID 的弹幕反查,此方法已不再使用
+
import 'dart:math';
int levenshteinDistance(String s1, String s2) {