StyleCop

.editorconfig

@@ -69,6 +69,7 @@ dotnet_diagnostic.SA1406.severity = suggestion
 dotnet_diagnostic.SA1410.severity = suggestion
 dotnet_diagnostic.SA1411.severity = suggestion
 dotnet_diagnostic.SA1413.severity = none
+dotnet_diagnostic.SA1512.severity = none
 dotnet_diagnostic.SA1516.severity = none
 dotnet_diagnostic.SA1600.severity = none
 dotnet_diagnostic.SA1601.severity = none

.gitignore

@@ -84,7 +84,6 @@ TestResults
 [Tt]est[Rr]esult*
 *.Cache
 ClientBin
-[Ss]tyle[Cc]op.*
 ~$*
 *.dbmdl
 Generated_Code #added for RIA/Silverlight projects

src/Directory.Build.props

@@ -104,6 +104,16 @@
     <EnableNETAnalyzers>false</EnableNETAnalyzers>
   </PropertyGroup>
 
+  <!-- Set up stylecop -->
+  <ItemGroup Condition="'$(SonarrProject)'=='true' and '$(EnableAnalyzers)'!='false'">
+    <!-- StyleCop analysis -->
+    <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageReference>
+    <AdditionalFiles Include="$(SolutionDir)stylecop.json" />
+  </ItemGroup>
+
   <!--
        Set runtime identifier to local system type if not specified
   -->

src/NzbDrone.Api.Test/ClientSchemaTests/SchemaBuilderFixture.cs

@@ -16,7 +16,6 @@ namespace NzbDrone.Api.Test.ClientSchemaTests
             schema.Should().HaveCount(2);
         }
 
-
         [Test]
         public void schema_should_have_proper_fields()
         {
@@ -32,7 +31,6 @@ namespace NzbDrone.Api.Test.ClientSchemaTests
             schema.Should().Contain(c => c.Order == 0 && c.Name == "firstName" && c.Label == "First Name" && c.HelpText == "Your First Name" && (string)c.Value == "Bob");
         }
 
-
         [Test]
         public void schema_should_have_nested_fields()
         {

src/NzbDrone.Automation.Test/AutomationTestAttribute.cs

@@ -7,7 +7,6 @@ namespace NzbDrone.Automation.Test
         public AutomationTestAttribute()
             : base("AutomationTest")
         {
-
         }
     }
 }

src/NzbDrone.Automation.Test/MainPagesTest.cs

@@ -1,4 +1,5 @@
-using FluentAssertions;
+using System.Reflection;
+using FluentAssertions;
 using NUnit.Framework;
 using NzbDrone.Automation.Test.PageModel;
 using OpenQA.Selenium;
@@ -8,73 +9,86 @@ namespace NzbDrone.Automation.Test
     [TestFixture]
     public class MainPagesTest : AutomationTest
     {
-        private PageBase page;
+        private PageBase _page;
 
         [SetUp]
         public void Setup()
         {
-            page = new PageBase(driver);
+            _page = new PageBase(driver);
         }
 
         [Test]
         public void series_page()
         {
-            page.SeriesNavIcon.Click();
+            _page.SeriesNavIcon.Click();
-            page.WaitForNoSpinner();
+            _page.WaitForNoSpinner();
 
-            page.Find(By.CssSelector("div[class*='SeriesIndex']")).Should().NotBeNull();
+            var imageName = MethodBase.GetCurrentMethod().Name;
+            TakeScreenshot(imageName);
+
+            _page.Find(By.CssSelector("div[class*='SeriesIndex']")).Should().NotBeNull();
         }
 
         [Test]
         public void calendar_page()
         {
-            page.CalendarNavIcon.Click();
+            _page.CalendarNavIcon.Click();
-            page.WaitForNoSpinner();
+            _page.WaitForNoSpinner();
 
-            page.Find(By.CssSelector("div[class*='CalendarPage']")).Should().NotBeNull();
+            var imageName = MethodBase.GetCurrentMethod().Name;
+            TakeScreenshot(imageName);
+
+            _page.Find(By.CssSelector("div[class*='CalendarPage']")).Should().NotBeNull();
         }
 
         [Test]
         public void activity_page()
         {
-            page.ActivityNavIcon.Click();
+            _page.ActivityNavIcon.Click();
-            page.WaitForNoSpinner();
+            _page.WaitForNoSpinner();
 
-            page.Find(By.LinkText("Queue")).Should().NotBeNull();
+            var imageName = MethodBase.GetCurrentMethod().Name;
-            page.Find(By.LinkText("History")).Should().NotBeNull();
+            TakeScreenshot(imageName);
-            page.Find(By.LinkText("Blocklist")).Should().NotBeNull();
+
+            _page.Find(By.LinkText("Queue")).Should().NotBeNull();
+            _page.Find(By.LinkText("History")).Should().NotBeNull();
+            _page.Find(By.LinkText("Blocklist")).Should().NotBeNull();
         }
 
         [Test]
         public void wanted_page()
         {
-            page.WantedNavIcon.Click();
+            _page.WantedNavIcon.Click();
-            page.WaitForNoSpinner();
+            _page.WaitForNoSpinner();
 
-            page.Find(By.LinkText("Missing")).Should().NotBeNull();
+            _page.Find(By.LinkText("Missing")).Should().NotBeNull();
-            page.Find(By.LinkText("Cutoff Unmet")).Should().NotBeNull();
+            _page.Find(By.LinkText("Cutoff Unmet")).Should().NotBeNull();
         }
 
         [Test]
         public void system_page()
         {
-            page.SystemNavIcon.Click();
+            _page.SystemNavIcon.Click();
-            page.WaitForNoSpinner();
+            _page.WaitForNoSpinner();
 
-            page.Find(By.CssSelector("div[class*='Health']")).Should().NotBeNull();
+            var imageName = MethodBase.GetCurrentMethod().Name;
+            TakeScreenshot(imageName);
+
+            _page.Find(By.CssSelector("div[class*='Health']")).Should().NotBeNull();
         }
 
         [Test]
         public void add_series_page()
         {
-            page.SeriesNavIcon.Click();
+            _page.SeriesNavIcon.Click();
-            page.WaitForNoSpinner();
+            _page.WaitForNoSpinner();
 
-            page.Find(By.LinkText("Add New")).Click();
+            _page.Find(By.LinkText("Add New")).Click();
 
-            page.WaitForNoSpinner();
+            var imageName = MethodBase.GetCurrentMethod().Name;
+            TakeScreenshot(imageName);
 
-            page.Find(By.CssSelector("input[class*='AddNewSeries/searchInput']")).Should().NotBeNull();
+            _page.Find(By.CssSelector("input[class*='AddNewSeries-searchInput']")).Should().NotBeNull();
         }
     }
 }

src/NzbDrone.Automation.Test/Sonarr.Automation.Test.csproj

@@ -4,7 +4,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Selenium.Support" Version="3.141.0" />
-    <PackageReference Include="Selenium.WebDriver.ChromeDriver" Version="88.0.4324.9600" />
+    <PackageReference Include="Selenium.WebDriver.ChromeDriver" Version="92.0.4515.10700" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\NzbDrone.Test.Common\Sonarr.Test.Common.csproj" />

src/NzbDrone.Common.Test/CacheTests/CachedFixture.cs

@@ -26,7 +26,6 @@ namespace NzbDrone.Common.Test.CacheTests
             _cachedString.Get("Test", _worker.GetString);
 
             _worker.HitCount.Should().Be(1);
-
         }
 
         [Test]
@@ -38,7 +37,6 @@ namespace NzbDrone.Common.Test.CacheTests
             first.Should().Be(second);
         }
 
-
         [Test]
         public void should_be_able_to_update_key()
         {
@@ -48,7 +46,6 @@ namespace NzbDrone.Common.Test.CacheTests
             _cachedString.Find("Key").Should().Be("New");
         }
 
-
         [Test]
         public void should_be_able_to_remove_key()
         {
@@ -70,7 +67,6 @@ namespace NzbDrone.Common.Test.CacheTests
         {
             int hitCount = 0;
 
-
             for (int i = 0; i < 10; i++)
             {
                 _cachedString.Get("key", () =>
@@ -84,6 +80,7 @@ namespace NzbDrone.Common.Test.CacheTests
         }
 
         [Test]
+        [Platform(Exclude = "MacOsX")]
         public void should_honor_ttl()
         {
             int hitCount = 0;
@@ -91,11 +88,13 @@ namespace NzbDrone.Common.Test.CacheTests
 
             for (int i = 0; i < 10; i++)
             {
-                _cachedString.Get("key", () =>
+                _cachedString.Get("key",
+                    () =>
                     {
                         hitCount++;
                         return null;
-                    }, TimeSpan.FromMilliseconds(300));
+                    },
+                    TimeSpan.FromMilliseconds(300));
 
                 Thread.Sleep(100);
             }

src/NzbDrone.Common.Test/ConfigFileProviderTest.cs

@@ -62,10 +62,8 @@ namespace NzbDrone.Common.Test
             const string key = "Port";
             const int value = 8989;
 
-
             var result = Subject.GetValueInt(key, value);
 
-
             result.Should().Be(value);
         }
 
@@ -75,20 +73,16 @@ namespace NzbDrone.Common.Test
             const string key = "LaunchBrowser";
             const bool value = true;
 
-
             var result = Subject.GetValueBoolean(key, value);
 
-
             result.Should().BeTrue();
         }
 
         [Test]
         public void GetLaunchBrowser_Success()
         {
-
             var result = Subject.LaunchBrowser;
 
-
             result.Should().Be(true);
         }
 
@@ -97,10 +91,8 @@ namespace NzbDrone.Common.Test
         {
             const int value = 8989;
 
-
             var result = Subject.Port;
 
-
             result.Should().Be(value);
         }
 
@@ -110,10 +102,8 @@ namespace NzbDrone.Common.Test
             const string key = "LaunchBrowser";
             const bool value = false;
 
-
             Subject.SetValue(key, value);
 
-
             var result = Subject.LaunchBrowser;
             result.Should().Be(value);
         }
@@ -124,10 +114,8 @@ namespace NzbDrone.Common.Test
             const string key = "Port";
             const int value = 12345;
 
-
             Subject.SetValue(key, value);
 
-
             var result = Subject.Port;
             result.Should().Be(value);
         }
@@ -138,10 +126,8 @@ namespace NzbDrone.Common.Test
             const string key = "Hello";
             const string value = "World";
 
-
             var result = Subject.GetValue(key, value);
 
-
             result.Should().Be(value);
         }
 
@@ -178,7 +164,6 @@ namespace NzbDrone.Common.Test
             dic["SslPort"] = origSslPort;
             Subject.SaveConfigDictionary(dic);
 
-
             dic = new Dictionary<string, object>();
             dic["SslPort"] = sslPort;
             Subject.SaveConfigDictionary(dic);

src/NzbDrone.Common.Test/DiskTests/DiskProviderFixtureBase.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using FluentAssertions;
 using NUnit.Framework;
