diff --git a/src/LogentriesCore/AsyncLogger.cs b/src/LogentriesCore/AsyncLogger.cs index 1e06c3a50..12c588ec7 100644 --- a/src/LogentriesCore/AsyncLogger.cs +++ b/src/LogentriesCore/AsyncLogger.cs @@ -296,7 +296,7 @@ namespace LogentriesCore WriteDebugMessages("HostName parameter is not defined - trying to get it from System.Environment.MachineName"); m_HostName = "HostName=" + System.Environment.MachineName + " "; } - catch (InvalidOperationException ex) + catch (InvalidOperationException) { // Cannot get host name automatically, so assume that HostName is not used // and log message is sent without it. diff --git a/src/NzbDrone.Api/TinyIoCNancyBootstrapper.cs b/src/NzbDrone.Api/TinyIoCNancyBootstrapper.cs index 0dcf42c16..02d6ee603 100644 --- a/src/NzbDrone.Api/TinyIoCNancyBootstrapper.cs +++ b/src/NzbDrone.Api/TinyIoCNancyBootstrapper.cs @@ -93,7 +93,6 @@ namespace NzbDrone.Api break; case Lifetime.PerRequest: throw new InvalidOperationException("Unable to directly register a per request lifetime."); - break; default: throw new ArgumentOutOfRangeException(); } @@ -120,7 +119,6 @@ namespace NzbDrone.Api break; case Lifetime.PerRequest: throw new InvalidOperationException("Unable to directly register a per request lifetime."); - break; default: throw new ArgumentOutOfRangeException(); } diff --git a/src/NzbDrone.Common/Http/Dispatchers/ManagedHttpDispatcher.cs b/src/NzbDrone.Common/Http/Dispatchers/ManagedHttpDispatcher.cs index d80e2b3ea..1a57f345d 100644 --- a/src/NzbDrone.Common/Http/Dispatchers/ManagedHttpDispatcher.cs +++ b/src/NzbDrone.Common/Http/Dispatchers/ManagedHttpDispatcher.cs @@ -100,7 +100,6 @@ namespace NzbDrone.Common.Http.Dispatchers break; case "Range": throw new NotImplementedException(); - break; case "Referer": webRequest.Referer = header.Value.ToString(); break; @@ -111,7 +110,6 @@ namespace NzbDrone.Common.Http.Dispatchers throw new NotSupportedException("User-Agent other than Sonarr not allowed."); case "Proxy-Connection": throw new NotImplementedException(); - break; default: webRequest.Headers.Add(header.Key, header.Value.ToString()); break; diff --git a/src/NzbDrone.Core.Test/Datastore/Migration/088_pushbullet_devices_channels.cs b/src/NzbDrone.Core.Test/Datastore/Migration/088_pushbullet_devices_channels.cs index cf9b0722e..7ace6dad2 100644 --- a/src/NzbDrone.Core.Test/Datastore/Migration/088_pushbullet_devices_channels.cs +++ b/src/NzbDrone.Core.Test/Datastore/Migration/088_pushbullet_devices_channels.cs @@ -14,8 +14,6 @@ namespace NzbDrone.Core.Test.Datastore.Migration [Test] public void should_convert_comma_separted_string_to_list() { - var deviceId = "device_id"; - WithTestDb(c => { c.Insert.IntoTable("Notifications").Row(new diff --git a/src/NzbDrone.Core.Test/HealthCheck/Checks/IndexerCheckFixture.cs b/src/NzbDrone.Core.Test/HealthCheck/Checks/IndexerCheckFixture.cs index cd741f9eb..6f54bfb93 100644 --- a/src/NzbDrone.Core.Test/HealthCheck/Checks/IndexerCheckFixture.cs +++ b/src/NzbDrone.Core.Test/HealthCheck/Checks/IndexerCheckFixture.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using Moq; using NUnit.Framework; using NzbDrone.Core.HealthCheck.Checks; using NzbDrone.Core.Indexers; @@ -10,17 +11,17 @@ namespace NzbDrone.Core.Test.HealthCheck.Checks [TestFixture] public class IndexerCheckFixture : CoreTest { - private IIndexer _indexer; + private Mock _indexerMock; private void GivenIndexer(bool supportsRss, bool supportsSearch) { - var _indexer = Mocker.GetMock(); - _indexer.SetupGet(s => s.SupportsRss).Returns(supportsRss); - _indexer.SetupGet(s => s.SupportsSearch).Returns(supportsSearch); + _indexerMock = Mocker.GetMock(); + _indexerMock.SetupGet(s => s.SupportsRss).Returns(supportsRss); + _indexerMock.SetupGet(s => s.SupportsSearch).Returns(supportsSearch); Mocker.GetMock() .Setup(s => s.GetAvailableProviders()) - .Returns(new List { _indexer.Object }); + .Returns(new List { _indexerMock.Object }); Mocker.GetMock() .Setup(s => s.RssEnabled()) @@ -35,14 +36,14 @@ namespace NzbDrone.Core.Test.HealthCheck.Checks { Mocker.GetMock() .Setup(s => s.RssEnabled()) - .Returns(new List { _indexer }); + .Returns(new List { _indexerMock.Object }); } private void GivenSearchEnabled() { Mocker.GetMock() .Setup(s => s.SearchEnabled()) - .Returns(new List { _indexer }); + .Returns(new List { _indexerMock.Object }); } [Test] diff --git a/src/NzbDrone.Core.Test/NotificationTests/Xbmc/Json/GetSeriesPathFixture.cs b/src/NzbDrone.Core.Test/NotificationTests/Xbmc/Json/GetSeriesPathFixture.cs index 00cdeac85..b4b29dff2 100644 --- a/src/NzbDrone.Core.Test/NotificationTests/Xbmc/Json/GetSeriesPathFixture.cs +++ b/src/NzbDrone.Core.Test/NotificationTests/Xbmc/Json/GetSeriesPathFixture.cs @@ -16,7 +16,6 @@ namespace NzbDrone.Core.Test.NotificationTests.Xbmc.Json private const int TVDB_ID = 5; private XbmcSettings _settings; private Series _series; - private string _response; private List _xbmcSeries; [SetUp] diff --git a/src/NzbDrone.Core.Test/NotificationTests/Xbmc/Json/UpdateFixture.cs b/src/NzbDrone.Core.Test/NotificationTests/Xbmc/Json/UpdateFixture.cs index 1f07252f2..46d7ee6a5 100644 --- a/src/NzbDrone.Core.Test/NotificationTests/Xbmc/Json/UpdateFixture.cs +++ b/src/NzbDrone.Core.Test/NotificationTests/Xbmc/Json/UpdateFixture.cs @@ -16,7 +16,6 @@ namespace NzbDrone.Core.Test.NotificationTests.Xbmc.Json { private const int TVDB_ID = 5; private XbmcSettings _settings; - private Series _series; private List _xbmcSeries; [SetUp] diff --git a/src/NzbDrone.Core/Download/Clients/NzbVortex/NzbVortex.cs b/src/NzbDrone.Core/Download/Clients/NzbVortex/NzbVortex.cs index 45ee06c83..575736f44 100644 --- a/src/NzbDrone.Core/Download/Clients/NzbVortex/NzbVortex.cs +++ b/src/NzbDrone.Core/Download/Clients/NzbVortex/NzbVortex.cs @@ -206,7 +206,7 @@ namespace NzbDrone.Core.Download.Clients.NzbVortex { _proxy.GetQueue(1, Settings); } - catch (NzbVortexAuthenticationException ex) + catch (NzbVortexAuthenticationException) { return new ValidationFailure("ApiKey", "API Key Incorrect"); } diff --git a/src/NzbDrone.Core/Download/Clients/NzbVortex/NzbVortexProxy.cs b/src/NzbDrone.Core/Download/Clients/NzbVortex/NzbVortexProxy.cs index d961f1b85..ade58c8c7 100644 --- a/src/NzbDrone.Core/Download/Clients/NzbVortex/NzbVortexProxy.cs +++ b/src/NzbDrone.Core/Download/Clients/NzbVortex/NzbVortexProxy.cs @@ -189,7 +189,7 @@ namespace NzbDrone.Core.Download.Clients.NzbVortex { return ProcessRequest(client, request).Content; } - catch (NzbVortexNotLoggedInException ex) + catch (NzbVortexNotLoggedInException) { _logger.Warn("Not logged in response received, reauthenticating and retrying"); request.AddQueryParameter("sessionid", GetSessionId(true, settings)); diff --git a/src/NzbDrone.Core/Indexers/Exceptions/IndexerException.cs b/src/NzbDrone.Core/Indexers/Exceptions/IndexerException.cs index 942698210..f93ef990e 100644 --- a/src/NzbDrone.Core/Indexers/Exceptions/IndexerException.cs +++ b/src/NzbDrone.Core/Indexers/Exceptions/IndexerException.cs @@ -9,11 +9,13 @@ namespace NzbDrone.Core.Indexers.Exceptions public IndexerException(IndexerResponse response, string message, params object[] args) : base(message, args) { + _indexerResponse = response; } public IndexerException(IndexerResponse response, string message) : base(message) { + _indexerResponse = response; } public IndexerResponse Response diff --git a/src/NzbDrone.Core/Indexers/Newznab/Newznab.cs b/src/NzbDrone.Core/Indexers/Newznab/Newznab.cs index 58aff71b9..a79f41587 100644 --- a/src/NzbDrone.Core/Indexers/Newznab/Newznab.cs +++ b/src/NzbDrone.Core/Indexers/Newznab/Newznab.cs @@ -124,8 +124,6 @@ namespace NzbDrone.Core.Indexers.Newznab return new ValidationFailure(string.Empty, "Unable to connect to indexer, check the log for more details"); } - - return null; } } } diff --git a/src/NzbDrone.Core/Indexers/Newznab/NewznabSettings.cs b/src/NzbDrone.Core/Indexers/Newznab/NewznabSettings.cs index d590e0c5b..1117f267a 100644 --- a/src/NzbDrone.Core/Indexers/Newznab/NewznabSettings.cs +++ b/src/NzbDrone.Core/Indexers/Newznab/NewznabSettings.cs @@ -80,7 +80,7 @@ namespace NzbDrone.Core.Indexers.Newznab [FieldDefinition(4, Label = "Additional Parameters", HelpText = "Additional Newznab parameters", Advanced = true)] public string AdditionalParameters { get; set; } - public NzbDroneValidationResult Validate() + public virtual NzbDroneValidationResult Validate() { return new NzbDroneValidationResult(Validator.Validate(this)); } diff --git a/src/NzbDrone.Core/Indexers/Torznab/TorznabSettings.cs b/src/NzbDrone.Core/Indexers/Torznab/TorznabSettings.cs index e20d7d0d9..6b73aeded 100644 --- a/src/NzbDrone.Core/Indexers/Torznab/TorznabSettings.cs +++ b/src/NzbDrone.Core/Indexers/Torznab/TorznabSettings.cs @@ -54,7 +54,7 @@ namespace NzbDrone.Core.Indexers.Torznab { private static readonly TorznabSettingsValidator Validator = new TorznabSettingsValidator(); - public NzbDroneValidationResult Validate() + public override NzbDroneValidationResult Validate() { return new NzbDroneValidationResult(Validator.Validate(this)); } diff --git a/src/NzbDrone.Core/Notifications/Plex/PlexHomeTheaterSettings.cs b/src/NzbDrone.Core/Notifications/Plex/PlexHomeTheaterSettings.cs index fe958b0f6..39184268e 100644 --- a/src/NzbDrone.Core/Notifications/Plex/PlexHomeTheaterSettings.cs +++ b/src/NzbDrone.Core/Notifications/Plex/PlexHomeTheaterSettings.cs @@ -15,21 +15,21 @@ namespace NzbDrone.Core.Notifications.Plex //These need to be kept in the same order as XBMC Settings, but we don't want them displayed [FieldDefinition(2, Label = "Username", Type = FieldType.Hidden)] - public string Username { get; set; } + public new string Username { get; set; } [FieldDefinition(3, Label = "Password", Type = FieldType.Hidden)] - public string Password { get; set; } + public new string Password { get; set; } [FieldDefinition(5, Label = "GUI Notification", Type = FieldType.Hidden)] - public bool Notify { get; set; } + public new bool Notify { get; set; } [FieldDefinition(6, Label = "Update Library", HelpText = "Update Library on Download & Rename?", Type = FieldType.Hidden)] - public bool UpdateLibrary { get; set; } + public new bool UpdateLibrary { get; set; } [FieldDefinition(7, Label = "Clean Library", HelpText = "Clean Library after update?", Type = FieldType.Hidden)] - public bool CleanLibrary { get; set; } + public new bool CleanLibrary { get; set; } [FieldDefinition(8, Label = "Always Update", HelpText = "Update Library even when a video is playing?", Type = FieldType.Hidden)] - public bool AlwaysUpdate { get; set; } + public new bool AlwaysUpdate { get; set; } } }