From 52dd2deb009f10bc4bbc6155b39751b70b0a0335 Mon Sep 17 00:00:00 2001 From: DirtyRacer1337 Date: Mon, 8 Jul 2024 05:55:07 +0700 Subject: [PATCH] update to jellyfin 10.9 --- .github/workflows/codeql-analysis.yml | 12 ++++----- .github/workflows/release.yml | 18 ++++++------- .../Helpers/Actors.cs | 6 ++--- .../Helpers/Utils/Analytics.cs | 2 +- .../PhoenixAdult.csproj | 25 +++++++++++-------- 5 files changed, 32 insertions(+), 31 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index c2a6f534..16eb4f44 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -22,17 +22,15 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Setup .NET Core - uses: actions/setup-dotnet@v1 - with: - dotnet-version: "6.0.x" + uses: actions/setup-dotnet@v4 - name: Initialize CodeQL - uses: github/codeql-action/init@v2 + uses: github/codeql-action/init@v3 with: languages: ${{ matrix.language }} queries: +security-extended - name: Autobuild - uses: github/codeql-action/autobuild@v2 + uses: github/codeql-action/autobuild@v3 - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 + uses: github/codeql-action/analyze@v3 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2d0561d3..24ae45cc 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -12,23 +12,23 @@ jobs: jellyfin: runs-on: windows-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Add msbuild to PATH - uses: microsoft/setup-msbuild@v1.1 + uses: microsoft/setup-msbuild@v2 - name: Build app for release run: MSBuild -t:Restore,Build -p:RestorePackagesConfig=true -property:Configuration=Release - name: Rename Files - run: ren Jellyfin.Plugin.PhoenixAdult/bin/Release/net6.0/PhoenixAdult.dll Jellyfin.Plugin.PhoenixAdult.dll && ren Jellyfin.Plugin.PhoenixAdult/bin/Release/net6.0/PhoenixAdult.pdb Jellyfin.Plugin.PhoenixAdult.pdb + run: ren Jellyfin.Plugin.PhoenixAdult/bin/Release/net8.0/PhoenixAdult.dll Jellyfin.Plugin.PhoenixAdult.dll && ren Jellyfin.Plugin.PhoenixAdult/bin/Release/net8.0/PhoenixAdult.pdb Jellyfin.Plugin.PhoenixAdult.pdb - uses: vimtor/action-zip@v1 with: - files: Jellyfin.Plugin.PhoenixAdult/bin/Release/net6.0/Jellyfin.Plugin.PhoenixAdult.pdb Jellyfin.Plugin.PhoenixAdult/bin/Release/net6.0/Jellyfin.Plugin.PhoenixAdult.dll + files: Jellyfin.Plugin.PhoenixAdult/bin/Release/net8.0/Jellyfin.Plugin.PhoenixAdult.pdb Jellyfin.Plugin.PhoenixAdult/bin/Release/net8.0/Jellyfin.Plugin.PhoenixAdult.dll dest: Jellyfin.Plugin.PhoenixAdult.zip - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: if-no-files-found: error name: Jellyfin @@ -37,10 +37,10 @@ jobs: emby: runs-on: windows-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Add msbuild to PATH - uses: microsoft/setup-msbuild@v1.1 + uses: microsoft/setup-msbuild@v2 - name: Build app for release run: MSBuild -t:Restore,Build -p:RestorePackagesConfig=true -property:Configuration=Release.Emby @@ -53,7 +53,7 @@ jobs: files: Jellyfin.Plugin.PhoenixAdult/bin/Release.Emby/netstandard2.1/Emby.Plugins.PhoenixAdult.pdb Jellyfin.Plugin.PhoenixAdult/bin/Release.Emby/netstandard2.1/Emby.Plugins.PhoenixAdult.dll dest: Emby.Plugins.PhoenixAdult.zip - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: if-no-files-found: error name: Emby @@ -64,7 +64,7 @@ jobs: needs: [jellyfin, emby] steps: - name: Download all artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 - uses: marvinpinto/action-automatic-releases@latest with: diff --git a/Jellyfin.Plugin.PhoenixAdult/Helpers/Actors.cs b/Jellyfin.Plugin.PhoenixAdult/Helpers/Actors.cs index d8767ff3..b5a3dc1d 100644 --- a/Jellyfin.Plugin.PhoenixAdult/Helpers/Actors.cs +++ b/Jellyfin.Plugin.PhoenixAdult/Helpers/Actors.cs @@ -11,7 +11,7 @@ #if __EMBY__ #else -using MediaBrowser.Model.Entities; +using Jellyfin.Data.Enums; #endif namespace PhoenixAdult.Helpers @@ -44,9 +44,9 @@ public static List Cleanup(MetadataResult scene) #if __EMBY__ #else - if (string.IsNullOrEmpty(newPeople.Type)) + if (string.IsNullOrEmpty(newPeople.Type.ToString())) { - newPeople.Type = PersonType.Actor; + newPeople.Type = PersonKind.Actor; } #endif if (!newPeoples.Any(o => o.Name == newPeople.Name)) diff --git a/Jellyfin.Plugin.PhoenixAdult/Helpers/Utils/Analytics.cs b/Jellyfin.Plugin.PhoenixAdult/Helpers/Utils/Analytics.cs index dfc145ed..c22d4a52 100644 --- a/Jellyfin.Plugin.PhoenixAdult/Helpers/Utils/Analytics.cs +++ b/Jellyfin.Plugin.PhoenixAdult/Helpers/Utils/Analytics.cs @@ -9,7 +9,7 @@ #if __EMBY__ #else -//using Sentry; +// using Sentry; #endif namespace PhoenixAdult.Helpers.Utils diff --git a/Jellyfin.Plugin.PhoenixAdult/PhoenixAdult.csproj b/Jellyfin.Plugin.PhoenixAdult/PhoenixAdult.csproj index 7c468609..888a68a1 100644 --- a/Jellyfin.Plugin.PhoenixAdult/PhoenixAdult.csproj +++ b/Jellyfin.Plugin.PhoenixAdult/PhoenixAdult.csproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 netstandard2.1 PhoenixAdult 10.8.0.0 @@ -37,26 +37,26 @@ - - + + - + - - - + + + - - + + - + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -67,7 +67,10 @@ - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive +