starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-23 01:05:19 +03:00
Code Issues Packages Projects Releases Wiki Activity

update translations

Browse Source
This commit is contained in:
Luke Pulverenti
2014-07-20 00:46:29 -04:00
parent 880fa21674
commit ce20066bc0
73 changed files with 1765 additions and 1363 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
MediaBrowser.Server.Implementations/ServerManager/WebSocketConnection.cs
View File

@@ -194,9 +194,9 @@ namespace MediaBrowser.Server.Implementations.ServerManager
throw new ArgumentNullException("message");
}
var bytes = _jsonSerializer.SerializeToBytes(message);
var json = _jsonSerializer.SerializeToString(message);
return SendAsync(bytes, cancellationToken);
return SendAsync(json, cancellationToken);
}
/// <summary>
@@ -205,20 +205,7 @@ namespace MediaBrowser.Server.Implementations.ServerManager
/// <param name="buffer">The buffer.</param>
/// <param name="cancellationToken">The cancellation token.</param>
/// <returns>Task.</returns>
public Task SendAsync(byte[] buffer, CancellationToken cancellationToken)
{
return SendAsync(buffer, WebSocketMessageType.Text, cancellationToken);
}
/// <summary>
/// Sends a message asynchronously.
/// </summary>
/// <param name="buffer">The buffer.</param>
/// <param name="type">The type.</param>
/// <param name="cancellationToken">The cancellation token.</param>
/// <returns>Task.</returns>
/// <exception cref="System.ArgumentNullException">buffer</exception>
public async Task SendAsync(byte[] buffer, WebSocketMessageType type, CancellationToken cancellationToken)
public async Task SendAsync(byte[] buffer, CancellationToken cancellationToken)
{
if (buffer == null)
{
@@ -233,7 +220,42 @@ namespace MediaBrowser.Server.Implementations.ServerManager
try
{
await _socket.SendAsync(buffer, type, true, cancellationToken);
await _socket.SendAsync(buffer, true, cancellationToken);
}
catch (OperationCanceledException)
{
_logger.Info("WebSocket message to {0} was cancelled", RemoteEndPoint);
throw;
}
catch (Exception ex)
{
_logger.ErrorException("Error sending WebSocket message {0}", ex, RemoteEndPoint);
throw;
}
finally
{
_sendSemaphore.Release();
}
}
public async Task SendAsync(string text, CancellationToken cancellationToken)
{
if (string.IsNullOrWhiteSpace(text))
{
throw new ArgumentNullException("text");
}
cancellationToken.ThrowIfCancellationRequested();
// Per msdn docs, attempting to send simultaneous messages will result in one failing.
// This should help us workaround that and ensure all messages get sent
await _sendSemaphore.WaitAsync(cancellationToken).ConfigureAwait(false);
try
{
await _socket.SendAsync(text, true, cancellationToken);
}
catch (OperationCanceledException)
{