From 4b104b82aa5332f0d5c70152d746b029f9918c2c Mon Sep 17 00:00:00 2001 From: TwistedUmbrellaX Date: Sat, 2 Mar 2024 15:28:28 -0500 Subject: [PATCH 1/4] Hide unused settings when unused (PT 2) --- .../Configuration/configPage.html | 59 ++++++++++++------- 1 file changed, 38 insertions(+), 21 deletions(-) diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/Configuration/configPage.html b/ConfusedPolarBear.Plugin.IntroSkipper/Configuration/configPage.html index 5abfdd3..2a20867 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper/Configuration/configPage.html +++ b/ConfusedPolarBear.Plugin.IntroSkipper/Configuration/configPage.html @@ -224,19 +224,6 @@
Playback -
- - -
- If checked, a skip button will be displayed at the start of an episode's introduction. - This setting only applies to the web interface. -
-
-
-
-
+
+
+ + +
+ If checked, a skip button will be displayed at the start of an episode's introduction. + This setting only applies to the web interface. +
+
+
+
-
+
@@ -282,7 +282,7 @@
-
+
@@ -326,7 +326,7 @@
-
+
@@ -350,13 +350,13 @@ Advanced
- Support Bundle + Support Bundle (ffmpeg)
- Fingerprint Editor + Manage Fingerprints

Select episodes to manage

@@ -528,9 +528,25 @@ var windowHashInterval = 0; + var autoSkip = document.querySelector("input#AutoSkip"); + var skipFirstEpisode = document.querySelector("div#divSkipFirstEpisode"); + var autoSkipNotificationText = document.querySelector("div#divAutoSkipNotificationText"); + + async function autoSkipChanged() { + if (autoSkip.checked) { + skipFirstEpisode.style.display = 'block'; + autoSkipNotificationText.style.display = 'block'; + } else { + skipFirstEpisode.style.display = 'none'; + autoSkipNotificationText.style.display = 'none'; + } + } + + autoSkip.addEventListener("change", autoSkipChanged); + var persistSkip = document.querySelector("input#PersistSkipButton"); - var showAdjustment = document.querySelector("input#ShowPromptAdjustment"); - var hideAdjustment = document.querySelector("input#HidePromptAdjustment"); + var showAdjustment = document.querySelector("div#divShowPromptAdjustment"); + var hideAdjustment = document.querySelector("div#divHidePromptAdjustment"); // prevent setting unavailable options async function persistSkipChanged() { @@ -823,6 +839,7 @@ document.querySelector("#" + field).checked = config[field]; } + autoSkipChanged(); persistSkipChanged(); Dashboard.hideLoadingMsg(); From b467ef4a82ca33680de49ba400100c98edba6f76 Mon Sep 17 00:00:00 2001 From: TwistedUmbrellaX Date: Sat, 2 Mar 2024 20:30:30 -0500 Subject: [PATCH 2/4] Handle episode where intro is not OP --- .../Analyzers/ChapterAnalyzer.cs | 5 ++++- .../Configuration/configPage.html | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/Analyzers/ChapterAnalyzer.cs b/ConfusedPolarBear.Plugin.IntroSkipper/Analyzers/ChapterAnalyzer.cs index 558c0e9..b22e428 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper/Analyzers/ChapterAnalyzer.cs +++ b/ConfusedPolarBear.Plugin.IntroSkipper/Analyzers/ChapterAnalyzer.cs @@ -151,7 +151,10 @@ public class ChapterAnalyzer : IMediaFileAnalyzer matchingChapter = new(episode.EpisodeId, currentRange); _logger.LogTrace("{Base}: okay", baseMessage); - break; + if (i > 0) + { + break; + } } return matchingChapter; diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/Configuration/configPage.html b/ConfusedPolarBear.Plugin.IntroSkipper/Configuration/configPage.html index 2a20867..0475d82 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper/Configuration/configPage.html +++ b/ConfusedPolarBear.Plugin.IntroSkipper/Configuration/configPage.html @@ -350,7 +350,7 @@ Advanced
- Support Bundle (ffmpeg) + Support Bundle Info
From 6d72cbe8ac602cb206bcbe5441ac979972e12e74 Mon Sep 17 00:00:00 2001 From: TwistedUmbrellaX Date: Sat, 2 Mar 2024 21:05:57 -0500 Subject: [PATCH 3/4] Stop archiving binary on pull request --- .github/workflows/build.yml | 1 + .../ConfusedPolarBear.Plugin.IntroSkipper.csproj | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index dadaf09..ea2653c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -45,6 +45,7 @@ jobs: - name: Create archive uses: vimtor/action-zip@v1.1 + if: github.event_name != 'pull_request' with: files: ConfusedPolarBear.Plugin.IntroSkipper/bin/Debug/net6.0/ConfusedPolarBear.Plugin.IntroSkipper.dll dest: intro-skipper-${{ env.GIT_HASH }}.zip diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/ConfusedPolarBear.Plugin.IntroSkipper.csproj b/ConfusedPolarBear.Plugin.IntroSkipper/ConfusedPolarBear.Plugin.IntroSkipper.csproj index d781908..51ee209 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper/ConfusedPolarBear.Plugin.IntroSkipper.csproj +++ b/ConfusedPolarBear.Plugin.IntroSkipper/ConfusedPolarBear.Plugin.IntroSkipper.csproj @@ -3,8 +3,8 @@ net6.0 ConfusedPolarBear.Plugin.IntroSkipper - 0.1.10.0 - 0.1.10.0 + 0.1.14.0 + 0.1.14.0 true true enable From 5616c763d6913d66756f8a05dcbd98f6e0914304 Mon Sep 17 00:00:00 2001 From: TwistedUmbrellaX Date: Sat, 2 Mar 2024 21:15:44 -0500 Subject: [PATCH 4/4] Fixing binary version number --- manifest.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/manifest.json b/manifest.json index d9107c8..d23259b 100644 --- a/manifest.json +++ b/manifest.json @@ -8,6 +8,14 @@ "category": "General", "imageUrl": "https://raw.githubusercontent.com/jumoog/intro-skipper/master/images/logo.png", "versions": [ + { + "version": "0.1.14.0", + "changelog": "- See the full changelog at [GitHub](https://github.com/jumoog/intro-skipper/blob/master/CHANGELOG.md)\n", + "targetAbi": "10.8.4.0", + "sourceUrl": "https://github.com/jumoog/intro-skipper/releases/download/v0.1.14/intro-skipper-v0.1.14.zip", + "checksum": "704ecc32588243545c44b2eed130b033", + "timestamp": "2024-03-02T21:10:57Z" + }, { "version": "0.1.13.0", "changelog": "- See the full changelog at [GitHub](https://github.com/jumoog/intro-skipper/blob/master/CHANGELOG.md)\n",