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

Jellyfin.Plugin.MediaBarEnhanced/Configuration/PluginConfiguration.cs

@@ -34,6 +34,7 @@ namespace Jellyfin.Plugin.MediaBarEnhanced.Configuration
         public bool EnableCustomMediaIds { get; set; } = true;
         public string PreferredVideoQuality { get; set; } = "Auto";
         public bool EnableSeasonalContent { get; set; } = false;
+        public string SeasonalSections { get; set; } = "[]";
         public bool IsEnabled { get; set; } = true;
         public bool EnableClientSideSettings { get; set; } = false;
         public bool ApplyLimitsToCustomIds { get; set; } = false;

Jellyfin.Plugin.MediaBarEnhanced/Configuration/configPage.html

@@ -94,6 +94,7 @@
 
                     <!-- CUSTOM CONTENT TAB -->
                     <div id="custom" class="tab-content" style="display:none;">
+                        <!-- Default Custom Media IDs -->
                         <h2 class="sectionTitle">Custom Media IDs</h2>
                         <div class="checkboxContainer checkboxContainer-withDescription">
                             <label>
@@ -101,9 +102,8 @@
                                     name="EnableCustomMediaIds" />
                                 <span>Enable Custom Media IDs</span>
                             </label>
-                            <div class="fieldDescription">If enabled, the slideshow will try to show the items listed
-                                below. If the list is empty, default behavior (random items) is used. Disable this
-                                to temporarily ignore your custom list without deleting it.</div>
+                            <div class="fieldDescription">If enabled, the slideshow will show the items listed
+                                below as the default content. If the list is empty, random items from your library are used.</div>
                         </div>
                         <div class="checkboxContainer checkboxContainer-withDescription">
                             <label>
@@ -113,48 +113,57 @@
                             </label>
                             <div class="fieldDescription">If enabled, the Max Items limit (Advanced &rarr; Content Limits) will also apply to Custom Media IDs and Collections. By default, custom lists are not limited.</div>
                         </div>
