fix: emby 4.8

DirtyRacer1337 · Sep 20, 2024 · b059c34 · b059c34
1 parent 6b10e89
commit b059c34
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 10 deletions.
diff --git a/Jellyfin.Plugin.Stash/Configuration/PluginConfiguration.cs b/Jellyfin.Plugin.Stash/Configuration/PluginConfiguration.cs
@@ -1,9 +1,20 @@
+#if __EMBY__
+using Emby.Web.GenericEdit;
+#else
 using MediaBrowser.Model.Plugins;
+#endif
 
 namespace Stash.Configuration
 {
+#if __EMBY__
+    public class PluginConfiguration : EditableOptionsBase
+    {
+        public override string EditorTitle => Plugin.Instance.Name;
+
+#else
     public class PluginConfiguration : BasePluginConfiguration
     {
+#endif
         public PluginConfiguration()
         {
             this.StashEndpoint = "http://localhost:9999";

diff --git a/Jellyfin.Plugin.Stash/Plugin.cs b/Jellyfin.Plugin.Stash/Plugin.cs
@@ -1,17 +1,17 @@
 using System;
 using System.Collections.Generic;
-using MediaBrowser.Common.Configuration;
 using MediaBrowser.Common.Plugins;
 using MediaBrowser.Model.Plugins;
-using MediaBrowser.Model.Serialization;
 using Stash.Configuration;
 
 #if __EMBY__
-using System.IO;
+using MediaBrowser.Common;
 using MediaBrowser.Common.Net;
-using MediaBrowser.Model.Drawing;
 using MediaBrowser.Model.Logging;
+using MediaBrowser.Controller.Plugins;
 #else
+using MediaBrowser.Model.Serialization;
+using MediaBrowser.Common.Configuration;
 using System.Net.Http;
 using Microsoft.Extensions.Logging;
 #endif
@@ -21,15 +21,14 @@
 namespace Stash
 {
 #if __EMBY__
-    public class Plugin : BasePlugin<PluginConfiguration>, IHasWebPages
+    public class Plugin : BasePluginSimpleUI<PluginConfiguration>
     {
-        public Plugin(IApplicationPaths applicationPaths, IXmlSerializer xmlSerializer, IHttpClient http, ILogManager logger)
+        public Plugin(IApplicationHost applicationHost, IHttpClient http, ILogManager logger) : base(applicationHost)
 #else
     public class Plugin : BasePlugin<PluginConfiguration>, IHasWebPages
     {
-        public Plugin(IApplicationPaths applicationPaths, IXmlSerializer xmlSerializer, IHttpClientFactory http, ILogger<Plugin> logger)
+        public Plugin(IApplicationPaths applicationPaths, IXmlSerializer xmlSerializer, IHttpClientFactory http, ILogger<Plugin> logger) : base(applicationPaths, xmlSerializer)
 #endif
-            : base(applicationPaths, xmlSerializer)
         {
             Instance = this;
             Http = http;
@@ -58,6 +57,11 @@ public Plugin(IApplicationPaths applicationPaths, IXmlSerializer xmlSerializer,
 
         public override Guid Id => Guid.Parse("57b8ef5d-8835-436d-9514-a709ee25faf2");
 
+#if __EMBY__
+        public PluginConfiguration Configuration => GetOptions();
+#else
+#endif
+
         public IEnumerable<PluginPageInfo> GetPages()
             => new[]
             {

diff --git a/Jellyfin.Plugin.Stash/Stash.csproj b/Jellyfin.Plugin.Stash/Stash.csproj
@@ -48,7 +48,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(Configuration)'=='Debug.Emby' or '$(Configuration)'=='Release.Emby'">
-    <PackageReference Include="MediaBrowser.Server.Core" Version="4.7.9" />
+    <PackageReference Include="MediaBrowser.Server.Core" Version="4.8.5" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(Configuration)'=='Debug' or '$(Configuration)'=='Debug.Emby'">
@@ -63,7 +63,10 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(Configuration)'=='Release' or '$(Configuration)'=='Release.Emby'">
-    <PackageReference Include="ILRepack.Lib.MSBuild.Task" Version="2.0.18.2" />
+    <PackageReference Include="ILRepack.Lib.MSBuild.Task" Version="2.0.34.2">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>