From de02e898752cb054460b2e83c94d5657fe70b442 Mon Sep 17 00:00:00 2001 From: Cody Robibero Date: Sat, 11 May 2024 13:26:09 -0600 Subject: [PATCH] 10.9 (#21) --- .../Jellyfin.Plugin.IMVDb.csproj | 6 +++--- .../PluginServiceRegistrator.cs | 5 +++-- .../Providers/ImvdbProvider.cs | 17 ++++++++--------- build.yaml | 7 ++----- 4 files changed, 16 insertions(+), 19 deletions(-) diff --git a/Jellyfin.Plugin.IMVDb/Jellyfin.Plugin.IMVDb.csproj b/Jellyfin.Plugin.IMVDb/Jellyfin.Plugin.IMVDb.csproj index 58f08cb..0c201f7 100644 --- a/Jellyfin.Plugin.IMVDb/Jellyfin.Plugin.IMVDb.csproj +++ b/Jellyfin.Plugin.IMVDb/Jellyfin.Plugin.IMVDb.csproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 true true enable @@ -16,13 +16,13 @@ - + - + diff --git a/Jellyfin.Plugin.IMVDb/PluginServiceRegistrator.cs b/Jellyfin.Plugin.IMVDb/PluginServiceRegistrator.cs index 239dc6e..d2564e7 100644 --- a/Jellyfin.Plugin.IMVDb/PluginServiceRegistrator.cs +++ b/Jellyfin.Plugin.IMVDb/PluginServiceRegistrator.cs @@ -1,4 +1,5 @@ -using MediaBrowser.Common.Plugins; +using MediaBrowser.Controller; +using MediaBrowser.Controller.Plugins; using Microsoft.Extensions.DependencyInjection; namespace Jellyfin.Plugin.IMVDb; @@ -9,7 +10,7 @@ namespace Jellyfin.Plugin.IMVDb; public class PluginServiceRegistrator : IPluginServiceRegistrator { /// - public void RegisterServices(IServiceCollection serviceCollection) + public void RegisterServices(IServiceCollection serviceCollection, IServerApplicationHost applicationHost) { serviceCollection.AddScoped(); } diff --git a/Jellyfin.Plugin.IMVDb/Providers/ImvdbProvider.cs b/Jellyfin.Plugin.IMVDb/Providers/ImvdbProvider.cs index 8d0577a..8b0309f 100644 --- a/Jellyfin.Plugin.IMVDb/Providers/ImvdbProvider.cs +++ b/Jellyfin.Plugin.IMVDb/Providers/ImvdbProvider.cs @@ -5,6 +5,7 @@ using System.Linq; using System.Net.Http; using System.Threading; using System.Threading.Tasks; +using Jellyfin.Data.Enums; using MediaBrowser.Common.Net; using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Providers; @@ -78,16 +79,14 @@ public class ImvdbProvider : IRemoteMetadataProvider { Name = releaseResult.SongTitle, ProductionYear = releaseResult.Year, - Artists = releaseResult.Artists.Select(i => i.Name).ToArray(), - ImageInfos = new[] - { - new ItemImageInfo - { - Path = releaseResult.Image?.Size1 - } - } + Artists = releaseResult.Artists.Select(i => i.Name).ToArray() }; + if (!string.IsNullOrEmpty(releaseResult.Image?.Size1)) + { + result.Item.ImageInfos = [new ItemImageInfo { Path = releaseResult.Image.Size1 }]; + } + foreach (var director in releaseResult.Directors) { result.AddPerson(new PersonInfo @@ -98,7 +97,7 @@ public class ImvdbProvider : IRemoteMetadataProvider { ImvdbPlugin.ProviderName, director.Id.ToString(CultureInfo.InvariantCulture) }, { ImvdbPlugin.ProviderName + "_slug", director.Url }, }, - Type = director.Position + Type = PersonKind.Director }); } diff --git a/build.yaml b/build.yaml index dc101c3..cd9caf2 100644 --- a/build.yaml +++ b/build.yaml @@ -2,8 +2,8 @@ name: "IMVDb" guid: "e29621a5-fa9e-4330-982e-ef6e54c0cad2" version: "4" -targetAbi: "10.8.0.0" -framework: "net6.0" +targetAbi: "10.9.0.0" +framework: "net8.0" owner: "jellyfin" overview: "Get Music Video metadata from IMVDb" description: > @@ -13,7 +13,4 @@ category: "Metadata" artifacts: - "Jellyfin.Plugin.IMVDb.dll" changelog: |- - - Use meta ci (#8) @crobibero - ### Code or Repo Maintenance ### - - 10.8 support (#11) @crobibero