diff --git a/ErsatzTV.Core/FFmpeg/ConcatPlaylist.cs b/ErsatzTV.Core/FFmpeg/ConcatPlaylist.cs index 1817fdd2b..71651c734 100644 --- a/ErsatzTV.Core/FFmpeg/ConcatPlaylist.cs +++ b/ErsatzTV.Core/FFmpeg/ConcatPlaylist.cs @@ -4,7 +4,7 @@ { public override string ToString() => $@"ffconcat version 1.0 -file {Scheme}://{Host}/ffmpeg/stream/{ChannelNumber} -file {Scheme}://{Host}/ffmpeg/stream/{ChannelNumber}"; +file http://localhost:8409/ffmpeg/stream/{ChannelNumber} +file http://localhost:8409/ffmpeg/stream/{ChannelNumber}"; } } diff --git a/ErsatzTV.Core/Iptv/ChannelGuide.cs b/ErsatzTV.Core/Iptv/ChannelGuide.cs index 2a9c3da72..b66fd9f3f 100644 --- a/ErsatzTV.Core/Iptv/ChannelGuide.cs +++ b/ErsatzTV.Core/Iptv/ChannelGuide.cs @@ -48,7 +48,7 @@ namespace ErsatzTV.Core.Iptv .HeadOrNone() .Match( artwork => $"{_scheme}://{_host}/iptv/logos/{artwork.Path}", - () => $"{_scheme}://{_host}/images/ersatztv-500.png"); + () => $"{_scheme}://{_host}/iptv/images/ersatztv-500.png"); xml.WriteAttributeString("src", logo); xml.WriteEndElement(); // icon @@ -122,7 +122,7 @@ namespace ErsatzTV.Core.Iptv .Filter(a => a.ArtworkKind == ArtworkKind.Poster) .HeadOrNone() .Match( - artwork => $"{_scheme}://{_host}/artwork/posters/{artwork.Path}", + artwork => $"{_scheme}://{_host}/iptv/artwork/posters/{artwork.Path}", () => string.Empty); if (!string.IsNullOrWhiteSpace(poster)) @@ -161,7 +161,7 @@ namespace ErsatzTV.Core.Iptv .Filter(a => a.ArtworkKind == ArtworkKind.Poster) .HeadOrNone() .Match( - artwork => $"{_scheme}://{_host}/artwork/posters/{artwork.Path}", + artwork => $"{_scheme}://{_host}/iptv/artwork/posters/{artwork.Path}", () => string.Empty); if (!string.IsNullOrWhiteSpace(poster)) diff --git a/ErsatzTV.Core/Iptv/ChannelPlaylist.cs b/ErsatzTV.Core/Iptv/ChannelPlaylist.cs index 752de754f..827132b92 100644 --- a/ErsatzTV.Core/Iptv/ChannelPlaylist.cs +++ b/ErsatzTV.Core/Iptv/ChannelPlaylist.cs @@ -33,7 +33,7 @@ namespace ErsatzTV.Core.Iptv .HeadOrNone() .Match( artwork => $"{_scheme}://{_host}/iptv/logos/{artwork.Path}", - () => $"{_scheme}://{_host}/images/ersatztv-500.png"); + () => $"{_scheme}://{_host}/iptv/images/ersatztv-500.png"); string shortUniqueId = Convert.ToBase64String(channel.UniqueId.ToByteArray()) .TrimEnd('=') diff --git a/ErsatzTV/Controllers/ArtworkController.cs b/ErsatzTV/Controllers/ArtworkController.cs index ba4e116a6..d47a77792 100644 --- a/ErsatzTV/Controllers/ArtworkController.cs +++ b/ErsatzTV/Controllers/ArtworkController.cs @@ -27,7 +27,8 @@ namespace ErsatzTV.Controllers _mediator = mediator; _httpClientFactory = httpClientFactory; } - + + [HttpGet("/iptv/artwork/posters/{fileName}")] [HttpGet("/artwork/posters/{fileName}")] public async Task GetPoster(string fileName) { @@ -48,6 +49,7 @@ namespace ErsatzTV.Controllers Right: r => new FileContentResult(r.Contents, r.MimeType)); } + [HttpGet("/iptv/artwork/posters/plex/{plexMediaSourceId}/{*path}")] [HttpGet("/artwork/posters/plex/{plexMediaSourceId}/{*path}")] public Task GetPlexPoster(int plexMediaSourceId, string path) => GetPlexArtwork( diff --git a/ErsatzTV/wwwroot/iptv/images/ersatztv-500.png b/ErsatzTV/wwwroot/iptv/images/ersatztv-500.png new file mode 100644 index 000000000..9e0a8b4e2 Binary files /dev/null and b/ErsatzTV/wwwroot/iptv/images/ersatztv-500.png differ