Skip to content

fix: Prevent forced playback speed interval leak #3837

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

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

fix: Prevent forced playback speed interval leak #3837

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
26 changes: 16 additions & 10 deletions js&css/web-accessible/www.youtube.com/player.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,16 +165,22 @@ ImprovedTube.playerPlaybackSpeed = function () { if (this.storage.player_forced_
) { player.setPlaybackRate(1); video.playbackRate = 1; console.log ("...,thus must be music?"); }
else { // Now this video might rarely be music
// - however we can make extra-sure after waiting for the video descripion to load... (#1539)
var tries = 0; var intervalMs = 210; if (location.href.indexOf('/watch?') !== -1) {var maxTries = 10;} else {var maxTries = 0;}
// ...except when it is an embedded player?
var waitForDescription = setInterval(() => {
if (++tries >= maxTries) {
subtitle = document.querySelector('#title + #subtitle:last-of-type')
if ( subtitle && 1 <= Number((subtitle?.innerHTML?.match(/^\d+/) || [])[0]) // indicates buyable/registered music (amount of songs)
&& typeof testSongDuration(DATA.lengthSeconds, Number((subtitle?.innerHTML?.match(/^\d+/) || [])[0]) ) !== 'undefined' ) // resonable duration
{player.setPlaybackRate(1); video.playbackRate = 1; console.log("...but YouTube shows music below the description!"); clearInterval(waitForDescription); }
intervalMs *= 1.11; }}, intervalMs);
window.addEventListener('load', () => { setTimeout(() => { clearInterval(waitForDescription); }, 1234); });
if (location.href.indexOf('/watch?') !== -1) {
let tries = 0;
const intervalMs = 210;
const maxTries = 10;
const waitForDescription = setInterval(() => {
const subtitle = document.querySelector('#title + #subtitle:last-of-type');
// console.log("[SPEED] checking for music keywords in the description... try " + tries + "// subtitle: " + subtitle?.innerHTML);
const descriptionSongCount = Number((subtitle?.innerHTML?.match(/^\d+/) || [])[0]);
if (subtitle && 1 <= descriptionSongCount && typeof testSongDuration(DATA.lengthSeconds, descriptionSongCount) !== 'undefined')
{player.setPlaybackRate(1); video.playbackRate = 1; console.log("...but YouTube shows music below the description!"); clearInterval(waitForDescription); return; }
if (++tries >= maxTries) {
// console.log("[SPEED] max tries reached, stopping description check...");
clearInterval(waitForDescription);
}
}, intervalMs);
}
}
}
//DATA (TO-DO: make the Data available to more/all features? #1452 #1763 (Then can replace ImprovedTube.elements.category === 'music', VideoID is also used elsewhere)
Expand Down