From 67044d2759e9895e92be4435e6111a2d1bd50e34 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Tue, 28 May 2013 13:25:10 -0400 Subject: [PATCH] added a play command --- MediaBrowser.Api/SessionsService.cs | 119 +++++++++++++++++++++++++++- 1 file changed, 116 insertions(+), 3 deletions(-) diff --git a/MediaBrowser.Api/SessionsService.cs b/MediaBrowser.Api/SessionsService.cs index bdf01f5688..1ab18a0223 100644 --- a/MediaBrowser.Api/SessionsService.cs +++ b/MediaBrowser.Api/SessionsService.cs @@ -1,5 +1,6 @@ using MediaBrowser.Common.Extensions; using MediaBrowser.Controller.Dto; +using MediaBrowser.Controller.Library; using MediaBrowser.Controller.Session; using MediaBrowser.Model.Net; using MediaBrowser.Model.Session; @@ -8,6 +9,7 @@ using System; using System.Collections.Generic; using System.Linq; using System.Threading; +using System.Threading.Tasks; namespace MediaBrowser.Api { @@ -44,7 +46,7 @@ namespace MediaBrowser.Api /// Artist, Genre, Studio, Person, or any kind of BaseItem /// /// The type of the item. - [ApiMember(Name = "ItemType", Description = "Only required if the item is an Artist, Genre, Studio, or Person.", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "POST")] + [ApiMember(Name = "ItemType", Description = "The type of item to browse to.", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "POST")] public string ItemType { get; set; } /// @@ -60,7 +62,7 @@ namespace MediaBrowser.Api /// The name of the item. [ApiMember(Name = "ItemName", Description = "The name of the item.", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "POST")] public string ItemName { get; set; } - + /// /// Gets or sets the context (Movies, Music, TvShows, etc) /// Applicable to genres, studios and persons only because the context of items and artists can be inferred. @@ -71,6 +73,39 @@ namespace MediaBrowser.Api public string Context { get; set; } } + [Route("/Sessions/{Id}/Playing", "POST")] + [Api(("Instructs a session to play an item"))] + public class Play : IReturnVoid + { + /// + /// Gets or sets the id. + /// + /// The id. + [ApiMember(Name = "Id", Description = "Session Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")] + public Guid Id { get; set; } + + /// + /// Artist, Genre, Studio, Person, or any kind of BaseItem + /// + /// The type of the item. + [ApiMember(Name = "ItemIds", Description = "The ids of the items to play, comma delimited", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "POST", AllowMultiple = true)] + public string ItemIds { get; set; } + + /// + /// Gets or sets the start position ticks that the first item should be played at + /// + /// The start position ticks. + [ApiMember(Name = "StartPositionTicks", Description = "The starting position of the first item.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "POST")] + public long? StartPositionTicks { get; set; } + + /// + /// Gets or sets the play command. + /// + /// The play command. + [ApiMember(Name = "PlayCommand", Description = "The type of play command to issue (PlayNow, PlayNext, PlayLast). Clients who have not yet implemented play next and play last may play now.", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "POST")] + public PlayCommand PlayCommand { get; set; } + } + /// /// Class SessionsService /// @@ -111,8 +146,22 @@ namespace MediaBrowser.Api /// Posts the specified request. /// /// The request. + public void Post(BrowseTo request) + { + var task = BrowseTo(request); + + Task.WaitAll(task); + } + + /// + /// Browses to. + /// + /// The request. + /// Task. /// - public async void Post(BrowseTo request) + /// + /// The requested session does not have an open web socket. + private async Task BrowseTo(BrowseTo request) { var session = _sessionManager.Sessions.FirstOrDefault(i => i.Id == request.Id); @@ -149,5 +198,69 @@ namespace MediaBrowser.Api throw new InvalidOperationException("The requested session does not have an open web socket."); } } + + /// + /// Posts the specified request. + /// + /// The request. + public void Post(Play request) + { + var task = Play(request); + + Task.WaitAll(task); + } + + /// + /// Plays the specified request. + /// + /// The request. + /// Task. + /// + /// + /// The requested session does not have an open web socket. + private async Task Play(Play request) + { + var session = _sessionManager.Sessions.FirstOrDefault(i => i.Id == request.Id); + + if (session == null) + { + throw new ResourceNotFoundException(string.Format("Session {0} not found.", request.Id)); + } + + if (!session.SupportsRemoteControl) + { + throw new ArgumentException(string.Format("Session {0} does not support remote control.", session.Id)); + } + + var socket = session.WebSockets.OrderByDescending(i => i.LastActivityDate).FirstOrDefault(i => i.State == WebSocketState.Open); + + if (socket != null) + { + try + { + await socket.SendAsync(new WebSocketMessage + { + MessageType = "Play", + + Data = new PlayRequest + { + ItemIds = request.ItemIds.Split(',').ToArray(), + + PlayCommand = request.PlayCommand, + StartPositionTicks = request.StartPositionTicks + } + + }, CancellationToken.None).ConfigureAwait(false); + } + catch (Exception ex) + { + Logger.ErrorException("Error sending web socket message", ex); + } + } + else + { + throw new InvalidOperationException("The requested session does not have an open web socket."); + } + } } }