pimhwang
/
ErsatzTV
mirror of https://github.com/ErsatzTV/ErsatzTV.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

properly encode xmltv fragments (#1597)

pull/1598/head
Jason Dove 2 years ago committed by GitHub
parent
69f9b6f137
commit
3ec610d65f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 88 additions and 54 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 103
      ErsatzTV.Application/Channels/Commands/RefreshChannelDataHandler.cs
  2. 25
      ErsatzTV.Application/Channels/Commands/RefreshChannelListHandler.cs
  3. 14
      ErsatzTV.Application/Channels/XmlTemplateContext.cs

103
ErsatzTV.Application/Channels/Commands/RefreshChannelDataHandler.cs
Unescape View File

@ -13,6 +13,7 @@ using Microsoft.Extensions.Logging;
using Microsoft.IO; using Microsoft.IO;
using Newtonsoft.Json; using Newtonsoft.Json;
using Scriban; using Scriban;
using Scriban.Runtime;
using WebMarkupMin.Core; using WebMarkupMin.Core;
namespace ErsatzTV.Application.Channels; namespace ErsatzTV.Application.Channels;
@ -54,6 +55,8 @@ public class RefreshChannelDataHandler : IRequestHandler<RefreshChannelData>
RemoveXmlComments = true, RemoveXmlComments = true,
CollapseTagsWithoutContent = true CollapseTagsWithoutContent = true
}); });
var templateContext = new XmlTemplateContext();
string movieText = await File.ReadAllTextAsync(movieTemplateFileName, cancellationToken); string movieText = await File.ReadAllTextAsync(movieTemplateFileName, cancellationToken);
var movieTemplate = Template.Parse(movieText, movieTemplateFileName); var movieTemplate = Template.Parse(movieText, movieTemplateFileName);
@ -213,26 +216,31 @@ public class RefreshChannelDataHandler : IRequestHandler<RefreshChannelData>
.HeadOrNone() .HeadOrNone()
.Match(a => GetArtworkUrl(a, ArtworkKind.Poster), () => string.Empty); .Match(a => GetArtworkUrl(a, ArtworkKind.Poster), () => string.Empty);
string result = await movieTemplate.RenderAsync( var data = new
new {
{ ProgrammeStart = start,
ProgrammeStart = start, ProgrammeStop = stop,
ProgrammeStop = stop, ChannelNumber = request.ChannelNumber,
ChannelNumber = request.ChannelNumber, HasCustomTitle = hasCustomTitle,
HasCustomTitle = hasCustomTitle, CustomTitle = displayItem.CustomTitle,
CustomTitle = displayItem.CustomTitle, MovieTitle = title,
MovieTitle = title, MovieHasPlot = !string.IsNullOrWhiteSpace(metadata.Plot),
MovieHasPlot = !string.IsNullOrWhiteSpace(metadata.Plot), MoviePlot = metadata.Plot,
MoviePlot = metadata.Plot, MovieHasYear = metadata.Year.HasValue,
MovieHasYear = metadata.Year.HasValue, MovieYear = metadata.Year,
MovieYear = metadata.Year, MovieGenres = metadata.Genres.Map(g => g.Name).OrderBy(n => n),
MovieGenres = metadata.Genres.Map(g => g.Name).OrderBy(n => n), MovieHasArtwork = !string.IsNullOrWhiteSpace(poster),
MovieHasArtwork = !string.IsNullOrWhiteSpace(poster), MovieArtworkUrl = poster,
MovieArtworkUrl = poster, MovieHasContentRating = !string.IsNullOrWhiteSpace(metadata.ContentRating),
MovieHasContentRating = !string.IsNullOrWhiteSpace(metadata.ContentRating), MovieContentRating = metadata.ContentRating,
MovieContentRating = metadata.ContentRating, MovieGuids = metadata.Guids.Map(g => g.Guid)
MovieGuids = metadata.Guids.Map(g => g.Guid) };
});
var scriptObject = new ScriptObject();
scriptObject.Import(data);
templateContext.PushGlobal(scriptObject);
string result = await movieTemplate.RenderAsync(templateContext);
MarkupMinificationResult minified = minifier.Minify(result); MarkupMinificationResult minified = minifier.Minify(result);
await xml.WriteRawAsync(minified.MinifiedContent); await xml.WriteRawAsync(minified.MinifiedContent);
@ -257,31 +265,36 @@ public class RefreshChannelDataHandler : IRequestHandler<RefreshChannelData>
string artworkPath = GetPrioritizedArtworkPath(metadata); string artworkPath = GetPrioritizedArtworkPath(metadata);
string result = await episodeTemplate.RenderAsync( var data = new
new {
{ ProgrammeStart = start,
ProgrammeStart = start, ProgrammeStop = stop,
ProgrammeStop = stop, ChannelNumber = request.ChannelNumber,
ChannelNumber = request.ChannelNumber, HasCustomTitle = hasCustomTitle,
HasCustomTitle = hasCustomTitle, CustomTitle = displayItem.CustomTitle,
CustomTitle = displayItem.CustomTitle, ShowTitle = title,
ShowTitle = title, EpisodeHasTitle = !string.IsNullOrWhiteSpace(subtitle),
EpisodeHasTitle = !string.IsNullOrWhiteSpace(subtitle), EpisodeTitle = subtitle,
EpisodeTitle = subtitle, EpisodeHasPlot = !string.IsNullOrWhiteSpace(metadata.Plot),
EpisodeHasPlot = !string.IsNullOrWhiteSpace(metadata.Plot), EpisodePlot = metadata.Plot,
EpisodePlot = metadata.Plot, ShowHasYear = showMetadata.Year.HasValue,
ShowHasYear = showMetadata.Year.HasValue, ShowYear = showMetadata.Year,
ShowYear = showMetadata.Year, ShowGenres = showMetadata.Genres.Map(g => g.Name).OrderBy(n => n),
ShowGenres = showMetadata.Genres.Map(g => g.Name).OrderBy(n => n), EpisodeHasArtwork = !string.IsNullOrWhiteSpace(artworkPath),
EpisodeHasArtwork = !string.IsNullOrWhiteSpace(artworkPath), EpisodeArtworkUrl = artworkPath,
EpisodeArtworkUrl = artworkPath, SeasonNumber = templateEpisode.Season?.SeasonNumber ?? 0,
SeasonNumber = templateEpisode.Season?.SeasonNumber ?? 0, EpisodeNumber = metadata.EpisodeNumber,
EpisodeNumber = metadata.EpisodeNumber, ShowHasContentRating = !string.IsNullOrWhiteSpace(showMetadata.ContentRating),
ShowHasContentRating = !string.IsNullOrWhiteSpace(showMetadata.ContentRating), ShowContentRating = showMetadata.ContentRating,
ShowContentRating = showMetadata.ContentRating, ShowGuids = showMetadata.Guids.Map(g => g.Guid),
ShowGuids = showMetadata.Guids.Map(g => g.Guid), EpisodeGuids = metadata.Guids.Map(g => g.Guid)
EpisodeGuids = metadata.Guids.Map(g => g.Guid) };
});
var scriptObject = new ScriptObject();
scriptObject.Import(data);
templateContext.PushGlobal(scriptObject);
string result = await episodeTemplate.RenderAsync(templateContext);
MarkupMinificationResult minified = minifier.Minify(result); MarkupMinificationResult minified = minifier.Minify(result);
await xml.WriteRawAsync(minified.MinifiedContent); await xml.WriteRawAsync(minified.MinifiedContent);

