Backupppert/jellyfin
0
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-07-09 07:10:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

simplify message parsing

Browse source
This commit is contained in:
Luke Pulverenti 2015-03-08 14:49:51 -04:00
parent 5060cd3b82
commit 98992ca580
2 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
MediaBrowser.Server.Implementations/HttpServer/SocketSharp/SharpWebSocket.cs
View file

@ -65,9 +65,10 @@ namespace MediaBrowser.Server.Implementations.HttpServer.SocketSharp
void socket_OnMessage(object sender, SocketHttpListener.MessageEventArgs e)
{
if (OnReceive != null)
if (OnReceiveBytes != null)
{
OnReceiveBytes(e.RawData);
//OnReceive(e.Data);
}
}

24
MediaBrowser.Server.Implementations/ServerManager/WebSocketConnection.cs
View file

@ -1,4 +1,5 @@
using MediaBrowser.Common.Events;
using System.Text;
using MediaBrowser.Common.Events;
using MediaBrowser.Controller.Net;
using MediaBrowser.Model.Logging;
using MediaBrowser.Model.Net;
@ -122,22 +123,21 @@ namespace MediaBrowser.Server.Implementations.ServerManager
}
try
{
WebSocketMessageInfo info;
//_logger.Debug(Encoding.UTF8.GetString(bytes));
using (var memoryStream = new MemoryStream(bytes))
{
var stub = (WebSocketMessage<object>)_jsonSerializer.DeserializeFromStream(memoryStream, typeof(WebSocketMessage<object>));
var info = (WebSocketMessageInfo)_jsonSerializer.DeserializeFromStream(memoryStream, typeof(WebSocketMessageInfo));
info = new WebSocketMessageInfo
{
MessageType = stub.MessageType,
Data = stub.Data == null ? null : stub.Data.ToString()
};
//info = new WebSocketMessageInfo
//{
// MessageType = stub.MessageType,
// Data = stub.Data == null ? null : stub.Data.ToString()
//};
info.Connection = this;
OnReceive(info);
}
info.Connection = this;
OnReceive(info);
}
catch (Exception ex)
{