Merge commit '1c2074744afe364352fb4fa6b48759fc4954b3ad' into development

Author: MarmadileManteater

.github/workflows/autoMerge.yml

@@ -13,10 +13,13 @@ jobs:
       (contains(github.event.pull_request.base.ref, 'development') || contains(github.event.pull_request.base.ref, 'RC'))
     runs-on: ubuntu-latest
 
+    permissions:
+      contents: write
+
     steps:
     - name: Auto Merge PR
       shell: bash
       env:
-        GH_TOKEN: ${{ secrets.PUSH_TOKEN }}
-        PR_NUMBER: ${{ github.event.pull_request.number }}
-      run: gh pr merge "https://github.com/FreeTubeApp/FreeTube/pull/${PR_NUMBER}" --auto --squash
+        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        PR_URL: ${{ github.event.pull_request.html_url }}
+      run: gh pr merge "$PR_URL" --auto --squash

src/renderer/components/ExperimentalSettings/ExperimentalSettings.vue

@@ -16,16 +16,6 @@
         @change="handleRestartPrompt"
       />
     </FtFlexBox>
-    <FtFlexBox v-if="sabrAllowedOnPlatform">
-      <FtToggleSwitch
-        tooltip-position="top"
-        :label="$t('Settings.SABR.Label')"
-        compact
-        :default-value="sabrEnabled"
-        :tooltip="$t('Settings.SABR.Tooltip')"
-        @change="updateSabrEnabled"
-      />
-    </FtFlexBox>
     <FtPrompt
       v-if="showRestartPrompt"
       :label="$t('Settings[\'The app needs to restart for changes to take effect. Restart and apply change?\']')"
@@ -37,15 +27,13 @@
 </template>
 
 <script setup>
-import { computed, onMounted, ref } from 'vue'
+import { onMounted, ref } from 'vue'
 
 import FtSettingsSection from '../FtSettingsSection/FtSettingsSection.vue'
 import FtFlexBox from '../ft-flex-box/ft-flex-box.vue'
 import FtToggleSwitch from '../FtToggleSwitch/FtToggleSwitch.vue'
 import FtPrompt from '../FtPrompt/FtPrompt.vue'
 
-import store from '../../store/index'
-
 const replaceHttpCacheLoading = ref(true)
 const replaceHttpCache = ref(false)
 const showRestartPrompt = ref(false)
@@ -81,18 +69,6 @@ function handleReplaceHttpCache(value) {
     window.ftElectron.toggleReplaceHttpCache()
   }
 }
-
-const sabrAllowedOnPlatform = process.env.SUPPORTS_LOCAL_API
-/** @type {import('vue').ComputedRef<boolean>} */
-const sabrEnabled = process.env.SUPPORTS_LOCAL_API ? computed(() => store.getters.getSabrEnabled) : false
-
-/**
- * @param {boolean} value
- */
-function updateSabrEnabled(value) {
-  store.dispatch('updateSabrEnabled', value)
-}
-
 </script>
 
 <style scoped src="./ExperimentalSettings.css" />

src/renderer/components/ft-shaka-video-player/ft-shaka-video-player.js

@@ -2839,9 +2839,8 @@ export default defineComponent({
         })
       }
 