25
ErsatzTV.Application/Channels/Commands/RefreshChannelListHandler.cs
Unescape View File

@ -8,6 +8,7 @@ using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Microsoft.IO; using Microsoft.IO;
using Scriban; using Scriban;
using Scriban.Runtime;
using WebMarkupMin.Core; using WebMarkupMin.Core;
namespace ErsatzTV.Application.Channels; namespace ErsatzTV.Application.Channels;
@ -65,6 +66,7 @@ public class RefreshChannelListHandler : IRequestHandler<RefreshChannelList>
string text = await File.ReadAllTextAsync(templateFileName, cancellationToken); string text = await File.ReadAllTextAsync(templateFileName, cancellationToken);
var template = Template.Parse(text, templateFileName); var template = Template.Parse(text, templateFileName);
var templateContext = new XmlTemplateContext();
await using RecyclableMemoryStream ms = _recyclableMemoryStreamManager.GetStream(); await using RecyclableMemoryStream ms = _recyclableMemoryStreamManager.GetStream();
await using var xml = XmlWriter.Create( await using var xml = XmlWriter.Create(
@ -73,15 +75,20 @@ public class RefreshChannelListHandler : IRequestHandler<RefreshChannelList>
await foreach (ChannelResult channel in GetChannels(dbContext).WithCancellation(cancellationToken)) await foreach (ChannelResult channel in GetChannels(dbContext).WithCancellation(cancellationToken))
{ {
string result = await template.RenderAsync( var data = new
new {
{ ChannelNumber = channel.Number,
ChannelNumber = channel.Number, ChannelName = channel.Name,
ChannelName = channel.Name, ChannelCategories = GetCategories(channel.Categories),
ChannelCategories = GetCategories(channel.Categories), ChannelHasArtwork = !string.IsNullOrWhiteSpace(channel.ArtworkPath),
ChannelHasArtwork = !string.IsNullOrWhiteSpace(channel.ArtworkPath), ChannelArtworkPath = channel.ArtworkPath
ChannelArtworkPath = channel.ArtworkPath };
});
var scriptObject = new ScriptObject();
scriptObject.Import(data);
templateContext.PushGlobal(scriptObject);
string result = await template.RenderAsync(templateContext);
MarkupMinificationResult minified = minifier.Minify(result); MarkupMinificationResult minified = minifier.Minify(result);
await xml.WriteRawAsync(minified.MinifiedContent); await xml.WriteRawAsync(minified.MinifiedContent);

14
ErsatzTV.Application/Channels/XmlTemplateContext.cs
Unescape View File

@ -0,0 +1,14 @@
using System.Net;
using Scriban;
using Scriban.Parsing;
namespace ErsatzTV.Application.Channels;
public class XmlTemplateContext : TemplateContext
{
public override TemplateContext Write(SourceSpan span, object textAsObject)
=> base.Write(span, textAsObject is string text ? WebUtility.HtmlEncode(text) : textAsObject);
public override ValueTask<TemplateContext> WriteAsync(SourceSpan span, object textAsObject)
=> base.WriteAsync(span, textAsObject is string text ? WebUtility.HtmlEncode(text) : textAsObject);
}
Write Preview
Loading…
Cancel
Save