Skip to content

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

fix(player): disable current danmaku session when auto load is unavailable

Prediditc5072a7ad133
diff --git a/lib/pages/player/controller/player_danmaku_controller.dart b/lib/pages/player/controller/player_danmaku_controller.dart
index 66eebd7f..8f158772 100644
--- a/lib/pages/player/controller/player_danmaku_controller.dart
+++ b/lib/pages/player/controller/player_danmaku_controller.dart
@@ -17,14 +17,49 @@ part 'player_danmaku_controller.g.dart';
class PlayerDanmakuController = _PlayerDanmakuController
with _$PlayerDanmakuController;
+enum DanmakuLoadStatus {
+ success,
+ empty,
+ failed,
+}
+
class DanmakuLoadResult {
const DanmakuLoadResult({
required this.danmakus,
required this.bangumiID,
+ required this.status,
});
+ factory DanmakuLoadResult.success({
+ required List<DanmakuEntry> danmakus,
+ required int bangumiID,
+ }) {
+ return DanmakuLoadResult(
+ danmakus: danmakus,
+ bangumiID: bangumiID,
+ status: danmakus.isEmpty
+ ? DanmakuLoadStatus.empty
+ : DanmakuLoadStatus.success,
+ );
+ }
+
+ factory DanmakuLoadResult.failed({
+ required int bangumiID,
+ }) {
+ return DanmakuLoadResult(
+ danmakus: const [],
+ bangumiID: bangumiID,
+ status: DanmakuLoadStatus.failed,
+ );
+ }
+
final List<DanmakuEntry> danmakus;
final int bangumiID;
+ final DanmakuLoadStatus status;
+
+ bool get hasDanmakus => status == DanmakuLoadStatus.success;
+
+ bool get isFailed => status == DanmakuLoadStatus.failed;
}
class DanmakuTimeline {
@@ -126,13 +161,28 @@ abstract class _PlayerDanmakuController with Store {
danmakuLoading = true;
}
- void applyDanmakuLoad(DanmakuLoadResult result) {
+ void applyDanmakuLoad(
+ DanmakuLoadResult result, {
+ required bool enableDanmaku,
+ }) {
bangumiID = result.bangumiID;
addDanmakus(result.danmakus);
+ danmakuOn = enableDanmaku;
danmakuLoading = false;
}
- void finishDanmakuLoad() {
+ void applyUnavailableDanmakuLoad(DanmakuLoadResult result) {
+ bangumiID = result.bangumiID;
+ danDanmakus.clear();
+ danmakuOn = false;
+ danmakuLoading = false;
+ }
+
+ void finishDanmakuLoad({bool disableDanmaku = false}) {
+ if (disableDanmaku) {
+ danDanmakus.clear();
+ danmakuOn = false;
+ }
danmakuLoading = false;
}
@@ -152,7 +202,7 @@ abstract class _PlayerDanmakuController with Store {
if (cachedDanmakus != null && cachedDanmakus.isNotEmpty) {
KazumiLogger().i(
'PlayerController: loaded ${cachedDanmakus.length} cached danmakus');
- return DanmakuLoadResult(
+ return DanmakuLoadResult.success(
danmakus: cachedDanmakus,
bangumiID: nextBangumiID,
);
@@ -170,7 +220,7 @@ abstract class _PlayerDanmakuController with Store {
_saveDanmakuToCache(downloadController, bangumiId, pluginName,
episode, res, nextBangumiID);
}
- return DanmakuLoadResult(
+ return DanmakuLoadResult.success(
danmakus: res,
bangumiID: nextBangumiID,
);
@@ -179,13 +229,18 @@ abstract class _PlayerDanmakuController with Store {
KazumiLogger().w(
'PlayerController: failed to fetch danmaku online (may be offline)',
error: e);
+ return DanmakuLoadResult.failed(bangumiID: nextBangumiID);
}
}
} catch (e) {
KazumiLogger()
.w('PlayerController: failed to load cached danmaku', error: e);
+ return DanmakuLoadResult.failed(bangumiID: nextBangumiID);
}
- return DanmakuLoadResult(danmakus: const [], bangumiID: nextBangumiID);
+ return DanmakuLoadResult.success(
+ danmakus: const [],
+ bangumiID: nextBangumiID,
+ );
}
void _saveDanmakuToCache(
@@ -219,25 +274,36 @@ abstract class _PlayerDanmakuController with Store {
try {
nextBangumiID =
await DanmakuApi.getDanDanBangumiIDByBgmBangumiID(bgmBangumiID);
+ if (nextBangumiID == 0) {
+ return DanmakuLoadResult.success(
+ danmakus: const [],
+ bangumiID: nextBangumiID,
+ );
+ }
var res = await DanmakuApi.getDanDanmaku(nextBangumiID, episode);
- return DanmakuLoadResult(danmakus: res, bangumiID: nextBangumiID);
+ return DanmakuLoadResult.success(
+ danmakus: res,
+ bangumiID: nextBangumiID,
+ );
} catch (e) {
KazumiLogger().w(
'PlayerController: failed to get danmaku [BgmBangumiID] $bgmBangumiID',
error: e);
}
- return DanmakuLoadResult(danmakus: const [], bangumiID: nextBangumiID);
+ return DanmakuLoadResult.failed(bangumiID: nextBangumiID);
}
- Future<void> getDanDanmakuByEpisodeID(int episodeID) async {
+ Future<bool> getDanDanmakuByEpisodeID(int episodeID) async {
KazumiLogger().i('PlayerController: attempting to get danmaku $episodeID');
danmakuLoading = true;
try {
danDanmakus.clear();
var res = await DanmakuApi.getDanDanmakuByEpisodeID(episodeID);
addDanmakus(res);
+ return res.isNotEmpty;
} catch (e) {
KazumiLogger().w('PlayerController: failed to get danmaku', error: e);
+ rethrow;
} finally {
danmakuLoading = false;
}
diff --git a/lib/pages/player/player_item.dart b/lib/pages/player/player_item.dart
index c3e688d0..f52b5c67 100644
--- a/lib/pages/player/player_item.dart
+++ b/lib/pages/player/player_item.dart
@@ -456,25 +456,18 @@ class _PlayerItemState extends State<PlayerItem>
void handleDanmaku() {
playerController.danmaku.canvasController.clear();
- // if true, turn off danmaku.
if (playerController.danmaku.danmakuOn) {
- setState(() {
- playerController.danmaku.danmakuOn = false;
- });
+ playerController.danmaku.danmakuOn = false;
setting.put(SettingBoxKey.danmakuEnabledByDefault, false);
unawaited(_updateAndroidPIPActions(force: true));
return;
}
- // if false and empty, show dialog.
if (playerController.danmaku.danDanmakus.isEmpty) {
showDanmakuSwitch();
unawaited(_updateAndroidPIPActions(force: true));
return;
}
- // turn on danmaku.
- setState(() {
- playerController.danmaku.danmakuOn = true;
- });
+ playerController.danmaku.danmakuOn = true;
setting.put(SettingBoxKey.danmakuEnabledByDefault, true);
unawaited(_updateAndroidPIPActions(force: true));
}
@@ -1066,10 +1059,20 @@ class _PlayerItemState extends State<PlayerItem>
try {
videoPageController
.cancelAutomaticDanmakuLoad();
- await playerController.danmaku
+ final hasDanmakus = await playerController
+ .danmaku
.getDanDanmakuByEpisodeID(
episode.episodeId);
- KazumiDialog.showToast(message: '弹幕切换成功');
+ if (!mounted) {
+ return;
+ }
+ if (hasDanmakus) {
+ playerController.danmaku.danmakuOn = true;
+ KazumiDialog.showToast(message: '弹幕切换成功');
+ } else {
+ playerController.danmaku.danmakuOn = false;
+ KazumiDialog.showToast(message: '未找到弹幕内容');
+ }
} catch (e) {
KazumiDialog.showToast(message: '弹幕切换失败');
}
diff --git a/lib/pages/video/video_controller.dart b/lib/pages/video/video_controller.dart
index f0e8327a..881c74cd 100644
--- a/lib/pages/video/video_controller.dart
+++ b/lib/pages/video/video_controller.dart
@@ -405,11 +405,26 @@ abstract class _VideoPageController with Store {
_danmakuEpisodeForPlayback(params),
);
if (session.isActive && danmakuSession.isActive) {
- playerController.danmaku.applyDanmakuLoad(result);
+ if (result.hasDanmakus) {
+ final bool enableDanmaku = setting.get(
+ SettingBoxKey.danmakuEnabledByDefault,
+ defaultValue: false,
+ );
+ playerController.danmaku.applyDanmakuLoad(
+ result,
+ enableDanmaku: enableDanmaku,
+ );
+ } else {
+ playerController.danmaku.applyUnavailableDanmakuLoad(result);
+ if (result.isFailed) {
+ KazumiDialog.showToast(message: '弹幕加载失败,可手动检索');
+ }
+ }
}
} catch (e) {
if (session.isActive && danmakuSession.isActive) {
- playerController.danmaku.finishDanmakuLoad();
+ playerController.danmaku.finishDanmakuLoad(disableDanmaku: true);
+ KazumiDialog.showToast(message: '弹幕加载失败,可手动检索');
}
KazumiLogger().w('VideoPageController: failed to load danmaku', error: e);
}