From 6dddf6f856fabdacc7cc5a58166c5eca228e0d50 Mon Sep 17 00:00:00 2001 From: xjasonlyu Date: Sun, 29 May 2022 17:10:50 +0800 Subject: [PATCH] style improve --- .../Providers/ActorImageProvider.cs | 3 ++- .../Providers/ActorProvider.cs | 1 + .../Providers/MovieImageProvider.cs | 15 ++++++++------- .../Providers/MovieProvider.cs | 15 +++++++-------- 4 files changed, 18 insertions(+), 16 deletions(-) diff --git a/Jellyfin.Plugin.JavTube/Providers/ActorImageProvider.cs b/Jellyfin.Plugin.JavTube/Providers/ActorImageProvider.cs index 9695ef4..f2e40ed 100644 --- a/Jellyfin.Plugin.JavTube/Providers/ActorImageProvider.cs +++ b/Jellyfin.Plugin.JavTube/Providers/ActorImageProvider.cs @@ -7,6 +7,7 @@ using MediaBrowser.Model.Providers; using MediaBrowser.Common.Net; using MediaBrowser.Model.Logging; using MediaBrowser.Model.Configuration; + #else using Microsoft.Extensions.Logging; #endif @@ -45,7 +46,7 @@ public class ActorImageProvider : BaseProvider, IRemoteImageProvider, IHasOrder return actorInfo.Images.Select(image => new RemoteImageInfo { - ProviderName = Name, + ProviderName = Name, Type = ImageType.Primary, Url = ApiClient.GetPrimaryImageApiUrl(actorInfo.Id, actorInfo.Provider, image) }).ToList(); diff --git a/Jellyfin.Plugin.JavTube/Providers/ActorProvider.cs b/Jellyfin.Plugin.JavTube/Providers/ActorProvider.cs index dde1228..decd861 100644 --- a/Jellyfin.Plugin.JavTube/Providers/ActorProvider.cs +++ b/Jellyfin.Plugin.JavTube/Providers/ActorProvider.cs @@ -6,6 +6,7 @@ using MediaBrowser.Model.Providers; #if __EMBY__ using MediaBrowser.Common.Net; using MediaBrowser.Model.Logging; + #else using Microsoft.Extensions.Logging; #endif diff --git a/Jellyfin.Plugin.JavTube/Providers/MovieImageProvider.cs b/Jellyfin.Plugin.JavTube/Providers/MovieImageProvider.cs index d768c10..3b254f2 100644 --- a/Jellyfin.Plugin.JavTube/Providers/MovieImageProvider.cs +++ b/Jellyfin.Plugin.JavTube/Providers/MovieImageProvider.cs @@ -1,16 +1,17 @@ -#if __EMBY__ -using MediaBrowser.Common.Net; -using MediaBrowser.Model.Configuration; -using MediaBrowser.Model.Logging; -#else -using Microsoft.Extensions.Logging; -#endif using Jellyfin.Plugin.JavTube.Extensions; using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Entities.Movies; using MediaBrowser.Controller.Providers; using MediaBrowser.Model.Entities; using MediaBrowser.Model.Providers; +#if __EMBY__ +using MediaBrowser.Common.Net; +using MediaBrowser.Model.Configuration; +using MediaBrowser.Model.Logging; + +#else +using Microsoft.Extensions.Logging; +#endif namespace Jellyfin.Plugin.JavTube.Providers; diff --git a/Jellyfin.Plugin.JavTube/Providers/MovieProvider.cs b/Jellyfin.Plugin.JavTube/Providers/MovieProvider.cs index 9400e27..60e4ed7 100644 --- a/Jellyfin.Plugin.JavTube/Providers/MovieProvider.cs +++ b/Jellyfin.Plugin.JavTube/Providers/MovieProvider.cs @@ -1,9 +1,3 @@ -#if __EMBY__ -using MediaBrowser.Common.Net; -using MediaBrowser.Model.Logging; -#else -using Microsoft.Extensions.Logging; -#endif using Jellyfin.Plugin.JavTube.Extensions; using Jellyfin.Plugin.JavTube.Models; using MediaBrowser.Controller.Entities; @@ -11,6 +5,13 @@ using MediaBrowser.Controller.Entities.Movies; using MediaBrowser.Controller.Providers; using MediaBrowser.Model.Entities; using MediaBrowser.Model.Providers; +#if __EMBY__ +using MediaBrowser.Common.Net; +using MediaBrowser.Model.Logging; + +#else +using Microsoft.Extensions.Logging; +#endif namespace Jellyfin.Plugin.JavTube.Providers; @@ -102,10 +103,8 @@ public class MovieProvider : BaseProvider, IRemoteMetadataProvider