Skip to content

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

refactor(player): extract seek logic into PlayerSeekController (#2291)

Predidit9d522e4d9618
diff --git a/lib/pages/player/controller/player_seek_controller.dart b/lib/pages/player/controller/player_seek_controller.dart
new file mode 100644
index 00000000..645705ea
--- /dev/null
+++ b/lib/pages/player/controller/player_seek_controller.dart
@@ -0,0 +1,149 @@
+import 'package:kazumi/pages/player/controller/player_danmaku_controller.dart';
+import 'package:kazumi/pages/player/controller/player_playback_controller.dart';
+
+class _InteractiveSeekSession {
+ _InteractiveSeekSession(this.pauseCompleted, this.target);
+
+ final Future<void> pauseCompleted;
+ Duration target;
+ Future<bool>? commit;
+}
+
+class PlayerSeekController {
+ PlayerSeekController({
+ required PlayerPlaybackController playback,
+ required PlayerDanmakuController danmaku,
+ required Future<void> Function({bool enableSync}) pause,
+ required Future<void> Function({bool enableSync}) play,
+ required Future<void> Function(bool enableSync) onSeekCompleted,
+ }) : _playback = playback,
+ _danmaku = danmaku,
+ _pause = pause,
+ _play = play,
+ _onSeekCompleted = onSeekCompleted;
+
+ final PlayerPlaybackController _playback;
+ final PlayerDanmakuController _danmaku;
+ final Future<void> Function({bool enableSync}) _pause;
+ final Future<void> Function({bool enableSync}) _play;
+ final Future<void> Function(bool enableSync) _onSeekCompleted;
+
+ Future<void> _seekTail = Future<void>.value();
+ _InteractiveSeekSession? _interactiveSession;
+
+ bool get hasActiveInteractiveSeek => _interactiveSession != null;
+
+ Future<void> seekTo(
+ Duration target, {
+ bool enableSync = true,
+ }) {
+ final player = _playback.mediaPlayer;
+ if (player == null) {
+ return Future<void>.value();
+ }
+
+ final normalizedTarget = _normalize(target);
+ _playback.currentPosition = normalizedTarget;
+ _danmaku.clearAndInvalidateScheduledDanmakus();
+
+ final operation = _seekTail.then((_) async {
+ if (!_playback.isCurrentPlayer(player)) {
+ return;
+ }
+ try {
+ await player.seek(normalizedTarget);
+ } catch (_) {
+ return;
+ }
+ if (_playback.isCurrentPlayer(player)) {
+ await _onSeekCompleted(enableSync);
+ }
+ });
+ _seekTail = _settle(operation);
+ return operation;
+ }
+
+ Future<void> seekBy(
+ Duration offset, {
+ bool enableSync = true,
+ }) =>
+ seekTo(
+ _playback.currentPosition + offset,
+ enableSync: enableSync,
+ );
+
+ void beginInteractiveSeek() {
+ _interactiveSession = _InteractiveSeekSession(
+ _pause(enableSync: false),
+ _playback.currentPosition,
+ );
+ }
+
+ bool updateInteractiveSeek(Duration target) {
+ final session = _interactiveSession;
+ if (session == null) {
+ return false;
+ }
+ session.target = _normalize(target);
+ _playback.currentPosition = session.target;
+ return true;
+ }
+
+ Future<bool> commitInteractiveSeek() {
+ final session = _interactiveSession;
+ if (session == null) {
+ return Future<bool>.value(false);
+ }
+ return session.commit ??= _commitInteractiveSeek(session);
+ }
+
+ void invalidateInteractiveSeek() {
+ _interactiveSession = null;
+ }
+
+ Future<bool> _commitInteractiveSeek(
+ _InteractiveSeekSession session,
+ ) async {
+ try {
+ await session.pauseCompleted;
+ if (!_isCurrent(session)) {
+ return false;
+ }
+
+ await seekTo(session.target);
+ if (!_isCurrent(session)) {
+ return false;
+ }
+
+ await _play(enableSync: false);
+ return _isCurrent(session);
+ } finally {
+ if (_isCurrent(session)) {
+ _interactiveSession = null;
+ }
+ }
+ }
+
+ Duration _normalize(Duration target) {
+ var milliseconds = target.inMilliseconds;
+ if (milliseconds < 0) {
+ milliseconds = 0;
+ }
+ final duration = _playback.duration;
+ if (duration > Duration.zero && milliseconds > duration.inMilliseconds) {
+ milliseconds = duration.inMilliseconds;
+ }
+ return Duration(milliseconds: milliseconds);
+ }
+
+ bool _isCurrent(_InteractiveSeekSession session) =>
+ identical(_interactiveSession, session);
+
+ Future<void> _settle(Future<void> operation) async {
+ try {
+ await operation;
+ } catch (_) {
+ // The caller receives the error; the queue only needs to remain usable.
+ }
+ }
+}
diff --git a/lib/pages/player/player_controller.dart b/lib/pages/player/player_controller.dart
index 020e370b..4cab18c7 100644
--- a/lib/pages/player/player_controller.dart
+++ b/lib/pages/player/player_controller.dart
@@ -8,6 +8,7 @@ import 'package:kazumi/services/player/external_playback_launcher.dart';
import 'package:kazumi/pages/player/controller/player_danmaku_controller.dart';
import 'package:kazumi/pages/player/controller/player_debug_controller.dart';
import 'package:kazumi/pages/player/controller/player_models.dart';
+import 'package:kazumi/pages/player/controller/player_seek_controller.dart';
import 'package:kazumi/pages/player/controller/player_aspect_ratio.dart';
import 'package:kazumi/pages/player/controller/player_panel_controller.dart';
import 'package:kazumi/pages/player/controller/player_playback_controller.dart';
@@ -47,6 +48,13 @@ class PlayerController {
play: play,
seek: seek,
);
+ late final PlayerSeekController seeking = PlayerSeekController(
+ playback: playback,
+ danmaku: danmaku,
+ pause: pause,
+ play: play,
+ onSeekCompleted: _onSeekCompleted,
+ );
late final ExternalPlaybackLauncher externalPlayback =
ExternalPlaybackLauncher(
videoUrl: () => videoUrl,
@@ -282,16 +290,13 @@ class PlayerController {
await playback.playOrPause(pause: pause, play: play);
}
- Future<void> seek(Duration duration, {bool enableSync = true}) async {
- final player = playback.mediaPlayer;
- if (player == null) return;
- playback.currentPosition = duration;
- danmaku.canvasController.clear();
- try {
- await player.seek(duration);
- } catch (_) {
- return;
- }
+ Future<void> seek(Duration duration, {bool enableSync = true}) =>
+ seeking.seekTo(duration, enableSync: enableSync);
+
+ Future<void> seekBy(Duration offset, {bool enableSync = true}) =>
+ seeking.seekBy(offset, enableSync: enableSync);
+
+ Future<void> _onSeekCompleted(bool enableSync) async {
if (syncplay.syncplayController != null) {
setSyncPlayCurrentPosition();
if (enableSync) {
diff --git a/lib/pages/player/player_item.dart b/lib/pages/player/player_item.dart
index e45aa762..1b9bbf1d 100644
--- a/lib/pages/player/player_item.dart
+++ b/lib/pages/player/player_item.dart
@@ -1,6 +1,5 @@
import 'dart:async';
import 'dart:io';
-import 'package:audio_video_progress_bar/audio_video_progress_bar.dart';
import 'package:kazumi/pages/player/player_item_panel.dart';
import 'package:kazumi/pages/player/controller/player_super_resolution.dart';
import 'package:kazumi/pages/player/player_panel_hold.dart';
@@ -353,25 +352,18 @@ class _PlayerItemState extends State<PlayerItem>
widget.changeEpisode(targetEpisode, currentRoad: currentRoad);
}
- //快退快捷键动作
Future<void> handleShortcutRewind() async {
- int skipTime = playerController.playback.arrowKeySkipTime;
- int current = playerController.playback.currentPosition.inSeconds;
- int targetPosition;
-
- targetPosition = current - skipTime;
- if (targetPosition < 0) targetPosition = 0;
-
try {
- playerTimer?.cancel();
- await playerController.seek(Duration(seconds: targetPosition));
- playerTimer = getPlayerTimer();
+ await _seekWithPlayerTimer(
+ () => playerController.seekBy(
+ Duration(seconds: -playerController.playback.arrowKeySkipTime),
+ ),
+ );
} catch (e) {
KazumiLogger().e('PlayerController: seek failed', error: e);
}
}
- // 快进快捷键动作
Future<void> handleShortcutForwardDown() async {
lastPlayerSpeed = playerController.playback.playerSpeed;
}
@@ -387,21 +379,16 @@ class _PlayerItemState extends State<PlayerItem>
}
Future<void> handleShortcutForwardUp() async {
- int skipTime = playerController.playback.arrowKeySkipTime;
- int current = playerController.playback.currentPosition.inSeconds;
- int total = playerController.playback.duration.inSeconds;
- int targetPosition;
-
- targetPosition = current + skipTime;
- if (targetPosition > total) targetPosition = total;
if (playerController.panel.showPlaySpeed) {
playerController.panel.showPlaySpeed = false;
setPlaybackSpeed(lastPlayerSpeed);
} else {
try {
- playerTimer?.cancel();
- playerController.seek(Duration(seconds: targetPosition));
- playerTimer = getPlayerTimer();
+ await _seekWithPlayerTimer(
+ () => playerController.seekBy(
+ Duration(seconds: playerController.playback.arrowKeySkipTime),
+ ),
+ );
} catch (e) {
KazumiLogger().e('PlayerController: seek failed', error: e);
}
@@ -513,10 +500,10 @@ class _PlayerItemState extends State<PlayerItem>
_scheduleAdjustmentHudHide();
}
- // 跳过指定秒数
Future<void> skipOP() async {
- await playerController.seek(playerController.playback.currentPosition +
- Duration(seconds: playerController.playback.buttonSkipTime));
+ await playerController.seekBy(
+ Duration(seconds: playerController.playback.buttonSkipTime),
+ );
}
void handleDanmaku() {
@@ -628,23 +615,64 @@ class _PlayerItemState extends State<PlayerItem>
await _syncHistoryWithWebDav();
}
- void handleProgressBarDragStart(ThumbDragDetails details) {
- playerTimer?.cancel();
- playerController.pause(enableSync: false);
+ void handleProgressBarDragStart() {
+ _beginInteractiveSeek();
_syncAudioServiceState();
- _progressBarDragHold?.release();
_progressBarDragHold = acquirePlayerPanelHold();
}
- void handleProgressBarDragEnd() {
- playerController.play(enableSync: false);
- _syncAudioServiceState();
+ Future<void> handleProgressBarSeek(Duration duration) async {
+ if (!playerController.seeking.updateInteractiveSeek(duration)) {
+ await playerController.seek(duration);
+ return;
+ }
+ await _commitInteractiveSeek();
+ }
+
+ void _beginInteractiveSeek() {
_progressBarDragHold?.release();
_progressBarDragHold = null;
+ playerTimer?.cancel();
+ playerController.seeking.beginInteractiveSeek();
+ }
+
+ Future<void> _commitInteractiveSeek() async {
+ var completed = false;
+ try {
+ completed = await playerController.seeking.commitInteractiveSeek();
+ } catch (e) {
+ KazumiLogger().e('PlayerController: interactive seek failed', error: e);
+ }
+ if (!mounted ||
+ (!completed && playerController.seeking.hasActiveInteractiveSeek)) {
+ return;
+ }
+ _progressBarDragHold?.release();
+ _progressBarDragHold = null;
+ if (completed) {
+ _syncAudioServiceState();
+ }
+ _restartPlayerTimer();
+ }
+
+ void _restartPlayerTimer() {
playerTimer?.cancel();
playerTimer = getPlayerTimer();
}
+ Future<void> _seekWithPlayerTimer(
+ Future<void> Function() seekAction,
+ ) async {
+ playerTimer?.cancel();
+ try {
+ await seekAction();
+ } finally {
+ if (mounted) {
+ _restartPlayerTimer();
+ }
+ }
+ }
+
//截图
Future<void> handleScreenshot() async {
_playScreenshotFeedback();
@@ -1725,6 +1753,7 @@ class _PlayerItemState extends State<PlayerItem>
_playerSizeListener();
WidgetsBinding.instance.removeObserver(this);
windowManager.removeListener(this);
+ playerController.seeking.invalidateInteractiveSeek();
playerTimer?.cancel();
hideTimer?.cancel();
mouseScrollerTimer?.cancel();
@@ -1928,7 +1957,7 @@ class _PlayerItemState extends State<PlayerItem>
handleFullscreen: handleFullscreen,
handleProgressBarDragStart:
handleProgressBarDragStart,
- handleProgressBarDragEnd: handleProgressBarDragEnd,
+ handleProgressBarSeek: handleProgressBarSeek,
handleSuperResolutionChange:
handleSuperResolutionChange,
handlePreNextEpisode: handlePreNextEpisode,
@@ -1958,7 +1987,7 @@ class _PlayerItemState extends State<PlayerItem>
handleFullscreen: handleFullscreen,
handleProgressBarDragStart:
handleProgressBarDragStart,
- handleProgressBarDragEnd: handleProgressBarDragEnd,
+ handleProgressBarSeek: handleProgressBarSeek,
handleSuperResolutionChange:
handleSuperResolutionChange,
panelVisibilityController:
@@ -1986,6 +2015,7 @@ class _PlayerItemState extends State<PlayerItem>
: GestureDetector(
onHorizontalDragStart: (_) {
playerController.panel.seekDirection = 0;
+ _beginInteractiveSeek();
},
onHorizontalDragUpdate:
(DragUpdateDetails details) {
@@ -1994,28 +2024,25 @@ class _PlayerItemState extends State<PlayerItem>
playerController.panel.seekDirection =
details.delta.dx > 0 ? 1 : -1;
}
- playerTimer?.cancel();
- playerController.pause(enableSync: false);
final double scale =
180000 / MediaQuery.sizeOf(context).width;
- int ms = (playerController.playback
- .currentPosition.inMilliseconds +
- (details.delta.dx * scale).round())
- .clamp(
- 0,
- playerController
- .playback.duration.inMilliseconds);
- playerController.playback.currentPosition =
- Duration(milliseconds: ms);
+ playerController.seeking.updateInteractiveSeek(
+ playerController.playback.currentPosition +
+ Duration(
+ milliseconds:
+ (details.delta.dx * scale).round(),
+ ),
+ );
},
onHorizontalDragEnd: (_) {
- playerController.play(enableSync: false);
- playerController.seek(
- playerController.playback.currentPosition);
- playerTimer?.cancel();
- playerTimer = getPlayerTimer();
playerController.panel.showSeekTime = false;
playerController.panel.seekDirection = 0;
+ if (playerController
+ .seeking.hasActiveInteractiveSeek) {
+ unawaited(
+ _commitInteractiveSeek(),
+ );
+ }
},
onVerticalDragUpdate:
(DragUpdateDetails details) async {
diff --git a/lib/pages/player/player_item_panel.dart b/lib/pages/player/player_item_panel.dart
index 78a74285..1c1a7720 100644
--- a/lib/pages/player/player_item_panel.dart
+++ b/lib/pages/player/player_item_panel.dart
@@ -36,7 +36,7 @@ class PlayerItemPanel extends StatefulWidget {
required this.handleScreenShot,
required this.handlePreNextEpisode,
required this.handleProgressBarDragStart,
- required this.handleProgressBarDragEnd,
+ required this.handleProgressBarSeek,
required this.handleSuperResolutionChange,
required this.panelVisibilityController,
required this.toggleMenu,
@@ -61,8 +61,8 @@ class PlayerItemPanel extends StatefulWidget {
final void Function() toggleMenu;
final void Function() handleFullscreen;
final void Function() handleScreenShot;
- final void Function(ThumbDragDetails details) handleProgressBarDragStart;
- final void Function() handleProgressBarDragEnd;
+ final VoidCallback handleProgressBarDragStart;
+ final Future<void> Function(Duration duration) handleProgressBarSeek;
final Future<void> Function(SuperResolutionMode mode)
handleSuperResolutionChange;
final AnimationController panelVisibilityController;
@@ -649,18 +649,10 @@ class _PlayerItemPanelState extends State<PlayerItemPanel> {
progress: playerController.playback.currentPosition,
buffered: playerController.playback.buffer,
total: playerController.playback.duration,
- onSeek: (duration) {
- playerController.seek(duration);
- },
- onDragStart: (details) {
- widget.handleProgressBarDragStart(details);
- },
- onDragUpdate: (details) => {
- playerController.playback.currentPosition = details.timeStamp
- },
- onDragEnd: () {
- widget.handleProgressBarDragEnd();
- },
+ onSeek: widget.handleProgressBarSeek,
+ onDragStart: (_) => widget.handleProgressBarDragStart(),
+ onDragUpdate: (details) => playerController.seeking
+ .updateInteractiveSeek(details.timeStamp),
),
),
Padding(
diff --git a/lib/pages/player/smallest_player_item_panel.dart b/lib/pages/player/smallest_player_item_panel.dart
index 58925bf0..ac74adc6 100644
--- a/lib/pages/player/smallest_player_item_panel.dart
+++ b/lib/pages/player/smallest_player_item_panel.dart
@@ -32,7 +32,7 @@ class SmallestPlayerItemPanel extends StatefulWidget {
required this.showDanmakuSwitch,
required this.handleFullscreen,
required this.handleProgressBarDragStart,
- required this.handleProgressBarDragEnd,
+ required this.handleProgressBarSeek,
required this.handleSuperResolutionChange,
required this.panelVisibilityController,
required this.keyboardFocus,
@@ -53,8 +53,8 @@ class SmallestPlayerItemPanel extends StatefulWidget {
final void Function() handleDanmaku;
final void Function() skipOP;
final void Function() handleFullscreen;
- final void Function(ThumbDragDetails details) handleProgressBarDragStart;
- final void Function() handleProgressBarDragEnd;
+ final VoidCallback handleProgressBarDragStart;
+ final Future<void> Function(Duration duration) handleProgressBarSeek;
final Future<void> Function(SuperResolutionMode mode)
handleSuperResolutionChange;
final AnimationController panelVisibilityController;
@@ -437,17 +437,10 @@ class _SmallestPlayerItemPanelState extends State<SmallestPlayerItemPanel> {
progress: playerController.playback.currentPosition,
buffered: playerController.playback.buffer,
total: playerController.playback.duration,
- onSeek: (duration) {
- playerController.seek(duration);
- },
- onDragStart: (details) {
- widget.handleProgressBarDragStart(details);
- },
- onDragUpdate: (details) =>
- {playerController.playback.currentPosition = details.timeStamp},
- onDragEnd: () {
- widget.handleProgressBarDragEnd();
- },
+ onSeek: widget.handleProgressBarSeek,
+ onDragStart: (_) => widget.handleProgressBarDragStart(),
+ onDragUpdate: (details) => playerController.seeking
+ .updateInteractiveSeek(details.timeStamp),
),
),
Text(