diff options
| author | Cody Robibero <cody@robibe.ro> | 2023-03-20 07:16:03 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-20 07:16:03 -0600 |
| commit | dd491ce8ffe520f992dd5441d3017a0d6c622790 (patch) | |
| tree | 55b3df4f6b294d2cb449991bb2b5730555ae9eda /Emby.Naming | |
| parent | 34200a79eabf100eb2cbcbdfea20eeacb7e986c6 (diff) | |
| parent | b9f7e3971e453e9faa136de38fe45edd52df253e (diff) | |
Merge pull request #9403 from SenorSmartyPants/ExtraCleanAndNFO
Co-authored-by: Cody Robibero <cody@robibe.ro>
Diffstat (limited to 'Emby.Naming')
| -rw-r--r-- | Emby.Naming/Common/NamingOptions.cs | 3 | ||||
| -rw-r--r-- | Emby.Naming/Video/VideoResolver.cs | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Emby.Naming/Common/NamingOptions.cs b/Emby.Naming/Common/NamingOptions.cs index 39c3ceeb3..17d77837f 100644 --- a/Emby.Naming/Common/NamingOptions.cs +++ b/Emby.Naming/Common/NamingOptions.cs @@ -156,7 +156,8 @@ namespace Emby.Naming.Common @"^(?<cleaned>.+?)(\[.*\])", @"^\s*(?<cleaned>.+?)\WE[0-9]+(-|~)E?[0-9]+(\W|$)", @"^\s*\[[^\]]+\](?!\.\w+$)\s*(?<cleaned>.+)", - @"^\s*(?<cleaned>.+?)\s+-\s+[0-9]+\s*$" + @"^\s*(?<cleaned>.+?)\s+-\s+[0-9]+\s*$", + @"^\s*(?<cleaned>.+?)(([-._ ](trailer|sample))|-(scene|clip|behindthescenes|deleted|deletedscene|featurette|short|interview|other|extra))$" }; SubtitleFileExtensions = new[] diff --git a/Emby.Naming/Video/VideoResolver.cs b/Emby.Naming/Video/VideoResolver.cs index 858e9dd2f..db5bfdbf9 100644 --- a/Emby.Naming/Video/VideoResolver.cs +++ b/Emby.Naming/Video/VideoResolver.cs @@ -87,8 +87,7 @@ namespace Emby.Naming.Video name = cleanDateTimeResult.Name; year = cleanDateTimeResult.Year; - if (extraResult.ExtraType is null - && TryCleanString(name, namingOptions, out var newName)) + if (TryCleanString(name, namingOptions, out var newName)) { name = newName; } |