@@ -7,7 +7,8 @@ using NzbDrone.Test.Common;
 
 namespace NzbDrone.Common.Test.DiskTests
 {
-    public abstract class DiskProviderFixtureBase<TSubject> : TestBase<TSubject> where TSubject : class, IDiskProvider
+    public abstract class DiskProviderFixtureBase<TSubject> : TestBase<TSubject>
+        where TSubject : class, IDiskProvider
     {
         [Test]
         [Retry(5)]
@@ -154,7 +155,7 @@ namespace NzbDrone.Common.Test.DiskTests
         public void should_return_false_for_unlocked_file()
         {
             var testFile = GetTempFilePath();
-            Subject.WriteAllText(testFile, new Guid().ToString());
+            Subject.WriteAllText(testFile, default(Guid).ToString());
 
             Subject.IsFileLocked(testFile).Should().BeFalse();
         }
@@ -163,7 +164,7 @@ namespace NzbDrone.Common.Test.DiskTests
         public void should_return_false_for_unlocked_and_readonly_file()
         {
             var testFile = GetTempFilePath();
-            Subject.WriteAllText(testFile, new Guid().ToString());
+            Subject.WriteAllText(testFile, default(Guid).ToString());
 
             File.SetAttributes(testFile, FileAttributes.ReadOnly);
 
@@ -174,7 +175,7 @@ namespace NzbDrone.Common.Test.DiskTests
         public void should_return_true_for_unlocked_file()
         {
             var testFile = GetTempFilePath();
-            Subject.WriteAllText(testFile, new Guid().ToString());
+            Subject.WriteAllText(testFile, default(Guid).ToString());
 
             using (var file = File.OpenWrite(testFile))
             {
@@ -186,7 +187,7 @@ namespace NzbDrone.Common.Test.DiskTests
         public void should_be_able_to_set_permission_from_parrent()
         {
             var testFile = GetTempFilePath();
-            Subject.WriteAllText(testFile, new Guid().ToString());
+            Subject.WriteAllText(testFile, default(Guid).ToString());
 
             Subject.InheritFolderPermissions(testFile);
         }
@@ -195,7 +196,7 @@ namespace NzbDrone.Common.Test.DiskTests
         public void should_be_set_last_file_write()
         {
             var testFile = GetTempFilePath();
-            Subject.WriteAllText(testFile, new Guid().ToString());
+            Subject.WriteAllText(testFile, default(Guid).ToString());
 
             var lastWriteTime = DateTime.SpecifyKind(new DateTime(2012, 1, 2), DateTimeKind.Utc);
 

src/NzbDrone.Common.Test/DiskTests/DiskTransferServiceFixture.cs

@@ -751,7 +751,9 @@ namespace NzbDrone.Common.Test.DiskTests
         {
             var dir = Path.GetDirectoryName(path);
             if (exists && dir.IsNotNullOrWhiteSpace())
+            {
                 WithExistingFolder(dir);
+            }
 
             Mocker.GetMock<IDiskProvider>()
                 .Setup(v => v.FolderExists(path))
@@ -762,7 +764,9 @@ namespace NzbDrone.Common.Test.DiskTests
         {
             var dir = Path.GetDirectoryName(path);
             if (exists && dir.IsNotNullOrWhiteSpace())
+            {
                 WithExistingFolder(dir);
+            }
 
             Mocker.GetMock<IDiskProvider>()
                 .Setup(v => v.FileExists(path))
@@ -816,7 +820,6 @@ namespace NzbDrone.Common.Test.DiskTests
                     WithExistingFile(v, false);
                 });
 
-
             Mocker.GetMock<IDiskProvider>()
                 .Setup(v => v.FolderExists(It.IsAny<string>()))
                 .Returns(false);
@@ -834,6 +837,7 @@ namespace NzbDrone.Common.Test.DiskTests
                {
                    WithExistingFolder(s, false);
                    WithExistingFolder(d);
+
                    // Note: Should also deal with the files.
                });
 
@@ -842,6 +846,7 @@ namespace NzbDrone.Common.Test.DiskTests
                .Callback<string, bool>((f, r) =>
                {
                    WithExistingFolder(f, false);
+
                    // Note: Should also deal with the files.
                });
 
@@ -907,8 +912,13 @@ namespace NzbDrone.Common.Test.DiskTests
 
             Mocker.GetMock<IDiskProvider>()
                 .Setup(v => v.MoveFile(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<bool>()))
-                .Callback<string, string, bool>((s,d,o) => {
+                .Callback<string, string, bool>((s, d, o) =>
-                    if (File.Exists(d) && o) File.Delete(d);
+                {
+                    if (File.Exists(d) && o)
+                    {
+                        File.Delete(d);
+                    }
+
                     File.Move(s, d);
                 });
 

src/NzbDrone.Common.Test/DiskTests/FreeSpaceFixtureBase.cs

@@ -7,7 +7,8 @@ using NzbDrone.Test.Common;
 
 namespace NzbDrone.Common.Test.DiskTests
 {
-    public abstract class FreeSpaceFixtureBase<TSubject> : TestBase<TSubject> where TSubject : class, IDiskProvider
+    public abstract class FreeSpaceFixtureBase<TSubject> : TestBase<TSubject>
+        where TSubject : class, IDiskProvider
     {
         [Test]
         public void should_get_free_space_for_folder()

src/NzbDrone.Common.Test/EnsureTest/PathExtensionFixture.cs

@@ -15,7 +15,6 @@ namespace NzbDrone.Common.Test.EnsureTest
             Ensure.That(path, () => path).IsValidPath();
         }
 
-
         [TestCase(@"/var/user/file with, comma.mkv")]
         public void EnsureLinuxPath(string path)
         {

src/NzbDrone.Common.Test/EnvironmentProviderTest.cs

@@ -10,13 +10,11 @@ namespace NzbDrone.Common.Test
     [TestFixture]
     public class IAppDirectoryInfoTest : TestBase<AppFolderInfo>
     {
-
         [Test]
         public void StartupPath_should_not_be_empty()
         {
             Subject.StartUpFolder.Should().NotBeNullOrWhiteSpace();
             Path.IsPathRooted(Subject.StartUpFolder).Should().BeTrue("Path is not rooted");
-
         }
 
         [Test]

src/NzbDrone.Common.Test/EnvironmentTests/EnvironmentProviderTest.cs

@@ -9,13 +9,11 @@ namespace NzbDrone.Common.Test.EnvironmentTests
     [TestFixture]
     public class BuildInfoTest : TestBase
     {
-
         [TestCase("0.0.0.0")]
         [TestCase("1.0.0.0")]
         public void Application_version_should_not_be_default(string version)
         {
             BuildInfo.Version.Should().NotBe(new Version(version));
         }
-
     }
 }

src/NzbDrone.Common.Test/EnvironmentTests/StartupArgumentsFixture.cs

@@ -26,7 +26,6 @@ namespace NzbDrone.Common.Test.EnvironmentTests
             args.Flags.Contains("t").Should().BeTrue();
         }
 
-
         [TestCase("/key=value")]
         [TestCase("/KEY=value")]
         [TestCase(" /key=\"value\"")]
@@ -37,7 +36,6 @@ namespace NzbDrone.Common.Test.EnvironmentTests
             args.Args["key"].Should().Be("value");
         }
 
-
         [TestCase("/data=test", "/data=test")]
         [TestCase("/Data=/a/b/c", "/data=/a/b/c")]
         public void should_preserver_data(string arg, string preserved)
@@ -55,7 +53,6 @@ namespace NzbDrone.Common.Test.EnvironmentTests
             args.PreservedArguments.Should().Be(preserved);
         }
 
-     
         [Test]
         public void should_preserver_both()
         {

src/NzbDrone.Common.Test/ExtensionTests/IEnumerableExtensionTests/ExceptByFixture.cs

@@ -56,7 +56,7 @@ namespace NzbDrone.Common.Test.ExtensionTests.IEnumerableExtensionTests
             var result = first.ExceptBy(o => o.Prop1, second, o => o.Prop1, StringComparer.InvariantCultureIgnoreCase).ToList();
 
             result.Should().HaveCount(1);
-            result.First().GetType().Should().Be(typeof (Object1));
+            result.First().GetType().Should().Be(typeof(Object1));
             result.First().Prop1.Should().Be("two");
         }
     }

src/NzbDrone.Common.Test/ExtensionTests/IPAddressExtensionsFixture.cs

@@ -24,7 +24,6 @@ namespace NzbDrone.Common.Test.ExtensionTests
         public void should_return_false_for_public_ip_address(string ipAddress)
         {
             IPAddress.Parse(ipAddress).IsLocalAddress().Should().BeFalse();
-
         }
     }
 }

src/NzbDrone.Common.Test/Http/HttpClientFixture.cs

@@ -23,7 +23,8 @@ namespace NzbDrone.Common.Test.Http
     [Ignore("httpbin is bugged")]
     [IntegrationTest]
     [TestFixture(typeof(ManagedHttpDispatcher))]
-    public class HttpClientFixture<TDispatcher> : TestBase<HttpClient> where TDispatcher : IHttpDispatcher
+    public class HttpClientFixture<TDispatcher> : TestBase<HttpClient>
+        where TDispatcher : IHttpDispatcher
     {
         private string[] _httpBinHosts;
         private int _httpBinSleep;
@@ -35,6 +36,7 @@ namespace NzbDrone.Common.Test.Http
         public void FixtureSetUp()
         {
             var candidates = new[] { "eu.httpbin.org", /*"httpbin.org",*/ "www.httpbin.org" };
+
             // httpbin.org is broken right now, occassionally redirecting to https if it's unavailable.
             _httpBinHosts = candidates.Where(IsTestSiteAvailable).ToArray();
 
@@ -49,7 +51,10 @@ namespace NzbDrone.Common.Test.Http
             {
                 var req = WebRequest.Create($"http://{site}/get") as HttpWebRequest;
                 var res = req.GetResponse() as HttpWebResponse;
-                if (res.StatusCode != HttpStatusCode.OK) return false;
+                if (res.StatusCode != HttpStatusCode.OK)
+                {
+                    return false;
+                }
 
                 try
                 {
@@ -61,7 +66,10 @@ namespace NzbDrone.Common.Test.Http
                     res = ex.Response as HttpWebResponse;
                 }
 
-                if (res == null || res.StatusCode != (HttpStatusCode)429) return false;
+                if (res == null || res.StatusCode != (HttpStatusCode)429)
+                {
+                    return false;
+                }
 
                 return true;
             }
@@ -688,7 +696,7 @@ namespace NzbDrone.Common.Test.Http
         [Test]
         public void should_call_interceptor()
         {
-            Mocker.SetConstant<IEnumerable<IHttpRequestInterceptor>>(new [] { Mocker.GetMock<IHttpRequestInterceptor>().Object });
+            Mocker.SetConstant<IEnumerable<IHttpRequestInterceptor>>(new[] { Mocker.GetMock<IHttpRequestInterceptor>().Object });
 
             Mocker.GetMock<IHttpRequestInterceptor>()
                 .Setup(v => v.PreRequest(It.IsAny<HttpRequest>()))

src/NzbDrone.Common.Test/Http/HttpHeaderFixture.cs

@@ -1,11 +1,11 @@
-using NUnit.Framework;
+using System;
-using FluentAssertions;
-using NzbDrone.Test.Common;
-using System;
-using System.Text;
-using NzbDrone.Common.Http;
 using System.Collections.Specialized;
 using System.Linq;
+using System.Text;
+using FluentAssertions;
+using NUnit.Framework;
+using NzbDrone.Common.Http;
+using NzbDrone.Test.Common;
 
 namespace NzbDrone.Common.Test.Http
 {

src/NzbDrone.Common.Test/Http/HttpRequestBuilderFixture.cs

@@ -35,7 +35,6 @@ namespace NzbDrone.Common.Test.Http
             var request = builder.Resource("/v1/").Build();
 
             request.Url.FullUri.Should().Be("http://domain/v1/");
-
         }
     }
 }

src/NzbDrone.Common.Test/InstrumentationTests/CleanseLogMessageFixture.cs

@@ -1,6 +1,6 @@
-using NUnit.Framework;
-using NzbDrone.Common.Instrumentation;
 using FluentAssertions;
+using NUnit.Framework;
+using NzbDrone.Common.Instrumentation;
 
 namespace NzbDrone.Common.Test.InstrumentationTests
 {
@@ -16,9 +16,11 @@ namespace NzbDrone.Common.Test.InstrumentationTests
         [TestCase(@"https://baconbits.org/feeds.php?feed=torrents_tv&user=12345&auth=2b51db35e1910123321025a12b9933d2&passkey=mySecret&authkey=2b51db35e1910123321025a12b9933d2")]
         [TestCase(@"http://127.0.0.1:9117/dl/indexername?jackett_apikey=flwjiefewklfjacketmySecretsdfldskjfsdlk&path=we0re9f0sdfbase64sfdkfjsdlfjk&file=The+Torrent+File+Name.torrent")]
         [TestCase(@"http://nzb.su/getnzb/2b51db35e1912ffc138825a12b9933d2.nzb&i=37292&r=2b51db35e1910123321025a12b9933d2")]
+
         // NzbGet
         [TestCase(@"{ ""Name"" : ""ControlUsername"", ""Value"" : ""mySecret"" }, { ""Name"" : ""ControlPassword"", ""Value"" : ""mySecret"" }, ")]
         [TestCase(@"{ ""Name"" : ""Server1.Username"", ""Value"" : ""mySecret"" }, { ""Name"" : ""Server1.Password"", ""Value"" : ""mySecret"" }, ")]
+
         // Sabnzbd
         [TestCase(@"http://127.0.0.1:1234/api/call?vv=1&apikey=mySecret")]
         [TestCase(@"http://127.0.0.1:1234/api/call?vv=1&ma_username=mySecret&ma_password=mySecret")]
@@ -29,6 +31,7 @@ namespace NzbDrone.Common.Test.InstrumentationTests
         [TestCase(@"""misc"":{""username"":""mySecret"",""api_key"":""mySecret"",""password"":""mySecret"",""nzb_key"":""mySecret""}")]
         [TestCase(@"""servers"":[{""username"":""mySecret"",""password"":""mySecret""}]")]
         [TestCase(@"""misc"":{""email_account"":""mySecret"",""email_to"":[],""email_from"":"""",""email_pwd"":""mySecret""}")]
+
         // uTorrent
         [TestCase(@"http://localhost:9091/gui/?token=wThmph5l0ZXfH-a6WOA4lqiLvyjCP0FpMrMeXmySecret_VXBO11HoKL751MAAAAA&list=1")]
         [TestCase(@",[""boss_key"",0,""mySecret"",{""access"":""Y""}],[""boss_key_salt"",0,""mySecret"",{""access"":""W""}]")]
@@ -36,22 +39,28 @@ namespace NzbDrone.Common.Test.InstrumentationTests
         [TestCase(@",[""webui.uconnect_username"",2,""mySecret"",{""access"":""Y""}],[""webui.uconnect_password"",2,""mySecret"",{""access"":""Y""}]")]
         [TestCase(@",[""proxy.proxy"",2,""mySecret"",{""access"":""Y""}]")]
         [TestCase(@",[""proxy.username"",2,""mySecret"",{""access"":""Y""}],[""proxy.password"",2,""mySecret"",{""access"":""Y""}]")]
+
         // Deluge
         [TestCase(@",{""download_location"": ""C:\Users\\mySecret mySecret\\Downloads""}")]
         [TestCase(@",{""download_location"": ""/home/mySecret/Downloads""}")]
         [TestCase(@"auth.login(""mySecret"")")]
+
         // Download Station
         [TestCase(@"webapi/entry.cgi?api=(removed)&version=2&method=login&account=01233210&passwd=mySecret&format=sid&session=DownloadStation")]
+
         // BroadcastheNet
         [TestCase(@"method: ""getTorrents"", ""params"": [ ""mySecret"",")]
         [TestCase(@"getTorrents(""mySecret"", [asdfasdf], 100, 0)")]
         [TestCase(@"""DownloadURL"":""https:\/\/broadcasthe.net\/torrents.php?action=download&id=123&authkey=mySecret&torrent_pass=mySecret""")]
+
         // Plex
         [TestCase(@" http://localhost:32400/library/metadata/12345/refresh?X-Plex-Client-Identifier=1234530f-422f-4aac-b6b3-01233210aaaa&X-Plex-Product=Sonarr&X-Plex-Platform=Windows&X-Plex-Platform-Version=7&X-Plex-Device-Name=Sonarr&X-Plex-Version=3.0.3.833&X-Plex-Token=mySecret")]
+
         // Internal
         [TestCase(@"OutputPath=/home/mySecret/Downloads")]
         [TestCase("Hardlinking episode file: /home/mySecret/Downloads to /media/abc.mkv")]
         [TestCase("Hardlink '/home/mySecret/Downloads/abs.mkv' to '/media/abc.mkv' failed.")]
+
         // Announce URLs (passkeys) Magnet & Tracker
         [TestCase(@"magnet_uri"":""magnet:?xt=urn:btih:9pr04sgkillroyimaveql2tyu8xyui&dn=&tr=https%3a%2f%2fxxx.yyy%2f9pr04sg601233210imaveql2tyu8xyui%2fannounce""}")]
         [TestCase(@"magnet_uri"":""magnet:?xt=urn:btih:9pr04sgkillroyimaveql2tyu8xyui&dn=&tr=https%3a%2f%2fxxx.yyy%2ftracker.php%2f9pr04sg601233210imaveql2tyu8xyui%2fannounce""}")]
@@ -62,6 +71,7 @@ namespace NzbDrone.Common.Test.InstrumentationTests
         [TestCase(@"tracker"":""https://xxx.yyy/announce/9pr04sg601233210imaveql2tyu8xyui""}")]
         [TestCase(@"tracker"":""https://xxx.yyy/announce.php?passkey=9pr04sg601233210imaveql2tyu8xyui""}")]
         [TestCase(@"tracker"":""http://xxx.yyy/announce.php?passkey=9pr04sg601233210imaveql2tyu8xyui"",""info"":""http://xxx.yyy/info?a=b""")]
+
         // Webhooks - Notifiarr
         [TestCase(@"https://xxx.yyy/api/v1/notification/sonarr/9pr04sg6-0123-3210-imav-eql2tyu8xyui")]
 

src/NzbDrone.Common.Test/InstrumentationTests/SentryTargetFixture.cs

@@ -1,24 +1,25 @@
-using NUnit.Framework;
-using FluentAssertions;
-using NzbDrone.Common.Instrumentation.Sentry;
 using System;
-using NLog;
-using NzbDrone.Test.Common;
 using System.Globalization;
 using System.Linq;
+using FluentAssertions;
+using NLog;
+using NUnit.Framework;
+using NzbDrone.Common.Instrumentation.Sentry;
+using NzbDrone.Test.Common;
 
 namespace NzbDrone.Common.Test.InstrumentationTests
 {
     [TestFixture]
     public class SentryTargetFixture : TestBase
     {
-        private SentryTarget Subject;
+        private SentryTarget _subject;
 
         private static LogLevel[] AllLevels = LogLevel.AllLevels.ToArray();
         private static LogLevel[] SentryLevels = LogLevel.AllLevels.Where(x => x >= LogLevel.Error).ToArray();
         private static LogLevel[] OtherLevels = AllLevels.Except(SentryLevels).ToArray();
 
-        private static Exception[] FilteredExceptions = new Exception[] {
+        private static Exception[] FilteredExceptions = new Exception[]
+        {
             new UnauthorizedAccessException(),
             new TinyIoC.TinyIoCResolutionException(typeof(string))
         };
@@ -26,7 +27,7 @@ namespace NzbDrone.Common.Test.InstrumentationTests
         [SetUp]
         public void Setup()
         {
-            Subject = new SentryTarget("https://aaaaaaaaaaaaaaaaaaaaaaaaaa@sentry.io/111111");
+            _subject = new SentryTarget("https://aaaaaaaaaaaaaaaaaaaaaaaaaa@sentry.io/111111");
         }
 
         private LogEventInfo GivenLogEvent(LogLevel level, Exception ex, string message)
@@ -34,44 +35,50 @@ namespace NzbDrone.Common.Test.InstrumentationTests
             return LogEventInfo.Create(level, "SentryTest", ex, CultureInfo.InvariantCulture, message);
         }
 
-        [Test, TestCaseSource("AllLevels")]
+        [Test]
+        [TestCaseSource("AllLevels")]
         public void log_without_error_is_not_sentry_event(LogLevel level)
         {
-            Subject.IsSentryMessage(GivenLogEvent(level, null, "test")).Should().BeFalse();
+            _subject.IsSentryMessage(GivenLogEvent(level, null, "test")).Should().BeFalse();
         }
 
-        [Test, TestCaseSource("SentryLevels")]
+        [Test]
+        [TestCaseSource("SentryLevels")]
         public void error_or_worse_with_exception_is_sentry_event(LogLevel level)
         {
-            Subject.IsSentryMessage(GivenLogEvent(level, new Exception(), "test")).Should().BeTrue();
+            _subject.IsSentryMessage(GivenLogEvent(level, new Exception(), "test")).Should().BeTrue();
         }
 
-        [Test, TestCaseSource("OtherLevels")]
+        [Test]
+        [TestCaseSource("OtherLevels")]
         public void less_than_error_with_exception_is_not_sentry_event(LogLevel level)
         {
-            Subject.IsSentryMessage(GivenLogEvent(level, new Exception(), "test")).Should().BeFalse();
+            _subject.IsSentryMessage(GivenLogEvent(level, new Exception(), "test")).Should().BeFalse();
         }
 
-        [Test, TestCaseSource("FilteredExceptions")]
+        [Test]
+        [TestCaseSource("FilteredExceptions")]
         public void should_filter_event_for_filtered_exception_types(Exception ex)
         {
             var log = GivenLogEvent(LogLevel.Error, ex, "test");
-            Subject.IsSentryMessage(log).Should().BeFalse();
+            _subject.IsSentryMessage(log).Should().BeFalse();
         }
 
-        [Test, TestCaseSource("FilteredExceptions")]
+        [Test]
+        [TestCaseSource("FilteredExceptions")]
         public void should_not_filter_event_for_filtered_exception_types_if_filtering_disabled(Exception ex)
         {
-            Subject.FilterEvents = false;
+            _subject.FilterEvents = false;
             var log = GivenLogEvent(LogLevel.Error, ex, "test");
-            Subject.IsSentryMessage(log).Should().BeTrue();
+            _subject.IsSentryMessage(log).Should().BeTrue();
         }
 
-        [Test, TestCaseSource(typeof(SentryTarget), "FilteredExceptionMessages")]
+        [Test]
+        [TestCaseSource(typeof(SentryTarget), "FilteredExceptionMessages")]
         public void should_filter_event_for_filtered_exception_messages(string message)
         {
             var log = GivenLogEvent(LogLevel.Error, new Exception("aaaaaaa" + message + "bbbbbbb"), "test");
-            Subject.IsSentryMessage(log).Should().BeFalse();
+            _subject.IsSentryMessage(log).Should().BeFalse();
         }
 
         [TestCase("A message that isn't filtered")]
@@ -79,7 +86,7 @@ namespace NzbDrone.Common.Test.InstrumentationTests
         public void should_not_filter_event_for_exception_messages_that_are_not_filtered(string message)
         {
             var log = GivenLogEvent(LogLevel.Error, new Exception(message), "test");
-            Subject.IsSentryMessage(log).Should().BeTrue();
+            _subject.IsSentryMessage(log).Should().BeTrue();
         }
     }
 }

src/NzbDrone.Common.Test/OsPathFixture.cs

@@ -1,7 +1,7 @@
-using NUnit.Framework;
+using FluentAssertions;
+using NUnit.Framework;
 using NzbDrone.Common.Disk;
 using NzbDrone.Test.Common;
-using FluentAssertions;
 
 namespace NzbDrone.Common.Test
 {

src/NzbDrone.Common.Test/PathExtensionFixture.cs

@@ -110,6 +110,7 @@ namespace NzbDrone.Common.Test
 
             _parent.IsParentPath(path).Should().BeTrue();
         }
+
         [TestCase(@"C:\Test\", @"C:\Test\mydir")]
         [TestCase(@"C:\Test\", @"C:\Test\mydir\")]
         [TestCase(@"C:\Test", @"C:\Test\30.Rock.S01E01.Pilot.avi")]
@@ -198,10 +199,9 @@ namespace NzbDrone.Common.Test
         public void get_actual_casing_for_none_existing_file_return_partially_fixed_result()
         {
             WindowsOnly();
-           "C:\\WINDOWS\\invalidfile.exe".GetActualCasing().Should().Be("C:\\Windows\\invalidfile.exe");
+            "C:\\WINDOWS\\invalidfile.exe".GetActualCasing().Should().Be("C:\\Windows\\invalidfile.exe");
         }
 
-
         [Test]
         public void get_actual_casing_for_none_existing_folder_return_partially_fixed_result()
         {
@@ -218,7 +218,6 @@ namespace NzbDrone.Common.Test
             path.ToLower().GetActualCasing().Should().Be(path);
         }
 
-
         [Test]
         public void get_actual_casing_should_return_actual_casing_for_local_dir_in_windows()
         {

src/NzbDrone.Common.Test/ProcessProviderFixture.cs

@@ -18,7 +18,6 @@ namespace NzbDrone.Common.Test
     [TestFixture]
     public class ProcessProviderFixture : TestBase<ProcessProvider>
     {
-
         [SetUp]
         public void Setup()
         {
@@ -44,7 +43,6 @@ namespace NzbDrone.Common.Test
                 {
                     TestLogger.Warn(ex, "{0} when killing process", ex.Message);
                 }
-                
             });
         }
 
@@ -134,7 +132,6 @@ namespace NzbDrone.Common.Test
             }
         }
 
-
         [Test]
         [Platform(Exclude = "MacOsX")]
         [Retry(3)]

src/NzbDrone.Common.Test/ServiceProviderFixture.cs

@@ -36,7 +36,6 @@ namespace NzbDrone.Common.Test
             }
         }
 
-
         private void CleanupService()
         {
             if (Subject.ServiceExist(TEMP_SERVICE_NAME))
@@ -62,7 +61,6 @@ namespace NzbDrone.Common.Test
             Subject.ServiceExist("random_service_name").Should().BeFalse();
         }
 
-
         [Test]
         public void Service_should_be_installed_and_then_uninstalled()
         {
@@ -123,7 +121,6 @@ namespace NzbDrone.Common.Test
             Subject.Start(ALWAYS_INSTALLED_SERVICE);
             Assert.Throws<InvalidOperationException>(() => Subject.Start(ALWAYS_INSTALLED_SERVICE));
 
-
             ExceptionVerification.ExpectedWarns(1);
         }
 
@@ -133,15 +130,14 @@ namespace NzbDrone.Common.Test
             Subject.GetService(ALWAYS_INSTALLED_SERVICE).Status
                 .Should().NotBe(ServiceControllerStatus.Running);
 
-
             Subject.Stop(ALWAYS_INSTALLED_SERVICE);
 
-
             Subject.GetService(ALWAYS_INSTALLED_SERVICE).Status
                 .Should().Be(ServiceControllerStatus.Stopped);
 
             ExceptionVerification.ExpectedWarns(1);
         }
+
         private static bool IsAnAdministrator()
         {
             var principal = new WindowsPrincipal(WindowsIdentity.GetCurrent());

src/NzbDrone.Common.Test/TPLTests/DebouncerFixture.cs

@@ -19,7 +19,6 @@ namespace NzbDrone.Common.Test.TPLTests
             }
         }
 
-
         [Test]
         [Retry(3)]
         public void should_hold_the_call_for_debounce_duration()
@@ -33,11 +32,9 @@ namespace NzbDrone.Common.Test.TPLTests
 
             counter.Count.Should().Be(0);
 
-
             Thread.Sleep(100);
 
             counter.Count.Should().Be(1);
-
         }
 
         [Test]
@@ -53,7 +50,6 @@ namespace NzbDrone.Common.Test.TPLTests
 
             counter.Count.Should().Be(0);
 
-
             Thread.Sleep(200);
 
             debounceFunction.Execute();
@@ -63,7 +59,6 @@ namespace NzbDrone.Common.Test.TPLTests
             Thread.Sleep(200);
 
             counter.Count.Should().Be(2);
-
         }
 
         [Test]

src/NzbDrone.Common.Test/TPLTests/RateLimitServiceFixture.cs

@@ -1,11 +1,11 @@
 using System;
 using System.Collections.Concurrent;
 using System.Diagnostics;
+using FluentAssertions;
 using NUnit.Framework;
 using NzbDrone.Common.Cache;
 using NzbDrone.Common.TPL;
 using NzbDrone.Test.Common;
-using FluentAssertions;
 
 namespace NzbDrone.Common.Test.TPLTests
 {

src/NzbDrone.Common/ArchiveService.cs

@@ -73,7 +73,9 @@ namespace NzbDrone.Common
                     {
                         continue; // Ignore directories
                     }
+
                     string entryFileName = zipEntry.Name;
+
                     // to remove the folder from the entry:- entryFileName = Path.GetFileName(entryFileName);
                     // Optionally match entrynames against a selection list here to skip as desired.
                     // The unpacked length is available in the zipEntry.Size property.

src/NzbDrone.Common/Cache/CacheManager.cs

@@ -21,7 +21,6 @@ namespace NzbDrone.Common.Cache
         public CacheManager()
         {
             _cache = new Cached<ICached>();
-
         }
 
         public void Clear()

src/NzbDrone.Common/Cache/Cached.cs

@@ -7,7 +7,6 @@ using NzbDrone.Common.Extensions;
 
 namespace NzbDrone.Common.Cache
 {
-
     public class Cached<T> : ICached<T>
     {
         private class CacheItem
@@ -144,6 +143,5 @@ namespace NzbDrone.Common.Cache
 
             return collection.Remove(new KeyValuePair<string, CacheItem>(key, value));
         }
-
     }
 }

src/NzbDrone.Common/Cache/CachedDictionary.cs

@@ -5,7 +5,6 @@ using System.Diagnostics;
 
 namespace NzbDrone.Common.Cache
 {
-
     public class CachedDictionary<TValue> : ICachedDictionary<TValue>
     {
         private readonly Func<IDictionary<string, TValue>> _fetchFunc;

src/NzbDrone.Common/Composition/Container.cs

@@ -24,12 +24,14 @@ namespace NzbDrone.Common.Composition
             _container.Register<TService, TImplementation>();
         }
 
-        public void Register<T>(T instance) where T : class
+        public void Register<T>(T instance)
+            where T : class
         {
             _container.Register<T>(instance);
         }
 
-        public T Resolve<T>() where T : class
+        public T Resolve<T>()
+            where T : class
         {
             return _container.Resolve<T>();
         }
@@ -44,7 +46,8 @@ namespace NzbDrone.Common.Composition
             _container.Register(serviceType, implementationType);
         }
 
-        public void Register<TService>(Func<IContainer, TService> factory) where TService : class
+        public void Register<TService>(Func<IContainer, TService> factory)
+            where TService : class
         {
             _container.Register((c, n) => factory(this));
         }
@@ -67,7 +70,8 @@ namespace NzbDrone.Common.Composition
             });
         }
 
