Use TV guide for livestreams
This commit is contained in:
@@ -5,6 +5,7 @@ using System.Net.Http.Headers;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using Jellyfin.Plugin.SRFPlay.Services.Interfaces;
|
||||
using Jellyfin.Plugin.SRFPlay.Utilities;
|
||||
using MediaBrowser.Common.Net;
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using Microsoft.AspNetCore.Http;
|
||||
@@ -242,7 +243,7 @@ public class StreamProxyController : ControllerBase
|
||||
}
|
||||
|
||||
// Determine content type based on file extension
|
||||
var contentType = GetContentType(segmentPath);
|
||||
var contentType = MimeTypeHelper.GetSegmentContentType(segmentPath);
|
||||
|
||||
_logger.LogDebug("Returning segment {SegmentPath} ({Length} bytes, {ContentType})", segmentPath, segmentData.Length, contentType);
|
||||
return File(segmentData, contentType);
|
||||
@@ -382,32 +383,6 @@ public class StreamProxyController : ControllerBase
|
||||
return result.ToString();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Gets the content type for a segment based on file extension.
|
||||
/// </summary>
|
||||
/// <param name="path">The segment path.</param>
|
||||
/// <returns>The MIME content type.</returns>
|
||||
private static string GetContentType(string path)
|
||||
{
|
||||
if (path.EndsWith(".ts", StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
return "video/MP2T";
|
||||
}
|
||||
|
||||
if (path.EndsWith(".mp4", StringComparison.OrdinalIgnoreCase) ||
|
||||
path.EndsWith(".m4s", StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
return "video/mp4";
|
||||
}
|
||||
|
||||
if (path.EndsWith(".aac", StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
return "audio/aac";
|
||||
}
|
||||
|
||||
return "application/octet-stream";
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Proxies image requests from SRF CDN, fixing Content-Type headers.
|
||||
/// </summary>
|
||||
@@ -471,7 +446,7 @@ public class StreamProxyController : ControllerBase
|
||||
.ConfigureAwait(false);
|
||||
|
||||
// Determine correct content type
|
||||
var contentType = GetImageContentType(decodedUrl);
|
||||
var contentType = MimeTypeHelper.GetImageContentType(decodedUrl);
|
||||
|
||||
_logger.LogDebug(
|
||||
"Returning proxied image ({Length} bytes, {ContentType})",
|
||||
@@ -486,38 +461,4 @@ public class StreamProxyController : ControllerBase
|
||||
return StatusCode(StatusCodes.Status502BadGateway);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Gets the content type for an image based on URL or file extension.
|
||||
/// </summary>
|
||||
/// <param name="url">The image URL.</param>
|
||||
/// <returns>The MIME content type.</returns>
|
||||
private static string GetImageContentType(string url)
|
||||
{
|
||||
if (string.IsNullOrEmpty(url))
|
||||
{
|
||||
return "image/jpeg";
|
||||
}
|
||||
|
||||
var uri = new Uri(url);
|
||||
var path = uri.AbsolutePath.ToLowerInvariant();
|
||||
|
||||
if (path.EndsWith(".png", StringComparison.Ordinal))
|
||||
{
|
||||
return "image/png";
|
||||
}
|
||||
|
||||
if (path.EndsWith(".gif", StringComparison.Ordinal))
|
||||
{
|
||||
return "image/gif";
|
||||
}
|
||||
|
||||
if (path.EndsWith(".webp", StringComparison.Ordinal))
|
||||
{
|
||||
return "image/webp";
|
||||
}
|
||||
|
||||
// Default to JPEG for SRF images (most common)
|
||||
return "image/jpeg";
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user