dtourolle/jellypod
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 15 Wiki Activity

Add Jellyfin 12.0 build target alongside 10.9

Browse Source 
The plugin now multi-targets net8.0 (Jellyfin 10.9, ABI 10.9.0.0) and net10.0
(Jellyfin 12.0, ABI 12.0.0.0) from one source tree, and each release ships both
packages.

TaskTriggerInfo.Type became a TaskTriggerInfoType enum in 12.0, which is the
only source-level break; it is handled with a NET10_0_OR_GREATER switch. CA1873
is disabled in the ruleset alongside CA1848, which it supersedes.

build.yaml stays the 10.9 config and the 12.0 one is derived from it at build
time, so the two cannot drift apart. Both manifest entries are prepended per
release with the 12.0 one first: Jellyfin keeps entries whose targetAbi is <=
the server version and takes the first of the highest version, so a 12.0 server
picks the 12.0 build while a 10.9 server never sees it.

The builder image now carries the .NET 10 SDK with the .NET 8 SDK alongside it.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
This commit is contained in:
dtourolle
2026-09-08 18:51:45 +02:00
co-authored by Claude Opus 5
parent 361028574e
commit 60cb40f0ce
8 changed files with 174 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitea/workflows/build.yaml
+41 -11
View File
@@ -32,21 +32,51 @@ jobs:
- name: Run tests - name: Run tests
run: dotnet test Jellyfin.Plugin.Jellypod.sln --no-build --configuration Release --verbosity normal run: dotnet test Jellyfin.Plugin.Jellypod.sln --no-build --configuration Release --verbosity normal
- name: Build Jellyfin Plugin - name: Build plugin for Jellyfin 10.9 (net8.0)
id: jprm id: jprm_jf109
run: | run: |
mkdir -p artifacts mkdir -p ./artifacts/jf10.9
jprm --verbosity=debug plugin build . jprm --verbosity=debug plugin build . --output ./artifacts/jf10.9
# Find the generated zip file ARTIFACT=$(find ./artifacts/jf10.9 -name "*.zip" -type f -print -quit)
ARTIFACT=$(find . -name "*.zip" -type f -print -quit) RENAMED="./artifacts/jf10.9/$(basename "${ARTIFACT}" .zip)_jf10.9.zip"
echo "artifact=${ARTIFACT}" >> $GITHUB_OUTPUT mv "${ARTIFACT}" "${RENAMED}"
echo "Found artifact: ${ARTIFACT}" echo "artifact=${RENAMED}" >> $GITHUB_OUTPUT
echo "Found artifact: ${RENAMED}"
- name: Upload build artifact - name: Retarget build config at Jellyfin 12.0 (net10.0)
run: |
sed -i \
-e 's/^targetAbi:.*/targetAbi: "12.0.0.0"/' \
-e 's/^framework:.*/framework: "net10.0"/' \
-e 's/^dotnet_framework:.*/dotnet_framework: "net10.0"/' \
build.yaml
cat build.yaml
- name: Build plugin for Jellyfin 12.0 (net10.0)
id: jprm_jf12
run: |
mkdir -p ./artifacts/jf12
jprm --verbosity=debug plugin build . --output ./artifacts/jf12
ARTIFACT=$(find ./artifacts/jf12 -name "*.zip" -type f -print -quit)
RENAMED="./artifacts/jf12/$(basename "${ARTIFACT}" .zip)_jf12.zip"
mv "${ARTIFACT}" "${RENAMED}"
echo "artifact=${RENAMED}" >> $GITHUB_OUTPUT
echo "Found artifact: ${RENAMED}"
- name: Upload build artifact (Jellyfin 10.9)
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
with: with:
name: jellypod-plugin name: jellypod-plugin-jf10.9
path: ${{ steps.jprm.outputs.artifact }} path: ${{ steps.jprm_jf109.outputs.artifact }}
retention-days: 30
if-no-files-found: error
- name: Upload build artifact (Jellyfin 12.0)
uses: actions/upload-artifact@v3
with:
name: jellypod-plugin-jf12
path: ${{ steps.jprm_jf12.outputs.artifact }}
retention-days: 30 retention-days: 30
if-no-files-found: error if-no-files-found: error
.gitea/workflows/release.yaml
+66 -36
View File
@@ -39,6 +39,17 @@ jobs:
sed -i "s/^version:.*/version: \"${VERSION}\"/" build.yaml sed -i "s/^version:.*/version: \"${VERSION}\"/" build.yaml
cat build.yaml cat build.yaml
- name: Generate Jellyfin 12.0 build config
run: |
# build.yaml is the Jellyfin 10.9 (net8.0) config; derive the
# Jellyfin 12.0 (net10.0) one from it so the two cannot drift apart.
sed \
-e 's/^targetAbi:.*/targetAbi: "12.0.0.0"/' \
-e 's/^framework:.*/framework: "net10.0"/' \
-e 's/^dotnet_framework:.*/dotnet_framework: "net10.0"/' \
build.yaml > build.jf12.yaml
cat build.jf12.yaml
- name: Restore dependencies - name: Restore dependencies
run: dotnet restore Jellyfin.Plugin.Jellypod.sln run: dotnet restore Jellyfin.Plugin.Jellypod.sln
@@ -48,25 +59,39 @@ jobs:
- name: Run tests - name: Run tests
run: dotnet test Jellyfin.Plugin.Jellypod.sln --no-build --configuration Release --verbosity normal run: dotnet test Jellyfin.Plugin.Jellypod.sln --no-build --configuration Release --verbosity normal
- name: Build Jellyfin Plugin - name: Build plugin for Jellyfin 10.9 (net8.0)
id: jprm id: jprm_jf109
run: | run: |
mkdir -p artifacts mkdir -p ./artifacts/jf10.9
jprm --verbosity=debug plugin build ./ jprm --verbosity=debug plugin build . --output ./artifacts/jf10.9
# Find the generated zip file ARTIFACT=$(find ./artifacts/jf10.9 -name "*.zip" -type f -print -quit)
ARTIFACT=$(find . -name "*.zip" -type f -print -quit) RENAMED="./artifacts/jf10.9/$(basename "${ARTIFACT}" .zip)_jf10.9.zip"
ARTIFACT_NAME=$(basename "${ARTIFACT}") mv "${ARTIFACT}" "${RENAMED}"
echo "artifact=${ARTIFACT}" >> $GITHUB_OUTPUT echo "artifact=${RENAMED}" >> $GITHUB_OUTPUT
echo "artifact_name=${ARTIFACT_NAME}" >> $GITHUB_OUTPUT echo "artifact_name=$(basename "${RENAMED}")" >> $GITHUB_OUTPUT
echo "Found artifact: ${ARTIFACT}" echo "checksum=$(md5sum "${RENAMED}" | awk '{print $1}')" >> $GITHUB_OUTPUT
echo "Found artifact: ${RENAMED}"
- name: Calculate checksum - name: Build plugin for Jellyfin 12.0 (net10.0)
id: checksum id: jprm_jf12
run: | run: |
CHECKSUM=$(md5sum "${{ steps.jprm.outputs.artifact }}" | awk '{print $1}') # jprm always reads build.yaml, so swap the 12.0 config in for this build.
echo "checksum=${CHECKSUM}" >> $GITHUB_OUTPUT cp build.yaml build.jf10.9.yaml
echo "MD5 Checksum: ${CHECKSUM}" cp build.jf12.yaml build.yaml
mkdir -p ./artifacts/jf12
jprm --verbosity=debug plugin build . --output ./artifacts/jf12
mv build.jf10.9.yaml build.yaml
ARTIFACT=$(find ./artifacts/jf12 -name "*.zip" -type f -print -quit)
RENAMED="./artifacts/jf12/$(basename "${ARTIFACT}" .zip)_jf12.zip"
mv "${ARTIFACT}" "${RENAMED}"
echo "artifact=${RENAMED}" >> $GITHUB_OUTPUT
echo "artifact_name=$(basename "${RENAMED}")" >> $GITHUB_OUTPUT
echo "checksum=$(md5sum "${RENAMED}" | awk '{print $1}')" >> $GITHUB_OUTPUT
echo "Found artifact: ${RENAMED}"
- name: Create Release - name: Create Release
id: create_release id: create_release
@@ -84,7 +109,7 @@ jobs:
-H "Authorization: token ${GITEA_TOKEN}" \ -H "Authorization: token ${GITEA_TOKEN}" \
-H "Content-Type: application/json" \ -H "Content-Type: application/json" \
"${GITEA_URL}/api/v1/repos/${REPO_OWNER}/${REPO_NAME}/releases" \ "${GITEA_URL}/api/v1/repos/${REPO_OWNER}/${REPO_NAME}/releases" \
-d "$(jq -n --arg tag "$VERSION" --arg name "Release $VERSION" --arg body "Jellypod Jellyfin Plugin. See attached files for plugin installation." '{tag_name: $tag, name: $name, body: $body, draft: false, prerelease: false}')") -d "$(jq -n --arg tag "$VERSION" --arg name "Release $VERSION" --arg body "Jellypod Jellyfin Plugin. Install the _jf10.9 build on Jellyfin 10.9.x and the _jf12 build on Jellyfin 12.0 or newer." '{tag_name: $tag, name: $name, body: $body, draft: false, prerelease: false}')")
HTTP_CODE=$(echo "$RESPONSE" | tail -n1) HTTP_CODE=$(echo "$RESPONSE" | tail -n1)
BODY=$(echo "$RESPONSE" | sed '$d') BODY=$(echo "$RESPONSE" | sed '$d')
@@ -99,21 +124,19 @@ jobs:
exit 1 exit 1
fi fi
# Upload plugin artifact upload_asset() {
echo "Uploading plugin artifact..." echo "Uploading $2 ..."
curl -f -X POST \ curl -f -X POST \
-H "Authorization: token ${GITEA_TOKEN}" \ -H "Authorization: token ${GITEA_TOKEN}" \
-H "Content-Type: application/zip" \ -H "Content-Type: $3" \
--data-binary "@${{ steps.jprm.outputs.artifact }}" \ --data-binary "@$1" \
"${GITEA_URL}/api/v1/repos/${REPO_OWNER}/${REPO_NAME}/releases/${RELEASE_ID}/assets?name=${{ steps.jprm.outputs.artifact_name }}" "${GITEA_URL}/api/v1/repos/${REPO_OWNER}/${REPO_NAME}/releases/${RELEASE_ID}/assets?name=$2"
}
# Upload build.yaml upload_asset "${{ steps.jprm_jf109.outputs.artifact }}" "${{ steps.jprm_jf109.outputs.artifact_name }}" "application/zip"
echo "Uploading build.yaml..." upload_asset "${{ steps.jprm_jf12.outputs.artifact }}" "${{ steps.jprm_jf12.outputs.artifact_name }}" "application/zip"
curl -f -X POST \ upload_asset build.yaml build.yaml "application/x-yaml"
-H "Authorization: token ${GITEA_TOKEN}" \ upload_asset build.jf12.yaml build.jf12.yaml "application/x-yaml"
-H "Content-Type: application/x-yaml" \
--data-binary "@build.yaml" \
"${GITEA_URL}/api/v1/repos/${REPO_OWNER}/${REPO_NAME}/releases/${RELEASE_ID}/assets?name=build.yaml"
echo "Release created successfully!" echo "Release created successfully!"
echo "View at: ${GITEA_URL}/${REPO_OWNER}/${REPO_NAME}/releases/tag/${{ steps.get_version.outputs.version }}" echo "View at: ${GITEA_URL}/${REPO_OWNER}/${REPO_NAME}/releases/tag/${{ steps.get_version.outputs.version }}"
@@ -126,10 +149,8 @@ jobs:
REPO_NAME="${{ github.event.repository.name }}" REPO_NAME="${{ github.event.repository.name }}"
GITEA_URL="${{ github.server_url }}" GITEA_URL="${{ github.server_url }}"
VERSION="${{ steps.get_version.outputs.version_number }}" VERSION="${{ steps.get_version.outputs.version_number }}"
CHECKSUM="${{ steps.checksum.outputs.checksum }}"
ARTIFACT_NAME="${{ steps.jprm.outputs.artifact_name }}"
TIMESTAMP=$(date -u +"%Y-%m-%dT%H:%M:%SZ") TIMESTAMP=$(date -u +"%Y-%m-%dT%H:%M:%SZ")
DOWNLOAD_URL="${GITEA_URL}/${REPO_OWNER}/${REPO_NAME}/releases/download/${{ steps.get_version.outputs.version }}/${ARTIFACT_NAME}" RELEASE_URL="${GITEA_URL}/${REPO_OWNER}/${REPO_NAME}/releases/download/${{ steps.get_version.outputs.version }}"
# Configure git # Configure git
git config user.name "Gitea Actions" git config user.name "Gitea Actions"
@@ -139,14 +160,23 @@ jobs:
git fetch origin master git fetch origin master
git checkout master git checkout master
# Update manifest.json - prepend new version to versions array # Prepend both ABI entries for this version. Jellyfin keeps only the
# entries whose targetAbi is <= the server version and then takes the
# first of the highest version, so the 12.0 entry must come first: a
# 12.0 server sees both and picks it, a 10.9 server never sees it.
jq --arg ver "${VERSION}" \ jq --arg ver "${VERSION}" \
--arg changelog "Release ${VERSION}" \ --arg changelog "Release ${VERSION}" \
--arg abi "10.9.0.0" \ --arg abi12 "12.0.0.0" \
--arg url "${DOWNLOAD_URL}" \ --arg url12 "${RELEASE_URL}/${{ steps.jprm_jf12.outputs.artifact_name }}" \
--arg checksum "${CHECKSUM}" \ --arg checksum12 "${{ steps.jprm_jf12.outputs.checksum }}" \
--arg abi109 "10.9.0.0" \
--arg url109 "${RELEASE_URL}/${{ steps.jprm_jf109.outputs.artifact_name }}" \
--arg checksum109 "${{ steps.jprm_jf109.outputs.checksum }}" \
--arg ts "${TIMESTAMP}" \ --arg ts "${TIMESTAMP}" \
'.[0].versions = [{version: $ver, changelog: $changelog, targetAbi: $abi, sourceUrl: $url, checksum: $checksum, timestamp: $ts}] + .[0].versions' \ '.[0].versions = [
{version: $ver, changelog: $changelog, targetAbi: $abi12, sourceUrl: $url12, checksum: $checksum12, timestamp: $ts},
{version: $ver, changelog: $changelog, targetAbi: $abi109, sourceUrl: $url109, checksum: $checksum109, timestamp: $ts}
] + .[0].versions' \
manifest.json > manifest.tmp && mv manifest.tmp manifest.json manifest.json > manifest.tmp && mv manifest.tmp manifest.json
# Commit and push # Commit and push
.gitignore
+1
View File
@@ -3,3 +3,4 @@ obj/
.vs/ .vs/
.idea/ .idea/
artifacts artifacts
build.jf12.yaml
Dockerfile.build
+7 -1
View File
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/sdk:8.0 FROM mcr.microsoft.com/dotnet/sdk:10.0
# Install Python, Node.js, and tools # Install Python, Node.js, and tools
RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \
@@ -10,6 +10,12 @@ RUN apt-get update && apt-get install -y \
npm \ npm \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
# The .NET 10 SDK builds the net10.0 (Jellyfin 12.0) target; the .NET 8 SDK is
# needed alongside it for the net8.0 (Jellyfin 10.9) target.
RUN curl -sSL https://dot.net/v1/dotnet-install.sh -o /tmp/dotnet-install.sh \
&& bash /tmp/dotnet-install.sh --channel 8.0 --install-dir /usr/share/dotnet --no-path \
&& rm /tmp/dotnet-install.sh
# Install JPRM # Install JPRM
RUN pip install --break-system-packages jprm RUN pip install --break-system-packages jprm
Jellyfin.Plugin.Jellypod/Jellyfin.Plugin.Jellypod.csproj
+15 -2
View File
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFrameworks>net8.0;net10.0</TargetFrameworks>
<RootNamespace>Jellyfin.Plugin.Jellypod</RootNamespace> <RootNamespace>Jellyfin.Plugin.Jellypod</RootNamespace>
<GenerateDocumentationFile>true</GenerateDocumentationFile> <GenerateDocumentationFile>true</GenerateDocumentationFile>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors> <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
@@ -11,7 +11,8 @@
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies> <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <!-- Jellyfin 10.9 (net8.0) -->
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
<PackageReference Include="Jellyfin.Controller" Version="10.9.11"> <PackageReference Include="Jellyfin.Controller" Version="10.9.11">
<ExcludeAssets>runtime</ExcludeAssets> <ExcludeAssets>runtime</ExcludeAssets>
</PackageReference> </PackageReference>
@@ -22,6 +23,18 @@
<PackageReference Include="System.ServiceModel.Syndication" Version="8.0.0" /> <PackageReference Include="System.ServiceModel.Syndication" Version="8.0.0" />
</ItemGroup> </ItemGroup>
<!-- Jellyfin 12.0 (net10.0) -->
<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
<PackageReference Include="Jellyfin.Controller" Version="12.0.0">
<ExcludeAssets>runtime</ExcludeAssets>
</PackageReference>
<PackageReference Include="Jellyfin.Model" Version="12.0.0">
<ExcludeAssets>runtime</ExcludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.Http" Version="10.0.11" />
<PackageReference Include="System.ServiceModel.Syndication" Version="10.0.11" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="SerilogAnalyzer" Version="0.15.0" PrivateAssets="All" /> <PackageReference Include="SerilogAnalyzer" Version="0.15.0" PrivateAssets="All" />
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556" PrivateAssets="All" /> <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556" PrivateAssets="All" />
Jellyfin.Plugin.Jellypod/ScheduledTasks/PodcastUpdateTask.cs
+4
View File
@@ -150,7 +150,11 @@ public class PodcastUpdateTask : IScheduledTask
{ {
new TaskTriggerInfo new TaskTriggerInfo
{ {
#if NET10_0_OR_GREATER
Type = TaskTriggerInfoType.IntervalTrigger,
#else
Type = TaskTriggerInfo.TriggerInterval, Type = TaskTriggerInfo.TriggerInterval,
#endif
IntervalTicks = TimeSpan.FromHours(intervalHours).Ticks IntervalTicks = TimeSpan.FromHours(intervalHours).Ticks
} }
}; };
README.md
+36 -4
View File
@@ -10,6 +10,19 @@ Add this repository URL in Jellyfin (Dashboard → Plugins → Repositories):
https://gitea.tourolle.paris/dtourolle/jellypod/raw/branch/master/manifest.json https://gitea.tourolle.paris/dtourolle/jellypod/raw/branch/master/manifest.json
``` ```
## Supported Jellyfin Versions
Jellypod is released as two builds from the same source. The repository manifest
lists both, and Jellyfin picks the right one for your server automatically:
| Jellyfin server | Build | Target framework |
| --------------- | -------------- | ---------------- |
| 10.9.x | `*_jf10.9.zip` | .NET 8 |
| 12.0 and newer | `*_jf12.zip` | .NET 10 |
If you install manually, download the build matching your server — a build
installed on the wrong server will fail to load.
## Features ## Features
- Browse and subscribe to podcasts - Browse and subscribe to podcasts
@@ -92,7 +105,9 @@ ffmpeg -i "$INPUT" -c:a aac -b:a 128k "$OUTPUT"
### Manual Installation ### Manual Installation
1. Download the latest release from [Releases](https://gitea.tourolle.paris/dtourolle/jellypod/releases) 1. Download the latest release from [Releases](https://gitea.tourolle.paris/dtourolle/jellypod/releases),
picking `jellypod_<version>_jf10.9.zip` for Jellyfin 10.9.x or
`jellypod_<version>_jf12.zip` for Jellyfin 12.0 and newer
2. Extract the contents to your Jellyfin plugins directory: 2. Extract the contents to your Jellyfin plugins directory:
- **Linux**: `~/.local/share/jellyfin/plugins/Jellypod/` - **Linux**: `~/.local/share/jellyfin/plugins/Jellypod/`
- **Windows**: `%LOCALAPPDATA%\jellyfin\plugins\Jellypod\` - **Windows**: `%LOCALAPPDATA%\jellyfin\plugins\Jellypod\`
@@ -103,15 +118,32 @@ ffmpeg -i "$INPUT" -c:a aac -b:a 128k "$OUTPUT"
#### Requirements #### Requirements
- [.NET SDK 8.0](https://dotnet.microsoft.com/en-us/download/dotnet/8.0) - [.NET SDK 8.0](https://dotnet.microsoft.com/en-us/download/dotnet/8.0) for the Jellyfin 10.9 build
- [.NET SDK 10.0](https://dotnet.microsoft.com/en-us/download/dotnet/10.0) for the Jellyfin 12.0 build
#### Build #### Build
```bash ```bash
dotnet build dotnet build # both targets
dotnet build -f net8.0 # Jellyfin 10.9 only
dotnet build -f net10.0 # Jellyfin 12.0 only
``` ```
The plugin DLL will be in `Jellyfin.Plugin.Jellypod/bin/Debug/net8.0/`. The plugin DLL will be in `Jellyfin.Plugin.Jellypod/bin/Debug/net8.0/` or
`Jellyfin.Plugin.Jellypod/bin/Debug/net10.0/`.
#### Packaging
`build.yaml` is the [jprm](https://github.com/oddstr13/jellyfin-plugin-repository-manager)
config for the Jellyfin 10.9 build. The Jellyfin 12.0 config is derived from it
at release time, so the two cannot drift apart:
```bash
sed -e 's/^targetAbi:.*/targetAbi: "12.0.0.0"/' \
-e 's/^framework:.*/framework: "net10.0"/' \
-e 's/^dotnet_framework:.*/dotnet_framework: "net10.0"/' \
build.yaml > build.jf12.yaml
```
## Development ## Development
jellyfin.ruleset
+2
View File
@@ -100,6 +100,8 @@
<Rule Id="CA1308" Action="None" /> <Rule Id="CA1308" Action="None" />
<!-- disable warning CA1848: Use the LoggerMessage delegates --> <!-- disable warning CA1848: Use the LoggerMessage delegates -->
<Rule Id="CA1848" Action="None" /> <Rule Id="CA1848" Action="None" />
<!-- disable warning CA1873: Avoid potentially expensive logging -->
<Rule Id="CA1873" Action="None" />
<!-- disable warning CA2101: Specify marshaling for P/Invoke string arguments --> <!-- disable warning CA2101: Specify marshaling for P/Invoke string arguments -->
<Rule Id="CA2101" Action="None" /> <Rule Id="CA2101" Action="None" />
<!-- disable warning CA2234: Pass System.Uri objects instead of strings --> <!-- disable warning CA2234: Pass System.Uri objects instead of strings -->