alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-03-08 03:06:20 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

More warnings (removed)

Browse Source
This commit is contained in:
Bond_009
2019-12-11 00:13:57 +01:00
parent 67922dff50
commit 2ef4ffd698
99 changed files with 397 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Emby.Server.Implementations/Activity/ActivityLogEntryPoint.cs
View File

@@ -1,4 +1,5 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
using System;
using System.Collections.Generic;

1
Emby.Server.Implementations/Activity/ActivityManager.cs
View File

@@ -1,4 +1,5 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
using System;
using System.Linq;

1
Emby.Server.Implementations/Activity/ActivityRepository.cs
View File

@@ -1,4 +1,5 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
using System;
using System.Collections.Generic;

13
Emby.Server.Implementations/ApplicationHost.cs
View File

@@ -1,4 +1,5 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
using System;
using System.Collections.Concurrent;
@@ -180,11 +181,7 @@ namespace Emby.Server.Implementations
/// Gets the plugins.
/// </summary>
/// <value>The plugins.</value>
public IPlugin[] Plugins
{
get => _plugins;
protected set => _plugins = value;
}
public IReadOnlyList<IPlugin> Plugins => _plugins;
/// <summary>
/// Gets or sets the logger factory.
@@ -1051,7 +1048,7 @@ namespace Emby.Server.Implementations
}
ConfigurationManager.AddParts(GetExports<IConfigurationFactory>());
Plugins = GetExports<IPlugin>()
_plugins = GetExports<IPlugin>()
.Select(LoadPlugin)
.Where(i => i != null)
.ToArray();
@@ -1683,9 +1680,9 @@ namespace Emby.Server.Implementations
/// <param name="plugin">The plugin.</param>
public void RemovePlugin(IPlugin plugin)
{
var list = Plugins.ToList();
var list = _plugins.ToList();
list.Remove(plugin);
Plugins = list.ToArray();
_plugins = list.ToArray();
}
/// <summary>

1
Emby.Server.Implementations/Branding/BrandingConfigurationFactory.cs
View File

@@ -1,4 +1,5 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
using System.Collections.Generic;
using MediaBrowser.Common.Configuration;

1
Emby.Server.Implementations/Channels/ChannelDynamicMediaSourceProvider.cs
View File

@@ -1,4 +1,5 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
using System;
using System.Collections.Generic;

1
Emby.Server.Implementations/Channels/ChannelImageProvider.cs
View File

@@ -1,4 +1,5 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
using System.Collections.Generic;
using System.Linq;

1
Emby.Server.Implementations/Channels/ChannelManager.cs
View File

@@ -1,4 +1,5 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
using System;
using System.Collections.Concurrent;

1
Emby.Server.Implementations/Channels/ChannelPostScanTask.cs
View File

@@ -1,4 +1,5 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
using System;
using System.Linq;

1
Emby.Server.Implementations/Channels/RefreshChannelsScheduledTask.cs
View File

@@ -1,4 +1,5 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
using System;
using System.Collections.Generic;

1
Emby.Server.Implementations/Collections/CollectionImageProvider.cs
View File

@@ -1,4 +1,5 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
using System;
using System.Collections.Generic;

1
Emby.Server.Implementations/Collections/CollectionManager.cs
View File

@@ -1,4 +1,5 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
using System;
using System.Collections.Generic;

2
Emby.Server.Implementations/Cryptography/CryptographyProvider.cs
View File

