alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-05-31 04:48:27 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

fix(external-media): implement review suggestions

Browse Source
This commit is contained in:
Shadowghost
2022-02-17 09:03:08 +01:00
parent 719b707281
commit a36e34fbd2
8 changed files with 127 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Emby.Naming/ExternalFiles/ExternalPathParser.cs
View File

@@ -9,7 +9,7 @@ using MediaBrowser.Model.Globalization;
namespace Emby.Naming.ExternalFiles
{
/// <summary>
/// External file parser class.
/// External media file parser class.
/// </summary>
public class ExternalPathParser
{
@@ -44,9 +44,8 @@ namespace Emby.Naming.ExternalFiles
}
var extension = Path.GetExtension(path);
if (!((_type == DlnaProfileType.Subtitle && _namingOptions.SubtitleFileExtensions.Contains(extension, StringComparison.OrdinalIgnoreCase))
|| (_type == DlnaProfileType.Audio && _namingOptions.AudioFileExtensions.Contains(extension, StringComparison.OrdinalIgnoreCase))
|| (_type == DlnaProfileType.Video && _namingOptions.VideoFileExtensions.Contains(extension, StringComparison.OrdinalIgnoreCase))))
if (!(_type == DlnaProfileType.Subtitle && _namingOptions.SubtitleFileExtensions.Contains(extension, StringComparison.OrdinalIgnoreCase))
&& !(_type == DlnaProfileType.Audio && _namingOptions.AudioFileExtensions.Contains(extension, StringComparison.OrdinalIgnoreCase)))
{
return null;
}
@@ -66,7 +65,7 @@ namespace Emby.Naming.ExternalFiles
while (languageString.Length > 0)
{
var lastSeparator = languageString.LastIndexOf(separator, StringComparison.OrdinalIgnoreCase);
int lastSeparator = languageString.LastIndexOf(separator, StringComparison.OrdinalIgnoreCase);
if (lastSeparator == -1)
{
@@ -74,8 +73,9 @@ namespace Emby.Naming.ExternalFiles
}
string currentSlice = languageString[lastSeparator..];
string currentSliceWithoutSeparator = currentSlice[separatorLength..];
if (_namingOptions.MediaDefaultFlags.Any(s => currentSlice[separatorLength..].Contains(s, StringComparison.OrdinalIgnoreCase)))
if (_namingOptions.MediaDefaultFlags.Any(s => currentSliceWithoutSeparator.Contains(s, StringComparison.OrdinalIgnoreCase)))
{
pathInfo.IsDefault = true;
extraString = extraString.Replace(currentSlice, string.Empty, StringComparison.OrdinalIgnoreCase);
@@ -83,7 +83,7 @@ namespace Emby.Naming.ExternalFiles
continue;
}
if (_namingOptions.MediaForcedFlags.Any(s => currentSlice[separatorLength..].Contains(s, StringComparison.OrdinalIgnoreCase)))
if (_namingOptions.MediaForcedFlags.Any(s => currentSliceWithoutSeparator.Contains(s, StringComparison.OrdinalIgnoreCase)))
{
pathInfo.IsForced = true;
extraString = extraString.Replace(currentSlice, string.Empty, StringComparison.OrdinalIgnoreCase);
@@ -92,7 +92,7 @@ namespace Emby.Naming.ExternalFiles
}
// Try to translate to three character code
var culture = _localizationManager.FindLanguageInfo(currentSlice[separatorLength..]);
var culture = _localizationManager.FindLanguageInfo(currentSliceWithoutSeparator);
if (culture != null && pathInfo.Language == null)
{