基于自定义规则的番剧采集APP,支持流媒体在线观看,支持弹幕,支持实时超分辨率。
add player debug mode && fix video parser output
Predidita2ef079ad497
diff --git a/lib/pages/player/player_controller.dart b/lib/pages/player/player_controller.dartindex 9a9a841e..77eab2ae 100644--- a/lib/pages/player/player_controller.dart+++ b/lib/pages/player/player_controller.dart@@ -1,4 +1,5 @@import 'dart:io';+import 'dart:async';import 'package:flutter/foundation.dart';import 'package:flutter_volume_controller/flutter_volume_controller.dart';import 'package:kazumi/bean/dialog/dialog_helper.dart';@@ -104,6 +105,7 @@ abstract class _PlayerController with Store {late String hardwareDecoder;bool lowMemoryMode = false;bool autoPlay = true;+ bool playerDebugMode = false;int forwardTime = 80;// 播放器实时状态@@ -115,6 +117,11 @@ abstract class _PlayerController with Store {Duration get playerBuffer => mediaPlayer.state.buffer;Duration get playerDuration => mediaPlayer.state.duration;+ // 播放器内部日志+ List<String> playerLog = [];+ // 播放器日志订阅+ StreamSubscription<PlayerLog>? playerLogSubscription;+Future<void> init(String url, {int offset = 0}) async {videoUrl = url;playing = false;@@ -125,7 +132,7 @@ abstract class _PlayerController with Store {duration = Duration.zero;completed = false;try {- mediaPlayer.dispose();+ await dispose();} catch (_) {}int episodeFromTitle = 0;try {@@ -168,16 +175,13 @@ abstract class _PlayerController with Store {autoPlay = setting.get(SettingBoxKey.autoPlay, defaultValue: true);lowMemoryMode =setting.get(SettingBoxKey.lowMemoryMode, defaultValue: false);- KazumiLogger().log(- Level.info, 'media_kit decoder: 硬件解码: $hAenable 解码器: $hardwareDecoder');+ playerDebugMode = setting.get(SettingBoxKey.playerDebugMode, defaultValue: false);if (videoPageController.currentPlugin.userAgent == '') {userAgent = Utils.getRandomUA();} else {userAgent = videoPageController.currentPlugin.userAgent;}- KazumiLogger().log(Level.info, 'media_kit UA: $userAgent');String referer = videoPageController.currentPlugin.referer;- KazumiLogger().log(Level.info, 'media_kit Referer: $referer');var httpHeaders = {'user-agent': userAgent,if (referer.isNotEmpty) 'referer': referer,@@ -186,9 +190,21 @@ abstract class _PlayerController with Store {mediaPlayer = Player(configuration: PlayerConfiguration(bufferSize: lowMemoryMode ? 15 * 1024 * 1024 : 1500 * 1024 * 1024,+ osc: false,+ logLevel: MPVLogLevel.info,),);+ // 记录播放器内部日志+ playerLog.clear();+ await playerLogSubscription?.cancel();+ playerLogSubscription = mediaPlayer.stream.log.listen((event) {+ playerLog.add(event.toString());+ if (playerDebugMode) {+ KazumiLogger().simpleLog(event.toString());+ }+ });+var pp = mediaPlayer.platform as NativePlayer;await pp.setProperty("af", "scaletempo2=max-speed=8");if (Platform.isAndroid) {@@ -316,6 +332,9 @@ abstract class _PlayerController with Store {}Future<void> dispose() async {+ try {+ await playerLogSubscription?.cancel();+ } catch (_) {}try {await mediaPlayer.dispose();} catch (_) {}diff --git a/lib/pages/player/player_item.dart b/lib/pages/player/player_item.dartindex 7d06bd6d..141bd02e 100644--- a/lib/pages/player/player_item.dart+++ b/lib/pages/player/player_item.dart@@ -29,6 +29,7 @@ import 'package:kazumi/request/damaku.dart';import 'package:kazumi/modules/danmaku/danmaku_search_response.dart';import 'package:kazumi/modules/danmaku/danmaku_episode_response.dart';import 'package:kazumi/pages/player/player_item_surface.dart';+import 'package:kazumi/bean/widget/text_display.dart';import 'package:mobx/mobx.dart' as mobx;class PlayerItem extends StatefulWidget {@@ -93,6 +94,9 @@ class _PlayerItemState extends State<PlayerItem>late bool _danmakuDanDanSource;late int _danmakuFontWeight;+ // 硬件解码+ late bool haEnable;+Timer? hideTimer;Timer? playerTimer;Timer? mouseScrollerTimer;@@ -490,6 +494,60 @@ class _PlayerItemState extends State<PlayerItem>);}+ void showVideoInfo() async {+ String currentDemux = await Utils.getCurrentDemux();+ KazumiDialog.show(builder: (context) {+ return AlertDialog(+ title: const Text('视频详情'),+ content: SelectableText.rich(+ TextSpan(+ children: [+ TextSpan(text: '规则: ${videoPageController.currentPlugin.name}\n'),+ TextSpan(text: '硬件解码: ${haEnable ? '启用' : '禁用'}\n'),+ TextSpan(text: '解复用器: $currentDemux\n'),+ const TextSpan(text: '资源地址: '),+ TextSpan(+ text: playerController.videoUrl,+ ),+ ],+ ),+ style: Theme.of(context).textTheme.bodyLarge!,+ ),+ actions: [+ TextButton(+ onPressed: () {+ KazumiDialog.dismiss();+ showPlayerLogsDialog();+ },+ child: Text('调试信息')),+ TextButton(onPressed: KazumiDialog.dismiss, child: Text('取消')),+ ],+ );+ });+ }++ void showPlayerLogsDialog() {+ KazumiDialog.show(builder: (context) {+ return AlertDialog(+ title: const Text('调试信息'),+ content: SizedBox(+ height: 400,+ width: 400,+ child: TextDisplayWidget(logLines: playerController.playerLog)),+ actions: [+ TextButton(onPressed: () {+ Clipboard.setData(ClipboardData(text: playerController.playerLog.toString()));+ KazumiDialog.showToast(message: '已复制到剪贴板');+ }, child: const Text('复制到剪贴板')),+ TextButton(+ onPressed: KazumiDialog.dismiss,+ child: const Text('取消'),+ ),+ ],+ );+ });+ }+/// Used to decide which panel is used./// It's too complicated to write these in conditional sentence./// * true: use [PlayerItemPanel]@@ -562,6 +620,7 @@ class _PlayerItemState extends State<PlayerItem>setting.get(SettingBoxKey.danmakuDanDanSource, defaultValue: true);_danmakuFontWeight =setting.get(SettingBoxKey.danmakuFontWeight, defaultValue: 4);+ haEnable = setting.get(SettingBoxKey.hAenable, defaultValue: true);playerTimer = getPlayerTimer();windowManager.addListener(this);displayVideoController();@@ -845,6 +904,7 @@ class _PlayerItemState extends State<PlayerItem>startHideTimer: startHideTimer,cancelHideTimer: cancelHideTimer,handleDanmaku: handleDanmaku,+ showVideoInfo: showVideoInfo,): SmallestPlayerItemPanel(onBackPressed: widget.onBackPressed,@@ -860,6 +920,7 @@ class _PlayerItemState extends State<PlayerItem>startHideTimer: startHideTimer,cancelHideTimer: cancelHideTimer,handleDanmaku: handleDanmaku,+ showVideoInfo: showVideoInfo,),// 播放器手势控制Positioned.fill(diff --git a/lib/pages/player/player_item_panel.dart b/lib/pages/player/player_item_panel.dartindex 36b89424..3ed9b5ef 100644--- a/lib/pages/player/player_item_panel.dart+++ b/lib/pages/player/player_item_panel.dart@@ -35,6 +35,7 @@ class PlayerItemPanel extends StatefulWidget {required this.startHideTimer,required this.cancelHideTimer,required this.handleDanmaku,+ required this.showVideoInfo,});final void Function(BuildContext) onBackPressed;@@ -51,6 +52,7 @@ class PlayerItemPanel extends StatefulWidget {final void Function() cancelHideTimer;final void Function() handleDanmaku;final void Function(String) sendDanmaku;+ final void Function() showVideoInfo;@overrideState<PlayerItemPanel> createState() => _PlayerItemPanelState();@@ -158,36 +160,6 @@ class _PlayerItemPanelState extends State<PlayerItemPanel> {);}- void showVideoInfo() async {- String currentDemux = await Utils.getCurrentDemux();- KazumiDialog.show(- // onDismiss: () {- // _focusNode.requestFocus();- // },- builder: (context) {- return AlertDialog(- title: const Text('视频详情'),- content: SelectableText.rich(- TextSpan(- children: [- TextSpan(text: '规则: ${videoPageController.currentPlugin.name}\n'),- TextSpan(text: '硬件解码: ${haEnable ? '启用' : '禁用'}\n'),- TextSpan(text: '解复用器: $currentDemux\n'),- const TextSpan(text: '资源地址: '),- TextSpan(- text: playerController.videoUrl,- ),- ],- ),- style: Theme.of(context).textTheme.bodyLarge!,- ),- actions: const [- TextButton(onPressed: KazumiDialog.dismiss, child: Text('取消')),- ],- );- });- }-// 选择倍速void showSetSpeedSheet() {final double currentSpeed = playerController.playerSpeed;@@ -673,7 +645,7 @@ class _PlayerItemPanelState extends State<PlayerItemPanel> {),MenuItemButton(onPressed: () {- showVideoInfo();+ widget.showVideoInfo();},child: const Padding(padding: EdgeInsets.fromLTRB(0, 10, 10, 10),diff --git a/lib/pages/player/smallest_player_item_panel.dart b/lib/pages/player/smallest_player_item_panel.dartindex 72e0b4c5..5560326c 100644--- a/lib/pages/player/smallest_player_item_panel.dart+++ b/lib/pages/player/smallest_player_item_panel.dart@@ -32,6 +32,7 @@ class SmallestPlayerItemPanel extends StatefulWidget {required this.startHideTimer,required this.cancelHideTimer,required this.handleDanmaku,+ required this.showVideoInfo,});final void Function(BuildContext) onBackPressed;@@ -46,6 +47,7 @@ class SmallestPlayerItemPanel extends StatefulWidget {final FocusNode keyboardFocus;final void Function() startHideTimer;final void Function() cancelHideTimer;+ final void Function() showVideoInfo;@overrideState<SmallestPlayerItemPanel> createState() =>@@ -64,36 +66,6 @@ class _SmallestPlayerItemPanelState extends State<SmallestPlayerItemPanel> {final PlayerController playerController = Modular.get<PlayerController>();final TextEditingController textController = TextEditingController();- void showVideoInfo() async {- String currentDemux = await Utils.getCurrentDemux();- KazumiDialog.show(- // onDismiss: () {- // _focusNode.requestFocus();- // },- builder: (context) {- return AlertDialog(- title: const Text('视频详情'),- content: SelectableText.rich(- TextSpan(- children: [- TextSpan(text: '规则: ${videoPageController.currentPlugin.name}\n'),- TextSpan(text: '硬件解码: ${haEnable ? '启用' : '禁用'}\n'),- TextSpan(text: '解复用器: $currentDemux\n'),- const TextSpan(text: '资源地址: '),- TextSpan(- text: playerController.videoUrl,- ),- ],- ),- style: Theme.of(context).textTheme.bodyLarge!,- ),- actions: const [- TextButton(onPressed: KazumiDialog.dismiss, child: Text('取消')),- ],- );- });- }-void showForwardChange() {KazumiDialog.show(builder: (context) {String input = "";@@ -575,7 +547,7 @@ class _SmallestPlayerItemPanelState extends State<SmallestPlayerItemPanel> {),MenuItemButton(onPressed: () {- showVideoInfo();+ widget.showVideoInfo();},child: const Padding(padding: EdgeInsets.fromLTRB(0, 10, 10, 10),diff --git a/lib/pages/settings/player_settings.dart b/lib/pages/settings/player_settings.dartindex 07c13616..260ad495 100644--- a/lib/pages/settings/player_settings.dart+++ b/lib/pages/settings/player_settings.dart@@ -23,6 +23,7 @@ class _PlayerSettingsPageState extends State<PlayerSettingsPage> {late bool playResume;late bool showPlayerError;late bool privateMode;+ late bool playerDebugMode;@overridevoid initState() {@@ -36,6 +37,8 @@ class _PlayerSettingsPageState extends State<PlayerSettingsPage> {privateMode = setting.get(SettingBoxKey.privateMode, defaultValue: false);showPlayerError =setting.get(SettingBoxKey.showPlayerError, defaultValue: true);+ playerDebugMode =+ setting.get(SettingBoxKey.playerDebugMode, defaultValue: false);}void onBackPressed(BuildContext context) {@@ -116,13 +119,25 @@ class _PlayerSettingsPageState extends State<PlayerSettingsPage> {SettingsTile.switchTile(onToggle: (value) async {showPlayerError = value ?? !showPlayerError;- await setting.put(SettingBoxKey.showPlayerError, showPlayerError);+ await setting.put(+ SettingBoxKey.showPlayerError, showPlayerError);setState(() {});},title: const Text('错误提示'),description: const Text('显示播放器内部错误提示'),initialValue: showPlayerError,),+ SettingsTile.switchTile(+ onToggle: (value) async {+ playerDebugMode = value ?? !playerDebugMode;+ await setting.put(+ SettingBoxKey.playerDebugMode, playerDebugMode);+ setState(() {});+ },+ title: const Text('调试模式'),+ description: const Text('记录播放器内部日志'),+ initialValue: playerDebugMode,+ ),SettingsTile.switchTile(onToggle: (value) async {privateMode = value ?? !privateMode;diff --git a/lib/pages/video/video_page.dart b/lib/pages/video/video_page.dartindex 1d47e750..df5c4d3e 100644--- a/lib/pages/video/video_page.dart+++ b/lib/pages/video/video_page.dart@@ -43,7 +43,7 @@ class _VideoPageState extends State<VideoPage>Modular.get<WebviewItemController>();late bool playResume;bool showDebugLog = false;- List<String> logLines = [];+ List<String> webviewLogLines = [];final FocusNode keyboardFocus = FocusNode();ScrollController scrollController = ScrollController();@@ -129,7 +129,7 @@ class _VideoPageState extends State<VideoPage>_logSubscription = webviewItemController.onLog.listen((event) {debugPrint('Kazumi Webview log: $event');if (event == 'clear') {- clearLogs();+ clearWebviewLog();return;}if (event == 'showDebug') {@@ -137,7 +137,7 @@ class _VideoPageState extends State<VideoPage>return;}setState(() {- logLines.add(event);+ webviewLogLines.add(event);});});}@@ -193,15 +193,15 @@ class _VideoPageState extends State<VideoPage>});}- void clearLog() {+ void clearWebviewLog() {setState(() {- logLines.clear();+ webviewLogLines.clear();});}Future<void> changeEpisode(int episode,{int currentRoad = 0, int offset = 0}) async {- clearLogs();+ clearWebviewLog();hideDebugConsole();videoPageController.loading = true;infoController.episodeInfo.reset();@@ -449,7 +449,7 @@ class _VideoPageState extends State<VideoPage>Widget get playerBody {return Stack(children: [- // 日志组件+ // webview log component (not player log, used for video parsing)Positioned.fill(child: Stack(children: [@@ -509,10 +509,10 @@ class _VideoPageState extends State<VideoPage>alignment: Alignment.center,child: ListView.builder(shrinkWrap: true,- itemCount: logLines.length,+ itemCount: webviewLogLines.length,itemBuilder: (context, index) {return Text(- logLines.isEmpty ? '' : logLines[index],+ webviewLogLines.isEmpty ? '' : webviewLogLines[index],style: const TextStyle(color: Colors.white,),diff --git a/lib/utils/logger.dart b/lib/utils/logger.dartindex f9f482bf..e158cb9b 100644--- a/lib/utils/logger.dart+++ b/lib/utils/logger.dart@@ -1,17 +1,20 @@import 'dart:io';import 'package:logger/logger.dart';-import 'package:path_provider/path_provider.dart';import 'package:path/path.dart' as p;+import 'package:path_provider/path_provider.dart';+import 'package:synchronized/synchronized.dart';class KazumiLogger extends Logger {KazumiLogger._internal() : super();static final KazumiLogger _instance = KazumiLogger._internal();-factory KazumiLogger() {return _instance;}+ /// Global lock to ensure file writing is executed synchronously+ static final Lock _logLock = Lock();+@overridevoid log(Level level, dynamic message,{Object? error, StackTrace? stackTrace, DateTime? time}) async {@@ -25,12 +28,34 @@ class KazumiLogger extends Logger {await directory.create(recursive: true);}+ await _logLock.synchronized(() async {+ await File(filename).writeAsString(+ "**${DateTime.now()}** \n$message \n${stackTrace == null ? '' : stackTrace.toString()} \n",+ mode: FileMode.writeOnlyAppend,+ );+ });+ }+ super.log(level, "$message",+ error: error, stackTrace: level == Level.error ? stackTrace : null);+ }++ /// Simple log logs to file without stack trace and console output+ void simpleLog(dynamic message) async {+ String dir = (await getApplicationSupportDirectory()).path;+ final String logDir = p.join(dir, "logs");+ final String filename = p.join(logDir, "kazumi_logs.log");++ final directory = Directory(logDir);+ if (!await directory.exists()) {+ await directory.create(recursive: true);+ }++ await KazumiLogger._logLock.synchronized(() async {await File(filename).writeAsString(- "**${DateTime.now()}** \n$message \n${stackTrace == null ? '' : stackTrace.toString()} \n",+ "**${DateTime.now()}** \n$message \n",mode: FileMode.writeOnlyAppend,);- }- super.log(level, "$message", error: error, stackTrace: level == Level.error ? stackTrace : null);+ });}}@@ -46,7 +71,11 @@ Future<File> getLogsPath() async {final file = File(filename);if (!await file.exists()) {- await file.create();+ await KazumiLogger._logLock.synchronized(() async {+ if (!await file.exists()) {+ await file.create();+ }+ });}return file;}@@ -56,7 +85,6 @@ Future<bool> clearLogs() async {final String logDir = p.join(dir, "logs");final String filename = p.join(logDir, "kazumi_logs.log");- // 确保日志文件夹存在final directory = Directory(logDir);if (!await directory.exists()) {await directory.create(recursive: true);@@ -64,7 +92,9 @@ Future<bool> clearLogs() async {final file = File(filename);try {- await file.writeAsString('');+ await KazumiLogger._logLock.synchronized(() async {+ await file.writeAsString('');+ });} catch (e) {print('Error clearing file: $e');return false;diff --git a/lib/utils/storage.dart b/lib/utils/storage.dartindex 99f242f2..a93dc9a0 100644--- a/lib/utils/storage.dart+++ b/lib/utils/storage.dart@@ -239,5 +239,6 @@ class SettingBoxKey {showWindowButton = 'showWindowButton',useDynamicColor = 'useDynamicColor',exitBehavior = 'exitBehavior',+ playerDebugMode = 'playerDebugMode',defaultSuperResolutionType = 'defaultSuperResolutionType';}diff --git a/pubspec.lock b/pubspec.lockindex 0a318344..4ccefe47 100644--- a/pubspec.lock+++ b/pubspec.lock@@ -1273,7 +1273,7 @@ packages:source: hostedversion: "1.4.1"synchronized:- dependency: transitive+ dependency: "direct main"description:name: synchronizedsha256: "69fe30f3a8b04a0be0c15ae6490fc859a78ef4c43ae2dd5e8a623d45bfcf9225"diff --git a/pubspec.yaml b/pubspec.yamlindex 52dd60ea..71822a36 100644--- a/pubspec.yaml+++ b/pubspec.yaml@@ -80,6 +80,7 @@ dependencies:material_color_utilities: anypath: anyscreen_brightness_platform_interface: any+ synchronized: anyantlr4: ^4.13.2webview_windows:git: