feat: Update to version 1.2.0.0 with script injection improvements and fallback support
This commit is contained in:
@@ -12,13 +12,14 @@
|
|||||||
<!-- <TreatWarningsAsErrors>false</TreatWarningsAsErrors> -->
|
<!-- <TreatWarningsAsErrors>false</TreatWarningsAsErrors> -->
|
||||||
<Title>Jellyfin Seasonals Plugin</Title>
|
<Title>Jellyfin Seasonals Plugin</Title>
|
||||||
<Authors>CodeDevMLH</Authors>
|
<Authors>CodeDevMLH</Authors>
|
||||||
<Version>1.1.0.0</Version>
|
<Version>1.2.0.0</Version>
|
||||||
<RepositoryUrl>https://github.com/CodeDevMLH/jellyfin-plugin-seasonals</RepositoryUrl>
|
<RepositoryUrl>https://github.com/CodeDevMLH/jellyfin-plugin-seasonals</RepositoryUrl>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Jellyfin.Controller" Version="$(JellyfinVersion)" />
|
<PackageReference Include="Jellyfin.Controller" Version="$(JellyfinVersion)" />
|
||||||
<PackageReference Include="Jellyfin.Model" Version="$(JellyfinVersion)" />
|
<PackageReference Include="Jellyfin.Model" Version="$(JellyfinVersion)" />
|
||||||
|
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
@@ -1,12 +1,17 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Globalization;
|
using System.Globalization;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Reflection;
|
||||||
|
using System.Runtime.Loader;
|
||||||
using Jellyfin.Plugin.Seasonals.Configuration;
|
using Jellyfin.Plugin.Seasonals.Configuration;
|
||||||
using MediaBrowser.Common.Configuration;
|
using MediaBrowser.Common.Configuration;
|
||||||
using MediaBrowser.Common.Plugins;
|
using MediaBrowser.Common.Plugins;
|
||||||
using MediaBrowser.Model.Plugins;
|
using MediaBrowser.Model.Plugins;
|
||||||
using MediaBrowser.Model.Serialization;
|
using MediaBrowser.Model.Serialization;
|
||||||
using Microsoft.Extensions.Logging;
|
using Microsoft.Extensions.Logging;
|
||||||
|
using Newtonsoft.Json;
|
||||||
|
using Newtonsoft.Json.Linq;
|
||||||
|
|
||||||
namespace Jellyfin.Plugin.Seasonals;
|
namespace Jellyfin.Plugin.Seasonals;
|
||||||
|
|
||||||
@@ -28,7 +33,10 @@ public class Plugin : BasePlugin<PluginConfiguration>, IHasWebPages
|
|||||||
{
|
{
|
||||||
Instance = this;
|
Instance = this;
|
||||||
_scriptInjector = new ScriptInjector(applicationPaths, loggerFactory.CreateLogger<ScriptInjector>());
|
_scriptInjector = new ScriptInjector(applicationPaths, loggerFactory.CreateLogger<ScriptInjector>());
|
||||||
_scriptInjector.Inject();
|
if (!_scriptInjector.Inject())
|
||||||
|
{
|
||||||
|
TryRegisterFallback(loggerFactory.CreateLogger("FileTransformationFallback"));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
@@ -42,16 +50,99 @@ public class Plugin : BasePlugin<PluginConfiguration>, IHasWebPages
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public static Plugin? Instance { get; private set; }
|
public static Plugin? Instance { get; private set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Callback method for FileTransformation plugin.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="payload">The payload containing the file contents.</param>
|
||||||
|
/// <returns>The modified file contents.</returns>
|
||||||
|
public static string TransformIndexHtml(JObject payload)
|
||||||
|
{
|
||||||
|
// CRITICAL: Always return original content if something fails or is null
|
||||||
|
string? originalContents = payload?["contents"]?.ToString();
|
||||||
|
|
||||||
|
if (string.IsNullOrEmpty(originalContents))
|
||||||
|
{
|
||||||
|
return originalContents ?? string.Empty;
|
||||||
|
}
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var html = originalContents;
|
||||||
|
const string inject = "<script src=\"/Seasonals/Resources/seasonals.js\"></script>\n<body";
|
||||||
|
|
||||||
|
if (!html.Contains("seasonals.js", StringComparison.Ordinal))
|
||||||
|
{
|
||||||
|
return html.Replace("<body", inject, StringComparison.OrdinalIgnoreCase);
|
||||||
|
}
|
||||||
|
|
||||||
|
return html;
|
||||||
|
}
|
||||||
|
catch
|
||||||
|
{
|
||||||
|
// On error, return original content to avoid breaking the UI
|
||||||
|
return originalContents;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void TryRegisterFallback(ILogger logger)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
// Find the FileTransformation assembly across all load contexts
|
||||||
|
var assembly = AssemblyLoadContext.All
|
||||||
|
.SelectMany(x => x.Assemblies)
|
||||||
|
.FirstOrDefault(x => x.FullName?.Contains(".FileTransformation") ?? false);
|
||||||
|
|
||||||
|
if (assembly == null)
|
||||||
|
{
|
||||||
|
logger.LogWarning("FileTransformation plugin not found. Fallback injection skipped.");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
var type = assembly.GetType("Jellyfin.Plugin.FileTransformation.PluginInterface");
|
||||||
|
if (type == null)
|
||||||
|
{
|
||||||
|
logger.LogWarning("Jellyfin.Plugin.FileTransformation.PluginInterface not found.");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
var method = type.GetMethod("RegisterTransformation");
|
||||||
|
if (method == null)
|
||||||
|
{
|
||||||
|
logger.LogWarning("RegisterTransformation method not found.");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Create JObject payload directly using Newtonsoft.Json
|
||||||
|
var payload = new JObject
|
||||||
|
{
|
||||||
|
{ "id", Id.ToString() },
|
||||||
|
{ "fileNamePattern", "index.html" },
|
||||||
|
{ "callbackAssembly", this.GetType().Assembly.FullName },
|
||||||
|
{ "callbackClass", this.GetType().FullName },
|
||||||
|
{ "callbackMethod", nameof(TransformIndexHtml) }
|
||||||
|
};
|
||||||
|
|
||||||
|
// Invoke RegisterTransformation with the JObject payload
|
||||||
|
method.Invoke(null, new object[] { payload });
|
||||||
|
logger.LogInformation("Successfully registered fallback transformation via FileTransformation plugin.");
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.LogError(ex, "Error attempting to register fallback transformation.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public IEnumerable<PluginPageInfo> GetPages()
|
public IEnumerable<PluginPageInfo> GetPages()
|
||||||
{
|
{
|
||||||
return
|
return new[]
|
||||||
[
|
{
|
||||||
new PluginPageInfo
|
new PluginPageInfo
|
||||||
{
|
{
|
||||||
Name = Name,
|
Name = Name,
|
||||||
EmbeddedResourcePath = string.Format(CultureInfo.InvariantCulture, "{0}.Configuration.configPage.html", GetType().Namespace)
|
EmbeddedResourcePath = string.Format(CultureInfo.InvariantCulture, "{0}.Configuration.configPage.html", GetType().Namespace)
|
||||||
}
|
}
|
||||||
];
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -30,7 +30,8 @@ public class ScriptInjector
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// Injects the script tag into index.html if it's not already present.
|
/// Injects the script tag into index.html if it's not already present.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public void Inject()
|
/// <returns>True if injection was successful or already present, false otherwise.</returns>
|
||||||
|
public bool Inject()
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
@@ -38,21 +39,21 @@ public class ScriptInjector
|
|||||||
if (string.IsNullOrEmpty(webPath))
|
if (string.IsNullOrEmpty(webPath))
|
||||||
{
|
{
|
||||||
_logger.LogWarning("Could not find Jellyfin web path. Script injection skipped.");
|
_logger.LogWarning("Could not find Jellyfin web path. Script injection skipped.");
|
||||||
return;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
var indexPath = Path.Combine(webPath, "index.html");
|
var indexPath = Path.Combine(webPath, "index.html");
|
||||||
if (!File.Exists(indexPath))
|
if (!File.Exists(indexPath))
|
||||||
{
|
{
|
||||||
_logger.LogWarning("index.html not found at {Path}. Script injection skipped.", indexPath);
|
_logger.LogWarning("index.html not found at {Path}. Script injection skipped.", indexPath);
|
||||||
return;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
var content = File.ReadAllText(indexPath);
|
var content = File.ReadAllText(indexPath);
|
||||||
if (content.Contains(ScriptTag, StringComparison.Ordinal))
|
if (content.Contains(ScriptTag, StringComparison.Ordinal))
|
||||||
{
|
{
|
||||||
_logger.LogInformation("Seasonals script already injected.");
|
_logger.LogInformation("Seasonals script already injected.");
|
||||||
return;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Insert before the closing body tag
|
// Insert before the closing body tag
|
||||||
@@ -60,19 +61,22 @@ public class ScriptInjector
|
|||||||
if (string.Equals(newContent, content, StringComparison.Ordinal))
|
if (string.Equals(newContent, content, StringComparison.Ordinal))
|
||||||
{
|
{
|
||||||
_logger.LogWarning("Could not find closing body tag in index.html. Script injection skipped.");
|
_logger.LogWarning("Could not find closing body tag in index.html. Script injection skipped.");
|
||||||
return;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
File.WriteAllText(indexPath, newContent);
|
File.WriteAllText(indexPath, newContent);
|
||||||
_logger.LogInformation("Successfully injected Seasonals script into index.html.");
|
_logger.LogInformation("Successfully injected Seasonals script into index.html.");
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
catch (UnauthorizedAccessException)
|
catch (UnauthorizedAccessException)
|
||||||
{
|
{
|
||||||
_logger.LogWarning("Permission denied when attempting to inject script into index.html. Automatic injection failed. Please ensure the Jellyfin web directory is writable by the process, or manually add the script tag: {ScriptTag}", ScriptTag);
|
_logger.LogWarning("Permission denied when attempting to inject script into index.html. Automatic injection failed. Please ensure the Jellyfin web directory is writable by the process, or manually add the script tag: {ScriptTag}", ScriptTag);
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
_logger.LogError(ex, "Error injecting Seasonals script.");
|
_logger.LogError(ex, "Error injecting Seasonals script.");
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -162,6 +162,7 @@ async function initializeTheme() {
|
|||||||
automateThemeSelection = config.automateSeasonSelection;
|
automateThemeSelection = config.automateSeasonSelection;
|
||||||
defaultTheme = config.selectedSeason;
|
defaultTheme = config.selectedSeason;
|
||||||
window.SeasonalsPluginConfig = config;
|
window.SeasonalsPluginConfig = config;
|
||||||
|
console.log('Seasonals Config loaded:', config);
|
||||||
} else {
|
} else {
|
||||||
console.error('Failed to fetch Seasonals config');
|
console.error('Failed to fetch Seasonals config');
|
||||||
}
|
}
|
||||||
@@ -170,7 +171,7 @@ async function initializeTheme() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
let currentTheme;
|
let currentTheme;
|
||||||
if (!automateThemeSelection) {
|
if (automateThemeSelection === false) {
|
||||||
currentTheme = defaultTheme;
|
currentTheme = defaultTheme;
|
||||||
} else {
|
} else {
|
||||||
currentTheme = determineCurrentTheme();
|
currentTheme = determineCurrentTheme();
|
||||||
@@ -178,7 +179,7 @@ async function initializeTheme() {
|
|||||||
|
|
||||||
console.log(`Selected theme: ${currentTheme}`);
|
console.log(`Selected theme: ${currentTheme}`);
|
||||||
|
|
||||||
if (currentTheme === 'none') {
|
if (!currentTheme || currentTheme === 'none') {
|
||||||
console.log('No theme selected.');
|
console.log('No theme selected.');
|
||||||
removeSelf();
|
removeSelf();
|
||||||
return;
|
return;
|
||||||
@@ -200,8 +201,9 @@ async function initializeTheme() {
|
|||||||
removeSelf();
|
removeSelf();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Ensure DOM is ready before initializing
|
||||||
//document.addEventListener('DOMContentLoaded', initializeTheme);
|
if (document.readyState === 'loading') {
|
||||||
document.addEventListener('DOMContentLoaded', () => {
|
document.addEventListener('DOMContentLoaded', initializeTheme);
|
||||||
|
} else {
|
||||||
initializeTheme();
|
initializeTheme();
|
||||||
});
|
}
|
||||||
@@ -6,10 +6,11 @@
|
|||||||
"compilationOptions": {},
|
"compilationOptions": {},
|
||||||
"targets": {
|
"targets": {
|
||||||
".NETCoreApp,Version=v9.0": {
|
".NETCoreApp,Version=v9.0": {
|
||||||
"Jellyfin.Plugin.Seasonals/1.1.0.0": {
|
"Jellyfin.Plugin.Seasonals/1.2.0.0": {
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"Jellyfin.Controller": "10.11.0",
|
"Jellyfin.Controller": "10.11.0",
|
||||||
"Jellyfin.Model": "10.11.0"
|
"Jellyfin.Model": "10.11.0",
|
||||||
|
"Newtonsoft.Json": "13.0.4"
|
||||||
},
|
},
|
||||||
"runtime": {
|
"runtime": {
|
||||||
"Jellyfin.Plugin.Seasonals.dll": {}
|
"Jellyfin.Plugin.Seasonals.dll": {}
|
||||||
@@ -326,6 +327,14 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"Newtonsoft.Json/13.0.4": {
|
||||||
|
"runtime": {
|
||||||
|
"lib/net6.0/Newtonsoft.Json.dll": {
|
||||||
|
"assemblyVersion": "13.0.0.0",
|
||||||
|
"fileVersion": "13.0.4.30916"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
"Polly/8.6.4": {
|
"Polly/8.6.4": {
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"Polly.Core": "8.6.4"
|
"Polly.Core": "8.6.4"
|
||||||
@@ -363,7 +372,7 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"libraries": {
|
"libraries": {
|
||||||
"Jellyfin.Plugin.Seasonals/1.1.0.0": {
|
"Jellyfin.Plugin.Seasonals/1.2.0.0": {
|
||||||
"type": "project",
|
"type": "project",
|
||||||
"serviceable": false,
|
"serviceable": false,
|
||||||
"sha512": ""
|
"sha512": ""
|
||||||
@@ -578,6 +587,13 @@
|
|||||||
"path": "nebml/1.1.0.5",
|
"path": "nebml/1.1.0.5",
|
||||||
"hashPath": "nebml.1.1.0.5.nupkg.sha512"
|
"hashPath": "nebml.1.1.0.5.nupkg.sha512"
|
||||||
},
|
},
|
||||||
|
"Newtonsoft.Json/13.0.4": {
|
||||||
|
"type": "package",
|
||||||
|
"serviceable": true,
|
||||||
|
"sha512": "sha512-pdgNNMai3zv51W5aq268sujXUyx7SNdE2bj1wZcWjAQrKMFZV260lbqYop1d2GM67JI1huLRwxo9ZqnfF/lC6A==",
|
||||||
|
"path": "newtonsoft.json/13.0.4",
|
||||||
|
"hashPath": "newtonsoft.json.13.0.4.nupkg.sha512"
|
||||||
|
},
|
||||||
"Polly/8.6.4": {
|
"Polly/8.6.4": {
|
||||||
"type": "package",
|
"type": "package",
|
||||||
"serviceable": true,
|
"serviceable": true,
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1,7 +1,7 @@
|
|||||||
---
|
---
|
||||||
name: "Seasonals"
|
name: "Seasonals"
|
||||||
guid: "ef1e863f-cbb0-4e47-9f23-f0cbb1826ad4"
|
guid: "ef1e863f-cbb0-4e47-9f23-f0cbb1826ad4"
|
||||||
version: "1.1.0.0"
|
version: "1.2.0.0"
|
||||||
targetAbi: "10.11.0.0"
|
targetAbi: "10.11.0.0"
|
||||||
framework: "net9.0"
|
framework: "net9.0"
|
||||||
overview: "Seasonal effects for Jellyfin"
|
overview: "Seasonal effects for Jellyfin"
|
||||||
|
|||||||
@@ -8,6 +8,14 @@
|
|||||||
"category": "General",
|
"category": "General",
|
||||||
"imageUrl": "https://git.mahom03-spacecloud.de/CodeDevMLH/Jellyfin-Seasonals-Plugin/raw/branch/main/logo.png",
|
"imageUrl": "https://git.mahom03-spacecloud.de/CodeDevMLH/Jellyfin-Seasonals-Plugin/raw/branch/main/logo.png",
|
||||||
"versions": [
|
"versions": [
|
||||||
|
{
|
||||||
|
"version": "1.2.0.0",
|
||||||
|
"changelog": "Bug fixing: Fix path, fix injection issue, added File Transformator as fallback if direct injection is blocked due to permissions.",
|
||||||
|
"targetAbi": "10.11.0.0",
|
||||||
|
"sourceUrl": "https://git.mahom03-spacecloud.de/CodeDevMLH/Jellyfin-Seasonals-Plugin/releases/download/v1.2.0.0/Jellyfin.Plugin.Seasonals.zip",
|
||||||
|
"checksum": "be2e93364396b6e0e02368d5a7db53bc",
|
||||||
|
"timestamp": "2025-12-17T15:32:08Z"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"version": "1.1.1.0",
|
"version": "1.1.1.0",
|
||||||
"changelog": "Bug fixing: Added Advanced Configuration UI for customizing individual seasonal effects.",
|
"changelog": "Bug fixing: Added Advanced Configuration UI for customizing individual seasonal effects.",
|
||||||
|
|||||||
Reference in New Issue
Block a user