-        public IEnumerable<T> ResolveAll<T>() where T : class
+        public IEnumerable<T> ResolveAll<T>()
+            where T : class
         {
             return _container.ResolveAll<T>();
         }
@@ -103,8 +107,7 @@ namespace NzbDrone.Common.Composition
                 .Where(implementation =>
                        contractType.IsAssignableFrom(implementation) &&
                        !implementation.IsInterface &&
-                       !implementation.IsAbstract
+                       !implementation.IsAbstract);
-                );
         }
     }
 }

src/NzbDrone.Common/Composition/ContainerBuilderBase.cs

@@ -121,6 +121,7 @@ namespace NzbDrone.Common.Composition
             {
                 return;
             }
+
             if (implementations.Count == 1)
             {
                 var impl = implementations.Single();

src/NzbDrone.Common/Composition/IContainer.cs

@@ -5,17 +5,21 @@ namespace NzbDrone.Common.Composition
 {
     public interface IContainer
     {
-        void Register<T>(T instance) where T : class;
+        void Register<T>(T instance)
+            where T : class;
 
         void Register<TService, TImplementation>()
             where TImplementation : class, TService
             where TService : class;
-        T Resolve<T>() where T : class;
+        T Resolve<T>()
+            where T : class;
         object Resolve(Type type);
         void Register(Type serviceType, Type implementationType);
-        void Register<TService>(Func<IContainer, TService> factory) where TService : class;
+        void Register<TService>(Func<IContainer, TService> factory)
+            where TService : class;
         void RegisterSingleton(Type service, Type implementation);
-        IEnumerable<T> ResolveAll<T>() where T : class;
+        IEnumerable<T> ResolveAll<T>()
+            where T : class;
         void RegisterAllAsSingleton(Type registrationType, IEnumerable<Type> implementationList);
         bool IsTypeRegistered(Type type);
 

src/NzbDrone.Common/Disk/DestinationAlreadyExistsException.cs

@@ -10,19 +10,23 @@ namespace NzbDrone.Common.Disk
         {
         }
 
-        public DestinationAlreadyExistsException(string message) : base(message)
+        public DestinationAlreadyExistsException(string message)
+            : base(message)
         {
         }
 
-        public DestinationAlreadyExistsException(string message, int hresult) : base(message, hresult)
+        public DestinationAlreadyExistsException(string message, int hresult)
+            : base(message, hresult)
         {
         }
 
-        public DestinationAlreadyExistsException(string message, Exception innerException) : base(message, innerException)
+        public DestinationAlreadyExistsException(string message, Exception innerException)
+            : base(message, innerException)
         {
         }
 
-        protected DestinationAlreadyExistsException(SerializationInfo info, StreamingContext context) : base(info, context)
+        protected DestinationAlreadyExistsException(SerializationInfo info, StreamingContext context)
+            : base(info, context)
         {
         }
     }

src/NzbDrone.Common/Disk/DiskProviderBase.cs

@@ -117,6 +117,7 @@ namespace NzbDrone.Common.Disk
                     {
                         return File.Exists(path) && path == path.GetActualCasing();
                     }
+
                 default:
                     {
                         return File.Exists(path);
@@ -367,7 +368,7 @@ namespace NzbDrone.Common.Disk
 
                 if (attributes.HasFlag(FileAttributes.ReadOnly))
                 {
-                    var newAttributes = attributes & ~(FileAttributes.ReadOnly);
+                    var newAttributes = attributes & ~FileAttributes.ReadOnly;
                     File.SetAttributes(path, newAttributes);
                 }
             }

src/NzbDrone.Common/Disk/DiskTransferService.cs

@@ -101,14 +101,20 @@ namespace NzbDrone.Common.Disk
 
             foreach (var subDir in _diskProvider.GetDirectoryInfos(sourcePath))
             {
-                if (ShouldIgnore(subDir)) continue;
+                if (ShouldIgnore(subDir))
+                {
+                    continue;
+                }
 
                 result &= TransferFolder(subDir.FullName, Path.Combine(targetPath, subDir.Name), mode);
             }
 
             foreach (var sourceFile in _diskProvider.GetFileInfos(sourcePath))
             {
-                if (ShouldIgnore(sourceFile)) continue;
+                if (ShouldIgnore(sourceFile))
+                {
+                    continue;
+                }
 
                 var destFile = Path.Combine(targetPath, sourceFile.Name);
 
@@ -152,14 +158,20 @@ namespace NzbDrone.Common.Disk
 
             foreach (var subDir in targetFolders.Where(v => !sourceFolders.Any(d => d.Name == v.Name)))
             {
-                if (ShouldIgnore(subDir)) continue;
+                if (ShouldIgnore(subDir))
+                {
+                    continue;
+                }
 
                 _diskProvider.DeleteFolder(subDir.FullName, true);
             }
 
             foreach (var subDir in sourceFolders)
             {
-                if (ShouldIgnore(subDir)) continue;
+                if (ShouldIgnore(subDir))
+                {
+                    continue;
+                }
 
                 filesCopied += MirrorFolder(subDir.FullName, Path.Combine(targetPath, subDir.Name));
             }
@@ -169,14 +181,20 @@ namespace NzbDrone.Common.Disk
 
             foreach (var targetFile in targetFiles.Where(v => !sourceFiles.Any(d => d.Name == v.Name)))
             {
-                if (ShouldIgnore(targetFile)) continue;
+                if (ShouldIgnore(targetFile))
+                {
+                    continue;
+                }
 
                 _diskProvider.DeleteFile(targetFile.FullName);
             }
 
             foreach (var sourceFile in sourceFiles)
             {
-                if (ShouldIgnore(sourceFile)) continue;
+                if (ShouldIgnore(sourceFile))
+                {
+                    continue;
+                }
 
                 var targetFile = Path.Combine(targetPath, sourceFile.Name);
 
@@ -305,6 +323,7 @@ namespace NzbDrone.Common.Disk
                 {
                     return TransferMode.HardLink;
                 }
+
                 if (!mode.HasFlag(TransferMode.Copy))
                 {
                     throw new IOException("Hardlinking from '" + sourcePath + "' to '" + targetPath + "' failed.");
@@ -315,7 +334,7 @@ namespace NzbDrone.Common.Disk
             var sourceMount = _diskProvider.GetMount(sourcePath);
             var targetMount = _diskProvider.GetMount(targetPath);
 
-            var isSameMount = (sourceMount != null && targetMount != null && sourceMount.RootDirectory == targetMount.RootDirectory);
+            var isSameMount = sourceMount != null && targetMount != null && sourceMount.RootDirectory == targetMount.RootDirectory;
 
             var sourceDriveFormat = sourceMount?.DriveFormat ?? string.Empty;
             var targetDriveFormat = targetMount?.DriveFormat ?? string.Empty;

src/NzbDrone.Common/Disk/FileAlreadyExistsException.cs

@@ -6,7 +6,8 @@ namespace NzbDrone.Common.Disk
     {
         public string Filename { get; set; }
 
-        public FileAlreadyExistsException(string message, string filename) : base(message)
+        public FileAlreadyExistsException(string message, string filename)
+            : base(message)
         {
             Filename = filename;
         }

src/NzbDrone.Common/Disk/FileSystemLookupService.cs

@@ -125,7 +125,6 @@ namespace NzbDrone.Common.Disk
                     result.Files = GetFiles(path);
                 }
             }
-
             catch (DirectoryNotFoundException)
             {
                 return new FileSystemResult { Parent = GetParent(path) };

src/NzbDrone.Common/Disk/LongPathSupport.cs

@@ -54,7 +54,11 @@ namespace NzbDrone.Common.Disk
         {
             get
             {
-                if (MAX_PATH == 0) DetectLongPathLimits();
+                if (MAX_PATH == 0)
+                {
+                    DetectLongPathLimits();
+                }
+
                 return MAX_PATH;
             }
         }
@@ -63,7 +67,11 @@ namespace NzbDrone.Common.Disk
         {
             get
             {
-                if (MAX_NAME == 0) DetectLongPathLimits();
+                if (MAX_NAME == 0)
+                {
+                    DetectLongPathLimits();
+                }
+
                 return MAX_NAME;
             }
         }

src/NzbDrone.Common/Disk/NotParentException.cs

@@ -4,11 +4,13 @@ namespace NzbDrone.Common.Disk
 {
     public class NotParentException : NzbDroneException
     {
-        public NotParentException(string message, params object[] args) : base(message, args)
+        public NotParentException(string message, params object[] args)
+            : base(message, args)
         {
         }
 
-        public NotParentException(string message) : base(message)
+        public NotParentException(string message)
+            : base(message)
         {
         }
     }

src/NzbDrone.Common/Disk/OsPath.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using NzbDrone.Common.Extensions;
@@ -44,22 +44,36 @@ namespace NzbDrone.Common.Disk
             {
                 return OsPathKind.Unix;
             }
+
             if (HasWindowsDriveLetter(path) || path.Contains('\\'))
             {
                 return OsPathKind.Windows;
             }
+
             if (path.Contains('/'))
             {
                 return OsPathKind.Unix;
             }
+
             return OsPathKind.Unknown;
         }
 
         private static bool HasWindowsDriveLetter(string path)
         {
-            if (path.Length < 2)    return false;
+            if (path.Length < 2)
-            if (!char.IsLetter(path[0]) || path[1] != ':') return false;
+            {
-            if (path.Length > 2 && path[2] != '\\' && path[2] != '/') return false;
+                return false;
+            }
+
+            if (!char.IsLetter(path[0]) || path[1] != ':')
+            {
+                return false;
+            }
+
+            if (path.Length > 2 && path[2] != '\\' && path[2] != '/')
+            {
+                return false;
+            }
 
             return true;
         }
@@ -76,6 +90,7 @@ namespace NzbDrone.Common.Disk
                     {
                         path = path.Replace("//", "/");
                     }
+
                     return path;
             }
 
@@ -98,6 +113,7 @@ namespace NzbDrone.Common.Disk
                 {
                     return _path.StartsWith(@"\\") || HasWindowsDriveLetter(_path);
                 }
+
                 if (IsUnixPath)
                 {
                     return _path.StartsWith("/");
@@ -196,10 +212,12 @@ namespace NzbDrone.Common.Disk
             {
                 return Equals((OsPath)obj);
             }
+
             if (obj is string)
             {
                 return Equals(new OsPath(obj as string));
             }
+
             return false;
         }
 
@@ -217,6 +235,7 @@ namespace NzbDrone.Common.Disk
                 case OsPathKind.Unix:
                     return new OsPath(_path.TrimEnd('/') + "/", _kind);
             }
+
             return this;
         }
 
@@ -250,7 +269,10 @@ namespace NzbDrone.Common.Disk
 
         public bool Equals(OsPath other)
         {
-            if (ReferenceEquals(other, null)) return false;
+            if (ReferenceEquals(other, null))
+            {
+                return false;
+            }
 
             if (_path == other._path)
             {
@@ -264,19 +286,26 @@ namespace NzbDrone.Common.Disk
             {
                 return string.Equals(left, right, StringComparison.InvariantCultureIgnoreCase);
             }
+
             return string.Equals(left, right, StringComparison.InvariantCulture);
         }
 
         public static bool operator ==(OsPath left, OsPath right)
         {
-            if (ReferenceEquals(left, null)) return ReferenceEquals(right, null);
+            if (ReferenceEquals(left, null))
+            {
+                return ReferenceEquals(right, null);
+            }
 
             return left.Equals(right);
         }
 
         public static bool operator !=(OsPath left, OsPath right)
         {
-            if (ReferenceEquals(left, null)) return !ReferenceEquals(right, null);
+            if (ReferenceEquals(left, null))
+            {
+                return !ReferenceEquals(right, null);
+            }
 
             return !left.Equals(right);
         }
@@ -302,10 +331,12 @@ namespace NzbDrone.Common.Disk
             {
                 return new OsPath(string.Join("\\", left._path.TrimEnd('\\'), right._path.TrimStart('\\')), OsPathKind.Windows);
             }
+
             if (left.Kind == OsPathKind.Unix || right.Kind == OsPathKind.Unix)
             {
                 return new OsPath(string.Join("/", left._path.TrimEnd('/'), right._path), OsPathKind.Unix);
             }
+
             return new OsPath(string.Join("/", left._path, right._path), OsPathKind.Unknown);
         }
 
@@ -361,6 +392,7 @@ namespace NzbDrone.Common.Disk
             {
                 return new OsPath(string.Join("\\", newFragments), OsPathKind.Unknown);
             }
+
             return new OsPath(string.Join("/", newFragments), OsPathKind.Unknown);
         }
     }

