speed by category, music detection #1729, re-doing: #847

code-charity · Aug 31, 2023 · 763ccd0 · 763ccd0
1 parent 7b3020f
commit 763ccd0
Show file tree

Hide file tree

Showing 34 changed files with 100 additions and 77 deletions.
diff --git a/_locales/am/messages.json b/_locales/am/messages.json
@@ -384,7 +384,7 @@
         "message": "Force video to play from the beginning"
     },
     "forcedPlaybackSpeed": {
-        "message": "Forced playback speed, speed-watching"
+        "message": "Speed-watching: Permanent speed"
     },
     "forcedPlaybackSpeedMusic": {
         "message": "(Force playback speed even for music?)"

diff --git a/_locales/bg/messages.json b/_locales/bg/messages.json
@@ -384,7 +384,7 @@
         "message": "Forced play video from the beginning"
     },
     "forcedPlaybackSpeed": {
-        "message": "Forced playback speed, speed-watching"
+        "message": "Speed-watching: Permanent speed"
     },
     "forcedPlaybackSpeedMusic": {
         "message": "(Force playback speed even for music?)"

diff --git a/_locales/ca/messages.json b/_locales/ca/messages.json
@@ -384,7 +384,7 @@
         "message": "Forced play video from the beginning"
     },
     "forcedPlaybackSpeed": {
-        "message": "Forced playback speed, speed-watching"
+        "message": "Speed-watching: Permanent speed"
     },
     "forcedPlaybackSpeedMusic": {
         "message": "(Force playback speed even for music?)"

diff --git a/_locales/cs/messages.json b/_locales/cs/messages.json
@@ -384,7 +384,7 @@
         "message": "Forced play video from the beginning"
     },
     "forcedPlaybackSpeed": {
-        "message": "Forced playback speed, speed-watching"
+        "message": "Speed-watching: Permanent speed"
     },
     "forcedPlaybackSpeedMusic": {
         "message": "(Force playback speed even for music?)"

diff --git a/_locales/da/messages.json b/_locales/da/messages.json
@@ -384,7 +384,7 @@
         "message": "Forced play video from the beginning"
     },
     "forcedPlaybackSpeed": {
-        "message": "Forced playback speed, speed-watching"
+        "message": "Speed-watching: Permanent speed"
     },
     "forcedPlaybackSpeedMusic": {
         "message": "(Force playback speed even for music?)"

diff --git a/_locales/en/messages.json b/_locales/en/messages.json
@@ -399,7 +399,7 @@
         "message": "Force video to play from the beginning"
     },
     "forcedPlaybackSpeed": {
-        "message": "Forced playback speed, speed-watching"
+        "message": "Speed-watching: Permanent speed"
     },
     "forcedPlaybackSpeedMusic": {
         "message": "(Force playback speed even for music?)"

diff --git a/_locales/en_GB/messages.json b/_locales/en_GB/messages.json
@@ -381,7 +381,7 @@
         "message": "Force video to play from the beginning"
     },
     "forcedPlaybackSpeed": {
-        "message": "Forced playback speed, speed-watching"
+        "message": "Speed-watching: Permanent speed"
     },
     "forcedPlaybackSpeedMusic": {
         "message": "(Force playback speed even for music?)"

diff --git a/_locales/en_US/messages.json b/_locales/en_US/messages.json
@@ -381,7 +381,7 @@
         "message": "Force video to play from the beginning"
     },
     "forcedPlaybackSpeed": {
-        "message": "Forced playback speed, speed-watching"
+        "message": "Speed-watching: Permanent speed"
     },
     "forcedPlaybackSpeedMusic": {
         "message": "(Force playback speed even for music?)"

diff --git a/_locales/et/messages.json b/_locales/et/messages.json
@@ -384,7 +384,7 @@
         "message": "Forced play video from the beginning"
     },
     "forcedPlaybackSpeed": {
-        "message": "Forced playback speed, speed-watching"
+        "message": "Speed-watching: Permanent speed"
     },
     "forcedPlaybackSpeedMusic": {
         "message": "(Force playback speed even for music?)"

diff --git a/_locales/fa/messages.json b/_locales/fa/messages.json
@@ -384,7 +384,7 @@
         "message": "Forced play video from the beginning"
     },
     "forcedPlaybackSpeed": {
-        "message": "Forced playback speed, speed-watching"
+        "message": "Speed-watching: Permanent speed"
     },
     "forcedPlaybackSpeedMusic": {
         "message": "(Force playback speed even for music?)"

diff --git a/_locales/fi/messages.json b/_locales/fi/messages.json
@@ -384,7 +384,7 @@
         "message": "Forced play video from the beginning"
     },
     "forcedPlaybackSpeed": {
-        "message": "Forced playback speed, speed-watching"
+        "message": "Speed-watching: Permanent speed"
     },
     "forcedPlaybackSpeedMusic": {
         "message": "(Force playback speed even for music?)"

diff --git a/_locales/fil/messages.json b/_locales/fil/messages.json
@@ -384,7 +384,7 @@
         "message": "Forced play video from the beginning"
     },
     "forcedPlaybackSpeed": {
-        "message": "Forced playback speed, speed-watching"
+        "message": "Speed-watching: Permanent speed"
     },
     "forcedPlaybackSpeedMusic": {
         "message": "(Force playback speed even for music?)"

diff --git a/_locales/gu/messages.json b/_locales/gu/messages.json
@@ -384,7 +384,7 @@
         "message": "Forced play video from the beginning"
     },
     "forcedPlaybackSpeed": {
-        "message": "Forced playback speed, speed-watching"
+        "message": "Speed-watching: Permanent speed"
     },
     "forcedPlaybackSpeedMusic": {
         "message": "(Force playback speed even for music?)"

diff --git a/_locales/he/messages.json b/_locales/he/messages.json
@@ -384,7 +384,7 @@
         "message": "Forced play video from the beginning"
     },
     "forcedPlaybackSpeed": {
-        "message": "Forced playback speed, speed-watching"
+        "message": "Speed-watching: Permanent speed"
     },
     "forcedPlaybackSpeedMusic": {
         "message": "(Force playback speed even for music?)"

diff --git a/_locales/hu/messages.json b/_locales/hu/messages.json
@@ -384,7 +384,7 @@
         "message": "Forced play video from the beginning"
     },
     "forcedPlaybackSpeed": {
-        "message": "Forced playback speed, speed-watching"
+        "message": "Speed-watching: Permanent speed"
     },
     "forcedPlaybackSpeedMusic": {
         "message": "(Force playback speed even for music?)"

diff --git a/_locales/kn/messages.json b/_locales/kn/messages.json
@@ -384,7 +384,7 @@
         "message": "Forced play video from the beginning"
     },
     "forcedPlaybackSpeed": {
-        "message": "Forced playback speed, speed-watching"
+        "message": "Speed-watching: Permanent speed"
     },
     "forcedPlaybackSpeedMusic": {
         "message": "(Force playback speed even for music?)"

diff --git a/_locales/lt/messages.json b/_locales/lt/messages.json
@@ -384,7 +384,7 @@
         "message": "Forced play video from the beginning"
     },
     "forcedPlaybackSpeed": {
-        "message": "Forced playback speed, speed-watching"
+        "message": "Speed-watching: Permanent speed"
     },
     "forcedPlaybackSpeedMusic": {
         "message": "(Force playback speed even for music?)"

diff --git a/_locales/lv/messages.json b/_locales/lv/messages.json
@@ -384,7 +384,7 @@
         "message": "Forced play video from the beginning"
     },
     "forcedPlaybackSpeed": {
-        "message": "Forced playback speed, speed-watching"
+        "message": "Speed-watching: Permanent speed"
     },
     "forcedPlaybackSpeedMusic": {
         "message": "(Force playback speed even for music?)"

diff --git a/_locales/ml/messages.json b/_locales/ml/messages.json
@@ -384,7 +384,7 @@
         "message": "Forced play video from the beginning"
     },
     "forcedPlaybackSpeed": {
-        "message": "Forced playback speed, speed-watching"
+        "message": "Speed-watching: Permanent speed"
     },
     "forcedPlaybackSpeedMusic": {
         "message": "(Force playback speed even for music?)"

diff --git a/_locales/mr/messages.json b/_locales/mr/messages.json
@@ -384,7 +384,7 @@
         "message": "Forced play video from the beginning"
     },
     "forcedPlaybackSpeed": {
-        "message": "Forced playback speed, speed-watching"
+        "message": "Speed-watching: Permanent speed"
     },
     "forcedPlaybackSpeedMusic": {
         "message": "(Force playback speed even for music?)"

diff --git a/_locales/ms/messages.json b/_locales/ms/messages.json
@@ -384,7 +384,7 @@
         "message": "Forced play video from the beginning"
     },
     "forcedPlaybackSpeed": {
-        "message": "Forced playback speed, speed-watching"
+        "message": "Speed-watching: Permanent speed"
     },
     "forcedPlaybackSpeedMusic": {
         "message": "(Force playback speed even for music?)"

diff --git a/_locales/si/messages.json b/_locales/si/messages.json
@@ -381,7 +381,7 @@
         "message": "වීඩියෝව මුල සිට බලහත්කාරයෙන් play කරන්න"
     },
     "forcedPlaybackSpeed": {
-        "message": "Forced playback speed, speed-watching"
+        "message": "Speed-watching: Permanent speed"
     },
     "forcedPlaybackSpeedMusic": {
         "message": "(Force playback speed even for music?)"

diff --git a/_locales/sl/messages.json b/_locales/sl/messages.json
@@ -384,7 +384,7 @@
         "message": "Forced play video from the beginning"
     },
     "forcedPlaybackSpeed": {
-        "message": "Forced playback speed, speed-watching"
+        "message": "Speed-watching: Permanent speed"
     },
     "forcedPlaybackSpeedMusic": {
         "message": "(Force playback speed even for music?)"

diff --git a/_locales/sr/messages.json b/_locales/sr/messages.json
@@ -384,7 +384,7 @@
         "message": "Forced play video from the beginning"
     },
     "forcedPlaybackSpeed": {
-        "message": "Forced playback speed, speed-watching"
+        "message": "Speed-watching: Permanent speed"
     },
     "forcedPlaybackSpeedMusic": {
         "message": "(Force playback speed even for music?)"

diff --git a/_locales/sw/messages.json b/_locales/sw/messages.json
@@ -384,7 +384,7 @@
         "message": "Forced play video from the beginning"
     },
     "forcedPlaybackSpeed": {
-        "message": "Forced playback speed, speed-watching"
+        "message": "Speed-watching: Permanent speed"
     },
     "forcedPlaybackSpeedMusic": {
         "message": "(Force playback speed even for music?)"

diff --git a/_locales/ta/messages.json b/_locales/ta/messages.json
@@ -384,7 +384,7 @@
         "message": "Forced play video from the beginning"
     },
     "forcedPlaybackSpeed": {
-        "message": "Forced playback speed, speed-watching"
+        "message": "Speed-watching: Permanent speed"
     },
     "forcedPlaybackSpeedMusic": {
         "message": "(Force playback speed even for music?)"

diff --git a/_locales/te/messages.json b/_locales/te/messages.json
@@ -384,7 +384,7 @@
         "message": "Forced play video from the beginning"
     },
     "forcedPlaybackSpeed": {
-        "message": "Forced playback speed, speed-watching"
+        "message": "Speed-watching: Permanent speed"
     },
     "forcedPlaybackSpeedMusic": {
         "message": "(Force playback speed even for music?)"

diff --git a/_locales/th/messages.json b/_locales/th/messages.json
@@ -384,7 +384,7 @@
         "message": "Forced play video from the beginning"
     },
     "forcedPlaybackSpeed": {
-        "message": "Forced playback speed, speed-watching"
+        "message": "Speed-watching: Permanent speed"
     },
     "forcedPlaybackSpeedMusic": {
         "message": "(Force playback speed even for music?)"

diff --git a/_locales/uk/messages.json b/_locales/uk/messages.json
@@ -384,7 +384,7 @@
         "message": "Forced play video from the beginning"
     },
     "forcedPlaybackSpeed": {
-        "message": "Forced playback speed, speed-watching"
+        "message": "Speed-watching: Permanent speed"
     },
     "forcedPlaybackSpeedMusic": {
         "message": "(Force playback speed even for music?)"

diff --git a/js&css/web-accessible/www.youtube.com/player.js b/js&css/web-accessible/www.youtube.com/player.js
@@ -65,49 +65,66 @@ ImprovedTube.playerAutoPip = function () {
 FORCED PLAYBACK SPEED
 ------------------------------------------------------------------------------*/
 ImprovedTube.playerPlaybackSpeed = function () {
-	var player = this.elements.player,
-		video = player.querySelector('video'),
-		option = this.storage.player_playback_speed,
-		tries = 0;
-	const intervalMs = 100,
-		maxIntervalMs = 5000;
-
-	if (this.isset(option) === false) {
-		option = 1;
-	}
-
 	if (this.storage.player_forced_playback_speed === true) {
-		var waitForDescInterval = setInterval(() => {
-			if (document.querySelector('div#description') || (++tries * intervalMs >= maxIntervalMs)) {
-				if (player.getVideoData().isLive === false) {
-					let category = document.querySelector('meta[itemprop=genre]')?.content;
-					let titlekeywords = document.getElementsByTagName('meta')?.title?.content + document.getElementsByTagName('meta')?.keywords?.content;
-					if (this.storage.player_force_speed_on_music === true // dont care if music, just switch it
-						|| (this.storage.player_force_speed_on_music === false // check if NOT music first
-							&& document.querySelector('h3#title')?.innerText !== 'Music' // (=buyable/registered music table)
-							&& category !== 'Music'
-							&& !(/official (music )?video|lyrics|cover[\)\]]|[\(\[]cover|cover version|karaok|(sing|play)[- ]?along|卡拉OK|卡拉OK|الكاريوكيкараоке|カラオケ|노래방/i.test(titlekeywords) && !/do[ck]u|interv[iyj]|back[- ]?stage|インタビュー|entrevista|面试|面試|회견|wawancara|مقابلة|интервью|entretien|기록한 것|记录|記錄|ドキュメンタリ|وثائقي|документальный/i.test(titlekeywords)) // says its music in description, but not backstage/interview? ugly hack!
-						// && location.href.indexOf('music') === -1	// (=only running on www.youtube.com anyways)
-						)) {
-							player.setPlaybackRate(Number(option));
-							video.playbackRate = Number(option);
-					} else { // Music and we are not overriding speed, set normal
-						player.setPlaybackRate(1);
-						video.playbackRate = 1;
-					}
+		var player = this.elements.player,
+		video = player.querySelector('video'),
+		option = this.storage.player_playback_speed;
+		if (this.isset(option) === false) {	option = 1; }
+
+		if (player.getVideoData().isLive === false			
+			&& this.storage.player_force_speed_on_music !== true  // || location.href.indexOf('music.') !== -1)  // (=currently we are only running on www.youtube.com anyways)
+			|| this.storage.player_dont_speed_education === true) {
+	// Data: 
+		let category = document.querySelector('meta[itemprop=genre]')?.content;
+			if (this.storage.player_dont_speed_education === true && category === 'Education') // dont speed education
+								{ return;} 		
+		let titleAndKeywords = document.getElementsByTagName('meta')?.title?.content + " " + document.getElementsByTagName('meta')?.keywords?.content;
+		let duration = document.querySelector('meta[itemprop=duration]')?.content; // Example:  PT1H20M30S
+				function parseDuration(duration) {	const [_, h = 0, m = 0, s = 0] = duration.match(/PT(?:(\d+)?H)?(?:(\d+)?M)?(\d+)?S?/).map(part => parseInt(part) || 0); 
+				return h * 3600 + m * 60 + s; } 
+		let durationInSeconds = parseDuration(duration); 
+		let musicRegexMatch = /official (music )?video|lyrics|cover[\)\]]|[\(\[]cover|cover version|karaok|(sing|play)[- ]?along|卡拉OK|卡拉OK|الكاريوكي|караоке|カラオケ|노래방/i.test(titleAndKeywords);
+		let notMusicRegexMatch = /do[ck]u|interv[iyj]|back[- ]?stage|インタビュー|entrevista|面试|面試|회견|wawancara|مقابلة|интервью|entretien|기록한 것|记录|記錄|ドキュメンタリ|وثائقي|документальный/i.test(titleAndKeywords);
+							     // (Tags/keywords shouldnt lie & very few songs titles might have these words)  	
+				function testSongDuration(s) { 
+				if (135 <= s && s <= 260) {return 'very common';}
+				if (105 <= s && s <= 420) {return 'common';}
+				if (420 <= s && s <= 720) {return 'long';}	
+				if  (45 <= s && s <= 105) {return 'short';}	  
+				let musicSectionLength = document.querySelector('div#items[class*="music-section"]')?.children?.length;
+				if (musicSectionLength && (120 <= s / musicSectionLength && s / musicSectionLength<= 410)) {return 'multiple';}
+			}				
+		let songDurationType = testSongDuration(durationInSeconds);
+ // check if the video is PROBABLY MUSIC:							
+	if  ( 		(category === 'Music' || musicRegexMatch && !notMusicRegexMatch || songDurationType === 'verycommon')
+			||	(category === 'Music' && musicRegexMatch &&  typeof songDurationType !== 'undefined'  
+															|| (/album|Álbum|专辑|專輯|एलबम|البوم|アルバム|альбом|앨범/i.test(titleAndKeywords) 
+																&& ([1150, 5000].includes(durationInSeconds))
+																)	
+			)
+		)	
+				{ //player.setPlaybackRate(1); video.playbackRate = 1;
+				} 
+
+			else { player.setPlaybackRate(Number(option));	video.playbackRate = Number(option);	//  #1729 question2		 
+			// Now this video might rarely be music 
+			// - however we can make extra-sure after waiting for the video descripion to load... (#1539)
+					tries = 0; 	intervalMs = 150;  	if (location.href.indexOf('/watch?') !== -1) {maxTries = 10;} else {maxTries = 1;}  	
+														// ...except when it is an embedded player?
+
+					var waitForDescription = setInterval(() => { 	
+					if (document.querySelector('div#description') || (++tries >= maxTries) ) {clearInterval(waitForDescription);}
+					if (document.querySelector('h3#title[class*="music-section"]')   // indicates buyable/registered music
+										 && typeof testSongDuration(durationInSeconds) !== 'undefined' ) // resonable duration
+											{player.setPlaybackRate(1); video.playbackRate = 1;} 			
+					intervalMs *= 1.4;				
+					}, intervalMs);	   						
 				}
-				clearInterval(waitForDescInterval);
-			}
-		}, intervalMs);
-	} else {
-		player.setPlaybackRate(1);
-		video.playbackRate = 1;
-	}
+		}	else { player.setPlaybackRate(Number(option));	video.playbackRate = Number(option);}  //  #1729 question2	 
+	} 
 };
+// hi @raszpl  // ImprovedTube.playerForceSpeedOnMusic = function () {  ImprovedTube.playerPlaybackSpeed(); };  
 
-ImprovedTube.playerForceSpeedOnMusic = function () {
-	ImprovedTube.playerPlaybackSpeed();
-};
 /*------------------------------------------------------------------------------
 SUBTITLES
 ------------------------------------------------------------------------------*/