timothy/ersatztv
1
0
Fork 0
Code Issues 51 Pull Requests 5 Actions Packages Projects Releases 9 Wiki Activity

use base path in channel playlist and channel guide (#1028)

Browse Source
This commit is contained in:
Jason Dove
2022-11-20 08:28:14 -06:00
committed by GitHub
parent 3c499f9e97
commit 776bce9087
10 changed files with 40 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ErsatzTV.Core/Iptv/ChannelGuide.cs
+6 -3
View File
@@ -13,6 +13,7 @@ public class ChannelGuide
{
private readonly List<Channel> _channels;
private readonly string _host;
private readonly string _baseUrl;
private readonly RecyclableMemoryStreamManager _recyclableMemoryStreamManager;
private readonly string _scheme;
@@ -20,11 +21,13 @@ public class ChannelGuide
RecyclableMemoryStreamManager recyclableMemoryStreamManager,
string scheme,
string host,
string baseUrl,
List<Channel> channels)
{
_recyclableMemoryStreamManager = recyclableMemoryStreamManager;
_scheme = scheme;
_host = host;
_baseUrl = baseUrl;
_channels = channels;
}
@@ -67,8 +70,8 @@ public class ChannelGuide
.Filter(a => a.ArtworkKind == ArtworkKind.Logo)
.HeadOrNone()
.Match(
artwork => $"{_scheme}://{_host}/iptv/logos/{artwork.Path}.jpg",
() => $"{_scheme}://{_host}/iptv/images/ersatztv-500.png");
artwork => $"{_scheme}://{_host}{_baseUrl}/iptv/logos/{artwork.Path}.jpg",
() => $"{_scheme}://{_host}{_baseUrl}/iptv/images/ersatztv-500.png");
xml.WriteAttributeString("src", logo);
xml.WriteEndElement(); // icon
@@ -394,7 +397,7 @@ public class ChannelGuide
_ => "posters"
};
artworkPath = $"{_scheme}://{_host}/iptv/artwork/{artworkFolder}/{artwork.Path}.jpg";
artworkPath = $"{_scheme}://{_host}{_baseUrl}/iptv/artwork/{artworkFolder}/{artwork.Path}.jpg";
}
return artworkPath;
ErsatzTV.Core/Iptv/ChannelPlaylist.cs
+7 -5
View File
@@ -7,12 +7,14 @@ public class ChannelPlaylist
{
private readonly List<Channel> _channels;
private readonly string _host;
private readonly string _baseUrl;
private readonly string _scheme;
public ChannelPlaylist(string scheme, string host, List<Channel> channels)
public ChannelPlaylist(string scheme, string host, string baseUrl, List<Channel> channels)
{
_scheme = scheme;
_host = host;
_baseUrl = baseUrl;
_channels = channels;
}
@@ -20,7 +22,7 @@ public class ChannelPlaylist
{
var sb = new StringBuilder();
var xmltv = $"{_scheme}://{_host}/iptv/xmltv.xml";
string xmltv = $"{_scheme}://{_host}{_baseUrl}/iptv/xmltv.xml";
sb.AppendLine($"#EXTM3U url-tvg=\"{xmltv}\" x-tvg-url=\"{xmltv}\"");
foreach (Channel channel in _channels.OrderBy(c => decimal.Parse(c.Number)))
{
@@ -28,8 +30,8 @@ public class ChannelPlaylist
.Filter(a => a.ArtworkKind == ArtworkKind.Logo)
.HeadOrNone()
.Match(
artwork => $"{_scheme}://{_host}/iptv/logos/{artwork.Path}.jpg",
() => $"{_scheme}://{_host}/iptv/images/ersatztv-500.png");
artwork => $"{_scheme}://{_host}{_baseUrl}/iptv/logos/{artwork.Path}.jpg",
() => $"{_scheme}://{_host}{_baseUrl}/iptv/images/ersatztv-500.png");
string shortUniqueId = Convert.ToBase64String(channel.UniqueId.ToByteArray())
.TrimEnd('=')
@@ -49,7 +51,7 @@ public class ChannelPlaylist
sb.AppendLine(
$"#EXTINF:0 tvg-id=\"{channel.Number}.etv\" channel-id=\"{shortUniqueId}\" channel-number=\"{channel.Number}\" CUID=\"{shortUniqueId}\" tvg-chno=\"{channel.Number}\" tvg-name=\"{channel.Name}\" tvg-logo=\"{logo}\" group-title=\"{channel.Group}\" tvc-stream-vcodec=\"{vcodec}\" tvc-stream-acodec=\"{acodec}\", {channel.Name}");
sb.AppendLine($"{_scheme}://{_host}/iptv/channel/{channel.Number}.{format}");
sb.AppendLine($"{_scheme}://{_host}{_baseUrl}/iptv/channel/{channel.Number}.{format}");
}
return sb.ToString();