alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-20 09:04:42 +01:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix dlna playlist

Browse Source
This commit is contained in:
Luke Pulverenti
2015-10-19 11:33:49 -04:00
parent 79a7e907d4
commit 8523d0aa2b
5 changed files with 45 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
MediaBrowser.Server.Implementations/Channels/ChannelManager.cs
View File

@@ -140,8 +140,23 @@ namespace MediaBrowser.Server.Implementations.Channels
if (user != null)
{
channels = channels.Where(i => GetChannelProvider(i).IsEnabledFor(user.Id.ToString("N")) && i.IsVisible(user))
.ToList();
channels = channels.Where(i =>
{
if (!i.IsVisible(user))
{
return false;
}
try
{
return GetChannelProvider(i).IsEnabledFor(user.Id.ToString("N"));
}
catch
{
return false;
}
}).ToList();
}
var all = channels;

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

@@ -83,8 +83,16 @@ namespace MediaBrowser.Server.Implementations.Intros
if (config.EnableIntrosFromMoviesInLibrary)
{
var itemsWithTrailers = user.RootFolder
.GetRecursiveChildren(user, i =>
var inputItems = _libraryManager.GetItems(new InternalItemsQuery
{
IncludeItemTypes = new[] { typeof(Movie).Name },
User = user
}).Items;
var itemsWithTrailers = inputItems
.Where(i =>
{
var hasTrailers = i as IHasTrailers;

17
MediaBrowser.Server.Implementations/Library/MusicManager.cs
View File

@@ -78,10 +78,19 @@ namespace MediaBrowser.Server.Implementations.Library
public IEnumerable<Audio> GetInstantMixFromGenres(IEnumerable<string> genres, User user)
{
var inputItems = user.RootFolder
.GetRecursiveChildren(user, i => i is Audio);
var genreList = genres.ToList();
var genresDictionary = genres.ToDictionary(i => i, StringComparer.OrdinalIgnoreCase);
var inputItems = _libraryManager.GetItems(new InternalItemsQuery
{
IncludeItemTypes = new[] { typeof(Audio).Name },
Genres = genreList.ToArray(),
User = user
}).Items;
var genresDictionary = genreList.ToDictionary(i => i, StringComparer.OrdinalIgnoreCase);
return inputItems
.Cast<Audio>()
@@ -131,7 +140,7 @@ namespace MediaBrowser.Server.Implementations.Library
{
return GetInstantMixFromFolder(folder, user);
}
return new Audio[] { };
}
}