Compare commits
33 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
73eb30d671 | ||
|
|
2cfbec95c9 | ||
|
|
08fc29cba3 | ||
|
|
0d6b835486 | ||
|
|
bf620e447f | ||
|
|
3117d627dd | ||
|
|
71402f7e86 | ||
|
|
cce202b88d | ||
|
|
1d334e4d95 | ||
|
|
142063ce63 | ||
|
|
1a0050ae1a | ||
|
|
46ebfdbafc | ||
|
|
14d2bb957b | ||
|
|
7a0c1e4488 | ||
|
|
ec0e686e00 | ||
|
|
54395896b3 | ||
|
|
8b2fe59f5a | ||
|
|
a44bf7ebf4 | ||
|
|
1f273906bf | ||
|
|
0534d0458e | ||
|
|
8b0d6f137d | ||
|
|
2208b86a47 | ||
|
|
5a1048687c | ||
|
|
d3f6641158 | ||
|
|
c214a620e4 | ||
|
|
f0c9462878 | ||
|
|
e12a5b56a2 | ||
|
|
51ff0f2623 | ||
|
|
2c907debc8 | ||
|
|
7b30f8c9e9 | ||
|
|
3a90605112 | ||
|
|
5772d670ff | ||
|
|
e558594c52 |
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.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -146,7 +146,7 @@
|
|||||||
Example:
|
Example:
|
||||||
<code>https://your-jellyfin-url/web/#/details?id=<b style="color:red;">your-item-id</b>&serverId=your-server-id</code><br><br>
|
<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
|
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
|
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).
|
resolution succeeded, you will have to look if the bar displays the correct items).
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
@@ -167,7 +167,7 @@
|
|||||||
|
|
||||||
<div style="background-color: rgba(255, 255, 255, 0.05); border-left: 4px solid #00a4dc; border-radius: 4px; padding: 1em 1.5em; margin: 1.5em 0; display: flex; align-items: center; gap: 1em;">
|
<div style="background-color: rgba(255, 255, 255, 0.05); border-left: 4px solid #00a4dc; border-radius: 4px; padding: 1em 1.5em; margin: 1.5em 0; display: flex; align-items: center; gap: 1em;">
|
||||||
<i class="material-icons" style="color: #00a4dc; font-size: 24px;">info</i>
|
<i class="material-icons" style="color: #00a4dc; font-size: 24px;">info</i>
|
||||||
<div>Define rules to automatically select a seasonal selection of items based on the date. Rules are evaluated from top to bottom. The first matching rule wins.</div>
|
<div>Define seasonal rules to automatically select a selection of items based on the date. Rules are evaluated from top to bottom. The first matching rule wins.</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div id="seasonalSectionsList"></div>
|
<div id="seasonalSectionsList"></div>
|
||||||
@@ -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>
|
||||||
@@ -449,7 +449,7 @@
|
|||||||
ApiClient.getPluginConfiguration(MediaBarEnhancedConfigurationPage.pluginId).then(function (config) {
|
ApiClient.getPluginConfiguration(MediaBarEnhancedConfigurationPage.pluginId).then(function (config) {
|
||||||
|
|
||||||
var keys = [
|
var keys = [
|
||||||
'MediaBarIsEnabled', 'ShuffleInterval', 'RetryInterval', 'MinSwipeDistance',
|
'ShuffleInterval', 'RetryInterval', 'MinSwipeDistance',
|
||||||
'LoadingCheckInterval', 'MaxPlotLength', 'MaxMovies', 'MaxTvShows',
|
'LoadingCheckInterval', 'MaxPlotLength', 'MaxMovies', 'MaxTvShows',
|
||||||
'MaxItems', 'PreloadCount', 'FadeTransitionDuration', 'MaxPaginationDots',
|
'MaxItems', 'PreloadCount', 'FadeTransitionDuration', 'MaxPaginationDots',
|
||||||
'SlideAnimationEnabled', 'EnableVideoBackdrop', 'UseSponsorBlock',
|
'SlideAnimationEnabled', 'EnableVideoBackdrop', 'UseSponsorBlock',
|
||||||
@@ -462,6 +462,12 @@
|
|||||||
'IncludeWatchedContent'
|
'IncludeWatchedContent'
|
||||||
];
|
];
|
||||||
|
|
||||||
|
// Manual mapping for MediaBarIsEnabled -> IsEnabled, to avoid conflicts with other plugins
|
||||||
|
var mediaBarEnabledCheckbox = page.querySelector('#MediaBarIsEnabled');
|
||||||
|
if (mediaBarEnabledCheckbox) {
|
||||||
|
mediaBarEnabledCheckbox.checked = config.IsEnabled;
|
||||||
|
}
|
||||||
|
|
||||||
keys.forEach(function (key) {
|
keys.forEach(function (key) {
|
||||||
var el = page.querySelector('#' + key);
|
var el = page.querySelector('#' + key);
|
||||||
if (el) {
|
if (el) {
|
||||||
@@ -539,8 +545,15 @@
|
|||||||
if (seasonalInput) seasonalInput.value = sectionsJson;
|
if (seasonalInput) seasonalInput.value = sectionsJson;
|
||||||
|
|
||||||
var config = {};
|
var config = {};
|
||||||
|
|
||||||
|
// Manual mapping for MediaBarIsEnabled -> IsEnabled, to avoid conflicts with other plugins
|
||||||
|
var mediaBarEnabledCheckbox = page.querySelector('#MediaBarIsEnabled');
|
||||||
|
if (mediaBarEnabledCheckbox) {
|
||||||
|
config.IsEnabled = mediaBarEnabledCheckbox.checked;
|
||||||
|
}
|
||||||
|
|
||||||
var keys = [
|
var keys = [
|
||||||
'MediaBarIsEnabled', 'ShuffleInterval', 'RetryInterval', 'MinSwipeDistance',
|
'ShuffleInterval', 'RetryInterval', 'MinSwipeDistance',
|
||||||
'LoadingCheckInterval', 'MaxPlotLength', 'MaxMovies', 'MaxTvShows',
|
'LoadingCheckInterval', 'MaxPlotLength', 'MaxMovies', 'MaxTvShows',
|
||||||
'MaxItems', 'PreloadCount', 'FadeTransitionDuration', 'MaxPaginationDots',
|
'MaxItems', 'PreloadCount', 'FadeTransitionDuration', 'MaxPaginationDots',
|
||||||
'SlideAnimationEnabled', 'EnableVideoBackdrop', 'UseSponsorBlock',
|
'SlideAnimationEnabled', 'EnableVideoBackdrop', 'UseSponsorBlock',
|
||||||
@@ -627,7 +640,7 @@
|
|||||||
' </div>' +
|
' </div>' +
|
||||||
' </div>' +
|
' </div>' +
|
||||||
' <div class="inputContainer">' +
|
' <div class="inputContainer">' +
|
||||||
' <input is="emby-input" type="text" class="emby-input section-name" value="' + (data.Name || '') + '" />' +
|
' <input is="emby-input" type="text" class="emby-input section-name" style="width: 60%;" value="' + (data.Name || '') + '" />' +
|
||||||
' <div class="fieldDescription">Name of the season</div>' +
|
' <div class="fieldDescription">Name of the season</div>' +
|
||||||
' </div>' +
|
' </div>' +
|
||||||
'</div>' +
|
'</div>' +
|
||||||
|
|||||||
@@ -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.5.0</Version>
|
<Version>1.7.0.2</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;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -63,6 +63,7 @@ const CONFIG = {
|
|||||||
sortOrder: "Ascending",
|
sortOrder: "Ascending",
|
||||||
applyLimitsToCustomIds: false,
|
applyLimitsToCustomIds: false,
|
||||||
seasonalSections: "[]",
|
seasonalSections: "[]",
|
||||||
|
isEnabled: true,
|
||||||
};
|
};
|
||||||
|
|
||||||
// State management
|
// State management
|
||||||
@@ -743,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,
|
||||||
@@ -750,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');
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
@@ -1638,6 +1647,7 @@ const SlideCreator = {
|
|||||||
"data-item-id": itemId,
|
"data-item-id": itemId,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
let videoBackdrop;
|
||||||
let backdrop;
|
let backdrop;
|
||||||
let isVideo = false;
|
let isVideo = false;
|
||||||
let trailerUrl = null;
|
let trailerUrl = null;
|
||||||
@@ -1721,18 +1731,26 @@ const SlideCreator = {
|
|||||||
// 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";
|
||||||
|
|
||||||
backdrop = SlideUtils.createElement("div", {
|
// Create a wrapper for opacity transition
|
||||||
|
videoBackdrop = SlideUtils.createElement("div", {
|
||||||
className: `backdrop video-backdrop ${videoClass}`,
|
className: `backdrop video-backdrop ${videoClass}`,
|
||||||
id: `youtube-player-${itemId}`
|
style: "opacity: 0; transition: opacity 1.2s ease-in-out;" // Start interrupted/transparent
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const ytPlayerDiv = SlideUtils.createElement("div", {
|
||||||
|
id: `youtube-player-${itemId}`,
|
||||||
|
style: "width: 100%; height: 100%;"
|
||||||
|
});
|
||||||
|
|
||||||
|
videoBackdrop.appendChild(ytPlayerDiv);
|
||||||
|
|
||||||
// Initialize YouTube Player
|
// Initialize YouTube Player
|
||||||
SlideUtils.loadYouTubeIframeAPI().then(() => {
|
SlideUtils.loadYouTubeIframeAPI().then(() => {
|
||||||
// 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,
|
||||||
@@ -1741,7 +1759,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
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -1774,17 +1791,25 @@ 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');
|
||||||
|
}
|
||||||
|
|
||||||
// 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;
|
||||||
event.target._videoId = videoId;
|
event.target._videoId = videoId;
|
||||||
|
|
||||||
if (STATE.slideshow.isMuted) {
|
// Store reference to wrapper for fading
|
||||||
event.target.mute();
|
event.target._wrapperDiv = videoBackdrop;
|
||||||
} else {
|
|
||||||
|
// Unmute now if user wants sound.
|
||||||
|
if (!STATE.slideshow.isMuted) {
|
||||||
event.target.unMute();
|
event.target.unMute();
|
||||||
event.target.setVolume(40);
|
event.target.setVolume(40);
|
||||||
}
|
}
|
||||||
@@ -1793,28 +1818,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();
|
||||||
}
|
}
|
||||||
@@ -1822,14 +1853,16 @@ 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) => {
|
||||||
|
// Fade in when playing
|
||||||
|
if (event.data === YT.PlayerState.PLAYING) {
|
||||||
|
if (event.target._wrapperDiv) {
|
||||||
|
event.target._wrapperDiv.style.opacity = "1";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (event.data === YT.PlayerState.ENDED) {
|
if (event.data === YT.PlayerState.ENDED) {
|
||||||
const slide = document.querySelector(`.slide[data-item-id="${itemId}"]`);
|
const slide = document.querySelector(`.slide[data-item-id="${itemId}"]`);
|
||||||
if (slide && slide.classList.contains('active')) {
|
if (slide && slide.classList.contains('active')) {
|
||||||
@@ -1853,22 +1886,24 @@ const SlideCreator = {
|
|||||||
} else if (!isYoutube) {
|
} else if (!isYoutube) {
|
||||||
isVideo = true;
|
isVideo = true;
|
||||||
|
|
||||||
|
const videoSrc = (typeof trailerUrl === 'object' ? trailerUrl.url : trailerUrl);
|
||||||
const videoAttributes = {
|
const videoAttributes = {
|
||||||
className: "backdrop video-backdrop",
|
className: "backdrop video-backdrop",
|
||||||
src: (typeof trailerUrl === 'object' ? trailerUrl.url : trailerUrl),
|
preload: "none",
|
||||||
preload: "auto",
|
|
||||||
disablePictureInPicture: true,
|
disablePictureInPicture: true,
|
||||||
style: "object-fit: cover; object-position: center center; width: 100%; height: 100%; position: absolute; top: 0; left: 0; pointer-events: none;"
|
"data-src": videoSrc,
|
||||||
|
style: "object-fit: cover; object-position: center center; width: 100%; height: 100%; position: absolute; top: 0; left: 0; pointer-events: none; opacity: 0; transition: opacity 1.2s ease-in-out;"
|
||||||
};
|
};
|
||||||
|
|
||||||
videoAttributes.muted = "";
|
videoAttributes.muted = "";
|
||||||
|
videoAttributes.playsinline = ""; // again Safari needs extra treatment...
|
||||||
|
|
||||||
backdrop = SlideUtils.createElement("video", videoAttributes);
|
videoBackdrop = SlideUtils.createElement("video", videoAttributes);
|
||||||
backdrop.volume = 0.4;
|
videoBackdrop.volume = 0.4;
|
||||||
|
|
||||||
STATE.slideshow.videoPlayers[itemId] = backdrop;
|
STATE.slideshow.videoPlayers[itemId] = videoBackdrop;
|
||||||
|
|
||||||
backdrop.addEventListener('play', (event) => {
|
videoBackdrop.addEventListener('play', (event) => {
|
||||||
const slide = document.querySelector(`.slide[data-item-id="${itemId}"]`);
|
const slide = document.querySelector(`.slide[data-item-id="${itemId}"]`);
|
||||||
if (!slide || !slide.classList.contains('active')) {
|
if (!slide || !slide.classList.contains('active')) {
|
||||||
console.log(`Local video ${itemId} started playing but slide is not active, pausing.`);
|
console.log(`Local video ${itemId} started playing but slide is not active, pausing.`);
|
||||||
@@ -1876,19 +1911,23 @@ const SlideCreator = {
|
|||||||
event.target.currentTime = 0;
|
event.target.currentTime = 0;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Fade in
|
||||||
|
event.target.style.opacity = "1";
|
||||||
|
|
||||||
if (CONFIG.waitForTrailerToEnd && STATE.slideshow.slideInterval) {
|
if (CONFIG.waitForTrailerToEnd && STATE.slideshow.slideInterval) {
|
||||||
STATE.slideshow.slideInterval.stop();
|
STATE.slideshow.slideInterval.stop();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
backdrop.addEventListener('ended', (event) => {
|
videoBackdrop.addEventListener('ended', (event) => {
|
||||||
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();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
backdrop.addEventListener('error', (event) => {
|
videoBackdrop.addEventListener('error', (event) => {
|
||||||
console.warn(`Local video error for item ${itemId}`);
|
console.warn(`Local video error for item ${itemId}`);
|
||||||
const slide = event.target.closest('.slide');
|
const slide = event.target.closest('.slide');
|
||||||
if (slide && slide.classList.contains('active')) {
|
if (slide && slide.classList.contains('active')) {
|
||||||
@@ -1898,13 +1937,18 @@ const SlideCreator = {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!isVideo) {
|
// Always create a static backdrop image (to show while video loads or if no video)
|
||||||
backdrop = SlideUtils.createElement("img", {
|
backdrop = SlideUtils.createElement("img", {
|
||||||
className: "backdrop high-quality",
|
className: "backdrop high-quality",
|
||||||
src: this.buildImageUrl(item, "Backdrop", 0, serverAddress, 60),
|
src: this.buildImageUrl(item, "Backdrop", 0, serverAddress, 60),
|
||||||
alt: LocalizationUtils.getLocalizedString('Backdrop', 'Backdrop'),
|
alt: LocalizationUtils.getLocalizedString('Backdrop', 'Backdrop'),
|
||||||
loading: "eager",
|
loading: "eager",
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// If video, static backdrop should be strictly a background (no animation)
|
||||||
|
if (isVideo) {
|
||||||
|
backdrop.style.animation = "none";
|
||||||
|
backdrop.style.transition = "none";
|
||||||
}
|
}
|
||||||
|
|
||||||
const backdropOverlay = SlideUtils.createElement("div", {
|
const backdropOverlay = SlideUtils.createElement("div", {
|
||||||
@@ -1914,8 +1958,14 @@ const SlideCreator = {
|
|||||||
const backdropContainer = SlideUtils.createElement("div", {
|
const backdropContainer = SlideUtils.createElement("div", {
|
||||||
className: "backdrop-container" + (isVideo && CONFIG.fullWidthVideo ? " full-width-video" : ""),
|
className: "backdrop-container" + (isVideo && CONFIG.fullWidthVideo ? " full-width-video" : ""),
|
||||||
});
|
});
|
||||||
|
|
||||||
backdropContainer.append(backdrop, backdropOverlay);
|
backdropContainer.append(backdrop, backdropOverlay);
|
||||||
|
|
||||||
|
// If video exists, append on top of static backdrop
|
||||||
|
if (isVideo && videoBackdrop) {
|
||||||
|
backdropContainer.appendChild(videoBackdrop);
|
||||||
|
}
|
||||||
|
|
||||||
const logo = SlideUtils.createElement("img", {
|
const logo = SlideUtils.createElement("img", {
|
||||||
className: "logo high-quality",
|
className: "logo high-quality",
|
||||||
src: this.buildImageUrl(item, "Logo", undefined, serverAddress, 40),
|
src: this.buildImageUrl(item, "Logo", undefined, serverAddress, 40),
|
||||||
@@ -2356,7 +2406,8 @@ const SlideshowManager = {
|
|||||||
currentSlide.classList.add("active");
|
currentSlide.classList.add("active");
|
||||||
|
|
||||||
// Manage Video Playback: Stop others, Play current
|
// Manage Video Playback: Stop others, Play current
|
||||||
// 1. Stop all other YouTube players and local video elements
|
// 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) {
|
||||||
@@ -2366,15 +2417,22 @@ const SlideshowManager = {
|
|||||||
if (typeof p.pauseVideo === 'function') {
|
if (typeof p.pauseVideo === 'function') {
|
||||||
p.pauseVideo();
|
p.pauseVideo();
|
||||||
}
|
}
|
||||||
// HTML5 <video> element (local trailers)
|
// HTML5 <video> element (local trailers), release HTTP connection
|
||||||
if (p instanceof HTMLVideoElement) {
|
if (p instanceof HTMLVideoElement) {
|
||||||
p.pause();
|
p.pause();
|
||||||
p.muted = true;
|
p.muted = true;
|
||||||
p.currentTime = 0;
|
p.currentTime = 0;
|
||||||
|
// Save src to data-src and release the HTTP streaming connection
|
||||||
|
if (p.src && !p.getAttribute('data-src')) {
|
||||||
|
p.setAttribute('data-src', p.src);
|
||||||
|
}
|
||||||
|
p.removeAttribute('src');
|
||||||
|
p.load();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
}, 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 => {
|
||||||
@@ -2407,15 +2465,18 @@ const SlideshowManager = {
|
|||||||
|
|
||||||
if (videoBackdrop) {
|
if (videoBackdrop) {
|
||||||
if (videoBackdrop.tagName === 'VIDEO') {
|
if (videoBackdrop.tagName === 'VIDEO') {
|
||||||
videoBackdrop.currentTime = 0;
|
// Restore src from data-src if it was deactivated to release connections
|
||||||
|
const lazySrc = videoBackdrop.getAttribute('data-src');
|
||||||
|
const isFreshLoad = lazySrc && !videoBackdrop.src;
|
||||||
|
|
||||||
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`);
|
||||||
@@ -2424,22 +2485,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(() => {
|
||||||
@@ -2605,7 +2685,7 @@ const SlideshowManager = {
|
|||||||
*/
|
*/
|
||||||
pruneSlideCache() {
|
pruneSlideCache() {
|
||||||
const currentIndex = STATE.slideshow.currentSlideIndex;
|
const currentIndex = STATE.slideshow.currentSlideIndex;
|
||||||
const keepRange = 5;
|
const keepRange = CONFIG.preloadCount + 1;
|
||||||
let prunedAny = false;
|
let prunedAny = false;
|
||||||
|
|
||||||
Object.keys(STATE.slideshow.createdSlides).forEach((itemId) => {
|
Object.keys(STATE.slideshow.createdSlides).forEach((itemId) => {
|
||||||
@@ -2623,7 +2703,17 @@ const SlideshowManager = {
|
|||||||
if (STATE.slideshow.videoPlayers[itemId]) {
|
if (STATE.slideshow.videoPlayers[itemId]) {
|
||||||
const player = STATE.slideshow.videoPlayers[itemId];
|
const player = STATE.slideshow.videoPlayers[itemId];
|
||||||
if (typeof player.destroy === 'function') {
|
if (typeof player.destroy === 'function') {
|
||||||
|
// YouTube player
|
||||||
player.destroy();
|
player.destroy();
|
||||||
|
} else if (player instanceof HTMLVideoElement) {
|
||||||
|
// HTML5 video, release HTTP streaming connection
|
||||||
|
player.pause();
|
||||||
|
// Save src to data-src and release the HTTP streaming connection
|
||||||
|
if (player.src && !player.getAttribute('data-src')) {
|
||||||
|
player.setAttribute('data-src', player.src);
|
||||||
|
}
|
||||||
|
player.removeAttribute('src');
|
||||||
|
player.load();
|
||||||
}
|
}
|
||||||
delete STATE.slideshow.videoPlayers[itemId];
|
delete STATE.slideshow.videoPlayers[itemId];
|
||||||
}
|
}
|
||||||
@@ -2802,7 +2892,7 @@ const SlideshowManager = {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
// 2. Stop and mute all HTML5 videos
|
// 2. Stop and mute all HTML5 videos, release connections
|
||||||
const container = document.getElementById("slides-container");
|
const container = document.getElementById("slides-container");
|
||||||
if (container) {
|
if (container) {
|
||||||
container.querySelectorAll('video').forEach(video => {
|
container.querySelectorAll('video').forEach(video => {
|
||||||
@@ -2810,6 +2900,12 @@ const SlideshowManager = {
|
|||||||
video.pause();
|
video.pause();
|
||||||
video.muted = true;
|
video.muted = true;
|
||||||
video.currentTime = 0;
|
video.currentTime = 0;
|
||||||
|
// Save src and release HTTP streaming connection
|
||||||
|
if (video.src && !video.getAttribute('data-src')) {
|
||||||
|
video.setAttribute('data-src', video.src);
|
||||||
|
}
|
||||||
|
video.removeAttribute('src');
|
||||||
|
video.load();
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.warn("Error stopping HTML5 video:", e);
|
console.warn("Error stopping HTML5 video:", e);
|
||||||
}
|
}
|
||||||
@@ -2842,9 +2938,14 @@ const SlideshowManager = {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// HTML5 video: just resume, don't reset currentTime
|
// HTML5 video: restore src if needed, then resume
|
||||||
const html5Video = currentSlide.querySelector('video.video-backdrop');
|
const html5Video = currentSlide.querySelector('video.video-backdrop');
|
||||||
if (html5Video) {
|
if (html5Video) {
|
||||||
|
// Restore src from data-src if it was cleared to release connections
|
||||||
|
const lazySrc = html5Video.getAttribute('data-src');
|
||||||
|
if (lazySrc && !html5Video.src) {
|
||||||
|
html5Video.src = lazySrc;
|
||||||
|
}
|
||||||
html5Video.muted = STATE.slideshow.isMuted;
|
html5Video.muted = STATE.slideshow.isMuted;
|
||||||
if (!STATE.slideshow.isMuted) html5Video.volume = 0.4;
|
if (!STATE.slideshow.isMuted) html5Video.volume = 0.4;
|
||||||
html5Video.play().catch(e => console.warn("Error resuming HTML5 video:", e));
|
html5Video.play().catch(e => console.warn("Error resuming HTML5 video:", e));
|
||||||
@@ -3650,8 +3751,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,28 @@
|
|||||||
"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.5.0",
|
"version": "1.7.0.2",
|
||||||
|
"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)",
|
||||||
|
"targetAbi": "10.11.0.0",
|
||||||
|
"sourceUrl": "https://git.mahom03-spacecloud.de/CodeDevMLH/jellyfin-plugin-media-bar-enhanced/releases/download/v1.6.6.4/Jellyfin.Plugin.MediaBarEnhanced.zip",
|
||||||
|
"checksum": "2c55cf9687e44b04a0824997e2980dc9",
|
||||||
|
"timestamp": "2026-02-19T17:21:40Z"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "1.6.5.2",
|
||||||
"changelog": "- refactored seasonal UI settings",
|
"changelog": "- refactored seasonal UI settings",
|
||||||
"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.5.0/Jellyfin.Plugin.MediaBarEnhanced.zip",
|
"sourceUrl": "https://git.mahom03-spacecloud.de/CodeDevMLH/jellyfin-plugin-media-bar-enhanced/releases/download/v1.6.5.2/Jellyfin.Plugin.MediaBarEnhanced.zip",
|
||||||
"checksum": "378a8465c281c315ed6ad0e683da4755",
|
"checksum": "552cb3376c77ede5a0664ced56bf7d1e",
|
||||||
"timestamp": "2026-02-16T18:38:40Z"
|
"timestamp": "2026-02-16T23:57:57Z"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"version": "1.6.4.1",
|
"version": "1.6.4.1",
|
||||||
|
|||||||
Reference in New Issue
Block a user