Skip to content

plugins: fix duplicate subtitle display with improved logic and checking #7346

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

plugins: fix duplicate subtitle display with improved logic and checking #7346

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
87 changes: 64 additions & 23 deletions src/plugins/htmlVideoPlayer/plugin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1364,36 +1364,77 @@
* @private
*/
renderSubtitlesWithCustomElement(videoElement, track, item, targetTextTrackIndex) {
this.fetchSubtitles(track, item).then((subtitleData) => {

Check failure on line 1367 in src/plugins/htmlVideoPlayer/plugin.js

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Refactor this function to reduce its Cognitive Complexity from 38 to the 15 allowed. 


See more on https://sonarcloud.io/project/issues?id=jellyfin_jellyfin-web&issues=AZqn-2_6S1uObbZAxAJ9&open=AZqn-2_6S1uObbZAxAJ9&pullRequest=7346
const subtitleAppearance = userSettings.getSubtitleAppearanceSettings();
const subtitleVerticalPosition = parseInt(subtitleAppearance.verticalPosition, 10);
const isSecondary = this.isSecondaryTrack(targetTextTrackIndex);

if (!this.#videoSubtitlesElem && !this.isSecondaryTrack(targetTextTrackIndex)) {
let subtitlesContainer = document.querySelector('.videoSubtitles');
if (!subtitlesContainer) {
subtitlesContainer = document.createElement('div');
subtitlesContainer.classList.add('videoSubtitles');
// If the requested track is no longer the active one for this player instance,
// don't create DOM for a stale async response (prevents duplicate overlays).
const expectedIndex = isSecondary ? this.#customSecondaryTrackIndex : this.#customTrackIndex;
if (expectedIndex !== track.Index) {
return; // stale response, ignore
}

let subtitlesContainer = document.querySelector('.videoSubtitles');

if (!isSecondary) {

Check warning on line 1381 in src/plugins/htmlVideoPlayer/plugin.js

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Unexpected negated condition. 


See more on https://sonarcloud.io/project/issues?id=jellyfin_jellyfin-web&issues=AZqn-2_6S1uObbZAxAJ-&open=AZqn-2_6S1uObbZAxAJ-&pullRequest=7346
// Primary track
if (!this.#videoSubtitlesElem) {
if (!subtitlesContainer) {
subtitlesContainer = document.createElement('div');
subtitlesContainer.classList.add('videoSubtitles');
}

// Reuse existing inner element if one already exists to avoid creating duplicates
const existingInner = subtitlesContainer ? subtitlesContainer.querySelector('.videoSubtitlesInner') : null;
if (existingInner) {
this.#videoSubtitlesElem = existingInner;
} else {
const subtitlesElement = document.createElement('div');
subtitlesElement.classList.add('videoSubtitlesInner');
subtitlesContainer.appendChild(subtitlesElement);
this.#videoSubtitlesElem = subtitlesElement;
}

// Ensure container is attached to the video parent
if (subtitlesContainer && subtitlesContainer.parentNode !== videoElement.parentNode) {
videoElement.parentNode.appendChild(subtitlesContainer);
}

this.setSubtitleAppearance(subtitlesContainer, this.#videoSubtitlesElem);
}
const subtitlesElement = document.createElement('div');
subtitlesElement.classList.add('videoSubtitlesInner');
subtitlesContainer.appendChild(subtitlesElement);
this.#videoSubtitlesElem = subtitlesElement;
this.setSubtitleAppearance(subtitlesContainer, this.#videoSubtitlesElem);
videoElement.parentNode.appendChild(subtitlesContainer);

this.#currentTrackEvents = subtitleData.TrackEvents;
} else if (!this.#videoSecondarySubtitlesElem && this.isSecondaryTrack(targetTextTrackIndex)) {
const subtitlesContainer = document.querySelector('.videoSubtitles');
if (!subtitlesContainer) return;
const secondarySubtitlesElement = document.createElement('div');
secondarySubtitlesElement.classList.add('videoSecondarySubtitlesInner');
// determine the order of the subtitles
if (subtitleVerticalPosition < 0) {
subtitlesContainer.insertBefore(secondarySubtitlesElement, subtitlesContainer.firstChild);
} else {
subtitlesContainer.appendChild(secondarySubtitlesElement);
} else {
// Secondary track
if (!this.#videoSecondarySubtitlesElem) {
if (!subtitlesContainer) return;

// Reuse existing secondary inner element if present
const existingSecondary = subtitlesContainer.querySelector('.videoSecondarySubtitlesInner');
if (existingSecondary) {
this.#videoSecondarySubtitlesElem = existingSecondary;
} else {
const secondarySubtitlesElement = document.createElement('div');
secondarySubtitlesElement.classList.add('videoSecondarySubtitlesInner');
// determine the order of the subtitles
if (subtitleVerticalPosition < 0) {
subtitlesContainer.insertBefore(secondarySubtitlesElement, subtitlesContainer.firstChild);
} else {
subtitlesContainer.appendChild(secondarySubtitlesElement);
}
this.#videoSecondarySubtitlesElem = secondarySubtitlesElement;
}

// Ensure container is attached to the video parent
if (subtitlesContainer && subtitlesContainer.parentNode !== videoElement.parentNode) {
videoElement.parentNode.appendChild(subtitlesContainer);
}

this.setSubtitleAppearance(subtitlesContainer, this.#videoSecondarySubtitlesElem);
}
this.#videoSecondarySubtitlesElem = secondarySubtitlesElement;
this.setSubtitleAppearance(subtitlesContainer, this.#videoSecondarySubtitlesElem);

this.#currentSecondaryTrackEvents = subtitleData.TrackEvents;
}
});
Expand Down
Loading