Compare commits
51 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
563a1e5484 | ||
|
|
788708370d | ||
|
|
4bb0de11da | ||
|
|
d2abfc6b46 | ||
|
|
8ba14d4df0 | ||
|
|
538138fcf3 | ||
|
|
08efb11d95 | ||
|
|
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 | ||
|
|
ec0e686e00 | ||
|
|
54395896b3 | ||
|
|
8b2fe59f5a |
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.2</Version>
|
<Version>1.7.0.13</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;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
/*
|
/*
|
||||||
* Jellyfin Slideshow by M0RPH3US v4.0.1
|
* Jellyfin Slideshow by M0RPH3US v4.0.1
|
||||||
* Modified by CodeDevMLH
|
* Modified by CodeDevMLH
|
||||||
*
|
*
|
||||||
@@ -124,7 +124,7 @@ const processNextRequest = () => {
|
|||||||
})
|
})
|
||||||
.then(callback)
|
.then(callback)
|
||||||
.catch((error) => {
|
.catch((error) => {
|
||||||
console.error("Error in throttled request:", error);
|
console.error("🎬 Media Bar:", "Error in throttled request:", error);
|
||||||
})
|
})
|
||||||
.finally(() => {
|
.finally(() => {
|
||||||
setTimeout(processNextRequest, 100);
|
setTimeout(processNextRequest, 100);
|
||||||
@@ -158,18 +158,26 @@ const isUserLoggedIn = () => {
|
|||||||
window.ApiClient._serverInfo.AccessToken
|
window.ApiClient._serverInfo.AccessToken
|
||||||
);
|
);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error("Error checking login status:", error);
|
console.error("🎬 Media Bar:", "Error checking login status:", error);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 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
|
||||||
*/
|
*/
|
||||||
const initJellyfinData = (callback) => {
|
const initJellyfinData = (callback) => {
|
||||||
if (!window.ApiClient) {
|
if (!window.ApiClient) {
|
||||||
console.warn("⏳ window.ApiClient is not available yet. Retrying...");
|
console.warn("🎬 Media Bar:", "⏳ window.ApiClient is not available yet. Retrying...");
|
||||||
setTimeout(() => initJellyfinData(callback), CONFIG.retryInterval);
|
setTimeout(() => initJellyfinData(callback), CONFIG.retryInterval);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -190,7 +198,7 @@ const initJellyfinData = (callback) => {
|
|||||||
callback();
|
callback();
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error("Error initializing Jellyfin data:", error);
|
console.error("🎬 Media Bar:", "Error initializing Jellyfin data:", error);
|
||||||
setTimeout(() => initJellyfinData(callback), CONFIG.retryInterval);
|
setTimeout(() => initJellyfinData(callback), CONFIG.retryInterval);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@@ -202,9 +210,9 @@ const initLocalization = async () => {
|
|||||||
try {
|
try {
|
||||||
const locale = await LocalizationUtils.getCurrentLocale();
|
const locale = await LocalizationUtils.getCurrentLocale();
|
||||||
await LocalizationUtils.loadTranslations(locale);
|
await LocalizationUtils.loadTranslations(locale);
|
||||||
console.log("✅ Localization initialized");
|
console.log("🎬 Media Bar:", "✅ Localization initialized");
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error("Error initializing localization:", error);
|
console.error("🎬 Media Bar:", "Error initializing localization:", error);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -324,7 +332,7 @@ const initLoadingScreen = () => {
|
|||||||
* Resets the slideshow state completely
|
* Resets the slideshow state completely
|
||||||
*/
|
*/
|
||||||
const resetSlideshowState = () => {
|
const resetSlideshowState = () => {
|
||||||
console.log("🔄 Resetting slideshow state...");
|
console.log("🎬 Media Bar:", "🔄 Resetting slideshow state...");
|
||||||
|
|
||||||
if (STATE.slideshow.slideInterval) {
|
if (STATE.slideshow.slideInterval) {
|
||||||
STATE.slideshow.slideInterval.stop();
|
STATE.slideshow.slideInterval.stop();
|
||||||
@@ -378,14 +386,14 @@ const startLoginStatusWatcher = () => {
|
|||||||
|
|
||||||
if (isLoggedIn !== wasLoggedIn) {
|
if (isLoggedIn !== wasLoggedIn) {
|
||||||
if (isLoggedIn) {
|
if (isLoggedIn) {
|
||||||
console.log("👤 User logged in. Initializing slideshow...");
|
console.log("🎬 Media Bar:", "👤 User logged in. Initializing slideshow...");
|
||||||
if (!STATE.slideshow.hasInitialized) {
|
if (!STATE.slideshow.hasInitialized) {
|
||||||
waitForApiClientAndInitialize();
|
waitForApiClientAndInitialize();
|
||||||
} else {
|
} else {
|
||||||
console.log("🔄 Slideshow already initialized, skipping");
|
console.log("🎬 Media Bar:", "🔄 Slideshow already initialized, skipping");
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
console.log("👋 User logged out. Stopping slideshow...");
|
console.log("🎬 Media Bar:", "👋 User logged out. Stopping slideshow...");
|
||||||
resetSlideshowState();
|
resetSlideshowState();
|
||||||
}
|
}
|
||||||
wasLoggedIn = isLoggedIn;
|
wasLoggedIn = isLoggedIn;
|
||||||
@@ -403,7 +411,7 @@ const waitForApiClientAndInitialize = () => {
|
|||||||
|
|
||||||
window.slideshowCheckInterval = setInterval(() => {
|
window.slideshowCheckInterval = setInterval(() => {
|
||||||
if (!window.ApiClient) {
|
if (!window.ApiClient) {
|
||||||
console.log("⏳ ApiClient not available yet. Waiting...");
|
console.log("🎬 Media Bar:", "⏳ ApiClient not available yet. Waiting...");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -413,23 +421,23 @@ const waitForApiClientAndInitialize = () => {
|
|||||||
window.ApiClient._serverInfo &&
|
window.ApiClient._serverInfo &&
|
||||||
window.ApiClient._serverInfo.AccessToken
|
window.ApiClient._serverInfo.AccessToken
|
||||||
) {
|
) {
|
||||||
console.log(
|
console.log("🎬 Media Bar:",
|
||||||
"🔓 User is fully logged in. Starting slideshow initialization..."
|
"🔓 User is fully logged in. Starting slideshow initialization..."
|
||||||
);
|
);
|
||||||
clearInterval(window.slideshowCheckInterval);
|
clearInterval(window.slideshowCheckInterval);
|
||||||
|
|
||||||
if (!STATE.slideshow.hasInitialized) {
|
if (!STATE.slideshow.hasInitialized) {
|
||||||
initJellyfinData(async () => {
|
initJellyfinData(async () => {
|
||||||
console.log("✅ Jellyfin API client initialized successfully");
|
console.log("🎬 Media Bar:", "✅ Jellyfin API client initialized successfully");
|
||||||
await initLocalization();
|
await initLocalization();
|
||||||
await fetchPluginConfig();
|
await fetchPluginConfig();
|
||||||
slidesInit();
|
slidesInit();
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
console.log("🔄 Slideshow already initialized, skipping");
|
console.log("🎬 Media Bar:", "🔄 Slideshow already initialized, skipping");
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
console.log(
|
console.log("🎬 Media Bar:",
|
||||||
"🔒 Authentication incomplete. Waiting for complete login..."
|
"🔒 Authentication incomplete. Waiting for complete login..."
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -460,11 +468,11 @@ const fetchPluginConfig = async () => {
|
|||||||
// Sync to LocalStorage for next load
|
// Sync to LocalStorage for next load
|
||||||
localStorage.setItem('mediaBarEnhanced-enableLoadingScreen', CONFIG.enableLoadingScreen);
|
localStorage.setItem('mediaBarEnhanced-enableLoadingScreen', CONFIG.enableLoadingScreen);
|
||||||
|
|
||||||
console.log("✅ MediaBarEnhanced config loaded", CONFIG);
|
console.log("🎬 Media Bar:", "✅ MediaBarEnhanced config loaded", CONFIG);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.error("Failed to load MediaBarEnhanced config", e);
|
console.error("🎬 Media Bar:", "Failed to load MediaBarEnhanced config", e);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -730,20 +738,25 @@ const SlideUtils = {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.warn("Invalid URL for modal:", url);
|
console.warn("🎬 Media Bar:", "Invalid URL for modal:", url);
|
||||||
}
|
}
|
||||||
|
|
||||||
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',
|
||||||
|
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
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@@ -809,7 +821,7 @@ const LocalizationUtils = {
|
|||||||
locale = localStorage.getItem("language").toLowerCase();
|
locale = localStorage.getItem("language").toLowerCase();
|
||||||
}
|
}
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.warn("Could not access localStorage for language:", e);
|
console.warn("🎬 Media Bar:", "Could not access localStorage for language:", e);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!locale) {
|
if (!locale) {
|
||||||
@@ -835,7 +847,7 @@ const LocalizationUtils = {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.warn("Could not fetch user audio language preference:", error);
|
console.warn("🎬 Media Bar:", "Could not fetch user audio language preference:", error);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -855,7 +867,7 @@ const LocalizationUtils = {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.warn("Could not fetch server metadata language preference:", error);
|
console.warn("🎬 Media Bar:", "Could not fetch server metadata language preference:", error);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -900,7 +912,7 @@ const LocalizationUtils = {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.warn("Error checking performance entries:", e);
|
console.warn("🎬 Media Bar:", "Error checking performance entries:", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -965,7 +977,7 @@ const LocalizationUtils = {
|
|||||||
this.translations[locale] = JSON.parse(jsonString);
|
this.translations[locale] = JSON.parse(jsonString);
|
||||||
return;
|
return;
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.error('Failed to parse JSON from standard extraction.');
|
console.error("🎬 Media Bar:", 'Failed to parse JSON from standard extraction.');
|
||||||
// Try alternative extraction below
|
// Try alternative extraction below
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -977,7 +989,7 @@ const LocalizationUtils = {
|
|||||||
this.translations[locale] = JSON.parse(jsonString);
|
this.translations[locale] = JSON.parse(jsonString);
|
||||||
return;
|
return;
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.error('Failed to parse JSON from direct extraction.');
|
console.error("🎬 Media Bar:", 'Failed to parse JSON from direct extraction.');
|
||||||
// Try direct extraction
|
// Try direct extraction
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -991,11 +1003,11 @@ const LocalizationUtils = {
|
|||||||
this.translations[locale] = JSON.parse(jsonString);
|
this.translations[locale] = JSON.parse(jsonString);
|
||||||
return;
|
return;
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.error("Failed to parse JSON from chunk:", e);
|
console.error("🎬 Media Bar:", "Failed to parse JSON from chunk:", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error("Error loading translations:", error);
|
console.error("🎬 Media Bar:", "Error loading translations:", error);
|
||||||
} finally {
|
} finally {
|
||||||
delete this.isLoading[locale];
|
delete this.isLoading[locale];
|
||||||
}
|
}
|
||||||
@@ -1059,38 +1071,11 @@ const ApiUtils = {
|
|||||||
|
|
||||||
return itemData;
|
return itemData;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error(`Error fetching details for item ${itemId}:`, error);
|
console.error("🎬 Media Bar:", `Error fetching details for item ${itemId}:`, error);
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
/**
|
|
||||||
* Fetch item IDs from the list file
|
|
||||||
* @returns {Promise<Array>} Array of item IDs
|
|
||||||
*/
|
|
||||||
// MARK: LIST FILE
|
|
||||||
async fetchItemIdsFromList() {
|
|
||||||
try {
|
|
||||||
const listFileName = `${STATE.jellyfinData.serverAddress}/web/avatars/list.txt?userId=${STATE.jellyfinData.userId}`;
|
|
||||||
const response = await fetch(listFileName);
|
|
||||||
|
|
||||||
if (!response.ok) {
|
|
||||||
console.warn("list.txt not found or inaccessible. Using random items.");
|
|
||||||
return [];
|
|
||||||
}
|
|
||||||
|
|
||||||
const text = await response.text();
|
|
||||||
return text
|
|
||||||
.split("\n")
|
|
||||||
.map((id) => id.trim())
|
|
||||||
.filter((id) => id)
|
|
||||||
.slice(1);
|
|
||||||
} catch (error) {
|
|
||||||
console.error("Error fetching list.txt:", error);
|
|
||||||
return [];
|
|
||||||
}
|
|
||||||
},
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Fetches random items from the server
|
* Fetches random items from the server
|
||||||
* @returns {Promise<Array>} Array of item objects
|
* @returns {Promise<Array>} Array of item objects
|
||||||
@@ -1101,7 +1086,7 @@ const ApiUtils = {
|
|||||||
!STATE.jellyfinData.accessToken ||
|
!STATE.jellyfinData.accessToken ||
|
||||||
STATE.jellyfinData.accessToken === "Not Found"
|
STATE.jellyfinData.accessToken === "Not Found"
|
||||||
) {
|
) {
|
||||||
console.warn("Access token not available. Delaying API request...");
|
console.warn("🎬 Media Bar:", "Access token not available. Delaying API request...");
|
||||||
return [];
|
return [];
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1109,11 +1094,11 @@ const ApiUtils = {
|
|||||||
!STATE.jellyfinData.serverAddress ||
|
!STATE.jellyfinData.serverAddress ||
|
||||||
STATE.jellyfinData.serverAddress === "Not Found"
|
STATE.jellyfinData.serverAddress === "Not Found"
|
||||||
) {
|
) {
|
||||||
console.warn("Server address not available. Delaying API request...");
|
console.warn("🎬 Media Bar:", "Server address not available. Delaying API request...");
|
||||||
return [];
|
return [];
|
||||||
}
|
}
|
||||||
|
|
||||||
console.log("Fetching random items from server...");
|
console.log("🎬 Media Bar:", "Fetching random items from server...");
|
||||||
|
|
||||||
let sortParams = `sortBy=${CONFIG.sortBy}`;
|
let sortParams = `sortBy=${CONFIG.sortBy}`;
|
||||||
|
|
||||||
@@ -1134,7 +1119,7 @@ const ApiUtils = {
|
|||||||
);
|
);
|
||||||
|
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
console.error(
|
console.error("🎬 Media Bar:",
|
||||||
`Failed to fetch items: ${response.status} ${response.statusText}`
|
`Failed to fetch items: ${response.status} ${response.statusText}`
|
||||||
);
|
);
|
||||||
return [];
|
return [];
|
||||||
@@ -1143,13 +1128,13 @@ const ApiUtils = {
|
|||||||
const data = await response.json();
|
const data = await response.json();
|
||||||
const items = data.Items || [];
|
const items = data.Items || [];
|
||||||
|
|
||||||
console.log(
|
console.log("🎬 Media Bar:",
|
||||||
`Successfully fetched ${items.length} random items from server`
|
`Successfully fetched ${items.length} random items from server`
|
||||||
);
|
);
|
||||||
|
|
||||||
return items.map((item) => item.Id);
|
return items.map((item) => item.Id);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error("Error fetching item IDs:", error);
|
console.error("🎬 Media Bar:", "Error fetching item IDs:", error);
|
||||||
return [];
|
return [];
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -1173,7 +1158,7 @@ const ApiUtils = {
|
|||||||
try {
|
try {
|
||||||
const sessionId = await this.getSessionId();
|
const sessionId = await this.getSessionId();
|
||||||
if (!sessionId) {
|
if (!sessionId) {
|
||||||
console.error("Session ID not found.");
|
console.error("🎬 Media Bar:", "Session ID not found.");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1189,10 +1174,10 @@ const ApiUtils = {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
console.log("Play command sent successfully to session:", sessionId);
|
console.log("🎬 Media Bar:", "Play command sent successfully to session:", sessionId);
|
||||||
return true;
|
return true;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error("Error sending play command:", error);
|
console.error("🎬 Media Bar:", "Error sending play command:", error);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -1218,7 +1203,7 @@ const ApiUtils = {
|
|||||||
const sessions = await response.json();
|
const sessions = await response.json();
|
||||||
|
|
||||||
if (!sessions || sessions.length === 0) {
|
if (!sessions || sessions.length === 0) {
|
||||||
console.warn(
|
console.warn("🎬 Media Bar:",
|
||||||
"No sessions found for deviceId:",
|
"No sessions found for deviceId:",
|
||||||
STATE.jellyfinData.deviceId
|
STATE.jellyfinData.deviceId
|
||||||
);
|
);
|
||||||
@@ -1227,7 +1212,7 @@ const ApiUtils = {
|
|||||||
|
|
||||||
return sessions[0].Id;
|
return sessions[0].Id;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error("Error fetching session data:", error);
|
console.error("🎬 Media Bar:", "Error fetching session data:", error);
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -1255,7 +1240,7 @@ const ApiUtils = {
|
|||||||
}
|
}
|
||||||
button.classList.toggle("favorited", !isFavorite);
|
button.classList.toggle("favorited", !isFavorite);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error("Error toggling favorite:", error);
|
console.error("🎬 Media Bar:", "Error toggling favorite:", error);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -1297,7 +1282,7 @@ const ApiUtils = {
|
|||||||
this._sponsorBlockCache[videoId] = result;
|
this._sponsorBlockCache[videoId] = result;
|
||||||
return result;
|
return result;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.warn('Error fetching SponsorBlock data:', error);
|
console.warn("🎬 Media Bar:", 'Error fetching SponsorBlock data:', error);
|
||||||
return { intro: null, outro: null };
|
return { intro: null, outro: null };
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -1317,7 +1302,7 @@ const ApiUtils = {
|
|||||||
);
|
);
|
||||||
|
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
console.warn(`Failed to search for '${name}'`);
|
console.warn("🎬 Media Bar:", `Failed to search for '${name}'`);
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1327,7 +1312,7 @@ const ApiUtils = {
|
|||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error(`Error searching for '${name}':`, error);
|
console.error("🎬 Media Bar:", `Error searching for '${name}':`, error);
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -1347,16 +1332,16 @@ const ApiUtils = {
|
|||||||
);
|
);
|
||||||
|
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
console.warn(`Failed to fetch collection items for ${collectionId}`);
|
console.warn("🎬 Media Bar:", `Failed to fetch collection items for ${collectionId}`);
|
||||||
return [];
|
return [];
|
||||||
}
|
}
|
||||||
|
|
||||||
const data = await response.json();
|
const data = await response.json();
|
||||||
const items = data.Items || [];
|
const items = data.Items || [];
|
||||||
console.log(`Resolved collection ${collectionId} to ${items.length} items`);
|
console.log("🎬 Media Bar:", `Resolved collection ${collectionId} to ${items.length} items`);
|
||||||
return items.map(i => ({ Id: i.Id, Type: i.Type }));
|
return items.map(i => ({ Id: i.Id, Type: i.Type }));
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error(`Error fetching collection items for ${collectionId}:`, error);
|
console.error("🎬 Media Bar:", `Error fetching collection items for ${collectionId}:`, error);
|
||||||
return [];
|
return [];
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -1386,7 +1371,7 @@ const ApiUtils = {
|
|||||||
if (CONFIG.randomizeLocalTrailers && trailers.length > 1) {
|
if (CONFIG.randomizeLocalTrailers && trailers.length > 1) {
|
||||||
const randomIndex = Math.floor(Math.random() * trailers.length);
|
const randomIndex = Math.floor(Math.random() * trailers.length);
|
||||||
trailer = trailers[randomIndex];
|
trailer = trailers[randomIndex];
|
||||||
console.log(`Using random local trailer (${randomIndex + 1}/${trailers.length}) for ${itemId}: ${trailer.Name}`);
|
console.log("🎬 Media Bar:", `Using random local trailer (${randomIndex + 1}/${trailers.length}) for ${itemId}: ${trailer.Name}`);
|
||||||
} else {
|
} else {
|
||||||
trailer = trailers[0];
|
trailer = trailers[0];
|
||||||
}
|
}
|
||||||
@@ -1395,12 +1380,12 @@ 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;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error(`Error fetching local trailer for ${itemId}:`, error);
|
console.error("🎬 Media Bar:", `Error fetching local trailer for ${itemId}:`, error);
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -1426,21 +1411,21 @@ const ApiUtils = {
|
|||||||
if (CONFIG.randomizeThemeVideos && items.length > 1) {
|
if (CONFIG.randomizeThemeVideos && items.length > 1) {
|
||||||
const randomIndex = Math.floor(Math.random() * items.length);
|
const randomIndex = Math.floor(Math.random() * items.length);
|
||||||
video = items[randomIndex];
|
video = items[randomIndex];
|
||||||
console.log(`Found Theme Video (Random ${randomIndex + 1}/${items.length}) via ThemeVideos endpoint: ${video.Name} (${video.Id})`);
|
console.log("🎬 Media Bar:", `Found Theme Video (Random ${randomIndex + 1}/${items.length}) via ThemeVideos endpoint: ${video.Name} (${video.Id})`);
|
||||||
} else {
|
} else {
|
||||||
video = items[0];
|
video = items[0];
|
||||||
console.log(`Found Theme Video (First) via ThemeVideos endpoint: ${video.Name} (${video.Id})`);
|
console.log("🎬 Media Bar:", `Found Theme Video (First) via ThemeVideos endpoint: ${video.Name} (${video.Id})`);
|
||||||
}
|
}
|
||||||
|
|
||||||
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`
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error(`Error fetching theme videos for ${itemId}:`, error);
|
console.error("🎬 Media Bar:", `Error fetching theme videos for ${itemId}:`, error);
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1624,7 +1609,7 @@ const SlideCreator = {
|
|||||||
*/
|
*/
|
||||||
createSlideElement(item, title) {
|
createSlideElement(item, title) {
|
||||||
if (!item || !item.Id) {
|
if (!item || !item.Id) {
|
||||||
console.error("Invalid item data:", item);
|
console.error("🎬 Media Bar:", "Invalid item data:", item);
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1656,27 +1641,27 @@ const SlideCreator = {
|
|||||||
|
|
||||||
if (guidMatch) {
|
if (guidMatch) {
|
||||||
const videoId = guidMatch[1];
|
const videoId = guidMatch[1];
|
||||||
console.log(`Using custom local video ID for ${itemId}: ${videoId}`);
|
console.log("🎬 Media Bar:", `Using custom local video ID for ${itemId}: ${videoId}`);
|
||||||
|
|
||||||
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.)
|
||||||
trailerUrl = customValue;
|
trailerUrl = customValue;
|
||||||
console.log(`Using custom trailer URL for ${itemId}: ${trailerUrl}`);
|
console.log("🎬 Media Bar:", `Using custom trailer URL for ${itemId}: ${trailerUrl}`);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// 1b. Check Theme Video if preferred (Local Backdrop)
|
// 1b. Check Theme Video if preferred (Local Backdrop)
|
||||||
else if (CONFIG.preferLocalBackdrops && item.themeVideoUrl) {
|
else if (CONFIG.preferLocalBackdrops && item.themeVideoUrl) {
|
||||||
trailerUrl = item.themeVideoUrl;
|
trailerUrl = item.themeVideoUrl;
|
||||||
console.log(`Using theme video (local backdrop) for ${itemId}: ${trailerUrl.url || trailerUrl}`);
|
console.log("🎬 Media Bar:", `Using theme video (local backdrop) for ${itemId}: ${trailerUrl.url || trailerUrl}`);
|
||||||
}
|
}
|
||||||
// 1c. Check Local Trailer if preferred
|
// 1c. Check Local Trailer if preferred
|
||||||
else if (CONFIG.preferLocalTrailers && item.LocalTrailerCount > 0 && item.localTrailerUrl) {
|
else if (CONFIG.preferLocalTrailers && item.LocalTrailerCount > 0 && item.localTrailerUrl) {
|
||||||
trailerUrl = item.localTrailerUrl;
|
trailerUrl = item.localTrailerUrl;
|
||||||
console.log(`Using local trailer for ${itemId}: ${trailerUrl}`);
|
console.log("🎬 Media Bar:", `Using local trailer for ${itemId}: ${trailerUrl}`);
|
||||||
}
|
}
|
||||||
// 1d. Fallback to Remote Trailer
|
// 1d. Fallback to Remote Trailer
|
||||||
else if (item.RemoteTrailers && item.RemoteTrailers.length > 0) {
|
else if (item.RemoteTrailers && item.RemoteTrailers.length > 0) {
|
||||||
@@ -1685,10 +1670,10 @@ const SlideCreator = {
|
|||||||
// 1e. Final Fallback to Local Trailer (even if not preferred)
|
// 1e. Final Fallback to Local Trailer (even if not preferred)
|
||||||
else if (item.LocalTrailerCount > 0 && item.localTrailerUrl) {
|
else if (item.LocalTrailerCount > 0 && item.localTrailerUrl) {
|
||||||
trailerUrl = item.localTrailerUrl;
|
trailerUrl = item.localTrailerUrl;
|
||||||
console.log(`Using local trailer fallback for ${itemId}: ${trailerUrl}`);
|
console.log("🎬 Media Bar:", `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);
|
||||||
@@ -1715,10 +1700,15 @@ const SlideCreator = {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.warn("Invalid trailer URL:", trailerUrl);
|
console.warn("🎬 Media Bar:", "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 +1719,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",
|
||||||
|
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 +1746,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
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -1773,17 +1767,14 @@ const SlideCreator = {
|
|||||||
// Apply SponsorBlock start/end times
|
// Apply SponsorBlock start/end times
|
||||||
if (segments.intro) {
|
if (segments.intro) {
|
||||||
playerVars.start = Math.ceil(segments.intro[1]);
|
playerVars.start = Math.ceil(segments.intro[1]);
|
||||||
console.info(`SponsorBlock intro detected for video ${videoId}: skipping to ${playerVars.start}s`);
|
console.info("🎬 Media Bar:", `SponsorBlock intro detected for video ${videoId}: skipping to ${playerVars.start}s`);
|
||||||
}
|
}
|
||||||
if (segments.outro) {
|
if (segments.outro) {
|
||||||
playerVars.end = Math.floor(segments.outro[0]);
|
playerVars.end = Math.floor(segments.outro[0]);
|
||||||
console.info(`SponsorBlock outro detected for video ${videoId}: ending at ${playerVars.end}s`);
|
console.info("🎬 Media Bar:", `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) => {
|
||||||
@@ -1818,16 +1809,16 @@ const SlideCreator = {
|
|||||||
// Re-check conditions before processing fallback
|
// 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("🎬 Media Bar:", `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("🎬 Media Bar:", "Error stopping video in timeout:", e); }
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (event.target.getPlayerState() !== YT.PlayerState.PLAYING &&
|
if (event.target.getPlayerState() !== YT.PlayerState.PLAYING &&
|
||||||
event.target.getPlayerState() !== YT.PlayerState.BUFFERING) {
|
event.target.getPlayerState() !== YT.PlayerState.BUFFERING) {
|
||||||
console.warn(`Autoplay blocked for ${itemId}, attempting muted fallback`);
|
console.warn("🎬 Media Bar:", `Autoplay blocked for ${itemId}, attempting muted fallback`);
|
||||||
event.target.mute();
|
event.target.mute();
|
||||||
event.target.playVideo();
|
event.target.playVideo();
|
||||||
}
|
}
|
||||||
@@ -1858,7 +1849,7 @@ const SlideCreator = {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
'onError': (event) => {
|
'onError': (event) => {
|
||||||
console.warn(`YouTube player error ${event.data} for video ${videoId}`);
|
console.warn("🎬 Media Bar:", `YouTube player error ${event.data} for video ${videoId}`);
|
||||||
// Fallback to next slide on error
|
// Fallback to next slide on error
|
||||||
if (CONFIG.waitForTrailerToEnd) {
|
if (CONFIG.waitForTrailerToEnd) {
|
||||||
SlideshowManager.nextSlide();
|
SlideshowManager.nextSlide();
|
||||||
@@ -1870,7 +1861,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);
|
||||||
@@ -1892,7 +1883,7 @@ const SlideCreator = {
|
|||||||
videoBackdrop.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("🎬 Media Bar:", `Local video ${itemId} started playing but slide is not active, pausing.`);
|
||||||
event.target.pause();
|
event.target.pause();
|
||||||
event.target.currentTime = 0;
|
event.target.currentTime = 0;
|
||||||
return;
|
return;
|
||||||
@@ -1914,7 +1905,7 @@ const SlideCreator = {
|
|||||||
});
|
});
|
||||||
|
|
||||||
videoBackdrop.addEventListener('error', (event) => {
|
videoBackdrop.addEventListener('error', (event) => {
|
||||||
console.warn(`Local video error for item ${itemId}`);
|
console.warn("🎬 Media Bar:", `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')) {
|
||||||
SlideshowManager.nextSlide();
|
SlideshowManager.nextSlide();
|
||||||
@@ -2277,7 +2268,7 @@ const SlideCreator = {
|
|||||||
|
|
||||||
return slideElement;
|
return slideElement;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error("Error creating slide for item:", error, itemId);
|
console.error("🎬 Media Bar:", "Error creating slide for item:", error, itemId);
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -2376,7 +2367,7 @@ const SlideshowManager = {
|
|||||||
this.upgradeSlideImageQuality(currentSlide);
|
this.upgradeSlideImageQuality(currentSlide);
|
||||||
|
|
||||||
if (!currentSlide) {
|
if (!currentSlide) {
|
||||||
console.error(`Failed to create slide for item ${currentItemId}`);
|
console.error("🎬 Media Bar:", `Failed to create slide for item ${currentItemId}`);
|
||||||
STATE.slideshow.isTransitioning = false;
|
STATE.slideshow.isTransitioning = false;
|
||||||
setTimeout(() => this.nextSlide(), 500);
|
setTimeout(() => this.nextSlide(), 500);
|
||||||
return;
|
return;
|
||||||
@@ -2468,9 +2459,9 @@ const SlideshowManager = {
|
|||||||
// Check if it actually started playing after a short delay (handling autoplay blocks)
|
// 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("🎬 Media Bar:", `Autoplay blocked for ${currentItemId}, attempting muted fallback`);
|
||||||
videoBackdrop.muted = true;
|
videoBackdrop.muted = true;
|
||||||
videoBackdrop.play().catch(err => console.error("Muted fallback failed", err));
|
videoBackdrop.play().catch(err => console.error("🎬 Media Bar:", "Muted fallback failed", err));
|
||||||
}
|
}
|
||||||
}, 1000);
|
}, 1000);
|
||||||
});
|
});
|
||||||
@@ -2497,7 +2488,7 @@ const SlideshowManager = {
|
|||||||
if (player.getPlayerState &&
|
if (player.getPlayerState &&
|
||||||
player.getPlayerState() !== YT.PlayerState.PLAYING &&
|
player.getPlayerState() !== YT.PlayerState.PLAYING &&
|
||||||
player.getPlayerState() !== YT.PlayerState.BUFFERING) {
|
player.getPlayerState() !== YT.PlayerState.BUFFERING) {
|
||||||
console.log("YouTube loadVideoById didn't start playback, retrying muted...");
|
console.log("🎬 Media Bar:", "YouTube loadVideoById didn't start playback, retrying muted...");
|
||||||
player.mute();
|
player.mute();
|
||||||
player.playVideo();
|
player.playVideo();
|
||||||
}
|
}
|
||||||
@@ -2556,13 +2547,13 @@ const SlideshowManager = {
|
|||||||
|
|
||||||
this.pruneSlideCache();
|
this.pruneSlideCache();
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error("Error updating current slide:", error);
|
console.error("🎬 Media Bar:", "Error updating current slide:", error);
|
||||||
} finally {
|
} finally {
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
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 +2594,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
|
||||||
@@ -2698,7 +2691,7 @@ const SlideshowManager = {
|
|||||||
delete STATE.slideshow.createdSlides[itemId];
|
delete STATE.slideshow.createdSlides[itemId];
|
||||||
prunedAny = true;
|
prunedAny = true;
|
||||||
|
|
||||||
console.log(`Pruned slide ${itemId} at distance ${distance} from view`);
|
console.log("🎬 Media Bar:", `Pruned slide ${itemId} at distance ${distance} from view`);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -2745,7 +2738,7 @@ const SlideshowManager = {
|
|||||||
}
|
}
|
||||||
|
|
||||||
video.play().catch(error => {
|
video.play().catch(error => {
|
||||||
console.warn("Unmuted play blocked, reverting to muted...");
|
console.warn("🎬 Media Bar:", "Unmuted play blocked, reverting to muted...");
|
||||||
STATE.slideshow.isMuted = true;
|
STATE.slideshow.isMuted = true;
|
||||||
video.muted = true;
|
video.muted = true;
|
||||||
video.play();
|
video.play();
|
||||||
@@ -2766,7 +2759,7 @@ const SlideshowManager = {
|
|||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
const state = player.getPlayerState();
|
const state = player.getPlayerState();
|
||||||
if (state === 2) {
|
if (state === 2) {
|
||||||
console.log("Video was paused after unmute...");
|
console.log("🎬 Media Bar:", "Video was paused after unmute...");
|
||||||
STATE.slideshow.isMuted = true;
|
STATE.slideshow.isMuted = true;
|
||||||
player.mute();
|
player.mute();
|
||||||
player.playVideo();
|
player.playVideo();
|
||||||
@@ -2857,7 +2850,7 @@ const SlideshowManager = {
|
|||||||
player.pauseVideo();
|
player.pauseVideo();
|
||||||
}
|
}
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.warn("Error pausing/stopping YouTube player:", e);
|
console.warn("🎬 Media Bar:", "Error pausing/stopping YouTube player:", e);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -2877,7 +2870,7 @@ const SlideshowManager = {
|
|||||||
video.removeAttribute('src');
|
video.removeAttribute('src');
|
||||||
video.load();
|
video.load();
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.warn("Error stopping HTML5 video:", e);
|
console.warn("🎬 Media Bar:", "Error stopping HTML5 video:", e);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -2918,7 +2911,7 @@ const SlideshowManager = {
|
|||||||
}
|
}
|
||||||
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("🎬 Media Bar:", "Error resuming HTML5 video:", e));
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -3120,14 +3113,14 @@ const SlideshowManager = {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (isInRange) {
|
if (isInRange) {
|
||||||
console.log(`Seasonal match found: ${section.Name}`);
|
console.log("🎬 Media Bar:", `Seasonal match found: ${section.Name}`);
|
||||||
idsString = section.MediaIds;
|
idsString = section.MediaIds;
|
||||||
usingSeasonal = true;
|
usingSeasonal = true;
|
||||||
break; // Use first matching season
|
break; // Use first matching season
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.error("Error parsing seasonal sections in JS:", e);
|
console.error("🎬 Media Bar:", "Error parsing seasonal sections in JS:", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -3185,14 +3178,14 @@ const SlideshowManager = {
|
|||||||
if (guidMatch) {
|
if (guidMatch) {
|
||||||
id = guidMatch[1];
|
id = guidMatch[1];
|
||||||
} else {
|
} else {
|
||||||
console.log(`Input '${rawId}' is not a GUID, searching for Collection/Playlist by name...`);
|
console.log("🎬 Media Bar:", `Input '${rawId}' is not a GUID, searching for Collection/Playlist by name...`);
|
||||||
const resolvedId = await ApiUtils.findCollectionOrPlaylistByName(rawId);
|
const resolvedId = await ApiUtils.findCollectionOrPlaylistByName(rawId);
|
||||||
|
|
||||||
if (resolvedId) {
|
if (resolvedId) {
|
||||||
console.log(`Resolved name '${rawId}' to ID: ${resolvedId}`);
|
console.log("🎬 Media Bar:", `Resolved name '${rawId}' to ID: ${resolvedId}`);
|
||||||
id = resolvedId;
|
id = resolvedId;
|
||||||
} else {
|
} else {
|
||||||
console.warn(`Could not find Collection or Playlist with name: '${rawId}'`);
|
console.warn("🎬 Media Bar:", `Could not find Collection or Playlist with name: '${rawId}'`);
|
||||||
continue; // Skip if resolution failed
|
continue; // Skip if resolution failed
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -3200,14 +3193,14 @@ const SlideshowManager = {
|
|||||||
|
|
||||||
const item = await ApiUtils.fetchItemDetails(id);
|
const item = await ApiUtils.fetchItemDetails(id);
|
||||||
if (item && (item.Type === 'BoxSet' || item.Type === 'Playlist')) {
|
if (item && (item.Type === 'BoxSet' || item.Type === 'Playlist')) {
|
||||||
console.log(`Found Collection/Playlist: ${id} (${item.Type}), fetching children...`);
|
console.log("🎬 Media Bar:", `Found Collection/Playlist: ${id} (${item.Type}), fetching children...`);
|
||||||
const children = await ApiUtils.fetchCollectionItems(id);
|
const children = await ApiUtils.fetchCollectionItems(id);
|
||||||
finalIds.push(...children);
|
finalIds.push(...children);
|
||||||
} else if (item) {
|
} else if (item) {
|
||||||
finalIds.push({ Id: item.Id, Type: item.Type });
|
finalIds.push({ Id: item.Id, Type: item.Type });
|
||||||
}
|
}
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.warn(`Error resolving item ${rawId}:`, e);
|
console.warn("🎬 Media Bar:", `Error resolving item ${rawId}:`, e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return finalIds;
|
return finalIds;
|
||||||
@@ -3223,7 +3216,7 @@ const SlideshowManager = {
|
|||||||
|
|
||||||
// 1. Try Custom Media/Collection IDs from Config & seasonal content
|
// 1. Try Custom Media/Collection IDs from Config & seasonal content
|
||||||
if (CONFIG.enableCustomMediaIds || CONFIG.enableSeasonalContent) {
|
if (CONFIG.enableCustomMediaIds || CONFIG.enableSeasonalContent) {
|
||||||
console.log("Using Custom Media IDs from configuration");
|
console.log("🎬 Media Bar:", "Using Custom Media IDs from configuration");
|
||||||
const rawIds = this.parseCustomIds();
|
const rawIds = this.parseCustomIds();
|
||||||
const resolvedItems = await this.resolveCollectionsAndItems(rawIds);
|
const resolvedItems = await this.resolveCollectionsAndItems(rawIds);
|
||||||
|
|
||||||
@@ -3253,20 +3246,15 @@ const SlideshowManager = {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
itemIds = keptItems.map(i => i.Id);
|
itemIds = keptItems.map(i => i.Id);
|
||||||
console.log(`Applied limits to custom IDs: ${itemIds.length} items (Movies: ${movieCount}, Shows: ${showCount})`);
|
console.log("🎬 Media Bar:", `Applied limits to custom IDs: ${itemIds.length} items (Movies: ${movieCount}, Shows: ${showCount})`);
|
||||||
} else {
|
} else {
|
||||||
itemIds = resolvedItems.map(i => i.Id);
|
itemIds = resolvedItems.map(i => i.Id);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 2. Try Avatar List (list.txt)
|
// 2. Fallback to server query (Random)
|
||||||
if (itemIds.length === 0) {
|
if (itemIds.length === 0) {
|
||||||
itemIds = await ApiUtils.fetchItemIdsFromList();
|
console.log("🎬 Media Bar:", "No custom list found, fetching random items from server...");
|
||||||
}
|
|
||||||
|
|
||||||
// 3. Fallback to server query (Random)
|
|
||||||
if (itemIds.length === 0) {
|
|
||||||
console.log("No custom list found, fetching random items from server...");
|
|
||||||
itemIds = await ApiUtils.fetchItemIdsFromServer();
|
itemIds = await ApiUtils.fetchItemIdsFromServer();
|
||||||
|
|
||||||
if (CONFIG.sortBy === 'Random') {
|
if (CONFIG.sortBy === 'Random') {
|
||||||
@@ -3278,7 +3266,7 @@ const SlideshowManager = {
|
|||||||
itemIds = SlideUtils.shuffleArray(itemIds);
|
itemIds = SlideUtils.shuffleArray(itemIds);
|
||||||
} else if (CONFIG.sortBy !== 'Original') {
|
} else if (CONFIG.sortBy !== 'Original') {
|
||||||
// Client-side sort required...
|
// Client-side sort required...
|
||||||
console.log(`Sorting ${itemIds.length} custom items by ${CONFIG.sortBy} ${CONFIG.sortOrder}`);
|
console.log("🎬 Media Bar:", `Sorting ${itemIds.length} custom items by ${CONFIG.sortBy} ${CONFIG.sortOrder}`);
|
||||||
const itemsWithDetails = [];
|
const itemsWithDetails = [];
|
||||||
for (const id of itemIds) {
|
for (const id of itemIds) {
|
||||||
const item = await ApiUtils.fetchItemDetails(id);
|
const item = await ApiUtils.fetchItemDetails(id);
|
||||||
@@ -3320,7 +3308,7 @@ const SlideshowManager = {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error("Error loading slideshow data:", error);
|
console.error("🎬 Media Bar:", "Error loading slideshow data:", error);
|
||||||
} finally {
|
} finally {
|
||||||
STATE.slideshow.isLoading = false;
|
STATE.slideshow.isLoading = false;
|
||||||
}
|
}
|
||||||
@@ -3466,7 +3454,7 @@ const MediaBarEnhancedSettingsManager = {
|
|||||||
|
|
||||||
this.initialized = true;
|
this.initialized = true;
|
||||||
this.injectSettingsIcon();
|
this.injectSettingsIcon();
|
||||||
console.log("MediaBarEnhanced: Client-Side Settings Manager initialized.");
|
console.log("🎬 Media Bar:", "Client-Side Settings Manager initialized.");
|
||||||
},
|
},
|
||||||
|
|
||||||
getSetting(key, defaultValue) {
|
getSetting(key, defaultValue) {
|
||||||
@@ -3640,7 +3628,7 @@ const initPageVisibilityHandler = () => {
|
|||||||
|
|
||||||
document.addEventListener("visibilitychange", () => {
|
document.addEventListener("visibilitychange", () => {
|
||||||
if (document.hidden) {
|
if (document.hidden) {
|
||||||
console.log("Tab inactive - pausing slideshow and videos");
|
console.log("🎬 Media Bar:", "Tab inactive - pausing slideshow and videos");
|
||||||
wasVideoPlayingBeforeHide = STATE.slideshow.isVideoPlaying;
|
wasVideoPlayingBeforeHide = STATE.slideshow.isVideoPlaying;
|
||||||
|
|
||||||
if (STATE.slideshow.slideInterval) {
|
if (STATE.slideshow.slideInterval) {
|
||||||
@@ -3658,7 +3646,7 @@ const initPageVisibilityHandler = () => {
|
|||||||
player.pauseVideo();
|
player.pauseVideo();
|
||||||
STATE.slideshow.isVideoPlaying = false;
|
STATE.slideshow.isVideoPlaying = false;
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.warn("Error pausing video on tab hide:", e);
|
console.warn("🎬 Media Bar:", "Error pausing video on tab hide:", e);
|
||||||
}
|
}
|
||||||
} else if (player.tagName === 'VIDEO') { // HTML5 Video
|
} else if (player.tagName === 'VIDEO') { // HTML5 Video
|
||||||
player.pause();
|
player.pause();
|
||||||
@@ -3667,7 +3655,7 @@ const initPageVisibilityHandler = () => {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
console.log("Tab active - resuming slideshow");
|
console.log("🎬 Media Bar:", "Tab active - resuming slideshow");
|
||||||
if (!STATE.slideshow.isPaused) {
|
if (!STATE.slideshow.isPaused) {
|
||||||
const currentItemId = STATE.slideshow.itemIds[STATE.slideshow.currentSlideIndex];
|
const currentItemId = STATE.slideshow.itemIds[STATE.slideshow.currentSlideIndex];
|
||||||
|
|
||||||
@@ -3680,16 +3668,16 @@ const initPageVisibilityHandler = () => {
|
|||||||
player.playVideo();
|
player.playVideo();
|
||||||
STATE.slideshow.isVideoPlaying = true;
|
STATE.slideshow.isVideoPlaying = true;
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.warn("Error resuming video on tab show:", e);
|
console.warn("🎬 Media Bar:", "Error resuming video on tab show:", e);
|
||||||
if (STATE.slideshow.slideInterval) {
|
if (STATE.slideshow.slideInterval) {
|
||||||
STATE.slideshow.slideInterval.start();
|
STATE.slideshow.slideInterval.start();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else if (player.tagName === 'VIDEO') { // HTML5 Video
|
} else if (player.tagName === 'VIDEO') { // HTML5 Video
|
||||||
try {
|
try {
|
||||||
player.play().catch(e => console.warn("Error resuming HTML5 video:", e));
|
player.play().catch(e => console.warn("🎬 Media Bar:", "Error resuming HTML5 video:", e));
|
||||||
STATE.slideshow.isVideoPlaying = true;
|
STATE.slideshow.isVideoPlaying = true;
|
||||||
} catch(e) { console.warn(e); }
|
} catch(e) { console.warn("🎬 Media Bar:", e); }
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// No video was playing, just restart interval
|
// No video was playing, just restart interval
|
||||||
@@ -3715,15 +3703,15 @@ const initPageVisibilityHandler = () => {
|
|||||||
*/
|
*/
|
||||||
const slidesInit = async () => {
|
const slidesInit = async () => {
|
||||||
if (STATE.slideshow.hasInitialized) {
|
if (STATE.slideshow.hasInitialized) {
|
||||||
console.log("⚠️ Slideshow already initialized, skipping");
|
console.log("🎬 Media Bar:", "⚠️ Slideshow already initialized, skipping");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
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("🎬 Media Bar:", "Disabled by client-side setting.");
|
||||||
const homeSections = document.querySelector('.homeSectionsContainer');
|
const homeSections = document.querySelector('.homeSectionsContainer');
|
||||||
if (homeSections) {
|
if (homeSections) {
|
||||||
homeSections.style.top = '0';
|
homeSections.style.top = '0';
|
||||||
@@ -3813,7 +3801,7 @@ const slidesInit = async () => {
|
|||||||
const lazyLoadObserver = initLazyLoading();
|
const lazyLoadObserver = initLazyLoading();
|
||||||
|
|
||||||
try {
|
try {
|
||||||
console.log("🌟 Initializing Enhanced Jellyfin Slideshow");
|
console.log("🎬 Media Bar:", "🌟 Initializing Enhanced Jellyfin Slideshow");
|
||||||
|
|
||||||
initArrowNavigation();
|
initArrowNavigation();
|
||||||
|
|
||||||
@@ -3827,9 +3815,9 @@ const slidesInit = async () => {
|
|||||||
|
|
||||||
VisibilityObserver.init();
|
VisibilityObserver.init();
|
||||||
|
|
||||||
console.log("✅ Enhanced Jellyfin Slideshow initialized successfully");
|
console.log("🎬 Media Bar:", "✅ Enhanced Jellyfin Slideshow initialized successfully");
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error("Error initializing slideshow:", error);
|
console.error("🎬 Media Bar:", "Error initializing slideshow:", error);
|
||||||
STATE.slideshow.hasInitialized = false;
|
STATE.slideshow.hasInitialized = false;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -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.2",
|
"version": "1.7.0.13",
|
||||||
|
"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.13/Jellyfin.Plugin.MediaBarEnhanced.zip",
|
||||||
|
"checksum": "457cdc6c320e8cf519fe843d4c1f4eb2",
|
||||||
|
"timestamp": "2026-03-06T03:10:53Z"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"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.2/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": "5672ad96720adf049e780c85174a88bc",
|
"checksum": "2c55cf9687e44b04a0824997e2980dc9",
|
||||||
"timestamp": "2026-02-19T02:36:41Z"
|
"timestamp": "2026-02-19T17:21:40Z"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"version": "1.6.5.2",
|
"version": "1.6.5.2",
|
||||||
|
|||||||
Reference in New Issue
Block a user