Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-09 03:04:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Require delimiter immediately after filename match

Browse Source
This commit is contained in:
Joe Rogers 2022-02-21 22:08:54 +01:00
parent 15053516f8
commit cf033b25f8
No known key found for this signature in database
GPG Key ID: 0074AD57B8FDBBB4
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
MediaBrowser.Providers/MediaInfo/MediaInfoResolver.cs
View File

@ -43,6 +43,11 @@ namespace MediaBrowser.Providers.MediaInfo
/// </summary> /// </summary>
private readonly IMediaEncoder _mediaEncoder; private readonly IMediaEncoder _mediaEncoder;
/// <summary>
/// The <see cref="NamingOptions"/> instance.
/// </summary>
private readonly NamingOptions _namingOptions;
/// <summary> /// <summary>
/// The <see cref="DlnaProfileType"/> of the files this resolver should resolve. /// The <see cref="DlnaProfileType"/> of the files this resolver should resolve.
/// </summary> /// </summary>
@ -62,6 +67,7 @@ namespace MediaBrowser.Providers.MediaInfo
DlnaProfileType type) DlnaProfileType type)
{ {
_mediaEncoder = mediaEncoder; _mediaEncoder = mediaEncoder;
_namingOptions = namingOptions;
_type = type; _type = type;
_externalPathParser = new ExternalPathParser(namingOptions, localizationManager, _type); _externalPathParser = new ExternalPathParser(namingOptions, localizationManager, _type);
} }
@ -159,9 +165,11 @@ namespace MediaBrowser.Providers.MediaInfo
foreach (var file in files) foreach (var file in files)
{ {
if (_compareInfo.IsPrefix(Path.GetFileNameWithoutExtension(file), video.FileNameWithoutExtension, CompareOptions, out int matchLength)) var fileNameWithoutExtension = Path.GetFileNameWithoutExtension(file);
if (_compareInfo.IsPrefix(fileNameWithoutExtension, video.FileNameWithoutExtension, CompareOptions, out int matchLength)
&& (fileNameWithoutExtension.Length == matchLength || _namingOptions.MediaFlagDelimiters.Contains(fileNameWithoutExtension[matchLength].ToString())))
{ {
var externalPathInfo = _externalPathParser.ParseFile(file, Path.GetFileNameWithoutExtension(file)[matchLength..]); var externalPathInfo = _externalPathParser.ParseFile(file, fileNameWithoutExtension[matchLength..]);
if (externalPathInfo != null) if (externalPathInfo != null)
{ {

2
tests/Jellyfin.Providers.Tests/MediaInfo/MediaInfoResolverTests.cs
View File

@ -113,7 +113,7 @@ public class MediaInfoResolverTests
[InlineData("My.Video.mp3")] [InlineData("My.Video.mp3")]
[InlineData("My.Video.png")] [InlineData("My.Video.png")]
[InlineData("My.Video.txt")] [InlineData("My.Video.txt")]
// [InlineData("My.Video Sequel.srt")] [InlineData("My.Video Sequel.srt")]
[InlineData("Some.Other.Video.srt")] [InlineData("Some.Other.Video.srt")]
public void GetExternalFiles_FuzzyMatching_RejectsNonMatches(string file) public void GetExternalFiles_FuzzyMatching_RejectsNonMatches(string file)
{ {