Use TV guide for livestreams
This commit is contained in:
@@ -2,13 +2,13 @@ using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Globalization;
|
||||
using System.Linq;
|
||||
using System.Security.Cryptography;
|
||||
using System.Text;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using Jellyfin.Plugin.SRFPlay.Api;
|
||||
using Jellyfin.Plugin.SRFPlay.Constants;
|
||||
using Jellyfin.Plugin.SRFPlay.Services.Interfaces;
|
||||
using Jellyfin.Plugin.SRFPlay.Utilities;
|
||||
using MediaBrowser.Controller;
|
||||
using MediaBrowser.Controller.Channels;
|
||||
using MediaBrowser.Controller.Providers;
|
||||
@@ -81,7 +81,7 @@ public class SRFPlayChannel : IChannel, IHasCacheKey
|
||||
/// <inheritdoc />
|
||||
public InternalChannelFeatures GetChannelFeatures()
|
||||
{
|
||||
_logger.LogInformation("=== GetChannelFeatures called for SRF Play channel ===");
|
||||
_logger.LogDebug("GetChannelFeatures called");
|
||||
|
||||
return new InternalChannelFeatures
|
||||
{
|
||||
@@ -127,12 +127,12 @@ public class SRFPlayChannel : IChannel, IHasCacheKey
|
||||
/// <inheritdoc />
|
||||
public async Task<ChannelItemResult> GetChannelItems(InternalChannelItemQuery query, CancellationToken cancellationToken)
|
||||
{
|
||||
_logger.LogInformation("=== GetChannelItems called! FolderId: {FolderId} ===", query.FolderId);
|
||||
_logger.LogDebug("GetChannelItems called for folder {FolderId}", query.FolderId);
|
||||
|
||||
try
|
||||
{
|
||||
var items = await GetFolderItemsAsync(query.FolderId, cancellationToken).ConfigureAwait(false);
|
||||
_logger.LogInformation("Returning {Count} channel items for folder {FolderId}", items.Count, query.FolderId);
|
||||
_logger.LogDebug("Returning {Count} channel items for folder {FolderId}", items.Count, query.FolderId);
|
||||
|
||||
return new ChannelItemResult
|
||||
{
|
||||
@@ -393,8 +393,14 @@ public class SRFPlayChannel : IChannel, IHasCacheKey
|
||||
var enabledTopics = config?.EnabledTopics != null && config.EnabledTopics.Count > 0
|
||||
? string.Join(",", config.EnabledTopics)
|
||||
: "all";
|
||||
var date = DateTime.Now.ToString("yyyy-MM-dd", CultureInfo.InvariantCulture);
|
||||
return $"{config?.BusinessUnit}_{config?.EnableLatestContent}_{config?.EnableTrendingContent}_{config?.EnableCategoryFolders}_{enabledTopics}_{date}";
|
||||
|
||||
// Use 15-minute time buckets for cache key so live content refreshes frequently
|
||||
// This ensures livestream folders update as programs start/end throughout the day
|
||||
var now = DateTime.Now;
|
||||
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}";
|
||||
}
|
||||
|
||||
private async Task<List<ChannelItemInfo>> ConvertUrnsToChannelItems(List<string> urns, CancellationToken cancellationToken)
|
||||
@@ -449,7 +455,7 @@ public class SRFPlayChannel : IChannel, IHasCacheKey
|
||||
}
|
||||
|
||||
// Generate deterministic GUID from URN
|
||||
var itemId = UrnToGuid(urn);
|
||||
var itemId = UrnHelper.ToGuid(urn);
|
||||
|
||||
// Use factory to create MediaSourceInfo (handles stream URL, auth, proxy registration)
|
||||
var mediaSource = await _mediaSourceFactory.CreateMediaSourceAsync(
|
||||
@@ -557,25 +563,6 @@ public class SRFPlayChannel : IChannel, IHasCacheKey
|
||||
return items;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Generates a deterministic GUID from a URN.
|
||||
/// This ensures the same URN always produces the same GUID.
|
||||
/// MD5 is used for non-cryptographic purposes only (generating IDs).
|
||||
/// </summary>
|
||||
/// <param name="urn">The URN to convert.</param>
|
||||
/// <returns>A deterministic GUID.</returns>
|
||||
#pragma warning disable CA5351 // MD5 is used for non-cryptographic purposes (ID generation)
|
||||
private static string UrnToGuid(string urn)
|
||||
{
|
||||
// Use MD5 to generate a deterministic hash from the URN
|
||||
var hash = MD5.HashData(Encoding.UTF8.GetBytes(urn));
|
||||
|
||||
// Convert the first 16 bytes to a GUID
|
||||
var guid = new Guid(hash);
|
||||
return guid.ToString();
|
||||
}
|
||||
#pragma warning restore CA5351
|
||||
|
||||
/// <summary>
|
||||
/// Creates a proxy URL for an image to fix Content-Type headers from SRF CDN.
|
||||
/// </summary>
|
||||
|
||||
Reference in New Issue
Block a user