majomi/intro-skipper
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '10.10' into jellyfin_selections

Browse Source
This commit is contained in:
Kilian von Pflugk 2024-11-30 20:59:43 +00:00
commit 886908c636
8 changed files with 46 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/ISSUE_TEMPLATE/bug_report_form.yml vendored
View File

@ -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:

6
.github/workflows/codeql.yml vendored
View File

@ -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

2
IntroSkipper.Tests/IntroSkipper.Tests.csproj
View File

@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageReference Include="xunit" Version="2.9.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

27
IntroSkipper/Configuration/configPage.html
View File

@ -432,8 +432,10 @@
<h3 style="margin: 0">Analyzer actions</h3>
<p style="margin: 0">
Choose how segments should be analyzed for this season.<br />
<i>
Default uses all available detection methods (Chromaprint, Chapter, and BlackFrame for credits).<br />
Select specific methods to limit analysis, or None to skip detection entirely.
</i>
</p>
<br />
@ -600,10 +602,9 @@
</div>
<div id="timestampErrorDiv" style="display: none">
<br />
<p>
<textarea id="timestampError" rows="2" cols="75" readonly></textarea>
<br />
<br />
</p>
</div>
<div id="fingerprintVisualizer" style="display: none">
@ -642,12 +643,11 @@
<span>Shift amount:</span>
<input type="number" min="-3000" max="3000" value="0" id="offset" />
<br />
<p>
<span id="suggestedShifts">
<span>Suggested shifts: </span>
</span>
<br />
<br />
</p>
<canvas id="troubleshooter" style="display: none"></canvas>
<span id="timestampContainer">
<span id="timestamps"></span>
@ -656,26 +656,27 @@
</span>
<br />
</div>
<br />
<div id="eraseSeasonContainer" style="display: none">
<p>
<button is="emby-button" id="btnEraseSeasonTimestamps" class="button-submit emby-button" type="button">Erase all timestamps for this season</button>
<input type="checkbox" id="eraseSeasonCacheCheckbox" style="margin-left: 10px" />
<label for="eraseSeasonCacheCheckbox" style="margin-left: 5px">Erase cached fingerprint files</label>
<br />
</p>
</div>
<div id="eraseMovieContainer" style="display: none">
<p>
<button is="emby-button" id="btnEraseMovieTimestamps" class="button-submit emby-button" type="button">Erase all timestamps for this movie</button>
<input type="checkbox" id="eraseMovieCacheCheckbox" style="margin-left: 10px" />
<label for="eraseMovieCacheCheckbox" style="margin-left: 5px">Erase cached fingerprint files</label>
<br />
</p>
</div>
<div style="display: flex; align-items: center;">
<div>
<p>
<button is="emby-button" class="button-submit emby-button" id="btnEraseIntroTimestamps">Erase all introduction timestamps (globally)</button>
<br />
@ -686,18 +687,16 @@
<br />
<button is="emby-button" class="button-submit emby-button" id="btnErasePreviewTimestamps">Erase all preview timestamps (globally)</button>
</div>
</p>
<div>
<input type="checkbox" id="eraseModeCacheCheckbox" style="margin-left: 10px" />
<label for="eraseModeCacheCheckbox" style="margin-left: 5px">Erase global cached fingerprint files</label>
</div>
</div>
<br />
<br />
</details>
<details id="support">
<summary>Support Bundle Info</summary>
<summary>Intro Skipper Support Log</summary>
<textarea id="supportBundle" rows="20" cols="75" readonly></textarea>
</details>

4
IntroSkipper/IntroSkipper.csproj
View File

@ -2,8 +2,8 @@
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<RootNamespace>IntroSkipper</RootNamespace>
<AssemblyVersion>1.10.10.9</AssemblyVersion>
<FileVersion>1.10.10.9</FileVersion>
<AssemblyVersion>1.10.10.11</AssemblyVersion>
<FileVersion>1.10.10.11</FileVersion>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<Nullable>enable</Nullable>

18
IntroSkipper/Plugin.cs
View File

@ -77,15 +77,6 @@ public class Plugin : BasePlugin<PluginConfiguration>, 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<PluginConfiguration>, 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();
}

4
README.md
View File

@ -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)

52
manifest.json
View File

@ -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"
}
]
}