cotugno/jellyfin
2
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-11-15 09:59:06 -07:00
Code Issues Packages Projects Releases Wiki Activity

hook up roku session controller + web client layout fixes

Browse Source
This commit is contained in:
Luke Pulverenti 2013-12-25 09:39:46 -05:00
parent b5fa341e08
commit bb5e6fdcad
15 changed files with 112 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MediaBrowser.Api/ApiEntryPoint.cs
View File

@ -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)

4
MediaBrowser.Api/AuthorizationRequestFilterAttribute.cs
View File

@ -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);
}
}
}

1
MediaBrowser.Controller/MediaBrowser.Controller.csproj
View File

@ -196,6 +196,7 @@
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Providers\BaseMetadataProvider.cs" />
<Compile Include="Session\ISessionController.cs" />
<Compile Include="Session\ISessionControllerFactory.cs" />
<Compile Include="Session\PlaybackInfo.cs" />
<Compile Include="Session\PlaybackProgressInfo.cs" />
<Compile Include="Session\PlaybackStopInfo.cs" />

16
MediaBrowser.Controller/Session/ISessionControllerFactory.cs Normal file
View File

@ -0,0 +1,16 @@

namespace MediaBrowser.Controller.Session
{
/// <summary>
/// Interface ISesssionControllerFactory
/// </summary>
public interface ISessionControllerFactory
{
/// <summary>
/// Gets the session controller.
/// </summary>
/// <param name="session">The session.</param>
/// <returns>ISessionController.</returns>
ISessionController GetSessionController(SessionInfo session);
}
}

9
MediaBrowser.Controller/Session/ISessionManager.cs
View File

@ -34,6 +34,12 @@ namespace MediaBrowser.Controller.Session
/// <value>The sessions.</value>
IEnumerable<SessionInfo> Sessions { get; }
/// <summary>
/// Adds the parts.
/// </summary>
/// <param name="sessionFactories">The session factories.</param>
void AddParts(IEnumerable<ISessionControllerFactory> sessionFactories);
/// <summary>
/// Logs the user activity.
/// </summary>
@ -41,10 +47,11 @@ namespace MediaBrowser.Controller.Session
/// <param name="appVersion">The app version.</param>
/// <param name="deviceId">The device id.</param>
/// <param name="deviceName">Name of the device.</param>
/// <param name="remoteEndPoint">The remote end point.</param>
/// <param name="user">The user.</param>
/// <returns>Task.</returns>
/// <exception cref="System.ArgumentNullException">user</exception>
Task<SessionInfo> LogSessionActivity(string clientType, string appVersion, string deviceId, string deviceName, User user);
Task<SessionInfo> LogSessionActivity(string clientType, string appVersion, string deviceId, string deviceName, string remoteEndPoint, User user);
/// <summary>
/// Used to report that playback has started for an item

6
MediaBrowser.Controller/Session/SessionInfo.cs
View File

@ -14,6 +14,12 @@ namespace MediaBrowser.Controller.Session
QueueableMediaTypes = new List<string>();
}
/// <summary>
/// Gets or sets the remote end point.
/// </summary>
/// <value>The remote end point.</value>
public string RemoteEndPoint { get; set; }
/// <summary>
/// Gets or sets a value indicating whether this instance can seek.
/// </summary>

6
MediaBrowser.Model/Session/SessionInfoDto.cs
View File

@ -13,6 +13,12 @@ namespace MediaBrowser.Model.Session
/// <value><c>true</c> if this instance can seek; otherwise, <c>false</c>.</value>
public bool CanSeek { get; set; }
/// <summary>
/// Gets or sets the remote end point.
/// </summary>
/// <value>The remote end point.</value>
public string RemoteEndPoint { get; set; }
/// <summary>
/// Gets or sets the queueable media types.
/// </summary>

4
MediaBrowser.Providers/Savers/XmlSaverHelpers.cs
View File

@ -426,8 +426,6 @@ namespace MediaBrowser.Providers.Savers
{
if (hasTagline.Taglines.Count > 0)
{
builder.Append("<TagLine>" + SecurityElement.Escape(hasTagline.Taglines[0]) + "</TagLine>");
builder.Append("<Taglines>");
foreach (var tagline in hasTagline.Taglines)
@ -449,8 +447,6 @@ namespace MediaBrowser.Providers.Savers
}
builder.Append("</Genres>");
builder.Append("<Genre>" + SecurityElement.Escape(string.Join("|", item.Genres.ToArray())) + "</Genre>");
}
if (item.Studios.Count > 0)

