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

fixes #564 - Enforce CanSeek and QueueableMediaTypes

Browse Source
This commit is contained in:
Luke Pulverenti
2013-10-11 09:47:38 -04:00
parent 204f7f6879
commit 3cb57db7fe
4 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
MediaBrowser.Server.Implementations/Session/SessionManager.cs
View File

@@ -38,6 +38,8 @@ namespace MediaBrowser.Server.Implementations.Session
/// </summary>
private readonly ILogger _logger;
private readonly ILibraryManager _libraryManager;
/// <summary>
/// Gets or sets the configuration manager.
/// </summary>
@@ -471,6 +473,19 @@ namespace MediaBrowser.Server.Implementations.Session
{
var session = GetSessionForRemoteControl(sessionId);
if (command.PlayCommand != PlayCommand.PlayNow)
{
if (command.ItemIds.Any(i =>
{
var item = _libraryManager.GetItemById(new Guid(i));
return !session.QueueableMediaTypes.Contains(item.MediaType, StringComparer.OrdinalIgnoreCase);
}))
{
throw new ArgumentException(string.Format("Session {0} is unable to queue the requested media type.", session.Id));
}
}
return session.SessionController.SendPlayCommand(command, cancellationToken);
}
@@ -499,6 +514,11 @@ namespace MediaBrowser.Server.Implementations.Session
{
var session = GetSessionForRemoteControl(sessionId);
if (command.Command == PlaystateCommand.Seek && !session.CanSeek)
{
throw new ArgumentException(string.Format("Session {0} is unable to seek.", session.Id));
}
return session.SessionController.SendPlaystateCommand(command, cancellationToken);
}