lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed boolean options to enums

Browse Source
This commit is contained in:
Matthew Jones 2022-01-26 16:09:05 +00:00
parent 61d8d40a4a
commit 91d143d6ee
3 changed files with 34 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
MediaBrowser.Model/Configuration/EmbeddedSubtitleOptions.cs Normal file
View File

@ -0,0 +1,30 @@
namespace MediaBrowser.Model.Configuration
{
/// <summary>
/// An enum representing the options to disable embedded subs.
/// </summary>
public enum EmbeddedSubtitleOptions
{
/// <summary>
/// Allow all embedded subs.
/// </summary>
AllowAll,
/// <summary>
/// Allow only embedded subs that are text based.
/// </summary>
AllowText,
/// <summary>
/// Allow only embedded subs that are image based.
/// </summary>
AllowImage,
/// <summary>
/// Disable all embedded subs.
/// </summary>
AllowNone,
}
}

5
MediaBrowser.Model/Configuration/LibraryOptions.cs
View File

@ -15,6 +15,7 @@ namespace MediaBrowser.Model.Configuration
SkipSubtitlesIfAudioTrackMatches = true;
RequirePerfectSubtitleMatch = true;
AllowEmbeddedSubtitles = EmbeddedSubtitleOptions.AllowAll;
AutomaticallyAddToCollection = true;
EnablePhotos = true;
@ -84,9 +85,7 @@ namespace MediaBrowser.Model.Configuration
public bool AutomaticallyAddToCollection { get; set; }
public bool DisableEmbeddedTextSubtitles { get; set; }
public bool DisableEmbeddedImageSubtitles { get; set; }
public EmbeddedSubtitleOptions AllowEmbeddedSubtitles { get; set; }
public TypeOptions[] TypeOptions { get; set; }

4
MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs
View File

@ -229,13 +229,13 @@ namespace MediaBrowser.Providers.MediaInfo
video.Video3DFormat ??= mediaInfo.Video3DFormat;
}
if (libraryOptions.DisableEmbeddedImageSubtitles)
if (libraryOptions.AllowEmbeddedSubtitles == EmbeddedSubtitleOptions.AllowText || libraryOptions.AllowEmbeddedSubtitles == EmbeddedSubtitleOptions.AllowNone)
{
_logger.LogDebug("Disabling embedded image subtitles for {Path} due to DisableEmbeddedImageSubtitles setting", video.Path);
mediaStreams.RemoveAll(i => i.Type == MediaStreamType.Subtitle && !i.IsExternal && !i.IsTextSubtitleStream);
}
if (libraryOptions.DisableEmbeddedTextSubtitles)
if (libraryOptions.AllowEmbeddedSubtitles == EmbeddedSubtitleOptions.AllowImage || libraryOptions.AllowEmbeddedSubtitles == EmbeddedSubtitleOptions.AllowNone)
{
_logger.LogDebug("Disabling embedded text subtitles for {Path} due to DisableEmbeddedTextSubtitles setting", video.Path);
mediaStreams.RemoveAll(i => i.Type == MediaStreamType.Subtitle && !i.IsExternal && i.IsTextSubtitleStream);