src/NzbDrone.Common/EnsureThat/EnsureBoolExtensions.cs

@@ -9,7 +9,9 @@ namespace NzbDrone.Common.EnsureThat
         public static Param<bool> IsTrue(this Param<bool> param)
         {
             if (!param.Value)
+            {
                 throw ExceptionFactory.CreateForParamValidation(param.Name, ExceptionMessages.EnsureExtensions_IsNotTrue);
+            }
 
             return param;
         }
@@ -18,7 +20,9 @@ namespace NzbDrone.Common.EnsureThat
         public static Param<bool> IsFalse(this Param<bool> param)
         {
             if (param.Value)
+            {
                 throw ExceptionFactory.CreateForParamValidation(param.Name, ExceptionMessages.EnsureExtensions_IsNotFalse);
+            }
 
             return param;
         }

src/NzbDrone.Common/EnsureThat/EnsureCollectionExtensions.cs

@@ -10,10 +10,13 @@ namespace NzbDrone.Common.EnsureThat
     public static class EnsureCollectionExtensions
     {
         [DebuggerStepThrough]
-        public static Param<T> HasItems<T>(this Param<T> param) where T : class, ICollection
+        public static Param<T> HasItems<T>(this Param<T> param)
+            where T : class, ICollection
         {
             if (param.Value == null || param.Value.Count < 1)
+            {
                 throw ExceptionFactory.CreateForParamValidation(param.Name, ExceptionMessages.EnsureExtensions_IsEmptyCollection);
+            }
 
             return param;
         }
@@ -22,7 +25,9 @@ namespace NzbDrone.Common.EnsureThat
         public static Param<Collection<T>> HasItems<T>(this Param<Collection<T>> param)
         {
             if (param.Value == null || param.Value.Count < 1)
+            {
                 throw ExceptionFactory.CreateForParamValidation(param.Name, ExceptionMessages.EnsureExtensions_IsEmptyCollection);
+            }
 
             return param;
         }
@@ -31,7 +36,9 @@ namespace NzbDrone.Common.EnsureThat
         public static Param<IEnumerable<T>> HasItems<T>(this Param<IEnumerable<T>> param)
         {
             if (param.Value == null || !param.Value.Any())
+            {
                 throw ExceptionFactory.CreateForParamValidation(param.Name, ExceptionMessages.EnsureExtensions_IsEmptyCollection);
+            }
 
             return param;
         }
@@ -40,7 +47,9 @@ namespace NzbDrone.Common.EnsureThat
         public static Param<T[]> HasItems<T>(this Param<T[]> param)
         {
             if (param.Value == null || param.Value.Length < 1)
+            {
                 throw ExceptionFactory.CreateForParamValidation(param.Name, ExceptionMessages.EnsureExtensions_IsEmptyCollection);
+            }
 
             return param;
         }
@@ -49,17 +58,20 @@ namespace NzbDrone.Common.EnsureThat
         public static Param<List<T>> HasItems<T>(this Param<List<T>> param)
         {
             if (param.Value == null || param.Value.Count < 1)
+            {
                 throw ExceptionFactory.CreateForParamValidation(param.Name, ExceptionMessages.EnsureExtensions_IsEmptyCollection);
+            }
 
             return param;
         }
 
-
         [DebuggerStepThrough]
         public static Param<IDictionary<TKey, TValue>> HasItems<TKey, TValue>(this Param<IDictionary<TKey, TValue>> param)
         {
             if (param.Value == null || param.Value.Count < 1)
+            {
                 throw ExceptionFactory.CreateForParamValidation(param.Name, ExceptionMessages.EnsureExtensions_IsEmptyCollection);
+            }
 
             return param;
         }

src/NzbDrone.Common/EnsureThat/EnsureDateTimeExtensions.cs

@@ -7,14 +7,15 @@ namespace NzbDrone.Common.EnsureThat
 {
     public static class EnsureDateTimeExtensions
     {
-
         private static readonly DateTime _minTime = new DateTime(1960, 1, 1);
 
         [DebuggerStepThrough]
         public static Param<DateTime> IsLt(this Param<DateTime> param, DateTime limit)
         {
             if (param.Value >= limit)
+            {
                 throw ExceptionFactory.CreateForParamValidation(param.Name, ExceptionMessages.EnsureExtensions_IsNotLt.Inject(param.Value, limit));
+            }
 
             return param;
         }
@@ -23,7 +24,9 @@ namespace NzbDrone.Common.EnsureThat
         public static Param<DateTime> IsLte(this Param<DateTime> param, DateTime limit)
         {
             if (!(param.Value <= limit))
+            {
                 throw ExceptionFactory.CreateForParamValidation(param.Name, ExceptionMessages.EnsureExtensions_IsNotLte.Inject(param.Value, limit));
+            }
 
             return param;
         }
@@ -32,7 +35,9 @@ namespace NzbDrone.Common.EnsureThat
         public static Param<DateTime> IsGt(this Param<DateTime> param, DateTime limit)
         {
             if (param.Value <= limit)
+            {
                 throw ExceptionFactory.CreateForParamValidation(param.Name, ExceptionMessages.EnsureExtensions_IsNotGt.Inject(param.Value, limit));
+            }
 
             return param;
         }
@@ -41,7 +46,9 @@ namespace NzbDrone.Common.EnsureThat
         public static Param<DateTime> IsGte(this Param<DateTime> param, DateTime limit)
         {
             if (!(param.Value >= limit))
+            {
                 throw ExceptionFactory.CreateForParamValidation(param.Name, ExceptionMessages.EnsureExtensions_IsNotGte.Inject(param.Value, limit));
+            }
 
             return param;
         }
@@ -50,10 +57,14 @@ namespace NzbDrone.Common.EnsureThat
         public static Param<DateTime> IsInRange(this Param<DateTime> param, DateTime min, DateTime max)
         {
             if (param.Value < min)
+            {
                 throw ExceptionFactory.CreateForParamValidation(param.Name, ExceptionMessages.EnsureExtensions_IsNotInRange_ToLow.Inject(param.Value, min));
+            }
 
             if (param.Value > max)
+            {
                 throw ExceptionFactory.CreateForParamValidation(param.Name, ExceptionMessages.EnsureExtensions_IsNotInRange_ToHigh.Inject(param.Value, max));
+            }
 
             return param;
         }
@@ -62,11 +73,13 @@ namespace NzbDrone.Common.EnsureThat
         public static Param<DateTime> IsUtc(this Param<DateTime> param)
         {
             if (param.Value.Kind != DateTimeKind.Utc)
+            {
                 throw ExceptionFactory.CreateForParamValidation(param.Name, "Excepted time to be in UTC but was [{0}]".Inject(param.Value.Kind));
+            }
+
             return param;
         }
 
-
         [DebuggerStepThrough]
         public static Param<DateTime> IsValid(this Param<DateTime> param)
         {

src/NzbDrone.Common/EnsureThat/EnsureDecimalExtensions.cs

@@ -10,7 +10,9 @@ namespace NzbDrone.Common.EnsureThat
         public static Param<decimal> IsLt(this Param<decimal> param, decimal limit)
         {
             if (param.Value >= limit)
+            {
                 throw ExceptionFactory.CreateForParamValidation(param.Name, ExceptionMessages.EnsureExtensions_IsNotLt.Inject(param.Value, limit));
+            }
 
             return param;
         }
@@ -19,7 +21,9 @@ namespace NzbDrone.Common.EnsureThat
         public static Param<decimal> IsLte(this Param<decimal> param, decimal limit)
         {
             if (!(param.Value <= limit))
+            {
                 throw ExceptionFactory.CreateForParamValidation(param.Name, ExceptionMessages.EnsureExtensions_IsNotLte.Inject(param.Value, limit));
+            }
 
             return param;
         }
@@ -28,7 +32,9 @@ namespace NzbDrone.Common.EnsureThat
         public static Param<decimal> IsGt(this Param<decimal> param, decimal limit)
         {
             if (param.Value <= limit)
+            {
                 throw ExceptionFactory.CreateForParamValidation(param.Name, ExceptionMessages.EnsureExtensions_IsNotGt.Inject(param.Value, limit));
+            }
 
             return param;
         }
@@ -37,7 +43,9 @@ namespace NzbDrone.Common.EnsureThat
         public static Param<decimal> IsGte(this Param<decimal> param, decimal limit)
         {
             if (!(param.Value >= limit))
+            {
                 throw ExceptionFactory.CreateForParamValidation(param.Name, ExceptionMessages.EnsureExtensions_IsNotGte.Inject(param.Value, limit));
+            }
 
             return param;
         }
@@ -46,10 +54,14 @@ namespace NzbDrone.Common.EnsureThat
         public static Param<decimal> IsInRange(this Param<decimal> param, decimal min, decimal max)
         {
             if (param.Value < min)
+            {
                 throw ExceptionFactory.CreateForParamValidation(param.Name, ExceptionMessages.EnsureExtensions_IsNotInRange_ToLow.Inject(param.Value, min));
+            }
 
             if (param.Value > max)
+            {
                 throw ExceptionFactory.CreateForParamValidation(param.Name, ExceptionMessages.EnsureExtensions_IsNotInRange_ToHigh.Inject(param.Value, max));
+            }
 
             return param;
         }

src/NzbDrone.Common/EnsureThat/EnsureDoubleExtensions.cs

@@ -10,7 +10,9 @@ namespace NzbDrone.Common.EnsureThat
         public static Param<double> IsLt(this Param<double> param, double limit)
         {
             if (param.Value >= limit)
+            {
                 throw ExceptionFactory.CreateForParamValidation(param.Name, ExceptionMessages.EnsureExtensions_IsNotLt.Inject(param.Value, limit));
+            }
 
             return param;
         }
@@ -19,7 +21,9 @@ namespace NzbDrone.Common.EnsureThat
         public static Param<double> IsLte(this Param<double> param, double limit)
         {
             if (!(param.Value <= limit))
+            {
                 throw ExceptionFactory.CreateForParamValidation(param.Name, ExceptionMessages.EnsureExtensions_IsNotLte.Inject(param.Value, limit));
+            }
 
             return param;
         }
@@ -28,7 +32,9 @@ namespace NzbDrone.Common.EnsureThat
         public static Param<double> IsGt(this Param<double> param, double limit)
         {
             if (param.Value <= limit)
+            {
                 throw ExceptionFactory.CreateForParamValidation(param.Name, ExceptionMessages.EnsureExtensions_IsNotGt.Inject(param.Value, limit));
+            }
 
             return param;
         }
@@ -37,7 +43,9 @@ namespace NzbDrone.Common.EnsureThat
         public static Param<double> IsGte(this Param<double> param, double limit)
         {
             if (!(param.Value >= limit))
+            {
                 throw ExceptionFactory.CreateForParamValidation(param.Name, ExceptionMessages.EnsureExtensions_IsNotGte.Inject(param.Value, limit));
+            }
 
             return param;
         }
@@ -46,10 +54,14 @@ namespace NzbDrone.Common.EnsureThat
         public static Param<double> IsInRange(this Param<double> param, double min, double max)
         {
             if (param.Value < min)
+            {
                 throw ExceptionFactory.CreateForParamValidation(param.Name, ExceptionMessages.EnsureExtensions_IsNotInRange_ToLow.Inject(param.Value, min));
+            }
 
             if (param.Value > max)
+            {
                 throw ExceptionFactory.CreateForParamValidation(param.Name, ExceptionMessages.EnsureExtensions_IsNotInRange_ToHigh.Inject(param.Value, max));
+            }
 
             return param;
         }

src/NzbDrone.Common/EnsureThat/EnsureGuidExtensions.cs

@@ -10,7 +10,9 @@ namespace NzbDrone.Common.EnsureThat
         public static Param<Guid> IsNotEmpty(this Param<Guid> param)
         {
             if (Guid.Empty.Equals(param.Value))
+            {
                 throw ExceptionFactory.CreateForParamValidation(param.Name, ExceptionMessages.EnsureExtensions_IsEmptyGuid);
+            }
 
             return param;
         }

src/NzbDrone.Common/EnsureThat/EnsureIntExtensions.cs

@@ -10,7 +10,9 @@ namespace NzbDrone.Common.EnsureThat
         public static Param<int> IsLessThan(this Param<int> param, int limit)
         {
             if (param.Value >= limit)
+            {
                 throw ExceptionFactory.CreateForParamValidation(param.Name, ExceptionMessages.EnsureExtensions_IsNotLt.Inject(param.Value, limit));
+            }
 
             return param;
         }
@@ -19,7 +21,9 @@ namespace NzbDrone.Common.EnsureThat
         public static Param<int> IsLessThanOrEqualTo(this Param<int> param, int limit)
         {
             if (!(param.Value <= limit))
+            {
                 throw ExceptionFactory.CreateForParamValidation(param.Name, ExceptionMessages.EnsureExtensions_IsNotLte.Inject(param.Value, limit));
+            }
 
             return param;
         }
@@ -28,7 +32,9 @@ namespace NzbDrone.Common.EnsureThat
         public static Param<int> IsGreaterThan(this Param<int> param, int limit)
         {
             if (param.Value <= limit)
+            {
                 throw ExceptionFactory.CreateForParamValidation(param.Name, ExceptionMessages.EnsureExtensions_IsNotGt.Inject(param.Value, limit));
+            }
 
             return param;
         }
@@ -37,7 +43,9 @@ namespace NzbDrone.Common.EnsureThat
         public static Param<int> IsGreaterThanZero(this Param<int> param)
         {
             if (param.Value <= 0)
+            {
                 throw ExceptionFactory.CreateForParamValidation(param.Name, ExceptionMessages.EnsureExtensions_IsNotGt.Inject(param.Value, 0));
+            }
 
             return param;
         }
@@ -46,7 +54,9 @@ namespace NzbDrone.Common.EnsureThat
         public static Param<int> IsGreaterOrEqualTo(this Param<int> param, int limit)
         {
             if (!(param.Value >= limit))
+            {
                 throw ExceptionFactory.CreateForParamValidation(param.Name, ExceptionMessages.EnsureExtensions_IsNotGte.Inject(param.Value, limit));
+            }
 
             return param;
         }
@@ -55,10 +65,14 @@ namespace NzbDrone.Common.EnsureThat
         public static Param<int> IsInRange(this Param<int> param, int min, int max)
         {
             if (param.Value < min)
+            {
                 throw ExceptionFactory.CreateForParamValidation(param.Name, ExceptionMessages.EnsureExtensions_IsNotInRange_ToLow.Inject(param.Value, min));
+            }
 
             if (param.Value > max)
+            {
                 throw ExceptionFactory.CreateForParamValidation(param.Name, ExceptionMessages.EnsureExtensions_IsNotInRange_ToHigh.Inject(param.Value, max));
+            }
 
             return param;
         }

src/NzbDrone.Common/EnsureThat/EnsureLongExtensions.cs

@@ -10,7 +10,9 @@ namespace NzbDrone.Common.EnsureThat
         public static Param<long> IsLt(this Param<long> param, long limit)
         {
             if (param.Value >= limit)
+            {
                 throw ExceptionFactory.CreateForParamValidation(param.Name, ExceptionMessages.EnsureExtensions_IsNotLt.Inject(param.Value, limit));
+            }
 
             return param;
         }
@@ -19,7 +21,9 @@ namespace NzbDrone.Common.EnsureThat
         public static Param<long> IsLte(this Param<long> param, long limit)
         {
             if (!(param.Value <= limit))
+            {
                 throw ExceptionFactory.CreateForParamValidation(param.Name, ExceptionMessages.EnsureExtensions_IsNotLte.Inject(param.Value, limit));
+            }
 
             return param;
         }
@@ -28,7 +32,9 @@ namespace NzbDrone.Common.EnsureThat
         public static Param<long> IsGt(this Param<long> param, long limit)
         {
             if (param.Value <= limit)
+            {
                 throw ExceptionFactory.CreateForParamValidation(param.Name, ExceptionMessages.EnsureExtensions_IsNotGt.Inject(param.Value, limit));
+            }
 
             return param;
         }
@@ -37,7 +43,9 @@ namespace NzbDrone.Common.EnsureThat
         public static Param<long> IsGte(this Param<long> param, long limit)
         {
             if (!(param.Value >= limit))
+            {
                 throw ExceptionFactory.CreateForParamValidation(param.Name, ExceptionMessages.EnsureExtensions_IsNotGte.Inject(param.Value, limit));
+            }
 
             return param;
         }
@@ -46,10 +54,14 @@ namespace NzbDrone.Common.EnsureThat
         public static Param<long> IsInRange(this Param<long> param, long min, long max)
         {
             if (param.Value < min)
+            {
                 throw ExceptionFactory.CreateForParamValidation(param.Name, ExceptionMessages.EnsureExtensions_IsNotInRange_ToLow.Inject(param.Value, min));
+            }
 
             if (param.Value > max)
+            {
                 throw ExceptionFactory.CreateForParamValidation(param.Name, ExceptionMessages.EnsureExtensions_IsNotInRange_ToHigh.Inject(param.Value, max));
+            }
 
             return param;
         }

src/NzbDrone.Common/EnsureThat/EnsureNullableValueTypeExtensions.cs

@@ -6,10 +6,13 @@ namespace NzbDrone.Common.EnsureThat
     public static class EnsureNullableValueTypeExtensions
     {
         [DebuggerStepThrough]
-        public static Param<T?> IsNotNull<T>(this Param<T?> param) where T : struct
+        public static Param<T?> IsNotNull<T>(this Param<T?> param)
+            where T : struct
         {
             if (param.Value == null || !param.Value.HasValue)
+            {
                 throw ExceptionFactory.CreateForParamNullValidation(param.Name, ExceptionMessages.EnsureExtensions_IsNotNull);
+            }
 
             return param;
         }

src/NzbDrone.Common/EnsureThat/EnsureObjectExtensions.cs

@@ -6,10 +6,13 @@ namespace NzbDrone.Common.EnsureThat
     public static class EnsureObjectExtensions
     {
         [DebuggerStepThrough]
-        public static Param<T> IsNotNull<T>(this Param<T> param) where T : class
+        public static Param<T> IsNotNull<T>(this Param<T> param)
+            where T : class
         {
             if (param.Value == null)
+            {
                 throw ExceptionFactory.CreateForParamNullValidation(param.Name, ExceptionMessages.EnsureExtensions_IsNotNull);
+            }
 
             return param;
         }

src/NzbDrone.Common/EnsureThat/EnsureShortExtensions.cs

@@ -10,7 +10,9 @@ namespace NzbDrone.Common.EnsureThat
         public static Param<short> IsLt(this Param<short> param, short limit)
         {
             if (param.Value >= limit)
+            {
                 throw ExceptionFactory.CreateForParamValidation(param.Name, ExceptionMessages.EnsureExtensions_IsNotLt.Inject(param.Value, limit));
+            }
 
             return param;
         }
@@ -19,7 +21,9 @@ namespace NzbDrone.Common.EnsureThat
         public static Param<short> IsLte(this Param<short> param, short limit)
         {
             if (!(param.Value <= limit))
+            {
                 throw ExceptionFactory.CreateForParamValidation(param.Name, ExceptionMessages.EnsureExtensions_IsNotLte.Inject(param.Value, limit));
+            }
 
             return param;
         }
@@ -28,7 +32,9 @@ namespace NzbDrone.Common.EnsureThat
         public static Param<short> IsGt(this Param<short> param, short limit)
         {
             if (param.Value <= limit)
+            {
                 throw ExceptionFactory.CreateForParamValidation(param.Name, ExceptionMessages.EnsureExtensions_IsNotGt.Inject(param.Value, limit));
+            }
 
             return param;
         }
@@ -37,7 +43,9 @@ namespace NzbDrone.Common.EnsureThat
         public static Param<short> IsGte(this Param<short> param, short limit)
         {
             if (!(param.Value >= limit))
+            {
                 throw ExceptionFactory.CreateForParamValidation(param.Name, ExceptionMessages.EnsureExtensions_IsNotGte.Inject(param.Value, limit));
+            }
 
             return param;
         }
@@ -46,10 +54,14 @@ namespace NzbDrone.Common.EnsureThat
         public static Param<short> IsInRange(this Param<short> param, short min, short max)
         {
             if (param.Value < min)
+            {
                 throw ExceptionFactory.CreateForParamValidation(param.Name, ExceptionMessages.EnsureExtensions_IsNotInRange_ToLow.Inject(param.Value, min));
+            }
 
             if (param.Value > max)
+            {
                 throw ExceptionFactory.CreateForParamValidation(param.Name, ExceptionMessages.EnsureExtensions_IsNotInRange_ToHigh.Inject(param.Value, max));
+            }
 
             return param;
         }

src/NzbDrone.Common/EnsureThat/EnsureStringExtensions.cs

@@ -13,7 +13,9 @@ namespace NzbDrone.Common.EnsureThat
         public static Param<string> IsNotNullOrWhiteSpace(this Param<string> param)
         {
             if (string.IsNullOrWhiteSpace(param.Value))
+            {
                 throw ExceptionFactory.CreateForParamValidation(param.Name, ExceptionMessages.EnsureExtensions_IsNotNullOrWhiteSpace);
+            }
 
             return param;
         }
@@ -22,7 +24,9 @@ namespace NzbDrone.Common.EnsureThat
         public static Param<string> IsNotNullOrEmpty(this Param<string> param)
         {
             if (string.IsNullOrEmpty(param.Value))
+            {
                 throw ExceptionFactory.CreateForParamValidation(param.Name, ExceptionMessages.EnsureExtensions_IsNotNullOrEmpty);
+            }
 
             return param;
         }
@@ -31,15 +35,21 @@ namespace NzbDrone.Common.EnsureThat
         public static Param<string> HasLengthBetween(this Param<string> param, int minLength, int maxLength)
         {
             if (string.IsNullOrEmpty(param.Value))
+            {
                 throw ExceptionFactory.CreateForParamValidation(param.Name, ExceptionMessages.EnsureExtensions_IsNotNullOrEmpty);
+            }
 
             var length = param.Value.Length;
 
             if (length < minLength)
+            {
                 throw ExceptionFactory.CreateForParamValidation(param.Name, ExceptionMessages.EnsureExtensions_IsNotInRange_ToShort.Inject(minLength, maxLength, length));
+            }
 
             if (length > maxLength)
+            {
                 throw ExceptionFactory.CreateForParamValidation(param.Name, ExceptionMessages.EnsureExtensions_IsNotInRange_ToLong.Inject(minLength, maxLength, length));
+            }
 
             return param;
         }
@@ -48,12 +58,16 @@ namespace NzbDrone.Common.EnsureThat
         public static Param<string> IsLongerThan(this Param<string> param, int minLength)
         {
             if (string.IsNullOrEmpty(param.Value))
+            {
                 throw ExceptionFactory.CreateForParamValidation(param.Name, ExceptionMessages.EnsureExtensions_IsNotNullOrEmpty);
+            }
 
             var length = param.Value.Length;
 
             if (length < minLength)
+            {
                 throw ExceptionFactory.CreateForParamValidation(param.Name, "The string is not long enough. Must be at least '{0}' but was '{1}' characters long.".Inject(minLength, length));
+            }
 
             return param;
         }
@@ -71,6 +85,7 @@ namespace NzbDrone.Common.EnsureThat
             {
                 throw ExceptionFactory.CreateForParamValidation(param.Name, ExceptionMessages.EnsureExtensions_NoMatch.Inject(param.Value, match));
             }
+
             return param;
         }
 
@@ -78,7 +93,9 @@ namespace NzbDrone.Common.EnsureThat
         public static Param<string> IsRelativePath(this Param<string> param)
         {
             if (string.IsNullOrWhiteSpace(param.Value))
+            {
                 throw ExceptionFactory.CreateForParamValidation(param.Name, ExceptionMessages.EnsureExtensions_IsNotNullOrWhiteSpace);
+            }
 
             if (!param.Value.EndsWith("\\"))
             {
@@ -97,9 +114,14 @@ namespace NzbDrone.Common.EnsureThat
         public static Param<string> IsValidPath(this Param<string> param)
         {
             if (string.IsNullOrWhiteSpace(param.Value))
+            {
                 throw ExceptionFactory.CreateForParamValidation(param.Name, ExceptionMessages.EnsureExtensions_IsNotNullOrWhiteSpace);
+            }
 
-            if (param.Value.IsPathValid()) return param;
+            if (param.Value.IsPathValid())
+            {
+                return param;
+            }
 
             if (OsInfo.IsWindows)
             {

src/NzbDrone.Common/EnsureThat/EnsureTypeExtensions.cs

@@ -9,7 +9,7 @@ namespace NzbDrone.Common.EnsureThat
     {
         private static class Types
         {
-            internal static readonly Type IntType = typeof (int);
+            internal static readonly Type IntType = typeof(int);
 
             internal static readonly Type ShortType = typeof(short);
 
@@ -78,8 +78,10 @@ namespace NzbDrone.Common.EnsureThat
         public static TypeParam IsOfType(this TypeParam param, Type type)
         {
             if (!param.Type.Equals(type))
+            {
                 throw ExceptionFactory.CreateForParamValidation(param.Name,
                     ExceptionMessages.EnsureExtensions_IsNotOfType.Inject(param.Type.FullName));
+            }
 
             return param;
         }

src/NzbDrone.Common/EnsureThat/ExpressionExtensions.cs

@@ -9,7 +9,9 @@ namespace NzbDrone.Common.EnsureThat
             var path = "";
 
             if (e.Expression is MemberExpression parent)
+            {
                 path = parent.ToPath() + ".";
+            }
 
             return path + e.Member.Name;
         }
@@ -22,17 +24,23 @@ namespace NzbDrone.Common.EnsureThat
         private static MemberExpression GetRightMostMember(Expression e)
         {
             if (e is LambdaExpression)
+            {
                 return GetRightMostMember(((LambdaExpression)e).Body);
+            }
 
             if (e is MemberExpression)
+            {
                 return (MemberExpression)e;
+            }
 
             if (e is MethodCallExpression)
             {
                 var callExpression = (MethodCallExpression)e;
 
                 if (callExpression.Object is MethodCallExpression || callExpression.Object is MemberExpression)
+                {
                     return GetRightMostMember(callExpression.Object);
+                }
 
                 var member = callExpression.Arguments.Count > 0 ? callExpression.Arguments[0] : callExpression.Object;
                 return GetRightMostMember(member);

src/NzbDrone.Common/EnsureThat/Param.cs

@@ -16,7 +16,8 @@ namespace NzbDrone.Common.EnsureThat
     {
         public readonly T Value;
 
-        internal Param(string name, T value) : base(name)
+        internal Param(string name, T value)
+            : base(name)
         {
             Value = value;
         }

src/NzbDrone.Common/EnvironmentInfo/AppFolderFactory.cs

@@ -95,9 +95,20 @@ namespace NzbDrone.Common.EnvironmentInfo
                     RemovePidFile();
                 }
 
-                if (_appFolderInfo.LegacyAppDataFolder.IsNullOrWhiteSpace()) return;
+                if (_appFolderInfo.LegacyAppDataFolder.IsNullOrWhiteSpace())
-                if (_diskProvider.FileExists(_appFolderInfo.GetDatabase()) || _diskProvider.FileExists(_appFolderInfo.GetConfigPath())) return;
+                {
-                if (!_diskProvider.FolderExists(_appFolderInfo.LegacyAppDataFolder)) return;
+                    return;
+                }
+
+                if (_diskProvider.FileExists(_appFolderInfo.GetDatabase()) || _diskProvider.FileExists(_appFolderInfo.GetConfigPath()))
+                {
+                    return;
+                }
+
+                if (!_diskProvider.FolderExists(_appFolderInfo.LegacyAppDataFolder))
+                {
+                    return;
+                }
 
                 // Delete the bin folder on Windows
                 var binFolder = Path.Combine(_appFolderInfo.LegacyAppDataFolder, "bin");

src/NzbDrone.Common/EnvironmentInfo/IOsVersionAdapter.cs

@@ -1,6 +1,5 @@
 namespace NzbDrone.Common.EnvironmentInfo
 {
-
     public interface IOsVersionAdapter
     {
         bool Enabled { get; }

src/NzbDrone.Common/EnvironmentInfo/OsInfo.cs

@@ -34,6 +34,7 @@ namespace NzbDrone.Common.EnvironmentInfo
                         Os = Os.Windows;
                         break;
                     }
+
                 case PlatformID.MacOSX:
                 case PlatformID.Unix:
                     {

src/NzbDrone.Common/EnvironmentInfo/OsVersionModel.cs

@@ -2,8 +2,6 @@ namespace NzbDrone.Common.EnvironmentInfo
 {
     public class OsVersionModel
     {
-
-
         public OsVersionModel(string name, string version, string fullName = null)
         {
             Name = Trim(name);

src/NzbDrone.Common/EnvironmentInfo/PlatformInfo.cs

@@ -2,7 +2,6 @@ using System;
 
 namespace NzbDrone.Common.EnvironmentInfo
 {
-
     public enum PlatformType
     {
         DotNet = 0,

src/NzbDrone.Common/EnvironmentInfo/RuntimeInfo.cs

@@ -124,7 +124,6 @@ namespace NzbDrone.Common.EnvironmentInfo
         public static bool IsProduction { get; }
         public static bool IsDevelopment { get; }
 
-
         private static bool InternalIsTesting()
         {
             try
@@ -153,7 +152,6 @@ namespace NzbDrone.Common.EnvironmentInfo
             }
             catch
             {
-
             }
 
             try

src/NzbDrone.Common/Exceptions/NzbDroneException.cs

@@ -7,19 +7,16 @@ namespace NzbDrone.Common.Exceptions
         protected NzbDroneException(string message, params object[] args)
             : base(string.Format(message, args))
         {
-
         }
 
         protected NzbDroneException(string message)
             : base(message)
         {
-
         }
 
         protected NzbDroneException(string message, Exception innerException, params object[] args)
             : base(string.Format(message, args), innerException)
         {
-
         }
 
         protected NzbDroneException(string message, Exception innerException)

src/NzbDrone.Common/Exceptions/SonarrStartupException.cs

@@ -7,19 +7,16 @@ namespace NzbDrone.Common.Exceptions
         public SonarrStartupException(string message, params object[] args)
             : base("Sonarr failed to start: " + string.Format(message, args))
         {
-
         }
 
         public SonarrStartupException(string message)
             : base("Sonarr failed to start: " + message)
         {
-
         }
 
         public SonarrStartupException()
             : base("Sonarr failed to start")
         {
-
         }
 
         public SonarrStartupException(Exception innerException, string message, params object[] args)
@@ -35,7 +32,6 @@ namespace NzbDrone.Common.Exceptions
         public SonarrStartupException(Exception innerException)
             : base("Sonarr failed to start: " + innerException.Message)
         {
-
         }
     }
 }

src/NzbDrone.Common/Expansive/Expansive.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.Dynamic;
@@ -11,7 +11,6 @@ namespace NzbDrone.Common.Expansive
     {
         private static PatternStyle _patternStyle;
 
-
         public static bool RequireAllExpansions { get; set; }
 
         public static Func<string, string> DefaultExpansionFactory { get; set; }
@@ -26,7 +25,6 @@ namespace NzbDrone.Common.Expansive
             return source.Expand(DefaultExpansionFactory);
         }
 
-
         public static string Expand(this string source, params string[] args)
         {
             var output = source;
@@ -50,9 +48,11 @@ namespace NzbDrone.Common.Expansive
                     {
                         tokenIndex = tokens.IndexOf(token);
                     }
+
                     output = Regex.Replace(output, _patternStyle.OutputFilter(match.Value), "{" + tokenIndex + "}");
                 }
             }
+
             var newArgs = new List<string>();
             foreach (var arg in args)
             {
@@ -63,15 +63,20 @@ namespace NzbDrone.Common.Expansive
                     foreach (Match match in tokenPattern.Matches(newArg))
                     {
                         var token = _patternStyle.TokenReplaceFilter(match.Value);
-                        if (calls.Contains(string.Format("{0}:{1}", callingToken, token))) throw new CircularReferenceException(string.Format("Circular Reference Detected for token '{0}'.", callingToken));
+                        if (calls.Contains(string.Format("{0}:{1}", callingToken, token)))
+                        {
+                            throw new CircularReferenceException(string.Format("Circular Reference Detected for token '{0}'.", callingToken));
+                        }
+
                         calls.Push(string.Format("{0}:{1}", callingToken, token));
                         callingToken = token;
                         newArg = Regex.Replace(newArg, _patternStyle.OutputFilter(match.Value), args[tokens.IndexOf(token)]);
                     }
-
                 }
+
                 newArgs.Add(newArg);
             }
+
             return string.Format(output, newArgs.ToArray());
         }
 
@@ -80,9 +85,6 @@ namespace NzbDrone.Common.Expansive
             return source.ExpandInternal(expansionFactory);
         }
 
-
-
-
         public static string Expand(this string source, object model)
         {
             return source.ExpandInternal(
@@ -116,7 +118,10 @@ namespace NzbDrone.Common.Expansive
 
         private static string ExpandInternal(this string source, Func<string, string> expansionFactory)
         {
-            if (expansionFactory == null) throw new ApplicationException("ExpansionFactory not defined.\nDefine a DefaultExpansionFactory or call Expand(source, Func<string, string> expansionFactory))");
+            if (expansionFactory == null)
+            {
+                throw new ApplicationException("ExpansionFactory not defined.\nDefine a DefaultExpansionFactory or call Expand(source, Func<string, string> expansionFactory))");
+            }
 
             var pattern = new Regex(_patternStyle.TokenMatchPattern, RegexOptions.IgnoreCase);
 
@@ -139,9 +144,12 @@ namespace NzbDrone.Common.Expansive
 
                     // if we have already encountered this token in this call tree, we have a circular reference
                     if (thisNode.CallTree.Contains(token))
+                    {
                         throw new CircularReferenceException(string.Format("Circular Reference Detected for token '{0}'. Call Tree: {1}->{2}",
                                                                            token,
-                                                                           string.Join("->", thisNode.CallTree.ToArray().Reverse()), token));
+                                                                           string.Join("->", thisNode.CallTree.ToArray().Reverse()),
+                                                                           token));
+                    }
 
                     // expand this match
                     var expandedValue = expansionFactory(token);
@@ -156,6 +164,7 @@ namespace NzbDrone.Common.Expansive
                     output = Regex.Replace(output, patternStyle.OutputFilter(match.Value), child);
                 }
             }
+
             return output;
         }
 
@@ -171,7 +180,11 @@ namespace NzbDrone.Common.Expansive
         {
             var result = new ExpandoObject();
             var d = result as IDictionary<string, object>; //work with the Expando as a Dictionary
-            if (o is ExpandoObject) return o; //shouldn't have to... but just in case
+            if (o is ExpandoObject)
+            {
+                return o; //shouldn't have to... but just in case
+            }
+
             if (o is NameValueCollection || o.GetType().IsSubclassOf(typeof(NameValueCollection)))
             {
                 var nv = (NameValueCollection)o;
@@ -185,8 +198,10 @@ namespace NzbDrone.Common.Expansive
                     d.Add(item.Name, item.GetValue(o, null));
                 }
             }
+
             return result;
         }
+
         /// <summary>
         /// Turns the object into a Dictionary
         /// </summary>

src/NzbDrone.Common/Expansive/TreeNode.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 
 namespace NzbDrone.Common.Expansive
 {
@@ -7,25 +7,29 @@ namespace NzbDrone.Common.Expansive
         private List<T> _CallTree;
         private TreeNode<T> _Parent;
 
-        public TreeNode(T Value)
+        public TreeNode(T value)
         {
-            this.Value = Value;
+            Value = value;
             Parent = null;
             Children = new TreeNodeList<T>(this);
             _CallTree = new List<T>();
         }
 
-        public TreeNode(T Value, TreeNode<T> Parent)
+        public TreeNode(T value, TreeNode<T> parent)
         {
-            this.Value = Value;
+            Value = value;
-            this.Parent = Parent;
+            Parent = parent;
             Children = new TreeNodeList<T>(this);
             _CallTree = new List<T>();
         }
 
         public TreeNode<T> Parent
         {
-            get { return _Parent; }
+            get
+            {
+                return _Parent;
+            }
+
             set
             {
                 if (value == _Parent)
@@ -58,6 +62,7 @@ namespace NzbDrone.Common.Expansive
                 {
                     node = node.Parent;
                 }
+
                 return node;
             }
         }
@@ -75,9 +80,14 @@ namespace NzbDrone.Common.Expansive
                     node = node.Parent;
                     _CallTree.Add(node.Value);
                 }
+
                 return _CallTree;
             }
-            private set { _CallTree = value; }
+
+            private set
+            {
+                _CallTree = value;
+            }
         }
 
         public T Value { get; set; }

src/NzbDrone.Common/Expansive/TreeNodeList.cs

@@ -6,24 +6,23 @@ namespace NzbDrone.Common.Expansive
     {
         public TreeNode<T> Parent;
 
-        public TreeNodeList(TreeNode<T> Parent)
+        public TreeNodeList(TreeNode<T> parent)
         {
-            this.Parent = Parent;
+            this.Parent = parent;
         }
 
-        public new TreeNode<T> Add(TreeNode<T> Node)
+        public new TreeNode<T> Add(TreeNode<T> node)
         {
-            base.Add(Node);
+            base.Add(node);
-            Node.Parent = Parent;
+            node.Parent = Parent;
-            return Node;
+            return node;
         }
 
-        public TreeNode<T> Add(T Value)
+        public TreeNode<T> Add(T value)
         {
-            return Add(new TreeNode<T>(Value));
+            return Add(new TreeNode<T>(value));
         }
 
-
         public override string ToString()
         {
             return "Count=" + Count.ToString();

src/NzbDrone.Common/Extensions/ExceptionExtensions.cs

@@ -7,30 +7,37 @@ namespace NzbDrone.Common.Extensions
 {
     public static class ExceptionExtensions
     {
-        public static T WithData<T>(this T ex, string key, string value) where T : Exception
+        public static T WithData<T>(this T ex, string key, string value)
+            where T : Exception
         {
             ex.AddData(key, value);
 
             return ex;
         }
-        public static T WithData<T>(this T ex, string key, int value) where T : Exception
+
+        public static T WithData<T>(this T ex, string key, int value)
+            where T : Exception
         {
             ex.AddData(key, value.ToString());
 
             return ex;
         }
 
-        public static T WithData<T>(this T ex, string key, Http.HttpUri value) where T : Exception
+        public static T WithData<T>(this T ex, string key, Http.HttpUri value)
+            where T : Exception
         {
             ex.AddData(key, value.ToString());
 
             return ex;
         }
 
-
+        public static T WithData<T>(this T ex, Http.HttpResponse response, int maxSampleLength = 512)
-        public static T WithData<T>(this T ex, Http.HttpResponse response, int maxSampleLength = 512) where T : Exception
+            where T : Exception
         {
-            if (response == null || response.Content == null) return ex;
+            if (response == null || response.Content == null)
+            {
+                return ex;
+            }
 
             var contentSample = response.Content.Substring(0, Math.Min(response.Content.Length, maxSampleLength));
 
@@ -50,16 +57,19 @@ namespace NzbDrone.Common.Extensions
             {
                 ex.AddData("ContentType", response.Headers.ContentType ?? string.Empty);
             }
+
             ex.AddData("ContentLength", response.Content.Length.ToString());
             ex.AddData("ContentSample", contentSample);
 
             return ex;
         }
 
-
         private static void AddData(this Exception ex, string key, string value)
         {
-            if (value.IsNullOrWhiteSpace()) return;
+            if (value.IsNullOrWhiteSpace())
+            {
+                return;
+            }
 
             ex.Data[key] = value;
         }

src/NzbDrone.Common/Extensions/IEnumerableExtensions.cs

@@ -7,9 +7,11 @@ namespace NzbDrone.Common.Extensions
 {
     public static class EnumerableExtensions
     {
-        public static IEnumerable<TFirst> IntersectBy<TFirst, TSecond, TKey>(this IEnumerable<TFirst> first, Func<TFirst, TKey> firstKeySelector,
+        public static IEnumerable<TFirst> IntersectBy<TFirst, TSecond, TKey>(this IEnumerable<TFirst> first,
-                                                                             IEnumerable<TSecond> second, Func<TSecond, TKey> secondKeySelector,
+            Func<TFirst, TKey> firstKeySelector,
-                                                                             IEqualityComparer<TKey> keyComparer)
+            IEnumerable<TSecond> second,
+            Func<TSecond, TKey> secondKeySelector,
+            IEqualityComparer<TKey> keyComparer)
         {
             var keys = new HashSet<TKey>(second.Select(secondKeySelector), keyComparer);
 
@@ -25,9 +27,11 @@ namespace NzbDrone.Common.Extensions
             }
         }
 
-        public static IEnumerable<TFirst> ExceptBy<TFirst, TSecond, TKey>(this IEnumerable<TFirst> first, Func<TFirst, TKey> firstKeySelector,
+        public static IEnumerable<TFirst> ExceptBy<TFirst, TSecond, TKey>(this IEnumerable<TFirst> first,
-                                                                             IEnumerable<TSecond> second, Func<TSecond, TKey> secondKeySelector,
+            Func<TFirst, TKey> firstKeySelector,
-                                                                             IEqualityComparer<TKey> keyComparer)
+            IEnumerable<TSecond> second,
+            Func<TSecond, TKey> secondKeySelector,
+            IEqualityComparer<TKey> keyComparer)
         {
             var keys = new HashSet<TKey>(second.Select(secondKeySelector), keyComparer);
             var matchedKeys = new HashSet<TKey>();
@@ -56,6 +60,7 @@ namespace NzbDrone.Common.Extensions
                     result[key] = item;
                 }
             }
+
             return result;
         }
 
@@ -70,6 +75,7 @@ namespace NzbDrone.Common.Extensions
                     result[key] = valueSelector(item);
                 }
             }
+
             return result;
         }
 

src/NzbDrone.Common/Extensions/Int64Extensions.cs

@@ -11,8 +11,15 @@ namespace NzbDrone.Common.Extensions
         {
             const int bytesInKb = 1024;
 
-            if (bytes < 0) return "-" + SizeSuffix(-bytes);
+            if (bytes < 0)
-            if (bytes == 0) return "0 B";
+            {
+                return "-" + SizeSuffix(-bytes);
+            }
+
+            if (bytes == 0)
+            {
+                return "0 B";
+            }
 
             var mag = (int)Math.Log(bytes, bytesInKb);
             var adjustedSize = bytes / (decimal)Math.Pow(bytesInKb, mag);

src/NzbDrone.Common/Extensions/LevenstheinExtensions.cs

@@ -6,9 +6,20 @@ namespace NzbDrone.Common.Extensions
     {
         public static int LevenshteinDistance(this string text, string other, int costInsert = 1, int costDelete = 1, int costSubstitute = 1)
         {
-            if (text == other) return 0;
+            if (text == other)
-            if (text.Length == 0) return other.Length * costInsert;
+            {
-            if (other.Length == 0) return text.Length * costDelete;
+                return 0;
+            }
+
+            if (text.Length == 0)
+            {
+                return other.Length * costInsert;
+            }
+
+            if (other.Length == 0)
+            {
+                return text.Length * costDelete;
+            }
 
             int[] matrix = new int[other.Length + 1];
 

src/NzbDrone.Common/Extensions/ObjectExtensions.cs

@@ -4,7 +4,8 @@ namespace NzbDrone.Common.Extensions
 {
     public static class ObjectExtensions
     {
-        public static T JsonClone<T>(this T source) where T : new()
+        public static T JsonClone<T>(this T source)
+            where T : new()
         {
             var json = source.ToJson();
             return Json.Deserialize<T>(json);

src/NzbDrone.Common/Extensions/PathExtensions.cs

@@ -113,6 +113,7 @@ namespace NzbDrone.Common.Extensions
             {
                 parentPath = parentPath.TrimEnd(Path.DirectorySeparatorChar);
             }
+
             if (childPath != "/" && !parentPath.EndsWith(":\\"))
             {
                 childPath = childPath.TrimEnd(Path.DirectorySeparatorChar);

src/NzbDrone.Common/Extensions/StreamExtensions.cs

@@ -14,6 +14,7 @@ namespace NzbDrone.Common.Extensions
                 {
                     ms.Write(buffer, 0, read);
                 }
+
                 return ms.ToArray();
             }
         }

src/NzbDrone.Common/Extensions/StringExtensions.cs

@@ -18,7 +18,11 @@ namespace NzbDrone.Common.Extensions
 
         public static object NullSafe(this object target)
         {
-            if (target != null) return target;
+            if (target != null)
+            {
+                return target;
+            }
+
             return "[NULL]";
         }
 
@@ -76,7 +80,9 @@ namespace NzbDrone.Common.Extensions
         public static string TrimEnd(this string text, string postfix)
         {
             if (text.EndsWith(postfix))
+            {
                 text = text.Substring(0, text.Length - postfix.Length);
+            }
 
             return text;
         }
@@ -134,7 +140,7 @@ namespace NzbDrone.Common.Extensions
         public static byte[] HexToByteArray(this string input)
         {
             return Enumerable.Range(0, input.Length)
-                             .Where(x => x%2 == 0)
+                             .Where(x => x % 2 == 0)
                              .Select(x => Convert.ToByte(input.Substring(x, 2), 16))
                              .ToArray();
         }
@@ -151,9 +157,9 @@ namespace NzbDrone.Common.Extensions
             var first = int.Parse(octalValue.Substring(0, 1));
             var second = int.Parse(octalValue.Substring(1, 1));
             var third = int.Parse(octalValue.Substring(2, 1));
-            var byteResult = (byte)((first << 6) | (second << 3) | (third));
+            var byteResult = (byte)((first << 6) | (second << 3) | third);
 
-            return Encoding.ASCII.GetString(new [] { byteResult });
+            return Encoding.ASCII.GetString(new[] { byteResult });
         }
 
         public static string SplitCamelCase(this string input)

src/NzbDrone.Common/Extensions/UrlExtensions.cs

@@ -28,7 +28,6 @@ namespace NzbDrone.Common.Extensions
             }
 
             return true;
-
         }
     }
 }

src/NzbDrone.Common/HashUtil.cs

@@ -24,6 +24,7 @@ namespace NzbDrone.Common
                     }
                 }
             }
+
             return $"{mCrc:x8}";
         }
 

src/NzbDrone.Common/Http/Dispatchers/ManagedHttpDispatcher.cs

@@ -197,6 +197,7 @@ namespace NzbDrone.Common.Http.Dispatchers
                     {
                         var responseStreamInfo = currentOperation.GetType().GetField("responseStream", BindingFlags.NonPublic | BindingFlags.Instance);
                         var responseStream = responseStreamInfo.GetValue(currentOperation) as Stream;
+
                         // Note that responseStream will likely be null once mono fixes it.
                         responseStream?.Dispose();
                     }

src/NzbDrone.Common/Http/HttpClient.cs

@@ -18,10 +18,12 @@ namespace NzbDrone.Common.Http
         HttpResponse Execute(HttpRequest request);
         void DownloadFile(string url, string fileName);
         HttpResponse Get(HttpRequest request);
-        HttpResponse<T> Get<T>(HttpRequest request) where T : new();
+        HttpResponse<T> Get<T>(HttpRequest request)
+            where T : new();
         HttpResponse Head(HttpRequest request);
         HttpResponse Post(HttpRequest request);
-        HttpResponse<T> Post<T>(HttpRequest request) where T : new();
+        HttpResponse<T> Post<T>(HttpRequest request)
+            where T : new();
     }
 
     public class HttpClient : IHttpClient
@@ -258,11 +260,13 @@ namespace NzbDrone.Common.Http
                         throw new HttpException(request, response, "Site responded with html content.");
                     }
                 }
+
                 stopWatch.Stop();
                 if (File.Exists(fileName))
                 {
                     File.Delete(fileName);
                 }
+
                 File.Move(fileNamePart, fileName);
                 _logger.Debug("Downloading Completed. took {0:0}s", stopWatch.Elapsed.Seconds);
             }
