mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-06 03:26:07 +02:00
update channels
This commit is contained in:
parent
ec1f721a99
commit
8c8ad20465
2 changed files with 1 additions and 15 deletions
|
@ -29,8 +29,6 @@ namespace MediaBrowser.Model.Configuration
|
||||||
|
|
||||||
public bool GroupMoviesIntoBoxSets { get; set; }
|
public bool GroupMoviesIntoBoxSets { get; set; }
|
||||||
|
|
||||||
public string[] DisplayChannelsWithinViews { get; set; }
|
|
||||||
|
|
||||||
public string[] ExcludeFoldersFromGrouping { get; set; }
|
public string[] ExcludeFoldersFromGrouping { get; set; }
|
||||||
public string[] GroupedFolders { get; set; }
|
public string[] GroupedFolders { get; set; }
|
||||||
|
|
||||||
|
@ -50,7 +48,6 @@ namespace MediaBrowser.Model.Configuration
|
||||||
public string[] PlainFolderViews { get; set; }
|
public string[] PlainFolderViews { get; set; }
|
||||||
|
|
||||||
public bool HidePlayedInLatest { get; set; }
|
public bool HidePlayedInLatest { get; set; }
|
||||||
public bool DisplayChannelsInline { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Initializes a new instance of the <see cref="UserConfiguration" /> class.
|
/// Initializes a new instance of the <see cref="UserConfiguration" /> class.
|
||||||
|
@ -62,8 +59,6 @@ namespace MediaBrowser.Model.Configuration
|
||||||
|
|
||||||
LatestItemsExcludes = new string[] { };
|
LatestItemsExcludes = new string[] { };
|
||||||
OrderedViews = new string[] { };
|
OrderedViews = new string[] { };
|
||||||
DisplayChannelsWithinViews = new string[] { };
|
|
||||||
DisplayChannelsInline = true;
|
|
||||||
|
|
||||||
PlainFolderViews = new string[] { };
|
PlainFolderViews = new string[] { };
|
||||||
|
|
||||||
|
|
|
@ -163,16 +163,7 @@ namespace MediaBrowser.Server.Implementations.Library
|
||||||
|
|
||||||
var channels = channelResult.Items;
|
var channels = channelResult.Items;
|
||||||
|
|
||||||
var embeddedChannels = channels
|
list.AddRange(channels);
|
||||||
.Where(i => user.Configuration.DisplayChannelsInline || user.Configuration.DisplayChannelsWithinViews.Contains(i.Id.ToString("N")))
|
|
||||||
.ToList();
|
|
||||||
|
|
||||||
list.AddRange(embeddedChannels);
|
|
||||||
|
|
||||||
if (channels.Length > embeddedChannels.Count)
|
|
||||||
{
|
|
||||||
list.Add(await _channelManager.GetInternalChannelFolder(cancellationToken).ConfigureAwait(false));
|
|
||||||
}
|
|
||||||
|
|
||||||
if (_liveTvManager.GetEnabledUsers().Select(i => i.Id.ToString("N")).Contains(query.UserId))
|
if (_liveTvManager.GetEnabledUsers().Select(i => i.Id.ToString("N")).Contains(query.UserId))
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue