Creepso/mangayomi
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Add support for SubtitleTrack from data

Browse source
This commit is contained in:
kodjomoustapha 2024-05-08 18:23:11 +01:00
parent f47f15c2a7
commit f2187df237
2 changed files with 27 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
lib/eval/dart/model/m_bridge.dart
View file

@ -575,14 +575,18 @@ class MBridge {
static String cryptoHandler(
String text, String iv, String secretKeyString, bool encrypt) {
if (encrypt) {
final encryptt = _encrypt(secretKeyString, iv);
final en = encryptt.$1.encrypt(text, iv: encryptt.$2);
return en.base64;
} else {
final encryptt = _encrypt(secretKeyString, iv);
final en = encryptt.$1.decrypt64(text, iv: encryptt.$2);
return en;
try {
if (encrypt) {
final encryptt = _encrypt(secretKeyString, iv);
final en = encryptt.$1.encrypt(text, iv: encryptt.$2);
return en.base64;
} else {
final encryptt = _encrypt(secretKeyString, iv);
final en = encryptt.$1.decrypt64(text, iv: encryptt.$2);
return en;
}
} catch (_) {
return text;
}
}
}

28
lib/modules/anime/anime_player_view.dart
View file

@ -145,7 +145,7 @@ class _AnimeStreamPageState extends riv.ConsumerState<AnimeStreamPage>
headers: _firstVid.headers));
final ValueNotifier<double> _playbackSpeed = ValueNotifier(1.0);
bool _initSubtitle = true;
bool _initSubtitleAndAudio = true;
final ValueNotifier<bool> _enterFullScreen = ValueNotifier(false);
late final ValueNotifier<Duration> _currentPosition =
ValueNotifier(_streamController.geTCurrentPosition());
@ -164,24 +164,25 @@ class _AnimeStreamPageState extends riv.ConsumerState<AnimeStreamPage>
_currentPosition.value = position;
if ((_firstVid.subtitles ?? []).isNotEmpty) {
if (_initSubtitle) {
if (_initSubtitleAndAudio) {
try {
if (_firstVid.subtitles?.isNotEmpty ?? false) {
_player.setSubtitleTrack(SubtitleTrack.uri(
_firstVid.subtitles?.first.file ?? "",
title: _firstVid.subtitles?.first.label,
language: _firstVid.subtitles?.first.label));
final file = _firstVid.subtitles?.first.file ?? "";
final label = _firstVid.subtitles?.first.label;
_player.setSubtitleTrack(file.startsWith("http")
? SubtitleTrack.uri(file, title: label, language: label)
: SubtitleTrack.data(file, title: label, language: label));
}
} catch (_) {}
try {
if (_firstVid.audios?.isNotEmpty ?? false) {
_player.setSubtitleTrack(SubtitleTrack.uri(
_player.setAudioTrack(AudioTrack.uri(
_firstVid.audios?.first.file ?? "",
title: _firstVid.audios?.first.label,
language: _firstVid.audios?.first.label));
}
} catch (_) {}
_initSubtitle = false;
_initSubtitleAndAudio = false;
}
}
},
@ -415,10 +416,13 @@ class _AnimeStreamPageState extends riv.ConsumerState<AnimeStreamPage>
for (var video in widget.videos) {
for (var sub in video.subtitles ?? []) {
if (!subs.contains(sub.file)) {
final file = sub.file!;
final label = sub.label;
videoSubtitle.add(VideoPrefs(
isLocal: false,
subtitle: SubtitleTrack.uri(sub.file!,
title: sub.label, language: sub.label)));
subtitle: file.startsWith("http")
? SubtitleTrack.uri(file, title: label, language: label)
: SubtitleTrack.data(file, title: label, language: label)));
subs.add(sub.file!);
}
}
@ -990,9 +994,7 @@ class _AnimeStreamPageState extends riv.ConsumerState<AnimeStreamPage>
await Future.delayed(const Duration(milliseconds: 100));
if (mounted) {
_key.currentState?.update(
fit: fit,
width: context.width(1),
height: context.height(1));
fit: fit, width: context.width(1), height: context.height(1));
}
}