Firehawk52-backup/jellyfin
28
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-01-15 08:23:28 -03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9403 from SenorSmartyPants/ExtraCleanAndNFO

Browse Source 
Co-authored-by: Cody Robibero <cody@robibe.ro>
This commit is contained in:
Cody Robibero
2023-03-20 07:16:03 -06:00
committed by GitHub
parent 34200a79ea b9f7e3971e
commit dd491ce8ff
7 changed files with 45 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Emby.Naming/Common/NamingOptions.cs
View File

@@ -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[]

3
Emby.Naming/Video/VideoResolver.cs
View File

@@ -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;
}