Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
affc87bd38 | ||
|
|
1101385107 | ||
|
|
4fc79f39f7 | ||
|
|
5875f81b9b | ||
|
|
cedef6d6aa | ||
|
|
4b5d7e2a7f | ||
|
|
8281960f0b | ||
|
|
7a719ee4ac | ||
|
|
5667c2e12f | ||
|
|
fef1bd6b17 | ||
|
|
763217c43d | ||
|
|
c2feaae89c | ||
|
|
35b103c056 | ||
|
|
7af1d9b8f4 | ||
|
|
10a76f8d45 | ||
|
|
a39a10636b | ||
|
|
029fb78049 |
@@ -36,6 +36,29 @@ jobs:
|
|||||||
working-directory: build-${{ github.run_id }}
|
working-directory: build-${{ github.run_id }}
|
||||||
run: dotnet restore Jellyfin.Plugin.SRFPlay.sln
|
run: dotnet restore Jellyfin.Plugin.SRFPlay.sln
|
||||||
|
|
||||||
|
- name: Compute build version
|
||||||
|
id: version
|
||||||
|
run: |
|
||||||
|
# For PRs, stamp a distinct version so a side-loaded build is
|
||||||
|
# identifiable in Jellyfin: 1.0.<YYYYMMDD>-pr<N>.<run_number>.
|
||||||
|
# For plain master pushes, keep a date-based dev version.
|
||||||
|
DATE=$(date -u +"%Y%m%d")
|
||||||
|
if [ -n "${{ github.event.pull_request.number }}" ]; then
|
||||||
|
VERSION="1.0.${DATE}.${{ github.run_number }}"
|
||||||
|
LABEL="pr${{ github.event.pull_request.number }}"
|
||||||
|
else
|
||||||
|
VERSION="1.0.${DATE}.${{ github.run_number }}"
|
||||||
|
LABEL="master"
|
||||||
|
fi
|
||||||
|
echo "version=${VERSION}" >> $GITHUB_OUTPUT
|
||||||
|
echo "label=${LABEL}" >> $GITHUB_OUTPUT
|
||||||
|
echo "Build version: ${VERSION} (${LABEL})"
|
||||||
|
|
||||||
|
- name: Set build version
|
||||||
|
working-directory: build-${{ github.run_id }}
|
||||||
|
run: |
|
||||||
|
sed -i "s/^version:.*/version: \"${{ steps.version.outputs.version }}\"/" build.yaml
|
||||||
|
|
||||||
- name: Build solution
|
- name: Build solution
|
||||||
working-directory: build-${{ github.run_id }}
|
working-directory: build-${{ github.run_id }}
|
||||||
run: dotnet build Jellyfin.Plugin.SRFPlay.sln --configuration Release --no-restore --no-self-contained /m:1
|
run: dotnet build Jellyfin.Plugin.SRFPlay.sln --configuration Release --no-restore --no-self-contained /m:1
|
||||||
@@ -59,7 +82,7 @@ jobs:
|
|||||||
- name: Upload build artifact
|
- name: Upload build artifact
|
||||||
uses: actions/upload-artifact@v3
|
uses: actions/upload-artifact@v3
|
||||||
with:
|
with:
|
||||||
name: jellyfin-srfplay-plugin
|
name: srfplay-${{ steps.version.outputs.label }}-${{ steps.version.outputs.version }}
|
||||||
path: build-${{ github.run_id }}/${{ steps.jprm.outputs.artifact }}
|
path: build-${{ github.run_id }}/${{ steps.jprm.outputs.artifact }}
|
||||||
retention-days: 30
|
retention-days: 30
|
||||||
if-no-files-found: error
|
if-no-files-found: error
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
name: 'Latest Release'
|
name: 'Nightly Build'
|
||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
@@ -7,9 +7,10 @@ on:
|
|||||||
paths-ignore:
|
paths-ignore:
|
||||||
- '**/*.md'
|
- '**/*.md'
|
||||||
- 'manifest.json'
|
- 'manifest.json'
|
||||||
|
- 'manifest-nightly.json'
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
latest-release:
|
nightly-build:
|
||||||
runs-on: linux/amd64
|
runs-on: linux/amd64
|
||||||
container:
|
container:
|
||||||
image: gitea.tourolle.paris/dtourolle/srfplay-builder:latest
|
image: gitea.tourolle.paris/dtourolle/srfplay-builder:latest
|
||||||
@@ -20,6 +21,24 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
path: build-${{ github.run_id }}
|
path: build-${{ github.run_id }}
|
||||||
|
|
||||||
|
- name: Compute nightly version
|
||||||
|
id: version
|
||||||
|
run: |
|
||||||
|
# Date-based nightly version: 1.0.<YYYYMMDD>.<run_number>
|
||||||
|
# The run_number suffix keeps multiple builds on the same day
|
||||||
|
# monotonically increasing so Jellyfin always offers the newest.
|
||||||
|
DATE=$(date -u +"%Y%m%d")
|
||||||
|
VERSION="1.0.${DATE}.${{ github.run_number }}"
|
||||||
|
echo "version=${VERSION}" >> $GITHUB_OUTPUT
|
||||||
|
echo "Nightly version: ${VERSION}"
|
||||||
|
|
||||||
|
- name: Set build version
|
||||||
|
working-directory: build-${{ github.run_id }}
|
||||||
|
run: |
|
||||||
|
VERSION="${{ steps.version.outputs.version }}"
|
||||||
|
sed -i "s/^version:.*/version: \"${VERSION}\"/" build.yaml
|
||||||
|
cat build.yaml
|
||||||
|
|
||||||
- name: Restore dependencies
|
- name: Restore dependencies
|
||||||
working-directory: build-${{ github.run_id }}
|
working-directory: build-${{ github.run_id }}
|
||||||
run: dotnet restore Jellyfin.Plugin.SRFPlay.sln
|
run: dotnet restore Jellyfin.Plugin.SRFPlay.sln
|
||||||
@@ -52,7 +71,7 @@ jobs:
|
|||||||
echo "checksum=${CHECKSUM}" >> $GITHUB_OUTPUT
|
echo "checksum=${CHECKSUM}" >> $GITHUB_OUTPUT
|
||||||
echo "Checksum: ${CHECKSUM}"
|
echo "Checksum: ${CHECKSUM}"
|
||||||
|
|
||||||
- name: Delete existing latest release
|
- name: Delete existing nightly release
|
||||||
working-directory: build-${{ github.run_id }}
|
working-directory: build-${{ github.run_id }}
|
||||||
env:
|
env:
|
||||||
GITEA_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITEA_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
@@ -71,7 +90,7 @@ jobs:
|
|||||||
-H "Authorization: token ${GITEA_TOKEN}" \
|
-H "Authorization: token ${GITEA_TOKEN}" \
|
||||||
"${GITEA_URL}/api/v1/repos/${REPO_OWNER}/${REPO_NAME}/releases/tags/${TAG}" | jq -r '.id')
|
"${GITEA_URL}/api/v1/repos/${REPO_OWNER}/${REPO_NAME}/releases/tags/${TAG}" | jq -r '.id')
|
||||||
|
|
||||||
echo "Deleting existing latest release (ID: ${RELEASE_ID})..."
|
echo "Deleting existing nightly release (ID: ${RELEASE_ID})..."
|
||||||
curl -s -X DELETE \
|
curl -s -X DELETE \
|
||||||
-H "Authorization: token ${GITEA_TOKEN}" \
|
-H "Authorization: token ${GITEA_TOKEN}" \
|
||||||
"${GITEA_URL}/api/v1/repos/${REPO_OWNER}/${REPO_NAME}/releases/${RELEASE_ID}"
|
"${GITEA_URL}/api/v1/repos/${REPO_OWNER}/${REPO_NAME}/releases/${RELEASE_ID}"
|
||||||
@@ -81,7 +100,7 @@ jobs:
|
|||||||
-H "Authorization: token ${GITEA_TOKEN}" \
|
-H "Authorization: token ${GITEA_TOKEN}" \
|
||||||
"${GITEA_URL}/api/v1/repos/${REPO_OWNER}/${REPO_NAME}/tags/${TAG}" || true
|
"${GITEA_URL}/api/v1/repos/${REPO_OWNER}/${REPO_NAME}/tags/${TAG}" || true
|
||||||
|
|
||||||
- name: Create latest release
|
- name: Create nightly release
|
||||||
working-directory: build-${{ github.run_id }}
|
working-directory: build-${{ github.run_id }}
|
||||||
env:
|
env:
|
||||||
GITEA_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITEA_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
@@ -89,12 +108,14 @@ jobs:
|
|||||||
REPO_OWNER="${{ github.repository_owner }}"
|
REPO_OWNER="${{ github.repository_owner }}"
|
||||||
REPO_NAME="${{ github.event.repository.name }}"
|
REPO_NAME="${{ github.event.repository.name }}"
|
||||||
GITEA_URL="${{ github.server_url }}"
|
GITEA_URL="${{ github.server_url }}"
|
||||||
|
VERSION="${{ steps.version.outputs.version }}"
|
||||||
|
SHORT_SHA=$(echo "${{ github.sha }}" | cut -c1-7)
|
||||||
|
|
||||||
RESPONSE=$(curl -s -w "\n%{http_code}" -X POST \
|
RESPONSE=$(curl -s -w "\n%{http_code}" -X POST \
|
||||||
-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 "latest" --arg name "Latest Build" --arg body "SRFPlay Jellyfin Plugin latest build from master." '{tag_name: $tag, name: $name, body: $body, target_commitish: "master", draft: false, prerelease: true}')")
|
-d "$(jq -n --arg tag "latest" --arg name "Nightly Build ${VERSION}" --arg body "SRFPlay Jellyfin Plugin nightly build ${VERSION} from master (${SHORT_SHA})." '{tag_name: $tag, name: $name, body: $body, target_commitish: "master", draft: false, prerelease: true}')")
|
||||||
|
|
||||||
HTTP_CODE=$(echo "$RESPONSE" | tail -n1)
|
HTTP_CODE=$(echo "$RESPONSE" | tail -n1)
|
||||||
BODY=$(echo "$RESPONSE" | sed '$d')
|
BODY=$(echo "$RESPONSE" | sed '$d')
|
||||||
@@ -124,9 +145,9 @@ jobs:
|
|||||||
--data-binary "@build.yaml" \
|
--data-binary "@build.yaml" \
|
||||||
"${GITEA_URL}/api/v1/repos/${REPO_OWNER}/${REPO_NAME}/releases/${RELEASE_ID}/assets?name=build.yaml"
|
"${GITEA_URL}/api/v1/repos/${REPO_OWNER}/${REPO_NAME}/releases/${RELEASE_ID}/assets?name=build.yaml"
|
||||||
|
|
||||||
echo "Latest release updated successfully!"
|
echo "Nightly release updated successfully!"
|
||||||
|
|
||||||
- name: Update manifest.json
|
- name: Update manifest-nightly.json
|
||||||
working-directory: build-${{ github.run_id }}
|
working-directory: build-${{ github.run_id }}
|
||||||
env:
|
env:
|
||||||
GITEA_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITEA_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
@@ -134,6 +155,7 @@ jobs:
|
|||||||
REPO_OWNER="${{ github.repository_owner }}"
|
REPO_OWNER="${{ github.repository_owner }}"
|
||||||
REPO_NAME="${{ github.event.repository.name }}"
|
REPO_NAME="${{ github.event.repository.name }}"
|
||||||
GITEA_URL="${{ github.server_url }}"
|
GITEA_URL="${{ github.server_url }}"
|
||||||
|
VERSION="${{ steps.version.outputs.version }}"
|
||||||
CHECKSUM="${{ steps.checksum.outputs.checksum }}"
|
CHECKSUM="${{ steps.checksum.outputs.checksum }}"
|
||||||
ARTIFACT_NAME="${{ steps.jprm.outputs.artifact_name }}"
|
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")
|
||||||
@@ -145,13 +167,10 @@ jobs:
|
|||||||
git fetch origin master
|
git fetch origin master
|
||||||
git checkout master
|
git checkout master
|
||||||
|
|
||||||
# Remove existing "latest" entry if present, then prepend new one
|
|
||||||
jq --arg url "$DOWNLOAD_URL" 'if .[0].versions[0].changelog == "Latest Build" then .[0].versions = .[0].versions[1:] else . end' manifest.json > manifest.tmp && mv manifest.tmp manifest.json
|
|
||||||
|
|
||||||
NEW_VERSION=$(cat <<EOF
|
NEW_VERSION=$(cat <<EOF
|
||||||
{
|
{
|
||||||
"version": "0.0.0.0",
|
"version": "${VERSION}",
|
||||||
"changelog": "Latest Build",
|
"changelog": "Nightly build ${VERSION} (${SHORT_SHA})",
|
||||||
"targetAbi": "10.9.0.0",
|
"targetAbi": "10.9.0.0",
|
||||||
"sourceUrl": "${DOWNLOAD_URL}",
|
"sourceUrl": "${DOWNLOAD_URL}",
|
||||||
"checksum": "${CHECKSUM}",
|
"checksum": "${CHECKSUM}",
|
||||||
@@ -160,9 +179,13 @@ jobs:
|
|||||||
EOF
|
EOF
|
||||||
)
|
)
|
||||||
|
|
||||||
jq --argjson newver "${NEW_VERSION}" '.[0].versions = [$newver] + .[0].versions' manifest.json > manifest.tmp && mv manifest.tmp manifest.json
|
# Prepend the new build and keep only the most recent 5 nightlies.
|
||||||
git add manifest.json
|
jq --argjson newver "${NEW_VERSION}" \
|
||||||
git commit -m "Update manifest.json for latest build (${SHORT_SHA})" || echo "No changes to commit"
|
'.[0].versions = ([$newver] + .[0].versions)[0:5]' \
|
||||||
|
manifest-nightly.json > manifest.tmp && mv manifest.tmp manifest-nightly.json
|
||||||
|
|
||||||
|
git add manifest-nightly.json
|
||||||
|
git commit -m "Nightly: ${VERSION} (${SHORT_SHA})" || echo "No changes to commit"
|
||||||
git push origin master
|
git push origin master
|
||||||
|
|
||||||
- name: Cleanup
|
- name: Cleanup
|
||||||
|
|||||||
@@ -0,0 +1,17 @@
|
|||||||
|
<Project>
|
||||||
|
<!--
|
||||||
|
The Jellyfin meta build workflow rewrites Directory.Build.props, stamping Version,
|
||||||
|
AssemblyVersion and FileVersion all to a date-based value (e.g. 1.0.20260627.182).
|
||||||
|
The build segment (20260627) exceeds the 16-bit limit (0-65535) that AssemblyVersion
|
||||||
|
and FileVersion require, which fails the compile (CS7034/CS7035).
|
||||||
|
|
||||||
|
Directory.Build.targets is imported AFTER the project (and after Directory.Build.props),
|
||||||
|
and the workflow does not touch it, so we force valid assembly/file versions here. The
|
||||||
|
package/plugin manifest Version stays as injected; only the .NET assembly identity is
|
||||||
|
normalised, which is fine because Jellyfin identifies plugins by GUID + manifest version.
|
||||||
|
-->
|
||||||
|
<PropertyGroup>
|
||||||
|
<AssemblyVersion>1.0.0.0</AssemblyVersion>
|
||||||
|
<FileVersion>1.0.0.0</FileVersion>
|
||||||
|
</PropertyGroup>
|
||||||
|
</Project>
|
||||||
@@ -20,6 +20,13 @@ public class RecordingEntry
|
|||||||
[JsonPropertyName("urn")]
|
[JsonPropertyName("urn")]
|
||||||
public string Urn { get; set; } = string.Empty;
|
public string Urn { get; set; } = string.Empty;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets or sets the business unit this recording belongs to (e.g. "srf", "rts").
|
||||||
|
/// Used to show recordings under the matching unit's channel.
|
||||||
|
/// </summary>
|
||||||
|
[JsonPropertyName("businessUnit")]
|
||||||
|
public string BusinessUnit { get; set; } = string.Empty;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the title.
|
/// Gets or sets the title.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|||||||
@@ -20,7 +20,6 @@ namespace Jellyfin.Plugin.SRFPlay.Api;
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public class SRFApiClient : IDisposable
|
public class SRFApiClient : IDisposable
|
||||||
{
|
{
|
||||||
private static readonly System.Text.CompositeFormat PlayV3UrlFormat = System.Text.CompositeFormat.Parse(ApiEndpoints.PlayV3BaseUrlTemplate);
|
|
||||||
private readonly HttpClient _httpClient;
|
private readonly HttpClient _httpClient;
|
||||||
private readonly HttpClient _playV3HttpClient;
|
private readonly HttpClient _playV3HttpClient;
|
||||||
private readonly ILogger _logger;
|
private readonly ILogger _logger;
|
||||||
@@ -58,6 +57,21 @@ public class SRFApiClient : IDisposable
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Builds the Play v3 API base URL for a business unit. The host is normally
|
||||||
|
/// www.<unit>.ch, but SWI's site lives at www.swissinfo.ch (www.swi.ch is an
|
||||||
|
/// unrelated welding institute), while the API path segment stays the unit code.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="businessUnit">The lowercase business unit (e.g. "srf", "swi").</param>
|
||||||
|
/// <returns>The Play v3 production base URL ending in a slash.</returns>
|
||||||
|
private static string BuildPlayV3BaseUrl(string businessUnit)
|
||||||
|
{
|
||||||
|
var host = string.Equals(businessUnit, "swi", StringComparison.OrdinalIgnoreCase)
|
||||||
|
? "www.swissinfo.ch"
|
||||||
|
: $"www.{businessUnit}.ch";
|
||||||
|
return $"https://{host}/play/v3/api/{businessUnit}/production/";
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Reads HTTP response content as UTF-8 string.
|
/// Reads HTTP response content as UTF-8 string.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -315,7 +329,7 @@ public class SRFApiClient : IDisposable
|
|||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
var baseUrl = string.Format(CultureInfo.InvariantCulture, PlayV3UrlFormat, businessUnit);
|
var baseUrl = BuildPlayV3BaseUrl(businessUnit);
|
||||||
var url = $"{baseUrl}{endpoint}";
|
var url = $"{baseUrl}{endpoint}";
|
||||||
_logger.LogInformation("Fetching all {Endpoint} for business unit: {BusinessUnit} from URL: {Url}", endpoint, businessUnit, url);
|
_logger.LogInformation("Fetching all {Endpoint} for business unit: {BusinessUnit} from URL: {Url}", endpoint, businessUnit, url);
|
||||||
|
|
||||||
@@ -352,7 +366,7 @@ public class SRFApiClient : IDisposable
|
|||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
var baseUrl = string.Format(CultureInfo.InvariantCulture, PlayV3UrlFormat, businessUnit);
|
var baseUrl = BuildPlayV3BaseUrl(businessUnit);
|
||||||
var url = $"{baseUrl}videos-by-show-id?showId={showId}";
|
var url = $"{baseUrl}videos-by-show-id?showId={showId}";
|
||||||
_logger.LogDebug("Fetching videos for show {ShowId} from business unit: {BusinessUnit}", showId, businessUnit);
|
_logger.LogDebug("Fetching videos for show {ShowId} from business unit: {BusinessUnit}", showId, businessUnit);
|
||||||
|
|
||||||
@@ -392,7 +406,7 @@ public class SRFApiClient : IDisposable
|
|||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
var baseUrl = string.Format(CultureInfo.InvariantCulture, PlayV3UrlFormat, businessUnit);
|
var baseUrl = BuildPlayV3BaseUrl(businessUnit);
|
||||||
var url = $"{baseUrl}livestreams?eventType={eventType.ToUpperInvariant()}";
|
var url = $"{baseUrl}livestreams?eventType={eventType.ToUpperInvariant()}";
|
||||||
_logger.LogInformation("Fetching scheduled livestreams for eventType={EventType} from business unit: {BusinessUnit}", eventType, businessUnit);
|
_logger.LogInformation("Fetching scheduled livestreams for eventType={EventType} from business unit: {BusinessUnit}", eventType, businessUnit);
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,43 @@
|
|||||||
|
using Jellyfin.Plugin.SRFPlay.Api;
|
||||||
|
using Jellyfin.Plugin.SRFPlay.Configuration;
|
||||||
|
using Jellyfin.Plugin.SRFPlay.Services.Interfaces;
|
||||||
|
using Microsoft.Extensions.Logging;
|
||||||
|
|
||||||
|
namespace Jellyfin.Plugin.SRFPlay.Channels;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Radiotelevisione svizzera — Swiss Italian channel.
|
||||||
|
/// </summary>
|
||||||
|
public sealed class RsiChannel : SrgChannelBase
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Initializes a new instance of the <see cref="RsiChannel"/> class.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="loggerFactory">The logger factory.</param>
|
||||||
|
/// <param name="contentRefreshService">The content refresh service.</param>
|
||||||
|
/// <param name="streamResolver">The stream resolver.</param>
|
||||||
|
/// <param name="mediaSourceFactory">The media source factory.</param>
|
||||||
|
/// <param name="categoryService">The category service.</param>
|
||||||
|
/// <param name="apiClientFactory">The API client factory.</param>
|
||||||
|
/// <param name="recordingService">The recording service.</param>
|
||||||
|
public RsiChannel(
|
||||||
|
ILoggerFactory loggerFactory,
|
||||||
|
IContentRefreshService contentRefreshService,
|
||||||
|
IStreamUrlResolver streamResolver,
|
||||||
|
IMediaSourceFactory mediaSourceFactory,
|
||||||
|
ICategoryService? categoryService,
|
||||||
|
ISRFApiClientFactory apiClientFactory,
|
||||||
|
IRecordingService recordingService)
|
||||||
|
: base(loggerFactory, contentRefreshService, streamResolver, mediaSourceFactory, categoryService, apiClientFactory, recordingService)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
protected override BusinessUnit Unit => BusinessUnit.RSI;
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
protected override string LogoResourceName => "Jellyfin.Plugin.SRFPlay.Images.rsi-logo.png";
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
public override string Description => "Radiotelevisione svizzera — Swiss Italian video-on-demand content";
|
||||||
|
}
|
||||||
@@ -0,0 +1,43 @@
|
|||||||
|
using Jellyfin.Plugin.SRFPlay.Api;
|
||||||
|
using Jellyfin.Plugin.SRFPlay.Configuration;
|
||||||
|
using Jellyfin.Plugin.SRFPlay.Services.Interfaces;
|
||||||
|
using Microsoft.Extensions.Logging;
|
||||||
|
|
||||||
|
namespace Jellyfin.Plugin.SRFPlay.Channels;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Radiotelevisiun Svizra Rumantscha — Swiss Romansh channel.
|
||||||
|
/// </summary>
|
||||||
|
public sealed class RtrChannel : SrgChannelBase
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Initializes a new instance of the <see cref="RtrChannel"/> class.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="loggerFactory">The logger factory.</param>
|
||||||
|
/// <param name="contentRefreshService">The content refresh service.</param>
|
||||||
|
/// <param name="streamResolver">The stream resolver.</param>
|
||||||
|
/// <param name="mediaSourceFactory">The media source factory.</param>
|
||||||
|
/// <param name="categoryService">The category service.</param>
|
||||||
|
/// <param name="apiClientFactory">The API client factory.</param>
|
||||||
|
/// <param name="recordingService">The recording service.</param>
|
||||||
|
public RtrChannel(
|
||||||
|
ILoggerFactory loggerFactory,
|
||||||
|
IContentRefreshService contentRefreshService,
|
||||||
|
IStreamUrlResolver streamResolver,
|
||||||
|
IMediaSourceFactory mediaSourceFactory,
|
||||||
|
ICategoryService? categoryService,
|
||||||
|
ISRFApiClientFactory apiClientFactory,
|
||||||
|
IRecordingService recordingService)
|
||||||
|
: base(loggerFactory, contentRefreshService, streamResolver, mediaSourceFactory, categoryService, apiClientFactory, recordingService)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
protected override BusinessUnit Unit => BusinessUnit.RTR;
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
protected override string LogoResourceName => "Jellyfin.Plugin.SRFPlay.Images.rtr-logo.png";
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
public override string Description => "Radiotelevisiun Svizra Rumantscha — Swiss Romansh video-on-demand content";
|
||||||
|
}
|
||||||
@@ -0,0 +1,43 @@
|
|||||||
|
using Jellyfin.Plugin.SRFPlay.Api;
|
||||||
|
using Jellyfin.Plugin.SRFPlay.Configuration;
|
||||||
|
using Jellyfin.Plugin.SRFPlay.Services.Interfaces;
|
||||||
|
using Microsoft.Extensions.Logging;
|
||||||
|
|
||||||
|
namespace Jellyfin.Plugin.SRFPlay.Channels;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Radio Télévision Suisse — Swiss French channel.
|
||||||
|
/// </summary>
|
||||||
|
public sealed class RtsChannel : SrgChannelBase
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Initializes a new instance of the <see cref="RtsChannel"/> class.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="loggerFactory">The logger factory.</param>
|
||||||
|
/// <param name="contentRefreshService">The content refresh service.</param>
|
||||||
|
/// <param name="streamResolver">The stream resolver.</param>
|
||||||
|
/// <param name="mediaSourceFactory">The media source factory.</param>
|
||||||
|
/// <param name="categoryService">The category service.</param>
|
||||||
|
/// <param name="apiClientFactory">The API client factory.</param>
|
||||||
|
/// <param name="recordingService">The recording service.</param>
|
||||||
|
public RtsChannel(
|
||||||
|
ILoggerFactory loggerFactory,
|
||||||
|
IContentRefreshService contentRefreshService,
|
||||||
|
IStreamUrlResolver streamResolver,
|
||||||
|
IMediaSourceFactory mediaSourceFactory,
|
||||||
|
ICategoryService? categoryService,
|
||||||
|
ISRFApiClientFactory apiClientFactory,
|
||||||
|
IRecordingService recordingService)
|
||||||
|
: base(loggerFactory, contentRefreshService, streamResolver, mediaSourceFactory, categoryService, apiClientFactory, recordingService)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
protected override BusinessUnit Unit => BusinessUnit.RTS;
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
protected override string LogoResourceName => "Jellyfin.Plugin.SRFPlay.Images.rts-logo.png";
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
public override string Description => "Radio Télévision Suisse — Swiss French video-on-demand content";
|
||||||
|
}
|
||||||
@@ -0,0 +1,43 @@
|
|||||||
|
using Jellyfin.Plugin.SRFPlay.Api;
|
||||||
|
using Jellyfin.Plugin.SRFPlay.Configuration;
|
||||||
|
using Jellyfin.Plugin.SRFPlay.Services.Interfaces;
|
||||||
|
using Microsoft.Extensions.Logging;
|
||||||
|
|
||||||
|
namespace Jellyfin.Plugin.SRFPlay.Channels;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Schweizer Radio und Fernsehen — Swiss German channel.
|
||||||
|
/// </summary>
|
||||||
|
public sealed class SrfChannel : SrgChannelBase
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Initializes a new instance of the <see cref="SrfChannel"/> class.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="loggerFactory">The logger factory.</param>
|
||||||
|
/// <param name="contentRefreshService">The content refresh service.</param>
|
||||||
|
/// <param name="streamResolver">The stream resolver.</param>
|
||||||
|
/// <param name="mediaSourceFactory">The media source factory.</param>
|
||||||
|
/// <param name="categoryService">The category service.</param>
|
||||||
|
/// <param name="apiClientFactory">The API client factory.</param>
|
||||||
|
/// <param name="recordingService">The recording service.</param>
|
||||||
|
public SrfChannel(
|
||||||
|
ILoggerFactory loggerFactory,
|
||||||
|
IContentRefreshService contentRefreshService,
|
||||||
|
IStreamUrlResolver streamResolver,
|
||||||
|
IMediaSourceFactory mediaSourceFactory,
|
||||||
|
ICategoryService? categoryService,
|
||||||
|
ISRFApiClientFactory apiClientFactory,
|
||||||
|
IRecordingService recordingService)
|
||||||
|
: base(loggerFactory, contentRefreshService, streamResolver, mediaSourceFactory, categoryService, apiClientFactory, recordingService)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
protected override BusinessUnit Unit => BusinessUnit.SRF;
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
protected override string LogoResourceName => "Jellyfin.Plugin.SRFPlay.Images.srf-logo.png";
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
public override string Description => "Schweizer Radio und Fernsehen — Swiss German video-on-demand content";
|
||||||
|
}
|
||||||
+40
-19
@@ -7,6 +7,7 @@ using System.Threading;
|
|||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using Jellyfin.Plugin.SRFPlay.Api;
|
using Jellyfin.Plugin.SRFPlay.Api;
|
||||||
using Jellyfin.Plugin.SRFPlay.Api.Models;
|
using Jellyfin.Plugin.SRFPlay.Api.Models;
|
||||||
|
using Jellyfin.Plugin.SRFPlay.Configuration;
|
||||||
using Jellyfin.Plugin.SRFPlay.Constants;
|
using Jellyfin.Plugin.SRFPlay.Constants;
|
||||||
using Jellyfin.Plugin.SRFPlay.Services.Interfaces;
|
using Jellyfin.Plugin.SRFPlay.Services.Interfaces;
|
||||||
using Jellyfin.Plugin.SRFPlay.Utilities;
|
using Jellyfin.Plugin.SRFPlay.Utilities;
|
||||||
@@ -22,11 +23,12 @@ using Microsoft.Extensions.Logging;
|
|||||||
namespace Jellyfin.Plugin.SRFPlay.Channels;
|
namespace Jellyfin.Plugin.SRFPlay.Channels;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// SRF Play channel for browsing and playing content.
|
/// Base channel for browsing and playing content from a single SRG SSR business unit.
|
||||||
|
/// One concrete subclass exists per unit (SRF, RTS, RSI, RTR, SWI), each shown as its own tile.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public class SRFPlayChannel : IChannel, IHasCacheKey
|
public abstract class SrgChannelBase : IChannel, IHasCacheKey
|
||||||
{
|
{
|
||||||
private readonly ILogger<SRFPlayChannel> _logger;
|
private readonly ILogger<SrgChannelBase> _logger;
|
||||||
private readonly IContentRefreshService _contentRefreshService;
|
private readonly IContentRefreshService _contentRefreshService;
|
||||||
private readonly IStreamUrlResolver _streamResolver;
|
private readonly IStreamUrlResolver _streamResolver;
|
||||||
private readonly IMediaSourceFactory _mediaSourceFactory;
|
private readonly IMediaSourceFactory _mediaSourceFactory;
|
||||||
@@ -35,7 +37,7 @@ public class SRFPlayChannel : IChannel, IHasCacheKey
|
|||||||
private readonly IRecordingService _recordingService;
|
private readonly IRecordingService _recordingService;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Initializes a new instance of the <see cref="SRFPlayChannel"/> class.
|
/// Initializes a new instance of the <see cref="SrgChannelBase"/> class.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="loggerFactory">The logger factory.</param>
|
/// <param name="loggerFactory">The logger factory.</param>
|
||||||
/// <param name="contentRefreshService">The content refresh service.</param>
|
/// <param name="contentRefreshService">The content refresh service.</param>
|
||||||
@@ -44,7 +46,7 @@ public class SRFPlayChannel : IChannel, IHasCacheKey
|
|||||||
/// <param name="categoryService">The category service (optional).</param>
|
/// <param name="categoryService">The category service (optional).</param>
|
||||||
/// <param name="apiClientFactory">The API client factory.</param>
|
/// <param name="apiClientFactory">The API client factory.</param>
|
||||||
/// <param name="recordingService">The recording service.</param>
|
/// <param name="recordingService">The recording service.</param>
|
||||||
public SRFPlayChannel(
|
protected SrgChannelBase(
|
||||||
ILoggerFactory loggerFactory,
|
ILoggerFactory loggerFactory,
|
||||||
IContentRefreshService contentRefreshService,
|
IContentRefreshService contentRefreshService,
|
||||||
IStreamUrlResolver streamResolver,
|
IStreamUrlResolver streamResolver,
|
||||||
@@ -53,7 +55,7 @@ public class SRFPlayChannel : IChannel, IHasCacheKey
|
|||||||
ISRFApiClientFactory apiClientFactory,
|
ISRFApiClientFactory apiClientFactory,
|
||||||
IRecordingService recordingService)
|
IRecordingService recordingService)
|
||||||
{
|
{
|
||||||
_logger = loggerFactory.CreateLogger<SRFPlayChannel>();
|
_logger = loggerFactory.CreateLogger<SrgChannelBase>();
|
||||||
_contentRefreshService = contentRefreshService;
|
_contentRefreshService = contentRefreshService;
|
||||||
_streamResolver = streamResolver;
|
_streamResolver = streamResolver;
|
||||||
_mediaSourceFactory = mediaSourceFactory;
|
_mediaSourceFactory = mediaSourceFactory;
|
||||||
@@ -66,14 +68,24 @@ public class SRFPlayChannel : IChannel, IHasCacheKey
|
|||||||
_logger.LogWarning("CategoryService not available - category folders will be disabled");
|
_logger.LogWarning("CategoryService not available - category folders will be disabled");
|
||||||
}
|
}
|
||||||
|
|
||||||
_logger.LogDebug("SRFPlayChannel initialized");
|
_logger.LogDebug("SrgChannelBase initialized");
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <inheritdoc />
|
/// <summary>
|
||||||
public string Name => "SRF Play";
|
/// Gets the business unit this channel serves.
|
||||||
|
/// </summary>
|
||||||
|
protected abstract BusinessUnit Unit { get; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets the embedded resource name of this unit's logo PNG.
|
||||||
|
/// </summary>
|
||||||
|
protected abstract string LogoResourceName { get; }
|
||||||
|
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public string Description => "Swiss Radio and Television video-on-demand content";
|
public string Name => $"{Unit} Play";
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
public abstract string Description { get; }
|
||||||
|
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public string DataVersion => "2.0"; // Back to authenticating at channel refresh with auto-refresh for fresh tokens
|
public string DataVersion => "2.0"; // Back to authenticating at channel refresh with auto-refresh for fresh tokens
|
||||||
@@ -114,7 +126,8 @@ public class SRFPlayChannel : IChannel, IHasCacheKey
|
|||||||
public Task<DynamicImageResponse> GetChannelImage(ImageType type, CancellationToken cancellationToken)
|
public Task<DynamicImageResponse> GetChannelImage(ImageType type, CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
var assembly = GetType().Assembly;
|
var assembly = GetType().Assembly;
|
||||||
var resourceStream = assembly.GetManifestResourceStream("Jellyfin.Plugin.SRFPlay.Images.logo.png");
|
var resourceStream = assembly.GetManifestResourceStream(LogoResourceName)
|
||||||
|
?? assembly.GetManifestResourceStream("Jellyfin.Plugin.SRFPlay.Images.logo.png");
|
||||||
|
|
||||||
if (resourceStream == null)
|
if (resourceStream == null)
|
||||||
{
|
{
|
||||||
@@ -198,7 +211,7 @@ public class SRFPlayChannel : IChannel, IHasCacheKey
|
|||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
var businessUnit = config.BusinessUnit.ToLowerString();
|
var businessUnit = Unit.ToLowerString();
|
||||||
var topics = await _categoryService.GetTopicsAsync(businessUnit, cancellationToken).ConfigureAwait(false);
|
var topics = await _categoryService.GetTopicsAsync(businessUnit, cancellationToken).ConfigureAwait(false);
|
||||||
|
|
||||||
foreach (var topic in topics.Where(t => !string.IsNullOrEmpty(t.Id)))
|
foreach (var topic in topics.Where(t => !string.IsNullOrEmpty(t.Id)))
|
||||||
@@ -239,24 +252,23 @@ public class SRFPlayChannel : IChannel, IHasCacheKey
|
|||||||
|
|
||||||
private async Task<List<ChannelItemInfo>> GetLatestVideosAsync(CancellationToken cancellationToken)
|
private async Task<List<ChannelItemInfo>> GetLatestVideosAsync(CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
var urns = await _contentRefreshService.RefreshLatestContentAsync(cancellationToken).ConfigureAwait(false);
|
var urns = await _contentRefreshService.RefreshLatestContentAsync(Unit.ToLowerString(), cancellationToken).ConfigureAwait(false);
|
||||||
return await ConvertUrnsToChannelItems(urns, cancellationToken).ConfigureAwait(false);
|
return await ConvertUrnsToChannelItems(urns, cancellationToken).ConfigureAwait(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
private async Task<List<ChannelItemInfo>> GetTrendingVideosAsync(CancellationToken cancellationToken)
|
private async Task<List<ChannelItemInfo>> GetTrendingVideosAsync(CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
var urns = await _contentRefreshService.RefreshTrendingContentAsync(cancellationToken).ConfigureAwait(false);
|
var urns = await _contentRefreshService.RefreshTrendingContentAsync(Unit.ToLowerString(), cancellationToken).ConfigureAwait(false);
|
||||||
return await ConvertUrnsToChannelItems(urns, cancellationToken).ConfigureAwait(false);
|
return await ConvertUrnsToChannelItems(urns, cancellationToken).ConfigureAwait(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
private async Task<List<ChannelItemInfo>> GetLiveSportsAsync(CancellationToken cancellationToken)
|
private async Task<List<ChannelItemInfo>> GetLiveSportsAsync(CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
var items = new List<ChannelItemInfo>();
|
var items = new List<ChannelItemInfo>();
|
||||||
var config = Plugin.Instance?.Configuration;
|
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
var businessUnit = config?.BusinessUnit.ToLowerString() ?? "srf";
|
var businessUnit = Unit.ToLowerString();
|
||||||
|
|
||||||
using var apiClient = _apiClientFactory.CreateClient();
|
using var apiClient = _apiClientFactory.CreateClient();
|
||||||
var scheduledLivestreams = await apiClient.GetScheduledLivestreamsAsync(businessUnit, "SPORT", cancellationToken).ConfigureAwait(false);
|
var scheduledLivestreams = await apiClient.GetScheduledLivestreamsAsync(businessUnit, "SPORT", cancellationToken).ConfigureAwait(false);
|
||||||
@@ -307,6 +319,7 @@ public class SRFPlayChannel : IChannel, IHasCacheKey
|
|||||||
private List<ChannelItemInfo> GetRecordingItems()
|
private List<ChannelItemInfo> GetRecordingItems()
|
||||||
{
|
{
|
||||||
var items = new List<ChannelItemInfo>();
|
var items = new List<ChannelItemInfo>();
|
||||||
|
var unit = Unit.ToLowerString();
|
||||||
var recordings = _recordingService.GetRecordings(RecordingState.Completed);
|
var recordings = _recordingService.GetRecordings(RecordingState.Completed);
|
||||||
|
|
||||||
foreach (var recording in recordings)
|
foreach (var recording in recordings)
|
||||||
@@ -316,6 +329,15 @@ public class SRFPlayChannel : IChannel, IHasCacheKey
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Only show recordings belonging to this unit. Recordings created before the
|
||||||
|
// BusinessUnit tag existed have an empty value and are shown everywhere so they
|
||||||
|
// are not lost.
|
||||||
|
if (!string.IsNullOrEmpty(recording.BusinessUnit) &&
|
||||||
|
!string.Equals(recording.BusinessUnit, unit, StringComparison.OrdinalIgnoreCase))
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
var fileInfo = new System.IO.FileInfo(recording.OutputPath);
|
var fileInfo = new System.IO.FileInfo(recording.OutputPath);
|
||||||
var itemId = $"recording_{recording.Id}";
|
var itemId = $"recording_{recording.Id}";
|
||||||
|
|
||||||
@@ -368,9 +390,8 @@ public class SRFPlayChannel : IChannel, IHasCacheKey
|
|||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
var config = Plugin.Instance?.Configuration;
|
|
||||||
var topicId = folderId.Substring("category_".Length);
|
var topicId = folderId.Substring("category_".Length);
|
||||||
var businessUnit = config?.BusinessUnit.ToLowerString() ?? "srf";
|
var businessUnit = Unit.ToLowerString();
|
||||||
|
|
||||||
var shows = await _categoryService.GetShowsByTopicAsync(topicId, businessUnit, 20, cancellationToken).ConfigureAwait(false);
|
var shows = await _categoryService.GetShowsByTopicAsync(topicId, businessUnit, 20, cancellationToken).ConfigureAwait(false);
|
||||||
var urns = new List<string>();
|
var urns = new List<string>();
|
||||||
@@ -472,7 +493,7 @@ public class SRFPlayChannel : IChannel, IHasCacheKey
|
|||||||
var timeKey = timeBucket.ToString("yyyy-MM-dd-HH-mm", CultureInfo.InvariantCulture);
|
var timeKey = timeBucket.ToString("yyyy-MM-dd-HH-mm", CultureInfo.InvariantCulture);
|
||||||
|
|
||||||
var recordingCount = _recordingService.GetRecordings(RecordingState.Completed).Count;
|
var recordingCount = _recordingService.GetRecordings(RecordingState.Completed).Count;
|
||||||
return $"{config?.BusinessUnit}_{config?.EnableLatestContent}_{config?.EnableTrendingContent}_{config?.EnableCategoryFolders}_{enabledTopics}_{timeKey}_rec{recordingCount}";
|
return $"{Unit}_{config?.EnableLatestContent}_{config?.EnableTrendingContent}_{config?.EnableCategoryFolders}_{enabledTopics}_{timeKey}_rec{recordingCount}";
|
||||||
}
|
}
|
||||||
|
|
||||||
private async Task<List<ChannelItemInfo>> ConvertUrnsToChannelItems(List<string> urns, CancellationToken cancellationToken)
|
private async Task<List<ChannelItemInfo>> ConvertUrnsToChannelItems(List<string> urns, CancellationToken cancellationToken)
|
||||||
@@ -0,0 +1,43 @@
|
|||||||
|
using Jellyfin.Plugin.SRFPlay.Api;
|
||||||
|
using Jellyfin.Plugin.SRFPlay.Configuration;
|
||||||
|
using Jellyfin.Plugin.SRFPlay.Services.Interfaces;
|
||||||
|
using Microsoft.Extensions.Logging;
|
||||||
|
|
||||||
|
namespace Jellyfin.Plugin.SRFPlay.Channels;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// SWI swissinfo.ch — Swiss international channel.
|
||||||
|
/// </summary>
|
||||||
|
public sealed class SwiChannel : SrgChannelBase
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Initializes a new instance of the <see cref="SwiChannel"/> class.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="loggerFactory">The logger factory.</param>
|
||||||
|
/// <param name="contentRefreshService">The content refresh service.</param>
|
||||||
|
/// <param name="streamResolver">The stream resolver.</param>
|
||||||
|
/// <param name="mediaSourceFactory">The media source factory.</param>
|
||||||
|
/// <param name="categoryService">The category service.</param>
|
||||||
|
/// <param name="apiClientFactory">The API client factory.</param>
|
||||||
|
/// <param name="recordingService">The recording service.</param>
|
||||||
|
public SwiChannel(
|
||||||
|
ILoggerFactory loggerFactory,
|
||||||
|
IContentRefreshService contentRefreshService,
|
||||||
|
IStreamUrlResolver streamResolver,
|
||||||
|
IMediaSourceFactory mediaSourceFactory,
|
||||||
|
ICategoryService? categoryService,
|
||||||
|
ISRFApiClientFactory apiClientFactory,
|
||||||
|
IRecordingService recordingService)
|
||||||
|
: base(loggerFactory, contentRefreshService, streamResolver, mediaSourceFactory, categoryService, apiClientFactory, recordingService)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
protected override BusinessUnit Unit => BusinessUnit.SWI;
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
protected override string LogoResourceName => "Jellyfin.Plugin.SRFPlay.Images.swi-logo.png";
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
public override string Description => "SWI swissinfo.ch — Swiss international video-on-demand content";
|
||||||
|
}
|
||||||
@@ -78,7 +78,8 @@ public class PluginConfiguration : BasePluginConfiguration
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the business unit to fetch content from.
|
/// Gets or sets the legacy single business unit. Retained only for backwards compatibility
|
||||||
|
/// with older configs; every unit now has its own always-on channel.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public BusinessUnit BusinessUnit { get; set; }
|
public BusinessUnit BusinessUnit { get; set; }
|
||||||
|
|
||||||
|
|||||||
@@ -1,24 +1,10 @@
|
|||||||
<!DOCTYPE html>
|
|
||||||
<html lang="en">
|
|
||||||
<head>
|
|
||||||
<meta charset="utf-8">
|
|
||||||
<title>SRF Play</title>
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
<div id="SRFPlayConfigPage" data-role="page" class="page type-interior pluginConfigurationPage" data-require="emby-input,emby-button,emby-select,emby-checkbox">
|
<div id="SRFPlayConfigPage" data-role="page" class="page type-interior pluginConfigurationPage" data-require="emby-input,emby-button,emby-select,emby-checkbox">
|
||||||
<div data-role="content">
|
<div data-role="content">
|
||||||
<div class="content-primary">
|
<div class="content-primary">
|
||||||
<form id="SRFPlayConfigForm">
|
<form id="SRFPlayConfigForm">
|
||||||
<div class="selectContainer">
|
<div class="checkboxContainer checkboxContainer-withDescription">
|
||||||
<label class="selectLabel" for="BusinessUnit">Business Unit</label>
|
<h3>Channels</h3>
|
||||||
<select is="emby-select" id="BusinessUnit" name="BusinessUnit" class="emby-select-withcolor emby-select">
|
<div class="fieldDescription">Every Swiss broadcaster has its own channel tile: SRF (German), RTS (French), RSI (Italian), RTR (Romansh) and SWI (swissinfo.ch). They are always available — pin the ones you use from the Jellyfin home screen.</div>
|
||||||
<option id="optSRF" value="SRF">SRF (German)</option>
|
|
||||||
<option id="optRTS" value="RTS">RTS (French)</option>
|
|
||||||
<option id="optRSI" value="RSI">RSI (Italian)</option>
|
|
||||||
<option id="optRTR" value="RTR">RTR (Romansh)</option>
|
|
||||||
<option id="optSWI" value="SWI">SWI (International)</option>
|
|
||||||
</select>
|
|
||||||
<div class="fieldDescription">Select the Swiss broadcasting unit to fetch content from</div>
|
|
||||||
</div>
|
</div>
|
||||||
<div class="selectContainer">
|
<div class="selectContainer">
|
||||||
<label class="selectLabel" for="QualityPreference">Quality Preference</label>
|
<label class="selectLabel" for="QualityPreference">Quality Preference</label>
|
||||||
@@ -149,7 +135,6 @@
|
|||||||
.addEventListener('pageshow', function() {
|
.addEventListener('pageshow', function() {
|
||||||
Dashboard.showLoadingMsg();
|
Dashboard.showLoadingMsg();
|
||||||
ApiClient.getPluginConfiguration(SRFPlayConfig.pluginUniqueId).then(function (config) {
|
ApiClient.getPluginConfiguration(SRFPlayConfig.pluginUniqueId).then(function (config) {
|
||||||
document.querySelector('#BusinessUnit').value = config.BusinessUnit;
|
|
||||||
document.querySelector('#QualityPreference').value = config.QualityPreference;
|
document.querySelector('#QualityPreference').value = config.QualityPreference;
|
||||||
document.querySelector('#ContentRefreshIntervalHours').value = config.ContentRefreshIntervalHours;
|
document.querySelector('#ContentRefreshIntervalHours').value = config.ContentRefreshIntervalHours;
|
||||||
document.querySelector('#ExpirationCheckIntervalHours').value = config.ExpirationCheckIntervalHours;
|
document.querySelector('#ExpirationCheckIntervalHours').value = config.ExpirationCheckIntervalHours;
|
||||||
@@ -175,7 +160,6 @@
|
|||||||
.addEventListener('submit', function(e) {
|
.addEventListener('submit', function(e) {
|
||||||
Dashboard.showLoadingMsg();
|
Dashboard.showLoadingMsg();
|
||||||
ApiClient.getPluginConfiguration(SRFPlayConfig.pluginUniqueId).then(function (config) {
|
ApiClient.getPluginConfiguration(SRFPlayConfig.pluginUniqueId).then(function (config) {
|
||||||
config.BusinessUnit = document.querySelector('#BusinessUnit').value;
|
|
||||||
config.QualityPreference = document.querySelector('#QualityPreference').value;
|
config.QualityPreference = document.querySelector('#QualityPreference').value;
|
||||||
config.ContentRefreshIntervalHours = parseInt(document.querySelector('#ContentRefreshIntervalHours').value);
|
config.ContentRefreshIntervalHours = parseInt(document.querySelector('#ContentRefreshIntervalHours').value);
|
||||||
config.ExpirationCheckIntervalHours = parseInt(document.querySelector('#ExpirationCheckIntervalHours').value);
|
config.ExpirationCheckIntervalHours = parseInt(document.querySelector('#ExpirationCheckIntervalHours').value);
|
||||||
@@ -398,5 +382,3 @@
|
|||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
</div>
|
</div>
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
|
|||||||
@@ -1,66 +1,59 @@
|
|||||||
<!DOCTYPE html>
|
<div id="SRFPlayRecordingsPage" data-role="page" class="page type-interior pluginConfigurationPage"
|
||||||
<html lang="en">
|
data-require="emby-button,emby-input">
|
||||||
<head>
|
|
||||||
<meta charset="utf-8">
|
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
|
||||||
<title>SRF Sport Recordings</title>
|
|
||||||
<style>
|
<style>
|
||||||
* { box-sizing: border-box; margin: 0; padding: 0; }
|
#SRFPlayRecordingsPage .srfrec-wrap { padding: 0 1em; }
|
||||||
body { font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif; background: #1a1a2e; color: #e0e0e0; padding: 20px; }
|
#SRFPlayRecordingsPage table { width: 100%; border-collapse: collapse; margin: 10px 0 20px; }
|
||||||
h1 { color: #fff; margin-bottom: 8px; font-size: 1.8em; }
|
#SRFPlayRecordingsPage th { text-align: left; padding: 10px 8px; border-bottom: 2px solid #444; color: #aaa; font-size: 0.85em; text-transform: uppercase; }
|
||||||
h2 { color: #ccc; margin: 24px 0 12px; font-size: 1.3em; border-bottom: 1px solid #333; padding-bottom: 6px; }
|
#SRFPlayRecordingsPage td { padding: 10px 8px; border-bottom: 1px solid #2a2a3e; }
|
||||||
.subtitle { color: #999; margin-bottom: 20px; font-size: 0.9em; }
|
#SRFPlayRecordingsPage tr:hover { background: rgba(255,255,255,0.04); }
|
||||||
table { width: 100%; border-collapse: collapse; margin: 10px 0 20px; }
|
#SRFPlayRecordingsPage .btn { padding: 6px 16px; border: none; border-radius: 4px; cursor: pointer; font-size: 0.85em; color: #fff; transition: opacity 0.2s; }
|
||||||
th { text-align: left; padding: 10px 8px; border-bottom: 2px solid #444; color: #aaa; font-size: 0.85em; text-transform: uppercase; }
|
#SRFPlayRecordingsPage .btn:hover { opacity: 0.85; }
|
||||||
td { padding: 10px 8px; border-bottom: 1px solid #2a2a3e; }
|
#SRFPlayRecordingsPage .btn-record { background: #4CAF50; }
|
||||||
tr:hover { background: #2a2a3e; }
|
#SRFPlayRecordingsPage .btn-stop { background: #FF9800; }
|
||||||
.btn { padding: 6px 16px; border: none; border-radius: 4px; cursor: pointer; font-size: 0.85em; color: #fff; transition: opacity 0.2s; }
|
#SRFPlayRecordingsPage .btn-cancel { background: #9E9E9E; }
|
||||||
.btn:hover { opacity: 0.85; }
|
#SRFPlayRecordingsPage .btn-delete { background: #f44336; }
|
||||||
.btn-record { background: #4CAF50; }
|
#SRFPlayRecordingsPage .btn-refresh { background: #2196F3; margin-bottom: 16px; }
|
||||||
.btn-stop { background: #FF9800; }
|
#SRFPlayRecordingsPage .status { padding: 3px 8px; border-radius: 3px; font-size: 0.8em; font-weight: 600; color: #fff; }
|
||||||
.btn-cancel { background: #9E9E9E; }
|
#SRFPlayRecordingsPage .status-scheduled { background: #1565C0; }
|
||||||
.btn-delete { background: #f44336; }
|
#SRFPlayRecordingsPage .status-waiting { background: #E65100; }
|
||||||
.btn-refresh { background: #2196F3; margin-bottom: 16px; }
|
#SRFPlayRecordingsPage .status-recording { background: #2E7D32; }
|
||||||
.status { padding: 3px 8px; border-radius: 3px; font-size: 0.8em; font-weight: 600; }
|
#SRFPlayRecordingsPage .status-failed { background: #C62828; }
|
||||||
.status-scheduled { background: #1565C0; }
|
#SRFPlayRecordingsPage .srfrec-msg { padding: 12px; color: #999; font-style: italic; }
|
||||||
.status-waiting { background: #E65100; }
|
#SRFPlayRecordingsPage .srfrec-error { color: #f44; }
|
||||||
.status-recording { background: #2E7D32; }
|
#SRFPlayRecordingsPage .login-form { max-width: 400px; margin: 40px auto; }
|
||||||
.status-failed { background: #C62828; }
|
#SRFPlayRecordingsPage .login-form input { width: 100%; padding: 10px; margin: 8px 0; background: #2a2a3e; border: 1px solid #444; color: #fff; border-radius: 4px; font-size: 1em; }
|
||||||
.msg { padding: 12px; color: #999; font-style: italic; }
|
#SRFPlayRecordingsPage .login-form .btn { width: 100%; padding: 12px; font-size: 1em; margin-top: 12px; }
|
||||||
.error { color: #f44; }
|
|
||||||
.login-form { max-width: 400px; margin: 60px auto; }
|
|
||||||
.login-form input { width: 100%; padding: 10px; margin: 8px 0; background: #2a2a3e; border: 1px solid #444; color: #fff; border-radius: 4px; font-size: 1em; }
|
|
||||||
.login-form .btn { width: 100%; padding: 12px; font-size: 1em; margin-top: 12px; }
|
|
||||||
@media (max-width: 600px) { body { padding: 10px; } td, th { padding: 6px 4px; font-size: 0.85em; } }
|
|
||||||
</style>
|
</style>
|
||||||
</head>
|
<div data-role="content">
|
||||||
<body>
|
<div class="content-primary srfrec-wrap">
|
||||||
<div id="loginSection" style="display:none;">
|
<div id="srfrecLoginSection" style="display:none;">
|
||||||
<div class="login-form">
|
<div class="login-form">
|
||||||
<h1>SRF Sport Recordings</h1>
|
<h1>SRF Sport Recordings</h1>
|
||||||
<p class="subtitle">Sign in to your Jellyfin server</p>
|
<p class="fieldDescription">Sign in to your Jellyfin server</p>
|
||||||
<input type="text" id="loginServer" placeholder="Server URL (e.g. http://192.168.1.50:8096)" />
|
<input type="text" id="srfrecLoginServer" placeholder="Server URL (e.g. http://192.168.1.50:8096)" />
|
||||||
<input type="text" id="loginUser" placeholder="Username" />
|
<input type="text" id="srfrecLoginUser" placeholder="Username" />
|
||||||
<input type="password" id="loginPass" placeholder="Password" />
|
<input type="password" id="srfrecLoginPass" placeholder="Password" />
|
||||||
<button class="btn btn-record" onclick="SRFRec.login()">Sign In</button>
|
<button type="button" class="btn btn-record" onclick="SRFRec.login()">Sign In</button>
|
||||||
<p id="loginError" class="error" style="margin-top:10px;"></p>
|
<p id="srfrecLoginError" class="srfrec-error" style="margin-top:10px;"></p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div id="mainSection" style="display:none;">
|
<div id="srfrecMainSection" style="display:none;">
|
||||||
<h1>SRF Sport Recordings</h1>
|
<h1>SRF Sport Recordings</h1>
|
||||||
<p class="subtitle">Browse upcoming sport livestreams and schedule recordings. <span id="userInfo"></span></p>
|
<p class="fieldDescription">Browse upcoming sport livestreams and schedule recordings. <span id="srfrecUserInfo"></span></p>
|
||||||
|
|
||||||
<h2>Upcoming Sport Livestreams</h2>
|
<h2>Upcoming Sport Livestreams</h2>
|
||||||
<button class="btn btn-refresh" onclick="SRFRec.loadSchedule()">Refresh Schedule</button>
|
<button type="button" class="btn btn-refresh" onclick="SRFRec.loadSchedule()">Refresh Schedule</button>
|
||||||
<div id="scheduleContainer"><p class="msg">Loading schedule...</p></div>
|
<div id="srfrecScheduleContainer"><p class="srfrec-msg">Loading schedule...</p></div>
|
||||||
|
|
||||||
<h2>Scheduled & Active Recordings</h2>
|
<h2>Scheduled & Active Recordings</h2>
|
||||||
<div id="activeRecordingsContainer"><p class="msg">Loading...</p></div>
|
<div id="srfrecActiveRecordingsContainer"><p class="srfrec-msg">Loading...</p></div>
|
||||||
|
|
||||||
<h2>Completed Recordings</h2>
|
<h2>Completed Recordings</h2>
|
||||||
<button class="btn btn-refresh" onclick="SRFRec.loadRecordings()">Refresh</button>
|
<button type="button" class="btn btn-refresh" onclick="SRFRec.loadRecordings()">Refresh</button>
|
||||||
<div id="completedRecordingsContainer"><p class="msg">Loading...</p></div>
|
<div id="srfrecCompletedRecordingsContainer"><p class="srfrec-msg">Loading...</p></div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
@@ -91,9 +84,9 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Show login form
|
// Show login form
|
||||||
var serverInput = document.getElementById('loginServer');
|
var serverInput = document.getElementById('srfrecLoginServer');
|
||||||
serverInput.value = window.location.origin;
|
serverInput.value = window.location.origin;
|
||||||
document.getElementById('loginSection').style.display = 'block';
|
document.getElementById('srfrecLoginSection').style.display = 'block';
|
||||||
},
|
},
|
||||||
|
|
||||||
verifySession: function(session) {
|
verifySession: function(session) {
|
||||||
@@ -102,24 +95,24 @@
|
|||||||
headers: { 'X-Emby-Token': this.token }
|
headers: { 'X-Emby-Token': this.token }
|
||||||
}).then(function(r) {
|
}).then(function(r) {
|
||||||
if (r.ok) {
|
if (r.ok) {
|
||||||
document.getElementById('userInfo').textContent = '(Server: ' + self.serverUrl + ')';
|
document.getElementById('srfrecUserInfo').textContent = '(Server: ' + self.serverUrl + ')';
|
||||||
self.showMain();
|
self.showMain();
|
||||||
} else {
|
} else {
|
||||||
localStorage.removeItem('srfRecSession');
|
localStorage.removeItem('srfRecSession');
|
||||||
document.getElementById('loginSection').style.display = 'block';
|
document.getElementById('srfrecLoginSection').style.display = 'block';
|
||||||
}
|
}
|
||||||
}).catch(function() {
|
}).catch(function() {
|
||||||
localStorage.removeItem('srfRecSession');
|
localStorage.removeItem('srfRecSession');
|
||||||
document.getElementById('loginSection').style.display = 'block';
|
document.getElementById('srfrecLoginSection').style.display = 'block';
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
login: function() {
|
login: function() {
|
||||||
var self = this;
|
var self = this;
|
||||||
var server = document.getElementById('loginServer').value.replace(/\/+$/, '');
|
var server = document.getElementById('srfrecLoginServer').value.replace(/\/+$/, '');
|
||||||
var user = document.getElementById('loginUser').value;
|
var user = document.getElementById('srfrecLoginUser').value;
|
||||||
var pass = document.getElementById('loginPass').value;
|
var pass = document.getElementById('srfrecLoginPass').value;
|
||||||
var errorEl = document.getElementById('loginError');
|
var errorEl = document.getElementById('srfrecLoginError');
|
||||||
errorEl.textContent = '';
|
errorEl.textContent = '';
|
||||||
|
|
||||||
fetch(server + '/Users/AuthenticateByName', {
|
fetch(server + '/Users/AuthenticateByName', {
|
||||||
@@ -142,7 +135,7 @@
|
|||||||
token: data.AccessToken,
|
token: data.AccessToken,
|
||||||
userName: data.User.Name
|
userName: data.User.Name
|
||||||
}));
|
}));
|
||||||
document.getElementById('userInfo').textContent = '(Signed in as ' + data.User.Name + ')';
|
document.getElementById('srfrecUserInfo').textContent = '(Signed in as ' + data.User.Name + ')';
|
||||||
self.showMain();
|
self.showMain();
|
||||||
})
|
})
|
||||||
.catch(function(err) {
|
.catch(function(err) {
|
||||||
@@ -151,8 +144,8 @@
|
|||||||
},
|
},
|
||||||
|
|
||||||
showMain: function() {
|
showMain: function() {
|
||||||
document.getElementById('loginSection').style.display = 'none';
|
document.getElementById('srfrecLoginSection').style.display = 'none';
|
||||||
document.getElementById('mainSection').style.display = 'block';
|
document.getElementById('srfrecMainSection').style.display = 'block';
|
||||||
this.loadSchedule();
|
this.loadSchedule();
|
||||||
this.loadRecordings();
|
this.loadRecordings();
|
||||||
},
|
},
|
||||||
@@ -175,14 +168,14 @@
|
|||||||
},
|
},
|
||||||
|
|
||||||
loadSchedule: function() {
|
loadSchedule: function() {
|
||||||
var container = document.getElementById('scheduleContainer');
|
var container = document.getElementById('srfrecScheduleContainer');
|
||||||
container.innerHTML = '<p class="msg">Loading schedule...</p>';
|
container.innerHTML = '<p class="srfrec-msg">Loading schedule...</p>';
|
||||||
|
|
||||||
fetch(this.serverUrl + '/Plugins/SRFPlay/Recording/Schedule', { headers: this.getHeaders() })
|
fetch(this.serverUrl + '/Plugins/SRFPlay/Recording/Schedule', { headers: this.getHeaders() })
|
||||||
.then(function(r) { return r.json(); })
|
.then(function(r) { return r.json(); })
|
||||||
.then(function(programs) {
|
.then(function(programs) {
|
||||||
if (!programs || programs.length === 0) {
|
if (!programs || programs.length === 0) {
|
||||||
container.innerHTML = '<p class="msg">No upcoming sport livestreams found.</p>';
|
container.innerHTML = '<p class="srfrec-msg">No upcoming sport livestreams found.</p>';
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -194,7 +187,7 @@
|
|||||||
html += '<td>' + (p.title || 'Unknown') + '</td>';
|
html += '<td>' + (p.title || 'Unknown') + '</td>';
|
||||||
html += '<td>' + SRFRec.formatDate(p.validFrom || p.date) + '</td>';
|
html += '<td>' + SRFRec.formatDate(p.validFrom || p.date) + '</td>';
|
||||||
html += '<td>' + SRFRec.formatDate(p.validTo) + '</td>';
|
html += '<td>' + SRFRec.formatDate(p.validTo) + '</td>';
|
||||||
html += '<td><button class="btn btn-record" onclick="SRFRec.scheduleRecording(\'' + encodeURIComponent(p.urn) + '\')">Record</button></td>';
|
html += '<td><button type="button" class="btn btn-record" onclick="SRFRec.scheduleRecording(\'' + encodeURIComponent(p.urn) + '\')">Record</button></td>';
|
||||||
html += '</tr>';
|
html += '</tr>';
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -202,7 +195,7 @@
|
|||||||
container.innerHTML = html;
|
container.innerHTML = html;
|
||||||
})
|
})
|
||||||
.catch(function(err) {
|
.catch(function(err) {
|
||||||
container.innerHTML = '<p class="error">Error loading schedule: ' + err.message + '</p>';
|
container.innerHTML = '<p class="srfrec-error">Error loading schedule: ' + err.message + '</p>';
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -229,8 +222,8 @@
|
|||||||
},
|
},
|
||||||
|
|
||||||
loadActiveRecordings: function() {
|
loadActiveRecordings: function() {
|
||||||
var container = document.getElementById('activeRecordingsContainer');
|
var container = document.getElementById('srfrecActiveRecordingsContainer');
|
||||||
container.innerHTML = '<p class="msg">Loading...</p>';
|
container.innerHTML = '<p class="srfrec-msg">Loading...</p>';
|
||||||
|
|
||||||
fetch(this.serverUrl + '/Plugins/SRFPlay/Recording/All', { headers: this.getHeaders() })
|
fetch(this.serverUrl + '/Plugins/SRFPlay/Recording/All', { headers: this.getHeaders() })
|
||||||
.then(function(r) { return r.json(); })
|
.then(function(r) { return r.json(); })
|
||||||
@@ -241,7 +234,7 @@
|
|||||||
});
|
});
|
||||||
|
|
||||||
if (active.length === 0) {
|
if (active.length === 0) {
|
||||||
container.innerHTML = '<p class="msg">No scheduled or active recordings.</p>';
|
container.innerHTML = '<p class="srfrec-msg">No scheduled or active recordings.</p>';
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -265,9 +258,9 @@
|
|||||||
html += '<td>' + SRFRec.formatDate(r.validFrom) + '</td>';
|
html += '<td>' + SRFRec.formatDate(r.validFrom) + '</td>';
|
||||||
html += '<td>';
|
html += '<td>';
|
||||||
if (r.state === 2 || r.state === 'Recording') {
|
if (r.state === 2 || r.state === 'Recording') {
|
||||||
html += '<button class="btn btn-stop" onclick="SRFRec.stopRecording(\'' + r.id + '\')">Stop</button>';
|
html += '<button type="button" class="btn btn-stop" onclick="SRFRec.stopRecording(\'' + r.id + '\')">Stop</button>';
|
||||||
} else {
|
} else {
|
||||||
html += '<button class="btn btn-cancel" onclick="SRFRec.cancelRecording(\'' + r.id + '\')">Cancel</button>';
|
html += '<button type="button" class="btn btn-cancel" onclick="SRFRec.cancelRecording(\'' + r.id + '\')">Cancel</button>';
|
||||||
}
|
}
|
||||||
html += '</td></tr>';
|
html += '</td></tr>';
|
||||||
});
|
});
|
||||||
@@ -276,19 +269,19 @@
|
|||||||
container.innerHTML = html;
|
container.innerHTML = html;
|
||||||
})
|
})
|
||||||
.catch(function(err) {
|
.catch(function(err) {
|
||||||
container.innerHTML = '<p class="error">Error: ' + err.message + '</p>';
|
container.innerHTML = '<p class="srfrec-error">Error: ' + err.message + '</p>';
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
loadCompletedRecordings: function() {
|
loadCompletedRecordings: function() {
|
||||||
var container = document.getElementById('completedRecordingsContainer');
|
var container = document.getElementById('srfrecCompletedRecordingsContainer');
|
||||||
container.innerHTML = '<p class="msg">Loading...</p>';
|
container.innerHTML = '<p class="srfrec-msg">Loading...</p>';
|
||||||
|
|
||||||
fetch(this.serverUrl + '/Plugins/SRFPlay/Recording/Completed', { headers: this.getHeaders() })
|
fetch(this.serverUrl + '/Plugins/SRFPlay/Recording/Completed', { headers: this.getHeaders() })
|
||||||
.then(function(r) { return r.json(); })
|
.then(function(r) { return r.json(); })
|
||||||
.then(function(recordings) {
|
.then(function(recordings) {
|
||||||
if (!recordings || recordings.length === 0) {
|
if (!recordings || recordings.length === 0) {
|
||||||
container.innerHTML = '<p class="msg">No completed recordings.</p>';
|
container.innerHTML = '<p class="srfrec-msg">No completed recordings.</p>';
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -300,7 +293,7 @@
|
|||||||
html += '<td>' + (r.title || 'Unknown') + '</td>';
|
html += '<td>' + (r.title || 'Unknown') + '</td>';
|
||||||
html += '<td>' + SRFRec.formatDate(r.recordingStartedAt) + '</td>';
|
html += '<td>' + SRFRec.formatDate(r.recordingStartedAt) + '</td>';
|
||||||
html += '<td>' + SRFRec.formatSize(r.fileSizeBytes) + '</td>';
|
html += '<td>' + SRFRec.formatSize(r.fileSizeBytes) + '</td>';
|
||||||
html += '<td><button class="btn btn-delete" onclick="SRFRec.deleteRecording(\'' + r.id + '\')">Delete</button></td>';
|
html += '<td><button type="button" class="btn btn-delete" onclick="SRFRec.deleteRecording(\'' + r.id + '\')">Delete</button></td>';
|
||||||
html += '</tr>';
|
html += '</tr>';
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -308,7 +301,7 @@
|
|||||||
container.innerHTML = html;
|
container.innerHTML = html;
|
||||||
})
|
})
|
||||||
.catch(function(err) {
|
.catch(function(err) {
|
||||||
container.innerHTML = '<p class="error">Error: ' + err.message + '</p>';
|
container.innerHTML = '<p class="srfrec-error">Error: ' + err.message + '</p>';
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -338,7 +331,16 @@
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
(function() {
|
||||||
|
var page = document.querySelector('#SRFPlayRecordingsPage');
|
||||||
|
if (page && typeof page.addEventListener === 'function' && typeof ApiClient !== 'undefined') {
|
||||||
|
// Inside the Jellyfin dashboard: defer to the page lifecycle so we
|
||||||
|
// never run during the config page's view and never hijack routing.
|
||||||
|
page.addEventListener('pageshow', function() { SRFRec.init(); });
|
||||||
|
} else {
|
||||||
|
// Standalone (e.g. TV/browser): initialise immediately.
|
||||||
SRFRec.init();
|
SRFRec.init();
|
||||||
|
}
|
||||||
|
})();
|
||||||
</script>
|
</script>
|
||||||
</body>
|
</div>
|
||||||
</html>
|
|
||||||
|
|||||||
@@ -40,6 +40,7 @@ public class RecordingController : ControllerBase
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns>The recording manager HTML page.</returns>
|
/// <returns>The recording manager HTML page.</returns>
|
||||||
[HttpGet("Page")]
|
[HttpGet("Page")]
|
||||||
|
[AllowAnonymous]
|
||||||
[ProducesResponseType(StatusCodes.Status200OK)]
|
[ProducesResponseType(StatusCodes.Status200OK)]
|
||||||
[ProducesResponseType(StatusCodes.Status404NotFound)]
|
[ProducesResponseType(StatusCodes.Status404NotFound)]
|
||||||
public IActionResult GetRecordingPage()
|
public IActionResult GetRecordingPage()
|
||||||
|
|||||||
@@ -33,6 +33,11 @@
|
|||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<None Remove="..\assests\main logo.png" />
|
<None Remove="..\assests\main logo.png" />
|
||||||
<EmbeddedResource Include="..\assests\main logo.png" LogicalName="Jellyfin.Plugin.SRFPlay.Images.logo.png" />
|
<EmbeddedResource Include="..\assests\main logo.png" LogicalName="Jellyfin.Plugin.SRFPlay.Images.logo.png" />
|
||||||
|
<EmbeddedResource Include="..\assests\units\srf-logo.png" LogicalName="Jellyfin.Plugin.SRFPlay.Images.srf-logo.png" />
|
||||||
|
<EmbeddedResource Include="..\assests\units\rts-logo.png" LogicalName="Jellyfin.Plugin.SRFPlay.Images.rts-logo.png" />
|
||||||
|
<EmbeddedResource Include="..\assests\units\rsi-logo.png" LogicalName="Jellyfin.Plugin.SRFPlay.Images.rsi-logo.png" />
|
||||||
|
<EmbeddedResource Include="..\assests\units\rtr-logo.png" LogicalName="Jellyfin.Plugin.SRFPlay.Images.rtr-logo.png" />
|
||||||
|
<EmbeddedResource Include="..\assests\units\swi-logo.png" LogicalName="Jellyfin.Plugin.SRFPlay.Images.swi-logo.png" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|||||||
@@ -45,16 +45,13 @@ public class Plugin : BasePlugin<PluginConfiguration>, IHasWebPages
|
|||||||
{
|
{
|
||||||
Name = Name,
|
Name = Name,
|
||||||
EmbeddedResourcePath = string.Format(CultureInfo.InvariantCulture, "{0}.Configuration.configPage.html", GetType().Namespace)
|
EmbeddedResourcePath = string.Format(CultureInfo.InvariantCulture, "{0}.Configuration.configPage.html", GetType().Namespace)
|
||||||
},
|
|
||||||
new PluginPageInfo
|
|
||||||
{
|
|
||||||
Name = "SRF Play Recordings",
|
|
||||||
DisplayName = "SRF Sport Recordings",
|
|
||||||
EmbeddedResourcePath = string.Format(CultureInfo.InvariantCulture, "{0}.Configuration.recordingPage.html", GetType().Namespace),
|
|
||||||
EnableInMainMenu = true,
|
|
||||||
MenuSection = "Live TV",
|
|
||||||
MenuIcon = "fiber_smart_record"
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Note: the recordings manager is intentionally NOT registered as a plugin
|
||||||
|
// page. Plugin pages live under the admin Dashboard and are admin-gated, which
|
||||||
|
// both caused a redirect to the recordings page and made it inaccessible to
|
||||||
|
// normal users. Recordings are served as a standalone, user-accessible page at
|
||||||
|
// GET /Plugins/SRFPlay/Recording/Page (see RecordingController).
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ using System.Collections.Generic;
|
|||||||
using System.Threading;
|
using System.Threading;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using Jellyfin.Plugin.SRFPlay.Services.Interfaces;
|
using Jellyfin.Plugin.SRFPlay.Services.Interfaces;
|
||||||
|
using Jellyfin.Plugin.SRFPlay.Utilities;
|
||||||
using MediaBrowser.Model.Tasks;
|
using MediaBrowser.Model.Tasks;
|
||||||
using Microsoft.Extensions.Logging;
|
using Microsoft.Extensions.Logging;
|
||||||
|
|
||||||
@@ -63,20 +64,25 @@ public class ContentRefreshTask : IScheduledTask
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Refresh latest content
|
// Refresh content for every business unit (one channel per unit).
|
||||||
|
var units = System.Enum.GetValues<Configuration.BusinessUnit>();
|
||||||
|
foreach (var unit in units)
|
||||||
|
{
|
||||||
|
var businessUnit = unit.ToLowerString();
|
||||||
|
|
||||||
if (config.EnableLatestContent)
|
if (config.EnableLatestContent)
|
||||||
{
|
{
|
||||||
_logger.LogInformation("Refreshing latest content");
|
_logger.LogInformation("Refreshing latest content for {BusinessUnit}", businessUnit);
|
||||||
progress?.Report(25);
|
progress?.Report(25);
|
||||||
await _contentRefreshService.RefreshLatestContentAsync(cancellationToken).ConfigureAwait(false);
|
await _contentRefreshService.RefreshLatestContentAsync(businessUnit, cancellationToken).ConfigureAwait(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Refresh trending content
|
|
||||||
if (config.EnableTrendingContent)
|
if (config.EnableTrendingContent)
|
||||||
{
|
{
|
||||||
_logger.LogInformation("Refreshing trending content");
|
_logger.LogInformation("Refreshing trending content for {BusinessUnit}", businessUnit);
|
||||||
progress?.Report(75);
|
progress?.Report(75);
|
||||||
await _contentRefreshService.RefreshTrendingContentAsync(cancellationToken).ConfigureAwait(false);
|
await _contentRefreshService.RefreshTrendingContentAsync(businessUnit, cancellationToken).ConfigureAwait(false);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
progress?.Report(100);
|
progress?.Report(100);
|
||||||
|
|||||||
@@ -49,7 +49,13 @@ public class ServiceRegistrator : IPluginServiceRegistrator
|
|||||||
serviceCollection.AddSingleton<IScheduledTask, ExpirationCheckTask>();
|
serviceCollection.AddSingleton<IScheduledTask, ExpirationCheckTask>();
|
||||||
serviceCollection.AddSingleton<IScheduledTask, RecordingSchedulerTask>();
|
serviceCollection.AddSingleton<IScheduledTask, RecordingSchedulerTask>();
|
||||||
|
|
||||||
// Register channel - must register as IChannel interface for Jellyfin to discover it
|
// Register one channel (tile) per SRG business unit. Each must be registered as IChannel
|
||||||
serviceCollection.AddSingleton<IChannel, SRFPlayChannel>();
|
// for Jellyfin to discover it. A unit that is not in EnabledBusinessUnits returns no
|
||||||
|
// content (its tile appears empty) - see SrgChannelBase.
|
||||||
|
serviceCollection.AddSingleton<IChannel, SrfChannel>();
|
||||||
|
serviceCollection.AddSingleton<IChannel, RtsChannel>();
|
||||||
|
serviceCollection.AddSingleton<IChannel, RsiChannel>();
|
||||||
|
serviceCollection.AddSingleton<IChannel, RtrChannel>();
|
||||||
|
serviceCollection.AddSingleton<IChannel, SwiChannel>();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -18,8 +18,10 @@ public class CategoryService : ICategoryService
|
|||||||
private readonly ILogger<CategoryService> _logger;
|
private readonly ILogger<CategoryService> _logger;
|
||||||
private readonly ISRFApiClientFactory _apiClientFactory;
|
private readonly ISRFApiClientFactory _apiClientFactory;
|
||||||
private readonly TimeSpan _topicsCacheDuration = TimeSpan.FromHours(24);
|
private readonly TimeSpan _topicsCacheDuration = TimeSpan.FromHours(24);
|
||||||
private Dictionary<string, PlayV3Topic>? _topicsCache;
|
|
||||||
private DateTime _topicsCacheExpiry = DateTime.MinValue;
|
// Cache topics per business unit. A single shared cache would return one unit's
|
||||||
|
// topics (e.g. German SRF) even after the user switched to another (e.g. French RTS).
|
||||||
|
private readonly Dictionary<string, (Dictionary<string, PlayV3Topic> Topics, DateTime Expiry)> _topicsCacheByUnit = new(StringComparer.OrdinalIgnoreCase);
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Initializes a new instance of the <see cref="CategoryService"/> class.
|
/// Initializes a new instance of the <see cref="CategoryService"/> class.
|
||||||
@@ -35,11 +37,11 @@ public class CategoryService : ICategoryService
|
|||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public async Task<List<PlayV3Topic>> GetTopicsAsync(string businessUnit, CancellationToken cancellationToken = default)
|
public async Task<List<PlayV3Topic>> GetTopicsAsync(string businessUnit, CancellationToken cancellationToken = default)
|
||||||
{
|
{
|
||||||
// Return cached topics if still valid
|
// Return cached topics for this business unit if still valid
|
||||||
if (_topicsCache != null && DateTime.UtcNow < _topicsCacheExpiry)
|
if (_topicsCacheByUnit.TryGetValue(businessUnit, out var cached) && DateTime.UtcNow < cached.Expiry)
|
||||||
{
|
{
|
||||||
_logger.LogDebug("Returning cached topics for business unit: {BusinessUnit}", businessUnit);
|
_logger.LogDebug("Returning cached topics for business unit: {BusinessUnit}", businessUnit);
|
||||||
return _topicsCache.Values.ToList();
|
return cached.Topics.Values.ToList();
|
||||||
}
|
}
|
||||||
|
|
||||||
_logger.LogInformation("Fetching topics for business unit: {BusinessUnit}", businessUnit);
|
_logger.LogInformation("Fetching topics for business unit: {BusinessUnit}", businessUnit);
|
||||||
@@ -48,13 +50,13 @@ public class CategoryService : ICategoryService
|
|||||||
|
|
||||||
if (topics != null && topics.Count > 0)
|
if (topics != null && topics.Count > 0)
|
||||||
{
|
{
|
||||||
// Cache topics by ID for quick lookups
|
// Cache topics by ID for quick lookups, scoped to this business unit
|
||||||
_topicsCache = topics
|
var byId = topics
|
||||||
.Where(t => !string.IsNullOrEmpty(t.Id))
|
.Where(t => !string.IsNullOrEmpty(t.Id))
|
||||||
.ToDictionary(t => t.Id!, t => t);
|
.ToDictionary(t => t.Id!, t => t);
|
||||||
_topicsCacheExpiry = DateTime.UtcNow.Add(_topicsCacheDuration);
|
_topicsCacheByUnit[businessUnit] = (byId, DateTime.UtcNow.Add(_topicsCacheDuration));
|
||||||
|
|
||||||
_logger.LogInformation("Cached {Count} topics for business unit: {BusinessUnit}", _topicsCache.Count, businessUnit);
|
_logger.LogInformation("Cached {Count} topics for business unit: {BusinessUnit}", byId.Count, businessUnit);
|
||||||
}
|
}
|
||||||
|
|
||||||
return topics ?? new List<PlayV3Topic>();
|
return topics ?? new List<PlayV3Topic>();
|
||||||
@@ -63,13 +65,14 @@ public class CategoryService : ICategoryService
|
|||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public async Task<PlayV3Topic?> GetTopicByIdAsync(string topicId, string businessUnit, CancellationToken cancellationToken = default)
|
public async Task<PlayV3Topic?> GetTopicByIdAsync(string topicId, string businessUnit, CancellationToken cancellationToken = default)
|
||||||
{
|
{
|
||||||
// Ensure topics are loaded
|
// Ensure topics are loaded for this business unit
|
||||||
if (_topicsCache == null || DateTime.UtcNow >= _topicsCacheExpiry)
|
if (!_topicsCacheByUnit.TryGetValue(businessUnit, out var cached) || DateTime.UtcNow >= cached.Expiry)
|
||||||
{
|
{
|
||||||
await GetTopicsAsync(businessUnit, cancellationToken).ConfigureAwait(false);
|
await GetTopicsAsync(businessUnit, cancellationToken).ConfigureAwait(false);
|
||||||
|
_topicsCacheByUnit.TryGetValue(businessUnit, out cached);
|
||||||
}
|
}
|
||||||
|
|
||||||
return _topicsCache?.GetValueOrDefault(topicId);
|
return cached.Topics?.GetValueOrDefault(topicId);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
@@ -101,8 +104,7 @@ public class CategoryService : ICategoryService
|
|||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public void ClearCache()
|
public void ClearCache()
|
||||||
{
|
{
|
||||||
_topicsCache = null;
|
_topicsCacheByUnit.Clear();
|
||||||
_topicsCacheExpiry = DateTime.MinValue;
|
|
||||||
_logger.LogInformation("Topics cache cleared");
|
_logger.LogInformation("Topics cache cleared");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -34,9 +34,10 @@ public class ContentRefreshService : IContentRefreshService
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// Refreshes latest content from SRF API using Play v3.
|
/// Refreshes latest content from SRF API using Play v3.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
/// <param name="businessUnit">The business unit to fetch content for (e.g. "srf", "rts").</param>
|
||||||
/// <param name="cancellationToken">The cancellation token.</param>
|
/// <param name="cancellationToken">The cancellation token.</param>
|
||||||
/// <returns>List of URNs for new content.</returns>
|
/// <returns>List of URNs for new content.</returns>
|
||||||
public async Task<List<string>> RefreshLatestContentAsync(CancellationToken cancellationToken)
|
public async Task<List<string>> RefreshLatestContentAsync(string businessUnit, CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
var config = Plugin.Instance?.Configuration;
|
var config = Plugin.Instance?.Configuration;
|
||||||
if (config == null || !config.EnableLatestContent)
|
if (config == null || !config.EnableLatestContent)
|
||||||
@@ -46,7 +47,7 @@ public class ContentRefreshService : IContentRefreshService
|
|||||||
}
|
}
|
||||||
|
|
||||||
return await FetchVideosFromShowsAsync(
|
return await FetchVideosFromShowsAsync(
|
||||||
config.BusinessUnit.ToLowerString(),
|
businessUnit,
|
||||||
minEpisodeCount: 0,
|
minEpisodeCount: 0,
|
||||||
maxShows: 20,
|
maxShows: 20,
|
||||||
videosPerShow: 1,
|
videosPerShow: 1,
|
||||||
@@ -58,9 +59,10 @@ public class ContentRefreshService : IContentRefreshService
|
|||||||
/// Refreshes trending content from SRF API using Play v3.
|
/// Refreshes trending content from SRF API using Play v3.
|
||||||
/// Gets videos from shows with the most episodes.
|
/// Gets videos from shows with the most episodes.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
/// <param name="businessUnit">The business unit to fetch content for (e.g. "srf", "rts").</param>
|
||||||
/// <param name="cancellationToken">The cancellation token.</param>
|
/// <param name="cancellationToken">The cancellation token.</param>
|
||||||
/// <returns>List of URNs for trending content.</returns>
|
/// <returns>List of URNs for trending content.</returns>
|
||||||
public async Task<List<string>> RefreshTrendingContentAsync(CancellationToken cancellationToken)
|
public async Task<List<string>> RefreshTrendingContentAsync(string businessUnit, CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
var config = Plugin.Instance?.Configuration;
|
var config = Plugin.Instance?.Configuration;
|
||||||
if (config == null || !config.EnableTrendingContent)
|
if (config == null || !config.EnableTrendingContent)
|
||||||
@@ -70,7 +72,7 @@ public class ContentRefreshService : IContentRefreshService
|
|||||||
}
|
}
|
||||||
|
|
||||||
return await FetchVideosFromShowsAsync(
|
return await FetchVideosFromShowsAsync(
|
||||||
config.BusinessUnit.ToLowerString(),
|
businessUnit,
|
||||||
minEpisodeCount: 10,
|
minEpisodeCount: 10,
|
||||||
maxShows: 15,
|
maxShows: 15,
|
||||||
videosPerShow: 2,
|
videosPerShow: 2,
|
||||||
|
|||||||
@@ -12,14 +12,16 @@ public interface IContentRefreshService
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// Refreshes latest content from SRF API using Play v3.
|
/// Refreshes latest content from SRF API using Play v3.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
/// <param name="businessUnit">The business unit to fetch content for (e.g. "srf", "rts").</param>
|
||||||
/// <param name="cancellationToken">The cancellation token.</param>
|
/// <param name="cancellationToken">The cancellation token.</param>
|
||||||
/// <returns>List of URNs for new content.</returns>
|
/// <returns>List of URNs for new content.</returns>
|
||||||
Task<List<string>> RefreshLatestContentAsync(CancellationToken cancellationToken);
|
Task<List<string>> RefreshLatestContentAsync(string businessUnit, CancellationToken cancellationToken);
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Refreshes trending content from SRF API using Play v3.
|
/// Refreshes trending content from SRF API using Play v3.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
/// <param name="businessUnit">The business unit to fetch content for (e.g. "srf", "rts").</param>
|
||||||
/// <param name="cancellationToken">The cancellation token.</param>
|
/// <param name="cancellationToken">The cancellation token.</param>
|
||||||
/// <returns>List of URNs for trending content.</returns>
|
/// <returns>List of URNs for trending content.</returns>
|
||||||
Task<List<string>> RefreshTrendingContentAsync(CancellationToken cancellationToken);
|
Task<List<string>> RefreshTrendingContentAsync(string businessUnit, CancellationToken cancellationToken);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -62,9 +62,15 @@ public class MediaSourceFactory : IMediaSourceFactory
|
|||||||
return Task.FromResult<MediaSourceInfo?>(null);
|
return Task.FromResult<MediaSourceInfo?>(null);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Detect if this is a live stream
|
// A scheduled livestream is only treated as live when the broadcast window is open.
|
||||||
var isLiveStream = chapter.Type == "SCHEDULED_LIVESTREAM" ||
|
// Past replays (ValidTo in the past) and upcoming events (ValidFrom in the future)
|
||||||
|
// are treated as VOD to avoid IsInfiniteStream/IgnoreDts flags and FFmpeg -re mode.
|
||||||
|
var isScheduledLivestream = chapter.Type == "SCHEDULED_LIVESTREAM" ||
|
||||||
urn.Contains("livestream", StringComparison.OrdinalIgnoreCase);
|
urn.Contains("livestream", StringComparison.OrdinalIgnoreCase);
|
||||||
|
var now = DateTime.UtcNow;
|
||||||
|
var isLiveStream = isScheduledLivestream &&
|
||||||
|
(chapter.ValidFrom == null || chapter.ValidFrom.Value.ToUniversalTime() <= now) &&
|
||||||
|
(chapter.ValidTo == null || chapter.ValidTo.Value.ToUniversalTime() > now);
|
||||||
|
|
||||||
// Register stream with UNAUTHENTICATED URL - proxy will authenticate on-demand
|
// Register stream with UNAUTHENTICATED URL - proxy will authenticate on-demand
|
||||||
// This avoids wasting 30-second tokens during category browsing
|
// This avoids wasting 30-second tokens during category browsing
|
||||||
|
|||||||
@@ -147,19 +147,25 @@ public class RecordingService : IRecordingService, IDisposable
|
|||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public async Task<IReadOnlyList<PlayV3TvProgram>> GetUpcomingScheduleAsync(CancellationToken cancellationToken)
|
public async Task<IReadOnlyList<PlayV3TvProgram>> GetUpcomingScheduleAsync(CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
var config = Plugin.Instance?.Configuration;
|
var units = System.Enum.GetValues<Configuration.BusinessUnit>();
|
||||||
var businessUnit = (config?.BusinessUnit ?? Configuration.BusinessUnit.SRF).ToString().ToLowerInvariant();
|
|
||||||
|
|
||||||
using var apiClient = _apiClientFactory.CreateClient();
|
using var apiClient = _apiClientFactory.CreateClient();
|
||||||
var livestreams = await apiClient.GetScheduledLivestreamsAsync(businessUnit, "SPORT", cancellationToken).ConfigureAwait(false);
|
|
||||||
|
|
||||||
if (livestreams == null)
|
// Aggregate sport livestreams across every business unit so the recordings
|
||||||
|
// page shows events from all languages.
|
||||||
|
var all = new List<PlayV3TvProgram>();
|
||||||
|
foreach (var unit in units)
|
||||||
{
|
{
|
||||||
return Array.Empty<PlayV3TvProgram>();
|
var businessUnit = unit.ToString().ToLowerInvariant();
|
||||||
|
var livestreams = await apiClient.GetScheduledLivestreamsAsync(businessUnit, "SPORT", cancellationToken).ConfigureAwait(false);
|
||||||
|
if (livestreams != null)
|
||||||
|
{
|
||||||
|
all.AddRange(livestreams);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Filter to only future/current livestreams that aren't blocked
|
// Filter to only future/current livestreams that aren't blocked
|
||||||
return livestreams
|
return all
|
||||||
.Where(ls => ls.Blocked != true && (ls.ValidTo == null || ls.ValidTo.Value.ToUniversalTime() > DateTime.UtcNow))
|
.Where(ls => ls.Blocked != true && (ls.ValidTo == null || ls.ValidTo.Value.ToUniversalTime() > DateTime.UtcNow))
|
||||||
.OrderBy(ls => ls.ValidFrom)
|
.OrderBy(ls => ls.ValidFrom)
|
||||||
.ToList();
|
.ToList();
|
||||||
@@ -178,9 +184,11 @@ public class RecordingService : IRecordingService, IDisposable
|
|||||||
return existing;
|
return existing;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Fetch metadata for the URN
|
// Fetch metadata for the URN. The unit is encoded in the URN itself, so use that to
|
||||||
|
// query the right schedule regardless of which units are enabled.
|
||||||
var config = Plugin.Instance?.Configuration;
|
var config = Plugin.Instance?.Configuration;
|
||||||
var businessUnit = (config?.BusinessUnit ?? Configuration.BusinessUnit.SRF).ToString().ToLowerInvariant();
|
var businessUnit = ParseBusinessUnitFromUrn(urn)
|
||||||
|
?? (config?.BusinessUnit ?? Configuration.BusinessUnit.SRF).ToString().ToLowerInvariant();
|
||||||
|
|
||||||
using var apiClient = _apiClientFactory.CreateClient();
|
using var apiClient = _apiClientFactory.CreateClient();
|
||||||
var livestreams = await apiClient.GetScheduledLivestreamsAsync(businessUnit, "SPORT", cancellationToken).ConfigureAwait(false);
|
var livestreams = await apiClient.GetScheduledLivestreamsAsync(businessUnit, "SPORT", cancellationToken).ConfigureAwait(false);
|
||||||
@@ -190,6 +198,7 @@ public class RecordingService : IRecordingService, IDisposable
|
|||||||
{
|
{
|
||||||
Id = Guid.NewGuid().ToString("N"),
|
Id = Guid.NewGuid().ToString("N"),
|
||||||
Urn = urn,
|
Urn = urn,
|
||||||
|
BusinessUnit = ParseBusinessUnitFromUrn(urn) ?? businessUnit,
|
||||||
Title = program?.Title ?? urn,
|
Title = program?.Title ?? urn,
|
||||||
Description = program?.Lead ?? program?.Description,
|
Description = program?.Lead ?? program?.Description,
|
||||||
ImageUrl = program?.ImageUrl,
|
ImageUrl = program?.ImageUrl,
|
||||||
@@ -206,6 +215,24 @@ public class RecordingService : IRecordingService, IDisposable
|
|||||||
return entry;
|
return entry;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Extracts the business unit from an SRF URN of the form "urn:<bu>:<type>:...".
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="urn">The URN.</param>
|
||||||
|
/// <returns>The lowercase business unit, or null if it cannot be determined.</returns>
|
||||||
|
private static string? ParseBusinessUnitFromUrn(string urn)
|
||||||
|
{
|
||||||
|
if (string.IsNullOrEmpty(urn))
|
||||||
|
{
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
var parts = urn.Split(':');
|
||||||
|
return parts.Length >= 2 && !string.IsNullOrEmpty(parts[1])
|
||||||
|
? parts[1].ToLowerInvariant()
|
||||||
|
: null;
|
||||||
|
}
|
||||||
|
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public bool CancelRecording(string recordingId)
|
public bool CancelRecording(string recordingId)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -270,7 +270,12 @@ The plugin includes:
|
|||||||
|
|
||||||
### Contributing
|
### Contributing
|
||||||
|
|
||||||
Contributions welcome!
|
Contributions welcome! This project is hosted on a self-hosted [Gitea](https://gitea.tourolle.paris/dtourolle/jellyfin-srfPlay) instance.
|
||||||
|
|
||||||
|
**You don't need a separate account** — you can sign in with your existing GitHub account. On the [sign-in page](https://gitea.tourolle.paris/user/login), choose **"Sign in with GitHub"** to register and log in via GitHub OAuth. Once signed in, you can:
|
||||||
|
|
||||||
|
- **Raise issues** — report bugs or request features on the [issue tracker](https://gitea.tourolle.paris/dtourolle/jellyfin-srfPlay/issues)
|
||||||
|
- **Contribute code** — fork the repository, push a branch, and open a pull request
|
||||||
|
|
||||||
## License
|
## License
|
||||||
|
|
||||||
|
|||||||
Binary file not shown.
|
After Width: | Height: | Size: 16 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 25 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 24 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 26 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 19 KiB |
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
---
|
---
|
||||||
name: "SRFPlay"
|
name: "SRFPlay"
|
||||||
guid: "eb5d7894-8eef-4b36-aa6f-5d124e828ce1"
|
guid: "a4b12f86-8c3d-4e9a-b7f2-1d5e6c8a9b4f"
|
||||||
version: "1.0.0.0"
|
version: "1.0.0.0"
|
||||||
targetAbi: "10.9.0.0"
|
targetAbi: "10.9.0.0"
|
||||||
framework: "net8.0"
|
framework: "net8.0"
|
||||||
|
|||||||
@@ -0,0 +1,21 @@
|
|||||||
|
[
|
||||||
|
{
|
||||||
|
"guid": "a4b12f86-8c3d-4e9a-b7f2-1d5e6c8a9b4f",
|
||||||
|
"name": "SRF Play (Nightly)",
|
||||||
|
"description": "NIGHTLY/UNSTABLE builds of the SRF Play plugin for Jellyfin. Built automatically from the master branch on every push. Expect bugs. For stable releases use the regular SRF Play repository instead.",
|
||||||
|
"overview": "Nightly builds of SRF Play for Jellyfin",
|
||||||
|
"owner": "dtourolle",
|
||||||
|
"category": "Live TV",
|
||||||
|
"imageUrl": "https://gitea.tourolle.paris/dtourolle/jellyfin-srfPlay/raw/branch/master/assests/main%20logo.png",
|
||||||
|
"versions": [
|
||||||
|
{
|
||||||
|
"version": "1.0.20260627.185",
|
||||||
|
"changelog": "Nightly build 1.0.20260627.185 (1101385)",
|
||||||
|
"targetAbi": "10.9.0.0",
|
||||||
|
"sourceUrl": "https://gitea.tourolle.paris/dtourolle/jellyfin-srfPlay/releases/download/latest/srfplay_1.0.20260627.185.zip",
|
||||||
|
"checksum": "577af725ca202bec555bf51905b75913",
|
||||||
|
"timestamp": "2026-06-27T09:30:57Z"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
+32
-16
@@ -8,6 +8,38 @@
|
|||||||
"category": "Live TV",
|
"category": "Live TV",
|
||||||
"imageUrl": "https://gitea.tourolle.paris/dtourolle/jellyfin-srfPlay/raw/branch/master/assests/main%20logo.png",
|
"imageUrl": "https://gitea.tourolle.paris/dtourolle/jellyfin-srfPlay/raw/branch/master/assests/main%20logo.png",
|
||||||
"versions": [
|
"versions": [
|
||||||
|
{
|
||||||
|
"version": "0.0.0.0",
|
||||||
|
"changelog": "Latest Build",
|
||||||
|
"targetAbi": "10.9.0.0",
|
||||||
|
"sourceUrl": "https://gitea.tourolle.paris/dtourolle/jellyfin-srfPlay/releases/download/latest/srfplay_1.0.0.0.zip",
|
||||||
|
"checksum": "2ed3281990b56fbfb5f75a1ee82a2f55",
|
||||||
|
"timestamp": "2026-06-27T09:01:57Z"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "1.0.32",
|
||||||
|
"changelog": "Release 1.0.32",
|
||||||
|
"targetAbi": "10.9.0.0",
|
||||||
|
"sourceUrl": "https://gitea.tourolle.paris/dtourolle/jellyfin-srfPlay/releases/download/v1.0.32/srfplay_1.0.32.0.zip",
|
||||||
|
"checksum": "82f53848f2e2b15a35ea731ee69ee402",
|
||||||
|
"timestamp": "2026-06-27T07:16:38Z"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "1.0.31",
|
||||||
|
"changelog": "Release 1.0.31",
|
||||||
|
"targetAbi": "10.9.0.0",
|
||||||
|
"sourceUrl": "https://gitea.tourolle.paris/dtourolle/jellyfin-srfPlay/releases/download/v1.0.31/srfplay_1.0.31.0.zip",
|
||||||
|
"checksum": "4e499de15687e6e328ddca41c6192485",
|
||||||
|
"timestamp": "2026-06-27T06:54:01Z"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "1.0.30",
|
||||||
|
"changelog": "Release 1.0.30",
|
||||||
|
"targetAbi": "10.9.0.0",
|
||||||
|
"sourceUrl": "https://gitea.tourolle.paris/dtourolle/jellyfin-srfPlay/releases/download/v1.0.30/srfplay_1.0.30.0.zip",
|
||||||
|
"checksum": "06731df9ba3d2dab53885c9c8ac95fa6",
|
||||||
|
"timestamp": "2026-05-03T16:44:57Z"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"version": "1.0.29",
|
"version": "1.0.29",
|
||||||
"changelog": "Release 1.0.29",
|
"changelog": "Release 1.0.29",
|
||||||
@@ -16,14 +48,6 @@
|
|||||||
"checksum": "fb745388e64299497262d9ad370d8823",
|
"checksum": "fb745388e64299497262d9ad370d8823",
|
||||||
"timestamp": "2026-05-03T16:07:24Z"
|
"timestamp": "2026-05-03T16:07:24Z"
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"version": "0.0.0.0",
|
|
||||||
"changelog": "Latest Build",
|
|
||||||
"targetAbi": "10.9.0.0",
|
|
||||||
"sourceUrl": "https://gitea.tourolle.paris/dtourolle/jellyfin-srfPlay/releases/download/latest/srfplay_1.0.0.0.zip",
|
|
||||||
"checksum": "7471a63c69deb5b9a31343bb6c49075f",
|
|
||||||
"timestamp": "2026-05-03T16:05:37Z"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"version": "1.0.27",
|
"version": "1.0.27",
|
||||||
"changelog": "Release 1.0.27",
|
"changelog": "Release 1.0.27",
|
||||||
@@ -32,14 +56,6 @@
|
|||||||
"checksum": "1e15e35452f7b82bf74d8c3560c15949",
|
"checksum": "1e15e35452f7b82bf74d8c3560c15949",
|
||||||
"timestamp": "2026-03-07T16:40:17Z"
|
"timestamp": "2026-03-07T16:40:17Z"
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"version": "0.0.0.0",
|
|
||||||
"changelog": "Latest Build",
|
|
||||||
"targetAbi": "10.9.0.0",
|
|
||||||
"sourceUrl": "https://gitea.tourolle.paris/dtourolle/jellyfin-srfPlay/releases/download/latest/srfplay_1.0.0.0.zip",
|
|
||||||
"checksum": "c7e868d23293adcc21d72e735094d9d6",
|
|
||||||
"timestamp": "2026-03-07T16:28:38Z"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"version": "1.0.25",
|
"version": "1.0.25",
|
||||||
"changelog": "Release 1.0.25",
|
"changelog": "Release 1.0.25",
|
||||||
|
|||||||
Reference in New Issue
Block a user