-                        <div class="inputContainer">
-                            <label class="inputLabel inputLabelUnfocused" for="CustomMediaIds">Media/Collection/Playlist
-                                IDs
-                                (Newline or Comma separated)</label>
-                            <textarea is="emby-textarea" id="CustomMediaIds" name="CustomMediaIds"
-                                style="width: 100%; height: 150px; font-family: monospace;"></textarea>
-                            <div class="fieldDescription" id="customMediaIdsDesc">Enter the IDs of the items you want to show in the slideshow.
-                                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 [Method] DESCRIPTION</code>.
-                                <br>
-                                Methods:
-                                <ul>
-                                    <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>
-                                <br>
-                                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.
-                                <br>
-                                <b>Note:</b> The separator <b>MUST NOT</b> be a hex character (0-9, a-f).</div>
-                            <div class="fieldDescription" id="seasonalMediaIdsDesc" style="display: none;">
-                                <b>Seasonal Mode Enabled:</b> Define lines with date ranges (Format: DD.MM-DD.MM |
-                                <i>name</i> | <i>IDs</i>).<br>
-                                Example:<br>
-                                <code>20.10-31.10 | Halloween | ID1, ID2 [https://youtu.be/...]</code><br>
-                                <code>01.12-26.12 | Christmas | ID3, ID4</code><br>
-                                <i>Only lines matching the current date will be used. If no line matches, it will try to
-                                    fetch the list.txt or use random items.</i>
+                        <div id="customMediaIdsContainer">
+                            <div class="inputContainer">
+                                <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.
+                                    <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>.
+                                    <br>
+                                    Methods:
+                                    <ul>
+                                        <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>
+                                    <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.
+                                    <br>
+                                    <b>Note:</b> The separator <b>MUST NOT</b> be a hex character (0-9, a-f).
+                                </div>
+                                <p>You can find the IDs of your items in the URL of the item page in the web interface.<br>
+                                    Example:
+                                    <code>https://your-jellyfin-url/web/#/details?id=<b style="color:red;">your-item-id</b>&serverId=your-server-id</code><br><br>
+                                    You can also insert a name of a collection or playlist to fetch the IDs of all items in
+                                    it (will take the first hit.<br><b>Note:</b> there is currently no feedback if the name
+                                    resolution succeeded, you will have to look if the bar displays the correct items).
+                                </p>
                             </div>
-                            <p>You can find the IDs of your items in the URL of the item page in the web interface.<br>
-                                Example:
-                                <code>https://your-jellyfin-url/web/#/details?id=<b style="color:red;">your-item-id</b>&serverId=your-server-id</code><br><br>
-                                You can also insert a name of a collection or playlist to fetch the IDs of all items in
-                                it (will take the first hit.<br><b>Note:</b> there is currently no feedback if the name
-                                resolution succeeded, you will have to look if the bar displays the correct items.).
-                            </p>
                         </div>
+
+                        <!-- Seasonal Content -->
+                        <h2 class="sectionTitle" style="margin-top: 2em;">Seasonal Content</h2>
+                        <div class="checkboxContainer checkboxContainer-withDescription">
+                            <label>
+                                <input is="emby-checkbox" type="checkbox" id="EnableSeasonalContent"
+                                    name="EnableSeasonalContent" />
+                                <span>Enable Seasonal Content</span>
+                            </label>
+                            <div class="fieldDescription">When enabled, seasonal sections below will override the default list
+                                during their active date ranges. If no season matches the current date, the default Custom Media IDs above are used as fallback.</div>
+                        </div>
+                        <div id="seasonalContentContainer" style="display: none;">
+                            <div id="seasonalSectionsList"></div>
+                            <button is="emby-button" type="button" id="addSeasonBtn" class="raised emby-button"
+                                style="margin-top: 1em; display: inline-flex; align-items: center; gap: 0.4em;">
+                                <i class="material-icons" style="font-size: 24px;">add</i>
+                                <span>Add Season</span>
+                            </button>
+                        </div>
+                        <input type="hidden" id="SeasonalSections" name="SeasonalSections" value="[]" />
                     </div>
 
                     <!-- ADVANCED TAB -->
@@ -183,11 +192,11 @@
                                 <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>
-                            <select is="emby-select" id="PreferredVideoQuality" name="PreferredVideoQuality" class="selectLayout emby-select-withcolor emby-select">
+                            <select is="emby-select" id="PreferredVideoQuality" name="PreferredVideoQuality" class="selectLayout emby-select-withcolor emby-select" style="width: 100%; -webkit-appearance: menulist; appearance: menulist;">
                                 <option value="Auto">Auto (Smart)</option>
                                 <option value="Maximum">Maximum (4K+)</option>
                                 <option value="1080p">1080p</option>
@@ -289,7 +298,7 @@
                         <h2 class="sectionTitle">Content Sorting</h2>
                         <div class="selectContainer">
                             <label class="selectLabel" for="SortBy">Sort By</label>
-                            <select is="emby-select" id="SortBy" name="SortBy" class="selectLayout emby-select-withcolor emby-select">
+                            <select is="emby-select" id="SortBy" name="SortBy" class="selectLayout emby-select-withcolor emby-select" style="width: 100%; -webkit-appearance: menulist; appearance: menulist;">
                                 <option value="Random">Random</option>
                                 <option value="Original">Original (Custom List Order)</option>
                                 <option value="PremiereDate">Premiere Date</option>
@@ -303,7 +312,7 @@
                         </div>
                         <div class="selectContainer">
                             <label class="selectLabel" for="SortOrder">Sort Order</label>
-                            <select is="emby-select" id="SortOrder" name="SortOrder" class="selectLayout emby-select-withcolor emby-select">
+                            <select is="emby-select" id="SortOrder" name="SortOrder" class="selectLayout emby-select-withcolor emby-select" style="width: 100%; -webkit-appearance: menulist; appearance: menulist;">
                                 <option value="Ascending">Ascending</option>
                                 <option value="Descending">Descending</option>
                             </select>
@@ -424,24 +433,38 @@
                             }
                         });
 
