Creepso/stremio-web
1
0
Fork 0
mirror of https://github.com/Stremio/stremio-web.git synced 2026-03-11 13:05:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor: simplfy subs handling

Browse source
This commit is contained in:
Timothy Z. 2026-01-22 14:48:52 +02:00
parent 67358359bf
commit ea5e302af7
1 changed files with 14 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
src/routes/Player/Player.js
View file

@ -90,7 +90,7 @@ const Player = ({ urlParams, queryParams }) => {
const nextVideoPopupDismissed = React.useRef(false);
const defaultSubtitlesSelected = React.useRef(false);
const lastSelectedSubtitleTrack = React.useRef(null);
const subtitlesEnabled = React.useRef(true);
const defaultAudioTrackSelected = React.useRef(false);
const [error, setError] = React.useState(null);
@ -503,14 +503,6 @@ const Player = ({ urlParams, queryParams }) => {
}
}, [video.state.stream, player.streamState]);
React.useEffect(() => {
if (video.state.selectedSubtitlesTrackId !== null) {
lastSelectedSubtitleTrack.current = { id: video.state.selectedSubtitlesTrackId, embedded: true };
} else if (video.state.selectedExtraSubtitlesTrackId !== null) {
lastSelectedSubtitleTrack.current = { id: video.state.selectedExtraSubtitlesTrackId, embedded: false };
}
}, [video.state.selectedSubtitlesTrackId, video.state.selectedExtraSubtitlesTrackId]);
React.useEffect(() => {
defaultSubtitlesSelected.current = false;
defaultAudioTrackSelected.current = false;
@ -680,35 +672,25 @@ const Player = ({ urlParams, queryParams }) => {
}, [onUpdateSubtitlesSize, onUpdateSubtitlesSize]);
onShortcut('toggleSubtitles', () => {
const hasEmbedded = video.state.selectedSubtitlesTrackId !== null;
const hasExtra = video.state.selectedExtraSubtitlesTrackId !== null;
const last = lastSelectedSubtitleTrack.current;
const savedTrack = player.streamState?.subtitleTrack;
if (hasEmbedded || hasExtra) {
if (subtitlesEnabled.current) {
video.setSubtitlesTrack(null);
video.setExtraSubtitlesTrack(null);
return;
}
if (last) {
const tracks = last.embedded ? video.state.subtitlesTracks : video.state.extraSubtitlesTracks;
if (tracks?.some((t) => t.id === last.id)) {
last.embedded ? onSubtitlesTrackSelected(last.id) : onExtraSubtitlesTrackSelected(last.id);
return;
} else if (savedTrack?.id) {
savedTrack.embedded ? onSubtitlesTrackSelected(savedTrack.id) : onExtraSubtitlesTrackSelected(savedTrack.id);
} else {
const embeddedMatch = findTrackByLang(video.state.subtitlesTracks || [], settings.subtitlesLanguage);
const extraMatch = findTrackByLang(video.state.extraSubtitlesTracks || [], settings.subtitlesLanguage);
if (embeddedMatch) {
onSubtitlesTrackSelected(embeddedMatch.id);
} else if (extraMatch) {
onExtraSubtitlesTrackSelected(extraMatch.id);
}
}
const embeddedMatch = findTrackByLang(video.state.subtitlesTracks || [], settings.subtitlesLanguage);
if (embeddedMatch) {
onSubtitlesTrackSelected(embeddedMatch.id);
return;
}
const extraMatch = findTrackByLang(video.state.extraSubtitlesTracks || [], settings.subtitlesLanguage);
if (extraMatch) {
onExtraSubtitlesTrackSelected(extraMatch.id);
}
}, [video.state.selectedSubtitlesTrackId, video.state.selectedExtraSubtitlesTrackId, video.state.subtitlesTracks, video.state.extraSubtitlesTracks, settings.subtitlesLanguage, onSubtitlesTrackSelected, onExtraSubtitlesTrackSelected]);
subtitlesEnabled.current = !subtitlesEnabled.current;
}, [player.streamState, video.state.subtitlesTracks, video.state.extraSubtitlesTracks, settings.subtitlesLanguage, onSubtitlesTrackSelected, onExtraSubtitlesTrackSelected]);
onShortcut('subtitlesMenu', () => {
closeMenus();