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

Remove MediaBrowser.Text since it violates licenses and is overall hacky

Browse Source
This commit is contained in:
cvium
2019-01-16 20:50:40 +01:00
committed by Claus Vium
parent 3a5e3ade01
commit b35dcbb9f0
129 changed files with 81 additions and 12173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Emby.Server.Implementations/HttpServer/WebSocketConnection.cs
View File

@@ -1,4 +1,4 @@
using System;
using System;
using System.Net.WebSockets;
using System.Text;
using System.Threading;
@@ -8,8 +8,8 @@ using MediaBrowser.Controller.Net;
using MediaBrowser.Model.Net;
using MediaBrowser.Model.Serialization;
using MediaBrowser.Model.Services;
using MediaBrowser.Model.Text;
using Microsoft.Extensions.Logging;
using UtfUnknown;
namespace Emby.Server.Implementations.HttpServer
{
@@ -68,7 +68,6 @@ namespace Emby.Server.Implementations.HttpServer
/// </summary>
/// <value>The query string.</value>
public QueryParamCollection QueryString { get; set; }
private readonly ITextEncoding _textEncoding;
/// <summary>
/// Initializes a new instance of the <see cref="WebSocketConnection" /> class.
@@ -78,7 +77,7 @@ namespace Emby.Server.Implementations.HttpServer
/// <param name="jsonSerializer">The json serializer.</param>
/// <param name="logger">The logger.</param>
/// <exception cref="ArgumentNullException">socket</exception>
public WebSocketConnection(IWebSocket socket, string remoteEndPoint, IJsonSerializer jsonSerializer, ILogger logger, ITextEncoding textEncoding)
public WebSocketConnection(IWebSocket socket, string remoteEndPoint, IJsonSerializer jsonSerializer, ILogger logger)
{
if (socket == null)
{
@@ -110,7 +109,6 @@ namespace Emby.Server.Implementations.HttpServer
RemoteEndPoint = remoteEndPoint;
_logger = logger;
_textEncoding = textEncoding;
socket.Closed += socket_Closed;
}
@@ -132,8 +130,7 @@ namespace Emby.Server.Implementations.HttpServer
{
return;
}
var charset = _textEncoding.GetDetectedEncodingName(bytes, bytes.Length, null, false);
var charset = CharsetDetector.DetectFromBytes(bytes).Detected?.EncodingName;
if (string.Equals(charset, "utf-8", StringComparison.OrdinalIgnoreCase))
{
@@ -141,7 +138,7 @@ namespace Emby.Server.Implementations.HttpServer
}
else
{
OnReceiveInternal(_textEncoding.GetASCIIEncoding().GetString(bytes, 0, bytes.Length));
OnReceiveInternal(Encoding.ASCII.GetString(bytes, 0, bytes.Length));
}
}
@@ -161,7 +158,7 @@ namespace Emby.Server.Implementations.HttpServer
var bytes = memory.Slice(0, length).ToArray();
var charset = _textEncoding.GetDetectedEncodingName(bytes, bytes.Length, null, false);
var charset = CharsetDetector.DetectFromBytes(bytes).Detected?.EncodingName;
if (string.Equals(charset, "utf-8", StringComparison.OrdinalIgnoreCase))
{
@@ -169,7 +166,7 @@ namespace Emby.Server.Implementations.HttpServer
}
else
{
OnReceiveInternal(_textEncoding.GetASCIIEncoding().GetString(bytes, 0, bytes.Length));
OnReceiveInternal(Encoding.ASCII.GetString(bytes, 0, bytes.Length));
}
}