-                        // Handle Seasonal UI logic
-                        var seasonalCheckbox = page.querySelector('#EnableSeasonalContent');
-                        var normalDesc = page.querySelector('#customMediaIdsDesc');
-                        var seasonalDesc = page.querySelector('#seasonalMediaIdsDesc');
+                        // Render Seasonal Sections
+                        try {
+                            var sections = JSON.parse(config.SeasonalSections || "[]");
+                            MediaBarEnhancedConfigurationPage.renderSeasonalSections(page, sections);
+                        } catch (e) {
+                            console.error("Error parsing SeasonalSections", e);
+                        }
 
-                        function updateDesc() {
-                            if (seasonalCheckbox && seasonalCheckbox.checked) {
-                                if (normalDesc) normalDesc.style.display = 'none';
-                                if (seasonalDesc) seasonalDesc.style.display = 'block';
-                            } else {
-                                if (normalDesc) normalDesc.style.display = 'block';
-                                if (seasonalDesc) seasonalDesc.style.display = 'none';
+                        // Handle Seasonal UI visibility
+                        var seasonalCheckbox = page.querySelector('#EnableSeasonalContent');
+                        var seasonalContainer = page.querySelector('#seasonalContentContainer');
+
+                        function updateSeasonalVisibility() {
+                            if (seasonalContainer) {
+                                seasonalContainer.style.display = seasonalCheckbox && seasonalCheckbox.checked ? 'block' : 'none';
                             }
                         }
 
                         if (seasonalCheckbox) {
-                            seasonalCheckbox.addEventListener('change', updateDesc);
-                            updateDesc();
+                            seasonalCheckbox.addEventListener('change', updateSeasonalVisibility);
+                            updateSeasonalVisibility();
+                        }
+                        
+                        // Add Season Button
+                        var addSeasonBtn = page.querySelector('#addSeasonBtn');
+                        if (addSeasonBtn) {
+                            // Remove existing listeners to avoid duplicates if re-attached
+                             var newBtn = addSeasonBtn.cloneNode(true);
+                             addSeasonBtn.parentNode.replaceChild(newBtn, addSeasonBtn);
+                             newBtn.addEventListener('click', function() {
+                                 MediaBarEnhancedConfigurationPage.addSeasonalSection(page);
+                             });
                         }
 
                         // Handle Prefer Local Trailers visibility
@@ -467,6 +490,11 @@
                 saveConfiguration: function (page) {
                     Dashboard.showLoadingMsg();
 
+                    var sections = MediaBarEnhancedConfigurationPage.getSeasonalSectionsFromUI(page);
+                    var sectionsJson = JSON.stringify(sections);
+                    var seasonalInput = page.querySelector('#SeasonalSections');
+                    if (seasonalInput) seasonalInput.value = sectionsJson;
+
                     var config = {};
                     var keys = [
                         'IsEnabled', 'ShuffleInterval', 'RetryInterval', 'MinSwipeDistance',
@@ -494,6 +522,105 @@
                     ApiClient.updatePluginConfiguration(MediaBarEnhancedConfigurationPage.pluginId, config).then(function (result) {
                         Dashboard.processPluginConfigurationUpdateResult(result);
                     });
+                },
+
+                renderSeasonalSections: function(page, sections) {
+                    var container = page.querySelector('#seasonalSectionsList');
+                    if (!container) return;
+                    container.innerHTML = '';
+                    sections.forEach(function(section, index) {
+                        MediaBarEnhancedConfigurationPage.createSectionElement(container, section, index + 1);
+                    });
+                },
+
+                addSeasonalSection: function(page) {
+                    var container = page.querySelector('#seasonalSectionsList');
+                    if (!container) return;
+                    var index = container.children.length + 1;
+                    MediaBarEnhancedConfigurationPage.createSectionElement(container, {
+                        Name: 'New Season',
+                        StartDay: 1, StartMonth: 1,
+                        EndDay: 1, EndMonth: 1,
+                        MediaIds: ''
+                    }, index);
+                },
+
+                createSectionElement: function(container, data, index) {
+                    var div = document.createElement('div');
+                    div.className = 'seasonal-section';
+                    div.style.cssText = 'background: rgba(0,0,0,0.2); padding: 1em; margin-bottom: 1em; border-radius: 4px; border: 1px solid rgba(255,255,255,0.1);';
+                    
+                    var days = [];
+                    for(var i=1; i<=31; i++) days.push(i);
+                    var months = [
+                        {v:1, n:'Jan'}, {v:2, n:'Feb'}, {v:3, n:'Mar'}, {v:4, n:'Apr'}, 
+                        {v:5, n:'May'}, {v:6, n:'Jun'}, {v:7, n:'Jul'}, {v:8, n:'Aug'}, 
+                        {v:9, n:'Sep'}, {v:10, n:'Oct'}, {v:11, n:'Nov'}, {v:12, n:'Dec'}
+                    ];
+
+                    function mkSelect(val, opts, cls) {
+                        var h = '<select class="emby-select emby-select-withcolor ' + cls + '" style="width: auto; display: inline-block; margin-right: 5px; -webkit-appearance: menulist; appearance: menulist;">';
+                        opts.forEach(function(o) {
+                            var v = o.v || o;
+                            var n = o.n || o;
+                            h += '<option value="'+v+'" ' + (v == val ? 'selected' : '') + '>' + n + '</option>';
+                        });
+                        h += '</select>';
+                        return h;
+                    }
+
+                    var labelText = 'Season list #' + (index || 1);
+
+                    div.innerHTML =
+                        '<div class="inputContainer" style="margin-bottom: 0.5em;">' +
+                        '    <label class="inputLabel" style="font-size: 1.2em; font-weight: bold; margin-bottom:0.5em; display:block;">' + labelText + '</label>' +
+                        '    <div style="display: flex; align-items: center;">' +
+                        '        <div style="flex-grow:1;">' +
+                        '            <input is="emby-input" type="text" class="emby-input section-name" value="' + (data.Name || '') + '" />' +
+                        '        </div>' +
+                        '        <button type="button" class="raised emby-button remove-section" style="background: #a94442; min-width: unset; margin-left: 1em;">Remove</button>' +
+                        '    </div>' +
+                        '    <div class="fieldDescription">Name of the season</div>' +
+                        '</div>' +
+                        '<div class="inputContainer" style="margin-bottom: 1em;">' +
+                        '    <label class="inputLabel" style="margin-bottom:0.5em; display:block;">Active Period</label>' +
+                        '    <div style="display: flex; align-items: center; flex-wrap: wrap; gap: 0.5em;">' +
+                        '        <span>From:</span>' +
+                                 mkSelect(data.StartDay, days, 'start-day') +
+                                 mkSelect(data.StartMonth, months, 'start-month') +
+                        '        <span style="margin-left: 1em;">To:</span>' +
+                                 mkSelect(data.EndDay, days, 'end-day') +
+                                 mkSelect(data.EndMonth, months, 'end-month') +
+                        '    </div>' +
+                        '    <div class="fieldDescription">Date range (inclusive) when this content is active.</div>' +
+                        '</div>' +
+                        '<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 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() {
+                        div.remove();
+                    });
+
+                    container.appendChild(div);
+                },
+
+                getSeasonalSectionsFromUI: function(page) {
+                    var sections = [];
+                    var els = page.querySelectorAll('.seasonal-section');
+                    els.forEach(function(el) {
+                        sections.push({
+                            Name: el.querySelector('.section-name').value,
+                            StartDay: parseInt(el.querySelector('.start-day').value),
+                            StartMonth: parseInt(el.querySelector('.start-month').value),
+                            EndDay: parseInt(el.querySelector('.end-day').value),
+                            EndMonth: parseInt(el.querySelector('.end-month').value),
+                            MediaIds: el.querySelector('.section-ids').value
+                        });
+                    });
+                    return sections;
                 }
             };
 

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.8</Version>
+    <Version>1.6.1.25</Version>
     <RepositoryUrl>https://github.com/CodeDevMLH/jellyfin-plugin-media-bar-enhanced</RepositoryUrl>
   </PropertyGroup>
 

