Update manifest.json for release v1.6.1.32 [skip ci]

Jellyfin.Plugin.MediaBarEnhanced/Configuration/configPage.html

@@ -115,14 +115,10 @@
                         </div>
                         <div id="customMediaIdsContainer">
                             <div class="inputContainer">
-                                <label class="inputLabel inputLabelUnfocused" for="CustomMediaIds">Default Media/Collection/Playlist
-                                    IDs
-                                    (Newline or Comma separated)</label>
+                                <label class="inputLabel inputLabelUnfocused" for="CustomMediaIds">Default Media/Collection/Playlist IDs (Newline or Comma-separated)</label>
                                 <textarea class="emby-textarea" is="emby-textarea" id="CustomMediaIds" name="CustomMediaIds"
                                     style="width: 100%; height: 150px; font-family: monospace;"></textarea>
-                                <div class="fieldDescription">Enter the IDs of the items you want to show in the slideshow as
-                                    your default content.
-                                    You can separate them by new line or comma.
+                                <div class="fieldDescription">Enter the IDs of the items you want to show in the slideshow as your default content. You can separate them by new line or comma.
                                     <br><br>
                                     <b>Manual Trailer/Video Override:</b> You can specify a YouTube URL <b>OR</b> a Jellyfin Item ID (e.g. for a Theme Video) for an item by adding it in
                                     brackets: <br> <code>e.g. ID DESCRIPTION [https://youtu.be/...]</code> or <code>ID [JellyfinItemId] DESCRIPTION</code>.
@@ -132,11 +128,9 @@
                                         <li><b>YouTube URL:</b> Play a remote trailer from YouTube.</li>
                                         <li><b>Jellyfin Item ID (GUID):</b> Play the video of another library item (e.g. a Theme Video or Backdrop Video) using the native player.</li>
                                     </ul>
-                                    You can also add a description after the ID using any separator like space, pipe
-                                    (|) or dash (-): <br>e.g. <code>ID DESCRIPTION</code> or <code>ID | DESCRIPTION</code>
+                                    You can also add a description after the ID using any separator like space, pipe (|) or dash (-): <br>e.g. <code>ID DESCRIPTION</code> or <code>ID | DESCRIPTION</code>
                                     <br><br>
-                                    <b>Note:</b> If using a <b>Collection Name</b> (instead of an ID) combined with a description, you <b>MUST</b> use 
-                                    the pipe (|) separator.
+                                    <b>Note:</b> If using a <b>Collection Name</b> (instead of an ID) combined with a description, you <b>MUST</b> use the pipe (|) separator.
                                     <br>
                                     <b>Note:</b> The separator <b>MUST NOT</b> be a hex character (0-9, a-f).
                                 </div>
@@ -198,7 +192,7 @@
                                 <input is="emby-checkbox" type="checkbox" id="UseSponsorBlock" name="UseSponsorBlock" />
                                 <span>Use SponsorBlock</span>
                             </label>
-                            <div class="fieldDescription">Skip intro/outro segments in YouTube trailers.</div>
+                            <div class="fieldDescription">Skip intro/outro segments in YouTube trailers (if data is available).</div>
                         </div>
                         <div class="selectContainer">
                             <label class="selectLabel" for="PreferredVideoQuality">Preferred YouTube Quality</label>
@@ -603,7 +597,7 @@
                         '<div class="inputContainer">' +
                         '    <label class="inputLabel" style="margin-bottom:0.5em; display:block;">Media IDs</label>' +
                         '    <textarea is="emby-textarea" class="emby-textarea section-ids" style="width: 100%; height: 80px; font-family: monospace;">' + (data.MediaIds || '') + '</textarea>' +
-                        '    <div class="fieldDescription">Comma-separated list of Movie/Series/Collection IDs to show during this season.</div>' +
+                        '    <div class="fieldDescription">Comma-separated or Newline separated list of Movie/Series/Collection IDs to show during this season.<br>Same options available as for the default media IDs.</div>' +
                         '</div>';
 
                     div.querySelector('.remove-section').addEventListener('click', function() {

Jellyfin.Plugin.MediaBarEnhanced/Jellyfin.Plugin.MediaBarEnhanced.csproj

@@ -12,7 +12,7 @@
     <!-- <TreatWarningsAsErrors>false</TreatWarningsAsErrors> -->
     <Title>Jellyfin Media Bar Enhanced Plugin</Title>
     <Authors>CodeDevMLH</Authors>
-    <Version>1.6.1.17</Version>
+    <Version>1.6.1.32</Version>
     <RepositoryUrl>https://github.com/CodeDevMLH/jellyfin-plugin-media-bar-enhanced</RepositoryUrl>
   </PropertyGroup>
 

Jellyfin.Plugin.MediaBarEnhanced/Web/mediaBarEnhanced.js

@@ -1258,9 +1258,20 @@ const ApiUtils = {
    */
   async fetchSponsorBlockData(videoId) {
     if (!CONFIG.useSponsorBlock) return { intro: null, outro: null };
+
+    // Return cached result if available
+    if (!this._sponsorBlockCache) this._sponsorBlockCache = {};
+    if (this._sponsorBlockCache[videoId]) {
+      return this._sponsorBlockCache[videoId];
+    }
+
     try {
       const response = await fetch(`https://sponsor.ajay.app/api/skipSegments?videoID=${videoId}&categories=["intro","outro"]`);
-      if (!response.ok) return { intro: null, outro: null };
+      if (!response.ok) {
+        const result = { intro: null, outro: null };
+        this._sponsorBlockCache[videoId] = result;
+        return result;
+      }
 
       const segments = await response.json();
       let intro = null;
@@ -1274,7 +1285,9 @@ const ApiUtils = {
         }
       });
 
-      return { intro, outro };
+      const result = { intro, outro };
+      this._sponsorBlockCache[videoId] = result;
+      return result;
     } catch (error) {
       console.warn('Error fetching SponsorBlock data:', error);
       return { intro: null, outro: null };
@@ -1435,19 +1448,16 @@ const VisibilityObserver = {
     
     // If a full screen video player is active, hide slideshow and stop playback
     if ((videoPlayer && !videoPlayer.classList.contains('hide')) || (trailerPlayer && !trailerPlayer.classList.contains('hide'))) {
-        if (this._lastVisibleState !== 'player-active') {
-            this._lastVisibleState = 'player-active';
-            const container = document.getElementById("slides-container");
-            if (container) {
-                container.style.display = "none";
-                container.style.visibility = "hidden";
-                container.style.pointerEvents = "none";
-            }
-            if (STATE.slideshow.slideInterval) {
-                STATE.slideshow.slideInterval.stop();
-            }
-            SlideshowManager.stopAllPlayback();
+        const container = document.getElementById("slides-container");
+        if (container) {
+            container.style.display = "none";
+            container.style.visibility = "hidden";
+            container.style.pointerEvents = "none";
         }
+        if (STATE.slideshow.slideInterval) {
+            STATE.slideshow.slideInterval.stop();
+        }
+        SlideshowManager.stopAllPlayback();
         return;
     }
 
@@ -1462,27 +1472,20 @@ const VisibilityObserver = {
       activeTab &&
       activeTab.getAttribute("data-index") === "0";
 
-    const newState = isVisible ? 'visible' : 'hidden';
-    
-    // Only update DOM and trigger actions when state actually changes
-    if (this._lastVisibleState !== newState) {
-      this._lastVisibleState = newState;
-      
-      container.style.display = isVisible ? "block" : "none";
-      container.style.visibility = isVisible ? "visible" : "hidden";
-      container.style.pointerEvents = isVisible ? "auto" : "none";
+    container.style.display = isVisible ? "block" : "none";
+    container.style.visibility = isVisible ? "visible" : "hidden";
+    container.style.pointerEvents = isVisible ? "auto" : "none";
 
-      if (isVisible) {
-        if (STATE.slideshow.slideInterval && !STATE.slideshow.isPaused) {
-          STATE.slideshow.slideInterval.start();
-          SlideshowManager.resumeActivePlayback();
-        }
-      } else {
-        if (STATE.slideshow.slideInterval) {
-          STATE.slideshow.slideInterval.stop();
-        }
-        SlideshowManager.stopAllPlayback();
+    if (isVisible) {
+      if (STATE.slideshow.slideInterval && !STATE.slideshow.isPaused) {
+        STATE.slideshow.slideInterval.start();
+        SlideshowManager.resumeActivePlayback();
       }
+    } else {
+      if (STATE.slideshow.slideInterval) {
+        STATE.slideshow.slideInterval.stop();
+      }
+      SlideshowManager.stopAllPlayback();
     }
   },
 
@@ -1490,13 +1493,7 @@ const VisibilityObserver = {
    * Initializes visibility observer
    */
   init() {
-    // MARK: Mark
     const observer = new MutationObserver(() => this.updateVisibility());
-    // let debounceTimer = null;
-    // const observer = new MutationObserver(() => {
-    //   if (debounceTimer) clearTimeout(debounceTimer);
-    //   debounceTimer = setTimeout(() => this.updateVisibility(), 250);
-    // });
     observer.observe(document.body, { childList: true, subtree: true });
 
     document.body.addEventListener("click", () => this.updateVisibility());
@@ -1623,6 +1620,11 @@ const SlideCreator = {
     else if (item.RemoteTrailers && item.RemoteTrailers.length > 0) {
       trailerUrl = item.RemoteTrailers[0].Url;
     }
+    // 1d. Final Fallback to Local Trailer (even if not preferred)
+    else if (item.LocalTrailerCount > 0 && item.localTrailerUrl) {
+         trailerUrl = item.localTrailerUrl;
+         console.log(`Using local trailer fallback for ${itemId}: ${trailerUrl}`);
+    }
 
     const isMobile = /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent);
     
@@ -1715,13 +1717,6 @@ const SlideCreator = {
               playerVars: playerVars,
               events: {
                 'onReady': (event) => {
-                  // Prevent iframe from stealing focus (critical for TV mode)
-                  const iframe = event.target.getIframe();
-                  if (iframe) {
-                    iframe.setAttribute('tabindex', '-1');
-                    iframe.setAttribute('inert', '');
-                  }
-
                   // Store start/end time and videoId for later use
                   event.target._startTime = playerVars.start || 0;
                   event.target._endTime = playerVars.end || undefined;
@@ -1738,20 +1733,12 @@ const SlideCreator = {
                     event.target.setPlaybackQuality(quality);
                   }
 
-                  // Only play if this is the active slide AND the slideshow is visible
+                  // Only play if this is the active slide
                   const slide = document.querySelector(`.slide[data-item-id="${itemId}"]`);
                   const isVideoPlayerOpen = document.querySelector('.videoPlayerContainer') || document.querySelector('.youtubePlayerContainer');
 
                   if (slide && slide.classList.contains('active') && !document.hidden && (!isVideoPlayerOpen || isVideoPlayerOpen.classList.contains('hide'))) {
-                    // MARK: mark
-                    // const currentIndex = STATE.slideshow.currentSlideIndex;
-                    //   const currentItemId = STATE.slideshow.itemIds[currentIndex];
-                    //   if (currentItemId !== itemId) {
-                    //       console.log(`Slide ${itemId} is no longer active (current: ${currentItemId}), aborting playback.`);
-                    //       event.target.mute(); // Mute just in case
-                    //       return;
-                    //   }
-                      event.target.playVideo();
+                    event.target.playVideo();
                     
                     // Check if it actually started playing after a short delay (handling autoplay blocks)
                     const timeoutId = setTimeout(() => {
@@ -1784,7 +1771,14 @@ const SlideCreator = {
                 },
                 'onStateChange': (event) => {
                   if (event.data === YT.PlayerState.ENDED) {
-                    SlideshowManager.nextSlide();
+                    const slide = document.querySelector(`.slide[data-item-id="${itemId}"]`);
+                    if (slide && slide.classList.contains('active')) {
+                      if (CONFIG.waitForTrailerToEnd) {
+                        SlideshowManager.nextSlide();
+                      } else {
+                        event.target.playVideo(); // Loop if trailer is shorter than slide duration
+                      }
+                    }
                   }
                 },
                 'onError': (event) => {
@@ -1813,44 +1807,36 @@ const SlideCreator = {
           style: "object-fit: cover; object-position: center center; width: 100%; height: 100%; position: absolute; top: 0; left: 0; pointer-events: none;"
         };
 
-        if (STATE.slideshow.isMuted) {
-          videoAttributes.muted = "";
-        }
+        videoAttributes.muted = "";
 
         backdrop = SlideUtils.createElement("video", videoAttributes);
-
-        if (!STATE.slideshow.isMuted) {
-          backdrop.volume = 0.4;
-        }
+        backdrop.volume = 0.4;
 
         STATE.slideshow.videoPlayers[itemId] = backdrop;
 
         backdrop.addEventListener('play', (event) => {
           const slide = document.querySelector(`.slide[data-item-id="${itemId}"]`);
-          // MARK: mark
-          // const currentIndex = STATE.slideshow.currentSlideIndex;
-          // const currentItemId = STATE.slideshow.itemIds[currentIndex];
-          
-          // if (!slide || !slide.classList.contains('active') || currentItemId !== itemId) {
-
           if (!slide || !slide.classList.contains('active')) {
-              console.log(`Local video ${itemId} started playing but is not active, pausing.`);
-              event.target.pause();
-              event.target.currentTime = 0;
-              return;
+            console.log(`Local video ${itemId} started playing but slide is not active, pausing.`);
+            event.target.pause();
+            event.target.currentTime = 0;
+            return;
           }
-
           if (CONFIG.waitForTrailerToEnd && STATE.slideshow.slideInterval) {
             STATE.slideshow.slideInterval.stop();
           }
         });
 
         backdrop.addEventListener('ended', () => {
-          SlideshowManager.nextSlide();
+            const slide = document.querySelector(`.slide[data-item-id="${itemId}"]`);
+            if (slide && slide.classList.contains('active')) {
+              SlideshowManager.nextSlide();
+            }
         });
 
         backdrop.addEventListener('error', () => {
-          if (CONFIG.waitForTrailerToEnd) {
+          const slide = document.querySelector(`.slide[data-item-id="${itemId}"]`);
+          if (CONFIG.waitForTrailerToEnd && slide && slide.classList.contains('active')) {
             SlideshowManager.nextSlide();
           }
         });
@@ -2281,16 +2267,6 @@ const SlideshowManager = {
     let previousVisibleSlide;
     try {
       const container = SlideUtils.getOrCreateSlidesContainer();
-      
-      const activeElement = document.activeElement;
-      let focusSelector = null;
-      if (container.contains(activeElement)) {
-          if (activeElement.classList.contains('play-button')) focusSelector = '.play-button';
-          else if (activeElement.classList.contains('detail-button')) focusSelector = '.detail-button';
-          else if (activeElement.classList.contains('favorite-button')) focusSelector = '.favorite-button';
-          else if (activeElement.classList.contains('trailer-button')) focusSelector = '.trailer-button';
-      }
-
       const totalItems = STATE.slideshow.totalItems;
 
       index = Math.max(0, Math.min(index, totalItems - 1));
@@ -2315,31 +2291,129 @@ const SlideshowManager = {
 
       if (previousVisibleSlide) {
         previousVisibleSlide.classList.remove("active");
+        // previousVisibleSlide.setAttribute("inert", "");
+        // previousVisibleSlide.setAttribute("tabindex", "-1");
       }
 
       currentSlide.classList.add("active");
+      // // Update Play/Pause Button State if it was paused
+      // if (STATE.slideshow.isPaused) {
+      //     STATE.slideshow.isPaused = false;
+      //     const pauseButton = document.querySelector('.pause-button');
+      //     if (pauseButton) {
+      //         pauseButton.innerHTML = '<i class="material-icons">pause</i>';
+      //         const pauseLabel = LocalizationUtils.getLocalizedString('ButtonPause', 'Pause');
+      //         pauseButton.setAttribute("aria-label", pauseLabel);
+      //         pauseButton.setAttribute("title", pauseLabel);
+      //     }
+      // }
 
-      // Restore focus for TV mode navigation continuity
-      requestAnimationFrame(() => {
-        if (focusSelector) {
-          const target = currentSlide.querySelector(focusSelector);
-          if (target) {
-            target.focus();
-            return;
+      // Manage Video Playback: Stop others, Play current
+
+      // 1. Stop all other YouTube players and local video elements
+      if (STATE.slideshow.videoPlayers) {
+        Object.keys(STATE.slideshow.videoPlayers).forEach(id => {
+          if (id !== currentItemId) {
+            const p = STATE.slideshow.videoPlayers[id];
+            if (!p) return;
+            // YouTube player
+            if (typeof p.pauseVideo === 'function') {
+              p.pauseVideo();
+            }
+            // HTML5 <video> element (local trailers)
+            if (p instanceof HTMLVideoElement) {
+              p.pause();
+              p.muted = true;
+              p.currentTime = 0;
+            }
           }
-        }
-        // Always ensure container has focus in TV mode to keep keyboard navigation working
-        const isTvMode = (window.layoutManager && window.layoutManager.tv) ||
-          document.documentElement.classList.contains('layout-tv') ||
-          document.body.classList.contains('layout-tv');
-        if (isTvMode) {
-          container.focus({ preventScroll: true });
+        });
+      }
+
+      // 2. Pause all other HTML5 videos e.g. local trailers
+      document.querySelectorAll('video').forEach(video => {
+        if (!video.closest(`.slide[data-item-id="${currentItemId}"]`)) {
+          video.pause();
         }
       });
 
-      // Manage Video Playback: Stop others, Play current
-      this.pauseOtherVideos(currentItemId);
-      this.playCurrentVideo(currentSlide, currentItemId);
+      // 3. Play and Reset current video
+      const videoBackdrop = currentSlide.querySelector('.video-backdrop');
+
+      // Auto-unpause when a video slide becomes active
+      if (videoBackdrop && STATE.slideshow.isPaused) {
+          STATE.slideshow.isPaused = false;
+          const pauseButton = document.querySelector('.pause-button');
+          if (pauseButton) {
+              pauseButton.innerHTML = '<i class="material-icons">pause</i>';
+              const pauseLabel = LocalizationUtils.getLocalizedString('ButtonPause', 'Pause');
+              pauseButton.setAttribute("aria-label", pauseLabel);
+              pauseButton.setAttribute("title", pauseLabel);
+          }
+      }
+
+      // Update mute button visibility
+      const muteButton = document.querySelector('.mute-button');
+      if (muteButton) {
+        const hasVideo = !!videoBackdrop;
+        muteButton.style.display = hasVideo ? 'block' : 'none';
+      }
+
+      if (videoBackdrop) {
+        if (videoBackdrop.tagName === 'VIDEO') {
+          videoBackdrop.currentTime = 0;
+
+          videoBackdrop.muted = STATE.slideshow.isMuted;
+          if (!STATE.slideshow.isMuted) {
+            videoBackdrop.volume = 0.4;
+          }
+
+          videoBackdrop.play().catch(e => {
+            // Check if it actually started playing after a short delay (handling autoplay blocks)
+            setTimeout(() => {
+              if (videoBackdrop.paused && currentSlide.classList.contains('active')) {
+                console.warn(`Autoplay blocked for ${currentItemId}, attempting muted fallback`);
+                videoBackdrop.muted = true;
+                videoBackdrop.play().catch(err => console.error("Muted fallback failed", err));
+              }
+            }, 1000);
+          });
+        } else if (STATE.slideshow.videoPlayers && STATE.slideshow.videoPlayers[currentItemId]) {
+          const player = STATE.slideshow.videoPlayers[currentItemId];
+          if (player && typeof player.loadVideoById === 'function' && player._videoId) {
+            // Use loadVideoById to enforce start and end times
+            player.loadVideoById({
+              videoId: player._videoId,
+              startSeconds: player._startTime || 0,
+              endSeconds: player._endTime
+            });
+
+            if (STATE.slideshow.isMuted) {
+              player.mute();
+            } else {
+              player.unMute();
+              player.setVolume(40);
+            }
+
+            // Check if playback successfully started, otherwise fallback to muted
+            setTimeout(() => {
+              if (!currentSlide.classList.contains('active')) return;
+              if (player.getPlayerState &&
+                player.getPlayerState() !== YT.PlayerState.PLAYING &&
+                player.getPlayerState() !== YT.PlayerState.BUFFERING) {
+                console.log("YouTube loadVideoById didn't start playback, retrying muted...");
+                player.mute();
+                player.playVideo();
+              }
+            }, 1000);
+          } else if (player && typeof player.seekTo === 'function') {
+            // Fallback if loadVideoById is not available or videoId missing
+            const startTime = player._startTime || 0;
+            player.seekTo(startTime);
+            player.playVideo();
+          }
+        }
+      }
 
       const enableAnimations = MediaBarEnhancedSettingsManager.getSetting('slideAnimations', CONFIG.slideAnimationEnabled);
 
@@ -2374,7 +2448,8 @@ const SlideshowManager = {
       this.updateDots();
 
       // Only restart interval if we are NOT waiting for a video to end
-      const hasVideo = currentSlide.querySelector('.video-backdrop');
+      const hasVideo = currentSlide.querySelector('.video-backdrop') || 
+        (STATE.slideshow.videoPlayers && STATE.slideshow.videoPlayers[currentItemId]);
       if (STATE.slideshow.slideInterval && !STATE.slideshow.isPaused) {
         if (CONFIG.waitForTrailerToEnd && hasVideo) {
           STATE.slideshow.slideInterval.stop();
@@ -2433,14 +2508,18 @@ const SlideshowManager = {
   async preloadAdjacentSlides(currentIndex) {
     const totalItems = STATE.slideshow.totalItems;
     const preloadCount = Math.min(Math.max(CONFIG.preloadCount || 1, 1), 5);
+    const preloadedIds = new Set();
 
     // Preload next slides
     for (let i = 1; i <= preloadCount; i++) {
         const nextIndex = (currentIndex + i) % totalItems;
         if (nextIndex === currentIndex) break;
-        
+
         const itemId = STATE.slideshow.itemIds[nextIndex];
-        SlideCreator.createSlideForItemId(itemId);
+        if (!preloadedIds.has(itemId)) {
+             preloadedIds.add(itemId);
+             SlideCreator.createSlideForItemId(itemId);
+        }
     }
 
     // Preload previous slides
@@ -2449,7 +2528,10 @@ const SlideshowManager = {
         if (prevIndex === currentIndex) break;
 
         const prevItemId = STATE.slideshow.itemIds[prevIndex];
-        SlideCreator.createSlideForItemId(prevItemId);
+        if (!preloadedIds.has(prevItemId)) {
+             preloadedIds.add(prevItemId);
+             SlideCreator.createSlideForItemId(prevItemId);
+        }
     }
   },
 
@@ -2485,13 +2567,11 @@ const SlideshowManager = {
       if (index === -1) return;
 
       const totalItems = STATE.slideshow.itemIds.length;
-      
-      // Calculate wrapped distance
       let distance = Math.abs(index - currentIndex);
       if (totalItems > keepRange * 2) {
           distance = Math.min(distance, totalItems - distance);
       }
-      
+
       if (distance > keepRange) {
         // Destroy video player if exists
         if (STATE.slideshow.videoPlayers[itemId]) {
@@ -2516,13 +2596,11 @@ const SlideshowManager = {
       }
     });
 
-    // After pruning, restore focus to container in TV mode
     if (prunedAny) {
       const isTvMode = (window.layoutManager && window.layoutManager.tv) ||
         document.documentElement.classList.contains('layout-tv') ||
         document.body.classList.contains('layout-tv');
       if (isTvMode) {
-        // Use setTimeout to execute AFTER Jellyfin's focus manager processes the iframe removal
         setTimeout(() => {
           const container = document.getElementById("slides-container");
           if (container && container.style.display !== 'none') {
@@ -2649,116 +2727,6 @@ const SlideshowManager = {
     }
   },
 
-  /**
-   * Pauses all video players except the one with the given item ID
-   * @param {string} excludeItemId - Item ID to exclude from pausing
-   */
-  pauseOtherVideos(excludeItemId) {
-    // Pause YouTube players
-    if (STATE.slideshow.videoPlayers) {
-      Object.keys(STATE.slideshow.videoPlayers).forEach(id => {
-        if (id !== excludeItemId) {
-          const p = STATE.slideshow.videoPlayers[id];
-          if (p) {
-            try {
-              if (typeof p.pauseVideo === 'function') {
-                p.pauseVideo();
-                if (typeof p.mute === 'function') {
-                  p.mute();
-                }
-              }
-              else if (p.tagName === 'VIDEO') {
-                p.pause();
-                p.muted = true;
-              }
-            } catch (e) { console.warn("Error pausing player", id, e); }
-          }
-        }
-      });
-    }
-    // Pause HTML5 videos
-    document.querySelectorAll('video').forEach(video => {
-      const slideParent = video.closest('.slide');
-      if (slideParent && slideParent.dataset.itemId !== excludeItemId) {
-        try {
-          video.pause();
-          video.muted = true;
-        } catch (e) {}
-      }
-    });
-  },
-
-  /**
-   * Plays the video backdrop on the given slide and updates mute button visibility
-   * @param {Element} slide - The slide DOM element
-   * @param {string} itemId - The item ID of the slide
-   * @returns {boolean} Whether a video was found and playback attempted
-   */
-  playCurrentVideo(slide, itemId) {
-    const videoBackdrop = slide.querySelector('.video-backdrop');
-
-    // Update mute button visibility
-    const muteButton = document.querySelector('.mute-button');
-    if (muteButton) {
-      muteButton.style.display = videoBackdrop ? 'block' : 'none';
-    }
-
-    if (!videoBackdrop) return false;
-
-    if (videoBackdrop.tagName === 'VIDEO') {
-      videoBackdrop.currentTime = 0;
-      videoBackdrop.muted = STATE.slideshow.isMuted;
-      if (!STATE.slideshow.isMuted) videoBackdrop.volume = 0.4;
-
-      videoBackdrop.play().catch(() => {
-        setTimeout(() => {
-          if (videoBackdrop.paused) {
-            console.warn(`Autoplay blocked for ${itemId}, attempting muted fallback`);
-            videoBackdrop.muted = true;
-            videoBackdrop.play().catch(err => console.error("Muted fallback failed", err));
-          }
-        }, 1000);
-      });
-      return true;
-    }
-
-    // YouTube player
-    const player = STATE.slideshow.videoPlayers && STATE.slideshow.videoPlayers[itemId];
-    if (player && typeof player.loadVideoById === 'function' && player._videoId) {
-      player.loadVideoById({
-        videoId: player._videoId,
-        startSeconds: player._startTime || 0,
-        endSeconds: player._endTime
-      });
-      
-      if (STATE.slideshow.isMuted) {
-        player.mute();
-      } else {
-        player.unMute();
-        player.setVolume(40);
-      }
-
-      setTimeout(() => {
-        if (player.getPlayerState &&
-          player.getPlayerState() !== YT.PlayerState.PLAYING &&
-          player.getPlayerState() !== YT.PlayerState.BUFFERING) {
-          console.log("YouTube loadVideoById didn't start playback, retrying muted...");
-          player.mute();
-          player.playVideo();
-        }
-      }, 1000);
-      return true;
-    } else if (player && typeof player.seekTo === 'function') {
-      // Fallback if loadVideoById is not available or videoId missing but player object exists
-      const startTime = player._startTime || 0;
-      player.seekTo(startTime);
-      player.playVideo();
-      return true;
-    }
-
-    return false;
-  },
-
   /**
    * Stops all video playback (YouTube and HTML5)
    * Used when navigating away from the home screen
@@ -2907,7 +2875,7 @@ const SlideshowManager = {
       // Determine if we should handle navigation keys (Arrows, Space, M)
       // TV Mode: Strict focus required (must be on slideshow)
       // Desktop Mode: Loose focus allowed (slideshow OR body/nothing focused)
-      let canControlSlideshow = isTvMode ? hasDirectFocus : (hasDirectFocus || isBodyFocused);
+      const canControlSlideshow = isTvMode ? hasDirectFocus : (hasDirectFocus || isBodyFocused);
 
       // Check for Input Fields (always ignore typing)
       const isInputElement = activeElement && (activeElement.tagName === 'INPUT' || activeElement.tagName === 'TEXTAREA' || activeElement.isContentEditable);
@@ -3551,69 +3519,75 @@ const MediaBarEnhancedSettingsManager = {
  * Initialize page visibility handling to pause when tab is inactive
  */
 const initPageVisibilityHandler = () => {
-  document.addEventListener("visibilitychange", () => {
-    const isVideoPlayerOpen = document.querySelector('.videoPlayerContainer:not(.hide)') ||
-      document.querySelector('.youtubePlayerContainer:not(.hide)');
+  let wasVideoPlayingBeforeHide = false;
 
+  document.addEventListener("visibilitychange", () => {
     if (document.hidden) {
-      // Stop slide timer
+      console.log("Tab inactive - pausing slideshow and videos");
+      wasVideoPlayingBeforeHide = STATE.slideshow.isVideoPlaying;
+      
       if (STATE.slideshow.slideInterval) {
         STATE.slideshow.slideInterval.stop();
       }
-
-      if (isVideoPlayerOpen) {
-        // Jellyfin video is playing --> full stop to free all resources
-        console.log("Tab inactive and Jellyfin player active - stopping all playback");
-        SlideshowManager.stopAllPlayback();
-      } else {
-        // Simple tab switch: stop all others, pause only the current
-        console.log("Tab inactive. Pausing current video, stopping others");
-        const currentItemId = STATE.slideshow.itemIds?.[STATE.slideshow.currentSlideIndex];
-
-        // Stop all players except the current one
-        if (STATE.slideshow.videoPlayers) {
-          Object.keys(STATE.slideshow.videoPlayers).forEach(id => {
-            if (id === currentItemId) return;
-            const p = STATE.slideshow.videoPlayers[id];
-            if (p) {
-              try {
-                if (typeof p.stopVideo === 'function') {
-                  p.stopVideo();
-                  if (typeof p.clearVideo === 'function') p.clearVideo();
-                } else if (p.tagName === 'VIDEO') {
-                  p.pause();
-                  p.muted = true;
-                  p.currentTime = 0;
-                }
-              } catch (e) { console.warn("Error stopping background player", id, e); }
-            }
-          });
-        }
-
-        // Pause only the current video
-        if (currentItemId) {
-          const player = STATE.slideshow.videoPlayers?.[currentItemId];
-          if (player) {
+      
+      // Pause active video if playing
+      const currentItemId = STATE.slideshow.itemIds[STATE.slideshow.currentSlideIndex];
+      if (currentItemId) {
+        // YouTube
+        if (STATE.slideshow.videoPlayers && STATE.slideshow.videoPlayers[currentItemId]) {
+          const player = STATE.slideshow.videoPlayers[currentItemId];
+          if (typeof player.pauseVideo === "function") {
             try {
-              if (typeof player.pauseVideo === 'function') {
-                player.pauseVideo();
-              } else if (player.tagName === 'VIDEO') {
-                player.pause();
-              }
-            } catch (e) { console.warn("Error pausing video on tab hide:", e); }
+              player.pauseVideo();
+              STATE.slideshow.isVideoPlaying = false;
+            } catch (e) {
+              console.warn("Error pausing video on tab hide:", e);
+            }
+          } else if (player.tagName === 'VIDEO') { // HTML5 Video
+             player.pause();
+             STATE.slideshow.isVideoPlaying = false;
           }
         }
       }
     } else {
-      console.log("Tab active. Resuming slideshow");
-      const isOnHome = window.location.hash === "#/home.html" || window.location.hash === "#/home";
-
-      if (isOnHome && !STATE.slideshow.isPaused && !isVideoPlayerOpen) {
-        SlideshowManager.resumeActivePlayback();
-
-        if (STATE.slideshow.slideInterval && !CONFIG.waitForTrailerToEnd) {
-          STATE.slideshow.slideInterval.start();
+      console.log("Tab active - resuming slideshow");
+      if (!STATE.slideshow.isPaused) {
+        const currentItemId = STATE.slideshow.itemIds[STATE.slideshow.currentSlideIndex];
+        
+        if (wasVideoPlayingBeforeHide && currentItemId && STATE.slideshow.videoPlayers && STATE.slideshow.videoPlayers[currentItemId]) {
+          const player = STATE.slideshow.videoPlayers[currentItemId];
+          
+          // YouTube
+          if (typeof player.playVideo === "function") {
+            try {
+              player.playVideo();
+              STATE.slideshow.isVideoPlaying = true;
+            } catch (e) {
+              console.warn("Error resuming video on tab show:", e);
+              if (STATE.slideshow.slideInterval) {
+                STATE.slideshow.slideInterval.start();
+              }
+            }
+          } else if (player.tagName === 'VIDEO') { // HTML5 Video
+             try {
+                player.play().catch(e => console.warn("Error resuming HTML5 video:", e));
+                STATE.slideshow.isVideoPlaying = true;
+             } catch(e) { console.warn(e); }
+          }
+        } else {
+          // No video was playing, just restart interval
+          const activeSlide = document.querySelector('.slide.active');
+          const hasVideo = activeSlide && activeSlide.querySelector('.video-backdrop');
+          
+          if (CONFIG.waitForTrailerToEnd && hasVideo) {
+             // Don't restart interval if waiting for trailer
+          } else {
+             if (STATE.slideshow.slideInterval) {
+               STATE.slideshow.slideInterval.start();
+             }
+          }
         }
+        wasVideoPlayingBeforeHide = false;
       }
     }
   });

README.md

@@ -155,21 +155,48 @@ Configure the plugin via **Dashboard** > **Plugins** > **Media Bar Enhanced**.
 Define exactly what shows up in your bar.
 
 *   **Enable Custom Media IDs**: Restrict the slideshow to a specific list of IDs.
-    *   **Manual Trailer Override**: Add `[YouTube_URL]` after an ID to force a specific trailer.
+    *   **Manual Trailer Override**: Add `[YouTube_URL]` or `[Jellyfin_ID]` after an ID to force a specific trailer/video.
     *   Example ID: `a1b2c3d4e5... [https://www.youtube.com/watch?v=VIDEO_ID]`
+    *   Example ID: `z1b2c3d4e5... [Jellyfin_ID]`
+    *   **Example Mixed List**:
+        ```
+        a1b2c3d4e5f6...                         <-- Plays local item video
+        6bdu812812hd... [https://youtu.be/...]  <-- Item metadata + Custom YouTube Trailer
+        12h44h124sf7... [hdc78127z4ff...]       <-- Item metadata + Custom Jellyfin Trailer/Video etc.
+        ```
     *   Example Collection Name: `Halloween Collection [https://...] | My Description` (Note: Use `|` to separate description from name if using a name instead of an ID)
+*   **Apply Limits to Custom IDs**: If enabled, the "Content Limits" (see below) will also apply to your Custom Media IDs list. By default, custom lists show all listed items regardless of limits.
 *   **Enable Seasonal Content Mode**: Advanced date-based scheduling.
-    *   Format: `DD.MM-DD.MM | Name | ID1, ID2, ID3`
-    *   Example: `20.10-31.10 | Halloween | <ID_OF_HALLOWEEN_COLLECTION>`
-    *   If the current date matches a range, those IDs are used. Otherwise, it defaults to standard behavior or the Custom Media IDs list.
+    *   **GUI Configuration**: You can easily add "Seasons" via the **Add Season** button.
+    *   **Active Period**: Select the Start and End Day/Month for each season.
+    *   **Media IDs**: Enter the Comma-separated list of IDs (Movies, Series, Collections) for that season.
+    *   **Priority**: If the current date matches a defined season, those IDs are used. If multiple seasons overlap, the first matching one is used. If no season matches, it falls back to the Default Custom Media IDs.
 
 **How to get IDs:**
 Check the URL of an item in the web interface:
 `.../web/#/details?id=YOUR_ITEM_ID_HERE&...`
 
+### Content Sorting
+Customize the order of slides in the Media Bar.
+
+*   **Sort By**: Choose criteria like *Random*, *Premiere Date*, *Production Year*, *Critic Rating*, *Community Rating*, *Name*, or *Runtime*.
+*   **Sort Order**: Ascending or Descending.
+*   **Note**: Sorting applies to both server-fetched content AND Custom Media IDs. Select **Original** to preserve the exact order of your Custom Media IDs list.
+
+### Content Limits
+Fine-tune performance by limiting the number of items fetched from the server.
+
+*   **Total Max Items**: Maximum total items to fetch (combined).
+*   **Max Movies**: Maximum movies to include (for random selection).
+*   **Max Tv Shows**: Maximum TV shows to include (for random selection).
+*   **Preload Count**: Number of slides to preload for smooth transitions.
+    *   *Intelligent Preloading*: The plugin uses a safe preloading strategy that respects this count but handles small lists gracefully to avoid playback issues.
+*   **Max Pagination Dots**: Maximum number of dots to show. If exceeded, it switches to a counter (e.g., 1/20).
+
 ### Advanced Settings
 *   **Slide Animations**: Enable/disable the "Zoom In" effect.
 *   **Use SponsorBlock**: Skips non-content segments in YouTube trailers (if the data exists).
+*   **Preferred YouTube Quality**: Select your preferred resolution (*Auto*, *Maximum*, *1080p*, *720p*).
 *   **Start Muted**: Videos start without sound (user can unmute).
 *   **Full Width Video**: Stretches video to cover the entire width (good for desktop, crop on mobile).
 *   **Enable Loading Screen**: Enable/disable the loading indicator while the bar initializes.

manifest.json

@@ -9,12 +9,12 @@
     "imageUrl": "https://git.mahom03-spacecloud.de/CodeDevMLH/jellyfin-plugin-media-bar-enhanced/raw/branch/main/logo.png",
     "versions": [
       {
-        "version": "1.6.1.17",
+        "version": "1.6.1.32",
         "changelog": "- fix tv mode issue\n- refactor video playback management",
         "targetAbi": "10.11.0.0",
-        "sourceUrl": "https://git.mahom03-spacecloud.de/CodeDevMLH/jellyfin-plugin-media-bar-enhanced/releases/download/v1.6.1.17/Jellyfin.Plugin.MediaBarEnhanced.zip",
-        "checksum": "4f0f1b0bfcb073ae72c6a5ba3b991e65",
-        "timestamp": "2026-02-13T13:49:22Z"
+        "sourceUrl": "https://git.mahom03-spacecloud.de/CodeDevMLH/jellyfin-plugin-media-bar-enhanced/releases/download/v1.6.1.32/Jellyfin.Plugin.MediaBarEnhanced.zip",
+        "checksum": "8d12099d8b1972412b6c300eeddc0c1b",
+        "timestamp": "2026-02-14T15:57:28Z"
       },
       {
         "version": "1.6.0.2",