alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-02 00:11:55 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

restore video grouping feature

Browse Source
This commit is contained in:
Luke Pulverenti
2015-10-19 22:06:05 -04:00
parent 51c3f270ae
commit 994cc020f8
4 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -433,6 +433,7 @@ namespace MediaBrowser.Server.Implementations.Channels
}
var item = _libraryManager.GetItemById(id) as Channel;
var channelId = channelInfo.Name.GetMD5().ToString("N");
if (item == null)
{
@@ -443,13 +444,12 @@ namespace MediaBrowser.Server.Implementations.Channels
DateCreated = _fileSystem.GetCreationTimeUtc(path),
DateModified = _fileSystem.GetLastWriteTimeUtc(path),
Path = path,
ChannelId = channelInfo.Name.GetMD5().ToString("N")
ChannelId = channelId
};
isNew = true;
}
var channelId = channelInfo.Name.GetMD5().ToString("N");
if (!string.Equals(item.ChannelId, channelId, StringComparison.OrdinalIgnoreCase))
{
isNew = true;
@@ -459,7 +459,7 @@ namespace MediaBrowser.Server.Implementations.Channels
item.Overview = channelInfo.Description;
item.HomePageUrl = channelInfo.HomePageUrl;
if (string.IsNullOrEmpty(item.Name))
if (string.IsNullOrWhiteSpace(item.Name))
{
item.Name = channelInfo.Name;
}
@@ -497,9 +497,14 @@ namespace MediaBrowser.Server.Implementations.Channels
public IEnumerable<ChannelFeatures> GetAllChannelFeatures()
{
return GetAllChannels()
.Select(GetChannelEntity)
.OrderBy(i => i.SortName)
var inputItems = _libraryManager.GetItems(new InternalItemsQuery
{
IncludeItemTypes = new[] { typeof(Channel).Name },
SortBy = new[] { ItemSortBy.SortName }
}).Items;
return inputItems
.Select(i => GetChannelFeatures(i.Id.ToString("N")));
}