diff options
| author | crobibero <cody@robibe.ro> | 2020-06-19 10:49:49 -0600 |
|---|---|---|
| committer | crobibero <cody@robibe.ro> | 2020-06-19 10:49:49 -0600 |
| commit | 494f6970724f3243ed5a6ebe89d756bf2759d3eb (patch) | |
| tree | 3b46944461c30fb750170534d15dc90ffa386be0 /Emby.Naming/Video | |
| parent | 000088f8f94e24ea715f15b722a2e64958bec07b (diff) | |
| parent | 305808dd0ac4f86bb1663e7f6ba2b22064ace0ba (diff) | |
Merge remote-tracking branch 'upstream/api-migration' into api-library
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 |