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

update intro provider

Browse Source
This commit is contained in:
Luke Pulverenti 2015-11-17 12:46:15 -05:00
parent 6186d2809f
commit 2c52712c4e
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
MediaBrowser.Server.Implementations/Intros/DefaultIntroProvider.cs
View File

@ -166,7 +166,7 @@ namespace MediaBrowser.Server.Implementations.Intros
private IEnumerable<IntroInfo> GetResult(BaseItem item, IEnumerable<ItemWithTrailer> candidates, CinemaModeConfiguration config, int? ratingLevel)
{
var customIntros = !string.IsNullOrWhiteSpace(config.CustomIntroPath) ?
GetCustomIntros(item) :
GetCustomIntros(config) :
new List<IntroInfo>();
var trailerLimit = config.TrailerLimit;
@ -215,11 +215,11 @@ namespace MediaBrowser.Server.Implementations.Intros
return _serverConfig.GetConfiguration<CinemaModeConfiguration>("cinemamode");
}
private List<IntroInfo> GetCustomIntros(BaseItem item)
private List<IntroInfo> GetCustomIntros(CinemaModeConfiguration options)
{
try
{
return GetCustomIntroFiles()
return GetCustomIntroFiles(options, true, false)
.OrderBy(i => Guid.NewGuid())
.Select(i => new IntroInfo
{
@ -233,24 +233,22 @@ namespace MediaBrowser.Server.Implementations.Intros
}
}
private IEnumerable<string> GetCustomIntroFiles(CinemaModeConfiguration options = null)
private IEnumerable<string> GetCustomIntroFiles(CinemaModeConfiguration options, bool enableCustomIntros, bool enableMediaInfoIntros)
{
options = options ?? GetOptions();
var list = new List<string>();
if (!string.IsNullOrWhiteSpace(options.CustomIntroPath))
if (enableCustomIntros && !string.IsNullOrWhiteSpace(options.CustomIntroPath))
{
list.AddRange(_fileSystem.GetFilePaths(options.CustomIntroPath, true)
.Where(_libraryManager.IsVideoFile));
}
if (!string.IsNullOrWhiteSpace(options.MediaInfoIntroPath))
if (enableMediaInfoIntros && !string.IsNullOrWhiteSpace(options.MediaInfoIntroPath))
{
list.AddRange(_fileSystem.GetFilePaths(options.MediaInfoIntroPath, true)
.Where(_libraryManager.IsVideoFile));
}
return list.Distinct(StringComparer.OrdinalIgnoreCase);
}
@ -352,7 +350,7 @@ namespace MediaBrowser.Server.Implementations.Intros
public IEnumerable<string> GetAllIntroFiles()
{
return GetCustomIntroFiles();
return GetCustomIntroFiles(GetOptions(), true, true);
}
private bool IsSupporter