3
MediaBrowser.Server.Implementations/Dto/DtoService.cs
View File

@ -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)

3
MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
View File

@ -168,13 +168,14 @@
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Providers\ImageSaver.cs" />
<Compile Include="Providers\ProviderManager.cs" />
<Compile Include="Roku\RokuControllerFactory.cs" />
<Compile Include="ScheduledTasks\PeopleValidationTask.cs" />
<Compile Include="ScheduledTasks\ChapterImagesTask.cs" />
<Compile Include="ScheduledTasks\RefreshMediaLibraryTask.cs" />
<Compile Include="ServerApplicationPaths.cs" />
<Compile Include="ServerManager\ServerManager.cs" />
<Compile Include="ServerManager\WebSocketConnection.cs" />
<Compile Include="Session\RokuController.cs" />
<Compile Include="Roku\RokuSessionController.cs" />
<Compile Include="Session\SessionManager.cs">
<SubType>Code</SubType>
</Compile>

32
MediaBrowser.Server.Implementations/Roku/RokuControllerFactory.cs Normal file
View File

@ -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;
}
}
}

6
MediaBrowser.Server.Implementations/Session/RokuController.cs → MediaBrowser.Server.Implementations/Roku/RokuSessionController.cs
View File

@ -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;

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

@ -39,7 +39,7 @@ namespace MediaBrowser.Server.Implementations.Session
private readonly ILogger _logger;
private readonly ILibraryManager _libraryManager;
/// <summary>
/// Gets or sets the configuration manager.
/// </summary>
@ -65,6 +65,8 @@ namespace MediaBrowser.Server.Implementations.Session
/// </summary>
public event EventHandler<PlaybackProgressEventArgs> PlaybackStopped;
private IEnumerable<ISessionControllerFactory> _sessionFactories = new List<ISessionControllerFactory>();
/// <summary>
/// Initializes a new instance of the <see cref="SessionManager" /> class.
/// </summary>
@ -82,6 +84,15 @@ namespace MediaBrowser.Server.Implementations.Session
_libraryManager = libraryManager;
}
/// <summary>
/// Adds the parts.
/// </summary>
/// <param name="sessionFactories">The session factories.</param>
public void AddParts(IEnumerable<ISessionControllerFactory> sessionFactories)
{
_sessionFactories = sessionFactories.ToList();
}
/// <summary>
/// Gets all connections.
/// </summary>
@ -98,11 +109,12 @@ namespace MediaBrowser.Server.Implementations.Session
/// <param name="appVersion">The app version.</param>
/// <param name="deviceId">The device id.</param>
/// <param name="deviceName">Name of the device.</param>
/// <param name="remoteEndPoint">The remote end point.</param>
/// <param name="user">The user.</param>
/// <returns>Task.</returns>
/// <exception cref="System.UnauthorizedAccessException"></exception>
/// <exception cref="System.ArgumentNullException">user</exception>
public async Task<SessionInfo> LogSessionActivity(string clientType, string appVersion, string deviceId, string deviceName, User user)
/// <exception cref="System.UnauthorizedAccessException"></exception>
public async Task<SessionInfo> 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
/// <param name="appVersion">The app version.</param>
/// <param name="deviceId">The device id.</param>
/// <param name="deviceName">Name of the device.</param>
/// <param name="remoteEndPoint">The remote end point.</param>
/// <param name="user">The user.</param>
/// <returns>SessionInfo.</returns>
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);
}

2
MediaBrowser.Server.Implementations/Session/SessionWebSocketListener.cs
View File

@ -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) &&

2
MediaBrowser.ServerApplication/ApplicationHost.cs
View File

@ -442,6 +442,8 @@ namespace MediaBrowser.ServerApplication
ImageProcessor.AddParts(GetExports<IImageEnhancer>());
LiveTvManager.AddParts(GetExports<ILiveTvService>());
SessionManager.AddParts(GetExports<ISessionControllerFactory>());
}
/// <summary>