Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
10a76f8d45 | ||
|
|
a39a10636b | ||
|
|
029fb78049 | ||
|
|
729f82b26d | ||
|
|
aad0c21d4b | ||
|
|
7a52b3da3b | ||
|
|
80598ea8cb | ||
|
|
24f53ef13e | ||
|
|
86b22c69d7 | ||
|
|
8ffa0a0f76 | ||
|
|
92f315f6f6 |
@@ -25,6 +25,13 @@ jobs:
|
||||
with:
|
||||
path: build-${{ github.run_id }}
|
||||
|
||||
- name: Cache NuGet packages
|
||||
uses: actions/cache@v3
|
||||
with:
|
||||
path: ~/.nuget/packages
|
||||
key: nuget-${{ hashFiles('**/Jellyfin.Plugin.SRFPlay.csproj', '**/Jellyfin.Plugin.SRFPlay.Tests.csproj') }}
|
||||
restore-keys: nuget-
|
||||
|
||||
- name: Restore dependencies
|
||||
working-directory: build-${{ github.run_id }}
|
||||
run: dotnet restore Jellyfin.Plugin.SRFPlay.sln
|
||||
|
||||
@@ -42,6 +42,13 @@ jobs:
|
||||
sed -i "s/^version:.*/version: \"${VERSION}\"/" build.yaml
|
||||
cat build.yaml
|
||||
|
||||
- name: Cache NuGet packages
|
||||
uses: actions/cache@v3
|
||||
with:
|
||||
path: ~/.nuget/packages
|
||||
key: nuget-${{ hashFiles('**/Jellyfin.Plugin.SRFPlay.csproj', '**/Jellyfin.Plugin.SRFPlay.Tests.csproj') }}
|
||||
restore-keys: nuget-
|
||||
|
||||
- name: Restore dependencies
|
||||
working-directory: release-${{ github.run_id }}
|
||||
run: dotnet restore Jellyfin.Plugin.SRFPlay.sln
|
||||
|
||||
@@ -27,6 +27,13 @@ jobs:
|
||||
with:
|
||||
path: test-${{ github.run_id }}
|
||||
|
||||
- name: Cache NuGet packages
|
||||
uses: actions/cache@v3
|
||||
with:
|
||||
path: ~/.nuget/packages
|
||||
key: nuget-${{ hashFiles('**/Jellyfin.Plugin.SRFPlay.csproj', '**/Jellyfin.Plugin.SRFPlay.Tests.csproj') }}
|
||||
restore-keys: nuget-
|
||||
|
||||
- name: Restore dependencies
|
||||
working-directory: test-${{ github.run_id }}
|
||||
run: dotnet restore Jellyfin.Plugin.SRFPlay.sln
|
||||
|
||||
@@ -6,6 +6,7 @@ using System.Text;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using Jellyfin.Plugin.SRFPlay.Api;
|
||||
using Jellyfin.Plugin.SRFPlay.Api.Models;
|
||||
using Jellyfin.Plugin.SRFPlay.Constants;
|
||||
using Jellyfin.Plugin.SRFPlay.Services.Interfaces;
|
||||
using Jellyfin.Plugin.SRFPlay.Utilities;
|
||||
@@ -15,6 +16,7 @@ using MediaBrowser.Controller.Providers;
|
||||
using MediaBrowser.Model.Channels;
|
||||
using MediaBrowser.Model.Dto;
|
||||
using MediaBrowser.Model.Entities;
|
||||
using MediaBrowser.Model.MediaInfo;
|
||||
using Microsoft.Extensions.Logging;
|
||||
|
||||
namespace Jellyfin.Plugin.SRFPlay.Channels;
|
||||
@@ -30,6 +32,7 @@ public class SRFPlayChannel : IChannel, IHasCacheKey
|
||||
private readonly IMediaSourceFactory _mediaSourceFactory;
|
||||
private readonly ICategoryService? _categoryService;
|
||||
private readonly ISRFApiClientFactory _apiClientFactory;
|
||||
private readonly IRecordingService _recordingService;
|
||||
|
||||
/// <summary>
|
||||
/// Initializes a new instance of the <see cref="SRFPlayChannel"/> class.
|
||||
@@ -40,13 +43,15 @@ public class SRFPlayChannel : IChannel, IHasCacheKey
|
||||
/// <param name="mediaSourceFactory">The media source factory.</param>
|
||||
/// <param name="categoryService">The category service (optional).</param>
|
||||
/// <param name="apiClientFactory">The API client factory.</param>
|
||||
/// <param name="recordingService">The recording service.</param>
|
||||
public SRFPlayChannel(
|
||||
ILoggerFactory loggerFactory,
|
||||
IContentRefreshService contentRefreshService,
|
||||
IStreamUrlResolver streamResolver,
|
||||
IMediaSourceFactory mediaSourceFactory,
|
||||
ICategoryService? categoryService,
|
||||
ISRFApiClientFactory apiClientFactory)
|
||||
ISRFApiClientFactory apiClientFactory,
|
||||
IRecordingService recordingService)
|
||||
{
|
||||
_logger = loggerFactory.CreateLogger<SRFPlayChannel>();
|
||||
_contentRefreshService = contentRefreshService;
|
||||
@@ -54,6 +59,7 @@ public class SRFPlayChannel : IChannel, IHasCacheKey
|
||||
_mediaSourceFactory = mediaSourceFactory;
|
||||
_categoryService = categoryService;
|
||||
_apiClientFactory = apiClientFactory;
|
||||
_recordingService = recordingService;
|
||||
|
||||
if (_categoryService == null)
|
||||
{
|
||||
@@ -170,6 +176,7 @@ public class SRFPlayChannel : IChannel, IHasCacheKey
|
||||
"latest" => await GetLatestVideosAsync(cancellationToken).ConfigureAwait(false),
|
||||
"trending" => await GetTrendingVideosAsync(cancellationToken).ConfigureAwait(false),
|
||||
"live_sports" => await GetLiveSportsAsync(cancellationToken).ConfigureAwait(false),
|
||||
"recordings" => GetRecordingItems(),
|
||||
_ when folderId.StartsWith("category_", StringComparison.Ordinal) => await GetCategoryVideosAsync(folderId, cancellationToken).ConfigureAwait(false),
|
||||
_ => new List<ChannelItemInfo>()
|
||||
};
|
||||
@@ -181,7 +188,8 @@ public class SRFPlayChannel : IChannel, IHasCacheKey
|
||||
{
|
||||
CreateFolder("latest", "Latest Videos"),
|
||||
CreateFolder("trending", "Trending Videos"),
|
||||
CreateFolder("live_sports", "Live Sports & Events")
|
||||
CreateFolder("live_sports", "Live Sports & Events"),
|
||||
CreateFolder("recordings", "Recordings")
|
||||
};
|
||||
|
||||
// Add category folders if enabled
|
||||
@@ -296,6 +304,58 @@ public class SRFPlayChannel : IChannel, IHasCacheKey
|
||||
return items;
|
||||
}
|
||||
|
||||
private List<ChannelItemInfo> GetRecordingItems()
|
||||
{
|
||||
var items = new List<ChannelItemInfo>();
|
||||
var recordings = _recordingService.GetRecordings(RecordingState.Completed);
|
||||
|
||||
foreach (var recording in recordings)
|
||||
{
|
||||
if (string.IsNullOrEmpty(recording.OutputPath) || !System.IO.File.Exists(recording.OutputPath))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
var fileInfo = new System.IO.FileInfo(recording.OutputPath);
|
||||
var itemId = $"recording_{recording.Id}";
|
||||
|
||||
var mediaSource = new MediaSourceInfo
|
||||
{
|
||||
Id = itemId,
|
||||
Name = recording.Title,
|
||||
Path = recording.OutputPath,
|
||||
Protocol = MediaProtocol.File,
|
||||
Container = "mkv",
|
||||
SupportsDirectPlay = true,
|
||||
SupportsDirectStream = true,
|
||||
SupportsTranscoding = true,
|
||||
IsRemote = false,
|
||||
Size = fileInfo.Length,
|
||||
Type = MediaSourceType.Default
|
||||
};
|
||||
|
||||
var item = new ChannelItemInfo
|
||||
{
|
||||
Id = itemId,
|
||||
Name = recording.Title,
|
||||
Overview = recording.Description,
|
||||
Type = ChannelItemType.Media,
|
||||
ContentType = ChannelMediaContentType.Movie,
|
||||
MediaType = ChannelMediaType.Video,
|
||||
DateCreated = recording.RecordingStartedAt,
|
||||
ImageUrl = !string.IsNullOrEmpty(recording.ImageUrl)
|
||||
? CreateProxiedImageUrl(recording.ImageUrl, _mediaSourceFactory.GetServerBaseUrl())
|
||||
: CreatePlaceholderImageUrl(recording.Title, _mediaSourceFactory.GetServerBaseUrl()),
|
||||
MediaSources = new List<MediaSourceInfo> { mediaSource }
|
||||
};
|
||||
|
||||
items.Add(item);
|
||||
}
|
||||
|
||||
_logger.LogInformation("Returning {Count} completed recordings as channel items", items.Count);
|
||||
return items;
|
||||
}
|
||||
|
||||
private async Task<List<ChannelItemInfo>> GetCategoryVideosAsync(string folderId, CancellationToken cancellationToken)
|
||||
{
|
||||
var items = new List<ChannelItemInfo>();
|
||||
@@ -411,7 +471,8 @@ public class SRFPlayChannel : IChannel, IHasCacheKey
|
||||
var timeBucket = new DateTime(now.Year, now.Month, now.Day, now.Hour, (now.Minute / 15) * 15, 0);
|
||||
var timeKey = timeBucket.ToString("yyyy-MM-dd-HH-mm", CultureInfo.InvariantCulture);
|
||||
|
||||
return $"{config?.BusinessUnit}_{config?.EnableLatestContent}_{config?.EnableTrendingContent}_{config?.EnableCategoryFolders}_{enabledTopics}_{timeKey}";
|
||||
var recordingCount = _recordingService.GetRecordings(RecordingState.Completed).Count;
|
||||
return $"{config?.BusinessUnit}_{config?.EnableLatestContent}_{config?.EnableTrendingContent}_{config?.EnableCategoryFolders}_{enabledTopics}_{timeKey}_rec{recordingCount}";
|
||||
}
|
||||
|
||||
private async Task<List<ChannelItemInfo>> ConvertUrnsToChannelItems(List<string> urns, CancellationToken cancellationToken)
|
||||
@@ -553,8 +614,7 @@ public class SRFPlayChannel : IChannel, IHasCacheKey
|
||||
ProviderIds = new Dictionary<string, string>
|
||||
{
|
||||
{ "SRF", urn }
|
||||
},
|
||||
MediaSources = new List<MediaSourceInfo> { mediaSource }
|
||||
}
|
||||
};
|
||||
|
||||
// Add series info if available
|
||||
|
||||
@@ -1,10 +1,3 @@
|
||||
<!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 data-role="content">
|
||||
<div class="content-primary">
|
||||
@@ -398,5 +391,3 @@
|
||||
};
|
||||
</script>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@@ -0,0 +1,346 @@
|
||||
<div id="SRFPlayRecordingsPage" data-role="page" class="page type-interior pluginConfigurationPage"
|
||||
data-require="emby-button,emby-input">
|
||||
<style>
|
||||
#SRFPlayRecordingsPage .srfrec-wrap { padding: 0 1em; }
|
||||
#SRFPlayRecordingsPage table { width: 100%; border-collapse: collapse; margin: 10px 0 20px; }
|
||||
#SRFPlayRecordingsPage th { text-align: left; padding: 10px 8px; border-bottom: 2px solid #444; color: #aaa; font-size: 0.85em; text-transform: uppercase; }
|
||||
#SRFPlayRecordingsPage td { padding: 10px 8px; border-bottom: 1px solid #2a2a3e; }
|
||||
#SRFPlayRecordingsPage tr:hover { background: rgba(255,255,255,0.04); }
|
||||
#SRFPlayRecordingsPage .btn { padding: 6px 16px; border: none; border-radius: 4px; cursor: pointer; font-size: 0.85em; color: #fff; transition: opacity 0.2s; }
|
||||
#SRFPlayRecordingsPage .btn:hover { opacity: 0.85; }
|
||||
#SRFPlayRecordingsPage .btn-record { background: #4CAF50; }
|
||||
#SRFPlayRecordingsPage .btn-stop { background: #FF9800; }
|
||||
#SRFPlayRecordingsPage .btn-cancel { background: #9E9E9E; }
|
||||
#SRFPlayRecordingsPage .btn-delete { background: #f44336; }
|
||||
#SRFPlayRecordingsPage .btn-refresh { background: #2196F3; margin-bottom: 16px; }
|
||||
#SRFPlayRecordingsPage .status { padding: 3px 8px; border-radius: 3px; font-size: 0.8em; font-weight: 600; color: #fff; }
|
||||
#SRFPlayRecordingsPage .status-scheduled { background: #1565C0; }
|
||||
#SRFPlayRecordingsPage .status-waiting { background: #E65100; }
|
||||
#SRFPlayRecordingsPage .status-recording { background: #2E7D32; }
|
||||
#SRFPlayRecordingsPage .status-failed { background: #C62828; }
|
||||
#SRFPlayRecordingsPage .srfrec-msg { padding: 12px; color: #999; font-style: italic; }
|
||||
#SRFPlayRecordingsPage .srfrec-error { color: #f44; }
|
||||
#SRFPlayRecordingsPage .login-form { max-width: 400px; margin: 40px auto; }
|
||||
#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; }
|
||||
#SRFPlayRecordingsPage .login-form .btn { width: 100%; padding: 12px; font-size: 1em; margin-top: 12px; }
|
||||
</style>
|
||||
<div data-role="content">
|
||||
<div class="content-primary srfrec-wrap">
|
||||
<div id="srfrecLoginSection" style="display:none;">
|
||||
<div class="login-form">
|
||||
<h1>SRF Sport Recordings</h1>
|
||||
<p class="fieldDescription">Sign in to your Jellyfin server</p>
|
||||
<input type="text" id="srfrecLoginServer" placeholder="Server URL (e.g. http://192.168.1.50:8096)" />
|
||||
<input type="text" id="srfrecLoginUser" placeholder="Username" />
|
||||
<input type="password" id="srfrecLoginPass" placeholder="Password" />
|
||||
<button type="button" class="btn btn-record" onclick="SRFRec.login()">Sign In</button>
|
||||
<p id="srfrecLoginError" class="srfrec-error" style="margin-top:10px;"></p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div id="srfrecMainSection" style="display:none;">
|
||||
<h1>SRF Sport Recordings</h1>
|
||||
<p class="fieldDescription">Browse upcoming sport livestreams and schedule recordings. <span id="srfrecUserInfo"></span></p>
|
||||
|
||||
<h2>Upcoming Sport Livestreams</h2>
|
||||
<button type="button" class="btn btn-refresh" onclick="SRFRec.loadSchedule()">Refresh Schedule</button>
|
||||
<div id="srfrecScheduleContainer"><p class="srfrec-msg">Loading schedule...</p></div>
|
||||
|
||||
<h2>Scheduled & Active Recordings</h2>
|
||||
<div id="srfrecActiveRecordingsContainer"><p class="srfrec-msg">Loading...</p></div>
|
||||
|
||||
<h2>Completed Recordings</h2>
|
||||
<button type="button" class="btn btn-refresh" onclick="SRFRec.loadRecordings()">Refresh</button>
|
||||
<div id="srfrecCompletedRecordingsContainer"><p class="srfrec-msg">Loading...</p></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<script>
|
||||
var SRFRec = {
|
||||
serverUrl: '',
|
||||
token: '',
|
||||
|
||||
init: function() {
|
||||
// Check if we're inside Jellyfin's web client (ApiClient available)
|
||||
if (typeof ApiClient !== 'undefined' && ApiClient.accessToken()) {
|
||||
this.serverUrl = ApiClient.serverAddress();
|
||||
this.token = ApiClient.accessToken();
|
||||
this.showMain();
|
||||
return;
|
||||
}
|
||||
|
||||
// Check localStorage for saved session
|
||||
var saved = localStorage.getItem('srfRecSession');
|
||||
if (saved) {
|
||||
try {
|
||||
var session = JSON.parse(saved);
|
||||
this.serverUrl = session.serverUrl;
|
||||
this.token = session.token;
|
||||
// Verify token still works
|
||||
this.verifySession(session);
|
||||
return;
|
||||
} catch(e) { /* fall through to login */ }
|
||||
}
|
||||
|
||||
// Show login form
|
||||
var serverInput = document.getElementById('srfrecLoginServer');
|
||||
serverInput.value = window.location.origin;
|
||||
document.getElementById('srfrecLoginSection').style.display = 'block';
|
||||
},
|
||||
|
||||
verifySession: function(session) {
|
||||
var self = this;
|
||||
fetch(this.serverUrl + '/System/Info', {
|
||||
headers: { 'X-Emby-Token': this.token }
|
||||
}).then(function(r) {
|
||||
if (r.ok) {
|
||||
document.getElementById('srfrecUserInfo').textContent = '(Server: ' + self.serverUrl + ')';
|
||||
self.showMain();
|
||||
} else {
|
||||
localStorage.removeItem('srfRecSession');
|
||||
document.getElementById('srfrecLoginSection').style.display = 'block';
|
||||
}
|
||||
}).catch(function() {
|
||||
localStorage.removeItem('srfRecSession');
|
||||
document.getElementById('srfrecLoginSection').style.display = 'block';
|
||||
});
|
||||
},
|
||||
|
||||
login: function() {
|
||||
var self = this;
|
||||
var server = document.getElementById('srfrecLoginServer').value.replace(/\/+$/, '');
|
||||
var user = document.getElementById('srfrecLoginUser').value;
|
||||
var pass = document.getElementById('srfrecLoginPass').value;
|
||||
var errorEl = document.getElementById('srfrecLoginError');
|
||||
errorEl.textContent = '';
|
||||
|
||||
fetch(server + '/Users/AuthenticateByName', {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
'X-Emby-Authorization': 'MediaBrowser Client="SRF Recordings", Device="Web", DeviceId="srfrec-' + Date.now() + '", Version="1.0.0"'
|
||||
},
|
||||
body: JSON.stringify({ Username: user, Pw: pass })
|
||||
})
|
||||
.then(function(r) {
|
||||
if (!r.ok) throw new Error('Authentication failed');
|
||||
return r.json();
|
||||
})
|
||||
.then(function(data) {
|
||||
self.serverUrl = server;
|
||||
self.token = data.AccessToken;
|
||||
localStorage.setItem('srfRecSession', JSON.stringify({
|
||||
serverUrl: server,
|
||||
token: data.AccessToken,
|
||||
userName: data.User.Name
|
||||
}));
|
||||
document.getElementById('srfrecUserInfo').textContent = '(Signed in as ' + data.User.Name + ')';
|
||||
self.showMain();
|
||||
})
|
||||
.catch(function(err) {
|
||||
errorEl.textContent = err.message;
|
||||
});
|
||||
},
|
||||
|
||||
showMain: function() {
|
||||
document.getElementById('srfrecLoginSection').style.display = 'none';
|
||||
document.getElementById('srfrecMainSection').style.display = 'block';
|
||||
this.loadSchedule();
|
||||
this.loadRecordings();
|
||||
},
|
||||
|
||||
getHeaders: function() {
|
||||
return { 'X-Emby-Token': this.token };
|
||||
},
|
||||
|
||||
formatDate: function(dateStr) {
|
||||
if (!dateStr) return 'N/A';
|
||||
var d = new Date(dateStr);
|
||||
return d.toLocaleDateString() + ' ' + d.toLocaleTimeString([], {hour: '2-digit', minute:'2-digit'});
|
||||
},
|
||||
|
||||
formatSize: function(bytes) {
|
||||
if (!bytes) return '';
|
||||
if (bytes > 1073741824) return (bytes / 1073741824).toFixed(1) + ' GB';
|
||||
if (bytes > 1048576) return (bytes / 1048576).toFixed(0) + ' MB';
|
||||
return (bytes / 1024).toFixed(0) + ' KB';
|
||||
},
|
||||
|
||||
loadSchedule: function() {
|
||||
var container = document.getElementById('srfrecScheduleContainer');
|
||||
container.innerHTML = '<p class="srfrec-msg">Loading schedule...</p>';
|
||||
|
||||
fetch(this.serverUrl + '/Plugins/SRFPlay/Recording/Schedule', { headers: this.getHeaders() })
|
||||
.then(function(r) { return r.json(); })
|
||||
.then(function(programs) {
|
||||
if (!programs || programs.length === 0) {
|
||||
container.innerHTML = '<p class="srfrec-msg">No upcoming sport livestreams found.</p>';
|
||||
return;
|
||||
}
|
||||
|
||||
var html = '<table>';
|
||||
html += '<thead><tr><th>Title</th><th>Start</th><th>End</th><th>Action</th></tr></thead><tbody>';
|
||||
|
||||
programs.forEach(function(p) {
|
||||
html += '<tr>';
|
||||
html += '<td>' + (p.title || 'Unknown') + '</td>';
|
||||
html += '<td>' + SRFRec.formatDate(p.validFrom || p.date) + '</td>';
|
||||
html += '<td>' + SRFRec.formatDate(p.validTo) + '</td>';
|
||||
html += '<td><button type="button" class="btn btn-record" onclick="SRFRec.scheduleRecording(\'' + encodeURIComponent(p.urn) + '\')">Record</button></td>';
|
||||
html += '</tr>';
|
||||
});
|
||||
|
||||
html += '</tbody></table>';
|
||||
container.innerHTML = html;
|
||||
})
|
||||
.catch(function(err) {
|
||||
container.innerHTML = '<p class="srfrec-error">Error loading schedule: ' + err.message + '</p>';
|
||||
});
|
||||
},
|
||||
|
||||
scheduleRecording: function(encodedUrn) {
|
||||
var self = this;
|
||||
fetch(this.serverUrl + '/Plugins/SRFPlay/Recording/Schedule/' + encodedUrn, {
|
||||
method: 'POST',
|
||||
headers: this.getHeaders()
|
||||
})
|
||||
.then(function(r) {
|
||||
if (r.ok) {
|
||||
alert('Recording scheduled!');
|
||||
self.loadRecordings();
|
||||
} else {
|
||||
alert('Failed to schedule recording');
|
||||
}
|
||||
})
|
||||
.catch(function(err) { alert('Error: ' + err.message); });
|
||||
},
|
||||
|
||||
loadRecordings: function() {
|
||||
this.loadActiveRecordings();
|
||||
this.loadCompletedRecordings();
|
||||
},
|
||||
|
||||
loadActiveRecordings: function() {
|
||||
var container = document.getElementById('srfrecActiveRecordingsContainer');
|
||||
container.innerHTML = '<p class="srfrec-msg">Loading...</p>';
|
||||
|
||||
fetch(this.serverUrl + '/Plugins/SRFPlay/Recording/All', { headers: this.getHeaders() })
|
||||
.then(function(r) { return r.json(); })
|
||||
.then(function(recordings) {
|
||||
var activeStates = ['Scheduled', 'WaitingForStream', 'Recording', 0, 1, 2];
|
||||
var active = recordings.filter(function(r) {
|
||||
return activeStates.indexOf(r.state) !== -1;
|
||||
});
|
||||
|
||||
if (active.length === 0) {
|
||||
container.innerHTML = '<p class="srfrec-msg">No scheduled or active recordings.</p>';
|
||||
return;
|
||||
}
|
||||
|
||||
var stateMap = {
|
||||
'Scheduled': {label: 'Scheduled', cls: 'status-scheduled'},
|
||||
'WaitingForStream': {label: 'Waiting', cls: 'status-waiting'},
|
||||
'Recording': {label: 'Recording', cls: 'status-recording'},
|
||||
0: {label: 'Scheduled', cls: 'status-scheduled'},
|
||||
1: {label: 'Waiting', cls: 'status-waiting'},
|
||||
2: {label: 'Recording', cls: 'status-recording'}
|
||||
};
|
||||
|
||||
var html = '<table>';
|
||||
html += '<thead><tr><th>Title</th><th>Status</th><th>Start</th><th>Action</th></tr></thead><tbody>';
|
||||
|
||||
active.forEach(function(r) {
|
||||
var st = stateMap[r.state] || {label: r.state, cls: ''};
|
||||
html += '<tr>';
|
||||
html += '<td>' + (r.title || 'Unknown') + '</td>';
|
||||
html += '<td><span class="status ' + st.cls + '">' + st.label + '</span></td>';
|
||||
html += '<td>' + SRFRec.formatDate(r.validFrom) + '</td>';
|
||||
html += '<td>';
|
||||
if (r.state === 2 || r.state === 'Recording') {
|
||||
html += '<button type="button" class="btn btn-stop" onclick="SRFRec.stopRecording(\'' + r.id + '\')">Stop</button>';
|
||||
} else {
|
||||
html += '<button type="button" class="btn btn-cancel" onclick="SRFRec.cancelRecording(\'' + r.id + '\')">Cancel</button>';
|
||||
}
|
||||
html += '</td></tr>';
|
||||
});
|
||||
|
||||
html += '</tbody></table>';
|
||||
container.innerHTML = html;
|
||||
})
|
||||
.catch(function(err) {
|
||||
container.innerHTML = '<p class="srfrec-error">Error: ' + err.message + '</p>';
|
||||
});
|
||||
},
|
||||
|
||||
loadCompletedRecordings: function() {
|
||||
var container = document.getElementById('srfrecCompletedRecordingsContainer');
|
||||
container.innerHTML = '<p class="srfrec-msg">Loading...</p>';
|
||||
|
||||
fetch(this.serverUrl + '/Plugins/SRFPlay/Recording/Completed', { headers: this.getHeaders() })
|
||||
.then(function(r) { return r.json(); })
|
||||
.then(function(recordings) {
|
||||
if (!recordings || recordings.length === 0) {
|
||||
container.innerHTML = '<p class="srfrec-msg">No completed recordings.</p>';
|
||||
return;
|
||||
}
|
||||
|
||||
var html = '<table>';
|
||||
html += '<thead><tr><th>Title</th><th>Recorded</th><th>Size</th><th>Action</th></tr></thead><tbody>';
|
||||
|
||||
recordings.forEach(function(r) {
|
||||
html += '<tr>';
|
||||
html += '<td>' + (r.title || 'Unknown') + '</td>';
|
||||
html += '<td>' + SRFRec.formatDate(r.recordingStartedAt) + '</td>';
|
||||
html += '<td>' + SRFRec.formatSize(r.fileSizeBytes) + '</td>';
|
||||
html += '<td><button type="button" class="btn btn-delete" onclick="SRFRec.deleteRecording(\'' + r.id + '\')">Delete</button></td>';
|
||||
html += '</tr>';
|
||||
});
|
||||
|
||||
html += '</tbody></table>';
|
||||
container.innerHTML = html;
|
||||
})
|
||||
.catch(function(err) {
|
||||
container.innerHTML = '<p class="srfrec-error">Error: ' + err.message + '</p>';
|
||||
});
|
||||
},
|
||||
|
||||
stopRecording: function(id) {
|
||||
var self = this;
|
||||
fetch(this.serverUrl + '/Plugins/SRFPlay/Recording/Active/' + id + '/Stop', {
|
||||
method: 'POST',
|
||||
headers: this.getHeaders()
|
||||
}).then(function() { self.loadRecordings(); });
|
||||
},
|
||||
|
||||
cancelRecording: function(id) {
|
||||
var self = this;
|
||||
fetch(this.serverUrl + '/Plugins/SRFPlay/Recording/Schedule/' + id, {
|
||||
method: 'DELETE',
|
||||
headers: this.getHeaders()
|
||||
}).then(function() { self.loadRecordings(); });
|
||||
},
|
||||
|
||||
deleteRecording: function(id) {
|
||||
if (!confirm('Delete this recording and its file?')) return;
|
||||
var self = this;
|
||||
fetch(this.serverUrl + '/Plugins/SRFPlay/Recording/Completed/' + id + '?deleteFile=true', {
|
||||
method: 'DELETE',
|
||||
headers: this.getHeaders()
|
||||
}).then(function() { self.loadRecordings(); });
|
||||
}
|
||||
};
|
||||
|
||||
(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();
|
||||
}
|
||||
})();
|
||||
</script>
|
||||
</div>
|
||||
@@ -1,3 +1,5 @@
|
||||
using System.IO;
|
||||
using System.Reflection;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using Jellyfin.Plugin.SRFPlay.Api.Models;
|
||||
@@ -33,6 +35,26 @@ public class RecordingController : ControllerBase
|
||||
_recordingService = recordingService;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Serves the recording manager page accessible to any authenticated user.
|
||||
/// </summary>
|
||||
/// <returns>The recording manager HTML page.</returns>
|
||||
[HttpGet("Page")]
|
||||
[ProducesResponseType(StatusCodes.Status200OK)]
|
||||
[ProducesResponseType(StatusCodes.Status404NotFound)]
|
||||
public IActionResult GetRecordingPage()
|
||||
{
|
||||
var assembly = Assembly.GetExecutingAssembly();
|
||||
var resourceStream = assembly.GetManifestResourceStream("Jellyfin.Plugin.SRFPlay.Configuration.recordingPage.html");
|
||||
|
||||
if (resourceStream == null)
|
||||
{
|
||||
return NotFound("Recording page not found");
|
||||
}
|
||||
|
||||
return File(resourceStream, "text/html");
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Gets upcoming sport livestreams available for recording.
|
||||
/// </summary>
|
||||
|
||||
@@ -160,7 +160,8 @@ public class StreamProxyController : ControllerBase
|
||||
AddManifestCacheHeaders(actualItemId);
|
||||
|
||||
_logger.LogDebug("Returning master manifest for item {ItemId} ({Length} bytes)", itemId, manifestContent.Length);
|
||||
return Content(manifestContent, "application/vnd.apple.mpegurl; charset=utf-8");
|
||||
// Use application/x-mpegURL for broader compatibility (Samsung AVPlay requires it)
|
||||
return Content(manifestContent, "application/x-mpegURL; charset=utf-8");
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
@@ -231,7 +232,7 @@ public class StreamProxyController : ControllerBase
|
||||
AddManifestCacheHeaders(actualItemId, isVariantManifest: true);
|
||||
|
||||
_logger.LogDebug("Returning variant manifest for item {ItemId} ({Length} bytes)", itemId, rewrittenContent.Length);
|
||||
return Content(rewrittenContent, "application/vnd.apple.mpegurl; charset=utf-8");
|
||||
return Content(rewrittenContent, "application/x-mpegURL; charset=utf-8");
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
|
||||
@@ -26,6 +26,8 @@
|
||||
<ItemGroup>
|
||||
<None Remove="Configuration\configPage.html" />
|
||||
<EmbeddedResource Include="Configuration\configPage.html" />
|
||||
<None Remove="Configuration\recordingPage.html" />
|
||||
<EmbeddedResource Include="Configuration\recordingPage.html" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
||||
@@ -45,6 +45,15 @@ public class Plugin : BasePlugin<PluginConfiguration>, IHasWebPages
|
||||
{
|
||||
Name = Name,
|
||||
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"
|
||||
}
|
||||
];
|
||||
}
|
||||
|
||||
@@ -62,9 +62,15 @@ public class MediaSourceFactory : IMediaSourceFactory
|
||||
return Task.FromResult<MediaSourceInfo?>(null);
|
||||
}
|
||||
|
||||
// Detect if this is a live stream
|
||||
var isLiveStream = chapter.Type == "SCHEDULED_LIVESTREAM" ||
|
||||
// A scheduled livestream is only treated as live when the broadcast window is open.
|
||||
// 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);
|
||||
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
|
||||
// This avoids wasting 30-second tokens during category browsing
|
||||
@@ -91,15 +97,15 @@ public class MediaSourceFactory : IMediaSourceFactory
|
||||
Protocol = MediaProtocol.Http,
|
||||
// Use "hls" to trigger hls.js player in web client
|
||||
Container = "hls",
|
||||
SupportsDirectStream = true,
|
||||
SupportsDirectStream = false,
|
||||
SupportsDirectPlay = true,
|
||||
SupportsTranscoding = false,
|
||||
SupportsTranscoding = true,
|
||||
IsRemote = true,
|
||||
Type = MediaSourceType.Default,
|
||||
RunTimeTicks = chapter.Duration > 0 ? TimeSpan.FromMilliseconds(chapter.Duration).Ticks : null,
|
||||
VideoType = VideoType.VideoFile,
|
||||
IsInfiniteStream = isLiveStream,
|
||||
// Don't use RequiresOpening - it forces Jellyfin to transcode which breaks token auth
|
||||
// RequiresOpening = false: proxy handles auth directly, no need for Jellyfin to open the stream
|
||||
RequiresOpening = false,
|
||||
RequiresClosing = false,
|
||||
// Disable probing - we provide stream info directly
|
||||
|
||||
@@ -656,21 +656,6 @@ public class StreamProxyService : IStreamProxyService
|
||||
// Rewrite the manifest to replace Akamai URLs with proxy URLs
|
||||
var rewrittenContent = RewriteManifestUrls(manifestContent, authenticatedUrl, baseProxyUrl);
|
||||
|
||||
// For live streams, inject #EXT-X-START to tell the player to start near the live edge
|
||||
// Without this, players may start at the beginning of the sliding window and stutter
|
||||
// as old segments get rotated out by the CDN
|
||||
if (_streamMappings.TryGetValue(itemId, out var streamInfoForManifest) && streamInfoForManifest.IsLiveStream)
|
||||
{
|
||||
if (!rewrittenContent.Contains("#EXT-X-START", StringComparison.Ordinal))
|
||||
{
|
||||
rewrittenContent = rewrittenContent.Replace(
|
||||
"#EXTM3U",
|
||||
"#EXTM3U\n#EXT-X-START:TIME-OFFSET=-6,PRECISE=NO",
|
||||
StringComparison.Ordinal);
|
||||
_logger.LogDebug("Injected #EXT-X-START tag for live stream {ItemId}", itemId);
|
||||
}
|
||||
}
|
||||
|
||||
_logger.LogDebug("Rewritten manifest for item {ItemId} ({Length} bytes):\n{Content}", itemId, rewrittenContent.Length, rewrittenContent);
|
||||
return rewrittenContent;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,7 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<configuration>
|
||||
<packageSources>
|
||||
<clear />
|
||||
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
|
||||
</packageSources>
|
||||
</configuration>
|
||||
@@ -8,6 +8,46 @@
|
||||
"category": "Live TV",
|
||||
"imageUrl": "https://gitea.tourolle.paris/dtourolle/jellyfin-srfPlay/raw/branch/master/assests/main%20logo.png",
|
||||
"versions": [
|
||||
{
|
||||
"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": "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": "834e9f57206eee47ec9607ef6f65d17b",
|
||||
"timestamp": "2026-05-03T16:39:53Z"
|
||||
},
|
||||
{
|
||||
"version": "1.0.29",
|
||||
"changelog": "Release 1.0.29",
|
||||
"targetAbi": "10.9.0.0",
|
||||
"sourceUrl": "https://gitea.tourolle.paris/dtourolle/jellyfin-srfPlay/releases/download/v1.0.29/srfplay_1.0.29.0.zip",
|
||||
"checksum": "fb745388e64299497262d9ad370d8823",
|
||||
"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",
|
||||
"changelog": "Release 1.0.27",
|
||||
"targetAbi": "10.9.0.0",
|
||||
"sourceUrl": "https://gitea.tourolle.paris/dtourolle/jellyfin-srfPlay/releases/download/v1.0.27/srfplay_1.0.27.0.zip",
|
||||
"checksum": "1e15e35452f7b82bf74d8c3560c15949",
|
||||
"timestamp": "2026-03-07T16:40:17Z"
|
||||
},
|
||||
{
|
||||
"version": "0.0.0.0",
|
||||
"changelog": "Latest Build",
|
||||
|
||||
Reference in New Issue
Block a user