From 67044d2759e9895e92be4435e6111a2d1bd50e34 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Tue, 28 May 2013 13:25:10 -0400 Subject: [PATCH 1/4] 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."); + } + } } } From 969bc00098f8069862d5049c296b905826868ada Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Tue, 28 May 2013 13:32:40 -0400 Subject: [PATCH 2/4] fixed missing compression for dashboard js/css --- .../HttpServer/HttpResultFactory.cs | 8 ++++++++ MediaBrowser.WebDashboard/Api/DashboardService.cs | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/MediaBrowser.Server.Implementations/HttpServer/HttpResultFactory.cs b/MediaBrowser.Server.Implementations/HttpServer/HttpResultFactory.cs index 8e715e47cd..115114e3a9 100644 --- a/MediaBrowser.Server.Implementations/HttpServer/HttpResultFactory.cs +++ b/MediaBrowser.Server.Implementations/HttpServer/HttpResultFactory.cs @@ -381,6 +381,14 @@ namespace MediaBrowser.Server.Implementations.HttpServer } if (contentType.StartsWith("application/", StringComparison.OrdinalIgnoreCase)) { + if (string.Equals(contentType, "application/x-javascript", StringComparison.OrdinalIgnoreCase)) + { + return true; + } + if (string.Equals(contentType, "application/xml", StringComparison.OrdinalIgnoreCase)) + { + return true; + } return false; } diff --git a/MediaBrowser.WebDashboard/Api/DashboardService.cs b/MediaBrowser.WebDashboard/Api/DashboardService.cs index 20c612be24..7061f8c7fb 100644 --- a/MediaBrowser.WebDashboard/Api/DashboardService.cs +++ b/MediaBrowser.WebDashboard/Api/DashboardService.cs @@ -409,7 +409,7 @@ namespace MediaBrowser.WebDashboard.Api var files = new[] { "http://code.jquery.com/mobile/1.3.1/jquery.mobile-1.3.1.min.css", - "thirdparty/jqm-icon-pack-3.0/font-awesome/jqm-icon-pack-3.0.0-fa.css", + "thirdparty/jqm-icon-pack-3.0/font-awesome/jqm-icon-pack-3.0.0-fa.css" + versionString, "css/all.css" + versionString }; From 110d1e6fbef39959f7c7b99eca6bbb0bc41dc218 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Tue, 28 May 2013 13:32:50 -0400 Subject: [PATCH 3/4] removed swallowed exceptions --- .../SQLiteDisplayPreferencesRepository.cs | 4 +++ .../Sqlite/SQLiteItemRepository.cs | 12 +++++-- .../Sqlite/SQLiteRepository.cs | 32 ------------------- .../Sqlite/SQLiteUserDataRepository.cs | 4 +++ .../Sqlite/SQLiteUserRepository.cs | 10 +++++- 5 files changed, 27 insertions(+), 35 deletions(-) diff --git a/MediaBrowser.Server.Implementations/Sqlite/SQLiteDisplayPreferencesRepository.cs b/MediaBrowser.Server.Implementations/Sqlite/SQLiteDisplayPreferencesRepository.cs index 2df377cbce..60c3c1fe02 100644 --- a/MediaBrowser.Server.Implementations/Sqlite/SQLiteDisplayPreferencesRepository.cs +++ b/MediaBrowser.Server.Implementations/Sqlite/SQLiteDisplayPreferencesRepository.cs @@ -148,6 +148,8 @@ namespace MediaBrowser.Server.Implementations.Sqlite { transaction.Rollback(); } + + throw; } catch (Exception e) { @@ -157,6 +159,8 @@ namespace MediaBrowser.Server.Implementations.Sqlite { transaction.Rollback(); } + + throw; } finally { diff --git a/MediaBrowser.Server.Implementations/Sqlite/SQLiteItemRepository.cs b/MediaBrowser.Server.Implementations/Sqlite/SQLiteItemRepository.cs index 33e9c7fe37..a0acd523ea 100644 --- a/MediaBrowser.Server.Implementations/Sqlite/SQLiteItemRepository.cs +++ b/MediaBrowser.Server.Implementations/Sqlite/SQLiteItemRepository.cs @@ -236,15 +236,19 @@ namespace MediaBrowser.Server.Implementations.Sqlite { transaction.Rollback(); } + + throw; } catch (Exception e) { - Logger.ErrorException("Failed to save item:", e); + Logger.ErrorException("Failed to save items:", e); if (transaction != null) { transaction.Rollback(); } + + throw; } finally { @@ -439,15 +443,19 @@ namespace MediaBrowser.Server.Implementations.Sqlite { transaction.Rollback(); } + + throw; } catch (Exception e) { - Logger.ErrorException("Failed to save item:", e); + Logger.ErrorException("Failed to save children:", e); if (transaction != null) { transaction.Rollback(); } + + throw; } finally { diff --git a/MediaBrowser.Server.Implementations/Sqlite/SQLiteRepository.cs b/MediaBrowser.Server.Implementations/Sqlite/SQLiteRepository.cs index ee2fcc10cf..7547212c5c 100644 --- a/MediaBrowser.Server.Implementations/Sqlite/SQLiteRepository.cs +++ b/MediaBrowser.Server.Implementations/Sqlite/SQLiteRepository.cs @@ -151,38 +151,6 @@ namespace MediaBrowser.Server.Implementations.Sqlite } } - /// - /// Executes the command. - /// - /// The CMD. - /// Task. - /// cmd - public async Task ExecuteCommand(DbCommand cmd) - { - if (cmd == null) - { - throw new ArgumentNullException("cmd"); - } - - using (var tran = Connection.BeginTransaction()) - { - try - { - cmd.Connection = Connection; - cmd.Transaction = tran; - - await cmd.ExecuteNonQueryAsync().ConfigureAwait(false); - - tran.Commit(); - } - catch (Exception e) - { - Logger.ErrorException("Failed to commit transaction.", e); - tran.Rollback(); - } - } - } - /// /// Gets a stream from a DataReader at a given ordinal /// diff --git a/MediaBrowser.Server.Implementations/Sqlite/SQLiteUserDataRepository.cs b/MediaBrowser.Server.Implementations/Sqlite/SQLiteUserDataRepository.cs index 284ef10fb3..d378809ffb 100644 --- a/MediaBrowser.Server.Implementations/Sqlite/SQLiteUserDataRepository.cs +++ b/MediaBrowser.Server.Implementations/Sqlite/SQLiteUserDataRepository.cs @@ -203,6 +203,8 @@ namespace MediaBrowser.Server.Implementations.Sqlite { transaction.Rollback(); } + + throw; } catch (Exception e) { @@ -212,6 +214,8 @@ namespace MediaBrowser.Server.Implementations.Sqlite { transaction.Rollback(); } + + throw; } finally { diff --git a/MediaBrowser.Server.Implementations/Sqlite/SQLiteUserRepository.cs b/MediaBrowser.Server.Implementations/Sqlite/SQLiteUserRepository.cs index df0d13b623..335841549a 100644 --- a/MediaBrowser.Server.Implementations/Sqlite/SQLiteUserRepository.cs +++ b/MediaBrowser.Server.Implementations/Sqlite/SQLiteUserRepository.cs @@ -145,6 +145,8 @@ namespace MediaBrowser.Server.Implementations.Sqlite { transaction.Rollback(); } + + throw; } catch (Exception e) { @@ -154,6 +156,8 @@ namespace MediaBrowser.Server.Implementations.Sqlite { transaction.Rollback(); } + + throw; } finally { @@ -228,7 +232,7 @@ namespace MediaBrowser.Server.Implementations.Sqlite cmd.Transaction = transaction; - await ExecuteCommand(cmd).ConfigureAwait(false); + await cmd.ExecuteNonQueryAsync(cancellationToken).ConfigureAwait(false); } transaction.Commit(); @@ -239,6 +243,8 @@ namespace MediaBrowser.Server.Implementations.Sqlite { transaction.Rollback(); } + + throw; } catch (Exception e) { @@ -248,6 +254,8 @@ namespace MediaBrowser.Server.Implementations.Sqlite { transaction.Rollback(); } + + throw; } finally { From 9274f9f35f1269c147c6815bb85e196e3128374a Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Tue, 28 May 2013 13:33:00 -0400 Subject: [PATCH 4/4] copy genres from MusicArtist to Artist --- MediaBrowser.Controller/Providers/Music/LastfmHelper.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/MediaBrowser.Controller/Providers/Music/LastfmHelper.cs b/MediaBrowser.Controller/Providers/Music/LastfmHelper.cs index d8bbfb00df..ca9f8bc719 100644 --- a/MediaBrowser.Controller/Providers/Music/LastfmHelper.cs +++ b/MediaBrowser.Controller/Providers/Music/LastfmHelper.cs @@ -42,6 +42,7 @@ namespace MediaBrowser.Controller.Providers.Music target.Tags = source.Tags.ToList(); target.Overview = source.Overview; target.ProductionLocations = source.ProductionLocations.ToList(); + target.Genres = source.Genres.ToList(); } public static void ProcessAlbumData(BaseItem item, LastfmAlbum data)