Compare commits
41 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
de62c794f9 | ||
|
|
fc2491a4ef | ||
|
|
03276d7722 | ||
|
|
8676160e7b | ||
|
|
c562560bc0 | ||
|
|
98474d4ff6 | ||
|
|
14c0eb43ed | ||
|
|
c4cbeda2b8 | ||
|
|
53ad568be4 | ||
|
|
fba64bd0f6 | ||
|
|
3da16c4c5c | ||
|
|
c7cd7be3ee | ||
|
|
6d90523eef | ||
|
|
2a3e8057a1 | ||
|
|
42026b0ee8 | ||
|
|
64dbc3cfd3 | ||
|
|
c998266dd7 | ||
|
|
9b941e5a77 | ||
|
|
1d70d7166d | ||
|
|
5331f0faf1 | ||
|
|
0508188705 | ||
|
|
cc861f4263 | ||
|
|
10e6cdc4a2 | ||
|
|
a8c7faab6b | ||
|
|
6df390fa18 | ||
|
|
d0c3d7ee4d | ||
|
|
bc621aacdf | ||
|
|
73eb30d671 | ||
|
|
2cfbec95c9 | ||
|
|
08fc29cba3 | ||
|
|
0d6b835486 | ||
|
|
bf620e447f | ||
|
|
3117d627dd | ||
|
|
71402f7e86 | ||
|
|
cce202b88d | ||
|
|
1d334e4d95 | ||
|
|
142063ce63 | ||
|
|
1a0050ae1a | ||
|
|
46ebfdbafc | ||
|
|
14d2bb957b | ||
|
|
7a0c1e4488 |
246
Injector_new.cs
Normal file
246
Injector_new.cs
Normal file
@@ -0,0 +1,246 @@
|
|||||||
|
using System;
|
||||||
|
using System.Reflection;
|
||||||
|
using System.IO;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Runtime.Loader;
|
||||||
|
using Microsoft.Extensions.Logging;
|
||||||
|
using Newtonsoft.Json.Linq;
|
||||||
|
using MediaBrowser.Common.Configuration;
|
||||||
|
using Jellyfin.Plugin.MediaBarEnhanced.Helpers;
|
||||||
|
|
||||||
|
namespace Jellyfin.Plugin.MediaBarEnhanced
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Handles the injection of the MediaBarEnhanced script into the Jellyfin web interface.
|
||||||
|
/// </summary>
|
||||||
|
public class ScriptInjector
|
||||||
|
{
|
||||||
|
private readonly IApplicationPaths _appPaths;
|
||||||
|
private readonly ILogger<ScriptInjector> _logger;
|
||||||
|
public const string ScriptTag = "<script src=\"../MediaBarEnhanced/Resources/mediaBarEnhanced.js\" defer></script>";
|
||||||
|
public const string CssTag = "<link rel=\"stylesheet\" href=\"../MediaBarEnhanced/Resources/mediaBarEnhanced.css\" />";
|
||||||
|
public const string ScriptMarker = "</body>";
|
||||||
|
public const string CssMarker = "</head>";
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Initializes a new instance of the <see cref="ScriptInjector"/> class.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="appPaths">The application paths.</param>
|
||||||
|
/// <param name="logger">The logger.</param>
|
||||||
|
public ScriptInjector(IApplicationPaths appPaths, ILogger<ScriptInjector> logger)
|
||||||
|
{
|
||||||
|
_appPaths = appPaths;
|
||||||
|
_logger = logger;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Injects the script tag into index.html if it's not already present.
|
||||||
|
/// </summary>
|
||||||
|
public void Inject()
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var webPath = GetWebPath();
|
||||||
|
if (string.IsNullOrEmpty(webPath))
|
||||||
|
{
|
||||||
|
_logger.LogWarning("Could not find Jellyfin web path. Script injection skipped. Attempting fallback.");
|
||||||
|
RegisterFileTransformation();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
var indexPath = Path.Combine(webPath, "index.html");
|
||||||
|
if (!File.Exists(indexPath))
|
||||||
|
{
|
||||||
|
_logger.LogWarning("index.html not found at {Path}. Script injection skipped. Attempting fallback.", indexPath);
|
||||||
|
RegisterFileTransformation();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
var content = File.ReadAllText(indexPath);
|
||||||
|
var injectedJS = false;
|
||||||
|
var injectedCSS = false;
|
||||||
|
|
||||||
|
if (!content.Contains(ScriptTag))
|
||||||
|
{
|
||||||
|
var index = content.IndexOf(ScriptMarker, StringComparison.OrdinalIgnoreCase);
|
||||||
|
if (index != -1)
|
||||||
|
{
|
||||||
|
content = content.Insert(index, ScriptTag + Environment.NewLine);
|
||||||
|
injectedJS = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!content.Contains(CssTag))
|
||||||
|
{
|
||||||
|
var index = content.IndexOf(CssMarker, StringComparison.OrdinalIgnoreCase);
|
||||||
|
if (index != -1)
|
||||||
|
{
|
||||||
|
content = content.Insert(index, CssTag + Environment.NewLine);
|
||||||
|
injectedCSS = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (injectedJS && injectedCSS)
|
||||||
|
{
|
||||||
|
File.WriteAllText(indexPath, content);
|
||||||
|
_logger.LogInformation("MediaBarEnhanced script injected into index.html.");
|
||||||
|
} else if (injectedJS)
|
||||||
|
{
|
||||||
|
File.WriteAllText(indexPath, content);
|
||||||
|
_logger.LogInformation("MediaBarEnhanced JS script injected into index.html. But CSS was already present or could not be injected.");
|
||||||
|
}
|
||||||
|
else if (injectedCSS)
|
||||||
|
{
|
||||||
|
File.WriteAllText(indexPath, content);
|
||||||
|
_logger.LogInformation("MediaBarEnhanced CSS injected into index.html. But JS script was already present or could not be injected.");
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
_logger.LogInformation("MediaBarEnhanced script and CSS already present in index.html. Or could not be injected.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (UnauthorizedAccessException)
|
||||||
|
{
|
||||||
|
_logger.LogWarning("Unauthorized access when attempting to inject script into index.html. Automatic injection failed. Attempting fallback now...");
|
||||||
|
RegisterFileTransformation();
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
_logger.LogError(ex, "Error injecting MediaBarEnhanced resources. Attempting fallback.");
|
||||||
|
RegisterFileTransformation();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Removes the script tag from index.html.
|
||||||
|
/// </summary>
|
||||||
|
public void Remove()
|
||||||
|
{
|
||||||
|
UnregisterFileTransformation();
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var webPath = GetWebPath();
|
||||||
|
if (string.IsNullOrEmpty(webPath))
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
var indexPath = Path.Combine(webPath, "index.html");
|
||||||
|
if (!File.Exists(indexPath))
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
var content = File.ReadAllText(indexPath);
|
||||||
|
var modified = false;
|
||||||
|
|
||||||
|
if (content.Contains(ScriptTag))
|
||||||
|
{
|
||||||
|
content = content.Replace(ScriptTag + Environment.NewLine, "").Replace(ScriptTag, "");
|
||||||
|
modified = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (content.Contains(CssTag))
|
||||||
|
{
|
||||||
|
content = content.Replace(CssTag + Environment.NewLine, "").Replace(CssTag, "");
|
||||||
|
modified = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (modified)
|
||||||
|
{
|
||||||
|
File.WriteAllText(indexPath, content);
|
||||||
|
_logger.LogInformation("MediaBarEnhanced script removed from index.html.");
|
||||||
|
} else
|
||||||
|
{
|
||||||
|
_logger.LogInformation("MediaBarEnhanced script not found in index.html. No removal necessary.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (UnauthorizedAccessException uaEx)
|
||||||
|
{
|
||||||
|
_logger.LogError(uaEx, "Unauthorized access when trying to remove MediaBarEnhanced script. Check file permissions.");
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
_logger.LogError(ex, "Error removing MediaBarEnhanced script.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private string? GetWebPath()
|
||||||
|
{
|
||||||
|
var prop = _appPaths.GetType().GetProperty("WebPath", BindingFlags.Instance | BindingFlags.Public);
|
||||||
|
return prop?.GetValue(_appPaths) as string;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void RegisterFileTransformation()
|
||||||
|
{
|
||||||
|
_logger.LogInformation("MediaBarEnhanced Fallback. Registering file transformations.");
|
||||||
|
|
||||||
|
List<JObject> payloads = new List<JObject>();
|
||||||
|
|
||||||
|
{
|
||||||
|
JObject payload = new JObject();
|
||||||
|
payload.Add("id", "0dfac9d7-d898-4944-900b-1c1837707279");
|
||||||
|
payload.Add("fileNamePattern", "index.html");
|
||||||
|
payload.Add("callbackAssembly", GetType().Assembly.FullName);
|
||||||
|
payload.Add("callbackClass", typeof(TransformationPatches).FullName);
|
||||||
|
payload.Add("callbackMethod", nameof(TransformationPatches.IndexHtml));
|
||||||
|
|
||||||
|
payloads.Add(payload);
|
||||||
|
}
|
||||||
|
|
||||||
|
Assembly? fileTransformationAssembly =
|
||||||
|
AssemblyLoadContext.All.SelectMany(x => x.Assemblies).FirstOrDefault(x =>
|
||||||
|
x.FullName?.Contains(".FileTransformation") ?? false);
|
||||||
|
|
||||||
|
if (fileTransformationAssembly != null)
|
||||||
|
{
|
||||||
|
Type? pluginInterfaceType = fileTransformationAssembly.GetType("Jellyfin.Plugin.FileTransformation.PluginInterface");
|
||||||
|
|
||||||
|
if (pluginInterfaceType != null)
|
||||||
|
{
|
||||||
|
foreach (JObject payload in payloads)
|
||||||
|
{
|
||||||
|
pluginInterfaceType.GetMethod("RegisterTransformation")?.Invoke(null, new object?[] { payload });
|
||||||
|
}
|
||||||
|
_logger.LogInformation("File transformations registered successfully.");
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
_logger.LogWarning("FileTransformation plugin found but PluginInterface type missing.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
_logger.LogWarning("FileTransformation plugin assembly not found. Fallback failed.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void UnregisterFileTransformation()
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
Assembly? fileTransformationAssembly =
|
||||||
|
AssemblyLoadContext.All.SelectMany(x => x.Assemblies).FirstOrDefault(x =>
|
||||||
|
x.FullName?.Contains(".FileTransformation") ?? false);
|
||||||
|
|
||||||
|
if (fileTransformationAssembly != null)
|
||||||
|
{
|
||||||
|
Type? pluginInterfaceType = fileTransformationAssembly.GetType("Jellyfin.Plugin.FileTransformation.PluginInterface");
|
||||||
|
|
||||||
|
if (pluginInterfaceType != null)
|
||||||
|
{
|
||||||
|
Guid id = Guid.Parse("0dfac9d7-d898-4944-900b-1c1837707279");
|
||||||
|
pluginInterfaceType.GetMethod("RemoveTransformation")?.Invoke(null, new object?[] { id });
|
||||||
|
_logger.LogInformation("File transformation unregistered successfully.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
_logger.LogWarning(ex, "Error attempting to unregister file transformation. It might not have been registered.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -241,7 +241,7 @@
|
|||||||
<span>Start Muted</span>
|
<span>Start Muted</span>
|
||||||
</label>
|
</label>
|
||||||
<div class="fieldDescription">Start trailer video playback muted. (Known issue: In the
|
<div class="fieldDescription">Start trailer video playback muted. (Known issue: In the
|
||||||
Android/IOS app, backdrop trailers are always muted.)</div>
|
Android/IOS app, backdrop trailers are always muted.)<br><b style="color:#ffcc00">Warning:</b> Disabling this may cause autoplay to fail on certain browsers due to strict autoplay policies.</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="checkboxContainer checkboxContainer-withDescription">
|
<div class="checkboxContainer checkboxContainer-withDescription">
|
||||||
<label>
|
<label>
|
||||||
|
|||||||
@@ -12,7 +12,7 @@
|
|||||||
<!-- <TreatWarningsAsErrors>false</TreatWarningsAsErrors> -->
|
<!-- <TreatWarningsAsErrors>false</TreatWarningsAsErrors> -->
|
||||||
<Title>Jellyfin Media Bar Enhanced Plugin</Title>
|
<Title>Jellyfin Media Bar Enhanced Plugin</Title>
|
||||||
<Authors>CodeDevMLH</Authors>
|
<Authors>CodeDevMLH</Authors>
|
||||||
<Version>1.6.6.3</Version>
|
<Version>1.7.0.11</Version>
|
||||||
<RepositoryUrl>https://github.com/CodeDevMLH/jellyfin-plugin-media-bar-enhanced</RepositoryUrl>
|
<RepositoryUrl>https://github.com/CodeDevMLH/jellyfin-plugin-media-bar-enhanced</RepositoryUrl>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
|
|||||||
@@ -60,6 +60,11 @@ namespace Jellyfin.Plugin.MediaBarEnhanced
|
|||||||
var content = File.ReadAllText(indexPath);
|
var content = File.ReadAllText(indexPath);
|
||||||
var injectedJS = false;
|
var injectedJS = false;
|
||||||
var injectedCSS = false;
|
var injectedCSS = false;
|
||||||
|
var modified = false;
|
||||||
|
|
||||||
|
// Cleanup legacy tags first to avoid duplicates or conflicts
|
||||||
|
content = RemoveLegacyTags(content, ref modified);
|
||||||
|
|
||||||
|
|
||||||
if (!content.Contains(ScriptTag))
|
if (!content.Contains(ScriptTag))
|
||||||
{
|
{
|
||||||
@@ -81,19 +86,26 @@ namespace Jellyfin.Plugin.MediaBarEnhanced
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (injectedJS && injectedCSS)
|
if (injectedJS || injectedCSS || modified)
|
||||||
{
|
{
|
||||||
File.WriteAllText(indexPath, content);
|
File.WriteAllText(indexPath, content);
|
||||||
_logger.LogInformation("MediaBarEnhanced script injected into index.html.");
|
|
||||||
} else if (injectedJS)
|
if (injectedJS && injectedCSS)
|
||||||
{
|
{
|
||||||
File.WriteAllText(indexPath, content);
|
_logger.LogInformation("MediaBarEnhanced script injected into index.html.");
|
||||||
_logger.LogInformation("MediaBarEnhanced JS script injected into index.html. But CSS was already present or could not be injected.");
|
}
|
||||||
}
|
else if (injectedJS)
|
||||||
else if (injectedCSS)
|
{
|
||||||
{
|
_logger.LogInformation("MediaBarEnhanced JS script injected into index.html. But CSS was already present or could not be injected.");
|
||||||
File.WriteAllText(indexPath, content);
|
}
|
||||||
_logger.LogInformation("MediaBarEnhanced CSS injected into index.html. But JS script was already present or could not be injected.");
|
else if (injectedCSS)
|
||||||
|
{
|
||||||
|
_logger.LogInformation("MediaBarEnhanced CSS injected into index.html. But JS script was already present or could not be injected.");
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
_logger.LogInformation("MediaBarEnhanced script and CSS already present. Legacy tags removed if found.");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -148,6 +160,9 @@ namespace Jellyfin.Plugin.MediaBarEnhanced
|
|||||||
modified = true;
|
modified = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Remove legacy tags
|
||||||
|
content = RemoveLegacyTags(content, ref modified);
|
||||||
|
|
||||||
if (modified)
|
if (modified)
|
||||||
{
|
{
|
||||||
File.WriteAllText(indexPath, content);
|
File.WriteAllText(indexPath, content);
|
||||||
@@ -242,5 +257,33 @@ namespace Jellyfin.Plugin.MediaBarEnhanced
|
|||||||
_logger.LogWarning(ex, "Error attempting to unregister file transformation. It might not have been registered.");
|
_logger.LogWarning(ex, "Error attempting to unregister file transformation. It might not have been registered.");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
/// <summary>
|
||||||
|
/// Removes legacy script and css tags from the content.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="content">The file content.</param>
|
||||||
|
/// <param name="modified">Ref bool to track if changes were made.</param>
|
||||||
|
/// <returns>The modified content.</returns>
|
||||||
|
private string RemoveLegacyTags(string content, ref bool modified)
|
||||||
|
{
|
||||||
|
// Legacy tags (used in versions prior to 1.6.3.0 where paths started with / instead of ../)
|
||||||
|
const string LegacyScriptTag = "<script src=\"/MediaBarEnhanced/Resources/mediaBarEnhanced.js\" defer></script>";
|
||||||
|
const string LegacyCssTag = "<link rel=\"stylesheet\" href=\"/MediaBarEnhanced/Resources/mediaBarEnhanced.css\" />";
|
||||||
|
|
||||||
|
if (content.Contains(LegacyScriptTag))
|
||||||
|
{
|
||||||
|
content = content.Replace(LegacyScriptTag + Environment.NewLine, "").Replace(LegacyScriptTag, "");
|
||||||
|
modified = true;
|
||||||
|
_logger.LogInformation("Legacy MediaBarEnhanced script tag removed.");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (content.Contains(LegacyCssTag))
|
||||||
|
{
|
||||||
|
content = content.Replace(LegacyCssTag + Environment.NewLine, "").Replace(LegacyCssTag, "");
|
||||||
|
modified = true;
|
||||||
|
_logger.LogInformation("Legacy MediaBarEnhanced CSS tag removed.");
|
||||||
|
}
|
||||||
|
|
||||||
|
return content;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -163,6 +163,14 @@ const isUserLoggedIn = () => {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Detects if the current device is a low-power device (Smart TVs, etc.)
|
||||||
|
* @returns {boolean} True if running on a low-power device
|
||||||
|
*/
|
||||||
|
const isLowPowerDevice = () => {
|
||||||
|
return /webOS|LG Browser|SMART-TV|SmartTV|Tizen|Viera|NetCast|Roku|VIDAA/i.test(navigator.userAgent);
|
||||||
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Initializes Jellyfin data from ApiClient
|
* Initializes Jellyfin data from ApiClient
|
||||||
* @param {Function} callback - Function to call once data is initialized
|
* @param {Function} callback - Function to call once data is initialized
|
||||||
@@ -734,16 +742,21 @@ const SlideUtils = {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (isYoutube && videoId) {
|
if (isYoutube && videoId) {
|
||||||
const playerDiv = this.createElement('div', { id: 'modal-yt-player' });
|
const ytIframe = this.createElement('iframe', {
|
||||||
contentContainer.appendChild(playerDiv);
|
id: 'modal-yt-player',
|
||||||
|
src: `https://www.youtube-nocookie.com/embed/${videoId}?enablejsapi=1&origin=${encodeURIComponent(window.location.origin)}`,
|
||||||
|
allow: 'autoplay; encrypted-media; fullscreen; picture-in-picture',
|
||||||
|
style: 'width: 100%; height: 100%; border: none;',
|
||||||
|
referrerpolicy: 'strict-origin-when-cross-origin',
|
||||||
|
allowfullscreen: 'true'
|
||||||
|
});
|
||||||
|
|
||||||
|
contentContainer.appendChild(ytIframe);
|
||||||
overlay.append(closeButton, contentContainer);
|
overlay.append(closeButton, contentContainer);
|
||||||
document.body.appendChild(overlay);
|
document.body.appendChild(overlay);
|
||||||
|
|
||||||
this.loadYouTubeIframeAPI().then(() => {
|
this.loadYouTubeIframeAPI().then(() => {
|
||||||
new YT.Player('modal-yt-player', {
|
new YT.Player(ytIframe, {
|
||||||
height: '100%',
|
|
||||||
width: '100%',
|
|
||||||
videoId: videoId,
|
|
||||||
playerVars: {
|
playerVars: {
|
||||||
autoplay: 1,
|
autoplay: 1,
|
||||||
controls: 1,
|
controls: 1,
|
||||||
@@ -751,7 +764,6 @@ const SlideUtils = {
|
|||||||
rel: 0,
|
rel: 0,
|
||||||
playsinline: 1,
|
playsinline: 1,
|
||||||
origin: window.location.origin,
|
origin: window.location.origin,
|
||||||
widget_referrer: window.location.href,
|
|
||||||
enablejsapi: 1
|
enablejsapi: 1
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@@ -1395,7 +1407,7 @@ const ApiUtils = {
|
|||||||
|
|
||||||
return {
|
return {
|
||||||
id: trailer.Id,
|
id: trailer.Id,
|
||||||
url: `${STATE.jellyfinData.serverAddress}/Videos/${trailer.Id}/stream.mp4?mediaSourceId=${mediaSourceId}&api_key=${STATE.jellyfinData.accessToken}`
|
url: `${STATE.jellyfinData.serverAddress}/Videos/${trailer.Id}/stream.mp4?mediaSourceId=${mediaSourceId}&api_key=${STATE.jellyfinData.accessToken}&static=true`
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
@@ -1434,7 +1446,7 @@ const ApiUtils = {
|
|||||||
|
|
||||||
return {
|
return {
|
||||||
id: video.Id,
|
id: video.Id,
|
||||||
url: `${STATE.jellyfinData.serverAddress}/Videos/${video.Id}/stream.mp4?api_key=${STATE.jellyfinData.accessToken}`
|
url: `${STATE.jellyfinData.serverAddress}/Videos/${video.Id}/stream.mp4?api_key=${STATE.jellyfinData.accessToken}&static=true`
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1660,7 +1672,7 @@ const SlideCreator = {
|
|||||||
|
|
||||||
trailerUrl = {
|
trailerUrl = {
|
||||||
id: videoId,
|
id: videoId,
|
||||||
url: `${STATE.jellyfinData.serverAddress}/Videos/${videoId}/stream.mp4?api_key=${STATE.jellyfinData.accessToken}`
|
url: `${STATE.jellyfinData.serverAddress}/Videos/${videoId}/stream.mp4?api_key=${STATE.jellyfinData.accessToken}&static=true`
|
||||||
};
|
};
|
||||||
} else {
|
} else {
|
||||||
// Assume it's a standard URL (YouTube, etc.)
|
// Assume it's a standard URL (YouTube, etc.)
|
||||||
@@ -1688,7 +1700,7 @@ const SlideCreator = {
|
|||||||
console.log(`Using local trailer fallback for ${itemId}: ${trailerUrl}`);
|
console.log(`Using local trailer fallback for ${itemId}: ${trailerUrl}`);
|
||||||
}
|
}
|
||||||
|
|
||||||
const isMobile = /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent);
|
const isMobile = /Android|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent);
|
||||||
|
|
||||||
// Client Setting Overrides
|
// Client Setting Overrides
|
||||||
const enableVideo = MediaBarEnhancedSettingsManager.getSetting('videoBackdrops', CONFIG.enableVideoBackdrop);
|
const enableVideo = MediaBarEnhancedSettingsManager.getSetting('videoBackdrops', CONFIG.enableVideoBackdrop);
|
||||||
@@ -1718,7 +1730,12 @@ const SlideCreator = {
|
|||||||
console.warn("Invalid trailer URL:", trailerUrl);
|
console.warn("Invalid trailer URL:", trailerUrl);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isYoutube && videoId) {
|
const isLowPower = isLowPowerDevice();
|
||||||
|
const itemIndex = STATE.slideshow.itemIds ? STATE.slideshow.itemIds.indexOf(itemId) : -1;
|
||||||
|
const isActiveSlide = itemIndex !== -1 && itemIndex === STATE.slideshow.currentSlideIndex;
|
||||||
|
const shouldCreateVideo = !isLowPower || isActiveSlide;
|
||||||
|
|
||||||
|
if (isYoutube && videoId && shouldCreateVideo) {
|
||||||
isVideo = true;
|
isVideo = true;
|
||||||
// Create container for YouTube API
|
// Create container for YouTube API
|
||||||
const videoClass = CONFIG.fullWidthVideo ? "video-backdrop-full" : "video-backdrop-default";
|
const videoClass = CONFIG.fullWidthVideo ? "video-backdrop-full" : "video-backdrop-default";
|
||||||
@@ -1729,12 +1746,17 @@ const SlideCreator = {
|
|||||||
style: "opacity: 0; transition: opacity 1.2s ease-in-out;" // Start interrupted/transparent
|
style: "opacity: 0; transition: opacity 1.2s ease-in-out;" // Start interrupted/transparent
|
||||||
});
|
});
|
||||||
|
|
||||||
const ytPlayerDiv = SlideUtils.createElement("div", {
|
// Create an iframe upfront
|
||||||
|
const ytPlayerIframe = SlideUtils.createElement("iframe", {
|
||||||
id: `youtube-player-${itemId}`,
|
id: `youtube-player-${itemId}`,
|
||||||
style: "width: 100%; height: 100%;"
|
src: `https://www.youtube-nocookie.com/embed/${videoId}?enablejsapi=1&origin=${encodeURIComponent(window.location.origin)}`,
|
||||||
|
style: "width: 100%; height: 100%; border: none;",
|
||||||
|
allow: "autoplay; encrypted-media; fullscreen; picture-in-picture",
|
||||||
|
referrerpolicy: "strict-origin-when-cross-origin",
|
||||||
|
allowfullscreen: "true"
|
||||||
});
|
});
|
||||||
|
|
||||||
videoBackdrop.appendChild(ytPlayerDiv);
|
videoBackdrop.appendChild(ytPlayerIframe);
|
||||||
|
|
||||||
// Initialize YouTube Player
|
// Initialize YouTube Player
|
||||||
SlideUtils.loadYouTubeIframeAPI().then(() => {
|
SlideUtils.loadYouTubeIframeAPI().then(() => {
|
||||||
@@ -1751,7 +1773,6 @@ const SlideCreator = {
|
|||||||
loop: 0,
|
loop: 0,
|
||||||
playsinline: 1,
|
playsinline: 1,
|
||||||
origin: window.location.origin,
|
origin: window.location.origin,
|
||||||
widget_referrer: window.location.href,
|
|
||||||
enablejsapi: 1
|
enablejsapi: 1
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -1780,10 +1801,7 @@ const SlideCreator = {
|
|||||||
console.info(`SponsorBlock outro detected for video ${videoId}: ending at ${playerVars.end}s`);
|
console.info(`SponsorBlock outro detected for video ${videoId}: ending at ${playerVars.end}s`);
|
||||||
}
|
}
|
||||||
|
|
||||||
STATE.slideshow.videoPlayers[itemId] = new YT.Player(`youtube-player-${itemId}`, {
|
STATE.slideshow.videoPlayers[itemId] = new YT.Player(ytPlayerIframe, {
|
||||||
height: '100%',
|
|
||||||
width: '100%',
|
|
||||||
videoId: videoId,
|
|
||||||
playerVars: playerVars,
|
playerVars: playerVars,
|
||||||
events: {
|
events: {
|
||||||
'onReady': (event) => {
|
'onReady': (event) => {
|
||||||
@@ -1870,7 +1888,7 @@ const SlideCreator = {
|
|||||||
});
|
});
|
||||||
|
|
||||||
// 2. Check for local video trailers in MediaSources if yt is not available
|
// 2. Check for local video trailers in MediaSources if yt is not available
|
||||||
} else if (!isYoutube) {
|
} else if (!isYoutube && shouldCreateVideo) {
|
||||||
isVideo = true;
|
isVideo = true;
|
||||||
|
|
||||||
const videoSrc = (typeof trailerUrl === 'object' ? trailerUrl.url : trailerUrl);
|
const videoSrc = (typeof trailerUrl === 'object' ? trailerUrl.url : trailerUrl);
|
||||||
@@ -2562,7 +2580,7 @@ const SlideshowManager = {
|
|||||||
STATE.slideshow.isTransitioning = false;
|
STATE.slideshow.isTransitioning = false;
|
||||||
|
|
||||||
if (previousVisibleSlide) {
|
if (previousVisibleSlide) {
|
||||||
const enableAnimations = MediaBarEnhancedSettingsManager.getSetting('slideAnimations', CONFIG.slideAnimationEnabled);
|
const enableAnimations = MediaBarEnhancedSettingsManager.getSetting('slideAnimations', CONFIG.slideAnimationEnabled) && !isLowPowerDevice();
|
||||||
if (enableAnimations) {
|
if (enableAnimations) {
|
||||||
const prevBackdrop = previousVisibleSlide.querySelector(".backdrop");
|
const prevBackdrop = previousVisibleSlide.querySelector(".backdrop");
|
||||||
const prevLogo = previousVisibleSlide.querySelector(".logo");
|
const prevLogo = previousVisibleSlide.querySelector(".logo");
|
||||||
@@ -2603,7 +2621,9 @@ const SlideshowManager = {
|
|||||||
*/
|
*/
|
||||||
async preloadAdjacentSlides(currentIndex) {
|
async preloadAdjacentSlides(currentIndex) {
|
||||||
const totalItems = STATE.slideshow.totalItems;
|
const totalItems = STATE.slideshow.totalItems;
|
||||||
const preloadCount = Math.min(Math.max(CONFIG.preloadCount || 1, 1), 5);
|
let preloadCount = Math.min(Math.max(CONFIG.preloadCount || 1, 1), 5);
|
||||||
|
if (isLowPowerDevice()) preloadCount = 1; // Strict limit for TVs
|
||||||
|
|
||||||
const preloadedIds = new Set();
|
const preloadedIds = new Set();
|
||||||
|
|
||||||
// Preload next slides
|
// Preload next slides
|
||||||
@@ -3719,14 +3739,6 @@ const slidesInit = async () => {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Check if plugin is enabled
|
|
||||||
if (CONFIG.isEnabled === false) {
|
|
||||||
console.log("MediaBarEnhanced: Disabled by server configuration");
|
|
||||||
const loader = document.querySelector(".bar-loading");
|
|
||||||
if (loader) loader.remove();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (CONFIG.enableClientSideSettings) {
|
if (CONFIG.enableClientSideSettings) {
|
||||||
MediaBarEnhancedSettingsManager.init();
|
MediaBarEnhancedSettingsManager.init();
|
||||||
const isClientSideEnabled = MediaBarEnhancedSettingsManager.getSetting('enabled', true);
|
const isClientSideEnabled = MediaBarEnhancedSettingsManager.getSetting('enabled', true);
|
||||||
|
|||||||
@@ -9,12 +9,20 @@
|
|||||||
"imageUrl": "https://git.mahom03-spacecloud.de/CodeDevMLH/jellyfin-plugin-media-bar-enhanced/raw/branch/main/logo.png",
|
"imageUrl": "https://git.mahom03-spacecloud.de/CodeDevMLH/jellyfin-plugin-media-bar-enhanced/raw/branch/main/logo.png",
|
||||||
"versions": [
|
"versions": [
|
||||||
{
|
{
|
||||||
"version": "1.6.6.3",
|
"version": "1.7.0.11",
|
||||||
|
"changelog": "- Add YouTube no-cookie host and referrer policy for iframe security to fix playback issues on iOS/MacOS",
|
||||||
|
"targetAbi": "10.11.0.0",
|
||||||
|
"sourceUrl": "https://git.mahom03-spacecloud.de/CodeDevMLH/jellyfin-plugin-media-bar-enhanced/releases/download/v1.7.0.11/Jellyfin.Plugin.MediaBarEnhanced.zip",
|
||||||
|
"checksum": "8c2aba88a7abe379657604b3114da089",
|
||||||
|
"timestamp": "2026-03-06T02:19:18Z"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "1.6.6.4",
|
||||||
"changelog": "- feat: add static backdrop also for video backdrops\n- fix: renaming issue of settings (avoiding conflict with other plugins)",
|
"changelog": "- feat: add static backdrop also for video backdrops\n- fix: renaming issue of settings (avoiding conflict with other plugins)",
|
||||||
"targetAbi": "10.11.0.0",
|
"targetAbi": "10.11.0.0",
|
||||||
"sourceUrl": "https://git.mahom03-spacecloud.de/CodeDevMLH/jellyfin-plugin-media-bar-enhanced/releases/download/v1.6.6.3/Jellyfin.Plugin.MediaBarEnhanced.zip",
|
"sourceUrl": "https://git.mahom03-spacecloud.de/CodeDevMLH/jellyfin-plugin-media-bar-enhanced/releases/download/v1.6.6.4/Jellyfin.Plugin.MediaBarEnhanced.zip",
|
||||||
"checksum": "7841bf8916ae070449b04783960dacca",
|
"checksum": "2c55cf9687e44b04a0824997e2980dc9",
|
||||||
"timestamp": "2026-02-19T15:50:04Z"
|
"timestamp": "2026-02-19T17:21:40Z"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"version": "1.6.5.2",
|
"version": "1.6.5.2",
|
||||||
|
|||||||
Reference in New Issue
Block a user