Compare commits
73 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
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 | ||
|
|
a44bf7ebf4 | ||
|
|
1f273906bf | ||
|
|
0534d0458e | ||
|
|
8b0d6f137d | ||
|
|
2208b86a47 | ||
|
|
5a1048687c | ||
|
|
d3f6641158 | ||
|
|
c214a620e4 | ||
|
|
f0c9462878 | ||
|
|
e12a5b56a2 | ||
|
|
51ff0f2623 | ||
|
|
2c907debc8 | ||
|
|
7b30f8c9e9 | ||
|
|
3a90605112 | ||
|
|
5772d670ff | ||
|
|
e558594c52 | ||
|
|
343436ac56 | ||
|
|
6075e20a11 | ||
|
|
8b7def809b | ||
|
|
43950eac60 | ||
|
|
c09f265b26 | ||
|
|
379c370b4a | ||
|
|
b567307003 | ||
|
|
ff9ea9eff0 | ||
|
|
9427e3e535 | ||
|
|
19318a916d | ||
|
|
5d85284df8 | ||
|
|
2382f850b6 | ||
|
|
22041293f6 | ||
|
|
5595158f9d | ||
|
|
39f85e0c9b | ||
|
|
18a9980a0a | ||
|
|
deb426833d | ||
|
|
bf4b6da0f0 | ||
|
|
2bc7d90254 | ||
|
|
3f302d4c64 | ||
|
|
13a1cc7885 | ||
|
|
a62900f96e | ||
|
|
9d90a29a40 | ||
|
|
cd3973088e | ||
|
|
4112cfad4a | ||
|
|
2618b18df1 | ||
|
|
ef378c5e87 | ||
|
|
b8d0dd9f1a |
@@ -51,7 +51,31 @@ jobs:
|
|||||||
echo "$CHANGELOG" >> $GITHUB_ENV
|
echo "$CHANGELOG" >> $GITHUB_ENV
|
||||||
echo "EOF" >> $GITHUB_ENV
|
echo "EOF" >> $GITHUB_ENV
|
||||||
|
|
||||||
|
- name: Check if Release Already Exists
|
||||||
|
id: check_release
|
||||||
|
shell: bash
|
||||||
|
run: |
|
||||||
|
REPO_OWNER="${{ github.repository_owner }}"
|
||||||
|
REPO_NAME="${{ github.event.repository.name }}"
|
||||||
|
VERSION="${{ env.VERSION }}"
|
||||||
|
TAG="v$VERSION"
|
||||||
|
SERVER_URL="https://git.mahom03-spacecloud.de"
|
||||||
|
|
||||||
|
HTTP_STATUS=$(curl -s -o /dev/null -w "%{http_code}" -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" "$SERVER_URL/api/v1/repos/$REPO_OWNER/$REPO_NAME/releases/tags/$TAG")
|
||||||
|
|
||||||
|
if [ "$HTTP_STATUS" -eq 200 ]; then
|
||||||
|
echo "Release $TAG already exists. Skipping release-related steps."
|
||||||
|
echo "release_exists=true" >> $GITHUB_OUTPUT
|
||||||
|
elif [ "$HTTP_STATUS" -eq 404 ]; then
|
||||||
|
echo "No existing release for $TAG. Continuing."
|
||||||
|
echo "release_exists=false" >> $GITHUB_OUTPUT
|
||||||
|
else
|
||||||
|
echo "Unexpected response when checking release: $HTTP_STATUS"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
- name: Build and Zip
|
- name: Build and Zip
|
||||||
|
if: steps.check_release.outputs.release_exists == 'false'
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
# Inject version from manifest into the build
|
# Inject version from manifest into the build
|
||||||
@@ -71,6 +95,7 @@ jobs:
|
|||||||
echo "ZIP_PATH=bin/Publish/Jellyfin.Plugin.MediaBarEnhanced.zip" >> $GITHUB_ENV
|
echo "ZIP_PATH=bin/Publish/Jellyfin.Plugin.MediaBarEnhanced.zip" >> $GITHUB_ENV
|
||||||
|
|
||||||
- name: Update manifest.json
|
- name: Update manifest.json
|
||||||
|
if: steps.check_release.outputs.release_exists == 'false'
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
REPO_OWNER="${{ github.repository_owner }}"
|
REPO_OWNER="${{ github.repository_owner }}"
|
||||||
@@ -90,12 +115,14 @@ jobs:
|
|||||||
manifest.json > manifest.json.tmp && mv manifest.json.tmp manifest.json
|
manifest.json > manifest.json.tmp && mv manifest.json.tmp manifest.json
|
||||||
|
|
||||||
- name: Commit manifest.json
|
- name: Commit manifest.json
|
||||||
|
if: steps.check_release.outputs.release_exists == 'false'
|
||||||
uses: stefanzweifel/git-auto-commit-action@v7
|
uses: stefanzweifel/git-auto-commit-action@v7
|
||||||
with:
|
with:
|
||||||
commit_message: "Update manifest.json for release v${{ env.VERSION }} [skip ci]"
|
commit_message: "Update manifest.json for release v${{ env.VERSION }} [skip ci]"
|
||||||
file_pattern: manifest.json
|
file_pattern: manifest.json
|
||||||
|
|
||||||
- name: Create Release
|
- name: Create Release
|
||||||
|
if: steps.check_release.outputs.release_exists == 'false'
|
||||||
uses: akkuman/gitea-release-action@v1
|
uses: akkuman/gitea-release-action@v1
|
||||||
with:
|
with:
|
||||||
server_url: "https://git.mahom03-spacecloud.de"
|
server_url: "https://git.mahom03-spacecloud.de"
|
||||||
@@ -109,6 +136,7 @@ jobs:
|
|||||||
|
|
||||||
# Update Message in Remote Repository
|
# Update Message in Remote Repository
|
||||||
- name: Checkout Central Manifest Repo
|
- name: Checkout Central Manifest Repo
|
||||||
|
if: steps.check_release.outputs.release_exists == 'false'
|
||||||
uses: actions/checkout@v6
|
uses: actions/checkout@v6
|
||||||
with:
|
with:
|
||||||
repository: ${{ github.repository_owner }}/jellyfin-plugin-manifest
|
repository: ${{ github.repository_owner }}/jellyfin-plugin-manifest
|
||||||
@@ -116,6 +144,7 @@ jobs:
|
|||||||
token: ${{ secrets.JELLYFIN_PLUGIN_MANIFEST_UPDATER_PAT }}
|
token: ${{ secrets.JELLYFIN_PLUGIN_MANIFEST_UPDATER_PAT }}
|
||||||
|
|
||||||
- name: Update Central Manifest
|
- name: Update Central Manifest
|
||||||
|
if: steps.check_release.outputs.release_exists == 'false'
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
cd central-manifest
|
cd central-manifest
|
||||||
@@ -171,6 +200,7 @@ jobs:
|
|||||||
manifest.json > manifest.json.tmp && mv manifest.json.tmp manifest.json
|
manifest.json > manifest.json.tmp && mv manifest.json.tmp manifest.json
|
||||||
|
|
||||||
- name: Commit and Push Central Manifest
|
- name: Commit and Push Central Manifest
|
||||||
|
if: steps.check_release.outputs.release_exists == 'false'
|
||||||
run: |
|
run: |
|
||||||
cd central-manifest
|
cd central-manifest
|
||||||
git config user.name "CodeDevMLH"
|
git config user.name "CodeDevMLH"
|
||||||
|
|||||||
33
.github/workflows/release_automation.yml
vendored
33
.github/workflows/release_automation.yml
vendored
@@ -52,7 +52,32 @@ jobs:
|
|||||||
echo "$CHANGELOG" >> $GITHUB_ENV
|
echo "$CHANGELOG" >> $GITHUB_ENV
|
||||||
echo "EOF" >> $GITHUB_ENV
|
echo "EOF" >> $GITHUB_ENV
|
||||||
|
|
||||||
|
- name: Check if Release Already Exists
|
||||||
|
id: check_release
|
||||||
|
shell: bash
|
||||||
|
run: |
|
||||||
|
REPO_OWNER="${{ github.repository_owner }}"
|
||||||
|
REPO_NAME="${{ github.event.repository.name }}"
|
||||||
|
VERSION="${{ env.VERSION }}"
|
||||||
|
TAG="v$VERSION"
|
||||||
|
API_URL="https://api.github.com/repos/$REPO_OWNER/$REPO_NAME/releases/tags/$TAG"
|
||||||
|
|
||||||
|
HTTP_STATUS=$(curl -s -o /dev/null -w "%{http_code}" -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" "$API_URL")
|
||||||
|
|
||||||
|
if [ "$HTTP_STATUS" -eq 200 ]; then
|
||||||
|
echo "Release $TAG already exists. Skipping release-related steps."
|
||||||
|
echo "release_exists=true" >> $GITHUB_OUTPUT
|
||||||
|
elif [ "$HTTP_STATUS" -eq 404 ]; then
|
||||||
|
echo "No existing release for $TAG. Continuing."
|
||||||
|
echo "release_exists=false" >> $GITHUB_OUTPUT
|
||||||
|
else
|
||||||
|
echo "Unexpected response when checking release: $HTTP_STATUS"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
- name: Build and Zip
|
- name: Build and Zip
|
||||||
|
if: steps.check_release.outputs.release_exists == 'false'
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
# Inject version from manifest into the build
|
# Inject version from manifest into the build
|
||||||
@@ -72,6 +97,7 @@ jobs:
|
|||||||
echo "ZIP_PATH=bin/Publish/Jellyfin.Plugin.MediaBarEnhanced.zip" >> $GITHUB_ENV
|
echo "ZIP_PATH=bin/Publish/Jellyfin.Plugin.MediaBarEnhanced.zip" >> $GITHUB_ENV
|
||||||
|
|
||||||
- name: Update manifest.json
|
- name: Update manifest.json
|
||||||
|
if: steps.check_release.outputs.release_exists == 'false'
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
REPO_OWNER="${{ github.repository_owner }}"
|
REPO_OWNER="${{ github.repository_owner }}"
|
||||||
@@ -91,13 +117,14 @@ jobs:
|
|||||||
manifest.json > manifest.json.tmp && mv manifest.json.tmp manifest.json
|
manifest.json > manifest.json.tmp && mv manifest.json.tmp manifest.json
|
||||||
|
|
||||||
- name: Commit manifest.json
|
- name: Commit manifest.json
|
||||||
|
if: steps.check_release.outputs.release_exists == 'false'
|
||||||
uses: stefanzweifel/git-auto-commit-action@v7
|
uses: stefanzweifel/git-auto-commit-action@v7
|
||||||
with:
|
with:
|
||||||
commit_message: "Update manifest.json for release v${{ env.VERSION }} [skip ci]"
|
commit_message: "Update manifest.json for release v${{ env.VERSION }} [skip ci]"
|
||||||
file_pattern: manifest.json
|
file_pattern: manifest.json
|
||||||
|
|
||||||
- name: Generate Commit Log
|
- name: Generate Commit Log
|
||||||
if: success()
|
if: success() && steps.check_release.outputs.release_exists == 'false'
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
echo "Generating commit log since last tag..."
|
echo "Generating commit log since last tag..."
|
||||||
@@ -131,6 +158,7 @@ jobs:
|
|||||||
cat release_body.txt
|
cat release_body.txt
|
||||||
|
|
||||||
- name: Create Release
|
- name: Create Release
|
||||||
|
if: steps.check_release.outputs.release_exists == 'false'
|
||||||
uses: softprops/action-gh-release@v2
|
uses: softprops/action-gh-release@v2
|
||||||
with:
|
with:
|
||||||
tag_name: "v${{ env.VERSION }}"
|
tag_name: "v${{ env.VERSION }}"
|
||||||
@@ -145,6 +173,7 @@ jobs:
|
|||||||
|
|
||||||
# Update Message in Remote Repository
|
# Update Message in Remote Repository
|
||||||
- name: Checkout Central Manifest Repo
|
- name: Checkout Central Manifest Repo
|
||||||
|
if: steps.check_release.outputs.release_exists == 'false'
|
||||||
uses: actions/checkout@v6
|
uses: actions/checkout@v6
|
||||||
with:
|
with:
|
||||||
repository: ${{ github.repository_owner }}/jellyfin-plugin-manifest
|
repository: ${{ github.repository_owner }}/jellyfin-plugin-manifest
|
||||||
@@ -152,6 +181,7 @@ jobs:
|
|||||||
token: ${{ secrets.JELLYFIN_PLUGIN_MANIFEST_UPDATER_PAT }}
|
token: ${{ secrets.JELLYFIN_PLUGIN_MANIFEST_UPDATER_PAT }}
|
||||||
|
|
||||||
- name: Update Central Manifest
|
- name: Update Central Manifest
|
||||||
|
if: steps.check_release.outputs.release_exists == 'false'
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
cd central-manifest
|
cd central-manifest
|
||||||
@@ -207,6 +237,7 @@ jobs:
|
|||||||
manifest.json > manifest.json.tmp && mv manifest.json.tmp manifest.json
|
manifest.json > manifest.json.tmp && mv manifest.json.tmp manifest.json
|
||||||
|
|
||||||
- name: Commit and Push Central Manifest
|
- name: Commit and Push Central Manifest
|
||||||
|
if: steps.check_release.outputs.release_exists == 'false'
|
||||||
run: |
|
run: |
|
||||||
cd central-manifest
|
cd central-manifest
|
||||||
git config user.name "CodeDevMLH"
|
git config user.name "CodeDevMLH"
|
||||||
|
|||||||
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.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -41,6 +41,7 @@ namespace Jellyfin.Plugin.MediaBarEnhanced.Configuration
|
|||||||
public bool IsEnabled { get; set; } = true;
|
public bool IsEnabled { get; set; } = true;
|
||||||
public bool EnableClientSideSettings { get; set; } = false;
|
public bool EnableClientSideSettings { get; set; } = false;
|
||||||
public bool ApplyLimitsToCustomIds { get; set; } = false;
|
public bool ApplyLimitsToCustomIds { get; set; } = false;
|
||||||
|
public bool IncludeWatchedContent { get; set; } = false;
|
||||||
public string SortBy { get; set; } = "Random";
|
public string SortBy { get; set; } = "Random";
|
||||||
public string SortOrder { get; set; } = "Ascending";
|
public string SortOrder { get; set; } = "Ascending";
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -22,15 +22,15 @@
|
|||||||
<hr style="max-width: 800px; margin: 1em 0;">
|
<hr style="max-width: 800px; margin: 1em 0;">
|
||||||
|
|
||||||
<div style="margin-bottom: 1.5em;">
|
<div style="margin-bottom: 1.5em;">
|
||||||
<button class="jellyfin-tab-button active" onclick="showTab('basic', this)"
|
<button class="jellyfin-tab-button active" onclick="showTab('media-bar-enhanced-basic', this)"
|
||||||
style="background: none; border: none; color: #fff; cursor: pointer; transition: color 0.3s, border-bottom 0.3s; padding: 0.5em 1em; border-bottom: 2px solid #00a4dc;">
|
style="background: none; border: none; color: #fff; cursor: pointer; transition: color 0.3s, border-bottom 0.3s; padding: 0.5em 1em; border-bottom: 2px solid #00a4dc;">
|
||||||
<h3>General Settings</h3>
|
<h3>General Settings</h3>
|
||||||
</button>
|
</button>
|
||||||
<button class="jellyfin-tab-button" onclick="showTab('custom', this)"
|
<button class="jellyfin-tab-button" onclick="showTab('media-bar-enhanced-custom', this)"
|
||||||
style="background: none; border: none; color: #ccc; cursor: pointer; transition: color 0.3s, border-bottom 0.3s; padding: 0.5em 1em; border-bottom: 2px solid transparent;">
|
style="background: none; border: none; color: #ccc; cursor: pointer; transition: color 0.3s, border-bottom 0.3s; padding: 0.5em 1em; border-bottom: 2px solid transparent;">
|
||||||
<h3>Custom Content</h3>
|
<h3>Custom Content</h3>
|
||||||
</button>
|
</button>
|
||||||
<button class="jellyfin-tab-button" onclick="showTab('advanced', this)"
|
<button class="jellyfin-tab-button" onclick="showTab('media-bar-enhanced-advanced', this)"
|
||||||
style="background: none; border: none; color: #ccc; cursor: pointer; transition: color 0.3s, border-bottom 0.3s; padding: 0.5em 1em; border-bottom: 2px solid transparent;">
|
style="background: none; border: none; color: #ccc; cursor: pointer; transition: color 0.3s, border-bottom 0.3s; padding: 0.5em 1em; border-bottom: 2px solid transparent;">
|
||||||
<h3>Advanced Settings</h3>
|
<h3>Advanced Settings</h3>
|
||||||
</button>
|
</button>
|
||||||
@@ -39,11 +39,11 @@
|
|||||||
<form id="mediaBarEnhancedConfigForm">
|
<form id="mediaBarEnhancedConfigForm">
|
||||||
|
|
||||||
<!-- BASIC TAB -->
|
<!-- BASIC TAB -->
|
||||||
<div id="basic" class="tab-content">
|
<div id="media-bar-enhanced-basic" class="tab-content">
|
||||||
<h2 class="sectionTitle">Main Plugin Settings</h2>
|
<h2 class="sectionTitle">Main Plugin Settings</h2>
|
||||||
<div class="checkboxContainer checkboxContainer-withDescription">
|
<div class="checkboxContainer checkboxContainer-withDescription">
|
||||||
<label>
|
<label>
|
||||||
<input is="emby-checkbox" type="checkbox" id="IsEnabled" name="IsEnabled" />
|
<input is="emby-checkbox" type="checkbox" id="MediaBarIsEnabled" name="MediaBarIsEnabled" />
|
||||||
<span>Enable Media Bar Enhanced Plugin</span>
|
<span>Enable Media Bar Enhanced Plugin</span>
|
||||||
</label>
|
</label>
|
||||||
<div class="fieldDescription">Enable or disable the entire plugin functionality.</div>
|
<div class="fieldDescription">Enable or disable the entire plugin functionality.</div>
|
||||||
@@ -71,7 +71,7 @@
|
|||||||
name="PreferLocalBackdrops" />
|
name="PreferLocalBackdrops" />
|
||||||
<span>Prefer Local Backdrops / Theme Videos</span>
|
<span>Prefer Local Backdrops / Theme Videos</span>
|
||||||
</label>
|
</label>
|
||||||
<div class="fieldDescription">If enabled, local backdrop videos (Theme Videos) will be preferred over trailers.</div>
|
<div class="fieldDescription">If enabled, local backdrop videos (Theme Videos) will be preferred over remote and local trailers.</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="checkboxContainer checkboxContainer-withDescription">
|
<div class="checkboxContainer checkboxContainer-withDescription">
|
||||||
<label>
|
<label>
|
||||||
@@ -101,7 +101,7 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- CUSTOM CONTENT TAB -->
|
<!-- CUSTOM CONTENT TAB -->
|
||||||
<div id="custom" class="tab-content" style="display:none;">
|
<div id="media-bar-enhanced-custom" class="tab-content" style="display:none;">
|
||||||
<!-- Default Custom Media IDs -->
|
<!-- Default Custom Media IDs -->
|
||||||
<h2 class="sectionTitle">Custom Media IDs</h2>
|
<h2 class="sectionTitle">Custom Media IDs</h2>
|
||||||
<div class="checkboxContainer checkboxContainer-withDescription">
|
<div class="checkboxContainer checkboxContainer-withDescription">
|
||||||
@@ -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>
|
||||||
@@ -164,6 +164,12 @@
|
|||||||
during their active date ranges. If no season matches the current date, the default Custom Media IDs above or random selection are used as fallback.</div>
|
during their active date ranges. If no season matches the current date, the default Custom Media IDs above or random selection are used as fallback.</div>
|
||||||
</div>
|
</div>
|
||||||
<div id="seasonalContentContainer" style="display: none;">
|
<div id="seasonalContentContainer" style="display: none;">
|
||||||
|
|
||||||
|
<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>
|
||||||
|
<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 id="seasonalSectionsList"></div>
|
<div id="seasonalSectionsList"></div>
|
||||||
<button is="emby-button" type="button" id="addSeasonBtn" class="raised emby-button"
|
<button is="emby-button" type="button" id="addSeasonBtn" class="raised emby-button"
|
||||||
style="margin-top: 1em; display: inline-flex; align-items: center; gap: 0.4em;">
|
style="margin-top: 1em; display: inline-flex; align-items: center; gap: 0.4em;">
|
||||||
@@ -175,7 +181,7 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- ADVANCED TAB -->
|
<!-- ADVANCED TAB -->
|
||||||
<div id="advanced" class="tab-content" style="display:none;">
|
<div id="media-bar-enhanced-advanced" class="tab-content" style="display:none;">
|
||||||
<h2 class="sectionTitle">Features</h2>
|
<h2 class="sectionTitle">Features</h2>
|
||||||
<div class="checkboxContainer checkboxContainer-withDescription">
|
<div class="checkboxContainer checkboxContainer-withDescription">
|
||||||
<label>
|
<label>
|
||||||
@@ -201,7 +207,7 @@
|
|||||||
name="RandomizeThemeVideos" />
|
name="RandomizeThemeVideos" />
|
||||||
<span>Randomize Backdrop Video</span>
|
<span>Randomize Backdrop Video</span>
|
||||||
</label>
|
</label>
|
||||||
<div class="fieldDescription">If enabled, a random video from the backdrops/theme videos will be selected instead of the first one.</div>
|
<div class="fieldDescription">If enabled, a random video from the backdrops/theme videos will be selected instead of the first one (if multiple exist).</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="checkboxContainer checkboxContainer-withDescription">
|
<div class="checkboxContainer checkboxContainer-withDescription">
|
||||||
<label>
|
<label>
|
||||||
@@ -235,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>
|
||||||
@@ -385,6 +391,14 @@
|
|||||||
<input is="emby-input" type="number" id="MaxPlotLength" name="MaxPlotLength" />
|
<input is="emby-input" type="number" id="MaxPlotLength" name="MaxPlotLength" />
|
||||||
<div class="fieldDescription">Maximum characters for the plot summary.</div>
|
<div class="fieldDescription">Maximum characters for the plot summary.</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="checkboxContainer checkboxContainer-withDescription">
|
||||||
|
<label>
|
||||||
|
<input is="emby-checkbox" type="checkbox" id="IncludeWatchedContent"
|
||||||
|
name="IncludeWatchedContent" />
|
||||||
|
<span>Include Watched Content</span>
|
||||||
|
</label>
|
||||||
|
<div class="fieldDescription">If enabled, watched content will be included in the random selection results.</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div
|
<div
|
||||||
@@ -435,7 +449,7 @@
|
|||||||
ApiClient.getPluginConfiguration(MediaBarEnhancedConfigurationPage.pluginId).then(function (config) {
|
ApiClient.getPluginConfiguration(MediaBarEnhancedConfigurationPage.pluginId).then(function (config) {
|
||||||
|
|
||||||
var keys = [
|
var keys = [
|
||||||
'IsEnabled', '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',
|
||||||
@@ -444,9 +458,16 @@
|
|||||||
'EnableCustomMediaIds', 'CustomMediaIds', 'EnableLoadingScreen',
|
'EnableCustomMediaIds', 'CustomMediaIds', 'EnableLoadingScreen',
|
||||||
'EnableSeasonalContent', 'EnableClientSideSettings', 'SortBy', 'SortOrder',
|
'EnableSeasonalContent', 'EnableClientSideSettings', 'SortBy', 'SortOrder',
|
||||||
'PreferLocalTrailers', 'ApplyLimitsToCustomIds', 'SeasonalSections',
|
'PreferLocalTrailers', 'ApplyLimitsToCustomIds', 'SeasonalSections',
|
||||||
'PreferLocalBackdrops', 'RandomizeThemeVideos', 'RandomizeLocalTrailers'
|
'PreferLocalBackdrops', 'RandomizeThemeVideos', 'RandomizeLocalTrailers',
|
||||||
|
'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) {
|
||||||
@@ -524,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 = [
|
||||||
'IsEnabled', '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',
|
||||||
@@ -534,7 +562,8 @@
|
|||||||
'EnableCustomMediaIds', 'CustomMediaIds', 'EnableLoadingScreen',
|
'EnableCustomMediaIds', 'CustomMediaIds', 'EnableLoadingScreen',
|
||||||
'EnableSeasonalContent', 'EnableClientSideSettings', 'SortBy', 'SortOrder',
|
'EnableSeasonalContent', 'EnableClientSideSettings', 'SortBy', 'SortOrder',
|
||||||
'PreferLocalTrailers', 'ApplyLimitsToCustomIds', 'SeasonalSections',
|
'PreferLocalTrailers', 'ApplyLimitsToCustomIds', 'SeasonalSections',
|
||||||
'PreferLocalBackdrops', 'RandomizeThemeVideos', 'RandomizeLocalTrailers'
|
'PreferLocalBackdrops', 'RandomizeThemeVideos', 'RandomizeLocalTrailers',
|
||||||
|
'IncludeWatchedContent'
|
||||||
];
|
];
|
||||||
|
|
||||||
keys.forEach(function (key) {
|
keys.forEach(function (key) {
|
||||||
@@ -602,14 +631,18 @@
|
|||||||
|
|
||||||
div.innerHTML =
|
div.innerHTML =
|
||||||
'<div class="inputContainer" style="margin-bottom: 0.5em;">' +
|
'<div class="inputContainer" style="margin-bottom: 0.5em;">' +
|
||||||
' <label class="inputLabel" style="font-size: 1.2em; font-weight: bold; margin-bottom:0.5em; display:block;">' + labelText + '</label>' +
|
' <div style="display: flex; align-items: center; justify-content: space-between;">' +
|
||||||
' <div style="display: flex; align-items: center;">' +
|
' <label class="inputLabel section-title" style="font-size: 1.2em; font-weight: bold; margin-bottom:0.5em; display:block;">' + labelText + '</label>' +
|
||||||
' <div style="flex-grow:1;">' +
|
' <div style="display: flex; gap: 0.5em;">' +
|
||||||
' <input is="emby-input" type="text" class="emby-input section-name" value="' + (data.Name || '') + '" />' +
|
' <button type="button" is="paper-icon-button-light" class="btn-move-up" title="Move Up"><i class="material-icons">arrow_upward</i></button>' +
|
||||||
|
' <button type="button" is="paper-icon-button-light" class="btn-move-down" title="Move Down"><i class="material-icons">arrow_downward</i></button>' +
|
||||||
|
' <button type="button" is="paper-icon-button-light" class="btn-remove" title="Remove" style="color: #a94442;"><i class="material-icons">delete</i></button>' +
|
||||||
' </div>' +
|
' </div>' +
|
||||||
' <button type="button" class="raised emby-button remove-section" style="background: #a94442; min-width: unset; margin-left: 1em;">Remove</button>' +
|
|
||||||
' </div>' +
|
' </div>' +
|
||||||
' <div class="fieldDescription">Name of the season</div>' +
|
' <div class="inputContainer">' +
|
||||||
|
' <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>' +
|
||||||
'</div>' +
|
'</div>' +
|
||||||
'<div class="inputContainer" style="margin-bottom: 1em;">' +
|
'<div class="inputContainer" style="margin-bottom: 1em;">' +
|
||||||
' <label class="inputLabel" style="margin-bottom:0.5em; display:block;">Active Period</label>' +
|
' <label class="inputLabel" style="margin-bottom:0.5em; display:block;">Active Period</label>' +
|
||||||
@@ -629,13 +662,38 @@
|
|||||||
' <div class="fieldDescription">Comma-separated or Newline separated list of Movie/Series/Collection IDs to show during this season.<br>Same options available as for the default media IDs.</div>' +
|
' <div class="fieldDescription">Comma-separated or Newline separated list of Movie/Series/Collection IDs to show during this season.<br>Same options available as for the default media IDs.</div>' +
|
||||||
'</div>';
|
'</div>';
|
||||||
|
|
||||||
div.querySelector('.remove-section').addEventListener('click', function() {
|
div.querySelector('.btn-remove').addEventListener('click', function() {
|
||||||
div.remove();
|
div.remove();
|
||||||
|
MediaBarEnhancedConfigurationPage.updateSectionTitles(container);
|
||||||
|
});
|
||||||
|
|
||||||
|
div.querySelector('.btn-move-up').addEventListener('click', function() {
|
||||||
|
if (div.previousElementSibling) {
|
||||||
|
container.insertBefore(div, div.previousElementSibling);
|
||||||
|
MediaBarEnhancedConfigurationPage.updateSectionTitles(container);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
div.querySelector('.btn-move-down').addEventListener('click', function() {
|
||||||
|
if (div.nextElementSibling) {
|
||||||
|
container.insertBefore(div.nextElementSibling, div);
|
||||||
|
MediaBarEnhancedConfigurationPage.updateSectionTitles(container);
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
container.appendChild(div);
|
container.appendChild(div);
|
||||||
},
|
},
|
||||||
|
|
||||||
|
updateSectionTitles: function(container) {
|
||||||
|
var sections = container.querySelectorAll('.seasonal-section');
|
||||||
|
sections.forEach(function(section, index) {
|
||||||
|
var title = section.querySelector('.section-title');
|
||||||
|
if (title) {
|
||||||
|
title.innerText = 'Season list #' + (index + 1);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
},
|
||||||
|
|
||||||
getSeasonalSectionsFromUI: function(page) {
|
getSeasonalSectionsFromUI: function(page) {
|
||||||
var sections = [];
|
var sections = [];
|
||||||
var els = page.querySelectorAll('.seasonal-section');
|
var els = page.querySelectorAll('.seasonal-section');
|
||||||
|
|||||||
@@ -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.2.0</Version>
|
<Version>1.7.0.6</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>
|
||||||
|
|
||||||
|
|||||||
@@ -18,8 +18,8 @@ namespace Jellyfin.Plugin.MediaBarEnhanced
|
|||||||
{
|
{
|
||||||
private readonly IApplicationPaths _appPaths;
|
private readonly IApplicationPaths _appPaths;
|
||||||
private readonly ILogger<ScriptInjector> _logger;
|
private readonly ILogger<ScriptInjector> _logger;
|
||||||
public const string ScriptTag = "<script src=\"/MediaBarEnhanced/Resources/mediaBarEnhanced.js\" defer></script>";
|
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 CssTag = "<link rel=\"stylesheet\" href=\"../MediaBarEnhanced/Resources/mediaBarEnhanced.css\" />";
|
||||||
public const string ScriptMarker = "</body>";
|
public const string ScriptMarker = "</body>";
|
||||||
public const string CssMarker = "</head>";
|
public const string CssMarker = "</head>";
|
||||||
|
|
||||||
@@ -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;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -45,6 +45,7 @@ const CONFIG = {
|
|||||||
randomizeLocalTrailers: false,
|
randomizeLocalTrailers: false,
|
||||||
preferLocalBackdrops: false,
|
preferLocalBackdrops: false,
|
||||||
randomizeThemeVideos: false,
|
randomizeThemeVideos: false,
|
||||||
|
includeWatchedContent: false,
|
||||||
waitForTrailerToEnd: true,
|
waitForTrailerToEnd: true,
|
||||||
startMuted: true,
|
startMuted: true,
|
||||||
fullWidthVideo: true,
|
fullWidthVideo: true,
|
||||||
@@ -62,6 +63,7 @@ const CONFIG = {
|
|||||||
sortOrder: "Ascending",
|
sortOrder: "Ascending",
|
||||||
applyLimitsToCustomIds: false,
|
applyLimitsToCustomIds: false,
|
||||||
seasonalSections: "[]",
|
seasonalSections: "[]",
|
||||||
|
isEnabled: true,
|
||||||
};
|
};
|
||||||
|
|
||||||
// State management
|
// State management
|
||||||
@@ -436,7 +438,7 @@ const waitForApiClientAndInitialize = () => {
|
|||||||
|
|
||||||
const fetchPluginConfig = async () => {
|
const fetchPluginConfig = async () => {
|
||||||
try {
|
try {
|
||||||
const response = await fetch('/MediaBarEnhanced/Config');
|
const response = await fetch('../MediaBarEnhanced/Config');
|
||||||
if (response.ok) {
|
if (response.ok) {
|
||||||
const pluginConfig = await response.json();
|
const pluginConfig = await response.json();
|
||||||
if (pluginConfig) {
|
if (pluginConfig) {
|
||||||
@@ -742,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,
|
||||||
@@ -749,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');
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
@@ -1121,8 +1131,11 @@ const ApiUtils = {
|
|||||||
sortParams += `&sortOrder=${CONFIG.sortOrder}`;
|
sortParams += `&sortOrder=${CONFIG.sortOrder}`;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Filter by isPlayed=False unless IncludeWatchedContent is enabled
|
||||||
|
const playedFilter = CONFIG.includeWatchedContent ? '' : '&isPlayed=False';
|
||||||
|
|
||||||
const response = await fetch(
|
const response = await fetch(
|
||||||
`${STATE.jellyfinData.serverAddress}/Items?IncludeItemTypes=Movie,Series&Recursive=true&hasOverview=true&imageTypes=Logo,Backdrop&${sortParams}&isPlayed=False&enableUserData=true&Limit=${CONFIG.maxItems}&fields=Id`,
|
`${STATE.jellyfinData.serverAddress}/Items?IncludeItemTypes=Movie,Series&Recursive=true&hasOverview=true&imageTypes=Logo,Backdrop&${sortParams}${playedFilter}&enableUserData=true&Limit=${CONFIG.maxItems}&fields=Id`,
|
||||||
{
|
{
|
||||||
headers: this.getAuthHeaders(),
|
headers: this.getAuthHeaders(),
|
||||||
}
|
}
|
||||||
@@ -1390,7 +1403,9 @@ const ApiUtils = {
|
|||||||
|
|
||||||
return {
|
return {
|
||||||
id: trailer.Id,
|
id: trailer.Id,
|
||||||
url: `${STATE.jellyfinData.serverAddress}/Videos/${trailer.Id}/stream.mp4?mediaSourceId=${mediaSourceId}&api_key=${STATE.jellyfinData.accessToken}`
|
// static=true forces Jellyfin to direct-stream (no transcoding) which enables
|
||||||
|
// HTTP Range Requests (Accept-Ranges: bytes) — required by Safari for video playback
|
||||||
|
url: `${STATE.jellyfinData.serverAddress}/Videos/${trailer.Id}/stream.mp4?mediaSourceId=${mediaSourceId}&api_key=${STATE.jellyfinData.accessToken}&static=true`
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
@@ -1634,6 +1649,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;
|
||||||
@@ -1717,160 +1733,301 @@ 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
|
||||||
className: `backdrop video-backdrop ${videoClass}`,
|
videoBackdrop = SlideUtils.createElement("div", {
|
||||||
id: `youtube-player-${itemId}`
|
className: `backdrop video-backdrop ${videoClass}`,
|
||||||
|
style: "opacity: 0; transition: opacity 1.2s ease-in-out;"
|
||||||
});
|
});
|
||||||
|
|
||||||
// Initialize YouTube Player
|
// Detect Safari/WebKit — the YouTube IFrame API causes Error 153 on WebKit
|
||||||
SlideUtils.loadYouTubeIframeAPI().then(() => {
|
// due to cross-origin postMessage restrictions. Use a plain iframe embed instead.
|
||||||
// Fetch SponsorBlock data
|
const isSafariWebKit = /Safari/.test(navigator.userAgent) && !/Chrome/.test(navigator.userAgent) && !/Chromium/.test(navigator.userAgent);
|
||||||
|
|
||||||
|
if (isSafariWebKit) {
|
||||||
|
// ── Safari: plain iframe embed ───────────────────────────────────────────
|
||||||
|
// Fetch SponsorBlock data and apply as URL params (start= / end=)
|
||||||
ApiUtils.fetchSponsorBlockData(videoId).then(segments => {
|
ApiUtils.fetchSponsorBlockData(videoId).then(segments => {
|
||||||
const playerVars = {
|
let startParam = '';
|
||||||
autoplay: 0,
|
let endParam = '';
|
||||||
mute: STATE.slideshow.isMuted ? 1 : 0,
|
|
||||||
controls: 0,
|
|
||||||
disablekb: 1,
|
|
||||||
fs: 0,
|
|
||||||
iv_load_policy: 3,
|
|
||||||
rel: 0,
|
|
||||||
loop: 0,
|
|
||||||
playsinline: 1,
|
|
||||||
origin: window.location.origin,
|
|
||||||
widget_referrer: window.location.href,
|
|
||||||
enablejsapi: 1
|
|
||||||
};
|
|
||||||
|
|
||||||
// Determine video quality
|
|
||||||
let quality = 'hd1080';
|
|
||||||
if (CONFIG.preferredVideoQuality === 'Maximum') {
|
|
||||||
quality = 'highres';
|
|
||||||
} else if (CONFIG.preferredVideoQuality === '720p') {
|
|
||||||
quality = 'hd720';
|
|
||||||
} else if (CONFIG.preferredVideoQuality === '1080p') {
|
|
||||||
quality = 'hd1080';
|
|
||||||
} else { // Auto or fallback
|
|
||||||
// If screen is wider than 1920, prefer highres, otherwise 1080p
|
|
||||||
quality = window.screen.width > 1920 ? 'highres' : 'hd1080';
|
|
||||||
}
|
|
||||||
|
|
||||||
playerVars.suggestedQuality = quality;
|
|
||||||
|
|
||||||
// Apply SponsorBlock start/end times
|
|
||||||
if (segments.intro) {
|
if (segments.intro) {
|
||||||
playerVars.start = Math.ceil(segments.intro[1]);
|
startParam = `&start=${Math.ceil(segments.intro[1])}`;
|
||||||
console.info(`SponsorBlock intro detected for video ${videoId}: skipping to ${playerVars.start}s`);
|
console.info(`SponsorBlock (Safari) intro skip: starting at ${Math.ceil(segments.intro[1])}s`);
|
||||||
}
|
}
|
||||||
if (segments.outro) {
|
if (segments.outro) {
|
||||||
playerVars.end = Math.floor(segments.outro[0]);
|
endParam = `&end=${Math.floor(segments.outro[0])}`;
|
||||||
console.info(`SponsorBlock outro detected for video ${videoId}: ending at ${playerVars.end}s`);
|
console.info(`SponsorBlock (Safari) outro skip: ending at ${Math.floor(segments.outro[0])}s`);
|
||||||
}
|
}
|
||||||
|
|
||||||
STATE.slideshow.videoPlayers[itemId] = new YT.Player(`youtube-player-${itemId}`, {
|
// enablejsapi=1 needed for postMessage commands — does NOT trigger IFrame API handshake
|
||||||
height: '100%',
|
const embedUrl = `https://www.youtube-nocookie.com/embed/${videoId}?autoplay=1&mute=1&controls=0&playsinline=1&rel=0&iv_load_policy=3&enablejsapi=1&origin=${encodeURIComponent(window.location.origin)}${startParam}${endParam}`;
|
||||||
width: '100%',
|
|
||||||
videoId: videoId,
|
|
||||||
playerVars: playerVars,
|
|
||||||
events: {
|
|
||||||
'onReady': (event) => {
|
|
||||||
// Store start/end time and videoId for later use
|
|
||||||
event.target._startTime = playerVars.start || 0;
|
|
||||||
event.target._endTime = playerVars.end || undefined;
|
|
||||||
event.target._videoId = videoId;
|
|
||||||
|
|
||||||
if (STATE.slideshow.isMuted) {
|
const ytIframe = document.createElement('iframe');
|
||||||
event.target.mute();
|
ytIframe.style.cssText = 'width:100%;height:100%;border:0;pointer-events:none;';
|
||||||
} else {
|
ytIframe.setAttribute('allow', 'accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share');
|
||||||
event.target.unMute();
|
ytIframe.setAttribute('allowfullscreen', '');
|
||||||
event.target.setVolume(40);
|
ytIframe.setAttribute('referrerpolicy', 'strict-origin-when-cross-origin');
|
||||||
|
ytIframe.src = embedUrl;
|
||||||
|
videoBackdrop.appendChild(ytIframe);
|
||||||
|
|
||||||
|
// Show immediately — no onStateChange available for plain iframes
|
||||||
|
videoBackdrop.style.opacity = '1';
|
||||||
|
|
||||||
|
// Helper: send postMessage command to the iframe player
|
||||||
|
const ytCmd = (func, args = []) => {
|
||||||
|
try {
|
||||||
|
ytIframe.contentWindow?.postMessage(
|
||||||
|
JSON.stringify({ event: 'command', func, args }),
|
||||||
|
'https://www.youtube-nocookie.com'
|
||||||
|
);
|
||||||
|
} catch(e) { /* cross-origin access may fail on some iOS versions */ }
|
||||||
|
};
|
||||||
|
|
||||||
|
// YouTube won't send onStateChange events unless we explicitly subscribe.
|
||||||
|
// The IFrame API does this automatically; we must do it manually for plain iframes.
|
||||||
|
const subscribeToYtEvents = () => {
|
||||||
|
try {
|
||||||
|
// Step 1: Announce we're listening
|
||||||
|
ytIframe.contentWindow?.postMessage(
|
||||||
|
JSON.stringify({ event: 'listening' }),
|
||||||
|
'https://www.youtube-nocookie.com'
|
||||||
|
);
|
||||||
|
// Step 2: Subscribe to state change events
|
||||||
|
ytIframe.contentWindow?.postMessage(
|
||||||
|
JSON.stringify({ event: 'command', func: 'addEventListener', args: ['onStateChange'] }),
|
||||||
|
'https://www.youtube-nocookie.com'
|
||||||
|
);
|
||||||
|
} catch(e) {}
|
||||||
|
};
|
||||||
|
|
||||||
|
// Subscribe when iframe has finished loading
|
||||||
|
ytIframe.addEventListener('load', subscribeToYtEvents);
|
||||||
|
|
||||||
|
// Listen for YouTube state changes (video ended → advance slide)
|
||||||
|
const handleYtMessage = (event) => {
|
||||||
|
if (!event.origin.includes('youtube')) return;
|
||||||
|
try {
|
||||||
|
const data = typeof event.data === 'string' ? JSON.parse(event.data) : event.data;
|
||||||
|
|
||||||
|
// Player is ready — re-subscribe in case the first attempt was too early
|
||||||
|
if (data.event === 'onReady') {
|
||||||
|
subscribeToYtEvents();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (data.event === 'onStateChange') {
|
||||||
|
console.log(`🍎 Safari YT state: ${data.info} for ${itemId}`);
|
||||||
|
if (data.info === 0) { // 0 = ENDED
|
||||||
|
const slide = document.querySelector(`.slide[data-item-id="${itemId}"]`);
|
||||||
|
if (slide && slide.classList.contains('active')) {
|
||||||
|
SlideshowManager.nextSlide();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
} catch(e) {}
|
||||||
|
};
|
||||||
|
window.addEventListener('message', handleYtMessage);
|
||||||
|
|
||||||
if (typeof event.target.setPlaybackQuality === 'function') {
|
// Create a postMessage-based stub compatible with all slide management code
|
||||||
event.target.setPlaybackQuality(quality);
|
// Key: we NEVER clear ytIframe.src — that would break the YouTube session and cause Error 153.
|
||||||
}
|
// Instead we use postMessage pause/play/seek to control playback state.
|
||||||
|
STATE.slideshow.videoPlayers[itemId] = {
|
||||||
|
_isSafariIframe: true,
|
||||||
|
_iframe: ytIframe,
|
||||||
|
_videoId: videoId,
|
||||||
|
_embedUrl: embedUrl,
|
||||||
|
_msgHandler: handleYtMessage,
|
||||||
|
pauseVideo() { ytCmd('pauseVideo'); },
|
||||||
|
stopVideo() { ytCmd('pauseVideo'); ytCmd('seekTo', [0, true]); },
|
||||||
|
playVideo() { ytCmd('playVideo'); },
|
||||||
|
mute() { ytCmd('mute'); },
|
||||||
|
unMute() { ytCmd('unMute'); },
|
||||||
|
setVolume(v) { ytCmd('setVolume', [v]); },
|
||||||
|
getIframe() { return ytIframe; },
|
||||||
|
getPlayerState() { return 1; }, // approximate: avoids triggering fallback timeouts
|
||||||
|
loadVideoById({ videoId: vid, startSeconds = 0 }) {
|
||||||
|
if (vid === this._videoId) {
|
||||||
|
// Same video — seek to start and resume. NEVER change src (would cause Error 153).
|
||||||
|
ytCmd('seekTo', [startSeconds, true]);
|
||||||
|
ytCmd('playVideo');
|
||||||
|
} else {
|
||||||
|
// Different video — need a fresh embed URL
|
||||||
|
const url = `https://www.youtube-nocookie.com/embed/${vid}?autoplay=1&mute=1&controls=0&playsinline=1&rel=0&iv_load_policy=3&enablejsapi=1&origin=${encodeURIComponent(window.location.origin)}`;
|
||||||
|
ytIframe.src = url;
|
||||||
|
this._videoId = vid;
|
||||||
|
this._embedUrl = url;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
destroy() {
|
||||||
|
window.removeEventListener('message', this._msgHandler);
|
||||||
|
ytIframe.remove();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
// Only play if this is the active slide
|
console.log(`🍎 Safari detected — using plain iframe embed for YouTube video ${videoId}`);
|
||||||
const slide = document.querySelector(`.slide[data-item-id="${itemId}"]`);
|
});
|
||||||
const isVideoPlayerOpen = document.querySelector('.videoPlayerContainer') || document.querySelector('.youtubePlayerContainer');
|
|
||||||
|
|
||||||
if (slide && slide.classList.contains('active') && !document.hidden && (!isVideoPlayerOpen || isVideoPlayerOpen.classList.contains('hide'))) {
|
} else {
|
||||||
event.target.playVideo();
|
// ── Non-Safari: YouTube IFrame API ──────────────────────────────────────
|
||||||
|
const ytPlayerDiv = SlideUtils.createElement("div", {
|
||||||
// Check if it actually started playing after a short delay (handling autoplay blocks)
|
id: `youtube-player-${itemId}`,
|
||||||
const timeoutId = setTimeout(() => {
|
style: "width: 100%; height: 100%;"
|
||||||
// Re-check conditions before processing fallback
|
});
|
||||||
const isVideoPlayerOpenNow = document.querySelector('.videoPlayerContainer') || document.querySelector('.youtubePlayerContainer');
|
|
||||||
if (document.hidden || (isVideoPlayerOpenNow && !isVideoPlayerOpenNow.classList.contains('hide')) || !slide.classList.contains('active')) {
|
videoBackdrop.appendChild(ytPlayerDiv);
|
||||||
|
|
||||||
|
SlideUtils.loadYouTubeIframeAPI().then(() => {
|
||||||
|
ApiUtils.fetchSponsorBlockData(videoId).then(segments => {
|
||||||
|
const playerVars = {
|
||||||
|
autoplay: 1,
|
||||||
|
mute: 1, // need to be muted for Safari, because apple makes life difficult...
|
||||||
|
controls: 0,
|
||||||
|
disablekb: 1,
|
||||||
|
fs: 0,
|
||||||
|
iv_load_policy: 3,
|
||||||
|
rel: 0,
|
||||||
|
loop: 0,
|
||||||
|
playsinline: 1,
|
||||||
|
origin: window.location.origin,
|
||||||
|
enablejsapi: 1
|
||||||
|
};
|
||||||
|
|
||||||
|
// Determine video quality
|
||||||
|
let quality = 'hd1080';
|
||||||
|
if (CONFIG.preferredVideoQuality === 'Maximum') {
|
||||||
|
quality = 'highres';
|
||||||
|
} else if (CONFIG.preferredVideoQuality === '720p') {
|
||||||
|
quality = 'hd720';
|
||||||
|
} else if (CONFIG.preferredVideoQuality === '1080p') {
|
||||||
|
quality = 'hd1080';
|
||||||
|
} else {
|
||||||
|
quality = window.screen.width > 1920 ? 'highres' : 'hd1080';
|
||||||
|
}
|
||||||
|
|
||||||
|
playerVars.suggestedQuality = quality;
|
||||||
|
|
||||||
|
// Apply SponsorBlock start/end times
|
||||||
|
if (segments.intro) {
|
||||||
|
playerVars.start = Math.ceil(segments.intro[1]);
|
||||||
|
console.info(`SponsorBlock intro detected for video ${videoId}: skipping to ${playerVars.start}s`);
|
||||||
|
}
|
||||||
|
if (segments.outro) {
|
||||||
|
playerVars.end = Math.floor(segments.outro[0]);
|
||||||
|
console.info(`SponsorBlock outro detected for video ${videoId}: ending at ${playerVars.end}s`);
|
||||||
|
}
|
||||||
|
|
||||||
|
STATE.slideshow.videoPlayers[itemId] = new YT.Player(`youtube-player-${itemId}`, {
|
||||||
|
height: '100%',
|
||||||
|
width: '100%',
|
||||||
|
videoId: videoId,
|
||||||
|
host: 'https://www.youtube-nocookie.com',
|
||||||
|
playerVars: playerVars,
|
||||||
|
events: {
|
||||||
|
'onReady': (event) => {
|
||||||
|
const iframe = event.target.getIframe();
|
||||||
|
if (iframe) {
|
||||||
|
iframe.setAttribute('referrerpolicy', 'strict-origin-when-cross-origin');
|
||||||
|
// Full allow attribute matching what YouTube sets on their own embed pages
|
||||||
|
iframe.setAttribute('allow', 'accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share');
|
||||||
|
}
|
||||||
|
|
||||||
|
// Store start/end time and videoId for later use
|
||||||
|
event.target._startTime = playerVars.start || 0;
|
||||||
|
event.target._endTime = playerVars.end || undefined;
|
||||||
|
event.target._videoId = videoId;
|
||||||
|
|
||||||
|
// Store reference to wrapper for fading
|
||||||
|
event.target._wrapperDiv = videoBackdrop;
|
||||||
|
|
||||||
|
// Unmute now if user wants sound.
|
||||||
|
if (!STATE.slideshow.isMuted) {
|
||||||
|
event.target.unMute();
|
||||||
|
event.target.setVolume(40);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (typeof event.target.setPlaybackQuality === 'function') {
|
||||||
|
event.target.setPlaybackQuality(quality);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Stop playback if slide was navigated away from
|
||||||
|
const slide = document.querySelector(`.slide[data-item-id="${itemId}"]`);
|
||||||
|
const isVideoPlayerOpen = document.querySelector('.videoPlayerContainer') || document.querySelector('.youtubePlayerContainer');
|
||||||
|
|
||||||
|
if (!slide || !slide.classList.contains('active') || document.hidden || (isVideoPlayerOpen && !isVideoPlayerOpen.classList.contains('hide'))) {
|
||||||
|
event.target.stopVideo();
|
||||||
|
} else {
|
||||||
|
if (CONFIG.waitForTrailerToEnd && STATE.slideshow.slideInterval) {
|
||||||
|
STATE.slideshow.slideInterval.stop();
|
||||||
|
}
|
||||||
|
|
||||||
|
const timeoutId = setTimeout(() => {
|
||||||
|
const isVideoPlayerOpenNow = document.querySelector('.videoPlayerContainer') || document.querySelector('.youtubePlayerContainer');
|
||||||
|
if (document.hidden || (isVideoPlayerOpenNow && !isVideoPlayerOpenNow.classList.contains('hide')) || !slide.classList.contains('active')) {
|
||||||
console.log(`Navigation detected during autoplay check for ${itemId}, stopping video.`);
|
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 &&
|
const state = event.target.getPlayerState();
|
||||||
event.target.getPlayerState() !== YT.PlayerState.BUFFERING) {
|
if (state !== YT.PlayerState.PLAYING && state !== YT.PlayerState.BUFFERING) {
|
||||||
console.warn(`Autoplay blocked for ${itemId}, attempting muted fallback`);
|
console.warn(`Autoplay stalled for ${itemId}, attempting muted fallback`);
|
||||||
event.target.mute();
|
event.target.mute();
|
||||||
event.target.playVideo();
|
event.target.playVideo();
|
||||||
}
|
}
|
||||||
}, 1000);
|
}, 1000);
|
||||||
|
|
||||||
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) => {
|
if (event.data === YT.PlayerState.PLAYING) {
|
||||||
if (event.data === YT.PlayerState.ENDED) {
|
if (event.target._wrapperDiv) {
|
||||||
const slide = document.querySelector(`.slide[data-item-id="${itemId}"]`);
|
event.target._wrapperDiv.style.opacity = "1";
|
||||||
if (slide && slide.classList.contains('active')) {
|
}
|
||||||
if (CONFIG.waitForTrailerToEnd) {
|
}
|
||||||
|
|
||||||
|
if (event.data === YT.PlayerState.ENDED) {
|
||||||
|
const slide = document.querySelector(`.slide[data-item-id="${itemId}"]`);
|
||||||
|
if (slide && slide.classList.contains('active')) {
|
||||||
SlideshowManager.nextSlide();
|
SlideshowManager.nextSlide();
|
||||||
} else {
|
|
||||||
event.target.playVideo(); // Loop if trailer is shorter than slide duration
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
},
|
||||||
},
|
'onError': (event) => {
|
||||||
'onError': (event) => {
|
console.warn(`YouTube player error ${event.data} for video ${videoId}`);
|
||||||
console.warn(`YouTube player error ${event.data} for video ${videoId}`);
|
if (CONFIG.waitForTrailerToEnd) {
|
||||||
// Fallback to next slide on error
|
SlideshowManager.nextSlide();
|
||||||
if (CONFIG.waitForTrailerToEnd) {
|
}
|
||||||
SlideshowManager.nextSlide();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
});
|
} // end non-Safari
|
||||||
|
|
||||||
// 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) {
|
||||||
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",
|
||||||
autoplay: false,
|
|
||||||
preload: "auto",
|
|
||||||
loop: false,
|
|
||||||
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.`);
|
||||||
@@ -1878,34 +2035,47 @@ 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', () => {
|
videoBackdrop.addEventListener('ended', (event) => {
|
||||||
const slide = document.querySelector(`.slide[data-item-id="${itemId}"]`);
|
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', () => {
|
videoBackdrop.addEventListener('error', (event) => {
|
||||||
const slide = document.querySelector(`.slide[data-item-id="${itemId}"]`);
|
const src = event.target.src || event.target.getAttribute('data-src') || 'unknown';
|
||||||
if (CONFIG.waitForTrailerToEnd && slide && slide.classList.contains('active')) {
|
const errCode = event.target.error ? event.target.error.code : 'n/a';
|
||||||
|
const errMsg = event.target.error ? event.target.error.message : 'n/a';
|
||||||
|
console.warn(`Local video error for item ${itemId} | code=${errCode} | msg=${errMsg} | url=${src}`);
|
||||||
|
const slide = event.target.closest('.slide');
|
||||||
|
if (slide && slide.classList.contains('active')) {
|
||||||
SlideshowManager.nextSlide();
|
SlideshowManager.nextSlide();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
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", {
|
||||||
@@ -1915,8 +2085,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),
|
||||||
@@ -2357,25 +2533,33 @@ 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
|
||||||
if (STATE.slideshow.videoPlayers) {
|
setTimeout(() => {
|
||||||
Object.keys(STATE.slideshow.videoPlayers).forEach(id => {
|
if (STATE.slideshow.videoPlayers) {
|
||||||
if (id !== currentItemId) {
|
Object.keys(STATE.slideshow.videoPlayers).forEach(id => {
|
||||||
const p = STATE.slideshow.videoPlayers[id];
|
if (id !== currentItemId) {
|
||||||
if (!p) return;
|
const p = STATE.slideshow.videoPlayers[id];
|
||||||
// YouTube player
|
if (!p) return;
|
||||||
if (typeof p.pauseVideo === 'function') {
|
// YouTube player
|
||||||
p.pauseVideo();
|
if (typeof p.pauseVideo === 'function') {
|
||||||
|
p.pauseVideo();
|
||||||
|
}
|
||||||
|
// HTML5 <video> element (local trailers), release HTTP connection
|
||||||
|
if (p instanceof HTMLVideoElement) {
|
||||||
|
p.pause();
|
||||||
|
p.muted = true;
|
||||||
|
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();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
// HTML5 <video> element (local trailers)
|
});
|
||||||
if (p instanceof HTMLVideoElement) {
|
}
|
||||||
p.pause();
|
}, CONFIG.fadeTransitionDuration);
|
||||||
p.muted = true;
|
|
||||||
p.currentTime = 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
// 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 => {
|
||||||
@@ -2408,44 +2592,67 @@ 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;
|
||||||
}
|
}
|
||||||
|
|
||||||
videoBackdrop.play().catch(e => {
|
const doPlay = () => {
|
||||||
// Check if it actually started playing after a short delay (handling autoplay blocks)
|
if (!currentSlide.classList.contains('active')) return;
|
||||||
setTimeout(() => {
|
videoBackdrop.play().catch(e => {
|
||||||
if (videoBackdrop.paused && currentSlide.classList.contains('active')) {
|
setTimeout(() => {
|
||||||
console.warn(`Autoplay blocked for ${currentItemId}, attempting muted fallback`);
|
if (videoBackdrop.paused && currentSlide.classList.contains('active')) {
|
||||||
videoBackdrop.muted = true;
|
console.warn(`Autoplay blocked for ${currentItemId}, attempting muted fallback`);
|
||||||
videoBackdrop.play().catch(err => console.error("Muted fallback failed", err));
|
videoBackdrop.muted = true;
|
||||||
}
|
videoBackdrop.play().catch(err => console.error("Muted fallback failed", err));
|
||||||
}, 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
|
||||||
});
|
});
|
||||||
|
player.mute();
|
||||||
if (STATE.slideshow.isMuted) {
|
if (!STATE.slideshow.isMuted) {
|
||||||
player.mute();
|
setTimeout(() => {
|
||||||
} else {
|
// Only unmute if still on the same slide
|
||||||
player.unMute();
|
if (currentSlide.classList.contains('active')) {
|
||||||
player.setVolume(40);
|
player.unMute();
|
||||||
|
player.setVolume(40);
|
||||||
|
}
|
||||||
|
}, 600);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Check if playback successfully started, otherwise fallback to muted
|
// Check if playback successfully started, otherwise fallback to muted
|
||||||
|
// (Only for real YT.Player instances — Safari stub's getPlayerState() always returns 1)
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
if (!currentSlide.classList.contains('active')) return;
|
if (!currentSlide.classList.contains('active')) return;
|
||||||
if (player.getPlayerState &&
|
if (player.getPlayerState && typeof YT !== 'undefined' &&
|
||||||
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("YouTube loadVideoById didn't start playback, retrying muted...");
|
||||||
@@ -2606,7 +2813,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) => {
|
||||||
@@ -2624,7 +2831,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];
|
||||||
}
|
}
|
||||||
@@ -2803,7 +3020,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 => {
|
||||||
@@ -2811,6 +3028,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);
|
||||||
}
|
}
|
||||||
@@ -2843,9 +3066,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));
|
||||||
@@ -3651,8 +3879,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) {
|
||||||
|
|||||||
@@ -101,6 +101,9 @@ This plugin builds upon the original Media Bar with new capabilities and improve
|
|||||||
<img width="513" height="575" alt="Client-Settings" src="https://github.com/user-attachments/assets/3e29a84f-f8ea-4b7b-b561-80493cb1535b" />
|
<img width="513" height="575" alt="Client-Settings" src="https://github.com/user-attachments/assets/3e29a84f-f8ea-4b7b-b561-80493cb1535b" />
|
||||||
</details>
|
</details>
|
||||||
* **Local Trailers Preference**: Option to prefer local trailers (from the media item) over online sources.
|
* **Local Trailers Preference**: Option to prefer local trailers (from the media item) over online sources.
|
||||||
|
* **Theme Video Support**: Option to prefer local theme videos (backdrops) over trailers.
|
||||||
|
* **Randomization**: Options to randomize theme videos and local trailers if multiple versions exist.
|
||||||
|
* **Include Watched Content**: Option to include watched items in the random slideshow.
|
||||||
* **Content Sorting Options**: Sort content by various criteria such as PremiereDate, ProductionYear, Random, or Original order.
|
* **Content Sorting Options**: Sort content by various criteria such as PremiereDate, ProductionYear, Random, or Original order.
|
||||||
* **Client-Side Settings**: Allow users to override settings locally on their device.
|
* **Client-Side Settings**: Allow users to override settings locally on their device.
|
||||||
|
|
||||||
@@ -157,6 +160,8 @@ Configure the plugin via **Dashboard** > **Plugins** > **Media Bar Enhanced**.
|
|||||||
* **Wait For Trailer To End**: Prevents slide transition until the video finishes.
|
* **Wait For Trailer To End**: Prevents slide transition until the video finishes.
|
||||||
* **Enable Mobile Video**: specific setting to allow video playback on mobile devices (disabled by default to save data/battery).
|
* **Enable Mobile Video**: specific setting to allow video playback on mobile devices (disabled by default to save data/battery).
|
||||||
* **Show Trailer Button**: Adds a button to open the trailer in a popup modal if video backdrops are disabled (e.g. on mobile if trailers are disabled there)
|
* **Show Trailer Button**: Adds a button to open the trailer in a popup modal if video backdrops are disabled (e.g. on mobile if trailers are disabled there)
|
||||||
|
* **Prefer Local Trailers**: If enabled, local trailers will be preferred over remote (YouTube) trailers.
|
||||||
|
* **Prefer Local Backdrops / Theme Videos**: If enabled, local backdrop videos (Theme Videos) will be preferred over trailers.
|
||||||
|
|
||||||
### Custom Content
|
### Custom Content
|
||||||
Define exactly what shows up in your bar.
|
Define exactly what shows up in your bar.
|
||||||
@@ -194,6 +199,7 @@ Customize the order of slides in the Media Bar.
|
|||||||
Fine-tune performance by limiting the number of items fetched from the server.
|
Fine-tune performance by limiting the number of items fetched from the server.
|
||||||
|
|
||||||
* **Total Max Items**: Maximum total items to fetch (combined).
|
* **Total Max Items**: Maximum total items to fetch (combined).
|
||||||
|
* **Include Watched Content**: If enabled, the random slideshow will also include items that you have already watched.
|
||||||
* **Max Movies**: Maximum movies to include (for random selection).
|
* **Max Movies**: Maximum movies to include (for random selection).
|
||||||
* **Max Tv Shows**: Maximum TV shows to include (for random selection).
|
* **Max Tv Shows**: Maximum TV shows to include (for random selection).
|
||||||
* **Preload Count**: Number of slides to preload for smooth transitions.
|
* **Preload Count**: Number of slides to preload for smooth transitions.
|
||||||
@@ -208,6 +214,8 @@ Fine-tune performance by limiting the number of items fetched from the server.
|
|||||||
* **Full Width Video**: Stretches video to cover the entire width (good for desktop, crop on mobile).
|
* **Full Width Video**: Stretches video to cover the entire width (good for desktop, crop on mobile).
|
||||||
* **Enable Loading Screen**: Enable/disable the loading indicator while the bar initializes.
|
* **Enable Loading Screen**: Enable/disable the loading indicator while the bar initializes.
|
||||||
* **Always Show Arrows**: Keeps navigation arrows visible instead of hiding them on mouse leave.
|
* **Always Show Arrows**: Keeps navigation arrows visible instead of hiding them on mouse leave.
|
||||||
|
* **Randomize Backdrop Video**: If enabled, a random video from the backdrops/theme videos will be selected instead of the first one.
|
||||||
|
* **Randomize Local Trailer**: If enabled, a random local trailer will be selected instead of the first one.
|
||||||
* **Enable Keyboard Controls**:
|
* **Enable Keyboard Controls**:
|
||||||
* `Left`/`Right`: Change slide
|
* `Left`/`Right`: Change slide
|
||||||
* `Space`: Pause/Play slideshow
|
* `Space`: Pause/Play slideshow
|
||||||
|
|||||||
@@ -43,7 +43,7 @@ Bevor du baust, musst du die Versionsnummer in den folgenden Dateien aktualisier
|
|||||||
Führe den folgenden Befehl im Terminal (PowerShell) im Hauptverzeichnis aus. Wir nutzen hier `dotnet build` statt `publish`, um unnötige Dateien zu vermeiden.
|
Führe den folgenden Befehl im Terminal (PowerShell) im Hauptverzeichnis aus. Wir nutzen hier `dotnet build` statt `publish`, um unnötige Dateien zu vermeiden.
|
||||||
|
|
||||||
```powershell
|
```powershell
|
||||||
dotnet build Jellyfin.Plugin.MediaBar/Jellyfin.Plugin.MediaBar.csproj --configuration Release --output bin/Publish; Compress-Archive -Path bin/Publish/* -DestinationPath bin/Publish/Jellyfin.Plugin.MediaBar.zip -Force; $hash = (Get-FileHash -Algorithm MD5 bin/Publish/Jellyfin.Plugin.MediaBar.zip).Hash.ToLower(); $time = (Get-Date).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ"); Write-Output "`n----------------------------------------"; Write-Output "NEUE CHECKSUMME (MD5): $hash"; Write-Output "ZEITSTEMPEL: $time"; Write-Output "----------------------------------------`n"
|
dotnet build Jellyfin.Plugin.MediaBarEnhanced/Jellyfin.Plugin.MediaBarEnhanced.csproj --configuration Release --output bin/Publish; Compress-Archive -Path bin/Publish/* -DestinationPath bin/Publish/Jellyfin.Plugin.MediaBarEnhanced.zip -Force; $hash = (Get-FileHash -Algorithm MD5 bin/Publish/Jellyfin.Plugin.MediaBarEnhanced.zip).Hash.ToLower(); $time = (Get-Date).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ"); Write-Output "`n----------------------------------------"; Write-Output "NEUE CHECKSUMME (MD5): $hash"; Write-Output "ZEITSTEMPEL: $time"; Write-Output "----------------------------------------`n"
|
||||||
```
|
```
|
||||||
|
|
||||||
## 3. Manifest aktualisieren
|
## 3. Manifest aktualisieren
|
||||||
|
|||||||
@@ -9,12 +9,52 @@
|
|||||||
"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.2.0",
|
"version": "1.7.0.6",
|
||||||
"changelog": "- feat: add options for local backdrops (theme videos) support and randomization features for local trailer/backdrops if more than 1 is available",
|
"changelog": "- Add YouTube no-cookie host and referrer policy for iframe security to fix playback issues on iOS/MacOS",
|
||||||
"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.2.0/Jellyfin.Plugin.MediaBarEnhanced.zip",
|
"sourceUrl": "https://git.mahom03-spacecloud.de/CodeDevMLH/jellyfin-plugin-media-bar-enhanced/releases/download/v1.7.0.6/Jellyfin.Plugin.MediaBarEnhanced.zip",
|
||||||
"checksum": "ccc738317994a37d75db528ef03f9e25",
|
"checksum": "58cb845a803a209362acbc01acc7dacc",
|
||||||
"timestamp": "2026-02-14T23:34:46Z"
|
"timestamp": "2026-03-06T00:25:03Z"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"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",
|
||||||
|
"targetAbi": "10.11.0.0",
|
||||||
|
"sourceUrl": "https://git.mahom03-spacecloud.de/CodeDevMLH/jellyfin-plugin-media-bar-enhanced/releases/download/v1.6.5.2/Jellyfin.Plugin.MediaBarEnhanced.zip",
|
||||||
|
"checksum": "552cb3376c77ede5a0664ced56bf7d1e",
|
||||||
|
"timestamp": "2026-02-16T23:57:57Z"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "1.6.4.1",
|
||||||
|
"changelog": "- fix slide transition when using local/backdrop videos",
|
||||||
|
"targetAbi": "10.11.0.0",
|
||||||
|
"sourceUrl": "https://git.mahom03-spacecloud.de/CodeDevMLH/jellyfin-plugin-media-bar-enhanced/releases/download/v1.6.4.1/Jellyfin.Plugin.MediaBarEnhanced.zip",
|
||||||
|
"checksum": "a9c5a863427de84639eca082483936da",
|
||||||
|
"timestamp": "2026-02-15T22:56:17Z"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "1.6.3.1",
|
||||||
|
"changelog": "- fix path issue on subpath installations",
|
||||||
|
"targetAbi": "10.11.0.0",
|
||||||
|
"sourceUrl": "https://git.mahom03-spacecloud.de/CodeDevMLH/jellyfin-plugin-media-bar-enhanced/releases/download/v1.6.3.0/Jellyfin.Plugin.MediaBarEnhanced.zip",
|
||||||
|
"checksum": "6a952445bfb80ba4603017358e48da91",
|
||||||
|
"timestamp": "2026-02-15T22:38:19Z"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "1.6.2.3",
|
||||||
|
"changelog": "- feat: add options for local backdrops (theme videos) support and randomization features for local trailer/backdrops if more than one is available\n- feat: add option to include watched content in the random selection",
|
||||||
|
"targetAbi": "10.11.0.0",
|
||||||
|
"sourceUrl": "https://git.mahom03-spacecloud.de/CodeDevMLH/jellyfin-plugin-media-bar-enhanced/releases/download/v1.6.2.3/Jellyfin.Plugin.MediaBarEnhanced.zip",
|
||||||
|
"checksum": "c7ff2d783889c25b5a53783bfbe30b11",
|
||||||
|
"timestamp": "2026-02-15T00:38:07Z"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"version": "1.6.1.32",
|
"version": "1.6.1.32",
|
||||||
|
|||||||
Reference in New Issue
Block a user