diff options
| author | David <daullmer@gmail.com> | 2020-06-14 12:43:10 +0200 |
|---|---|---|
| committer | David <daullmer@gmail.com> | 2020-06-14 12:43:10 +0200 |
| commit | cf3d0f8d519ca1b43c78d5dde9f5b43fec6e3334 (patch) | |
| tree | e1f83eeb7920f3c68fc3d5f41242e3d24958227d /Emby.Naming/Video | |
| parent | b16da095493bc207f4196b8b61cfc768a237a5bc (diff) | |
| parent | 0011e8df47380936742302ef40639a4626a780ed (diff) | |
Merge remote-tracking branch 'remotes/upstream/api-migration' into api-system
Diffstat (limited to 'Emby.Naming/Video')
| -rw-r--r-- | Emby.Naming/Video/VideoListResolver.cs | 2 | ||||
| -rw-r--r-- | Emby.Naming/Video/VideoResolver.cs | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Emby.Naming/Video/VideoListResolver.cs b/Emby.Naming/Video/VideoListResolver.cs index 7f755fd25e..948fe037b5 100644 --- a/Emby.Naming/Video/VideoListResolver.cs +++ b/Emby.Naming/Video/VideoListResolver.cs @@ -227,7 +227,7 @@ namespace Emby.Naming.Video } return remainingFiles - .Where(i => i.ExtraType == null) + .Where(i => i.ExtraType != null) .Where(i => baseNames.Any(b => i.FileNameWithoutExtension.StartsWith(b, StringComparison.OrdinalIgnoreCase))) .ToList(); diff --git a/Emby.Naming/Video/VideoResolver.cs b/Emby.Naming/Video/VideoResolver.cs index 0b75a8cce9..b4aee614b0 100644 --- a/Emby.Naming/Video/VideoResolver.cs +++ b/Emby.Naming/Video/VideoResolver.cs @@ -89,14 +89,14 @@ namespace Emby.Naming.Video if (parseName) { var cleanDateTimeResult = CleanDateTime(name); + name = cleanDateTimeResult.Name; + year = cleanDateTimeResult.Year; if (extraResult.ExtraType == null - && TryCleanString(cleanDateTimeResult.Name, out ReadOnlySpan<char> newName)) + && TryCleanString(name, out ReadOnlySpan<char> newName)) { name = newName.ToString(); } - - year = cleanDateTimeResult.Year; } return new VideoFileInfo |