From 87ee56de65bffe8554ae9b42750c36ea251ffe53 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sun, 24 Nov 2024 18:33:27 +0000 Subject: [PATCH 1/9] release v1.10.10.10 --- .github/ISSUE_TEMPLATE/bug_report_form.yml | 2 +- IntroSkipper/IntroSkipper.csproj | 4 +- README.md | 2 +- manifest.json | 50 ++++------------------ 4 files changed, 13 insertions(+), 45 deletions(-) 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/IntroSkipper/IntroSkipper.csproj b/IntroSkipper/IntroSkipper.csproj index 72c1b97..7044bb1 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.10 + 1.10.10.10 true true enable diff --git a/README.md b/README.md index 4026843..5d2efd0 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 diff --git a/manifest.json b/manifest.json index 26dfd32..6a78b6f 100644 --- a/manifest.json +++ b/manifest.json @@ -8,6 +8,14 @@ "category": "General", "imageUrl": "https://raw.githubusercontent.com/intro-skipper/intro-skipper/master/images/logo.png", "versions": [ + { + "version": "1.10.10.10", + "changelog": "- See the full changelog at [GitHub](https://github.com/intro-skipper/intro-skipper/releases/tag/10.10/v1.10.10.10)\n", + "targetAbi": "10.10.3.0", + "sourceUrl": "https://github.com/intro-skipper/intro-skipper/releases/download/10.10/v1.10.10.10/intro-skipper-v1.10.10.10.zip", + "checksum": "96ec29871e726ece01fbf7ccb24ae392", + "timestamp": "2024-11-24T18:33:26Z" + }, { "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", @@ -15,47 +23,7 @@ "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" } ] } -] +] \ No newline at end of file From cb0fdb92adfceaad44ae2b31dbbe0b40d21ee750 Mon Sep 17 00:00:00 2001 From: TwistedUmbrellaX <1173913+AbandonedCart@users.noreply.github.com> Date: Mon, 25 Nov 2024 11:25:44 -0500 Subject: [PATCH 2/9] Clearer separation between erase types --- IntroSkipper/Configuration/configPage.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/IntroSkipper/Configuration/configPage.html b/IntroSkipper/Configuration/configPage.html index 36b41ca..81b74dc 100644 --- a/IntroSkipper/Configuration/configPage.html +++ b/IntroSkipper/Configuration/configPage.html @@ -687,6 +687,7 @@
+
From d4f88e0f3e5f290becc0ac27b5fed6ef1a13db99 Mon Sep 17 00:00:00 2001 From: rlauu <46294892+rlauu@users.noreply.github.com> Date: Mon, 25 Nov 2024 17:32:04 +0100 Subject: [PATCH 3/9] Create db before trying to restore timestamps --- IntroSkipper/Plugin.cs | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/IntroSkipper/Plugin.cs b/IntroSkipper/Plugin.cs index 61b3981..7711b58 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); - } - 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); + } + catch (Exception ex) + { + logger.LogError("Failed to perform migrations. Error: {Error}", ex); + } + FFmpegWrapper.CheckFFmpegVersion(); } From 4995fc7b70ba29f6f51b9ef1c57f02ef60f17ca6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2024 18:04:58 +0100 Subject: [PATCH 4/9] ci(deps): bump github/codeql-action from 3.27.4 to 3.27.5 (#399) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.27.4 to 3.27.5. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/ea9e4e37992a54ee68a9622e985e60c8e8f12d9f...f09c1c0a94de965c15400f5634aa42fac8fb8f88) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 From 1048eaf26d7ea11c2a521b48a8ce4aaf5b90f53d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2024 18:05:35 +0100 Subject: [PATCH 5/9] chore(deps): bump Microsoft.NET.Test.Sdk from 17.11.1 to 17.12.0 (#400) Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 17.11.1 to 17.12.0. - [Release notes](https://github.com/microsoft/vstest/releases) - [Changelog](https://github.com/microsoft/vstest/blob/main/docs/releases.md) - [Commits](https://github.com/microsoft/vstest/compare/v17.11.1...v17.12.0) --- updated-dependencies: - dependency-name: Microsoft.NET.Test.Sdk dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- IntroSkipper.Tests/IntroSkipper.Tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 724c237592f481730880371d078a88db21b01b28 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 25 Nov 2024 17:07:33 +0000 Subject: [PATCH 6/9] release v1.10.10.11 --- IntroSkipper/IntroSkipper.csproj | 4 ++-- manifest.json | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/IntroSkipper/IntroSkipper.csproj b/IntroSkipper/IntroSkipper.csproj index 7044bb1..bf676ae 100644 --- a/IntroSkipper/IntroSkipper.csproj +++ b/IntroSkipper/IntroSkipper.csproj @@ -2,8 +2,8 @@ net8.0 IntroSkipper - 1.10.10.10 - 1.10.10.10 + 1.10.10.11 + 1.10.10.11 true true enable diff --git a/manifest.json b/manifest.json index 6a78b6f..56399a9 100644 --- a/manifest.json +++ b/manifest.json @@ -8,6 +8,14 @@ "category": "General", "imageUrl": "https://raw.githubusercontent.com/intro-skipper/intro-skipper/master/images/logo.png", "versions": [ + { + "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" + }, { "version": "1.10.10.10", "changelog": "- See the full changelog at [GitHub](https://github.com/intro-skipper/intro-skipper/releases/tag/10.10/v1.10.10.10)\n", From 18d0847ae0737fd7c9db60fbe31d565ea53b33dd Mon Sep 17 00:00:00 2001 From: TwistedUmbrellaX <1173913+AbandonedCart@users.noreply.github.com> Date: Tue, 26 Nov 2024 09:59:39 -0500 Subject: [PATCH 7/9] Cleaning up the UI (#401) * Update configPage.html * Update configPage.html * Update configPage.html * Wrap the larger paragraph --- IntroSkipper/Configuration/configPage.html | 47 ++++++++++------------ 1 file changed, 22 insertions(+), 25 deletions(-) diff --git a/IntroSkipper/Configuration/configPage.html b/IntroSkipper/Configuration/configPage.html index 81b74dc..fb6c2b9 100644 --- a/IntroSkipper/Configuration/configPage.html +++ b/IntroSkipper/Configuration/configPage.html @@ -455,8 +455,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. +


@@ -623,10 +625,9 @@
-
-
+


@@ -711,18 +710,16 @@
-

+

-
-
- Support Bundle Info + Intro Skipper Support Log
From d7d39498876b25c121d907e09f2e83e000016e60 Mon Sep 17 00:00:00 2001 From: TwistedUmbrellaX <1173913+AbandonedCart@users.noreply.github.com> Date: Tue, 26 Nov 2024 13:09:46 -0500 Subject: [PATCH 8/9] Change a wiki heading --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5d2efd0..ef0e370 100644 --- a/README.md +++ b/README.md @@ -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) From 3139c15eb1c8680678ab4e7d0bc3435cc5af3882 Mon Sep 17 00:00:00 2001 From: Kilian von Pflugk Date: Tue, 26 Nov 2024 21:58:10 +0000 Subject: [PATCH 9/9] remove older plugin version prevent user installation of versions with known bugs --- manifest.json | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/manifest.json b/manifest.json index 56399a9..967d960 100644 --- a/manifest.json +++ b/manifest.json @@ -15,23 +15,7 @@ "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" - }, - { - "version": "1.10.10.10", - "changelog": "- See the full changelog at [GitHub](https://github.com/intro-skipper/intro-skipper/releases/tag/10.10/v1.10.10.10)\n", - "targetAbi": "10.10.3.0", - "sourceUrl": "https://github.com/intro-skipper/intro-skipper/releases/download/10.10/v1.10.10.10/intro-skipper-v1.10.10.10.zip", - "checksum": "96ec29871e726ece01fbf7ccb24ae392", - "timestamp": "2024-11-24T18:33:26Z" - }, - { - "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" } ] } -] \ No newline at end of file +]