@@ -281,7 +285,8 @@ namespace NzbDrone.Common.Http
             return Execute(request);
         }
 
-        public HttpResponse<T> Get<T>(HttpRequest request) where T : new()
+        public HttpResponse<T> Get<T>(HttpRequest request)
+            where T : new()
         {
             var response = Get(request);
             CheckResponseContentType(response);
@@ -300,7 +305,8 @@ namespace NzbDrone.Common.Http
             return Execute(request);
         }
 
-        public HttpResponse<T> Post<T>(HttpRequest request) where T : new()
+        public HttpResponse<T> Post<T>(HttpRequest request)
+            where T : new()
         {
             var response = Post(request);
             CheckResponseContentType(response);

src/NzbDrone.Common/Http/HttpException.cs

@@ -17,13 +17,11 @@ namespace NzbDrone.Common.Http
         public HttpException(HttpRequest request, HttpResponse response)
             : this(request, response, string.Format("HTTP request failed: [{0}:{1}] [{2}] at [{3}]", (int)response.StatusCode, response.StatusCode, request.Method, request.Url))
         {
-
         }
 
         public HttpException(HttpResponse response)
             : this(response.Request, response)
         {
-
         }
 
         public override string ToString()

src/NzbDrone.Common/Http/HttpHeader.cs

@@ -1,11 +1,11 @@
 using System;
-using System.Linq;
+using System.Collections;
 using System.Collections.Generic;
 using System.Collections.Specialized;
+using System.Globalization;
+using System.Linq;
 using System.Text;
 using NzbDrone.Common.Extensions;
-using System.Collections;
-using System.Globalization;
 
 namespace NzbDrone.Common.Http
 {
@@ -14,12 +14,10 @@ namespace NzbDrone.Common.Http
         public HttpHeader(NameValueCollection headers)
             : base(headers)
         {
-
         }
 
         public HttpHeader()
         {
-
         }
 
         public bool ContainsKey(string key)
@@ -35,6 +33,7 @@ namespace NzbDrone.Common.Http
             {
                 return null;
             }
+
             if (values.Length > 1)
             {
                 throw new ApplicationException($"Expected {key} to occur only once, but was {values.Join("|")}.");
@@ -43,7 +42,8 @@ namespace NzbDrone.Common.Http
             return values[0];
         }
 
-        protected T? GetSingleValue<T>(string key, Func<string, T> converter) where T : struct
+        protected T? GetSingleValue<T>(string key, Func<string, T> converter)
+            where T : struct
         {
             var value = GetSingleValue(key);
             if (value == null)
@@ -53,6 +53,7 @@ namespace NzbDrone.Common.Http
 
             return converter(value);
         }
+
         protected void SetSingleValue(string key, string value)
         {
             if (value == null)
@@ -65,7 +66,8 @@ namespace NzbDrone.Common.Http
             }
         }
 
-        protected void SetSingleValue<T>(string key, T? value, Func<T, string> converter = null) where T : struct
+        protected void SetSingleValue<T>(string key, T? value, Func<T, string> converter = null)
+            where T : struct
         {
             if (!value.HasValue)
             {

src/NzbDrone.Common/Http/HttpRequest.cs

@@ -19,7 +19,6 @@ namespace NzbDrone.Common.Http
             LogHttpError = true;
             Cookies = new Dictionary<string, string>();
 
-
             if (!RuntimeInfo.IsProduction)
             {
                 AllowAutoRedirect = false;

src/NzbDrone.Common/Http/HttpRequestBuilder.cs

@@ -48,7 +48,6 @@ namespace NzbDrone.Common.Http
         public HttpRequestBuilder(bool useHttps, string host, int port, string urlBase = null)
             : this(BuildBaseUrl(useHttps, host, port, urlBase))
         {
-
         }
 
         public static string BuildBaseUrl(bool useHttps, string host, int port, string urlBase = null)
@@ -151,7 +150,10 @@ namespace NzbDrone.Common.Http
 
         protected virtual void ApplyFormData(HttpRequest request)
         {
-            if (FormData.Empty()) return;
+            if (FormData.Empty())
+            {
+                return;
+            }
 
             if (request.ContentData != null)
             {
@@ -176,11 +178,22 @@ namespace NzbDrone.Common.Http
                         writer.Write(partBoundary);
 
                         writer.Write("Content-Disposition: form-data");
-                        if (formData.Name.IsNotNullOrWhiteSpace()) writer.Write("; name=\"{0}\"", formData.Name);
+                        if (formData.Name.IsNotNullOrWhiteSpace())
-                        if (formData.FileName.IsNotNullOrWhiteSpace()) writer.Write("; filename=\"{0}\"", formData.FileName);
+                        {
+                            writer.Write("; name=\"{0}\"", formData.Name);
+                        }
+
+                        if (formData.FileName.IsNotNullOrWhiteSpace())
+                        {
+                            writer.Write("; filename=\"{0}\"", formData.FileName);
+                        }
+
                         writer.Write("\r\n");
 
-                        if (formData.ContentType.IsNotNullOrWhiteSpace()) writer.Write("Content-Type: {0}\r\n", formData.ContentType);
+                        if (formData.ContentType.IsNotNullOrWhiteSpace())
+                        {
+                            writer.Write("Content-Type: {0}\r\n", formData.ContentType);
+                        }
 
                         writer.Write("\r\n");
                         writer.Flush();
@@ -382,5 +395,4 @@ namespace NzbDrone.Common.Http
             return this;
         }
     }
-
 }

src/NzbDrone.Common/Http/HttpRequestBuilderFactory.cs

@@ -16,7 +16,6 @@ namespace NzbDrone.Common.Http
 
         protected HttpRequestBuilderFactory()
         {
-
         }
 
         protected void SetRootBuilder(HttpRequestBuilder rootBuilder)

src/NzbDrone.Common/Http/HttpResponse.cs

@@ -48,7 +48,6 @@ namespace NzbDrone.Common.Http
             }
         }
 
-
         public bool HasHttpError => (int)StatusCode >= 400;
 
         public bool HasHttpRedirect => StatusCode == HttpStatusCode.Moved ||
@@ -93,8 +92,8 @@ namespace NzbDrone.Common.Http
         }
     }
 
