From bb5e6fdcad9e92b58b754075b8df2387590aeaaf Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Wed, 25 Dec 2013 09:39:46 -0500 Subject: [PATCH] hook up roku session controller + web client layout fixes --- MediaBrowser.Api/ApiEntryPoint.cs | 2 +- .../AuthorizationRequestFilterAttribute.cs | 4 +- .../MediaBrowser.Controller.csproj | 1 + .../Session/ISessionControllerFactory.cs | 16 ++++++++ .../Session/ISessionManager.cs | 9 ++++- .../Session/SessionInfo.cs | 6 +++ MediaBrowser.Model/Session/SessionInfoDto.cs | 6 +++ .../Savers/XmlSaverHelpers.cs | 4 -- .../Dto/DtoService.cs | 3 +- ...MediaBrowser.Server.Implementations.csproj | 3 +- .../Roku/RokuControllerFactory.cs | 32 ++++++++++++++++ .../RokuSessionController.cs} | 6 +-- .../Session/SessionManager.cs | 37 +++++++++++++++---- .../Session/SessionWebSocketListener.cs | 2 +- .../ApplicationHost.cs | 2 + 15 files changed, 112 insertions(+), 21 deletions(-) create mode 100644 MediaBrowser.Controller/Session/ISessionControllerFactory.cs create mode 100644 MediaBrowser.Server.Implementations/Roku/RokuControllerFactory.cs rename MediaBrowser.Server.Implementations/{Session/RokuController.cs => Roku/RokuSessionController.cs} (94%) diff --git a/MediaBrowser.Api/ApiEntryPoint.cs b/MediaBrowser.Api/ApiEntryPoint.cs index 177435b6f5..785cc395c5 100644 --- a/MediaBrowser.Api/ApiEntryPoint.cs +++ b/MediaBrowser.Api/ApiEntryPoint.cs @@ -96,7 +96,7 @@ namespace MediaBrowser.Api { var jobCount = _activeTranscodingJobs.Count; - Parallel.ForEach(_activeTranscodingJobs, KillTranscodingJob); + Parallel.ForEach(_activeTranscodingJobs.ToList(), KillTranscodingJob); // Try to allow for some time to kill the ffmpeg processes and delete the partial stream files if (jobCount > 0) diff --git a/MediaBrowser.Api/AuthorizationRequestFilterAttribute.cs b/MediaBrowser.Api/AuthorizationRequestFilterAttribute.cs index a8b34b8bdf..8f9babd06a 100644 --- a/MediaBrowser.Api/AuthorizationRequestFilterAttribute.cs +++ b/MediaBrowser.Api/AuthorizationRequestFilterAttribute.cs @@ -63,7 +63,9 @@ namespace MediaBrowser.Api if (!string.IsNullOrEmpty(client) && !string.IsNullOrEmpty(deviceId) && !string.IsNullOrEmpty(device) && !string.IsNullOrEmpty(version)) { - SessionManager.LogSessionActivity(client, version, deviceId, device, user); + var remoteEndPoint = request.RemoteIp; + + SessionManager.LogSessionActivity(client, version, deviceId, device, remoteEndPoint, user); } } } diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj index 05a5f58a67..7a9a5e8d1a 100644 --- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj +++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj @@ -196,6 +196,7 @@ + diff --git a/MediaBrowser.Controller/Session/ISessionControllerFactory.cs b/MediaBrowser.Controller/Session/ISessionControllerFactory.cs new file mode 100644 index 0000000000..92862e4625 --- /dev/null +++ b/MediaBrowser.Controller/Session/ISessionControllerFactory.cs @@ -0,0 +1,16 @@ + +namespace MediaBrowser.Controller.Session +{ + /// + /// Interface ISesssionControllerFactory + /// + public interface ISessionControllerFactory + { + /// + /// Gets the session controller. + /// + /// The session. + /// ISessionController. + ISessionController GetSessionController(SessionInfo session); + } +} diff --git a/MediaBrowser.Controller/Session/ISessionManager.cs b/MediaBrowser.Controller/Session/ISessionManager.cs index 771d8f72e5..ec138bfb4d 100644 --- a/MediaBrowser.Controller/Session/ISessionManager.cs +++ b/MediaBrowser.Controller/Session/ISessionManager.cs @@ -34,6 +34,12 @@ namespace MediaBrowser.Controller.Session /// The sessions. IEnumerable Sessions { get; } + /// + /// Adds the parts. + /// + /// The session factories. + void AddParts(IEnumerable sessionFactories); + /// /// Logs the user activity. /// @@ -41,10 +47,11 @@ namespace MediaBrowser.Controller.Session /// The app version. /// The device id. /// Name of the device. + /// The remote end point. /// The user. /// Task. /// user - Task LogSessionActivity(string clientType, string appVersion, string deviceId, string deviceName, User user); + Task LogSessionActivity(string clientType, string appVersion, string deviceId, string deviceName, string remoteEndPoint, User user); /// /// Used to report that playback has started for an item diff --git a/MediaBrowser.Controller/Session/SessionInfo.cs b/MediaBrowser.Controller/Session/SessionInfo.cs index ed2fcda678..82e9328ac3 100644 --- a/MediaBrowser.Controller/Session/SessionInfo.cs +++ b/MediaBrowser.Controller/Session/SessionInfo.cs @@ -14,6 +14,12 @@ namespace MediaBrowser.Controller.Session QueueableMediaTypes = new List(); } + /// + /// Gets or sets the remote end point. + /// + /// The remote end point. + public string RemoteEndPoint { get; set; } + /// /// Gets or sets a value indicating whether this instance can seek. /// diff --git a/MediaBrowser.Model/Session/SessionInfoDto.cs b/MediaBrowser.Model/Session/SessionInfoDto.cs index 02b7f02268..80f6ea2c00 100644 --- a/MediaBrowser.Model/Session/SessionInfoDto.cs +++ b/MediaBrowser.Model/Session/SessionInfoDto.cs @@ -13,6 +13,12 @@ namespace MediaBrowser.Model.Session /// true if this instance can seek; otherwise, false. public bool CanSeek { get; set; } + /// + /// Gets or sets the remote end point. + /// + /// The remote end point. + public string RemoteEndPoint { get; set; } + /// /// Gets or sets the queueable media types. /// diff --git a/MediaBrowser.Providers/Savers/XmlSaverHelpers.cs b/MediaBrowser.Providers/Savers/XmlSaverHelpers.cs index ac8270dfe7..ff866fcb23 100644 --- a/MediaBrowser.Providers/Savers/XmlSaverHelpers.cs +++ b/MediaBrowser.Providers/Savers/XmlSaverHelpers.cs @@ -426,8 +426,6 @@ namespace MediaBrowser.Providers.Savers { if (hasTagline.Taglines.Count > 0) { - builder.Append("" + SecurityElement.Escape(hasTagline.Taglines[0]) + ""); - builder.Append(""); foreach (var tagline in hasTagline.Taglines) @@ -449,8 +447,6 @@ namespace MediaBrowser.Providers.Savers } builder.Append(""); - - builder.Append("" + SecurityElement.Escape(string.Join("|", item.Genres.ToArray())) + ""); } if (item.Studios.Count > 0) diff --git a/MediaBrowser.Server.Implementations/Dto/DtoService.cs b/MediaBrowser.Server.Implementations/Dto/DtoService.cs index 1060886a85..d5faa25bfc 100644 --- a/MediaBrowser.Server.Implementations/Dto/DtoService.cs +++ b/MediaBrowser.Server.Implementations/Dto/DtoService.cs @@ -243,7 +243,8 @@ namespace MediaBrowser.Server.Implementations.Dto NowViewingItemType = session.NowViewingItemType, ApplicationVersion = session.ApplicationVersion, CanSeek = session.CanSeek, - QueueableMediaTypes = session.QueueableMediaTypes + QueueableMediaTypes = session.QueueableMediaTypes, + RemoteEndPoint = session.RemoteEndPoint }; if (session.NowPlayingItem != null) diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj index 29601b396d..09a39c3eb2 100644 --- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj +++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj @@ -168,13 +168,14 @@ + - + Code diff --git a/MediaBrowser.Server.Implementations/Roku/RokuControllerFactory.cs b/MediaBrowser.Server.Implementations/Roku/RokuControllerFactory.cs new file mode 100644 index 0000000000..71f70421a9 --- /dev/null +++ b/MediaBrowser.Server.Implementations/Roku/RokuControllerFactory.cs @@ -0,0 +1,32 @@ +using MediaBrowser.Common.Net; +using MediaBrowser.Controller; +using MediaBrowser.Controller.Session; +using MediaBrowser.Model.Serialization; +using System; + +namespace MediaBrowser.Server.Implementations.Roku +{ + public class RokuControllerFactory : ISessionControllerFactory + { + private readonly IHttpClient _httpClient; + private readonly IJsonSerializer _json; + private readonly IServerApplicationHost _appHost; + + public RokuControllerFactory(IHttpClient httpClient, IJsonSerializer json, IServerApplicationHost appHost) + { + _httpClient = httpClient; + _json = json; + _appHost = appHost; + } + + public ISessionController GetSessionController(SessionInfo session) + { + if (string.Equals(session.Client, "roku", StringComparison.OrdinalIgnoreCase)) + { + return new RokuSessionController(_httpClient, _json, _appHost, session); + } + + return null; + } + } +} diff --git a/MediaBrowser.Server.Implementations/Session/RokuController.cs b/MediaBrowser.Server.Implementations/Roku/RokuSessionController.cs similarity index 94% rename from MediaBrowser.Server.Implementations/Session/RokuController.cs rename to MediaBrowser.Server.Implementations/Roku/RokuSessionController.cs index f7ca43c9f2..ffe33d763e 100644 --- a/MediaBrowser.Server.Implementations/Session/RokuController.cs +++ b/MediaBrowser.Server.Implementations/Roku/RokuSessionController.cs @@ -10,9 +10,9 @@ using System; using System.Threading; using System.Threading.Tasks; -namespace MediaBrowser.Server.Implementations.Session +namespace MediaBrowser.Server.Implementations.Roku { - public class RokuController : ISessionController + public class RokuSessionController : ISessionController { private readonly IHttpClient _httpClient; private readonly IJsonSerializer _json; @@ -20,7 +20,7 @@ namespace MediaBrowser.Server.Implementations.Session public SessionInfo Session { get; private set; } - public RokuController(IHttpClient httpClient, IJsonSerializer json, IServerApplicationHost appHost, SessionInfo session) + public RokuSessionController(IHttpClient httpClient, IJsonSerializer json, IServerApplicationHost appHost, SessionInfo session) { _httpClient = httpClient; _json = json; diff --git a/MediaBrowser.Server.Implementations/Session/SessionManager.cs b/MediaBrowser.Server.Implementations/Session/SessionManager.cs index 3a07d33a6d..1a94b9c79b 100644 --- a/MediaBrowser.Server.Implementations/Session/SessionManager.cs +++ b/MediaBrowser.Server.Implementations/Session/SessionManager.cs @@ -39,7 +39,7 @@ namespace MediaBrowser.Server.Implementations.Session private readonly ILogger _logger; private readonly ILibraryManager _libraryManager; - + /// /// Gets or sets the configuration manager. /// @@ -65,6 +65,8 @@ namespace MediaBrowser.Server.Implementations.Session /// public event EventHandler PlaybackStopped; + private IEnumerable _sessionFactories = new List(); + /// /// Initializes a new instance of the class. /// @@ -82,6 +84,15 @@ namespace MediaBrowser.Server.Implementations.Session _libraryManager = libraryManager; } + /// + /// Adds the parts. + /// + /// The session factories. + public void AddParts(IEnumerable sessionFactories) + { + _sessionFactories = sessionFactories.ToList(); + } + /// /// Gets all connections. /// @@ -98,11 +109,12 @@ namespace MediaBrowser.Server.Implementations.Session /// The app version. /// The device id. /// Name of the device. + /// The remote end point. /// The user. /// Task. - /// /// user - public async Task LogSessionActivity(string clientType, string appVersion, string deviceId, string deviceName, User user) + /// + public async Task LogSessionActivity(string clientType, string appVersion, string deviceId, string deviceName, string remoteEndPoint, User user) { if (string.IsNullOrEmpty(clientType)) { @@ -128,7 +140,7 @@ namespace MediaBrowser.Server.Implementations.Session var activityDate = DateTime.UtcNow; - var session = GetSessionInfo(clientType, appVersion, deviceId, deviceName, user); + var session = GetSessionInfo(clientType, appVersion, deviceId, deviceName, remoteEndPoint, user); session.LastActivityDate = activityDate; @@ -196,9 +208,10 @@ namespace MediaBrowser.Server.Implementations.Session /// The app version. /// The device id. /// Name of the device. + /// The remote end point. /// The user. /// SessionInfo. - private SessionInfo GetSessionInfo(string clientType, string appVersion, string deviceId, string deviceName, User user) + private SessionInfo GetSessionInfo(string clientType, string appVersion, string deviceId, string deviceName, string remoteEndPoint, User user) { var key = clientType + deviceId + appVersion; @@ -212,6 +225,14 @@ namespace MediaBrowser.Server.Implementations.Session connection.DeviceName = deviceName; connection.User = user; + connection.RemoteEndPoint = remoteEndPoint; + + if (connection.SessionController == null) + { + connection.SessionController = _sessionFactories + .Select(i => i.GetSessionController(connection)) + .FirstOrDefault(i => i != null); + } return connection; } @@ -335,7 +356,7 @@ namespace MediaBrowser.Server.Implementations.Session { throw new ArgumentException("PlaybackStopInfo.SessionId cannot be Guid.Empty"); } - + if (info.PositionTicks.HasValue && info.PositionTicks.Value < 0) { throw new ArgumentOutOfRangeException("positionTicks"); @@ -497,7 +518,7 @@ namespace MediaBrowser.Server.Implementations.Session { throw new ArgumentException("Virtual items are not playable."); } - + if (command.PlayCommand != PlayCommand.PlayNow) { if (items.Any(i => !session.QueueableMediaTypes.Contains(i.MediaType, StringComparer.OrdinalIgnoreCase))) @@ -505,7 +526,7 @@ namespace MediaBrowser.Server.Implementations.Session throw new ArgumentException(string.Format("Session {0} is unable to queue the requested media type.", session.Id)); } } - + return session.SessionController.SendPlayCommand(command, cancellationToken); } diff --git a/MediaBrowser.Server.Implementations/Session/SessionWebSocketListener.cs b/MediaBrowser.Server.Implementations/Session/SessionWebSocketListener.cs index 41cb7eb6bb..cc82156e8e 100644 --- a/MediaBrowser.Server.Implementations/Session/SessionWebSocketListener.cs +++ b/MediaBrowser.Server.Implementations/Session/SessionWebSocketListener.cs @@ -104,7 +104,7 @@ namespace MediaBrowser.Server.Implementations.Session { _logger.Debug("Logging session activity"); - await _sessionManager.LogSessionActivity(client, version, deviceId, deviceName, null).ConfigureAwait(false); + await _sessionManager.LogSessionActivity(client, version, deviceId, deviceName, message.Connection.RemoteEndPoint, null).ConfigureAwait(false); session = _sessionManager.Sessions .FirstOrDefault(i => string.Equals(i.DeviceId, deviceId) && diff --git a/MediaBrowser.ServerApplication/ApplicationHost.cs b/MediaBrowser.ServerApplication/ApplicationHost.cs index 4969c184c4..5e6a156bb0 100644 --- a/MediaBrowser.ServerApplication/ApplicationHost.cs +++ b/MediaBrowser.ServerApplication/ApplicationHost.cs @@ -442,6 +442,8 @@ namespace MediaBrowser.ServerApplication ImageProcessor.AddParts(GetExports()); LiveTvManager.AddParts(GetExports()); + + SessionManager.AddParts(GetExports()); } ///