diff options
Diffstat (limited to 'MediaBrowser.Server.Implementations')
15 files changed, 26 insertions, 100 deletions
diff --git a/MediaBrowser.Server.Implementations/HttpServer/HttpServer.cs b/MediaBrowser.Server.Implementations/HttpServer/HttpServer.cs index 2ef9bed9fc..5f354fb0df 100644 --- a/MediaBrowser.Server.Implementations/HttpServer/HttpServer.cs +++ b/MediaBrowser.Server.Implementations/HttpServer/HttpServer.cs @@ -382,22 +382,23 @@ namespace MediaBrowser.Server.Implementations.HttpServer /// <returns>Task.</returns> private async Task ProcessWebSocketRequest(HttpListenerContext ctx) { + #if __MonoCS__ + #else try - { - var webSocketContext = await ctx.AcceptWebSocketAsync(null).ConfigureAwait(false); - - if (WebSocketConnected != null) - { - WebSocketConnected(this, new WebSocketConnectEventArgs { WebSocket = new NativeWebSocket(webSocketContext.WebSocket, _logger), Endpoint = ctx.Request.RemoteEndPoint.ToString() }); - } - } - catch (Exception ex) - { - _logger.ErrorException("AcceptWebSocketAsync error", ex); - - ctx.Response.StatusCode = 500; - ctx.Response.Close(); - } + { + var webSocketContext = await ctx.AcceptWebSocketAsync(null).ConfigureAwait(false); + if (WebSocketConnected != null) + { + WebSocketConnected(this, new WebSocketConnectEventArgs { WebSocket = new NativeWebSocket(webSocketContext.WebSocket, _logger), Endpoint = ctx.Request.RemoteEndPoint.ToString() }); + } + } + catch (Exception ex) + { + _logger.ErrorException("AcceptWebSocketAsync error", ex); + ctx.Response.StatusCode = 500; + ctx.Response.Close(); + } + #endif } /// <summary> @@ -532,7 +533,12 @@ namespace MediaBrowser.Server.Implementations.HttpServer { get { - if (!_supportsNativeWebSocket.HasValue) + #if __MonoCS__ + return false; + #else + #endif + + if (!_supportsNativeWebSocket.HasValue) { try { diff --git a/MediaBrowser.Server.Implementations/Library/UserDataManager.cs b/MediaBrowser.Server.Implementations/Library/UserDataManager.cs index 34ad7f235d..bf62e09c3d 100644 --- a/MediaBrowser.Server.Implementations/Library/UserDataManager.cs +++ b/MediaBrowser.Server.Implementations/Library/UserDataManager.cs @@ -57,10 +57,6 @@ namespace MediaBrowser.Server.Implementations.Library { throw new ArgumentNullException("userData"); } - if (cancellationToken == null) - { - throw new ArgumentNullException("cancellationToken"); - } if (userId == Guid.Empty) { throw new ArgumentNullException("userId"); diff --git a/MediaBrowser.Server.Implementations/Library/Validators/GameGenresPostScanTask.cs b/MediaBrowser.Server.Implementations/Library/Validators/GameGenresPostScanTask.cs index 5bd3943636..9e140c6261 100644 --- a/MediaBrowser.Server.Implementations/Library/Validators/GameGenresPostScanTask.cs +++ b/MediaBrowser.Server.Implementations/Library/Validators/GameGenresPostScanTask.cs @@ -16,19 +16,13 @@ namespace MediaBrowser.Server.Implementations.Library.Validators private readonly ILibraryManager _libraryManager; /// <summary> - /// The _user manager - /// </summary> - private readonly IUserManager _userManager; - - /// <summary> /// Initializes a new instance of the <see cref="GameGenresPostScanTask"/> class. /// </summary> /// <param name="libraryManager">The library manager.</param> /// <param name="userManager">The user manager.</param> - public GameGenresPostScanTask(ILibraryManager libraryManager, IUserManager userManager) + public GameGenresPostScanTask(ILibraryManager libraryManager) { _libraryManager = libraryManager; - _userManager = userManager; } /// <summary> diff --git a/MediaBrowser.Server.Implementations/Library/Validators/GenresPostScanTask.cs b/MediaBrowser.Server.Implementations/Library/Validators/GenresPostScanTask.cs index 5da090b290..b4907a70c3 100644 --- a/MediaBrowser.Server.Implementations/Library/Validators/GenresPostScanTask.cs +++ b/MediaBrowser.Server.Implementations/Library/Validators/GenresPostScanTask.cs @@ -13,19 +13,13 @@ namespace MediaBrowser.Server.Implementations.Library.Validators private readonly ILibraryManager _libraryManager; /// <summary> - /// The _user manager - /// </summary> - private readonly IUserManager _userManager; - - /// <summary> /// Initializes a new instance of the <see cref="ArtistsPostScanTask" /> class. /// </summary> /// <param name="libraryManager">The library manager.</param> /// <param name="userManager">The user manager.</param> - public GenresPostScanTask(ILibraryManager libraryManager, IUserManager userManager) + public GenresPostScanTask(ILibraryManager libraryManager) { _libraryManager = libraryManager; - _userManager = userManager; } /// <summary> diff --git a/MediaBrowser.Server.Implementations/Library/Validators/MusicGenresPostScanTask.cs b/MediaBrowser.Server.Implementations/Library/Validators/MusicGenresPostScanTask.cs index e64a4baa40..e5535c6e06 100644 --- a/MediaBrowser.Server.Implementations/Library/Validators/MusicGenresPostScanTask.cs +++ b/MediaBrowser.Server.Implementations/Library/Validators/MusicGenresPostScanTask.cs @@ -16,19 +16,13 @@ namespace MediaBrowser.Server.Implementations.Library.Validators private readonly ILibraryManager _libraryManager; /// <summary> - /// The _user manager - /// </summary> - private readonly IUserManager _userManager; - - /// <summary> /// Initializes a new instance of the <see cref="ArtistsPostScanTask" /> class. /// </summary> /// <param name="libraryManager">The library manager.</param> /// <param name="userManager">The user manager.</param> - public MusicGenresPostScanTask(ILibraryManager libraryManager, IUserManager userManager) + public MusicGenresPostScanTask(ILibraryManager libraryManager) { _libraryManager = libraryManager; - _userManager = userManager; } /// <summary> diff --git a/MediaBrowser.Server.Implementations/Library/Validators/StudiosPostScanTask.cs b/MediaBrowser.Server.Implementations/Library/Validators/StudiosPostScanTask.cs index 4aefd3d49b..fb9562da2a 100644 --- a/MediaBrowser.Server.Implementations/Library/Validators/StudiosPostScanTask.cs +++ b/MediaBrowser.Server.Implementations/Library/Validators/StudiosPostScanTask.cs @@ -16,19 +16,13 @@ namespace MediaBrowser.Server.Implementations.Library.Validators private readonly ILibraryManager _libraryManager; /// <summary> - /// The _user manager - /// </summary> - private readonly IUserManager _userManager; - - /// <summary> /// Initializes a new instance of the <see cref="ArtistsPostScanTask" /> class. /// </summary> /// <param name="libraryManager">The library manager.</param> /// <param name="userManager">The user manager.</param> - public StudiosPostScanTask(ILibraryManager libraryManager, IUserManager userManager) + public StudiosPostScanTask(ILibraryManager libraryManager) { _libraryManager = libraryManager; - _userManager = userManager; } /// <summary> diff --git a/MediaBrowser.Server.Implementations/MediaEncoder/MediaEncoder.cs b/MediaBrowser.Server.Implementations/MediaEncoder/MediaEncoder.cs index 453144dfc5..a9690c6658 100644 --- a/MediaBrowser.Server.Implementations/MediaEncoder/MediaEncoder.cs +++ b/MediaBrowser.Server.Implementations/MediaEncoder/MediaEncoder.cs @@ -594,11 +594,6 @@ namespace MediaBrowser.Server.Implementations.MediaEncoder throw new ArgumentNullException("outputPath"); } - if (cancellationToken == null) - { - throw new ArgumentNullException("cancellationToken"); - } - var slowSeekParam = offset.TotalSeconds > 0 ? " -ss " + offset.TotalSeconds.ToString(UsCulture) : string.Empty; var process = new Process diff --git a/MediaBrowser.Server.Implementations/Persistence/SqliteChapterRepository.cs b/MediaBrowser.Server.Implementations/Persistence/SqliteChapterRepository.cs index ff97bc40c5..9121ae87b0 100644 --- a/MediaBrowser.Server.Implementations/Persistence/SqliteChapterRepository.cs +++ b/MediaBrowser.Server.Implementations/Persistence/SqliteChapterRepository.cs @@ -188,11 +188,6 @@ namespace MediaBrowser.Server.Implementations.Persistence throw new ArgumentNullException("chapters"); } - if (cancellationToken == null) - { - throw new ArgumentNullException("cancellationToken"); - } - cancellationToken.ThrowIfCancellationRequested(); await _writeLock.WaitAsync(cancellationToken).ConfigureAwait(false); diff --git a/MediaBrowser.Server.Implementations/Persistence/SqliteDisplayPreferencesRepository.cs b/MediaBrowser.Server.Implementations/Persistence/SqliteDisplayPreferencesRepository.cs index 909745fe3d..bfbb0e206c 100644 --- a/MediaBrowser.Server.Implementations/Persistence/SqliteDisplayPreferencesRepository.cs +++ b/MediaBrowser.Server.Implementations/Persistence/SqliteDisplayPreferencesRepository.cs @@ -112,10 +112,6 @@ namespace MediaBrowser.Server.Implementations.Persistence { throw new ArgumentNullException("displayPreferences.Id"); } - if (cancellationToken == null) - { - throw new ArgumentNullException("cancellationToken"); - } cancellationToken.ThrowIfCancellationRequested(); diff --git a/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs b/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs index ee47dbd81c..d61178d282 100644 --- a/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs +++ b/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs @@ -186,11 +186,6 @@ namespace MediaBrowser.Server.Implementations.Persistence throw new ArgumentNullException("items"); } - if (cancellationToken == null) - { - throw new ArgumentNullException("cancellationToken"); - } - cancellationToken.ThrowIfCancellationRequested(); await _writeLock.WaitAsync(cancellationToken).ConfigureAwait(false); @@ -456,11 +451,6 @@ namespace MediaBrowser.Server.Implementations.Persistence throw new ArgumentNullException("children"); } - if (cancellationToken == null) - { - throw new ArgumentNullException("cancellationToken"); - } - cancellationToken.ThrowIfCancellationRequested(); await _writeLock.WaitAsync(cancellationToken).ConfigureAwait(false); diff --git a/MediaBrowser.Server.Implementations/Persistence/SqliteUserDataRepository.cs b/MediaBrowser.Server.Implementations/Persistence/SqliteUserDataRepository.cs index e58bd2506e..fa8e69b9bb 100644 --- a/MediaBrowser.Server.Implementations/Persistence/SqliteUserDataRepository.cs +++ b/MediaBrowser.Server.Implementations/Persistence/SqliteUserDataRepository.cs @@ -116,10 +116,6 @@ namespace MediaBrowser.Server.Implementations.Persistence { throw new ArgumentNullException("userData"); } - if (cancellationToken == null) - { - throw new ArgumentNullException("cancellationToken"); - } if (userId == Guid.Empty) { throw new ArgumentNullException("userId"); diff --git a/MediaBrowser.Server.Implementations/Persistence/SqliteUserRepository.cs b/MediaBrowser.Server.Implementations/Persistence/SqliteUserRepository.cs index 1aa0e83952..8749c929ca 100644 --- a/MediaBrowser.Server.Implementations/Persistence/SqliteUserRepository.cs +++ b/MediaBrowser.Server.Implementations/Persistence/SqliteUserRepository.cs @@ -98,11 +98,6 @@ namespace MediaBrowser.Server.Implementations.Persistence throw new ArgumentNullException("user"); } - if (cancellationToken == null) - { - throw new ArgumentNullException("cancellationToken"); - } - cancellationToken.ThrowIfCancellationRequested(); var serialized = _jsonSerializer.SerializeToBytes(user); @@ -199,11 +194,6 @@ namespace MediaBrowser.Server.Implementations.Persistence throw new ArgumentNullException("user"); } - if (cancellationToken == null) - { - throw new ArgumentNullException("cancellationToken"); - } - cancellationToken.ThrowIfCancellationRequested(); await _writeLock.WaitAsync(cancellationToken).ConfigureAwait(false); diff --git a/MediaBrowser.Server.Implementations/Providers/ProviderManager.cs b/MediaBrowser.Server.Implementations/Providers/ProviderManager.cs index 7d5a581d5e..8bd5012713 100644 --- a/MediaBrowser.Server.Implementations/Providers/ProviderManager.cs +++ b/MediaBrowser.Server.Implementations/Providers/ProviderManager.cs @@ -269,10 +269,6 @@ namespace MediaBrowser.Server.Implementations.Providers { throw new ArgumentNullException(); } - if (cancellationToken == null) - { - throw new ArgumentNullException(); - } if (cancellationToken.IsCancellationRequested) { diff --git a/MediaBrowser.Server.Implementations/ServerManager/ServerManager.cs b/MediaBrowser.Server.Implementations/ServerManager/ServerManager.cs index 638e6fa0de..84a40619c4 100644 --- a/MediaBrowser.Server.Implementations/ServerManager/ServerManager.cs +++ b/MediaBrowser.Server.Implementations/ServerManager/ServerManager.cs @@ -285,11 +285,6 @@ namespace MediaBrowser.Server.Implementations.ServerManager throw new ArgumentNullException("dataFunction"); } - if (cancellationToken == null) - { - throw new ArgumentNullException("cancellationToken"); - } - cancellationToken.ThrowIfCancellationRequested(); var connectionsList = connections.Where(s => s.State == WebSocketState.Open).ToList(); diff --git a/MediaBrowser.Server.Implementations/ServerManager/WebSocketConnection.cs b/MediaBrowser.Server.Implementations/ServerManager/WebSocketConnection.cs index 61c06ba6de..2b7a1a21e8 100644 --- a/MediaBrowser.Server.Implementations/ServerManager/WebSocketConnection.cs +++ b/MediaBrowser.Server.Implementations/ServerManager/WebSocketConnection.cs @@ -216,11 +216,6 @@ namespace MediaBrowser.Server.Implementations.ServerManager throw new ArgumentNullException("buffer"); } - if (cancellationToken == null) - { - throw new ArgumentNullException("cancellationToken"); - } - cancellationToken.ThrowIfCancellationRequested(); // Per msdn docs, attempting to send simultaneous messages will result in one failing. |