@@ -121,7 +121,7 @@ namespace Emby.Server.Implementations.Cryptography
/// <summary>
/// Releases unmanaged and - optionally - managed resources.
/// </summary>
/// <param name="dispose"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
/// <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
protected virtual void Dispose(bool disposing)
{
if (_disposed)

1
Emby.Server.Implementations/Data/BaseSqliteRepository.cs
View File

@@ -1,4 +1,5 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
using System;
using System.Collections.Generic;

1
Emby.Server.Implementations/Data/CleanDatabaseScheduledTask.cs
View File

@@ -1,4 +1,5 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
using System;
using System.Threading;

1
Emby.Server.Implementations/Data/ManagedConnection.cs
View File

@@ -1,4 +1,5 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
using System;
using System.Collections.Generic;

1
Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs
View File

@@ -1,4 +1,5 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
using System;
using System.Collections.Generic;

1
Emby.Server.Implementations/Data/SqliteExtensions.cs
View File

@@ -1,4 +1,5 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
using System;
using System.Collections.Generic;

1
Emby.Server.Implementations/Data/SqliteUserDataRepository.cs
View File

@@ -1,4 +1,5 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
using System;
using System.Collections.Generic;

1
Emby.Server.Implementations/Data/SqliteUserRepository.cs
View File

@@ -1,4 +1,5 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
using System;
using System.Collections.Generic;

1
Emby.Server.Implementations/Devices/DeviceId.cs
View File

@@ -1,4 +1,5 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
using System;
using System.Globalization;

1
Emby.Server.Implementations/Devices/DeviceManager.cs
View File

@@ -1,4 +1,5 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
using System;
using System.Collections.Generic;

1
Emby.Server.Implementations/Diagnostics/CommonProcess.cs
View File

@@ -1,4 +1,5 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
using System;
using System.Diagnostics;

1
Emby.Server.Implementations/Diagnostics/ProcessFactory.cs
View File

@@ -1,4 +1,5 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
using MediaBrowser.Model.Diagnostics;

1
Emby.Server.Implementations/Dto/DtoService.cs
View File

@@ -1,4 +1,5 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
using System;
using System.Collections.Generic;

16
Emby.Server.Implementations/Emby.Server.Implementations.csproj
View File

@@ -29,10 +29,10 @@
<PackageReference Include="Microsoft.AspNetCore.ResponseCompression" Version="2.2.0" />
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.2.0" />
<PackageReference Include="Microsoft.AspNetCore.WebSockets" Version="2.2.1" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="3.0.1" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.0.1" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="3.0.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="3.0.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.0" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="3.1.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="3.1.0" />
<PackageReference Include="Mono.Nat" Version="2.0.0" />
<PackageReference Include="ServiceStack.Text.Core" Version="5.7.0" />
<PackageReference Include="sharpcompress" Version="0.24.0" />
@@ -52,10 +52,10 @@
<!-- Code analysers-->
<ItemGroup Condition=" '$(Configuration)' == 'Debug' ">
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.7" />
<PackageReference Include="SerilogAnalyzer" Version="0.15.0" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" />
<PackageReference Include="SmartAnalyzers.MultithreadingAnalyzer" Version="1.1.31" />
<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" />
</ItemGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

1
Emby.Server.Implementations/EntryPoints/AutomaticRestartEntryPoint.cs
View File

@@ -1,4 +1,5 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
using System;
using System.Linq;

1
Emby.Server.Implementations/EntryPoints/ExternalPortForwarding.cs
View File

@@ -1,4 +1,5 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
using System;
using System.Collections.Generic;

1
Emby.Server.Implementations/EntryPoints/LibraryChangedNotifier.cs
View File

@@ -1,4 +1,5 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
using System;
using System.Collections.Generic;

1
Emby.Server.Implementations/EntryPoints/RecordingNotifier.cs
View File

@@ -1,4 +1,5 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
using System;
using System.Linq;

1
Emby.Server.Implementations/EntryPoints/UserDataChangeNotifier.cs
View File

@@ -1,4 +1,5 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
using System;
using System.Collections.Generic;

1
Emby.Server.Implementations/HttpServer/FileWriter.cs
View File

@@ -1,4 +1,5 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
using System;
using System.Collections.Generic;

2
Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
View File

@@ -1,4 +1,5 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
using System;
using System.Collections.Generic;
@@ -218,7 +219,6 @@ namespace Emby.Server.Implementations.HttpServer
case FileNotFoundException _:
case ResourceNotFoundException _: return 404;
case MethodNotAllowedException _: return 405;
case RemoteServiceUnavailableException _: return 502;
default: return 500;
}
}

1
Emby.Server.Implementations/HttpServer/HttpResultFactory.cs
View File

@@ -1,4 +1,5 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
using System;
using System.Collections.Generic;

1
Emby.Server.Implementations/HttpServer/IHttpListener.cs
View File

@@ -1,4 +1,5 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
using System;
using System.Threading;

1
Emby.Server.Implementations/HttpServer/RangeRequestWriter.cs
View File

@@ -1,4 +1,5 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
using System;
using System.Collections.Generic;

1
Emby.Server.Implementations/HttpServer/Security/AuthService.cs
View File

@@ -1,4 +1,5 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
using System;
using System.Linq;

1
Emby.Server.Implementations/HttpServer/Security/AuthorizationContext.cs
View File

@@ -1,4 +1,5 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
using System;
using System.Collections.Generic;

1
Emby.Server.Implementations/HttpServer/Security/SessionContext.cs
View File

@@ -1,4 +1,5 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
using System;
using MediaBrowser.Controller.Entities;

1
Emby.Server.Implementations/IO/ExtendedFileSystemInfo.cs
View File

