From ca5112f45a724fa24a420fa2b62c0849f99ff756 Mon Sep 17 00:00:00 2001 From: Shadowghost Date: Thu, 27 Jan 2022 14:21:53 +0100 Subject: feat(external-media): refactor external subtitle and audio provider --- Emby.Naming/Common/NamingOptions.cs | 49 +++++++++++++++++++++++++++++-------- 1 file changed, 39 insertions(+), 10 deletions(-) (limited to 'Emby.Naming/Common/NamingOptions.cs') diff --git a/Emby.Naming/Common/NamingOptions.cs b/Emby.Naming/Common/NamingOptions.cs index eb211050f1..82a3ad2b7b 100644 --- a/Emby.Naming/Common/NamingOptions.cs +++ b/Emby.Naming/Common/NamingOptions.cs @@ -149,10 +149,14 @@ namespace Emby.Naming.Common SubtitleFileExtensions = new[] { + ".ass", + ".smi", + ".sami", ".srt", ".ssa", - ".ass", - ".sub" + ".sub", + ".vtt", + ".mks" }; SubtitleFlagDelimiters = new[] @@ -246,6 +250,22 @@ namespace Emby.Naming.Common ".mka" }; + ExternalAudioFlagDelimiters = new[] + { + '.' + }; + + ExternalAudioForcedFlags = new[] + { + "foreign", + "forced" + }; + + ExternalAudioDefaultFlags = new[] + { + "default" + }; + EpisodeExpressions = new[] { // *** Begin Kodi Standard Naming @@ -648,9 +668,7 @@ namespace Emby.Naming.Common @"^\s*(?[^ ].*?)\s*$" }; - var extensions = VideoFileExtensions.ToList(); - - extensions.AddRange(new[] + VideoFileExtensions = new[] { ".mkv", ".m2t", @@ -681,11 +699,7 @@ namespace Emby.Naming.Common ".m2v", ".rec", ".mxf" - }); - - VideoFileExtensions = extensions - .Distinct(StringComparer.OrdinalIgnoreCase) - .ToArray(); + }; MultipleEpisodeExpressions = new[] { @@ -717,6 +731,21 @@ namespace Emby.Naming.Common /// public string[] AudioFileExtensions { get; set; } + /// + /// Gets or sets list of external audio flag delimiters. + /// + public char[] ExternalAudioFlagDelimiters { get; set; } + + /// + /// Gets or sets list of external audio forced flags. + /// + public string[] ExternalAudioForcedFlags { get; set; } + + /// + /// Gets or sets list of external audio default flags. + /// + public string[] ExternalAudioDefaultFlags { get; set; } + /// /// Gets or sets list of album stacking prefixes. /// -- cgit v1.2.3