diff --git a/.github/ISSUE_TEMPLATE/bug_report_form.yml b/.github/ISSUE_TEMPLATE/bug_report_form.yml index 97cb75d..467fb91 100644 --- a/.github/ISSUE_TEMPLATE/bug_report_form.yml +++ b/.github/ISSUE_TEMPLATE/bug_report_form.yml @@ -13,7 +13,7 @@ body: Many servers have permission issues that can be resolved with a few extra steps. If your skip button is not shown, please see [Troubleshooting](https://github.com/intro-skipper/intro-skipper/wiki/Troubleshooting#skip-button-is-not-visible) before reporting. options: - - label: I use Jellyfin 10.10.2 (or newer) and my permissions are correct + - label: I use Jellyfin 10.10.3 (or newer) and my permissions are correct required: true - type: textarea attributes: diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 89d45b0..ba44209 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -55,13 +55,13 @@ jobs: run: dotnet restore - name: Initialize CodeQL - uses: github/codeql-action/init@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # v3.27.4 + uses: github/codeql-action/init@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5 with: languages: ${{ matrix.language }} queries: +security-extended - name: Autobuild - uses: github/codeql-action/autobuild@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # v3.27.4 + uses: github/codeql-action/autobuild@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5 - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # v3.27.4 + uses: github/codeql-action/analyze@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5 diff --git a/IntroSkipper.Tests/IntroSkipper.Tests.csproj b/IntroSkipper.Tests/IntroSkipper.Tests.csproj index d4927b6..fbe21c9 100644 --- a/IntroSkipper.Tests/IntroSkipper.Tests.csproj +++ b/IntroSkipper.Tests/IntroSkipper.Tests.csproj @@ -8,7 +8,7 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/IntroSkipper/Configuration/configPage.html b/IntroSkipper/Configuration/configPage.html index 5d61118..7e989e6 100644 --- a/IntroSkipper/Configuration/configPage.html +++ b/IntroSkipper/Configuration/configPage.html @@ -432,8 +432,10 @@

Analyzer actions

Choose how segments should be analyzed for this season.
- Default uses all available detection methods (Chromaprint, Chapter, and BlackFrame for credits).
- Select specific methods to limit analysis, or None to skip detection entirely. + + Default uses all available detection methods (Chromaprint, Chapter, and BlackFrame for credits).
+ Select specific methods to limit analysis, or None to skip detection entirely. +


@@ -600,10 +602,9 @@ -
-
+


@@ -686,18 +687,16 @@
-

+

-
-
- Support Bundle Info + Intro Skipper Support Log
diff --git a/IntroSkipper/IntroSkipper.csproj b/IntroSkipper/IntroSkipper.csproj index 72c1b97..bf676ae 100644 --- a/IntroSkipper/IntroSkipper.csproj +++ b/IntroSkipper/IntroSkipper.csproj @@ -2,8 +2,8 @@ net8.0 IntroSkipper - 1.10.10.9 - 1.10.10.9 + 1.10.10.11 + 1.10.10.11 true true enable diff --git a/IntroSkipper/Plugin.cs b/IntroSkipper/Plugin.cs index d5c05e7..7011ee5 100644 --- a/IntroSkipper/Plugin.cs +++ b/IntroSkipper/Plugin.cs @@ -77,15 +77,6 @@ public class Plugin : BasePlugin, IHasWebPages Directory.CreateDirectory(FingerprintCachePath); } - try - { - LegacyMigrations.MigrateAll(this, serverConfiguration, logger, applicationPaths, _libraryManager); - } - catch (Exception ex) - { - logger.LogError("Failed to perform migrations. Error: {Error}", ex); - } - // Initialize database, restore timestamps if available. try { @@ -97,6 +88,15 @@ public class Plugin : BasePlugin, IHasWebPages logger.LogWarning("Error initializing database: {Exception}", ex); } + try + { + LegacyMigrations.MigrateAll(this, serverConfiguration, logger, applicationPaths, _libraryManager); + } + catch (Exception ex) + { + logger.LogError("Failed to perform migrations. Error: {Error}", ex); + } + FFmpegWrapper.CheckFFmpegVersion(); } diff --git a/README.md b/README.md index 4026843..ef0e370 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ https://manifest.intro-skipper.org/manifest.json ## System requirements -* Jellyfin 10.10.2 (or newer) +* Jellyfin 10.10.3 (or newer) * Jellyfin's [fork](https://github.com/jellyfin/jellyfin-ffmpeg) of `ffmpeg` must be installed, version `7.0.2-5` or newer * `jellyfin/jellyfin` 10.10.z container: preinstalled * `linuxserver/jellyfin` 10.10.z container: preinstalled @@ -48,7 +48,7 @@ https://manifest.intro-skipper.org/manifest.json - #### [Scheduled tasks fail instantly](https://github.com/intro-skipper/intro-skipper/wiki/Troubleshooting#scheduled-tasks-fail-instantly) - #### [Plugin settings not saved](https://github.com/intro-skipper/intro-skipper/wiki/Troubleshooting#plugin-settings-not-saved) - #### [Skip button is not visible](https://github.com/intro-skipper/intro-skipper/wiki/Troubleshooting#skip-button-is-not-visible) -- #### [Autoskip is not working](https://github.com/intro-skipper/intro-skipper/wiki/Troubleshooting#autoskip-is-not-working) +- #### [Auto skip is not working](https://github.com/intro-skipper/intro-skipper/wiki/Troubleshooting#auto-skip-is-not-working) ## [API Documentation](https://github.com/intro-skipper/intro-skipper/blob/master/docs/api.md) diff --git a/manifest.json b/manifest.json index 26dfd32..967d960 100644 --- a/manifest.json +++ b/manifest.json @@ -9,52 +9,12 @@ "imageUrl": "https://raw.githubusercontent.com/intro-skipper/intro-skipper/master/images/logo.png", "versions": [ { - "version": "1.10.10.9", - "changelog": "- See the full changelog at [GitHub](https://github.com/intro-skipper/intro-skipper/releases/tag/10.10/v1.10.10.9)\n", - "targetAbi": "10.10.2.0", - "sourceUrl": "https://github.com/intro-skipper/intro-skipper/releases/download/10.10/v1.10.10.9/intro-skipper-v1.10.10.9.zip", - "checksum": "a39436ee4476a4e74acbafbaf1008dfb", - "timestamp": "2024-11-17T21:14:18Z" - }, - { - "version": "1.10.10.7", - "changelog": "- See the full changelog at [GitHub](https://github.com/intro-skipper/intro-skipper/releases/tag/10.10/v1.10.10.7)\n", - "targetAbi": "10.10.1.0", - "sourceUrl": "https://github.com/intro-skipper/intro-skipper/releases/download/10.10/v1.10.10.7/intro-skipper-v1.10.10.7.zip", - "checksum": "5b2c8de6dd09af7a5754c634bd42e83b", - "timestamp": "2024-11-12T18:43:24Z" - }, - { - "version": "1.10.10.6", - "changelog": "- See the full changelog at [GitHub](https://github.com/intro-skipper/intro-skipper/releases/tag/10.10/v1.10.10.6)\n", - "targetAbi": "10.10.1.0", - "sourceUrl": "https://github.com/intro-skipper/intro-skipper/releases/download/10.10/v1.10.10.6/intro-skipper-v1.10.10.6.zip", - "checksum": "e795759bf4330fa039015220ee519d71", - "timestamp": "2024-11-06T09:31:59Z" - }, - { - "version": "1.10.10.5", - "changelog": "- See the full changelog at [GitHub](https://github.com/intro-skipper/intro-skipper/releases/tag/10.10/v1.10.10.5)\n", - "targetAbi": "10.10.1.0", - "sourceUrl": "https://github.com/intro-skipper/intro-skipper/releases/download/10.10/v1.10.10.5/intro-skipper-v1.10.10.5.zip", - "checksum": "30e518b6caa4b7350e19cb934adf889a", - "timestamp": "2024-11-05T21:09:51Z" - }, - { - "version": "1.10.10.4", - "changelog": "- See the full changelog at [GitHub](https://github.com/intro-skipper/intro-skipper/releases/tag/10.10/v1.10.10.4)\n", - "targetAbi": "10.10.1.0", - "sourceUrl": "https://github.com/intro-skipper/intro-skipper/releases/download/10.10/v1.10.10.4/intro-skipper-v1.10.10.4.zip", - "checksum": "6fe00d82d0b8c5f01e59974c16a866ec", - "timestamp": "2024-11-05T14:34:34Z" - }, - { - "version": "1.10.10.3", - "changelog": "- See the full changelog at [GitHub](https://github.com/intro-skipper/intro-skipper/releases/tag/10.10/v1.10.10.3)\n", - "targetAbi": "10.10.1.0", - "sourceUrl": "https://github.com/intro-skipper/intro-skipper/releases/download/10.10/v1.10.10.3/intro-skipper-v1.10.10.3.zip", - "checksum": "a79860821dcfc16784faa3c143f860b9", - "timestamp": "2024-11-04T20:25:58Z" + "version": "1.10.10.11", + "changelog": "- See the full changelog at [GitHub](https://github.com/intro-skipper/intro-skipper/releases/tag/10.10/v1.10.10.11)\n", + "targetAbi": "10.10.3.0", + "sourceUrl": "https://github.com/intro-skipper/intro-skipper/releases/download/10.10/v1.10.10.11/intro-skipper-v1.10.10.11.zip", + "checksum": "30a71fd3996e0fbe9076371539b1ca56", + "timestamp": "2024-11-25T17:07:33Z" } ] }