diff options
22 files changed, 31 insertions, 124 deletions
diff --git a/MediaBrowser.Api/DefaultTheme/DefaultThemeService.cs b/MediaBrowser.Api/DefaultTheme/DefaultThemeService.cs index 8c041a178..3c5f1fcf8 100644 --- a/MediaBrowser.Api/DefaultTheme/DefaultThemeService.cs +++ b/MediaBrowser.Api/DefaultTheme/DefaultThemeService.cs @@ -66,16 +66,14 @@ namespace MediaBrowser.Api.DefaultTheme private readonly ILogger _logger; private readonly ILibraryManager _libraryManager; - private readonly ILocalizationManager _localization; private readonly IImageProcessor _imageProcessor; - public DefaultThemeService(IUserManager userManager, IDtoService dtoService, ILogger logger, ILibraryManager libraryManager, ILocalizationManager localization, IImageProcessor imageProcessor) + public DefaultThemeService(IUserManager userManager, IDtoService dtoService, ILogger logger, ILibraryManager libraryManager, IImageProcessor imageProcessor) { _userManager = userManager; _dtoService = dtoService; _logger = logger; _libraryManager = libraryManager; - _localization = localization; _imageProcessor = imageProcessor; } diff --git a/MediaBrowser.Api/UserLibrary/YearsService.cs b/MediaBrowser.Api/UserLibrary/YearsService.cs index 6d87a791c..eda8e08c6 100644 --- a/MediaBrowser.Api/UserLibrary/YearsService.cs +++ b/MediaBrowser.Api/UserLibrary/YearsService.cs @@ -48,11 +48,6 @@ namespace MediaBrowser.Api.UserLibrary /// </summary> public class YearsService : BaseItemsByNameService<Year> { - /// <summary> - /// The us culture - /// </summary> - private static readonly CultureInfo UsCulture = new CultureInfo("en-US"); - public YearsService(IUserManager userManager, ILibraryManager libraryManager, IUserDataManager userDataRepository, IItemRepository itemRepo, IDtoService dtoService) : base(userManager, libraryManager, userDataRepository, itemRepo, dtoService) { diff --git a/MediaBrowser.Common.Implementations/HttpClientManager/HttpClientManager.cs b/MediaBrowser.Common.Implementations/HttpClientManager/HttpClientManager.cs index 412c69509..4d1a9c0d4 100644 --- a/MediaBrowser.Common.Implementations/HttpClientManager/HttpClientManager.cs +++ b/MediaBrowser.Common.Implementations/HttpClientManager/HttpClientManager.cs @@ -555,11 +555,6 @@ namespace MediaBrowser.Common.Implementations.HttpClientManager { throw new ArgumentNullException("url"); } - - if (cancellationToken == null) - { - throw new ArgumentNullException("cancellationToken"); - } } /// <summary> diff --git a/MediaBrowser.Common.Implementations/Updates/InstallationManager.cs b/MediaBrowser.Common.Implementations/Updates/InstallationManager.cs index 56190e9bd..60db90476 100644 --- a/MediaBrowser.Common.Implementations/Updates/InstallationManager.cs +++ b/MediaBrowser.Common.Implementations/Updates/InstallationManager.cs @@ -361,11 +361,6 @@ namespace MediaBrowser.Common.Implementations.Updates throw new ArgumentNullException("progress"); } - if (cancellationToken == null) - { - throw new ArgumentNullException("cancellationToken"); - } - var installationInfo = new InstallationInfo { Id = Guid.NewGuid(), diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs index fa72b5aba..e1e7d8751 100644 --- a/MediaBrowser.Controller/Entities/Folder.cs +++ b/MediaBrowser.Controller/Entities/Folder.cs @@ -1066,7 +1066,7 @@ namespace MediaBrowser.Controller.Entities /// <returns>IList{BaseItem}.</returns> public IList<BaseItem> GetRecursiveChildren() { - return GetRecursiveChildren(null, null, true); + return GetRecursiveChildren(i => true); } /// <summary> diff --git a/MediaBrowser.Controller/Localization/LocalizedStrings.cs b/MediaBrowser.Controller/Localization/LocalizedStrings.cs index bd82d39ea..94ac90271 100644 --- a/MediaBrowser.Controller/Localization/LocalizedStrings.cs +++ b/MediaBrowser.Controller/Localization/LocalizedStrings.cs @@ -130,17 +130,17 @@ namespace MediaBrowser.Controller.Localization { value = field.GetValue(stringData) as string; } - catch (TargetException ex) + catch (TargetException) { //Logger.ErrorException("Error getting value for field: {0}", ex, field.Name); continue; } - catch (FieldAccessException ex) + catch (FieldAccessException) { //Logger.ErrorException("Error getting value for field: {0}", ex, field.Name); continue; } - catch (NotSupportedException ex) + catch (NotSupportedException) { //Logger.ErrorException("Error getting value for field: {0}", ex, field.Name); continue; diff --git a/MediaBrowser.Server.Implementations/HttpServer/HttpServer.cs b/MediaBrowser.Server.Implementations/HttpServer/HttpServer.cs index 2ef9bed9f..5f354fb0d 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 34ad7f235..bf62e09c3 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 5bd394363..9e140c626 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 5da090b29..b4907a70c 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 e64a4baa4..e5535c6e0 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 4aefd3d49..fb9562da2 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 453144dfc..a9690c665 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 ff97bc40c..9121ae87b 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 909745fe3..bfbb0e206 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 ee47dbd81..d61178d28 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 e58bd2506..fa8e69b9b 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 1aa0e8395..8749c929c 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 7d5a581d5..8bd501271 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 638e6fa0d..84a40619c 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 61c06ba6d..2b7a1a21e 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. diff --git a/MediaBrowser.Server.Mono/Program.cs b/MediaBrowser.Server.Mono/Program.cs index 86001887e..2e86afad7 100644 --- a/MediaBrowser.Server.Mono/Program.cs +++ b/MediaBrowser.Server.Mono/Program.cs @@ -47,8 +47,6 @@ namespace MediaBrowser.Server.Mono bool createdNew; - var runningPath = Process.GetCurrentProcess().MainModule.FileName.Replace(Path.DirectorySeparatorChar.ToString(), string.Empty); - //_singleInstanceMutex = new Mutex(true, @"Local\" + runningPath, out createdNew); createdNew = true; |