-      const delayLoadUntilUnix = props.delayLoadUntilUnix
-      const initialLoadDelayMs = delayLoadUntilUnix - Date.now()
-      if (initialLoadDelayMs > 0) {
+      const initialLoadDelayMs = props.delayLoadUntilUnix - Date.now()
+      if (initialLoadDelayMs > 0 && (props.format === 'legacy' || props.manifestMimeType !== MANIFEST_TYPE_SABR)) {
         showToast(
           ({ remainingMs }) => {
             // `+value` converts string back to float

src/renderer/helpers/api/local.js

@@ -392,7 +392,6 @@ export async function getLocalSearchContinuation(continuationData) {
 
 /**
  * @param {string} id
- * @param {boolean} forceEnableSabrOnlyResponseWorkaround - When true workaround will be forced and there will be no audio track selection
  * @returns {Promise<{
  *   info: import('youtubei.js').YT.VideoInfo,
  *   poToken: string | undefined,
@@ -402,12 +401,12 @@ export async function getLocalSearchContinuation(continuationData) {
  *     osName: string,
  *     osVersion: string
  *   },
- *   adEndTimeUnixMs: number,
- *   sabrCanBeUsed: boolean,
+ *   adEndTimeUnixMs: number
  * }>}
  */
-export async function getLocalVideoInfo(id, { forceEnableSabrOnlyResponseWorkaround = false } = {}) {
-  let totalAdTimeSeconds = 0
+export async function getLocalVideoInfo(id) {
+  let responseTime = Date.now()
+  let totalAdTimeMilliseconds = 0
 
   const webInnertube = await createInnertube({
     withPlayer: true,
@@ -421,19 +420,25 @@ export async function getLocalVideoInfo(id, { forceEnableSabrOnlyResponseWorkaro
 
       const responseText = await response.text()
 
+      responseTime = Date.now()
+
       const json = JSON.parse(responseText)
 
       if (Array.isArray(json.adSlots)) {
         for (const adSlot of json.adSlots) {
           if (adSlot.adSlotRenderer?.adSlotMetadata?.triggerEvent === 'SLOT_TRIGGER_EVENT_BEFORE_CONTENT') {
-            const playerVars = adSlot.adSlotRenderer.fulfillmentContent?.fulfilledLayout?.playerBytesAdLayoutRenderer
-              ?.renderingContent?.instreamVideoAdRenderer?.playerVars
-
-            if (playerVars) {
-              const match = playerVars.match(/length_seconds=([\d.]+)/)
-
-              if (match) {
-                totalAdTimeSeconds += parseFloat(match[1])
+            const instreamVideoAdRenderer = adSlot.adSlotRenderer.fulfillmentContent?.fulfilledLayout?.playerBytesAdLayoutRenderer
+              ?.renderingContent?.instreamVideoAdRenderer
+
+            if (instreamVideoAdRenderer) {
+              if (typeof instreamVideoAdRenderer.skipOffsetMilliseconds === 'number') {
+                totalAdTimeMilliseconds += instreamVideoAdRenderer.skipOffsetMilliseconds
+              } else if (instreamVideoAdRenderer.playerVars) {
+                const match = instreamVideoAdRenderer.playerVars.match(/length_seconds=([\d.]+)/)
+
+                if (match) {
+                  totalAdTimeMilliseconds += parseFloat(match[1]) * 1000
+                }
               }
             }
           }
@@ -473,36 +478,10 @@ export async function getLocalVideoInfo(id, { forceEnableSabrOnlyResponseWorkaro
   }
 
   const info = await webInnertube.getInfo(id, { po_token: contentPoToken })
-  const sabrCannotBeUsed = info.streaming_data?.server_abr_streaming_url == null ||
-    info.player_config?.media_common_config?.media_ustreamer_request_config?.video_playback_ustreamer_config == null
-  const workaroundRequired = forceEnableSabrOnlyResponseWorkaround || sabrCannotBeUsed
-  // Some time would be used for parsing and maybe additional requests so end time should be calculated sooner to reduce actual waiting time
-  let adEndTimeUnixMs = Date.now()
-
-  // #region temporary workaround for SABR-only responses
-
-  if (workaroundRequired) {
-    // MWEB doesn't have an audio track selector so it picks the audio track on the server based on the request language.
-    const originalAudioTrackFormat = info.streaming_data?.adaptive_formats.find(format => {
-      return format.has_audio && format.is_original && format.language
-    })
 
-    if (originalAudioTrackFormat) {
-      webInnertube.session.context.client.hl = originalAudioTrackFormat.language
-    }
-
-    const mwebInfo = await webInnertube.getBasicInfo(id, { client: 'MWEB', po_token: contentPoToken })
-
-    if (mwebInfo.playability_status.status === 'OK' && mwebInfo.streaming_data?.adaptive_formats) {
-      info.playability_status = mwebInfo.playability_status
-      info.streaming_data.adaptive_formats = mwebInfo.streaming_data.adaptive_formats
-    }
-  }
   // Some time would be used for parsing and maybe additional requests so end time should be calculated sooner to reduce actual waiting time
-  // Legacy format also requires this
-  adEndTimeUnixMs += totalAdTimeSeconds * 1000
-
-  // #endregion temporary workaround for SABR-only responses
+  // Legacy format requires this
+  const adEndTimeUnixMs = responseTime + totalAdTimeMilliseconds
 
   let { clientName, clientVersion, osName, osVersion } = webInnertube.session.context.client
 
@@ -611,7 +590,6 @@ export async function getLocalVideoInfo(id, { forceEnableSabrOnlyResponseWorkaro
     poToken: contentPoToken,
     clientInfo,
     adEndTimeUnixMs,
-    sabrCanBeUsed: !sabrCannotBeUsed,
   }
 }
 

src/renderer/store/modules/settings.js

@@ -169,7 +169,6 @@ const state = {
   defaultSkipInterval: 5,
   defaultViewingMode: 'default',
   defaultVideoFormat: 'dash',
-  sabrEnabled: true,
   disableSmoothScrolling: false,
   displayVideoPlayButton: true,
   enableSearchSuggestions: true,

src/renderer/views/Watch/Watch.js

@@ -136,8 +136,6 @@ export default defineComponent({
       manifestMimeType: MANIFEST_TYPE_DASH,
       /** @type {SabrData | null} */
       sabrData: null,
-      // For the same video
-      sabrReloadCount: 0,
       legacyFormats: [],
       captions: [],
       /** @type {'EQUIRECTANGULAR' | 'EQUIRECTANGULAR_THREED_TOP_BOTTOM' | 'MESH'| null} */
@@ -324,15 +322,6 @@ export default defineComponent({
       // `this.$refs.player?.hasLoaded` cannot be used in computed property
       return !this.isLoading
     },
-
-    sabrEnabled() {
-      return this.$store.getters.getSabrEnabled
-    },
-
-    sabrReloadedTooManyTimes() {
-      // Hardcoded since no idea what causes player reload loop, but 3 times probably too much already
-      return this.sabrReloadCount >= 3
-    }
   },
   watch: {
     async $route() {
@@ -341,10 +330,6 @@ export default defineComponent({
     userPlaylistsReady() {
       this.onMountedDependOnLocalStateLoading()
     },
-    videoId() {
-      // Reset SABR reload count when videoID changed
-      this.sabrReloadCount = 0
-    },
     async thumbnail() {
       if (process.env.IS_ANDROID) {
         createMediaSession(this.videoTitle, this.channelName, this.videoLengthSeconds * 1000, this.thumbnail)
@@ -361,16 +346,6 @@ export default defineComponent({
     this.checkIfTimestamp()
     this.currentPlaybackRate = this.$store.getters.getDefaultPlayback
   },
-  created: function () {
-    this.videoId = this.$route.params.id
-    this.activeFormat = this.defaultVideoFormat
-    // So that the value for this session remains unchanged even if setting changed
-    this.autoplayNextRecommendedVideo = this.autoplayNextRecommendedVideoByDefault
-    this.autoplayNextPlaylistVideo = this.autoplayNextPlaylistVideoByDefault
-
-    this.checkIfTimestamp()
-    this.currentPlaybackRate = this.$store.getters.getDefaultPlayback
-  },
   mounted: function () {
     window.addEventListener('media-next', this.mediaNext)
     window.addEventListener('media-previous', this.mediaPrevious)
@@ -519,16 +494,10 @@ export default defineComponent({
       }
 
       try {
-        const sabrShouldBeTried = this.sabrEnabled && !this.sabrReloadedTooManyTimes
-
-        const videoInfo = await getLocalVideoInfo(this.videoId, { forceEnableSabrOnlyResponseWorkaround: !sabrShouldBeTried })
+        const videoInfo = await getLocalVideoInfo(this.videoId)
         const { info: result, poToken, clientInfo, adEndTimeUnixMs } = videoInfo
 
-        const sabrShouldBeUsed = sabrShouldBeTried && videoInfo.sabrCanBeUsed && this.activeFormat !== 'legacy'
-        if (!sabrShouldBeUsed) {
-          // The hack should only be used on non-SABR
-          this.adEndTimeUnixMs = adEndTimeUnixMs
-        }
+        this.adEndTimeUnixMs = adEndTimeUnixMs
 
         this.isFamilyFriendly = result.basic_info.is_family_safe
 
@@ -956,7 +925,10 @@ export default defineComponent({
               })
               ?.projection_type ?? null
 
-            if (sabrShouldBeUsed) {
+            if (
+              videoInfo.info.streaming_data?.server_abr_streaming_url &&
+              videoInfo.info.player_config.media_common_config.media_ustreamer_request_config
+            ) {
               const storyboards = storyboard
                 ? [{
                     templateUrl: storyboard.template_url,
@@ -1361,12 +1333,6 @@ export default defineComponent({
     },
 
     handleVideoLoaded: function () {
-      if (this.sabrReloadCount > 0) {
-        // DO NOT count player reload requests during video playback (at the middle)
-        // Video loaded = not reload loop
-        this.sabrReloadCount--
-      }
-
       // Only used one time = remove after use
       this.oneTimeTimestamp = null
 
@@ -2018,7 +1984,6 @@ export default defineComponent({
 
     async onPlayerReloadRequested() {
       showToast('Reloading player according to SABR request')
-      this.sabrReloadCount++
 
       const timestamp = this.getTimestamp()
       if (timestamp > 0) {

static/locales/ckb.yaml

@@ -48,6 +48,7 @@ Global:
 # Search Bar
     Comment Count: ١ توانج | {count} توانج
     Like Count: ١ بەدڵبوون | {count} بەدڵبوون
+  Posts: بڵاوکراوەکان
 Search / Go to URL: 'گەڕان/ بڕۆ بۆ ئرڵ'
 Search Bar:
   Clear Input: 'سڕینەوەی نووسراو'
@@ -107,7 +108,7 @@ Subscriptions:
   'Your Subscription list is currently empty. Start adding subscriptions to see them here.': ''
   Disabled Automatic Fetching: ''
   Empty Channels: 'کەناڵە بەشداربووەکانت هێشتا هیچ ڤیدیۆیەکیان نییە.'
-  Empty Posts: ''
+  Empty Posts: 'کەناڵە بەشداربووەکانت هێشتا هیچ بڵاوکراوەیەکیان نییە.'
   Load More Videos: 'ڤیدیۆی زۆرتر بار بکە'
   Load More Posts: 'بڵاوکراوەی زۆرتر بار بکە'
   Subscriptions Tabs: ''
@@ -124,6 +125,7 @@ Trending:
   Trending: 'باو'
   Gaming: 'یاری'
   Trending Tabs: ''
+  Sports: وەرزش
 Most Popular: 'باوترین'
 Playlists: 'پێڕستی لێدانەکان'
 User Playlists:
@@ -185,6 +187,8 @@ User Playlists:
       "Video(s) added to {playlistCount} playlists": ""
     Allow Adding Duplicate Video(s): ڕێ بە زیادکردنی ڤیدیۆی دووبارە بدە
     N playlists selected: '{playlistCount} دیاریکراوە'
+    "{videoCount}/{totalVideoCount} Videos Will Be Added": '{videoCount}/{totalVideoCount} ڤیدیۆ زیاد دەکرێتن'
+    "{videoCount}/{totalVideoCount} Videos Already Added": '{videoCount}/{totalVideoCount} ڤیدیۆ زیاد کراینە'
   CreatePlaylistPrompt:
     New Playlist Name: ناوی پێڕستی لێدانی نوێ
     Create: درووستکردن
@@ -194,6 +198,8 @@ User Playlists:
       There was an issue with creating the playlist.: هەڵەیەک ڕوویدا لە درووستکردنی پێڕستی لێدانەکە.
   Are you sure you want to delete this playlist? This cannot be undone: دڵنیایت لە سڕینەوەی ئەم پێڕستی لێدانە؟ چونکە ناگەڕێندرێتەوە.
   Playlist Description: پێناسەی پێڕستی لێدان
+  Playlists with Matching Videos: پێڕستەکانی لێدان لەگەڵ ڤیدیۆ هاوتاکان
+  TotalTimePlaylist: 'سەرجەمی کات: {duration}'
 History:
   # On History Page
   History: 'مێژوو'

static/locales/cs.yaml

@@ -622,6 +622,9 @@ Settings:
     Set Password: Nastavit heslo
   Sort Settings Sections (A-Z): Seřadit sekce nastavení (A-Z)
   Return to Settings Menu: Vrátit se do nastavení
+  SABR:
+    Label: Povolti SABR jako backend DASH
+    Tooltip: SABR se v budoucím vydání stane jediným backendem DASH a nelze jej zakázat. Tento přepínač je poskytnut v případě, že má raná implementace závažné problémy.
 About:
   #On About page
   About: 'O aplikaci'
@@ -869,6 +872,9 @@ Video:
 #& Playlists
   Save Watched Progress: Uložit průběh sledování
   Watched Progress Saved: Průběh sledování uložen
+  Watch:
+    'Remaining preroll-ad time: {remindingTimeSeconds}s': 'Zbývající čas prvotní reklamy: {remindingTimeSeconds} s'
+    'Remaining SABR backoff time: {remindingTimeSeconds}s': 'Zbývající čas pauzy SABR: {remindingTimeSeconds} s'
 Playlist:
   #& About
   View Full Playlist: 'Zobrazit celý seznam skladeb'

static/locales/en-US.yaml

@@ -692,9 +692,6 @@ Settings:
     Set Password To Prevent Access: Set a password to prevent access to settings
     Set Password: Set Password
     Remove Password: Remove Password
-  SABR:
-    Label: Enable SABR as DASH backend
-    Tooltip: SABR will become the only DASH backend in future release and cannot be disabled. This toggle is provided in case early implementation has unrecoverable issues.
 About:
   #On About page
   About: About

static/locales/fr-FR.yaml

@@ -615,6 +615,9 @@ Settings:
     Password Settings: Mot de passe
   Sort Settings Sections (A-Z): Trier de À à Z les rubriques des paramètres
   Return to Settings Menu: Revenir au Menu paramètres
+  SABR:
+    Label: Activer SABR comme backend DASH
+    Tooltip: SABR deviendra le seul moteur DASH dans les prochaines versions et ne pourra pas être désactivé. Cette option est disponible au cas où une implémentation préliminaire présenterait des problèmes irrémédiables.
 About:
   #On About page
   About: 'À propos'
@@ -821,6 +824,9 @@ Video:
 #& Playlists
   Save Watched Progress: Enregistrer l'état de visionnage
   Watched Progress Saved: État de visionnage enregistré
+  Watch:
+    'Remaining preroll-ad time: {remindingTimeSeconds}s': 'Temps restant avant la publicité : {remindingTimeSeconds}s'
+    'Remaining SABR backoff time: {remindingTimeSeconds}s': 'Temps de recul SABR restant : {remindingTimeSeconds}s'
 Playlist:
   #& About
   View Full Playlist: 'Afficher la playlist complète'