Skip to content

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

refactor: refactor player initialization

Prediditbf423da727c4
diff --git a/lib/pages/player/player_controller.dart b/lib/pages/player/player_controller.dart
index bbff5f50..773d3372 100644
--- a/lib/pages/player/player_controller.dart
+++ b/lib/pages/player/player_controller.dart
@@ -26,6 +26,28 @@ import 'package:kazumi/pages/download/download_controller.dart';
part 'player_controller.g.dart';
+class PlaybackInitParams {
+ final String videoUrl;
+ final int offset;
+ final bool isLocalPlayback;
+ final int bangumiId;
+ final String pluginName;
+ final int episode;
+ final Map<String, String> httpHeaders;
+ final bool adBlockerEnabled;
+
+ const PlaybackInitParams({
+ required this.videoUrl,
+ required this.offset,
+ required this.isLocalPlayback,
+ required this.bangumiId,
+ required this.pluginName,
+ required this.episode,
+ required this.httpHeaders,
+ required this.adBlockerEnabled,
+ });
+}
+
enum DanmakuDestination {
chatRoom,
remoteDanmaku,
@@ -193,34 +215,11 @@ abstract class _PlayerController with Store {
bool _isLocalPlayback = false;
- Future<void> init(String url, {int offset = 0}) async {
- // Check for local cached version
- _isLocalPlayback = false;
+ Future<void> init(PlaybackInitParams params) async {
+ videoUrl = params.videoUrl;
+ _isLocalPlayback = params.isLocalPlayback;
- // 离线模式下直接使用传入的本地路径
- if (videoPageController.isOfflineMode) {
- videoUrl = url;
- _isLocalPlayback = true;
- KazumiLogger().i('PlayerController: offline mode, using local path $url');
- } else {
- try {
- final downloadController = Modular.get<DownloadController>();
- final localPath = downloadController.getLocalVideoPath(
- videoPageController.bangumiItem.id,
- videoPageController.currentPlugin.name,
- videoPageController.currentEpisode,
- );
- if (localPath != null) {
- videoUrl = localPath;
- _isLocalPlayback = true;
- KazumiLogger().i('PlayerController: using local cache $localPath');
- } else {
- videoUrl = url;
- }
- } catch (_) {
- videoUrl = url;
- }
- }
+ KazumiLogger().i('PlayerController: ${params.isLocalPlayback ? "local" : "online"} playback, url: ${params.videoUrl}');
playing = false;
loading = true;
@@ -246,15 +245,19 @@ abstract class _PlayerController with Store {
try {
episodeFromTitle = Utils.extractEpisodeNumber(videoPageController
.roadList[videoPageController.currentRoad]
- .identifier[videoPageController.currentEpisode - 1]);
+ .identifier[params.episode - 1]);
} catch (e) {
KazumiLogger().e('PlayerController: failed to extract episode number from title', error: e);
}
if (episodeFromTitle == 0) {
- episodeFromTitle = videoPageController.currentEpisode;
+ episodeFromTitle = params.episode;
}
- _loadDanmaku(episodeFromTitle);
- mediaPlayer ??= await createVideoController(offset: offset);
+ _loadDanmaku(params.bangumiId, params.pluginName, episodeFromTitle);
+ mediaPlayer ??= await createVideoController(
+ params.httpHeaders,
+ params.adBlockerEnabled,
+ offset: params.offset,
+ );
if (Utils.isDesktop()) {
volume = volume != -1 ? volume : 100;
@@ -331,8 +334,11 @@ abstract class _PlayerController with Store {
await playerAudioBitrateSubscription?.cancel();
}
- Future<Player> createVideoController({int offset = 0}) async {
- String userAgent = '';
+ Future<Player> createVideoController(
+ Map<String, String> httpHeaders,
+ bool adBlockerEnabled,
+ {int offset = 0}
+ ) async {
superResolutionType =
setting.get(SettingBoxKey.defaultSuperResolutionType, defaultValue: 1);
hAenable = setting.get(SettingBoxKey.hAenable, defaultValue: true);
@@ -345,27 +351,6 @@ abstract class _PlayerController with Store {
setting.get(SettingBoxKey.lowMemoryMode, defaultValue: false);
playerDebugMode =
setting.get(SettingBoxKey.playerDebugMode, defaultValue: false);
- bool forceAdBlocker =
- setting.get(SettingBoxKey.forceAdBlocker, defaultValue: false);
- // 离线模式下不需要 adBlocker 和 HTTP 头
- bool adBlockerEnabled = _isLocalPlayback
- ? false
- : (forceAdBlocker || videoPageController.currentPlugin.adBlocker);
- String referer = '';
- if (!_isLocalPlayback) {
- if (videoPageController.currentPlugin.userAgent == '') {
- userAgent = Utils.getRandomUA();
- } else {
- userAgent = videoPageController.currentPlugin.userAgent;
- }
- referer = videoPageController.currentPlugin.referer;
- }
- var httpHeaders = _isLocalPlayback
- ? <String, String>{}
- : {
- 'user-agent': userAgent,
- if (referer.isNotEmpty) 'referer': referer,
- };
mediaPlayer = Player(
configuration: PlayerConfiguration(
@@ -606,16 +591,15 @@ abstract class _PlayerController with Store {
}
/// 加载弹幕 (离线模式优先从缓存加载,无缓存时尝试在线获取)
- Future<void> _loadDanmaku(int episode) async {
- if (videoPageController.isOfflineMode) {
- await _loadCachedDanmaku(episode);
+ Future<void> _loadDanmaku(int bangumiId, String pluginName, int episode) async {
+ if (_isLocalPlayback) {
+ await _loadCachedDanmaku(bangumiId, pluginName, episode);
} else {
- getDanDanmakuByBgmBangumiID(
- videoPageController.bangumiItem.id, episode);
+ getDanDanmakuByBgmBangumiID(bangumiId, episode);
}
}
- Future<void> _loadCachedDanmaku(int episode) async {
+ Future<void> _loadCachedDanmaku(int bangumiId, String pluginName, int episode) async {
if (danmakuLoading) {
KazumiLogger().i('PlayerController: danmaku is loading, ignore duplicate request');
return;
@@ -627,9 +611,9 @@ abstract class _PlayerController with Store {
danDanmakus.clear();
final downloadController = Modular.get<DownloadController>();
final cachedDanmakus = downloadController.getCachedDanmakus(
- videoPageController.bangumiItem.id,
- videoPageController.offlinePluginName,
- videoPageController.actualEpisodeNumber,
+ bangumiId,
+ pluginName,
+ episode,
);
if (cachedDanmakus != null && cachedDanmakus.isNotEmpty) {
@@ -639,13 +623,13 @@ abstract class _PlayerController with Store {
KazumiLogger().i('PlayerController: no cached danmaku, attempting online fetch');
try {
bangumiID = await DanmakuRequest.getDanDanBangumiIDByBgmBangumiID(
- videoPageController.bangumiItem.id);
+ bangumiId);
if (bangumiID != 0) {
var res = await DanmakuRequest.getDanDanmaku(bangumiID, episode);
if (res.isNotEmpty) {
addDanmakus(res);
KazumiLogger().i('PlayerController: fetched ${res.length} danmakus online');
- _saveDanmakuToCache(downloadController, res);
+ _saveDanmakuToCache(downloadController, bangumiId, pluginName, episode, res);
}
}
} catch (e) {
@@ -659,12 +643,12 @@ abstract class _PlayerController with Store {
}
}
- void _saveDanmakuToCache(DownloadController downloadController, List<Danmaku> danmakus) {
+ void _saveDanmakuToCache(DownloadController downloadController, int bangumiId, String pluginName, int episode, List<Danmaku> danmakus) {
try {
downloadController.updateCachedDanmakus(
- videoPageController.bangumiItem.id,
- videoPageController.offlinePluginName,
- videoPageController.actualEpisodeNumber,
+ bangumiId,
+ pluginName,
+ episode,
danmakus,
bangumiID,
);
diff --git a/lib/pages/video/video_controller.dart b/lib/pages/video/video_controller.dart
index 19b2d760..cc833267 100644
--- a/lib/pages/video/video_controller.dart
+++ b/lib/pages/video/video_controller.dart
@@ -18,6 +18,8 @@ import 'package:kazumi/modules/bangumi/episode_item.dart';
import 'package:kazumi/modules/comments/comment_item.dart';
import 'package:kazumi/request/bangumi.dart';
import 'package:dio/dio.dart';
+import 'package:hive_ce/hive.dart';
+import 'package:kazumi/utils/storage.dart';
part 'video_controller.g.dart';
@@ -86,6 +88,7 @@ abstract class _VideoPageController with Store {
final HistoryController historyController = Modular.get<HistoryController>();
final IDownloadRepository downloadRepository = Modular.get<IDownloadRepository>();
final IDownloadManager downloadManager = Modular.get<IDownloadManager>();
+ final Box setting = GStorage.setting;
/// 长生命周期的视频源提供者(页面生命周期内复用,WebView 实例在 Provider 内复用)
WebViewVideoSourceProvider? _videoSourceProvider;
@@ -206,8 +209,19 @@ abstract class _VideoPageController with Store {
KazumiLogger().i('VideoPageController: offline episode changed to $actualEpisodeNumber (index: $episode), path: $localPath');
+ final params = PlaybackInitParams(
+ videoUrl: localPath,
+ offset: offset,
+ isLocalPlayback: true,
+ bangumiId: bangumiItem.id,
+ pluginName: _offlinePluginName,
+ episode: actualEpisodeNumber,
+ httpHeaders: {},
+ adBlockerEnabled: false,
+ );
+
final playerController = Modular.get<PlayerController>();
- playerController.init(localPath, offset: offset);
+ await playerController.init(params);
}
/// 获取本地视频路径
@@ -233,8 +247,26 @@ abstract class _VideoPageController with Store {
loading = false;
KazumiLogger().i('VideoPageController: resolved video URL: ${source.url}');
+ final bool forceAdBlocker = setting.get(SettingBoxKey.forceAdBlocker, defaultValue: false);
+
+ final params = PlaybackInitParams(
+ videoUrl: source.url,
+ offset: source.offset,
+ isLocalPlayback: false,
+ bangumiId: bangumiItem.id,
+ pluginName: currentPlugin.name,
+ episode: currentEpisode,
+ httpHeaders: {
+ 'user-agent': currentPlugin.userAgent.isEmpty
+ ? Utils.getRandomUA()
+ : currentPlugin.userAgent,
+ if (currentPlugin.referer.isNotEmpty) 'referer': currentPlugin.referer,
+ },
+ adBlockerEnabled: forceAdBlocker || currentPlugin.adBlocker,
+ );
+
final playerController = Modular.get<PlayerController>();
- playerController.init(source.url, offset: source.offset);
+ await playerController.init(params);
} on VideoSourceTimeoutException {
KazumiLogger().w('VideoPageController: video URL resolution timed out');
loading = false;
diff --git a/lib/pages/video/video_page.dart b/lib/pages/video/video_page.dart
index ac7ce9ae..98dee16d 100644
--- a/lib/pages/video/video_page.dart
+++ b/lib/pages/video/video_page.dart
@@ -129,17 +129,24 @@ class _VideoPageState extends State<VideoPage>
videoPageController.bangumiItem,
videoPageController.offlinePluginName);
if (progress != null && playResume) {
- // 在离线模式下,只恢复播放进度,不改变集数(因为用户已选择特定集数)
+ // 在离线模式下,只恢复播放进度,不改变集数
videoPageController.historyOffset = progress.progress.inSeconds;
}
- // 初始化播放器(loading 已在 initForOfflinePlayback 中设置为 false)
- WidgetsBinding.instance.addPostFrameCallback((_) {
+ // 初始化播放器
+ WidgetsBinding.instance.addPostFrameCallback((_) async {
if (videoPageController.offlineVideoPath != null) {
- playerController.init(
- videoPageController.offlineVideoPath!,
+ final params = PlaybackInitParams(
+ videoUrl: videoPageController.offlineVideoPath!,
offset: videoPageController.historyOffset,
+ isLocalPlayback: true,
+ bangumiId: videoPageController.bangumiItem.id,
+ pluginName: videoPageController.offlinePluginName,
+ episode: videoPageController.actualEpisodeNumber,
+ httpHeaders: {},
+ adBlockerEnabled: false,
);
+ await playerController.init(params);
}
});
}