pt
/
jellyfin
mirror of https://github.com/jellyfin/jellyfin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use generated regex

This commit is contained in:
Stepan Goremykin 2023-10-08 01:16:00 +02:00
parent 6512f85ccb
commit 3259d484ff
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs
View File

@ -499,8 +499,8 @@ namespace MediaBrowser.MediaEncoding.Encoder
var required = codec == Codec.Encoder ? _requiredEncoders : _requiredDecoders; var required = codec == Codec.Encoder ? _requiredEncoders : _requiredDecoders;
var found = Regex var found = CodecRegex()
.Matches(output, @"^\s\S{6}\s(?<codec>[\w|-]+)\s+.+$", RegexOptions.Multiline) .Matches(output)
.Select(x => x.Groups["codec"].Value) .Select(x => x.Groups["codec"].Value)
.Where(x => required.Contains(x)); .Where(x => required.Contains(x));
@ -527,8 +527,8 @@ namespace MediaBrowser.MediaEncoding.Encoder
return Enumerable.Empty<string>(); return Enumerable.Empty<string>();
} }
var found = Regex var found = FilterRegex()
.Matches(output, @"^\s\S{3}\s(?<filter>[\w|-]+)\s+.+$", RegexOptions.Multiline) .Matches(output)
.Select(x => x.Groups["filter"].Value) .Select(x => x.Groups["filter"].Value)
.Where(x => _requiredFilters.Contains(x)); .Where(x => _requiredFilters.Contains(x));
@ -582,5 +582,11 @@ namespace MediaBrowser.MediaEncoding.Encoder
return reader.ReadToEnd(); return reader.ReadToEnd();
} }
} }
[GeneratedRegex("^\\s\\S{6}\\s(?<codec>[\\w|-]+)\\s+.+$", RegexOptions.Multiline)]
private static partial Regex CodecRegex();
[GeneratedRegex("^\\s\\S{3}\\s(?<filter>[\\w|-]+)\\s+.+$", RegexOptions.Multiline)]
private static partial Regex FilterRegex();
} }
} }

9
MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs
View File

@ -22,7 +22,7 @@ namespace MediaBrowser.MediaEncoding.Probing
/// <summary> /// <summary>
/// Class responsible for normalizing FFprobe output. /// Class responsible for normalizing FFprobe output.
/// </summary> /// </summary>
public class ProbeResultNormalizer public partial class ProbeResultNormalizer
{ {
// When extracting subtitles, the maximum length to consider (to avoid invalid filenames) // When extracting subtitles, the maximum length to consider (to avoid invalid filenames)
private const int MaxSubtitleDescriptionExtractionLength = 100; private const int MaxSubtitleDescriptionExtractionLength = 100;
@ -31,8 +31,6 @@ namespace MediaBrowser.MediaEncoding.Probing
private readonly char[] _nameDelimiters = { '/', '|', ';', '\\' }; private readonly char[] _nameDelimiters = { '/', '|', ';', '\\' };
private static readonly Regex _performerPattern = new(@"(?<name>.*) \((?<instrument>.*)\)");
private readonly ILogger _logger; private readonly ILogger _logger;
private readonly ILocalizationManager _localization; private readonly ILocalizationManager _localization;
@ -1215,7 +1213,7 @@ namespace MediaBrowser.MediaEncoding.Probing
{ {
foreach (var person in Split(performer, false)) foreach (var person in Split(performer, false))
{ {
Match match = _performerPattern.Match(person); Match match = PerformerRegex().Match(person);
// If the performer doesn't have any instrument/role associated, it won't match. In that case, chances are it's simply a band name, so we skip it. // If the performer doesn't have any instrument/role associated, it won't match. In that case, chances are it's simply a band name, so we skip it.
if (match.Success) if (match.Success)
@ -1654,5 +1652,8 @@ namespace MediaBrowser.MediaEncoding.Probing
return TransportStreamTimestamp.Valid; return TransportStreamTimestamp.Valid;
} }
[GeneratedRegex("(?<name>.*) \\((?<instrument>.*)\\)")]
private static partial Regex PerformerRegex();
} }
} }