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

Jellyfin.Plugin.MediaBarEnhanced/Configuration/configPage.html

@@ -182,8 +182,7 @@
                         </div>
                         <div class="selectContainer">
                             <label class="selectLabel" for="PreferredVideoQuality">Preferred YouTube Quality</label>
-                            <select is="emby-select" id="PreferredVideoQuality" name="PreferredVideoQuality"
-                                class="emby-select-withcolor emby-select">
+                            <select is="emby-select" id="PreferredVideoQuality" name="PreferredVideoQuality" class="selectLayout emby-select-withcolor emby-select">
                                 <option value="Auto">Auto (Smart)</option>
                                 <option value="Maximum">Maximum (4K+)</option>
                                 <option value="1080p">1080p</option>
@@ -285,7 +284,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="emby-select-withcolor emby-select">
+                            <select is="emby-select" id="SortBy" name="SortBy" class="selectLayout emby-select-withcolor emby-select">
                                 <option value="Random">Random</option>
                                 <option value="Original">Original (Custom List Order)</option>
                                 <option value="PremiereDate">Premiere Date</option>
@@ -299,7 +298,7 @@
                         </div>
                         <div class="selectContainer">
                             <label class="selectLabel" for="SortOrder">Sort Order</label>
-                            <select is="emby-select" id="SortOrder" name="SortOrder" class="emby-select-withcolor emby-select">
+                            <select is="emby-select" id="SortOrder" name="SortOrder" class="selectLayout emby-select-withcolor emby-select">
                                 <option value="Ascending">Ascending</option>
                                 <option value="Descending">Descending</option>
                             </select>

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

Jellyfin.Plugin.MediaBarEnhanced/Web/mediaBarEnhanced.css

@@ -1,6 +1,6 @@
 /*
- * Jellyfin Slideshow by M0RPH3US v3.0.9
- * Modified by CodeDevMLH v1.1.0.0
+ * Jellyfin Slideshow by M0RPH3US v4.0.1
+ * Modified by CodeDevMLH
  * 
  * New features:
  * - optional Trailer background video support
@@ -14,6 +14,9 @@
  * - option to disable loading screen
  * - option to put collection (boxsets) IDs into the slideshow to display their items
  * - option to enable client-side settings (allow users to override settings locally on their device)
+ * - option to enable seasonal content (only show items that are relevant to the current season/holiday)
+ * - option to prefer local trailers (from the media item) over online sources
+ * - options to sort the content by various criteria (PremiereDate, ProductionYear, Random, Original order, etc.)
  */
 
 @import url(https://fonts.googleapis.com/css2?family=Archivo+Narrow:ital,wght@0,400..700;1,400..700&display=swap);
@@ -161,7 +164,7 @@
 
 .homeSectionsContainer {
   position: relative;
-  margin-top: 65vh;
+  top: 65vh;
   z-index: 6;
 }
 
@@ -991,4 +994,4 @@
 
 .dots-container .slide-counter {
   margin: 0;
-}
+}

Jellyfin.Plugin.MediaBarEnhanced/Web/mediaBarEnhanced.js

@@ -1,6 +1,6 @@
 /*
  * Jellyfin Slideshow by M0RPH3US v4.0.1
- * Modified by CodeDevMLH v1.1.0.0
+ * Modified by CodeDevMLH
  * 
  * New features:
  * - optional Trailer background video support
@@ -14,6 +14,9 @@
  * - option to disable loading screen
  * - option to put collection (boxsets) IDs into the slideshow to display their items
  * - option to enable client-side settings (allow users to override settings locally on their device)
+ * - option to enable seasonal content (only show items that are relevant to the current season/holiday)
+ * - option to prefer local trailers (from the media item) over online sources
+ * - options to sort the content by various criteria (PremiereDate, ProductionYear, Random, Original order, etc.)
  */
 
 //Core Module Configuration
@@ -85,6 +88,7 @@ const STATE = {
     isMuted: CONFIG.startMuted,
     customTrailerUrls: {},
     ytPromise: null,
+    autoplayTimeouts: [],
   },
 };
 
