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

ReSharper conform to 'var' settings

Browse Source
This commit is contained in:
Erwin de Haan
2019-01-13 21:37:13 +01:00
parent a36658f6f0
commit 65bd052f3e
199 changed files with 1063 additions and 1063 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SocketHttpListener/Ext.cs
View File

@@ -161,7 +161,7 @@ namespace SocketHttpListener
internal static bool Contains<T>(this IEnumerable<T> source, Func<T, bool> condition)
{
foreach (T elm in source)
foreach (var elm in source)
if (condition(elm))
return true;

4
SocketHttpListener/MessageEventArgs.cs
View File

@@ -9,8 +9,8 @@ namespace SocketHttpListener
/// <remarks>
/// A <see cref="WebSocket.OnMessage"/> event occurs when the <see cref="WebSocket"/> receives
/// a text or binary data frame.
/// If you want to get the received data, you access the <see cref="MessageEventArgs.Data"/> or
/// <see cref="MessageEventArgs.RawData"/> property.
/// If you want to get the received data, you access the <see cref="Data"/> or
/// <see cref="RawData"/> property.
/// </remarks>
public class MessageEventArgs : EventArgs
{

8
SocketHttpListener/Net/ChunkStream.cs
View File

@@ -108,7 +108,7 @@ namespace SocketHttpListener.Net
var chunksForRemoving = new List<Chunk>(count);
for (int i = 0; i < count; i++)
{
Chunk chunk = _chunks[i];
var chunk = _chunks[i];
if (chunk.Offset == chunk.Bytes.Length)
{
@@ -189,7 +189,7 @@ namespace SocketHttpListener.Net
int count = _chunks.Count;
for (int i = 0; i < count; i++)
{
Chunk ch = _chunks[i];
var ch = _chunks[i];
if (ch == null || ch.Bytes == null)
continue;
if (ch.Bytes.Length > 0 && ch.Offset < ch.Bytes.Length)
@@ -368,7 +368,7 @@ namespace SocketHttpListener.Net
return State.Trailer;
}
StringReader reader = new StringReader(_saved.ToString());
var reader = new StringReader(_saved.ToString());
string line;
while ((line = reader.ReadLine()) != null && line != "")
_headers.Add(line);
@@ -378,7 +378,7 @@ namespace SocketHttpListener.Net
private static void ThrowProtocolViolation(string message)
{
WebException we = new WebException(message, null, WebExceptionStatus.ServerProtocolViolation, null);
var we = new WebException(message, null, WebExceptionStatus.ServerProtocolViolation, null);
throw we;
}
}

14
SocketHttpListener/Net/ChunkedInputStream.cs
View File

@@ -61,7 +61,7 @@ namespace SocketHttpListener.Net
: base(stream, buffer, offset, length)
{
_context = context;
WebHeaderCollection coll = (WebHeaderCollection)context.Request.Headers;
var coll = (WebHeaderCollection)context.Request.Headers;
_decoder = new ChunkStream(coll);
}
@@ -73,13 +73,13 @@ namespace SocketHttpListener.Net
protected override int ReadCore(byte[] buffer, int offset, int count)
{
IAsyncResult ares = BeginReadCore(buffer, offset, count, null, null);
var ares = BeginReadCore(buffer, offset, count, null, null);
return EndRead(ares);
}
protected override IAsyncResult BeginReadCore(byte[] buffer, int offset, int size, AsyncCallback cback, object state)
{
HttpStreamAsyncResult ares = new HttpStreamAsyncResult(this);
var ares = new HttpStreamAsyncResult(this);
ares._callback = cback;
ares._state = state;
if (_no_more_data || size == 0 || _closed)
@@ -107,7 +107,7 @@ namespace SocketHttpListener.Net
ares._buffer = new byte[8192];
ares._offset = 0;
ares._count = 8192;
ReadBufferState rb = new ReadBufferState(buffer, offset, size, ares);
var rb = new ReadBufferState(buffer, offset, size, ares);
rb.InitialCount += nread;
base.BeginReadCore(ares._buffer, ares._offset, ares._count, OnRead, rb);
return ares;
@@ -115,8 +115,8 @@ namespace SocketHttpListener.Net
private void OnRead(IAsyncResult base_ares)
{
ReadBufferState rb = (ReadBufferState)base_ares.AsyncState;
HttpStreamAsyncResult ares = rb.Ares;
var rb = (ReadBufferState)base_ares.AsyncState;
var ares = rb.Ares;
try
{
int nread = base.EndRead(base_ares);
@@ -155,7 +155,7 @@ namespace SocketHttpListener.Net
if (asyncResult == null)
throw new ArgumentNullException(nameof(asyncResult));
HttpStreamAsyncResult ares = asyncResult as HttpStreamAsyncResult;
var ares = asyncResult as HttpStreamAsyncResult;
if (ares == null || !ReferenceEquals(this, ares._parent))
{
throw new ArgumentException("Invalid async result");

8
SocketHttpListener/Net/HttpConnection.cs
View File

@@ -212,7 +212,7 @@ namespace SocketHttpListener.Net
private static void OnRead(IAsyncResult ares)
{
HttpConnection cnc = (HttpConnection)ares.AsyncState;
var cnc = (HttpConnection)ares.AsyncState;
cnc.OnReadInternal(ares);
}
@@ -269,7 +269,7 @@ namespace SocketHttpListener.Net
Close(true);
return;
}
HttpListener listener = _epl.Listener;
var listener = _epl.Listener;
if (_lastListener != listener)
{
RemoveConnection();
@@ -417,7 +417,7 @@ namespace SocketHttpListener.Net
{
try
{
HttpListenerResponse response = _context.Response;
var response = _context.Response;
response.StatusCode = status;
response.ContentType = "text/html";
string description = HttpStatusDescription.Get(status);
@@ -509,7 +509,7 @@ namespace SocketHttpListener.Net
return;
}
Socket s = _socket;
var s = _socket;
_socket = null;
try
{

26
SocketHttpListener/Net/HttpEndPointListener.cs
View File

@@ -160,7 +160,7 @@ namespace SocketHttpListener.Net
}
catch (Exception ex)
{
HttpEndPointListener epl = (HttpEndPointListener)acceptEventArg.UserToken;
var epl = (HttpEndPointListener)acceptEventArg.UserToken;
epl._logger.LogError(ex, "Error in socket.AcceptAsync");
}
@@ -176,7 +176,7 @@ namespace SocketHttpListener.Net
private static async void ProcessAccept(SocketAsyncEventArgs args)
{
HttpEndPointListener epl = (HttpEndPointListener)args.UserToken;
var epl = (HttpEndPointListener)args.UserToken;
if (epl._closed)
{
@@ -214,7 +214,7 @@ namespace SocketHttpListener.Net
var localEndPointString = accepted.LocalEndPoint == null ? string.Empty : accepted.LocalEndPoint.ToString();
//_logger.LogInformation("HttpEndPointListener Accepting connection from {0} to {1} secure connection requested: {2}", remoteEndPointString, localEndPointString, _secure);
HttpConnection conn = new HttpConnection(epl._logger, accepted, epl, epl._secure, epl._cert, epl._cryptoProvider, epl._streamHelper, epl._textEncoding, epl._fileSystem, epl._environment);
var conn = new HttpConnection(epl._logger, accepted, epl, epl._secure, epl._cert, epl._cryptoProvider, epl._streamHelper, epl._textEncoding, epl._fileSystem, epl._environment);
await conn.Init().ConfigureAwait(false);
@@ -276,9 +276,9 @@ namespace SocketHttpListener.Net
public bool BindContext(HttpListenerContext context)
{
HttpListenerRequest req = context.Request;
var req = context.Request;
ListenerPrefix prefix;
HttpListener listener = SearchListener(req.Url, out prefix);
var listener = SearchListener(req.Url, out prefix);
if (listener == null)
return false;
@@ -310,8 +310,8 @@ namespace SocketHttpListener.Net
if (host != null && host != "")
{
Dictionary<ListenerPrefix, HttpListener> localPrefixes = _prefixes;
foreach (ListenerPrefix p in localPrefixes.Keys)
var localPrefixes = _prefixes;
foreach (var p in localPrefixes.Keys)
{
string ppath = p.Path;
if (ppath.Length < bestLength)
@@ -331,7 +331,7 @@ namespace SocketHttpListener.Net
return bestMatch;
}
List<ListenerPrefix> list = _unhandledPrefixes;
var list = _unhandledPrefixes;
bestMatch = MatchFromList(host, path, list, out prefix);
if (path != pathSlash && bestMatch == null)
@@ -361,7 +361,7 @@ namespace SocketHttpListener.Net
HttpListener bestMatch = null;
int bestLength = -1;
foreach (ListenerPrefix p in list)
foreach (var p in list)
{
string ppath = p.Path;
if (ppath.Length < bestLength)
@@ -383,7 +383,7 @@ namespace SocketHttpListener.Net
if (list == null)
return;
foreach (ListenerPrefix p in list)
foreach (var p in list)
{
if (p.Path == prefix.Path)
throw new Exception("net_listener_already");
@@ -399,7 +399,7 @@ namespace SocketHttpListener.Net
int c = list.Count;
for (int i = 0; i < c; i++)
{
ListenerPrefix p = list[i];
var p = list[i];
if (p.Path == prefix.Path)
{
list.RemoveAt(i);
@@ -414,7 +414,7 @@ namespace SocketHttpListener.Net
if (_prefixes.Count > 0)
return;
List<ListenerPrefix> list = _unhandledPrefixes;
var list = _unhandledPrefixes;
if (list != null && list.Count > 0)
return;
@@ -434,7 +434,7 @@ namespace SocketHttpListener.Net
// Clone the list because RemoveConnection can be called from Close
var connections = new List<HttpConnection>(_unregisteredConnections.Keys);
foreach (HttpConnection c in connections)
foreach (var c in connections)
c.Close(true);
_unregisteredConnections.Clear();
}

10
SocketHttpListener/Net/HttpEndPointManager.cs
View File

@@ -17,7 +17,7 @@ namespace SocketHttpListener.Net
public static void AddListener(ILogger logger, HttpListener listener)
{
List<string> added = new List<string>();
var added = new List<string>();
try
{
lock ((s_ipEndPoints as ICollection).SyncRoot)
@@ -64,7 +64,7 @@ namespace SocketHttpListener.Net
}
}
ListenerPrefix lp = new ListenerPrefix(p);
var lp = new ListenerPrefix(p);
if (lp.Host != "*" && lp.Host != "+" && Uri.CheckHostName(lp.Host) == UriHostNameType.Unknown)
throw new HttpListenerException((int)HttpStatusCode.BadRequest, "net_listener_host");
@@ -75,7 +75,7 @@ namespace SocketHttpListener.Net
throw new HttpListenerException((int)HttpStatusCode.BadRequest, "net_invalid_path");
// listens on all the interfaces if host name cannot be parsed by IPAddress.
HttpEndPointListener epl = GetEPListener(logger, lp.Host, lp.Port, listener, lp.Secure);
var epl = GetEPListener(logger, lp.Host, lp.Port, listener, lp.Secure);
epl.AddPrefix(lp, listener);
}
@@ -179,14 +179,14 @@ namespace SocketHttpListener.Net
private static void RemovePrefixInternal(ILogger logger, string prefix, HttpListener listener)
{
ListenerPrefix lp = new ListenerPrefix(prefix);
var lp = new ListenerPrefix(prefix);
if (lp.Path.IndexOf('%') != -1)
return;
if (lp.Path.IndexOf("//", StringComparison.Ordinal) != -1)
return;
HttpEndPointListener epl = GetEPListener(logger, lp.Host, lp.Port, listener, lp.Secure);
var epl = GetEPListener(logger, lp.Host, lp.Port, listener, lp.Secure);
epl.RemovePrefix(lp, listener);
}
}

2
SocketHttpListener/Net/HttpListenerContext.Managed.cs
View File

@@ -44,7 +44,7 @@ namespace SocketHttpListener.Net
}
internal IPrincipal ParseBasicAuthentication(string authData) =>
TryParseBasicAuth(authData, out HttpStatusCode errorCode, out string username, out string password) ?
TryParseBasicAuth(authData, out var errorCode, out string username, out string password) ?
new GenericPrincipal(new HttpListenerBasicIdentity(username, password), Array.Empty<string>()) :
null;

4
SocketHttpListener/Net/HttpListenerRequest.Managed.cs
View File

@@ -180,7 +180,7 @@ namespace SocketHttpListener.Net
if (string.Compare(Headers[HttpKnownHeaderNames.Expect], "100-continue", StringComparison.OrdinalIgnoreCase) == 0)
{
HttpResponseStream output = _context.Connection.GetResponseStream();
var output = _context.Connection.GetResponseStream();
output.InternalWrite(s_100continue, 0, s_100continue.Length);
}
}
@@ -256,7 +256,7 @@ namespace SocketHttpListener.Net
{
try
{
IAsyncResult ares = InputStream.BeginRead(bytes, 0, length, null, null);
var ares = InputStream.BeginRead(bytes, 0, length, null, null);
if (!ares.IsCompleted && !ares.AsyncWaitHandle.WaitOne(1000))
return false;
if (InputStream.EndRead(ares) <= 0)

10
SocketHttpListener/Net/HttpListenerRequest.cs
View File

@@ -23,7 +23,7 @@ namespace SocketHttpListener.Net
private static CookieCollection ParseCookies(Uri uri, string setCookieHeader)
{
CookieCollection cookies = new CookieCollection();
var cookies = new CookieCollection();
return cookies;
}
@@ -171,7 +171,7 @@ namespace SocketHttpListener.Net
{
get
{
QueryParamCollection queryString = new QueryParamCollection();
var queryString = new QueryParamCollection();
Helpers.FillFromString(queryString, Url.Query, true, ContentEncoding);
return queryString;
}
@@ -197,7 +197,7 @@ namespace SocketHttpListener.Net
return null;
}
bool success = Uri.TryCreate(referrer, UriKind.RelativeOrAbsolute, out Uri urlReferrer);
bool success = Uri.TryCreate(referrer, UriKind.RelativeOrAbsolute, out var urlReferrer);
return success ? urlReferrer : null;
}
}
@@ -296,7 +296,7 @@ namespace SocketHttpListener.Net
// collect comma-separated values into list
List<string> values = new List<string>();
var values = new List<string>();
int i = 0;
while (i < l)
@@ -341,7 +341,7 @@ namespace SocketHttpListener.Net
private static string UrlDecodeStringFromStringInternal(string s, Encoding e)
{
int count = s.Length;
UrlDecoder helper = new UrlDecoder(count, e);
var helper = new UrlDecoder(count, e);
// go through the string's chars collapsing %XX and %uXXXX and
// appending each char as char, with exception of %XX constructs

10
SocketHttpListener/Net/HttpListenerRequestUriBuilder.cs
View File

@@ -54,7 +54,7 @@ namespace SocketHttpListener.Net
public static Uri GetRequestUri(string rawUri, string cookedUriScheme, string cookedUriHost,
string cookedUriPath, string cookedUriQuery)
{
HttpListenerRequestUriBuilder builder = new HttpListenerRequestUriBuilder(rawUri,
var builder = new HttpListenerRequestUriBuilder(rawUri,
cookedUriScheme, cookedUriHost, cookedUriPath, cookedUriQuery);
return builder.Build();
@@ -94,10 +94,10 @@ namespace SocketHttpListener.Net
// Try to check the raw path using first the primary encoding (according to http.sys settings);
// if it fails try the secondary encoding.
ParsingResult result = BuildRequestUriUsingRawPath(GetEncoding(EncodingType.Primary));
var result = BuildRequestUriUsingRawPath(GetEncoding(EncodingType.Primary));
if (result == ParsingResult.EncodingError)
{
Encoding secondaryEncoding = GetEncoding(EncodingType.Secondary);
var secondaryEncoding = GetEncoding(EncodingType.Secondary);
result = BuildRequestUriUsingRawPath(secondaryEncoding);
}
isValid = (result == ParsingResult.Success) ? true : false;
@@ -136,7 +136,7 @@ namespace SocketHttpListener.Net
_requestUriString.Append(Uri.SchemeDelimiter);
_requestUriString.Append(_cookedUriHost);
ParsingResult result = ParseRawPath(encoding);
var result = ParseRawPath(encoding);
if (result == ParsingResult.Success)
{
_requestUriString.Append(_cookedUriQuery);
@@ -327,7 +327,7 @@ namespace SocketHttpListener.Net
private static string GetOctetsAsString(IEnumerable<byte> octets)
{
StringBuilder octetString = new StringBuilder();
var octetString = new StringBuilder();
bool first = true;
foreach (byte octet in octets)

4
SocketHttpListener/Net/HttpListenerResponse.Managed.cs
View File

@@ -263,8 +263,8 @@ namespace SocketHttpListener.Net
ComputeCookies();
}
Encoding encoding = _textEncoding.GetDefaultEncoding();
StreamWriter writer = new StreamWriter(ms, encoding, 256);
var encoding = _textEncoding.GetDefaultEncoding();
var writer = new StreamWriter(ms, encoding, 256);
writer.Write("HTTP/1.1 {0} ", _statusCode); // "1.1" matches Windows implementation, which ignores the response version
writer.Flush();
byte[] statusDescriptionBytes = WebHeaderEncoding.GetBytes(StatusDescription);

4
SocketHttpListener/Net/HttpRequestStream.Managed.cs
View File

@@ -124,7 +124,7 @@ namespace SocketHttpListener.Net
{
if (size == 0 || _closed)
{
HttpStreamAsyncResult ares = new HttpStreamAsyncResult(this);
var ares = new HttpStreamAsyncResult(this);
ares._callback = cback;
ares._state = state;
ares.Complete();
@@ -134,7 +134,7 @@ namespace SocketHttpListener.Net
int nread = FillFromBuffer(buffer, offset, size);
if (nread > 0 || nread == -1)
{
HttpStreamAsyncResult ares = new HttpStreamAsyncResult(this);
var ares = new HttpStreamAsyncResult(this);
ares._buffer = buffer;
ares._offset = offset;
ares._count = size;

12
SocketHttpListener/Net/HttpResponseStream.Managed.cs
View File

@@ -70,7 +70,7 @@ namespace SocketHttpListener.Net
private void DisposeCore()
{
byte[] bytes = null;
MemoryStream ms = GetHeaders(true);
var ms = GetHeaders(true);
bool chunked = _response.SendChunked;
if (_stream.CanWrite)
{
@@ -110,7 +110,7 @@ namespace SocketHttpListener.Net
if (_stream.CanWrite)
{
MemoryStream ms = GetHeaders(closing: false, isWebSocketHandshake: true);
var ms = GetHeaders(closing: false, isWebSocketHandshake: true);
bool chunked = _response.SendChunked;
long start = ms.Position;
@@ -146,7 +146,7 @@ namespace SocketHttpListener.Net
return null;
}
MemoryStream ms = new MemoryStream();
var ms = new MemoryStream();
_response.SendHeaders(closing, ms, isWebSocketHandshake);
return ms;
}
@@ -190,7 +190,7 @@ namespace SocketHttpListener.Net
return;
byte[] bytes = null;
MemoryStream ms = GetHeaders(false);
var ms = GetHeaders(false);
bool chunked = _response.SendChunked;
if (ms != null)
{
@@ -226,7 +226,7 @@ namespace SocketHttpListener.Net
{
if (_closed)
{
HttpStreamAsyncResult ares = new HttpStreamAsyncResult(this);
var ares = new HttpStreamAsyncResult(this);
ares._callback = cback;
ares._state = state;
ares.Complete();
@@ -234,7 +234,7 @@ namespace SocketHttpListener.Net
}
byte[] bytes = null;
MemoryStream ms = GetHeaders(false);
var ms = GetHeaders(false);
bool chunked = _response.SendChunked;
if (ms != null)
{

2
SocketHttpListener/Net/ListenerPrefix.cs
View File

@@ -40,7 +40,7 @@ namespace SocketHttpListener.Net
// Equals and GetHashCode are required to detect duplicates in HttpListenerPrefixCollection.
public override bool Equals(object o)
{
ListenerPrefix other = o as ListenerPrefix;
var other = o as ListenerPrefix;
if (other == null)
return false;

4
SocketHttpListener/Net/WebHeaderCollection.cs
View File

@@ -234,7 +234,7 @@ namespace SocketHttpListener.Net
internal string ToStringMultiValue()
{
StringBuilder sb = new StringBuilder();
var sb = new StringBuilder();
int count = base.Count;
for (int i = 0; i < count; i++)
@@ -263,7 +263,7 @@ namespace SocketHttpListener.Net
public override string ToString()
{
StringBuilder sb = new StringBuilder();
var sb = new StringBuilder();
int count = base.Count;
for (int i = 0; i < count; i++)

10
SocketHttpListener/Net/WebSockets/HttpWebSocket.Managed.cs
View File

@@ -16,8 +16,8 @@ namespace SocketHttpListener.Net.WebSockets
ValidateOptions(subProtocol, receiveBufferSize, MinSendBufferSize, keepAliveInterval);
// get property will create a new response if one doesn't exist.
HttpListenerResponse response = context.Response;
HttpListenerRequest request = context.Request;
var response = context.Response;
var request = context.Request;
ValidateWebSocketHeaders(context);
string secWebSocketVersion = request.Headers[HttpKnownHeaderNames.SecWebSocketVersion];
@@ -50,15 +50,15 @@ namespace SocketHttpListener.Net.WebSockets
response.StatusCode = (int)HttpStatusCode.SwitchingProtocols; // HTTP 101
response.StatusDescription = HttpStatusDescription.Get(HttpStatusCode.SwitchingProtocols);
HttpResponseStream responseStream = response.OutputStream as HttpResponseStream;
var responseStream = response.OutputStream as HttpResponseStream;
// Send websocket handshake headers
await responseStream.WriteWebSocketHandshakeHeadersAsync().ConfigureAwait(false);
//WebSocket webSocket = WebSocket.CreateFromStream(context.Connection.ConnectedStream, isServer: true, subProtocol, keepAliveInterval);
WebSocket webSocket = new WebSocket(subProtocol);
var webSocket = new WebSocket(subProtocol);
HttpListenerWebSocketContext webSocketContext = new HttpListenerWebSocketContext(
var webSocketContext = new HttpListenerWebSocketContext(
request.Url,
request.Headers,
request.Cookies,

2
SocketHttpListener/Net/WebSockets/HttpWebSocket.cs
View File

@@ -19,7 +19,7 @@ namespace SocketHttpListener.Net.WebSockets
string retVal;
// SHA1 used only for hashing purposes, not for crypto. Check here for FIPS compat.
using (SHA1 sha1 = SHA1.Create())
using (var sha1 = SHA1.Create())
{
string acceptString = string.Concat(secWebSocketKey, HttpWebSocket.SecWebSocketKeyGuid);
byte[] toHash = Encoding.UTF8.GetBytes(acceptString);

2
SocketHttpListener/Net/WebSockets/WebSocketValidate.cs
View File

@@ -20,7 +20,7 @@ namespace SocketHttpListener.Net.WebSockets
if (validStates != null && validStates.Length > 0)
{
foreach (WebSocketState validState in validStates)
foreach (var validState in validStates)
{
if (currentState == validState)
{