-
+    public class HttpResponse<T> : HttpResponse
-    public class HttpResponse<T> : HttpResponse where T : new()
+        where T : new()
     {
         public HttpResponse(HttpResponse response)
             : base(response.Request, response.Headers, response.ResponseData, response.StatusCode)

src/NzbDrone.Common/Http/HttpUri.cs

@@ -47,6 +47,7 @@ namespace NzbDrone.Common.Http
                 {
                     builder.Append('/');
                 }
+
                 builder.Append(path.TrimStart('/'));
             }
 
@@ -78,7 +79,7 @@ namespace NzbDrone.Common.Http
             var query = match.Groups["query"];
             var fragment = match.Groups["fragment"];
 
-            if (!match.Success || scheme.Success && !host.Success && path.Success)
+            if (!match.Success || (scheme.Success && !host.Success && path.Success))
             {
                 throw new ArgumentException("Uri didn't match expected pattern: " + _uri);
             }
@@ -126,6 +127,7 @@ namespace NzbDrone.Common.Http
 
                     _queryParams = dict.AsReadOnly();
                 }
+
                 return _queryParams;
             }
         }
@@ -200,6 +202,7 @@ namespace NzbDrone.Common.Http
                 {
                     builder.Append("&");
                 }
+
                 builder.Append(Uri.EscapeDataString(pair.Key));
                 builder.Append("=");
                 builder.Append(Uri.EscapeDataString(pair.Value));
