alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-06-08 00:39:25 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

add error handling to dlna channel support

Browse Source
This commit is contained in:
Luke Pulverenti
2014-07-31 20:37:06 -04:00
parent a37a11c486
commit 3fa2a001c7
46 changed files with 1689 additions and 439 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
MediaBrowser.Dlna/ContentDirectory/ControlHandler.cs
View File

@@ -358,29 +358,45 @@ namespace MediaBrowser.Dlna.ContentDirectory
if (channel != null)
{
return await _channelManager.GetChannelItemsInternal(new ChannelItemQuery
try
{
ChannelId = channel.Id.ToString("N"),
Limit = limit,
StartIndex = startIndex,
UserId = user.Id.ToString("N")
// Don't blow up here because it could cause parent screens with other content to fail
return await _channelManager.GetChannelItemsInternal(new ChannelItemQuery
{
ChannelId = channel.Id.ToString("N"),
Limit = limit,
StartIndex = startIndex,
UserId = user.Id.ToString("N")
}, CancellationToken.None);
}, CancellationToken.None);
}
catch
{
// Already logged at lower levels
}
}
var channelFolderItem = folder as ChannelFolderItem;
if (channelFolderItem != null)
{
return await _channelManager.GetChannelItemsInternal(new ChannelItemQuery
try
{
ChannelId = channelFolderItem.ChannelId,
FolderId = channelFolderItem.Id.ToString("N"),
Limit = limit,
StartIndex = startIndex,
UserId = user.Id.ToString("N")
// Don't blow up here because it could cause parent screens with other content to fail
return await _channelManager.GetChannelItemsInternal(new ChannelItemQuery
{
ChannelId = channelFolderItem.ChannelId,
FolderId = channelFolderItem.Id.ToString("N"),
Limit = limit,
StartIndex = startIndex,
UserId = user.Id.ToString("N")
}, CancellationToken.None);
}, CancellationToken.None);
}
catch
{
// Already logged at lower levels
}
}
return ToResult(GetPlainFolderChildrenSorted(folder, user, sort), startIndex, limit);