Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
95ce4edf9b | ||
|
|
536fef85a8 | ||
|
|
3c321b4036 | ||
|
|
6822ea7202 | ||
|
|
8a5223b960 |
@@ -0,0 +1,58 @@
|
||||
#cloud-config
|
||||
# Gitea Actions runner on an Oracle Cloud Always Free Ampere (ARM) VM, shared by
|
||||
# every repo on the instance.
|
||||
#
|
||||
# Paste this into "Advanced options -> Management -> Initialization script" when
|
||||
# creating the instance (image: Canonical Ubuntu 24.04, shape: VM.Standard.A1.Flex).
|
||||
# Before pasting, replace REGISTRATION_TOKEN below with an instance-wide token:
|
||||
# Site Administration -> Actions -> Runners -> Create new runner
|
||||
# (a token from repo Settings would limit the runner to that one repo).
|
||||
#
|
||||
# The runner only makes outbound connections (to Gitea and container registries),
|
||||
# so the VM needs no inbound ports beyond SSH.
|
||||
#
|
||||
# Labels follow the instance convention (same set as the freebox ARM runner).
|
||||
# ubuntu-latest / ubuntu-22.04 are shared with the amd64 runner, so a job asking
|
||||
# for them may land on either architecture; ask for linux/arm64 or linux/amd64
|
||||
# when a job needs a specific one. SRF Play jobs run in the multi-arch
|
||||
# srfplay-builder image, so they work on both.
|
||||
|
||||
# Optional: a password for the "ubuntu" user, so you can log in through the Oracle
|
||||
# serial console ("Launch Cloud Shell connection") without an SSH key. Generate the
|
||||
# hash locally with: openssl passwd -6
|
||||
# then uncomment and paste it in. SSH still only accepts keys.
|
||||
#chpasswd:
|
||||
# expire: false
|
||||
# users:
|
||||
# - name: ubuntu
|
||||
# password: "$6$...paste the hash here..."
|
||||
|
||||
package_update: true
|
||||
packages:
|
||||
- docker.io
|
||||
- docker-compose-v2
|
||||
|
||||
write_files:
|
||||
- path: /opt/act_runner/docker-compose.yml
|
||||
permissions: "0600"
|
||||
content: |
|
||||
services:
|
||||
runner:
|
||||
image: gitea/act_runner:latest
|
||||
restart: unless-stopped
|
||||
environment:
|
||||
GITEA_INSTANCE_URL: https://gitea.tourolle.paris
|
||||
GITEA_RUNNER_REGISTRATION_TOKEN: REGISTRATION_TOKEN
|
||||
GITEA_RUNNER_NAME: oracle-a1
|
||||
# Comma-separated with no spaces: label:docker://<default job image>
|
||||
GITEA_RUNNER_LABELS: "ubuntu-latest:docker://gitea/runner-images:ubuntu-latest,ubuntu-22.04:docker://gitea/runner-images:ubuntu-22.04,linux-arm64:docker://gitea/runner-images:ubuntu-latest,self-hosted:docker://gitea/runner-images:ubuntu-latest,linux/arm64:docker://gitea/runner-images:ubuntu-latest"
|
||||
volumes:
|
||||
# Registration is stored here, so the token is only used once.
|
||||
- ./data:/data
|
||||
- /var/run/docker.sock:/var/run/docker.sock
|
||||
|
||||
runcmd:
|
||||
- systemctl enable --now docker
|
||||
- cd /opt/act_runner && docker compose up -d
|
||||
# Weekly clean-up so pulled images and build caches do not fill the boot volume.
|
||||
- echo '0 4 * * 0 root docker system prune -af --filter "until=168h" >/dev/null 2>&1' > /etc/cron.d/docker-prune
|
||||
@@ -15,7 +15,7 @@ on:
|
||||
|
||||
jobs:
|
||||
build:
|
||||
runs-on: linux/amd64
|
||||
runs-on: ubuntu-latest
|
||||
container:
|
||||
image: gitea.tourolle.paris/dtourolle/srfplay-builder:latest
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@ on:
|
||||
|
||||
jobs:
|
||||
nightly-build:
|
||||
runs-on: linux/amd64
|
||||
runs-on: ubuntu-latest
|
||||
container:
|
||||
image: gitea.tourolle.paris/dtourolle/srfplay-builder:latest
|
||||
|
||||
|
||||
@@ -13,7 +13,7 @@ on:
|
||||
|
||||
jobs:
|
||||
build-and-release:
|
||||
runs-on: linux/amd64
|
||||
runs-on: ubuntu-latest
|
||||
container:
|
||||
image: gitea.tourolle.paris/dtourolle/srfplay-builder:latest
|
||||
|
||||
|
||||
@@ -17,7 +17,7 @@ on:
|
||||
|
||||
jobs:
|
||||
test:
|
||||
runs-on: linux/amd64
|
||||
runs-on: ubuntu-latest
|
||||
container:
|
||||
image: gitea.tourolle.paris/dtourolle/srfplay-builder:latest
|
||||
|
||||
|
||||
+5
-2
@@ -1,7 +1,10 @@
|
||||
# SRFPlay Builder Image
|
||||
# Pre-built image with .NET SDK and JPRM for building Jellyfin plugins
|
||||
# Build: docker build -f Dockerfile.builder -t gitea.tourolle.paris/dtourolle/srfplay-builder:latest .
|
||||
# Push: docker push gitea.tourolle.paris/dtourolle/srfplay-builder:latest
|
||||
# Multi-arch (amd64 + arm64) so runners on ARM hosts such as Oracle Cloud's free
|
||||
# Ampere VMs can use it too; the plugin DLLs it produces are identical either way.
|
||||
# Build + push (needs a docker-container buildx builder and arm64 binfmt/QEMU):
|
||||
# docker buildx build -f Dockerfile.builder --platform linux/amd64,linux/arm64 \
|
||||
# -t gitea.tourolle.paris/dtourolle/srfplay-builder:latest --push .
|
||||
|
||||
FROM mcr.microsoft.com/dotnet/sdk:10.0
|
||||
|
||||
|
||||
@@ -303,8 +303,8 @@ public abstract class SrgChannelBase : IChannel, IHasCacheKey
|
||||
if (matchingEvent?.ValidFrom != null)
|
||||
{
|
||||
var eventTime = matchingEvent.ValidFrom.Value;
|
||||
item.Name = $"[{eventTime:dd.MM HH:mm}] {matchingEvent.Title}";
|
||||
item.PremiereDate = eventTime;
|
||||
item.Name = $"[{DisplayTime.From(eventTime):dd.MM HH:mm}] {matchingEvent.Title}";
|
||||
item.PremiereDate = eventTime.ToUniversalTime();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -169,6 +169,14 @@ public class PluginConfiguration : BasePluginConfiguration
|
||||
/// </summary>
|
||||
public string RecordingOutputPath { get; set; } = string.Empty;
|
||||
|
||||
/// <summary>
|
||||
/// Gets or sets the time zone used for times the plugin writes as text: the start time in
|
||||
/// upcoming livestream names and the timestamp in recording file names. An IANA id such as
|
||||
/// "Europe/Zurich"; empty uses the server's time zone. Dates Jellyfin shows itself (e.g.
|
||||
/// PremiereDate) are stored as UTC and follow each viewer's own time zone regardless.
|
||||
/// </summary>
|
||||
public string DisplayTimeZone { get; set; } = string.Empty;
|
||||
|
||||
/// <summary>
|
||||
/// Gets or sets how many segments back from the live edge livestream playback should start.
|
||||
/// Injected as <c>#EXT-X-START:TIME-OFFSET=-(N * targetDuration)</c> into the live media
|
||||
|
||||
@@ -82,6 +82,11 @@
|
||||
<input id="RecordingOutputPath" name="RecordingOutputPath" type="text" is="emby-input" placeholder="e.g., /media/recordings/srf" />
|
||||
<div class="fieldDescription">Directory where sport livestream recordings will be saved (requires ffmpeg)</div>
|
||||
</div>
|
||||
<div class="inputContainer">
|
||||
<label class="inputLabel inputLabelUnfocused" for="DisplayTimeZone">Display Time Zone</label>
|
||||
<input id="DisplayTimeZone" name="DisplayTimeZone" type="text" is="emby-input" placeholder="e.g., Europe/Zurich" />
|
||||
<div class="fieldDescription">Time zone for start times in upcoming livestream names and for recording file names. Leave empty to use the server's time zone.</div>
|
||||
</div>
|
||||
<div class="inputContainer">
|
||||
<label class="inputLabel inputLabelUnfocused" for="LiveStartSegmentsBack">Live Start Offset (segments)</label>
|
||||
<input id="LiveStartSegmentsBack" name="LiveStartSegmentsBack" type="number" is="emby-input" min="0" max="20" />
|
||||
@@ -200,6 +205,7 @@
|
||||
document.querySelector('#ProxyPassword').value = config.ProxyPassword || '';
|
||||
document.querySelector('#PublicServerUrl').value = config.PublicServerUrl || '';
|
||||
document.querySelector('#RecordingOutputPath').value = config.RecordingOutputPath || '';
|
||||
document.querySelector('#DisplayTimeZone').value = config.DisplayTimeZone || '';
|
||||
document.querySelector('#LiveStartSegmentsBack').value = config.LiveStartSegmentsBack != null ? config.LiveStartSegmentsBack : 3;
|
||||
document.querySelector('#CleanUpResumePoints').checked = config.CleanUpResumePoints !== false;
|
||||
document.querySelector('#ClearLiveStreamResumePoints').checked = config.ClearLiveStreamResumePoints !== false;
|
||||
@@ -231,6 +237,7 @@
|
||||
config.ProxyPassword = document.querySelector('#ProxyPassword').value;
|
||||
config.PublicServerUrl = document.querySelector('#PublicServerUrl').value;
|
||||
config.RecordingOutputPath = document.querySelector('#RecordingOutputPath').value;
|
||||
config.DisplayTimeZone = document.querySelector('#DisplayTimeZone').value.trim();
|
||||
config.LiveStartSegmentsBack = parseInt(document.querySelector('#LiveStartSegmentsBack').value) || 0;
|
||||
config.CleanUpResumePoints = document.querySelector('#CleanUpResumePoints').checked;
|
||||
config.ClearLiveStreamResumePoints = document.querySelector('#ClearLiveStreamResumePoints').checked;
|
||||
|
||||
@@ -451,7 +451,7 @@ public class RecordingService : IRecordingService, IDisposable
|
||||
|
||||
// Build output file path
|
||||
var safeTitle = SanitizeFileName(entry.Title);
|
||||
var timestamp = DateTime.Now.ToString("yyyy-MM-dd_HHmm", CultureInfo.InvariantCulture);
|
||||
var timestamp = DisplayTime.Now().ToString("yyyy-MM-dd_HHmm", CultureInfo.InvariantCulture);
|
||||
var outputPath = Path.Combine(GetRecordingOutputPath(), $"{safeTitle}_{timestamp}.mkv");
|
||||
entry.OutputPath = outputPath;
|
||||
|
||||
|
||||
@@ -0,0 +1,42 @@
|
||||
using System;
|
||||
|
||||
namespace Jellyfin.Plugin.SRFPlay.Utilities;
|
||||
|
||||
/// <summary>
|
||||
/// Converts times into the time zone the plugin writes into text (item names, file names).
|
||||
/// SRG sends times with an offset, and DateTime deserialisation turns them into server-local
|
||||
/// values, so without this the text follows whatever zone the server happens to run in.
|
||||
/// </summary>
|
||||
public static class DisplayTime
|
||||
{
|
||||
/// <summary>
|
||||
/// Converts a time to the configured display time zone (the server's if none is set).
|
||||
/// </summary>
|
||||
/// <param name="value">The time. Unspecified values are treated as server-local, like deserialised ones.</param>
|
||||
/// <returns>The same instant expressed in the display time zone.</returns>
|
||||
public static DateTime From(DateTime value)
|
||||
{
|
||||
return TimeZoneInfo.ConvertTimeFromUtc(value.ToUniversalTime(), GetZone());
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Gets the current time in the display time zone.
|
||||
/// </summary>
|
||||
/// <returns>The current time in the display time zone.</returns>
|
||||
public static DateTime Now()
|
||||
{
|
||||
return TimeZoneInfo.ConvertTimeFromUtc(DateTime.UtcNow, GetZone());
|
||||
}
|
||||
|
||||
private static TimeZoneInfo GetZone()
|
||||
{
|
||||
var id = Plugin.Instance?.Configuration.DisplayTimeZone;
|
||||
if (string.IsNullOrWhiteSpace(id))
|
||||
{
|
||||
return TimeZoneInfo.Local;
|
||||
}
|
||||
|
||||
// An unknown id falls back to the server's zone rather than breaking listings.
|
||||
return TimeZoneInfo.TryFindSystemTimeZoneById(id.Trim(), out var zone) ? zone : TimeZoneInfo.Local;
|
||||
}
|
||||
}
|
||||
@@ -8,6 +8,54 @@
|
||||
"category": "Live TV",
|
||||
"imageUrl": "https://gitea.tourolle.paris/dtourolle/jellyfin-srfPlay/raw/branch/master/assests/main%20logo.png",
|
||||
"versions": [
|
||||
{
|
||||
"version": "1.0.20260924.21612",
|
||||
"changelog": "Nightly build 1.0.20260924.21612 (3c321b4)",
|
||||
"targetAbi": "12.0.0.0",
|
||||
"sourceUrl": "https://gitea.tourolle.paris/dtourolle/jellyfin-srfPlay/releases/download/latest/srfplay_1.0.20260924.21612.zip",
|
||||
"checksum": "146824b350e6f10c0861dea198e5dd51",
|
||||
"timestamp": "2026-09-24T03:01:30Z"
|
||||
},
|
||||
{
|
||||
"version": "1.0.20260924.21611",
|
||||
"changelog": "Nightly build 1.0.20260924.21611 (3c321b4)",
|
||||
"targetAbi": "10.11.0.0",
|
||||
"sourceUrl": "https://gitea.tourolle.paris/dtourolle/jellyfin-srfPlay/releases/download/latest/srfplay_1.0.20260924.21611.zip",
|
||||
"checksum": "e63045bda702234285ee6d2f62034397",
|
||||
"timestamp": "2026-09-24T03:01:30Z"
|
||||
},
|
||||
{
|
||||
"version": "1.0.20260924.21609",
|
||||
"changelog": "Nightly build 1.0.20260924.21609 (3c321b4)",
|
||||
"targetAbi": "10.9.0.0",
|
||||
"sourceUrl": "https://gitea.tourolle.paris/dtourolle/jellyfin-srfPlay/releases/download/latest/srfplay_1.0.20260924.21609.zip",
|
||||
"checksum": "57592a884c09600d11f82702ac5d1805",
|
||||
"timestamp": "2026-09-24T03:01:30Z"
|
||||
},
|
||||
{
|
||||
"version": "1.0.20260924.21212",
|
||||
"changelog": "Nightly build 1.0.20260924.21212 (db9461c)",
|
||||
"targetAbi": "12.0.0.0",
|
||||
"sourceUrl": "https://gitea.tourolle.paris/dtourolle/jellyfin-srfPlay/releases/download/latest/srfplay_1.0.20260924.21212.zip",
|
||||
"checksum": "b497b4f8a9c5822909b6df0ed37b8b3d",
|
||||
"timestamp": "2026-09-24T01:14:34Z"
|
||||
},
|
||||
{
|
||||
"version": "1.0.20260924.21211",
|
||||
"changelog": "Nightly build 1.0.20260924.21211 (db9461c)",
|
||||
"targetAbi": "10.11.0.0",
|
||||
"sourceUrl": "https://gitea.tourolle.paris/dtourolle/jellyfin-srfPlay/releases/download/latest/srfplay_1.0.20260924.21211.zip",
|
||||
"checksum": "e3b98d2db0253dc42c3cc87645bffa0e",
|
||||
"timestamp": "2026-09-24T01:14:34Z"
|
||||
},
|
||||
{
|
||||
"version": "1.0.20260924.21209",
|
||||
"changelog": "Nightly build 1.0.20260924.21209 (db9461c)",
|
||||
"targetAbi": "10.9.0.0",
|
||||
"sourceUrl": "https://gitea.tourolle.paris/dtourolle/jellyfin-srfPlay/releases/download/latest/srfplay_1.0.20260924.21209.zip",
|
||||
"checksum": "1f4b3fe079d32a08968d7dfb99dc813f",
|
||||
"timestamp": "2026-09-24T01:14:34Z"
|
||||
},
|
||||
{
|
||||
"version": "1.0.20260908.201",
|
||||
"changelog": "Nightly build 1.0.20260908.201 (d0d5d06)",
|
||||
|
||||
@@ -8,6 +8,30 @@
|
||||
"category": "Live TV",
|
||||
"imageUrl": "https://gitea.tourolle.paris/dtourolle/jellyfin-srfPlay/raw/branch/master/assests/main%20logo.png",
|
||||
"versions": [
|
||||
{
|
||||
"version": "1.2.1.12",
|
||||
"changelog": "Release 1.2.1",
|
||||
"targetAbi": "12.0.0.0",
|
||||
"sourceUrl": "https://gitea.tourolle.paris/dtourolle/jellyfin-srfPlay/releases/download/v1.2.1/srfplay_1.2.1.12.zip",
|
||||
"checksum": "e7fe29977ed387f5f324b58aa40d8ebb",
|
||||
"timestamp": "2026-09-24T01:16:46Z"
|
||||
},
|
||||
{
|
||||
"version": "1.2.1.11",
|
||||
"changelog": "Release 1.2.1",
|
||||
"targetAbi": "10.11.0.0",
|
||||
"sourceUrl": "https://gitea.tourolle.paris/dtourolle/jellyfin-srfPlay/releases/download/v1.2.1/srfplay_1.2.1.11.zip",
|
||||
"checksum": "f69293b34c2e0e5fc5f2f2117ffb3ded",
|
||||
"timestamp": "2026-09-24T01:16:46Z"
|
||||
},
|
||||
{
|
||||
"version": "1.2.1.9",
|
||||
"changelog": "Release 1.2.1",
|
||||
"targetAbi": "10.9.0.0",
|
||||
"sourceUrl": "https://gitea.tourolle.paris/dtourolle/jellyfin-srfPlay/releases/download/v1.2.1/srfplay_1.2.1.9.zip",
|
||||
"checksum": "f18230d45e510cf60dce3badcd3f29a1",
|
||||
"timestamp": "2026-09-24T01:16:46Z"
|
||||
},
|
||||
{
|
||||
"version": "1.1.2",
|
||||
"changelog": "Release 1.1.2",
|
||||
|
||||
Reference in New Issue
Block a user