@@ -208,7 +211,6 @@ namespace NzbDrone.Common.Http
             return SetQuery(builder.ToString());
         }
 
-
         public override int GetHashCode()
         {
             return _uri.GetHashCode();
@@ -237,7 +239,10 @@ namespace NzbDrone.Common.Http
 
         public bool Equals(HttpUri other)
         {
-            if (object.ReferenceEquals(other, null)) return false;
+            if (object.ReferenceEquals(other, null))
+            {
+                return false;
+            }
 
             return _uri.Equals(other._uri);
         }

src/NzbDrone.Common/Http/JsonRpcRequestBuilder.cs

@@ -22,7 +22,7 @@ namespace NzbDrone.Common.Http
         }
 
         public JsonRpcRequestBuilder(string baseUrl, string method, IEnumerable<object> parameters)
-            : base (baseUrl)
+            : base(baseUrl)
         {
             Method = HttpMethod.POST;
             JsonMethod = method;

src/NzbDrone.Common/Http/Proxy/HttpProxySettings.cs

@@ -30,15 +30,17 @@ namespace NzbDrone.Common.Http.Proxy
                 if (!string.IsNullOrWhiteSpace(BypassFilter))
                 {
                     var hostlist = BypassFilter.Split(',');
-                    for(int i = 0; i < hostlist.Length; i++)
+                    for (int i = 0; i < hostlist.Length; i++)
                     {
-                        if(hostlist[i].StartsWith("*"))
+                        if (hostlist[i].StartsWith("*"))
                         {
                             hostlist[i] = ";" + hostlist[i];
                         }
                     }
+
                     return hostlist;
                 }
+
                 return new string[] { };
             }
         }