Jellyfin.Plugin.MediaBarEnhanced/Web/mediaBarEnhanced.js

@@ -1319,7 +1319,7 @@ const ApiUtils = {
   async fetchCollectionItems(collectionId) {
     try {
       const response = await fetch(
-        `${STATE.jellyfinData.serverAddress}/Items?ParentId=${collectionId}&Recursive=true&IncludeItemTypes=Movie,Series&fields=Id&userId=${STATE.jellyfinData.userId}`,
+        `${STATE.jellyfinData.serverAddress}/Items?ParentId=${collectionId}&Recursive=true&IncludeItemTypes=Movie,Series&fields=Id,Type&userId=${STATE.jellyfinData.userId}`,
         {
           headers: this.getAuthHeaders(),
         }
@@ -1333,7 +1333,7 @@ const ApiUtils = {
       const data = await response.json();
       const items = data.Items || [];
       console.log(`Resolved collection ${collectionId} to ${items.length} items`);
-      return items.map(i => i.Id);
+      return items.map(i => ({ Id: i.Id, Type: i.Type }));
     } catch (error) {
       console.error(`Error fetching collection items for ${collectionId}:`, error);
       return [];
@@ -1435,19 +1435,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 +1459,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 +1480,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 +1607,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 +1704,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,18 +1720,11 @@ 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'))) {
-                      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();
                     
                     // Check if it actually started playing after a short delay (handling autoplay blocks)
@@ -1783,7 +1758,11 @@ const SlideCreator = {
                 },
                 'onStateChange': (event) => {
                   if (event.data === YT.PlayerState.ENDED) {
+                    if (CONFIG.waitForTrailerToEnd) {
                       SlideshowManager.nextSlide();
+                    } else {
+                      event.target.playVideo(); // Loop if not waiting for end if trailer is shorter than slide duration
+                    }
                   }
                 },
                 'onError': (event) => {
@@ -1808,6 +1787,7 @@ const SlideCreator = {
           autoplay: false,
           preload: "auto",
           loop: false,
+          disablePictureInPicture: true,
           style: "object-fit: cover; object-position: center center; width: 100%; height: 100%; position: absolute; top: 0; left: 0; pointer-events: none;"
         };
 
@@ -1823,25 +1803,16 @@ const SlideCreator = {
 
         STATE.slideshow.videoPlayers[itemId] = backdrop;
 
-        backdrop.addEventListener('play', (event) => {
-          const slide = document.querySelector(`.slide[data-item-id="${itemId}"]`);
-          const currentIndex = STATE.slideshow.currentSlideIndex;
-          const currentItemId = STATE.slideshow.itemIds[currentIndex];
-          
-          if (!slide || !slide.classList.contains('active') || currentItemId !== itemId) {
-              console.log(`Local video ${itemId} started playing but is not active, pausing.`);
-              event.target.pause();
-              event.target.currentTime = 0;
-              return;
-          }
-
+        backdrop.addEventListener('play', () => {
           if (CONFIG.waitForTrailerToEnd && STATE.slideshow.slideInterval) {
             STATE.slideshow.slideInterval.stop();
           }
         });
 
         backdrop.addEventListener('ended', () => {
+          if (CONFIG.waitForTrailerToEnd) {
             SlideshowManager.nextSlide();
+          }
         });
 
         backdrop.addEventListener('error', () => {
@@ -2276,16 +2247,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));
@@ -2313,28 +2274,92 @@ const SlideshowManager = {
       }
 
       currentSlide.classList.add("active");
-      
-      // 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. Pause all other YouTube players
+      if (STATE.slideshow.videoPlayers) {
+        Object.keys(STATE.slideshow.videoPlayers).forEach(id => {
+          if (id !== currentItemId) {
+            const p = STATE.slideshow.videoPlayers[id];
+            if (p && typeof p.pauseVideo === 'function') {
+              p.pauseVideo();
+            }
           }
-        }
-        // 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');
+
+      // 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) {
+                console.warn(`Autoplay blocked for ${itemId}, 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 (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);
 
@@ -2428,19 +2453,26 @@ 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
     for (let i = 1; i <= preloadCount; i++) {
         const prevIndex = (currentIndex - i + totalItems) % totalItems;
+        if (prevIndex === currentIndex) break;
         const prevItemId = STATE.slideshow.itemIds[prevIndex];
-        SlideCreator.createSlideForItemId(prevItemId);
+        if (!preloadedIds.has(prevItemId)) {
+             preloadedIds.add(prevItemId);
+             SlideCreator.createSlideForItemId(prevItemId);
+        }
     }
   },
 
@@ -2476,13 +2508,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]) {
@@ -2507,13 +2537,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') {
@@ -2640,114 +2668,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?.[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') {
-      player.seekTo(player._startTime || 0);
-      player.playVideo();
-      return true;
-    }
-
-    return false;
-  },
-
   /**
    * Stops all video playback (YouTube and HTML5)
    * Used when navigating away from the home screen
@@ -2804,24 +2724,18 @@ const SlideshowManager = {
     const currentSlide = document.querySelector(`.slide[data-item-id="${currentItemId}"]`);
     if (!currentSlide) return;
 
-    // YouTube player: just resume, don't reload
-    const ytPlayer = STATE.slideshow.videoPlayers?.[currentItemId];
+    // 1. Try YouTube Player
+    const ytPlayer = STATE.slideshow.videoPlayers[currentItemId];
     if (ytPlayer && typeof ytPlayer.playVideo === 'function') {
-      if (STATE.slideshow.isMuted) {
-        if (typeof ytPlayer.mute === 'function') ytPlayer.mute();
-      } else {
-        if (typeof ytPlayer.unMute === 'function') ytPlayer.unMute();
-        if (typeof ytPlayer.setVolume === 'function') ytPlayer.setVolume(40);
-      }
       ytPlayer.playVideo();
-      return;
     }
 
-    // HTML5 video: just resume, don't reset currentTime
-    const html5Video = currentSlide.querySelector('video.video-backdrop');
+    // 2. Try HTML5 Video
+    const html5Video = currentSlide.querySelector('video');
     if (html5Video) {
-      html5Video.muted = STATE.slideshow.isMuted;
-      if (!STATE.slideshow.isMuted) html5Video.volume = 0.4;
+      if (STATE.slideshow.isMuted) {
+        html5Video.muted = true;
+      }
       html5Video.play().catch(e => console.warn("Error resuming HTML5 video:", e));
     }
   },
@@ -2896,7 +2810,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);
@@ -2969,22 +2883,96 @@ const SlideshowManager = {
   },
 
   /**
-   * Parses custom media IDs, handling seasonal content if enabled
+   * Parses custom media IDs, handling seasonal content if enabled.
+   * If Seasonal Content is enabled:
+   *  - Check if any defined season matches the current date.
+   *  - If match: Return IDs from that season.
+   *  - If NO match: Fall back to Default Custom IDs.
+   * If Custom Media IDs are enabled (and no seasonal match):
+   *  - Return Default Custom IDs.
+   * If no Custom Media IDs are enabled:
+   *  - Return empty array (triggering random fallback).
    * @returns {string[]} Array of media IDs
    */
   parseCustomIds() {
-    if (!CONFIG.enableSeasonalContent) {
-    return CONFIG.customMediaIds
-      .split(/[\n,]/).map((line) => {
+    let idsString = CONFIG.customMediaIds;
+    let usingSeasonal = false;
+
+    if (CONFIG.enableSeasonalContent) {
+      try {
+        const sections = JSON.parse(CONFIG.seasonalSections || "[]");
+        const currentDate = new Date();
+        const currentMonth = currentDate.getMonth() + 1; // 1-12
+        const currentDay = currentDate.getDate(); // 1-31
+
+        for (const section of sections) {
+           const startDay = parseInt(section.StartDay);
+           const startMonth = parseInt(section.StartMonth);
+           const endDay = parseInt(section.EndDay);
+           const endMonth = parseInt(section.EndMonth);
+           
+           let isInRange = false;
+
+           if (startMonth === endMonth) {
+             if (currentMonth === startMonth && currentDay >= startDay && currentDay <= endDay) {
+               isInRange = true;
+             }
+           } else if (startMonth < endMonth) {
+             // Normal range
+             if (
+               (currentMonth > startMonth && currentMonth < endMonth) ||
+               (currentMonth === startMonth && currentDay >= startDay) ||
+               (currentMonth === endMonth && currentDay <= endDay)
+             ) {
+               isInRange = true;
+             }
+           } else {
+             // Wrap around year
+             if (
+               (currentMonth > startMonth || currentMonth < endMonth) ||
+               (currentMonth === startMonth && currentDay >= startDay) ||
+               (currentMonth === endMonth && currentDay <= endDay)
+             ) {
+               isInRange = true;
+             }
+           }
+
+           if (isInRange) {
+             console.log(`Seasonal match found: ${section.Name}`);
+             idsString = section.MediaIds;
+             usingSeasonal = true;
+             break; // Use first matching season
+           }
+        }
+      } catch (e) {
+        console.error("Error parsing seasonal sections in JS:", e);
+      }
+    }
+
+    // If NOT using seasonal content (disabled or no match), 
+    // Custom IDs are disabled, return empty to skip to random
+    if (!usingSeasonal && !CONFIG.enableCustomMediaIds) {
+        return [];
+    }
+    
+    // Parse the resulting string (either seasonal or default)
+    if (!idsString) return [];
+
+    return idsString
+      .split(/[\n,]/)
+      .map((line) => {
         const urlMatch = line.match(/\[(.*?)\]/);
         let id = line;
         if (urlMatch) {
             const url = urlMatch[1];
+            // Remove the [url] part from the ID string for parsing
             id = line.replace(/\[.*?\]/, '').trim();
+            // Attempt to extract GUID if present
             const guidMatch = id.match(/([0-9a-f]{32})/i);
             if (guidMatch) {
                 id = guidMatch[1];
             } else {
+                // Fallback: split by pipe if used
                 id = id.split('|')[0].trim();
             }
             STATE.slideshow.customTrailerUrls[id] = url;
@@ -2993,83 +2981,6 @@ const SlideshowManager = {
       }) 
       .map((id) => id.trim())
       .filter((id) => id);
-    } else {
-      return this.parseSeasonalIds();
-    }
-  },
-
-  /**
-   * Parses custom media IDs, handling seasonal content if enabled
-   * @returns {string[]} Array of media IDs
-   */
-  parseSeasonalIds() {
-    console.log("Using Seasonal Content Mode");
-    const lines = CONFIG.customMediaIds.split('\n');
-    const currentDate = new Date();
-    const currentMonth = currentDate.getMonth() + 1; // 1-12
-    const currentDay = currentDate.getDate(); // 1-31
-    const rawIds = [];
-
-    for (const line of lines) {
-      const match = line.match(/^\s*(\d{1,2})\.(\d{1,2})-(\d{1,2})\.(\d{1,2})\s*\|.*\|(.*)$/) ||
-        line.match(/^\s*(\d{1,2})\.(\d{1,2})-(\d{1,2})\.(\d{1,2})\s*\|(.*)$/);
-
-      if (match) {
-        const startDay = parseInt(match[1]);
-        const startMonth = parseInt(match[2]);
-        const endDay = parseInt(match[3]);
-        const endMonth = parseInt(match[4]);
-        const idsPart = match[5];
-
-        let isInRange = false;
-
-        if (startMonth === endMonth) {
-          if (currentMonth === startMonth && currentDay >= startDay && currentDay <= endDay) {
-            isInRange = true;
-          }
-        } else if (startMonth < endMonth) {
-          // Normal range spanning months (e.g. 15.06 - 15.08)
-          if (
-            (currentMonth > startMonth && currentMonth < endMonth) ||
-            (currentMonth === startMonth && currentDay >= startDay) ||
-            (currentMonth === endMonth && currentDay <= endDay)
-          ) {
-            isInRange = true;
-          }
-        } else {
-          // Wrap around year (e.g. 01.12 - 15.01)
-          if (
-            (currentMonth > startMonth || currentMonth < endMonth) ||
-            (currentMonth === startMonth && currentDay >= startDay) ||
-            (currentMonth === endMonth && currentDay <= endDay)
-          ) {
-            isInRange = true;
-          }
-        }
-
-        if (isInRange) {
-          console.log(`Seasonal match found: ${line}`);
-          const ids = idsPart.split(/[,]/).map(line => {
-              const urlMatch = line.match(/\[(.*?)\]/);
-              let id = line;
-              if (urlMatch) {
-                  const url = urlMatch[1];
-                  id = line.replace(/\[.*?\]/, '').trim();
-                  const guidMatch = id.match(/([0-9a-f]{32})/i);
-                  if (guidMatch) {
-                       id = guidMatch[1];
-                  } else {
-                       id = id.split('|')[0].trim();
-                  }
-                  STATE.slideshow.customTrailerUrls[id] = url;
-              }
-              return id.trim();
-          }).filter(id => id);
-          rawIds.push(...ids);
-        }
-      }
-    }
-    return rawIds;
   },
 
   /**
@@ -3111,7 +3022,7 @@ const SlideshowManager = {
           const children = await ApiUtils.fetchCollectionItems(id);
           finalIds.push(...children);
         } else if (item) {
-          finalIds.push(id);
+          finalIds.push({ Id: item.Id, Type: item.Type });
         }
       } catch (e) {
         console.warn(`Error resolving item ${rawId}:`, e);
@@ -3129,15 +3040,40 @@ const SlideshowManager = {
       let itemIds = [];
 
       // 1. Try Custom Media/Collection IDs from Config & seasonal content
-      if (CONFIG.enableCustomMediaIds && CONFIG.customMediaIds) {
+      if (CONFIG.enableCustomMediaIds || CONFIG.enableSeasonalContent) {
         console.log("Using Custom Media IDs from configuration");
         const rawIds = this.parseCustomIds();
-        itemIds = await this.resolveCollectionsAndItems(rawIds);
+        const resolvedItems = await this.resolveCollectionsAndItems(rawIds);
 
         // Apply max items limit to custom IDs if enabled
-        if (CONFIG.applyLimitsToCustomIds && itemIds.length > CONFIG.maxItems) {
-          console.log(`Limiting custom IDs from ${itemIds.length} to ${CONFIG.maxItems}`);
-          itemIds = itemIds.slice(0, CONFIG.maxItems);
+        if (CONFIG.applyLimitsToCustomIds) {
+            let movieCount = 0;
+            let showCount = 0;
+            let keptItems = [];
+            
+            for (const item of resolvedItems) {
+                 if (keptItems.length >= CONFIG.maxItems) break;
+                 
+                 if (item.Type === 'Movie') {
+                     if (movieCount < CONFIG.maxMovies) {
+                         movieCount++;
+                         keptItems.push(item);
+                     }
+                 } else if (item.Type === 'Series' || item.Type === 'Season' || item.Type === 'Episode') { 
+                     // Count Seasons/Episodes as TV Shows
+                     if (showCount < CONFIG.maxTvShows) {
+                         showCount++;
+                         keptItems.push(item);
+                     }
+                 } else {
+                     // Other types: count towards total only
+                     keptItems.push(item);
+                 }
+            }
+            itemIds = keptItems.map(i => i.Id);
+            console.log(`Applied limits to custom IDs: ${itemIds.length} items (Movies: ${movieCount}, Shows: ${showCount})`);
+        } else {
+            itemIds = resolvedItems.map(i => i.Id);
         }
       }
 
@@ -3518,69 +3454,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.8",
+        "version": "1.6.1.25",
         "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.8/Jellyfin.Plugin.MediaBarEnhanced.zip",
-        "checksum": "96db191473dc77edead21e8230c1115b",
-        "timestamp": "2026-02-12T23:51:47Z"
+        "sourceUrl": "https://git.mahom03-spacecloud.de/CodeDevMLH/jellyfin-plugin-media-bar-enhanced/releases/download/v1.6.1.25/Jellyfin.Plugin.MediaBarEnhanced.zip",
+        "checksum": "283886aa51ccd1d40f057b65617b7ea4",
+        "timestamp": "2026-02-14T02:21:14Z"
       },
       {
         "version": "1.6.0.2",