@@ -1,4 +1,5 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
namespace Emby.Server.Implementations.IO
{

1
Emby.Server.Implementations/IO/FileRefresher.cs
View File

@@ -1,4 +1,5 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
using System;
using System.Collections.Generic;

1
Emby.Server.Implementations/IO/LibraryMonitor.cs
View File

@@ -1,4 +1,5 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
using System;
using System.Collections.Concurrent;

1
Emby.Server.Implementations/IO/ManagedFileSystem.cs
View File

@@ -1,4 +1,5 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
using System;
using System.Collections.Generic;

1
Emby.Server.Implementations/IO/MbLinkShortcutHandler.cs
View File

@@ -1,4 +1,5 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
using System;
using System.IO;

1
Emby.Server.Implementations/IO/StreamHelper.cs
View File

@@ -1,4 +1,5 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
using System;
using System.Buffers;

1
Emby.Server.Implementations/Images/BaseDynamicImageProvider.cs
View File

@@ -1,4 +1,5 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
using System;
using System.Collections.Generic;

13
Emby.Server.Implementations/Library/DefaultAuthenticationProvider.cs
View File

@@ -70,9 +70,9 @@ namespace Emby.Server.Implementations.Library
byte[] calculatedHash = _cryptographyProvider.ComputeHash(
readyHash.Id,
passwordbytes,
readyHash.Salt);
readyHash.Salt.ToArray());
if (calculatedHash.SequenceEqual(readyHash.Hash))
if (readyHash.Hash.SequenceEqual(calculatedHash))
{
success = true;
}
@@ -148,17 +148,18 @@ namespace Emby.Server.Implementations.Library
// TODO: make use of iterations parameter?
PasswordHash passwordHash = PasswordHash.Parse(user.Password);
var salt = passwordHash.Salt.ToArray();
return new PasswordHash(
passwordHash.Id,
_cryptographyProvider.ComputeHash(
passwordHash.Id,
Encoding.UTF8.GetBytes(str),
passwordHash.Salt),
passwordHash.Salt,
salt),
salt,
passwordHash.Parameters.ToDictionary(x => x.Key, y => y.Value)).ToString();
}
public byte[] GetHashed(User user, string str)
public ReadOnlySpan<byte> GetHashed(User user, string str)
{
if (string.IsNullOrEmpty(user.Password))
{
@@ -170,7 +171,7 @@ namespace Emby.Server.Implementations.Library
return _cryptographyProvider.ComputeHash(
passwordHash.Id,
Encoding.UTF8.GetBytes(str),
passwordHash.Salt);
passwordHash.Salt.ToArray());
}
}
}

1
Emby.Server.Implementations/Library/ExclusiveLiveStream.cs
View File

@@ -1,4 +1,5 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
using System;
using System.Globalization;

1
Emby.Server.Implementations/Library/LibraryManager.cs
View File

@@ -1,4 +1,5 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
using System;
using System.Collections.Concurrent;

1
Emby.Server.Implementations/Library/LiveStreamHelper.cs
View File

@@ -1,4 +1,5 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
using System;
using System.Collections.Generic;

1
Emby.Server.Implementations/Library/MediaSourceManager.cs
View File

@@ -1,4 +1,5 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
using System;
using System.Collections.Generic;

1
Emby.Server.Implementations/Library/MediaStreamSelector.cs
View File

@@ -1,4 +1,5 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
using System;
using System.Collections.Generic;

1
Emby.Server.Implementations/Library/MusicManager.cs
View File

@@ -1,4 +1,5 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
using System;
using System.Collections.Generic;

1
Emby.Server.Implementations/Library/Resolvers/Audio/AudioResolver.cs
View File

@@ -1,4 +1,5 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
using System;
using System.Collections.Generic;

1
Emby.Server.Implementations/Library/Resolvers/BaseVideoResolver.cs
View File

@@ -1,4 +1,5 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
using System;
using System.IO;

1
Emby.Server.Implementations/Library/Resolvers/Books/BookResolver.cs
View File

@@ -1,4 +1,5 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
using System;
using System.IO;

1
Emby.Server.Implementations/Library/Resolvers/PhotoResolver.cs
View File

@@ -1,4 +1,5 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
using System;
using System.Collections.Generic;

1
Emby.Server.Implementations/Library/Resolvers/PlaylistResolver.cs
View File

@@ -1,4 +1,5 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
using System;
using System.IO;

1
Emby.Server.Implementations/Library/Resolvers/SpecialFolderResolver.cs
View File

@@ -1,4 +1,5 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
using System;
using System.IO;

1
Emby.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs
View File

@@ -1,4 +1,5 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
using System;
using System.Collections.Generic;

1
Emby.Server.Implementations/Library/Resolvers/VideoResolver.cs
View File

@@ -1,4 +1,5 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Library;

1
Emby.Server.Implementations/Library/SearchEngine.cs
View File

@@ -1,4 +1,5 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
using System;
using System.Collections.Generic;

1
Emby.Server.Implementations/Library/UserDataManager.cs
View File

@@ -1,4 +1,5 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
using System;
using System.Collections.Concurrent;

3
Emby.Server.Implementations/Library/UserManager.cs
View File

@@ -1,4 +1,5 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
using System;
using System.Collections.Concurrent;
@@ -480,7 +481,7 @@ namespace Emby.Server.Implementations.Library
var hash = _cryptoProvider.ComputeHash(
passwordHash.Id,
Encoding.UTF8.GetBytes(password),
passwordHash.Salt);
passwordHash.Salt.ToArray());
success = passwordHash.Hash.SequenceEqual(hash);
}

1
Emby.Server.Implementations/Library/UserViewManager.cs
View File

@@ -1,4 +1,5 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
using System;
using System.Collections.Generic;