src/NzbDrone.Common/Http/Proxy/ManagedWebProxyFactory.cs

@@ -31,6 +31,7 @@ namespace NzbDrone.Common.Http.Proxy
 
             return proxy;
         }
+
         private IWebProxy CreateWebProxy(HttpProxySettings proxySettings)
         {
             switch (proxySettings.Type)
@@ -44,6 +45,7 @@ namespace NzbDrone.Common.Http.Proxy
                     {
                         return new WebProxy(proxySettings.Host + ":" + proxySettings.Port, proxySettings.BypassLocalAddress, proxySettings.BypassListAsArray);
                     }
+
                 case ProxyType.Socks4:
                     return new SocksWebProxy(new ProxyConfig(IPAddress.Loopback, GetNextFreePort(), GetProxyIpAddress(proxySettings.Host), proxySettings.Port, ProxyConfig.SocksVersion.Four, proxySettings.Username, proxySettings.Password), false);
                 case ProxyType.Socks5:

src/NzbDrone.Common/Http/TlsFailureException.cs

@@ -11,8 +11,6 @@ namespace NzbDrone.Common.Http
         public TlsFailureException(WebRequest request, WebException innerException)
             : base("Failed to establish secure https connection to '" + request.RequestUri + "'.", innerException, WebExceptionStatus.SecureChannelFailure, innerException.Response)
         {
-
         }
-
     }
 }

src/NzbDrone.Common/Http/UnexpectedHtmlContentException.cs

@@ -7,7 +7,6 @@ namespace NzbDrone.Common.Http
         public UnexpectedHtmlContentException(HttpResponse response)
             : base(response.Request, response, $"Site responded with browser content instead of api data. This disruption may be temporary, please try again later. [{response.Request.Url}]")
         {
-
         }
     }
 }

src/NzbDrone.Common/Instrumentation/CleansingJsonVisitor.cs

@@ -19,6 +19,7 @@ namespace NzbDrone.Common.Instrumentation
                     json[i] = new JValue(CleanseLogMessage.Cleanse(text));
                 }
             }
+
             foreach (JToken token in json)
             {
                 Visit(token);

src/NzbDrone.Common/Instrumentation/LogEventExtensions.cs

@@ -29,7 +29,6 @@ namespace NzbDrone.Common.Instrumentation
                         message += ": " + logEvent.Exception.Message;
                     }
                 }
-
             }
 
             return message;

src/NzbDrone.Common/Instrumentation/NzbDroneLogger.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
@@ -13,6 +13,8 @@ namespace NzbDrone.Common.Instrumentation
 {
     public static class NzbDroneLogger
     {
+        private const string FILE_LOG_LAYOUT = @"${date:format=yyyy-MM-dd HH\:mm\:ss.f}|${level}|${logger}|${message}${onexception:inner=${newline}${newline}[v${assembly-version}] ${exception:format=ToString}${newline}}";
+
         private static bool _isConfigured;
 
         static NzbDroneLogger()
@@ -20,7 +22,6 @@ namespace NzbDrone.Common.Instrumentation
             LogManager.Configuration = new LoggingConfiguration();
         }
 
-
         public static void Register(IStartupContext startupContext, bool updateApp, bool inConsole)
         {
             if (_isConfigured)
@@ -69,7 +70,6 @@ namespace NzbDrone.Common.Instrumentation
                 dsn = RuntimeInfo.IsProduction
                     ? "https://80777986b95f44a1a90d1eb2f3af1e36@sentry.sonarr.tv/11"
                     : "https://6168f0946aba4e60ac23e469ac08eac5@sentry.sonarr.tv/9";
-
             }
             else
             {
@@ -131,8 +131,6 @@ namespace NzbDrone.Common.Instrumentation
             LogManager.Configuration.LoggingRules.Add(loggingRule);
         }
 
-        private const string FILE_LOG_LAYOUT = @"${date:format=yyyy-MM-dd HH\:mm\:ss.f}|${level}|${logger}|${message}${onexception:inner=${newline}${newline}[v${assembly-version}] ${exception:format=ToString}${newline}}";
-
         private static void RegisterAppFile(IAppFolderInfo appFolderInfo)
         {
             RegisterAppFile(appFolderInfo, "appFileInfo", "sonarr.txt", 5, LogLevel.Info);
@@ -208,6 +206,5 @@ namespace NzbDrone.Common.Instrumentation
         {
             return GetLogger(obj.GetType());
         }
-
     }
 }

src/NzbDrone.Common/Instrumentation/Sentry/SentryCleanser.cs

@@ -36,7 +36,6 @@ namespace NzbDrone.Common.Instrumentation.Sentry
             }
             catch (Exception)
             {
-
             }
 
             return sentryEvent;
@@ -50,9 +49,8 @@ namespace NzbDrone.Common.Instrumentation.Sentry
                 var data = b.Data?.ToDictionary(x => x.Key, y => CleanseLogMessage.Cleanse(y.Value));
                 return new Breadcrumb(message, b.Type, data, b.Category, b.Level);
             }
-            catch(Exception)
+            catch (Exception)
             {
-
             }
 
             return b;
@@ -60,7 +58,6 @@ namespace NzbDrone.Common.Instrumentation.Sentry
 
         private static string ShortenPath(string path)
         {
-
             if (string.IsNullOrWhiteSpace(path))
             {
                 return null;
@@ -68,7 +65,7 @@ namespace NzbDrone.Common.Instrumentation.Sentry
 
             // the paths in the stacktrace depend on where it was compiled,
             // not the current OS
-            var rootDirs = new [] { "\\src\\", "/src/" };
+            var rootDirs = new[] { "\\src\\", "/src/" };
             foreach (var rootDir in rootDirs)
             {
                 var index = path.IndexOf(rootDir, StringComparison.Ordinal);

src/NzbDrone.Common/Instrumentation/Sentry/SentryTarget.cs

@@ -40,8 +40,10 @@ namespace NzbDrone.Common.Instrumentation.Sentry
         {
             // UnauthorizedAccessExceptions will just be user configuration issues
             "UnauthorizedAccessException",
+
             // Filter out people stuck in boot loops
             "CorruptDatabaseException",
+
             // This also filters some people in boot loops
             "TinyIoCResolutionException"
         };
@@ -202,6 +204,7 @@ namespace NzbDrone.Common.Instrumentation.Sentry
                 {
                     fingerPrint.Add(ex.TargetSite.ToString());
                 }
+
                 if (ex.InnerException != null)
                 {
                     fingerPrint.Add(ex.InnerException.GetType().FullName);
@@ -249,7 +252,6 @@ namespace NzbDrone.Common.Instrumentation.Sentry
             return false;
         }
 
-
         protected override void Write(LogEventInfo logEvent)
         {
             if (_unauthorized || !SentryEnabled)
@@ -314,6 +316,7 @@ namespace NzbDrone.Common.Instrumentation.Sentry
                 {
                     _sdk?.Dispose();
                 }
+
                 // Flag us as disposed.  This allows us to handle multiple calls to Dispose() as well as ObjectDisposedException
                 _disposed = true;
             }

src/NzbDrone.Common/OAuth/OAuthRequest.cs

@@ -492,5 +492,3 @@ namespace NzbDrone.Common.OAuth
         }
     }
 }
-
-