starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-24 01:34:45 +03:00
Code Issues Packages Projects Releases Wiki Activity

rework collection editor

Browse Source
This commit is contained in:
Luke Pulverenti
2015-09-15 23:55:26 -04:00
parent a0fa1b5f8f
commit a2c371ec60
16 changed files with 271 additions and 359 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,7 +31,6 @@ namespace MediaBrowser.Server.Implementations.Channels
public class ChannelManager : IChannelManager, IDisposable
{
private IChannel[] _channels;
private IChannelFactory[] _factories;
private readonly IUserManager _userManager;
private readonly IUserDataManager _userDataManager;
@@ -76,10 +75,9 @@ namespace MediaBrowser.Server.Implementations.Channels
}
}
public void AddParts(IEnumerable<IChannel> channels, IEnumerable<IChannelFactory> factories)
public void AddParts(IEnumerable<IChannel> channels)
{
_channels = channels.Where(i => !(i is IFactoryChannel)).ToArray();
_factories = factories.ToArray();
_channels = channels.ToArray();
}
public string ChannelDownloadPath
@@ -99,20 +97,7 @@ namespace MediaBrowser.Server.Implementations.Channels
private IEnumerable<IChannel> GetAllChannels()
{
return _factories
.SelectMany(i =>
{
try
{
return i.GetChannels().ToList();
}
catch (Exception ex)
{
_logger.ErrorException("Error getting channel list", ex);
return new List<IChannel>();
}
})
.Concat(_channels)
return _channels
.OrderBy(i => i.Name);
}