alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-02-09 06:02:24 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Cleanup/simplification

Browse Source 
* Removed useless copies/allocations
* Reduced unneeded complexity
This commit is contained in:
Bond-009
2019-03-07 15:54:30 +01:00
parent 10a0d6bdba
commit c5fce647de
19 changed files with 127 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Emby.Server.Implementations/SocketSharp/RequestMono.cs
View File

@@ -79,7 +79,7 @@ namespace Emby.Server.Implementations.SocketSharp
byte[] copy = new byte[e.Length];
input.Position = e.Start;
input.Read(copy, 0, (int)e.Length);
await input.ReadAsync(copy, 0, (int)e.Length).ConfigureAwait(false);
form.Add(e.Name, (e.Encoding ?? ContentEncoding).GetString(copy, 0, copy.Length));
}
@@ -98,11 +98,11 @@ namespace Emby.Server.Implementations.SocketSharp
var form = new WebROCollection();
files = new Dictionary<string, HttpPostedFile>();
if (IsContentType("multipart/form-data", true))
if (IsContentType("multipart/form-data"))
{
await LoadMultiPart(form).ConfigureAwait(false);
}
else if (IsContentType("application/x-www-form-urlencoded", true))
else if (IsContentType("application/x-www-form-urlencoded"))
{
await LoadWwwForm(form).ConfigureAwait(false);
}
@@ -200,19 +200,14 @@ namespace Emby.Server.Implementations.SocketSharp
return false;
}
private bool IsContentType(string ct, bool starts_with)
private bool IsContentType(string ct)
{
if (ct == null || ContentType == null)
if (ContentType == null)
{
return false;
}
if (starts_with)
{
return ContentType.StartsWith(ct, StringComparison.OrdinalIgnoreCase);
}
return string.Equals(ContentType, ct, StringComparison.OrdinalIgnoreCase);
return ContentType.StartsWith(ct, StringComparison.OrdinalIgnoreCase);
}
private async Task LoadWwwForm(WebROCollection form)

4
Emby.Server.Implementations/SocketSharp/WebSocketSharpRequest.cs
View File

@@ -4,7 +4,6 @@ using System.Globalization;
using System.IO;
using System.Net;
using System.Text;
using Emby.Server.Implementations.HttpServer;
using MediaBrowser.Model.Services;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Http.Extensions;
@@ -405,8 +404,7 @@ namespace Emby.Server.Implementations.SocketSharp
return null;
}
var path = sbPathInfo.ToString();
return path.Length > 1 ? path.TrimEnd('/') : "/";
return sbPathInfo.Length > 1 ? sbPathInfo.ToString().TrimEnd('/') : "/";
}
public string UserAgent => request.Headers[HeaderNames.UserAgent];