mirror of https://github.com/jellyfin/jellyfin.git
fixes #273 - Marking/unmarking Favorite status doesn't cause a library changed notification
This commit is contained in:
parent
d021e20249
commit
16b9d26ab5
|
@ -72,6 +72,28 @@ namespace MediaBrowser.Controller.Session
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="cancellationToken">The cancellation token.</param>
|
/// <param name="cancellationToken">The cancellation token.</param>
|
||||||
/// <returns>Task.</returns>
|
/// <returns>Task.</returns>
|
||||||
Task SendRestartRequiredMessage(CancellationToken cancellationToken);
|
Task SendRestartRequiredNotification(CancellationToken cancellationToken);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Sends the user data change info.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="info">The info.</param>
|
||||||
|
/// <param name="cancellationToken">The cancellation token.</param>
|
||||||
|
/// <returns>Task.</returns>
|
||||||
|
Task SendUserDataChangeInfo(UserDataChangeInfo info, CancellationToken cancellationToken);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Sends the server shutdown notification.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="cancellationToken">The cancellation token.</param>
|
||||||
|
/// <returns>Task.</returns>
|
||||||
|
Task SendServerShutdownNotification(CancellationToken cancellationToken);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Sends the server restart notification.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="cancellationToken">The cancellation token.</param>
|
||||||
|
/// <returns>Task.</returns>
|
||||||
|
Task SendServerRestartNotification(CancellationToken cancellationToken);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -119,6 +119,20 @@ namespace MediaBrowser.Controller.Session
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="cancellationToken">The cancellation token.</param>
|
/// <param name="cancellationToken">The cancellation token.</param>
|
||||||
/// <returns>Task.</returns>
|
/// <returns>Task.</returns>
|
||||||
Task SendRestartRequiredMessage(CancellationToken cancellationToken);
|
Task SendRestartRequiredNotification(CancellationToken cancellationToken);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Sends the server shutdown notification.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="cancellationToken">The cancellation token.</param>
|
||||||
|
/// <returns>Task.</returns>
|
||||||
|
Task SendServerShutdownNotification(CancellationToken cancellationToken);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Sends the server restart notification.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="cancellationToken">The cancellation token.</param>
|
||||||
|
/// <returns>Task.</returns>
|
||||||
|
Task SendServerRestartNotification(CancellationToken cancellationToken);
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -350,6 +350,9 @@
|
||||||
<Compile Include="..\MediaBrowser.Model\Session\SystemCommand.cs">
|
<Compile Include="..\MediaBrowser.Model\Session\SystemCommand.cs">
|
||||||
<Link>Session\SystemCommand.cs</Link>
|
<Link>Session\SystemCommand.cs</Link>
|
||||||
</Compile>
|
</Compile>
|
||||||
|
<Compile Include="..\MediaBrowser.Model\Session\UserDataChangeInfo.cs">
|
||||||
|
<Link>Session\UserDataChangeInfo.cs</Link>
|
||||||
|
</Compile>
|
||||||
<Compile Include="..\MediaBrowser.Model\System\SystemInfo.cs">
|
<Compile Include="..\MediaBrowser.Model\System\SystemInfo.cs">
|
||||||
<Link>System\SystemInfo.cs</Link>
|
<Link>System\SystemInfo.cs</Link>
|
||||||
</Compile>
|
</Compile>
|
||||||
|
|
|
@ -334,6 +334,9 @@
|
||||||
<Compile Include="..\MediaBrowser.Model\Session\SystemCommand.cs">
|
<Compile Include="..\MediaBrowser.Model\Session\SystemCommand.cs">
|
||||||
<Link>Session\SystemCommand.cs</Link>
|
<Link>Session\SystemCommand.cs</Link>
|
||||||
</Compile>
|
</Compile>
|
||||||
|
<Compile Include="..\MediaBrowser.Model\Session\UserDataChangeInfo.cs">
|
||||||
|
<Link>Session\UserDataChangeInfo.cs</Link>
|
||||||
|
</Compile>
|
||||||
<Compile Include="..\MediaBrowser.Model\System\SystemInfo.cs">
|
<Compile Include="..\MediaBrowser.Model\System\SystemInfo.cs">
|
||||||
<Link>System\SystemInfo.cs</Link>
|
<Link>System\SystemInfo.cs</Link>
|
||||||
</Compile>
|
</Compile>
|
||||||
|
|
|
@ -50,6 +50,12 @@ namespace MediaBrowser.Model.Dto
|
||||||
/// <value><c>true</c> if played; otherwise, <c>false</c>.</value>
|
/// <value><c>true</c> if played; otherwise, <c>false</c>.</value>
|
||||||
public bool Played { get; set; }
|
public bool Played { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets or sets the key.
|
||||||
|
/// </summary>
|
||||||
|
/// <value>The key.</value>
|
||||||
|
public string Key { get; set; }
|
||||||
|
|
||||||
public event PropertyChangedEventHandler PropertyChanged;
|
public event PropertyChangedEventHandler PropertyChanged;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -126,6 +126,7 @@
|
||||||
<Compile Include="Serialization\IXmlSerializer.cs" />
|
<Compile Include="Serialization\IXmlSerializer.cs" />
|
||||||
<Compile Include="Session\SessionInfoDto.cs" />
|
<Compile Include="Session\SessionInfoDto.cs" />
|
||||||
<Compile Include="Session\SystemCommand.cs" />
|
<Compile Include="Session\SystemCommand.cs" />
|
||||||
|
<Compile Include="Session\UserDataChangeInfo.cs" />
|
||||||
<Compile Include="Updates\CheckForUpdateResult.cs" />
|
<Compile Include="Updates\CheckForUpdateResult.cs" />
|
||||||
<Compile Include="Updates\PackageTargetSystem.cs" />
|
<Compile Include="Updates\PackageTargetSystem.cs" />
|
||||||
<Compile Include="Updates\InstallationInfo.cs" />
|
<Compile Include="Updates\InstallationInfo.cs" />
|
||||||
|
|
|
@ -0,0 +1,23 @@
|
||||||
|
using MediaBrowser.Model.Dto;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
|
||||||
|
namespace MediaBrowser.Model.Session
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Class UserDataChangeInfo
|
||||||
|
/// </summary>
|
||||||
|
public class UserDataChangeInfo
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Gets or sets the user id.
|
||||||
|
/// </summary>
|
||||||
|
/// <value>The user id.</value>
|
||||||
|
public string UserId { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets or sets the user data list.
|
||||||
|
/// </summary>
|
||||||
|
/// <value>The user data list.</value>
|
||||||
|
public List<UserItemDataDto> UserDataList { get; set; }
|
||||||
|
}
|
||||||
|
}
|
|
@ -340,7 +340,8 @@ namespace MediaBrowser.Server.Implementations.Dto
|
||||||
PlayCount = data.PlayCount,
|
PlayCount = data.PlayCount,
|
||||||
Rating = data.Rating,
|
Rating = data.Rating,
|
||||||
Played = data.Played,
|
Played = data.Played,
|
||||||
LastPlayedDate = data.LastPlayedDate
|
LastPlayedDate = data.LastPlayedDate,
|
||||||
|
Key = data.Key
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
private void SetBookProperties(BaseItemDto dto, Book item)
|
private void SetBookProperties(BaseItemDto dto, Book item)
|
||||||
|
|
|
@ -18,7 +18,7 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Class WebSocketEvents
|
/// Class WebSocketEvents
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public class WebSocketEvents : IServerEntryPoint
|
public class ServerEventNotifier : IServerEntryPoint
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// The _server manager
|
/// The _server manager
|
||||||
|
@ -47,15 +47,15 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
|
||||||
|
|
||||||
private readonly IDtoService _dtoService;
|
private readonly IDtoService _dtoService;
|
||||||
|
|
||||||
private ISessionManager _sessionManager;
|
private readonly ISessionManager _sessionManager;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Initializes a new instance of the <see cref="WebSocketEvents" /> class.
|
/// Initializes a new instance of the <see cref="ServerEventNotifier" /> class.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="serverManager">The server manager.</param>
|
/// <param name="serverManager">The server manager.</param>
|
||||||
/// <param name="logger">The logger.</param>
|
/// <param name="logger">The logger.</param>
|
||||||
/// <param name="userManager">The user manager.</param>
|
/// <param name="userManager">The user manager.</param>
|
||||||
public WebSocketEvents(IServerManager serverManager, IServerApplicationHost appHost, IUserManager userManager, IInstallationManager installationManager, ITaskManager taskManager, IDtoService dtoService, ISessionManager sessionManager)
|
public ServerEventNotifier(IServerManager serverManager, IServerApplicationHost appHost, IUserManager userManager, IInstallationManager installationManager, ITaskManager taskManager, IDtoService dtoService, ISessionManager sessionManager)
|
||||||
{
|
{
|
||||||
_serverManager = serverManager;
|
_serverManager = serverManager;
|
||||||
_userManager = userManager;
|
_userManager = userManager;
|
||||||
|
@ -131,7 +131,7 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
|
||||||
/// <param name="e">The <see cref="EventArgs" /> instance containing the event data.</param>
|
/// <param name="e">The <see cref="EventArgs" /> instance containing the event data.</param>
|
||||||
void kernel_HasPendingRestartChanged(object sender, EventArgs e)
|
void kernel_HasPendingRestartChanged(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
_sessionManager.SendRestartRequiredMessage(CancellationToken.None);
|
_sessionManager.SendRestartRequiredNotification(CancellationToken.None);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
|
@ -0,0 +1,140 @@
|
||||||
|
using MediaBrowser.Controller.Dto;
|
||||||
|
using MediaBrowser.Controller.Library;
|
||||||
|
using MediaBrowser.Controller.Plugins;
|
||||||
|
using MediaBrowser.Controller.Session;
|
||||||
|
using MediaBrowser.Model.Entities;
|
||||||
|
using MediaBrowser.Model.Logging;
|
||||||
|
using MediaBrowser.Model.Session;
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Threading;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
|
namespace MediaBrowser.Server.Implementations.EntryPoints
|
||||||
|
{
|
||||||
|
class UserDataChangeNotifier : IServerEntryPoint
|
||||||
|
{
|
||||||
|
private readonly ISessionManager _sessionManager;
|
||||||
|
private readonly ILogger _logger;
|
||||||
|
private readonly IDtoService _dtoService;
|
||||||
|
private readonly IUserDataManager _userDataManager;
|
||||||
|
|
||||||
|
private readonly object _syncLock = new object();
|
||||||
|
private Timer UpdateTimer { get; set; }
|
||||||
|
private const int UpdateDuration = 2000;
|
||||||
|
|
||||||
|
private readonly Dictionary<Guid, List<string>> _changedKeys = new Dictionary<Guid, List<string>>();
|
||||||
|
|
||||||
|
public UserDataChangeNotifier(IUserDataManager userDataManager, ISessionManager sessionManager, IDtoService dtoService, ILogger logger)
|
||||||
|
{
|
||||||
|
_userDataManager = userDataManager;
|
||||||
|
_sessionManager = sessionManager;
|
||||||
|
_dtoService = dtoService;
|
||||||
|
_logger = logger;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Run()
|
||||||
|
{
|
||||||
|
_userDataManager.UserDataSaved += _userDataManager_UserDataSaved;
|
||||||
|
}
|
||||||
|
|
||||||
|
void _userDataManager_UserDataSaved(object sender, UserDataSaveEventArgs e)
|
||||||
|
{
|
||||||
|
if (e.SaveReason == UserDataSaveReason.PlaybackProgress)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
lock (_syncLock)
|
||||||
|
{
|
||||||
|
if (UpdateTimer == null)
|
||||||
|
{
|
||||||
|
UpdateTimer = new Timer(UpdateTimerCallback, null, UpdateDuration,
|
||||||
|
Timeout.Infinite);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
UpdateTimer.Change(UpdateDuration, Timeout.Infinite);
|
||||||
|
}
|
||||||
|
|
||||||
|
List<string> keys;
|
||||||
|
|
||||||
|
if (!_changedKeys.TryGetValue(e.UserId, out keys))
|
||||||
|
{
|
||||||
|
keys = new List<string>();
|
||||||
|
_changedKeys[e.UserId] = keys;
|
||||||
|
}
|
||||||
|
|
||||||
|
keys.Add(e.Key);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void UpdateTimerCallback(object state)
|
||||||
|
{
|
||||||
|
lock (_syncLock)
|
||||||
|
{
|
||||||
|
// Remove dupes in case some were saved multiple times
|
||||||
|
var changes = _changedKeys.ToList();
|
||||||
|
_changedKeys.Clear();
|
||||||
|
|
||||||
|
SendNotifications(changes, CancellationToken.None);
|
||||||
|
|
||||||
|
if (UpdateTimer != null)
|
||||||
|
{
|
||||||
|
UpdateTimer.Dispose();
|
||||||
|
UpdateTimer = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task SendNotifications(List<KeyValuePair<Guid, List<string>>> changes, CancellationToken cancellationToken)
|
||||||
|
{
|
||||||
|
foreach (var pair in changes)
|
||||||
|
{
|
||||||
|
var userId = pair.Key;
|
||||||
|
var userSessions = _sessionManager.Sessions
|
||||||
|
.Where(u => u.User != null && u.User.Id == userId && u.SessionController != null && u.IsActive)
|
||||||
|
.ToList();
|
||||||
|
|
||||||
|
if (userSessions.Count > 0)
|
||||||
|
{
|
||||||
|
var dtoList = pair.Value
|
||||||
|
.Select(i => _dtoService.GetUserItemDataDto(_userDataManager.GetUserData(userId, i)))
|
||||||
|
.ToList();
|
||||||
|
|
||||||
|
var info = new UserDataChangeInfo
|
||||||
|
{
|
||||||
|
UserId = userId.ToString("N"),
|
||||||
|
|
||||||
|
UserDataList = dtoList
|
||||||
|
};
|
||||||
|
|
||||||
|
foreach (var userSession in userSessions)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
await userSession.SessionController.SendUserDataChangeInfo(info, cancellationToken).ConfigureAwait(false);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
_logger.ErrorException("Error sending UserDataChanged message", ex);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Dispose()
|
||||||
|
{
|
||||||
|
if (UpdateTimer != null)
|
||||||
|
{
|
||||||
|
UpdateTimer.Dispose();
|
||||||
|
UpdateTimer = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
_userDataManager.UserDataSaved -= _userDataManager_UserDataSaved;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -115,7 +115,8 @@
|
||||||
<Compile Include="EntryPoints\Notifications\WebSocketNotifier.cs" />
|
<Compile Include="EntryPoints\Notifications\WebSocketNotifier.cs" />
|
||||||
<Compile Include="EntryPoints\RefreshUsersMetadata.cs" />
|
<Compile Include="EntryPoints\RefreshUsersMetadata.cs" />
|
||||||
<Compile Include="EntryPoints\UdpServerEntryPoint.cs" />
|
<Compile Include="EntryPoints\UdpServerEntryPoint.cs" />
|
||||||
<Compile Include="EntryPoints\WebSocketEvents.cs" />
|
<Compile Include="EntryPoints\ServerEventNotifier.cs" />
|
||||||
|
<Compile Include="EntryPoints\UserDataChangeNotifier.cs" />
|
||||||
<Compile Include="HttpServer\HttpResultFactory.cs" />
|
<Compile Include="HttpServer\HttpResultFactory.cs" />
|
||||||
<Compile Include="HttpServer\HttpServer.cs" />
|
<Compile Include="HttpServer\HttpServer.cs" />
|
||||||
<Compile Include="HttpServer\NativeWebSocket.cs" />
|
<Compile Include="HttpServer\NativeWebSocket.cs" />
|
||||||
|
|
|
@ -290,6 +290,7 @@ namespace MediaBrowser.Server.Implementations.Session
|
||||||
var data = _userDataRepository.GetUserData(user.Id, key);
|
var data = _userDataRepository.GetUserData(user.Id, key);
|
||||||
|
|
||||||
UpdatePlayState(info.Item, data, info.PositionTicks.Value);
|
UpdatePlayState(info.Item, data, info.PositionTicks.Value);
|
||||||
|
|
||||||
await _userDataRepository.SaveUserData(user.Id, key, data, UserDataSaveReason.PlaybackProgress, CancellationToken.None).ConfigureAwait(false);
|
await _userDataRepository.SaveUserData(user.Id, key, data, UserDataSaveReason.PlaybackProgress, CancellationToken.None).ConfigureAwait(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -501,7 +502,12 @@ namespace MediaBrowser.Server.Implementations.Session
|
||||||
return session.SessionController.SendPlaystateCommand(command, cancellationToken);
|
return session.SessionController.SendPlaystateCommand(command, cancellationToken);
|
||||||
}
|
}
|
||||||
|
|
||||||
public Task SendRestartRequiredMessage(CancellationToken cancellationToken)
|
/// <summary>
|
||||||
|
/// Sends the restart required message.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="cancellationToken">The cancellation token.</param>
|
||||||
|
/// <returns>Task.</returns>
|
||||||
|
public Task SendRestartRequiredNotification(CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
var sessions = Sessions.Where(i => i.IsActive && i.SessionController != null).ToList();
|
var sessions = Sessions.Where(i => i.IsActive && i.SessionController != null).ToList();
|
||||||
|
|
||||||
|
@ -509,11 +515,61 @@ namespace MediaBrowser.Server.Implementations.Session
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
await session.SessionController.SendRestartRequiredMessage(cancellationToken).ConfigureAwait(false);
|
await session.SessionController.SendRestartRequiredNotification(cancellationToken).ConfigureAwait(false);
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
_logger.ErrorException("Error in SendRestartRequiredMessage.", ex);
|
_logger.ErrorException("Error in SendRestartRequiredNotification.", ex);
|
||||||
|
}
|
||||||
|
|
||||||
|
}));
|
||||||
|
|
||||||
|
return Task.WhenAll(tasks);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Sends the server shutdown notification.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="cancellationToken">The cancellation token.</param>
|
||||||
|
/// <returns>Task.</returns>
|
||||||
|
public Task SendServerShutdownNotification(CancellationToken cancellationToken)
|
||||||
|
{
|
||||||
|
var sessions = Sessions.Where(i => i.IsActive && i.SessionController != null).ToList();
|
||||||
|
|
||||||
|
var tasks = sessions.Select(session => Task.Run(async () =>
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
await session.SessionController.SendServerShutdownNotification(cancellationToken).ConfigureAwait(false);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
_logger.ErrorException("Error in SendServerShutdownNotification.", ex);
|
||||||
|
}
|
||||||
|
|
||||||
|
}));
|
||||||
|
|
||||||
|
return Task.WhenAll(tasks);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Sends the server restart notification.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="cancellationToken">The cancellation token.</param>
|
||||||
|
/// <returns>Task.</returns>
|
||||||
|
public Task SendServerRestartNotification(CancellationToken cancellationToken)
|
||||||
|
{
|
||||||
|
var sessions = Sessions.Where(i => i.IsActive && i.SessionController != null).ToList();
|
||||||
|
|
||||||
|
var tasks = sessions.Select(session => Task.Run(async () =>
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
await session.SessionController.SendServerRestartNotification(cancellationToken).ConfigureAwait(false);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
_logger.ErrorException("Error in SendServerRestartNotification.", ex);
|
||||||
}
|
}
|
||||||
|
|
||||||
}));
|
}));
|
||||||
|
|
|
@ -84,15 +84,22 @@ namespace MediaBrowser.Server.Implementations.Session
|
||||||
/// Processes the identity message.
|
/// Processes the identity message.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="message">The message.</param>
|
/// <param name="message">The message.</param>
|
||||||
private void ProcessIdentityMessage(WebSocketMessageInfo message)
|
private async void ProcessIdentityMessage(WebSocketMessageInfo message)
|
||||||
{
|
{
|
||||||
_logger.Debug("Received Identity message");
|
_logger.Debug("Received Identity message: " + message.Data);
|
||||||
|
|
||||||
var vals = message.Data.Split('|');
|
var vals = message.Data.Split('|');
|
||||||
|
|
||||||
var client = vals[0];
|
var client = vals[0];
|
||||||
var deviceId = vals[1];
|
var deviceId = vals[1];
|
||||||
var version = vals[2];
|
var version = vals[2];
|
||||||
|
var deviceName = vals.Length > 3 ? vals[3] : string.Empty;
|
||||||
|
|
||||||
|
if (!string.IsNullOrEmpty(deviceName))
|
||||||
|
{
|
||||||
|
_logger.Debug("Logging session activity");
|
||||||
|
await _sessionManager.LogSessionActivity(client, version, deviceId, deviceName, null).ConfigureAwait(false);
|
||||||
|
}
|
||||||
|
|
||||||
var session = _sessionManager.Sessions
|
var session = _sessionManager.Sessions
|
||||||
.FirstOrDefault(i => string.Equals(i.DeviceId, deviceId) &&
|
.FirstOrDefault(i => string.Equals(i.DeviceId, deviceId) &&
|
||||||
|
@ -156,7 +163,7 @@ namespace MediaBrowser.Server.Implementations.Session
|
||||||
|
|
||||||
if (result == null)
|
if (result == null)
|
||||||
{
|
{
|
||||||
_logger.Error("Unable to session based on web socket message");
|
_logger.Error("Unable to find session based on web socket message");
|
||||||
}
|
}
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
|
|
|
@ -134,7 +134,7 @@ namespace MediaBrowser.Server.Implementations.Session
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="cancellationToken">The cancellation token.</param>
|
/// <param name="cancellationToken">The cancellation token.</param>
|
||||||
/// <returns>Task.</returns>
|
/// <returns>Task.</returns>
|
||||||
public Task SendRestartRequiredMessage(CancellationToken cancellationToken)
|
public Task SendRestartRequiredNotification(CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
var socket = GetActiveSocket();
|
var socket = GetActiveSocket();
|
||||||
|
|
||||||
|
@ -145,5 +145,58 @@ namespace MediaBrowser.Server.Implementations.Session
|
||||||
|
|
||||||
}, cancellationToken);
|
}, cancellationToken);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Sends the user data change info.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="info">The info.</param>
|
||||||
|
/// <param name="cancellationToken">The cancellation token.</param>
|
||||||
|
/// <returns>Task.</returns>
|
||||||
|
public Task SendUserDataChangeInfo(UserDataChangeInfo info, CancellationToken cancellationToken)
|
||||||
|
{
|
||||||
|
var socket = GetActiveSocket();
|
||||||
|
|
||||||
|
return socket.SendAsync(new WebSocketMessage<UserDataChangeInfo>
|
||||||
|
{
|
||||||
|
MessageType = "UserDataChanged",
|
||||||
|
Data = info
|
||||||
|
|
||||||
|
}, cancellationToken);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Sends the server shutdown notification.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="cancellationToken">The cancellation token.</param>
|
||||||
|
/// <returns>Task.</returns>
|
||||||
|
public Task SendServerShutdownNotification(CancellationToken cancellationToken)
|
||||||
|
{
|
||||||
|
var socket = GetActiveSocket();
|
||||||
|
|
||||||
|
return socket.SendAsync(new WebSocketMessage<string>
|
||||||
|
{
|
||||||
|
MessageType = "ServerShuttingDown",
|
||||||
|
Data = string.Empty
|
||||||
|
|
||||||
|
}, cancellationToken);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Sends the server restart notification.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="cancellationToken">The cancellation token.</param>
|
||||||
|
/// <returns>Task.</returns>
|
||||||
|
public Task SendServerRestartNotification(CancellationToken cancellationToken)
|
||||||
|
{
|
||||||
|
var socket = GetActiveSocket();
|
||||||
|
|
||||||
|
return socket.SendAsync(new WebSocketMessage<string>
|
||||||
|
{
|
||||||
|
MessageType = "ServerRestarting",
|
||||||
|
Data = string.Empty
|
||||||
|
|
||||||
|
}, cancellationToken);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -488,11 +488,11 @@ namespace MediaBrowser.ServerApplication
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
await ServerManager.SendWebSocketMessageAsync("ServerRestarting", () => string.Empty, CancellationToken.None).ConfigureAwait(false);
|
await SessionManager.SendServerRestartNotification(CancellationToken.None).ConfigureAwait(false);
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
Logger.ErrorException("Error sending server restart web socket message", ex);
|
Logger.ErrorException("Error sending server restart notification", ex);
|
||||||
}
|
}
|
||||||
|
|
||||||
NativeApp.Restart();
|
NativeApp.Restart();
|
||||||
|
@ -609,11 +609,11 @@ namespace MediaBrowser.ServerApplication
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
await ServerManager.SendWebSocketMessageAsync("ServerShuttingDown", () => string.Empty, CancellationToken.None).ConfigureAwait(false);
|
await SessionManager.SendServerShutdownNotification(CancellationToken.None).ConfigureAwait(false);
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
Logger.ErrorException("Error sending server shutdown web socket message", ex);
|
Logger.ErrorException("Error sending server shutdown notification", ex);
|
||||||
}
|
}
|
||||||
|
|
||||||
NativeApp.Shutdown();
|
NativeApp.Shutdown();
|
||||||
|
|
|
@ -170,7 +170,7 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout, wi
|
||||||
webSocket.onopen = function () {
|
webSocket.onopen = function () {
|
||||||
setTimeout(function () {
|
setTimeout(function () {
|
||||||
|
|
||||||
self.sendWebSocketMessage("Identity", clientName + "|" + deviceId + "|" + applicationVersion);
|
self.sendWebSocketMessage("Identity", clientName + "|" + deviceId + "|" + applicationVersion + "|" + deviceName);
|
||||||
|
|
||||||
$(self).trigger("websocketopen");
|
$(self).trigger("websocketopen");
|
||||||
}, 500);
|
}, 500);
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<packages>
|
<packages>
|
||||||
<package id="MediaBrowser.ApiClient.Javascript" version="3.0.178" targetFramework="net45" />
|
<package id="MediaBrowser.ApiClient.Javascript" version="3.0.179" targetFramework="net45" />
|
||||||
<package id="ServiceStack.Common" version="3.9.62" targetFramework="net45" />
|
<package id="ServiceStack.Common" version="3.9.62" targetFramework="net45" />
|
||||||
<package id="ServiceStack.Text" version="3.9.62" targetFramework="net45" />
|
<package id="ServiceStack.Text" version="3.9.62" targetFramework="net45" />
|
||||||
</packages>
|
</packages>
|
Loading…
Reference in New Issue