@@ -736,7 +740,11 @@ const SlideUtils = {
             autoplay: 1,
             controls: 1,
             iv_load_policy: 3,
-            rel: 0
+            rel: 0,
+            playsinline: 1,
+            origin: window.location.origin,
+            widget_referrer: window.location.href,
+            enablejsapi: 1
           }
         });
       });
@@ -1332,7 +1340,7 @@ const ApiUtils = {
   /**
    * Fetches the first local trailer for an item
    * @param {string} itemId - Item ID
-   * @returns {Promise<string|null>} Stream URL or null
+   * @returns {Promise<Object|null>} Trailer data object {id, url} or null
    */
   async fetchLocalTrailer(itemId) {
     try {
@@ -1352,8 +1360,11 @@ const ApiUtils = {
         const trailer = trailers[0];
         const mediaSourceId = trailer.MediaSources && trailer.MediaSources[0] ? trailer.MediaSources[0].Id : trailer.Id;
         
-        // Construct stream URL
-        return `${STATE.jellyfinData.serverAddress}/Videos/${trailer.Id}/stream.mp4?Static=true&mediaSourceId=${mediaSourceId}&api_key=${STATE.jellyfinData.accessToken}`;
+        // Return object with ID and URL
+        return {
+            id: trailer.Id,
+            url: `${STATE.jellyfinData.serverAddress}/Videos/${trailer.Id}/stream.mp4?Static=true&mediaSourceId=${mediaSourceId}&api_key=${STATE.jellyfinData.accessToken}`
+        };
       }
       return null;
     } catch (error) {
@@ -1416,6 +1427,24 @@ class SlideTimer {
  */
 const VisibilityObserver = {
   updateVisibility() {
+    const videoPlayer = document.querySelector('.videoPlayerContainer');
+    const trailerPlayer = document.querySelector('.youtubePlayerContainer');
+    
+    // If a full screen video player is active, hide slideshow and stop playback
+    if ((videoPlayer && !videoPlayer.classList.contains('hide')) || (trailerPlayer && !trailerPlayer.classList.contains('hide'))) {
+        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;
+    }
+
     const activeTab = document.querySelector(".emby-tab-button-active");
     const container = document.getElementById("slides-container");
 
@@ -1547,8 +1576,24 @@ const SlideCreator = {
 
     // 1a. Custom URL override
     if (STATE.slideshow.customTrailerUrls && STATE.slideshow.customTrailerUrls[itemId]) {
-      trailerUrl = STATE.slideshow.customTrailerUrls[itemId];
-      console.log(`Using custom trailer URL for ${itemId}: ${trailerUrl}`);
+      const customValue = STATE.slideshow.customTrailerUrls[itemId];
+      
+      // Check if the custom value is a Jellyfin Item ID (GUID)
+      const guidMatch = customValue.match(/^([0-9a-f]{32})$/i);
+      
+      if (guidMatch) {
+          const videoId = guidMatch[1];
+          console.log(`Using custom local video ID for ${itemId}: ${videoId}`);
+          
+          trailerUrl = {
+              id: videoId,
+              url: `${STATE.jellyfinData.serverAddress}/Videos/${videoId}/stream.mp4?Static=true&api_key=${STATE.jellyfinData.accessToken}`
+          };
+      } else {
+          // Assume it's a standard URL (YouTube, etc.)
+          trailerUrl = customValue;
+          console.log(`Using custom trailer URL for ${itemId}: ${trailerUrl}`);
+      }
     } 
     // 1b. Check Local Trailer if preferred
     else if (CONFIG.preferLocalTrailers && item.LocalTrailerCount > 0 && item.localTrailerUrl) {
@@ -1573,12 +1618,17 @@ const SlideCreator = {
       let videoId = null;
 
       try {
-        const urlObj = new URL(trailerUrl);
-        if (urlObj.hostname.includes('youtube.com') || urlObj.hostname.includes('youtu.be')) {
+        let urlToCheck = trailerUrl;
+        if (typeof trailerUrl === 'object' && trailerUrl.url) {
+            urlToCheck = trailerUrl.url;
+        }
+
+        const urlObjChecked = new URL(urlToCheck);
+        if (urlObjChecked.hostname.includes('youtube.com') || urlObjChecked.hostname.includes('youtu.be')) {
           isYoutube = true;
-          videoId = urlObj.searchParams.get('v');
-          if (!videoId && urlObj.hostname.includes('youtu.be')) {
-            videoId = urlObj.pathname.substring(1);
+          videoId = urlObjChecked.searchParams.get('v');
+          if (!videoId && urlObjChecked.hostname.includes('youtu.be')) {
+            videoId = urlObjChecked.pathname.substring(1);
           }
         }
       } catch (e) {
@@ -1607,7 +1657,11 @@ const SlideCreator = {
               fs: 0,
               iv_load_policy: 3,
               rel: 0,
-              loop: 0
+              loop: 0,
+              playsinline: 1,
+              origin: window.location.origin,
+              widget_referrer: window.location.href,
+              enablejsapi: 1
             };
 
             // Determine video quality
@@ -1660,10 +1714,23 @@ const SlideCreator = {
 
                   // Only play if this is the active slide
                   const slide = document.querySelector(`.slide[data-item-id="${itemId}"]`);
-                  if (slide && slide.classList.contains('active')) {
+                  const isVideoPlayerOpen = document.querySelector('.videoPlayerContainer') || document.querySelector('.youtubePlayerContainer');
+
+                  if (slide && slide.classList.contains('active') && !document.hidden && (!isVideoPlayerOpen || isVideoPlayerOpen.classList.contains('hide'))) {
                     event.target.playVideo();
+                    
                     // Check if it actually started playing after a short delay (handling autoplay blocks)
-                    setTimeout(() => {
+                    const timeoutId = setTimeout(() => {
+                      // Re-check conditions before processing fallback
+                      const isVideoPlayerOpenNow = document.querySelector('.videoPlayerContainer') || document.querySelector('.youtubePlayerContainer');
+                      if (document.hidden || (isVideoPlayerOpenNow && !isVideoPlayerOpenNow.classList.contains('hide')) || !slide.classList.contains('active')) {
+                          console.log(`Navigation detected during autoplay check for ${itemId}, stopping video.`);
+                          try {
+                            event.target.stopVideo();
+                          } catch (e) { console.warn("Error stopping video in timeout:", e); }
+                          return;
+                      }
+
                       if (event.target.getPlayerState() !== YT.PlayerState.PLAYING &&
                         event.target.getPlayerState() !== YT.PlayerState.BUFFERING) {
                         console.warn(`Autoplay blocked for ${itemId}, attempting muted fallback`);
@@ -1672,6 +1739,9 @@ const SlideCreator = {
                       }
                     }, 1000);
 
+                    if (!STATE.slideshow.autoplayTimeouts) STATE.slideshow.autoplayTimeouts = [];
+                    STATE.slideshow.autoplayTimeouts.push(timeoutId);
+
                     // Pause slideshow timer when video starts if configured
                     if (CONFIG.waitForTrailerToEnd && STATE.slideshow.slideInterval) {
                       STATE.slideshow.slideInterval.stop();
@@ -1704,7 +1774,7 @@ const SlideCreator = {
 
         const videoAttributes = {
           className: "backdrop video-backdrop",
-          src: trailerUrl,
+          src: (typeof trailerUrl === 'object' ? trailerUrl.url : trailerUrl),
           autoplay: false,
           preload: "auto",
           loop: false,
@@ -1995,11 +2065,20 @@ const SlideCreator = {
 
   /**
    * Creates a trailer button
-   * @param {string} url - Trailer URL
+   * @param {string|Object} trailerInfo - Trailer URL string or object {id, url}
    * @returns {HTMLElement} Trailer button element
    */
-  createTrailerButton(url) {
+  createTrailerButton(trailerInfo) {
     const trailerText = LocalizationUtils.getLocalizedString('Trailer', 'Trailer');
+    
+    let url = trailerInfo;
+    let localTrailerId = null;
+
+    if (typeof trailerInfo === 'object' && trailerInfo !== null) {
+        url = trailerInfo.url;
+        localTrailerId = trailerInfo.id;
+    }
+
     return SlideUtils.createElement("button", {
       className: "detailButton trailer-button",
       innerHTML: `<span class="material-icons">movie</span> <span class="trailer-text">${trailerText}</span>`,
@@ -2007,7 +2086,13 @@ const SlideCreator = {
       onclick: (e) => {
         e.preventDefault();
         e.stopPropagation();
-        SlideUtils.openVideoModal(url);
+        
+        if (localTrailerId) {
+            // Play local trailer using native player
+            ApiUtils.playItem(localTrailerId);
+        } else {
+            SlideUtils.openVideoModal(url);
+        }
       },
     });
   },
@@ -2547,15 +2632,26 @@ const SlideshowManager = {
    * Used when navigating away from the home screen
    */
   stopAllPlayback() {
-    // 1. Pause all YouTube players
+    // Clear any pending autoplay timeouts
+    if (STATE.slideshow.autoplayTimeouts) {
+        STATE.slideshow.autoplayTimeouts.forEach(id => clearTimeout(id));
+        STATE.slideshow.autoplayTimeouts = [];
+    }
+
+    // 1. Stop all YouTube players
     if (STATE.slideshow.videoPlayers) {
       Object.values(STATE.slideshow.videoPlayers).forEach(player => {
         try {
-          if (player && typeof player.pauseVideo === 'function') {
+          if (player && typeof player.stopVideo === 'function') {
+            player.stopVideo();
+            if (typeof player.clearVideo === 'function') {
+                player.clearVideo();
+            }
+          } else if (player && typeof player.pauseVideo === 'function') {
             player.pauseVideo();
           }
         } catch (e) {
-          console.warn("Error pausing YouTube player:", e);
+          console.warn("Error pausing/stopping YouTube player:", e);
         }
       });
     }
@@ -2659,55 +2755,75 @@ const SlideshowManager = {
       }
 
       const activeElement = document.activeElement;
-      const isSlideshowFocused = container.contains(activeElement) || activeElement === container;
-      
-      const isTvMode = window.layoutManager && window.layoutManager.tv;
+      const isTvDevice = window.browser && window.browser.tv;
+      const isTvLayout = window.layoutManager && window.layoutManager.tv;
+      const hasTvClass = document.documentElement.classList.contains('layout-tv') || document.body.classList.contains('layout-tv');
+      const isTvMode = isTvDevice || isTvLayout || hasTvClass;
+
+      // Check Focus State
+      const isBodyFocused = activeElement === document.body;
+      const hasDirectFocus = container.contains(activeElement) || activeElement === container;
       
+      // 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)
+      const canControlSlideshow = isTvMode ? hasDirectFocus : (hasDirectFocus || isBodyFocused);
+
+      // Check for Input Fields (always ignore typing)
       const isInputElement = activeElement && (activeElement.tagName === 'INPUT' || activeElement.tagName === 'TEXTAREA' || activeElement.isContentEditable);
-      
-      if (isInputElement) {
-        return;
-      }
+      if (isInputElement) return;
+
+      // Check active video players (ignore if video is playing/overlay is open)
+      const videoPlayer = document.querySelector('.videoPlayerContainer');
+      const trailerPlayer = document.querySelector('.youtubePlayerContainer');
+      const isVideoOpen = (videoPlayer && !videoPlayer.classList.contains('hide')) || (trailerPlayer && !trailerPlayer.classList.contains('hide'));
+      if (isVideoOpen) return;
 
       switch (e.key) {
         case "ArrowRight":
-          if (isTvMode && !isSlideshowFocused) return;
-          SlideshowManager.nextSlide();
-          e.preventDefault();
+          if (canControlSlideshow) {
+            SlideshowManager.nextSlide();
+            e.preventDefault();
+          }
           break;
 
         case "ArrowLeft":
-          if (isTvMode && !isSlideshowFocused) return;
-          SlideshowManager.prevSlide();
-          e.preventDefault();
+          if (canControlSlideshow) {
+            SlideshowManager.prevSlide();
+            e.preventDefault();
+          }
           break;
 
         case " ": // Space bar
-          if (isTvMode && !isSlideshowFocused) return;
-          this.togglePause();
-          e.preventDefault();
+          if (canControlSlideshow) {
+            this.togglePause();
+            e.preventDefault();
+          }
           break;
 
         case "m": // Mute toggle
         case "M":
-          if (isTvMode && !isSlideshowFocused) return;
-          this.toggleMute();
-          e.preventDefault();
+          if (canControlSlideshow) {
+            this.toggleMute();
+            e.preventDefault();
+          }
           break;
 
         case "Enter":
-          if (!isSlideshowFocused) return;
-          const currentItemId = STATE.slideshow.itemIds[STATE.slideshow.currentSlideIndex];
-          if (currentItemId) {
-             if (window.Emby && window.Emby.Page) {
-               Emby.Page.show(
-                 `/details?id=${currentItemId}&serverId=${STATE.jellyfinData.serverId}`
-               );
-             } else {
-               window.location.href = `#/details?id=${currentItemId}&serverId=${STATE.jellyfinData.serverId}`;
-             }
+          // Enter always requires direct focus on the slideshow to avoid conflicts
+          if (hasDirectFocus) {
+            const currentItemId = STATE.slideshow.itemIds[STATE.slideshow.currentSlideIndex];
+            if (currentItemId) {
+               if (window.Emby && window.Emby.Page) {
+                 Emby.Page.show(
+                   `/details?id=${currentItemId}&serverId=${STATE.jellyfinData.serverId}`
+                 );
+               } else {
+                 window.location.href = `#/details?id=${currentItemId}&serverId=${STATE.jellyfinData.serverId}`;
+               }
+            }
+            e.preventDefault();
           }
-          e.preventDefault();
           break;
       }
     });

manifest.json

@@ -9,12 +9,28 @@
     "imageUrl": "https://git.mahom03-spacecloud.de/CodeDevMLH/jellyfin-plugin-media-bar-enhanced/raw/branch/main/logo.png",
     "versions": [
       {
-        "version": "1.5.0.21",
-        "changelog": "- fix: Keyboard controls in TV mode\n- Add sorting options for content\n- Update mediaBarEnhanced.js and mediaBarEnhanced.css with version 4.0.1 from original repo",
+        "version": "1.6.0.2",
+        "changelog": "- add local trailer support on trailer button\nfix: iOS/MacOS playback issue?",
         "targetAbi": "10.11.0.0",
-        "sourceUrl": "https://git.mahom03-spacecloud.de/CodeDevMLH/jellyfin-plugin-media-bar-enhanced/releases/download/v1.5.0.21/Jellyfin.Plugin.MediaBarEnhanced.zip",
-        "checksum": "9a28102dbd4b62abdc8ef72abd7c6574",
-        "timestamp": "2026-02-09T22:29:09Z"
+        "sourceUrl": "https://git.mahom03-spacecloud.de/CodeDevMLH/jellyfin-plugin-media-bar-enhanced/releases/download/v1.6.0.2/Jellyfin.Plugin.MediaBarEnhanced.zip",
+        "checksum": "335a682c714e3e3178f9444fc36668a0",
+        "timestamp": "2026-02-10T21:44:35Z"
+      },
+      {
+        "version": "1.5.1.3",
+        "changelog": "- fix: iOS/MacOS playback issue?",
+        "targetAbi": "10.11.0.0",
+        "sourceUrl": "https://git.mahom03-spacecloud.de/CodeDevMLH/jellyfin-plugin-media-bar-enhanced/releases/download/v1.5.1.3/Jellyfin.Plugin.MediaBarEnhanced.zip",
+        "checksum": "9d9dbed453673d4b78acf2adaaaee126",
+        "timestamp": "2026-02-10T20:12:59Z"
+      },
+      {
+        "version": "1.5.0.28",
+        "changelog": "- fix: Keyboard controls in TV mode\n- Add sorting options for content\n- Add local trailer support\n- fix performance issue\n- Update mediaBarEnhanced.js and mediaBarEnhanced.css with version 4.0.1 from upstream repo",
+        "targetAbi": "10.11.0.0",
+        "sourceUrl": "https://git.mahom03-spacecloud.de/CodeDevMLH/jellyfin-plugin-media-bar-enhanced/releases/download/v1.5.0.28/Jellyfin.Plugin.MediaBarEnhanced.zip",
+        "checksum": "0261ff27be18d48cefa5078706954240",
+        "timestamp": "2026-02-10T00:35:41Z"
       },
       {
         "version": "1.3.0.3",