Compare commits
22 Commits
v1.6.6.1
...
d0c3d7ee4d
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d0c3d7ee4d | ||
|
|
bc621aacdf | ||
|
|
73eb30d671 | ||
|
|
2cfbec95c9 | ||
|
|
08fc29cba3 | ||
|
|
0d6b835486 | ||
|
|
bf620e447f | ||
|
|
3117d627dd | ||
|
|
71402f7e86 | ||
|
|
cce202b88d | ||
|
|
1d334e4d95 | ||
|
|
142063ce63 | ||
|
|
1a0050ae1a | ||
|
|
46ebfdbafc | ||
|
|
14d2bb957b | ||
|
|
7a0c1e4488 | ||
|
|
ec0e686e00 | ||
|
|
54395896b3 | ||
|
|
8b2fe59f5a | ||
|
|
a44bf7ebf4 | ||
|
|
1f273906bf | ||
|
|
0534d0458e |
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.1</Version>
|
<Version>1.7.0.3</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,21 +86,28 @@ namespace Jellyfin.Plugin.MediaBarEnhanced
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (injectedJS || injectedCSS || modified)
|
||||||
|
{
|
||||||
|
File.WriteAllText(indexPath, content);
|
||||||
|
|
||||||
if (injectedJS && injectedCSS)
|
if (injectedJS && injectedCSS)
|
||||||
{
|
{
|
||||||
File.WriteAllText(indexPath, content);
|
|
||||||
_logger.LogInformation("MediaBarEnhanced script injected into index.html.");
|
_logger.LogInformation("MediaBarEnhanced script injected into index.html.");
|
||||||
} else if (injectedJS)
|
}
|
||||||
|
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.");
|
_logger.LogInformation("MediaBarEnhanced JS script injected into index.html. But CSS was already present or could not be injected.");
|
||||||
}
|
}
|
||||||
else if (injectedCSS)
|
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.");
|
_logger.LogInformation("MediaBarEnhanced CSS injected into index.html. But JS script was already present or could not be injected.");
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
{
|
||||||
|
_logger.LogInformation("MediaBarEnhanced script and CSS already present. Legacy tags removed if found.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
{
|
{
|
||||||
_logger.LogInformation("MediaBarEnhanced script and CSS already present in index.html. Or could not be injected.");
|
_logger.LogInformation("MediaBarEnhanced script and CSS already present in index.html. Or could not be injected.");
|
||||||
}
|
}
|
||||||
@@ -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;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -744,6 +744,7 @@ const SlideUtils = {
|
|||||||
height: '100%',
|
height: '100%',
|
||||||
width: '100%',
|
width: '100%',
|
||||||
videoId: videoId,
|
videoId: videoId,
|
||||||
|
host: 'https://www.youtube-nocookie.com',
|
||||||
playerVars: {
|
playerVars: {
|
||||||
autoplay: 1,
|
autoplay: 1,
|
||||||
controls: 1,
|
controls: 1,
|
||||||
@@ -751,8 +752,15 @@ 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
|
||||||
|
},
|
||||||
|
events: {
|
||||||
|
'onReady': (event) => {
|
||||||
|
const iframe = event.target.getIframe();
|
||||||
|
if (iframe) {
|
||||||
|
iframe.setAttribute('referrerpolicy', 'strict-origin-when-cross-origin');
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
@@ -1395,7 +1403,9 @@ 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}`
|
// static=true forces Jellyfin to direct-stream (no transcoding) which enables
|
||||||
|
// HTTP Range Requests (Accept-Ranges: bytes) — required by Safari for video playback
|
||||||
|
url: `${STATE.jellyfinData.serverAddress}/Videos/${trailer.Id}/stream.mp4?mediaSourceId=${mediaSourceId}&api_key=${STATE.jellyfinData.accessToken}&static=true`
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
@@ -1741,8 +1751,8 @@ const SlideCreator = {
|
|||||||
// Fetch SponsorBlock data
|
// Fetch SponsorBlock data
|
||||||
ApiUtils.fetchSponsorBlockData(videoId).then(segments => {
|
ApiUtils.fetchSponsorBlockData(videoId).then(segments => {
|
||||||
const playerVars = {
|
const playerVars = {
|
||||||
autoplay: 0,
|
autoplay: 1,
|
||||||
mute: STATE.slideshow.isMuted ? 1 : 0,
|
mute: 1, // need to be muted for Safari, because apple makes life difficult...
|
||||||
controls: 0,
|
controls: 0,
|
||||||
disablekb: 1,
|
disablekb: 1,
|
||||||
fs: 0,
|
fs: 0,
|
||||||
@@ -1751,7 +1761,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
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -1784,9 +1793,17 @@ const SlideCreator = {
|
|||||||
height: '100%',
|
height: '100%',
|
||||||
width: '100%',
|
width: '100%',
|
||||||
videoId: videoId,
|
videoId: videoId,
|
||||||
|
host: 'https://www.youtube-nocookie.com',
|
||||||
playerVars: playerVars,
|
playerVars: playerVars,
|
||||||
events: {
|
events: {
|
||||||
'onReady': (event) => {
|
'onReady': (event) => {
|
||||||
|
const iframe = event.target.getIframe();
|
||||||
|
if (iframe) {
|
||||||
|
iframe.setAttribute('referrerpolicy', 'strict-origin-when-cross-origin');
|
||||||
|
// Full allow attribute matching what YouTube sets on their own embed pages
|
||||||
|
iframe.setAttribute('allow', 'accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share');
|
||||||
|
}
|
||||||
|
|
||||||
// Store start/end time and videoId for later use
|
// Store start/end time and videoId for later use
|
||||||
event.target._startTime = playerVars.start || 0;
|
event.target._startTime = playerVars.start || 0;
|
||||||
event.target._endTime = playerVars.end || undefined;
|
event.target._endTime = playerVars.end || undefined;
|
||||||
@@ -1795,9 +1812,8 @@ const SlideCreator = {
|
|||||||
// Store reference to wrapper for fading
|
// Store reference to wrapper for fading
|
||||||
event.target._wrapperDiv = videoBackdrop;
|
event.target._wrapperDiv = videoBackdrop;
|
||||||
|
|
||||||
if (STATE.slideshow.isMuted) {
|
// Unmute now if user wants sound.
|
||||||
event.target.mute();
|
if (!STATE.slideshow.isMuted) {
|
||||||
} else {
|
|
||||||
event.target.unMute();
|
event.target.unMute();
|
||||||
event.target.setVolume(40);
|
event.target.setVolume(40);
|
||||||
}
|
}
|
||||||
@@ -1806,28 +1822,34 @@ const SlideCreator = {
|
|||||||
event.target.setPlaybackQuality(quality);
|
event.target.setPlaybackQuality(quality);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Only play if this is the active slide
|
// Stop playback if slide was navigated away from
|
||||||
const slide = document.querySelector(`.slide[data-item-id="${itemId}"]`);
|
const slide = document.querySelector(`.slide[data-item-id="${itemId}"]`);
|
||||||
const isVideoPlayerOpen = document.querySelector('.videoPlayerContainer') || document.querySelector('.youtubePlayerContainer');
|
const isVideoPlayerOpen = document.querySelector('.videoPlayerContainer') || document.querySelector('.youtubePlayerContainer');
|
||||||
|
|
||||||
if (slide && slide.classList.contains('active') && !document.hidden && (!isVideoPlayerOpen || isVideoPlayerOpen.classList.contains('hide'))) {
|
if (!slide || !slide.classList.contains('active') || document.hidden || (isVideoPlayerOpen && !isVideoPlayerOpen.classList.contains('hide'))) {
|
||||||
event.target.playVideo();
|
event.target.stopVideo();
|
||||||
|
} else {
|
||||||
|
// Pause slideshow timer when video starts if configured
|
||||||
|
if (CONFIG.waitForTrailerToEnd && STATE.slideshow.slideInterval) {
|
||||||
|
STATE.slideshow.slideInterval.stop();
|
||||||
|
}
|
||||||
|
|
||||||
// Check if it actually started playing after a short delay (handling autoplay blocks)
|
// Safety check after 1s: handle navigation-away during the window,
|
||||||
|
// and fallback to muted play if autoplay failed for any reason.
|
||||||
const timeoutId = setTimeout(() => {
|
const timeoutId = setTimeout(() => {
|
||||||
// Re-check conditions before processing fallback
|
|
||||||
const isVideoPlayerOpenNow = document.querySelector('.videoPlayerContainer') || document.querySelector('.youtubePlayerContainer');
|
const isVideoPlayerOpenNow = document.querySelector('.videoPlayerContainer') || document.querySelector('.youtubePlayerContainer');
|
||||||
if (document.hidden || (isVideoPlayerOpenNow && !isVideoPlayerOpenNow.classList.contains('hide')) || !slide.classList.contains('active')) {
|
if (document.hidden || (isVideoPlayerOpenNow && !isVideoPlayerOpenNow.classList.contains('hide')) || !slide.classList.contains('active')) {
|
||||||
console.log(`Navigation detected during autoplay check for ${itemId}, stopping video.`);
|
console.log(`Navigation detected during autoplay check for ${itemId}, stopping video.`);
|
||||||
try {
|
try {
|
||||||
event.target.stopVideo();
|
event.target.stopVideo();
|
||||||
} catch (e) { console.warn("Error stopping video in timeout:", e); }
|
} catch (e) { console.warn("Error stopping video:", e); }
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (event.target.getPlayerState() !== YT.PlayerState.PLAYING &&
|
// If somehow not playing/buffering yet, force muted fallback
|
||||||
event.target.getPlayerState() !== YT.PlayerState.BUFFERING) {
|
const state = event.target.getPlayerState();
|
||||||
console.warn(`Autoplay blocked for ${itemId}, attempting muted fallback`);
|
if (state !== YT.PlayerState.PLAYING && state !== YT.PlayerState.BUFFERING) {
|
||||||
|
console.warn(`Autoplay stalled for ${itemId}, attempting muted fallback`);
|
||||||
event.target.mute();
|
event.target.mute();
|
||||||
event.target.playVideo();
|
event.target.playVideo();
|
||||||
}
|
}
|
||||||
@@ -1835,11 +1857,6 @@ const SlideCreator = {
|
|||||||
|
|
||||||
if (!STATE.slideshow.autoplayTimeouts) STATE.slideshow.autoplayTimeouts = [];
|
if (!STATE.slideshow.autoplayTimeouts) STATE.slideshow.autoplayTimeouts = [];
|
||||||
STATE.slideshow.autoplayTimeouts.push(timeoutId);
|
STATE.slideshow.autoplayTimeouts.push(timeoutId);
|
||||||
|
|
||||||
// Pause slideshow timer when video starts if configured
|
|
||||||
if (CONFIG.waitForTrailerToEnd && STATE.slideshow.slideInterval) {
|
|
||||||
STATE.slideshow.slideInterval.stop();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
'onStateChange': (event) => {
|
'onStateChange': (event) => {
|
||||||
@@ -1883,6 +1900,7 @@ const SlideCreator = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
videoAttributes.muted = "";
|
videoAttributes.muted = "";
|
||||||
|
videoAttributes.playsinline = ""; // again Safari needs extra treatment...
|
||||||
|
|
||||||
videoBackdrop = SlideUtils.createElement("video", videoAttributes);
|
videoBackdrop = SlideUtils.createElement("video", videoAttributes);
|
||||||
videoBackdrop.volume = 0.4;
|
videoBackdrop.volume = 0.4;
|
||||||
@@ -1914,7 +1932,10 @@ const SlideCreator = {
|
|||||||
});
|
});
|
||||||
|
|
||||||
videoBackdrop.addEventListener('error', (event) => {
|
videoBackdrop.addEventListener('error', (event) => {
|
||||||
console.warn(`Local video error for item ${itemId}`);
|
const src = event.target.src || event.target.getAttribute('data-src') || 'unknown';
|
||||||
|
const errCode = event.target.error ? event.target.error.code : 'n/a';
|
||||||
|
const errMsg = event.target.error ? event.target.error.message : 'n/a';
|
||||||
|
console.warn(`Local video error for item ${itemId} | code=${errCode} | msg=${errMsg} | url=${src}`);
|
||||||
const slide = event.target.closest('.slide');
|
const slide = event.target.closest('.slide');
|
||||||
if (slide && slide.classList.contains('active')) {
|
if (slide && slide.classList.contains('active')) {
|
||||||
SlideshowManager.nextSlide();
|
SlideshowManager.nextSlide();
|
||||||
@@ -2393,6 +2414,7 @@ const SlideshowManager = {
|
|||||||
|
|
||||||
// Manage Video Playback: Stop others, Play current
|
// Manage Video Playback: Stop others, Play current
|
||||||
// 1. Stop all other YouTube players and local video elements, release connections
|
// 1. Stop all other YouTube players and local video elements, release connections
|
||||||
|
setTimeout(() => {
|
||||||
if (STATE.slideshow.videoPlayers) {
|
if (STATE.slideshow.videoPlayers) {
|
||||||
Object.keys(STATE.slideshow.videoPlayers).forEach(id => {
|
Object.keys(STATE.slideshow.videoPlayers).forEach(id => {
|
||||||
if (id !== currentItemId) {
|
if (id !== currentItemId) {
|
||||||
@@ -2417,6 +2439,7 @@ const SlideshowManager = {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
}, CONFIG.fadeTransitionDuration);
|
||||||
|
|
||||||
// 2. Pause all other HTML5 videos e.g. local trailers
|
// 2. Pause all other HTML5 videos e.g. local trailers
|
||||||
document.querySelectorAll('video').forEach(video => {
|
document.querySelectorAll('video').forEach(video => {
|
||||||
@@ -2451,19 +2474,16 @@ const SlideshowManager = {
|
|||||||
if (videoBackdrop.tagName === 'VIDEO') {
|
if (videoBackdrop.tagName === 'VIDEO') {
|
||||||
// Restore src from data-src if it was deactivated to release connections
|
// Restore src from data-src if it was deactivated to release connections
|
||||||
const lazySrc = videoBackdrop.getAttribute('data-src');
|
const lazySrc = videoBackdrop.getAttribute('data-src');
|
||||||
if (lazySrc && !videoBackdrop.src) {
|
const isFreshLoad = lazySrc && !videoBackdrop.src;
|
||||||
videoBackdrop.src = lazySrc;
|
|
||||||
}
|
|
||||||
|
|
||||||
videoBackdrop.currentTime = 0;
|
|
||||||
|
|
||||||
videoBackdrop.muted = STATE.slideshow.isMuted;
|
videoBackdrop.muted = STATE.slideshow.isMuted;
|
||||||
if (!STATE.slideshow.isMuted) {
|
if (!STATE.slideshow.isMuted) {
|
||||||
videoBackdrop.volume = 0.4;
|
videoBackdrop.volume = 0.4;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const doPlay = () => {
|
||||||
|
if (!currentSlide.classList.contains('active')) return;
|
||||||
videoBackdrop.play().catch(e => {
|
videoBackdrop.play().catch(e => {
|
||||||
// Check if it actually started playing after a short delay (handling autoplay blocks)
|
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
if (videoBackdrop.paused && currentSlide.classList.contains('active')) {
|
if (videoBackdrop.paused && currentSlide.classList.contains('active')) {
|
||||||
console.warn(`Autoplay blocked for ${currentItemId}, attempting muted fallback`);
|
console.warn(`Autoplay blocked for ${currentItemId}, attempting muted fallback`);
|
||||||
@@ -2472,22 +2492,41 @@ const SlideshowManager = {
|
|||||||
}
|
}
|
||||||
}, 1000);
|
}, 1000);
|
||||||
});
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
if (isFreshLoad) {
|
||||||
|
// Safari: set src, then wait for loadedmetadata before seeking/playing
|
||||||
|
videoBackdrop.src = lazySrc;
|
||||||
|
videoBackdrop.load();
|
||||||
|
videoBackdrop.addEventListener('loadedmetadata', () => {
|
||||||
|
videoBackdrop.currentTime = 0;
|
||||||
|
doPlay();
|
||||||
|
}, { once: true });
|
||||||
|
} else {
|
||||||
|
// src already set (e.g. paused slide resuming)
|
||||||
|
videoBackdrop.currentTime = 0;
|
||||||
|
doPlay();
|
||||||
|
}
|
||||||
} else if (STATE.slideshow.videoPlayers && STATE.slideshow.videoPlayers[currentItemId]) {
|
} else if (STATE.slideshow.videoPlayers && STATE.slideshow.videoPlayers[currentItemId]) {
|
||||||
const player = STATE.slideshow.videoPlayers[currentItemId];
|
const player = STATE.slideshow.videoPlayers[currentItemId];
|
||||||
if (player && typeof player.loadVideoById === 'function' && player._videoId) {
|
if (player && typeof player.loadVideoById === 'function' && player._videoId) {
|
||||||
// Use loadVideoById to enforce start and end times
|
// Use loadVideoById to enforce start and end times
|
||||||
|
// load always starts muted first, then unmute if needed
|
||||||
player.loadVideoById({
|
player.loadVideoById({
|
||||||
videoId: player._videoId,
|
videoId: player._videoId,
|
||||||
startSeconds: player._startTime || 0,
|
startSeconds: player._startTime || 0,
|
||||||
endSeconds: player._endTime
|
endSeconds: player._endTime
|
||||||
});
|
});
|
||||||
|
|
||||||
if (STATE.slideshow.isMuted) {
|
|
||||||
player.mute();
|
player.mute();
|
||||||
} else {
|
if (!STATE.slideshow.isMuted) {
|
||||||
|
setTimeout(() => {
|
||||||
|
// Only unmute if still on the same slide
|
||||||
|
if (currentSlide.classList.contains('active')) {
|
||||||
player.unMute();
|
player.unMute();
|
||||||
player.setVolume(40);
|
player.setVolume(40);
|
||||||
}
|
}
|
||||||
|
}, 600);
|
||||||
|
}
|
||||||
|
|
||||||
// Check if playback successfully started, otherwise fallback to muted
|
// Check if playback successfully started, otherwise fallback to muted
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
@@ -3719,8 +3758,8 @@ const slidesInit = async () => {
|
|||||||
|
|
||||||
if (CONFIG.enableClientSideSettings) {
|
if (CONFIG.enableClientSideSettings) {
|
||||||
MediaBarEnhancedSettingsManager.init();
|
MediaBarEnhancedSettingsManager.init();
|
||||||
const isEnabled = MediaBarEnhancedSettingsManager.getSetting('enabled', true);
|
const isClientSideEnabled = MediaBarEnhancedSettingsManager.getSetting('enabled', true);
|
||||||
if (!isEnabled) {
|
if (!isClientSideEnabled) {
|
||||||
console.log("MediaBarEnhanced: Disabled by client-side setting.");
|
console.log("MediaBarEnhanced: Disabled by client-side setting.");
|
||||||
const homeSections = document.querySelector('.homeSectionsContainer');
|
const homeSections = document.querySelector('.homeSectionsContainer');
|
||||||
if (homeSections) {
|
if (homeSections) {
|
||||||
|
|||||||
@@ -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.1",
|
"version": "1.7.0.3",
|
||||||
|
"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.2/Jellyfin.Plugin.MediaBarEnhanced.zip",
|
||||||
|
"checksum": "ac29b647173ef306beb01f3f66373c21",
|
||||||
|
"timestamp": "2026-03-05T22:44:55Z"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"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.1/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": "b601594ce1b9928a6e4a41d94c866346",
|
"checksum": "2c55cf9687e44b04a0824997e2980dc9",
|
||||||
"timestamp": "2026-02-19T02:25:33Z"
|
"timestamp": "2026-02-19T17:21:40Z"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"version": "1.6.5.2",
|
"version": "1.6.5.2",
|
||||||
|
|||||||
Reference in New Issue
Block a user