open-source-mirrors
/
jellyfin
mirror of https://github.com/jellyfin/jellyfin
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2742 from Bond-009/warn18

Browse Source 
Enable Microsoft.CodeAnalysis.FxCopAnalyzers for Jellyfin.Common
pull/2758/head
Vasily 5 years ago committed by GitHub
parent 65542c7c98 2be394089e
commit c85cb85eea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 16 additions and 23 deletions
Show Stats Download Patch File Download Diff File

15
Emby.Server.Implementations/HttpClientManager/HttpClientManager.cs
Unescape View File

@ -96,13 +96,13 @@ namespace Emby.Server.Implementations.HttpClientManager
switch (options.DecompressionMethod)
{
case CompressionMethod.Deflate | CompressionMethod.Gzip:
case CompressionMethods.Deflate | CompressionMethods.Gzip:
request.Headers.Add(HeaderNames.AcceptEncoding, new[] { "gzip", "deflate" });
break;
case CompressionMethod.Deflate:
case CompressionMethods.Deflate:
request.Headers.Add(HeaderNames.AcceptEncoding, "deflate");
break;
case CompressionMethod.Gzip:
case CompressionMethods.Gzip:
request.Headers.Add(HeaderNames.AcceptEncoding, "gzip");
break;
default:
@ -239,15 +239,10 @@ namespace Emby.Server.Implementations.HttpClientManager
var httpWebRequest = GetRequestMessage(options, httpMethod);
if (options.RequestContentBytes != null
|| !string.IsNullOrEmpty(options.RequestContent)
if (!string.IsNullOrEmpty(options.RequestContent)
|| httpMethod == HttpMethod.Post)
{
if (options.RequestContentBytes != null)
{
httpWebRequest.Content = new ByteArrayContent(options.RequestContentBytes);
}
else if (options.RequestContent != null)
if (options.RequestContent != null)
{
httpWebRequest.Content = new StringContent(
options.RequestContent,

2
Emby.Server.Implementations/LiveTv/EmbyTV/DirectRecorder.cs
Unescape View File

@ -72,7 +72,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
UserAgent = "Emby/3.0",
// Shouldn't matter but may cause issues
DecompressionMethod = CompressionMethod.None
DecompressionMethod = CompressionMethods.None
};
using (var response = await _httpClient.SendAsync(httpRequestOptions, HttpMethod.Get).ConfigureAwait(false))

4
Emby.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs
Unescape View File

@ -635,7 +635,7 @@ namespace Emby.Server.Implementations.LiveTv.Listings
ListingsProviderInfo providerInfo)
{
// Schedules direct requires that the client support compression and will return a 400 response without it
options.DecompressionMethod = CompressionMethod.Deflate;
options.DecompressionMethod = CompressionMethods.Deflate;
try
{
@ -665,7 +665,7 @@ namespace Emby.Server.Implementations.LiveTv.Listings
ListingsProviderInfo providerInfo)
{
// Schedules direct requires that the client support compression and will return a 400 response without it
options.DecompressionMethod = CompressionMethod.Deflate;
options.DecompressionMethod = CompressionMethods.Deflate;
try
{

2
Emby.Server.Implementations/LiveTv/Listings/XmlTvListingsProvider.cs
Unescape View File

@ -83,7 +83,7 @@ namespace Emby.Server.Implementations.LiveTv.Listings
{
CancellationToken = cancellationToken,
Url = path,
DecompressionMethod = CompressionMethod.Gzip,
DecompressionMethod = CompressionMethods.Gzip,
},
HttpMethod.Get).ConfigureAwait(false))
using (var stream = res.Content)

2
Emby.Server.Implementations/LiveTv/TunerHosts/SharedHttpStream.cs
Unescape View File

@ -59,7 +59,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
Url = url,
CancellationToken = CancellationToken.None,
BufferContent = false,
DecompressionMethod = CompressionMethod.None
DecompressionMethod = CompressionMethods.None
};
foreach (var header in mediaSource.RequiredHttpHeaders)

2
MediaBrowser.Common/Cryptography/Extensions.cs → MediaBrowser.Common/Cryptography/CryptoExtensions.cs
Unescape View File

@ -9,7 +9,7 @@ namespace MediaBrowser.Common.Cryptography
/// <summary>
/// Class containing extension methods for working with Jellyfin cryptography objects.
/// </summary>
public static class Extensions
public static class CryptoExtensions
{
/// <summary>
/// Creates a new <see cref="PasswordHash" /> instance.

2
MediaBrowser.Common/MediaBrowser.Common.csproj
Unescape View File

@ -30,7 +30,7 @@
<!-- Code analyzers-->
<ItemGroup Condition=" '$(Configuration)' == 'Debug' ">
<!-- <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8" PrivateAssets="All" /> -->
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8" PrivateAssets="All" />
<PackageReference Include="SerilogAnalyzer" Version="0.15.0" PrivateAssets="All" />
<!-- <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="All" /> -->
<PackageReference Include="SmartAnalyzers.MultithreadingAnalyzer" Version="1.1.31" PrivateAssets="All" />

8
MediaBrowser.Common/Net/HttpRequestOptions.cs
Unescape View File

@ -20,7 +20,7 @@ namespace MediaBrowser.Common.Net
RequestHeaders = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
CacheMode = CacheMode.None;
DecompressionMethod = CompressionMethod.Deflate;
DecompressionMethod = CompressionMethods.Deflate;
}
/// <summary>
@ -29,7 +29,7 @@ namespace MediaBrowser.Common.Net
/// <value>The URL.</value>
public string Url { get; set; }
public CompressionMethod DecompressionMethod { get; set; }
public CompressionMethods DecompressionMethod { get; set; }
/// <summary>
/// Gets or sets the accept header.
@ -83,8 +83,6 @@ namespace MediaBrowser.Common.Net
public string RequestContent { get; set; }
public byte[] RequestContentBytes { get; set; }
public bool BufferContent { get; set; }
public bool LogErrorResponseBody { get; set; }
@ -112,7 +110,7 @@ namespace MediaBrowser.Common.Net
}
[Flags]
public enum CompressionMethod
public enum CompressionMethods
{
None = 0b00000001,
Deflate = 0b00000010,

2
MediaBrowser.Common/Net/HttpResponseInfo.cs
Unescape View File

@ -8,7 +8,7 @@ namespace MediaBrowser.Common.Net
/// <summary>
/// Class HttpResponseInfo.
/// </summary>
public class HttpResponseInfo : IDisposable
public sealed class HttpResponseInfo : IDisposable
{
#pragma warning disable CS1591
public HttpResponseInfo()

Write Preview
Loading…
Cancel
Save