From 4433cbb949a43deaa74d71d0c43a103dfd1b0df4 Mon Sep 17 00:00:00 2001
From: CodeDevMLH <145071728+CodeDevMLH@users.noreply.github.com>
Date: Wed, 17 Dec 2025 16:34:02 +0100
Subject: [PATCH] feat: Update to version 1.2.0.0 with script injection
improvements and fallback support
---
.../Jellyfin.Plugin.Seasonals.csproj | 3 +-
Jellyfin.Plugin.Seasonals/Plugin.cs | 99 +++++++++++++++++-
Jellyfin.Plugin.Seasonals/ScriptInjector.cs | 14 ++-
Jellyfin.Plugin.Seasonals/Web/seasonals.js | 14 +--
.../Jellyfin.Plugin.Seasonals.deps.json | 22 +++-
bin/Publish/Jellyfin.Plugin.Seasonals.dll | Bin 964096 -> 963072 bytes
bin/Publish/Jellyfin.Plugin.Seasonals.pdb | Bin 28216 -> 28544 bytes
bin/Publish/Jellyfin.Plugin.Seasonals.zip | Bin 5221157 -> 5221274 bytes
build.yaml | 2 +-
manifest.json | 8 ++
10 files changed, 142 insertions(+), 20 deletions(-)
diff --git a/Jellyfin.Plugin.Seasonals/Jellyfin.Plugin.Seasonals.csproj b/Jellyfin.Plugin.Seasonals/Jellyfin.Plugin.Seasonals.csproj
index a42bea4..59efc6e 100644
--- a/Jellyfin.Plugin.Seasonals/Jellyfin.Plugin.Seasonals.csproj
+++ b/Jellyfin.Plugin.Seasonals/Jellyfin.Plugin.Seasonals.csproj
@@ -12,13 +12,14 @@
Jellyfin Seasonals Plugin
CodeDevMLH
- 1.1.0.0
+ 1.2.0.0
https://github.com/CodeDevMLH/jellyfin-plugin-seasonals
+
diff --git a/Jellyfin.Plugin.Seasonals/Plugin.cs b/Jellyfin.Plugin.Seasonals/Plugin.cs
index 47601b6..ad1af94 100644
--- a/Jellyfin.Plugin.Seasonals/Plugin.cs
+++ b/Jellyfin.Plugin.Seasonals/Plugin.cs
@@ -1,12 +1,17 @@
using System;
using System.Collections.Generic;
using System.Globalization;
+using System.Linq;
+using System.Reflection;
+using System.Runtime.Loader;
using Jellyfin.Plugin.Seasonals.Configuration;
using MediaBrowser.Common.Configuration;
using MediaBrowser.Common.Plugins;
using MediaBrowser.Model.Plugins;
using MediaBrowser.Model.Serialization;
using Microsoft.Extensions.Logging;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
namespace Jellyfin.Plugin.Seasonals;
@@ -28,7 +33,10 @@ public class Plugin : BasePlugin, IHasWebPages
{
Instance = this;
_scriptInjector = new ScriptInjector(applicationPaths, loggerFactory.CreateLogger());
- _scriptInjector.Inject();
+ if (!_scriptInjector.Inject())
+ {
+ TryRegisterFallback(loggerFactory.CreateLogger("FileTransformationFallback"));
+ }
}
///
@@ -42,16 +50,99 @@ public class Plugin : BasePlugin, IHasWebPages
///
public static Plugin? Instance { get; private set; }
+ ///
+ /// Callback method for FileTransformation plugin.
+ ///
+ /// The payload containing the file contents.
+ /// The modified file contents.
+ 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 = "\n 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.");
+ }
+ }
+
///
public IEnumerable GetPages()
{
- return
- [
+ return new[]
+ {
new PluginPageInfo
{
Name = Name,
EmbeddedResourcePath = string.Format(CultureInfo.InvariantCulture, "{0}.Configuration.configPage.html", GetType().Namespace)
}
- ];
+ };
}
}
diff --git a/Jellyfin.Plugin.Seasonals/ScriptInjector.cs b/Jellyfin.Plugin.Seasonals/ScriptInjector.cs
index d84532f..6432b26 100644
--- a/Jellyfin.Plugin.Seasonals/ScriptInjector.cs
+++ b/Jellyfin.Plugin.Seasonals/ScriptInjector.cs
@@ -30,7 +30,8 @@ public class ScriptInjector
///
/// Injects the script tag into index.html if it's not already present.
///
- public void Inject()
+ /// True if injection was successful or already present, false otherwise.
+ public bool Inject()
{
try
{
@@ -38,21 +39,21 @@ public class ScriptInjector
if (string.IsNullOrEmpty(webPath))
{
_logger.LogWarning("Could not find Jellyfin web path. Script injection skipped.");
- return;
+ return false;
}
var indexPath = Path.Combine(webPath, "index.html");
if (!File.Exists(indexPath))
{
_logger.LogWarning("index.html not found at {Path}. Script injection skipped.", indexPath);
- return;
+ return false;
}
var content = File.ReadAllText(indexPath);
if (content.Contains(ScriptTag, StringComparison.Ordinal))
{
_logger.LogInformation("Seasonals script already injected.");
- return;
+ return true;
}
// Insert before the closing body tag
@@ -60,19 +61,22 @@ public class ScriptInjector
if (string.Equals(newContent, content, StringComparison.Ordinal))
{
_logger.LogWarning("Could not find closing body tag in index.html. Script injection skipped.");
- return;
+ return false;
}
File.WriteAllText(indexPath, newContent);
_logger.LogInformation("Successfully injected Seasonals script into index.html.");
+ return true;
}
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);
+ return false;
}
catch (Exception ex)
{
_logger.LogError(ex, "Error injecting Seasonals script.");
+ return false;
}
}
diff --git a/Jellyfin.Plugin.Seasonals/Web/seasonals.js b/Jellyfin.Plugin.Seasonals/Web/seasonals.js
index d232124..4904d47 100644
--- a/Jellyfin.Plugin.Seasonals/Web/seasonals.js
+++ b/Jellyfin.Plugin.Seasonals/Web/seasonals.js
@@ -162,6 +162,7 @@ async function initializeTheme() {
automateThemeSelection = config.automateSeasonSelection;
defaultTheme = config.selectedSeason;
window.SeasonalsPluginConfig = config;
+ console.log('Seasonals Config loaded:', config);
} else {
console.error('Failed to fetch Seasonals config');
}
@@ -170,7 +171,7 @@ async function initializeTheme() {
}
let currentTheme;
- if (!automateThemeSelection) {
+ if (automateThemeSelection === false) {
currentTheme = defaultTheme;
} else {
currentTheme = determineCurrentTheme();
@@ -178,7 +179,7 @@ async function initializeTheme() {
console.log(`Selected theme: ${currentTheme}`);
- if (currentTheme === 'none') {
+ if (!currentTheme || currentTheme === 'none') {
console.log('No theme selected.');
removeSelf();
return;
@@ -200,8 +201,9 @@ async function initializeTheme() {
removeSelf();
}
-
-//document.addEventListener('DOMContentLoaded', initializeTheme);
-document.addEventListener('DOMContentLoaded', () => {
+// Ensure DOM is ready before initializing
+if (document.readyState === 'loading') {
+ document.addEventListener('DOMContentLoaded', initializeTheme);
+} else {
initializeTheme();
-});
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/bin/Publish/Jellyfin.Plugin.Seasonals.deps.json b/bin/Publish/Jellyfin.Plugin.Seasonals.deps.json
index 7ff4bb9..1b094db 100644
--- a/bin/Publish/Jellyfin.Plugin.Seasonals.deps.json
+++ b/bin/Publish/Jellyfin.Plugin.Seasonals.deps.json
@@ -6,10 +6,11 @@
"compilationOptions": {},
"targets": {
".NETCoreApp,Version=v9.0": {
- "Jellyfin.Plugin.Seasonals/1.1.0.0": {
+ "Jellyfin.Plugin.Seasonals/1.2.0.0": {
"dependencies": {
"Jellyfin.Controller": "10.11.0",
- "Jellyfin.Model": "10.11.0"
+ "Jellyfin.Model": "10.11.0",
+ "Newtonsoft.Json": "13.0.4"
},
"runtime": {
"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": {
"dependencies": {
"Polly.Core": "8.6.4"
@@ -363,7 +372,7 @@
}
},
"libraries": {
- "Jellyfin.Plugin.Seasonals/1.1.0.0": {
+ "Jellyfin.Plugin.Seasonals/1.2.0.0": {
"type": "project",
"serviceable": false,
"sha512": ""
@@ -578,6 +587,13 @@
"path": "nebml/1.1.0.5",
"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": {
"type": "package",
"serviceable": true,
diff --git a/bin/Publish/Jellyfin.Plugin.Seasonals.dll b/bin/Publish/Jellyfin.Plugin.Seasonals.dll
index 4e4d4f07e6acff1304fd3a5c75f4ef9a09e7e5bf..cac93a66f8a206ff5ec5600a6869cad9b3729583 100644
GIT binary patch
delta 14637
zcmc&*34B!LwLjmzvt^PDWMRvCLr5}NN!US_BuJ33LqNcV49O4%k{Osugot>D;x4w}
zSmTBUmm&%lje=;cNuLYUs;IASPk6zdQd_n4xxHuK|2y}K4chkgz4rHeli&T{^FQZ&
z=R4nW@BQwQ=x--Q-<`DMs^MkJmfcS3*Gt2Vcu`JtpNGg{DIYts^S-4X{}B((mx^8w
zeWCBnNsS*s37`v}^-x_$MWw4Gwp2_uP8>xqO^;%EGbsCLg%fn?J*OANWe
zOOrHv7;JrL2nu+eP!*+x$3sz67M_ircPR8lX_sm!QIw@cc~6vHZX+KmM$sg#R8K7)
zqJ@7f-G`A$?z~c4ermBjl!mfyhc_L&l6Xg6sU!c=3>l6b@y_rbxTl3O!Anz};U2K?
z^MLeF7E}o*;+zR5?D>v_6XYtA6%CZ_97Wz0WJgLOz1%_9qITqyy(r7c|`gQXCGhN(pQoSRfDjB4Q=L$5*2BkM2
zn&Vlh&=EccWvBo=-kIw4D$j9RpQp*Le?+#<@I%ms3gMFAO7)@{9JKdaSN8lRJR`-h
z<%LJ-v|bC9Ku)nG+rAk*7!Bo4^p-*wDr2V!a0)L2^j8LDNiSxFJ7i)Cx@ey(rhPKtFV6^==t>=Oo$Thk!EtwnMx#K!9{yOmaA%Bx;>6$-yPjkZ|H#&-9V@j|
zWKtCdx$oDCE|VLYLKtiDyCK(Mv=BEk4(@qc2y@LHnjmHGL}2)9#8WMq1nxac+9w0<
zELy60r$Es3Ef^=8X4`^fZ0J=v7s^owv`L!R#G&Qrn{}DmX6Y23X79^V_W9rx+i}5T
z$^AGLs(7b&8g`|_Re?h&(ANddJ9+qJsprrPr?(QG39fLlqi+V6^wo2RgUo)NGz3L%
zMiE!|J@|${;{tMiC&szbyj2iN(o}^PJHM0Ri3Vq!w;C?WA<@<6AiE!tPgLhC(-xTe
zk`0?Ot#30vk(FY%yf9XVyDx+sE41eXCE1FE8m`l)X+$o@2KmzI0U}EdmpslN1xF{M
zYy0=C{rFwbJFJ=5zXwhG@oQlD3%yjTort)?jYuN=CLoQEbneA|Jn_s{zx8d(Jn2UF
zHMusvuPJgsPo$^dtR_b~$!3OM`PQbUWM2y}yNrhRweYgrC|$Pj=h|k>8(T;oJK;eI
zv_3mEG##>a4vV*}-m{@;gNrCiDc9&qv`_vt?+oa*a2|?z2cS2!A>JfY?jtzJ9NrWb
zF|Qo*d<-ql-wrR%v=Em_aTtrMq==Iwv@KFZS`ar$5yuL|ZBoo(@g^yv4bbkFVjckJ
z<;^&A+lq$c&~SF`u+I=;O6*m~PT(5nMqsb=Dd0V>+kn+^?ZBTgj&noqI^aGV1-d?q
zcMDSleKUJdME2c^Pnx#y$6s^
zqUMSV&6iwOuG3mM0{Cg+UGPs2Er6-S5xxhcNDIHxUw7Qn{l35MOG}rS*stu6#Phgt
zX@BK-kfQKxiCLO=p-iAG(uIVg@;W1R+-F&O2;5zCq0Z;tyiz@Xa8Y;*ig|JQkx9p%
z8jxq=Vv~C*Q38gr4i|>p#jW8$uqh%NQjeavHxarei^;WuNM7-BXD*qAxkp36{}WxE
zTiqPObm53DATopEvTpkIm6@*FD``BjM#V2fdOh7!vZn&}=kW>Y1zL(Fn%7PFyn^-&=$Wp;#ZBdLK|A=}2_;Fr~Z
z#RuQ|U5hA22(IZf3S2D>iJGNsH(K(sKsVuhAwS*h7>