New: Bump Version to V3 to please the masses

.gitignore

@@ -107,26 +107,24 @@ _NCrunch_*
 _TeamCity*
 
 # Radarr
-Backups/
-logs/
-#MediaCover/
-UpdateLogs/
-xdg/
 config.xml
-logs.db*
-nzbdrone.db*
-nzbdrone.pid
+nzbdrone.log*txt
+UpdateLogs/
 *workspace.xml
 *.test-cache
 *.userprefs
 */test-results/*
 src/UI/.idea/*
+*log.txt
 node_modules/
 _output*
+_artifacts
 _rawPackage/
 _dotTrace*
 _tests/
 *.Result.xml
+coverage*.xml
+coverage*.json
 setup/Output/
 *.~is
 

azure-pipelines.yml

@@ -7,7 +7,7 @@ variables:
   outputFolder: './_output'
   artifactsFolder: './_artifacts'
   testsFolder: './_tests'
-  majorVersion: '2.0.0'
+  majorVersion: '3.0.0'
   minorVersion: $[counter('minorVersion', 2000)]
   radarrVersion: '$(majorVersion).$(minorVersion)'
   buildName: '$(Build.SourceBranchName).$(radarrVersion)'

macOS/Radarr.app/Contents/Info.plist

@@ -23,11 +23,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.0</string>
+	<string>10.0.0.0</string>
 	<key>CFBundleSignature</key>
 	<string>xmmd</string>
 	<key>CFBundleVersion</key>
-	<string>2.0</string>
+	<string>10.0.0.0</string>
 	<key>NSAppleScriptEnabled</key>
 	<string>YES</string>
 </dict>

setup/radarr.iss

@@ -6,7 +6,7 @@
 #define AppURL "https://radarr.video/"
 #define ForumsURL "https://forums.radarr.video/"
 #define AppExeName "Radarr.exe"
-#define BaseVersion "2.0.0"
+#define BaseVersion GetEnv('MAJORVERSION')
 #define BuildNumber GetEnv('MINORVERSION')
 #define BuildVersion GetEnv('RADARRVERSION')
 #define BranchName GetEnv('BUILD_SOURCEBRANCHNAME')

src/NzbDrone.Common.Test/EnvironmentInfo/BuildInfoFixture.cs

@@ -10,7 +10,7 @@ namespace NzbDrone.Common.Test.EnvironmentInfo
         [Test]
         public void should_return_version()
         {
-            BuildInfo.Version.Major.Should().BeOneOf(2, 10);
+            BuildInfo.Version.Major.Should().BeOneOf(3, 10);
         }
 
         [Test]

src/NzbDrone.Host/MainAppContainerBuilder.cs

@@ -17,7 +17,7 @@ namespace Radarr.Host
                                  "Radarr.Core",
                                  "Radarr.Api",
                                  "Radarr.SignalR",
-                                 "Radarr.Api.V2",
+                                 "Radarr.Api.V3",
                                  "Radarr.Http"
                              };
 

src/NzbDrone.Host/Radarr.Host.csproj

@@ -21,7 +21,7 @@
     <ProjectReference Include="..\NzbDrone.Common\Radarr.Common.csproj" />
     <ProjectReference Include="..\NzbDrone.Core\Radarr.Core.csproj" />
     <ProjectReference Include="..\NzbDrone.SignalR\Radarr.SignalR.csproj" />
-    <ProjectReference Include="..\Radarr.Api.V2\Radarr.Api.V2.csproj" />
+    <ProjectReference Include="..\Radarr.Api.V3\Radarr.Api.V3.csproj" />
     <ProjectReference Include="..\Radarr.Http\Radarr.Http.csproj" />
   </ItemGroup>
   <ItemGroup>

src/NzbDrone.Integration.Test/ApiTests/BlacklistFixture.cs

@@ -1,6 +1,6 @@
 using FluentAssertions;
 using NUnit.Framework;
-using Radarr.Api.V2.Movies;
+using Radarr.Api.V3.Movies;
 
 namespace NzbDrone.Integration.Test.ApiTests
 {
@@ -15,7 +15,7 @@ namespace NzbDrone.Integration.Test.ApiTests
         {
             _movie = EnsureMovie(11, "The Blacklist");
 
-            Blacklist.Post(new Radarr.Api.V2.Blacklist.BlacklistResource
+            Blacklist.Post(new Radarr.Api.V3.Blacklist.BlacklistResource
             {
                 MovieId = _movie.Id,
                 SourceTitle = "Blacklist.S01E01.Brought.To.You.By-BoomBoxHD"

src/NzbDrone.Integration.Test/ApiTests/CalendarFixture.cs

@@ -1,6 +1,6 @@
 using FluentAssertions;
 using NUnit.Framework;
-using Radarr.Api.V2.Movies;
+using Radarr.Api.V3.Movies;
 using NzbDrone.Integration.Test.Client;
 using System;
 using System.Collections.Generic;

src/NzbDrone.Integration.Test/ApiTests/DiskSpaceFixture.cs

@@ -1,7 +1,7 @@
 using System.Linq;
 using FluentAssertions;
 using NUnit.Framework;
-using Radarr.Api.V2.DiskSpace;
+using Radarr.Api.V3.DiskSpace;
 using NzbDrone.Integration.Test.Client;
 
 namespace NzbDrone.Integration.Test.ApiTests

src/NzbDrone.Integration.Test/ApiTests/MovieEditorFixture.cs

@@ -1,7 +1,7 @@
 using FluentAssertions;
 using NUnit.Framework;
 using System.Linq;
-using Radarr.Api.V2.Movies;
+using Radarr.Api.V3.Movies;
 using NzbDrone.Test.Common;
 
 namespace NzbDrone.Integration.Test.ApiTests

src/NzbDrone.Integration.Test/ApiTests/ReleaseFixture.cs

@@ -1,6 +1,6 @@
 using FluentAssertions;
 using NUnit.Framework;
-using Radarr.Api.V2.Indexers;
+using Radarr.Api.V3.Indexers;
 using System.Linq;
 using System.Net;
 

src/NzbDrone.Integration.Test/ApiTests/RootFolderFixture.cs

@@ -1,7 +1,7 @@
 using System;
 using FluentAssertions;
 using NUnit.Framework;
-using Radarr.Api.V2.RootFolders;
+using Radarr.Api.V3.RootFolders;
 
 namespace NzbDrone.Integration.Test.ApiTests
 {

src/NzbDrone.Integration.Test/Client/DownloadClientClient.cs

@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using Radarr.Api.V2.DownloadClient;
+using Radarr.Api.V3.DownloadClient;
 using RestSharp;
 
 namespace NzbDrone.Integration.Test.Client

src/NzbDrone.Integration.Test/Client/IndexerClient.cs

@@ -1,4 +1,4 @@
-using Radarr.Api.V2.Indexers;
+using Radarr.Api.V3.Indexers;
 using RestSharp;
 
 namespace NzbDrone.Integration.Test.Client

src/NzbDrone.Integration.Test/Client/MovieClient.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using System.Net;
-using Radarr.Api.V2.Movies;
+using Radarr.Api.V3.Movies;
 using RestSharp;
 
 namespace NzbDrone.Integration.Test.Client

src/NzbDrone.Integration.Test/Client/NotificationClient.cs

@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using Radarr.Api.V2.Notifications;
+using Radarr.Api.V3.Notifications;
 using RestSharp;
 
 namespace NzbDrone.Integration.Test.Client

src/NzbDrone.Integration.Test/Client/ReleaseClient.cs

@@ -1,4 +1,4 @@
-using Radarr.Api.V2.Indexers;
+using Radarr.Api.V3.Indexers;
 using RestSharp;
 
 namespace NzbDrone.Integration.Test.Client

src/NzbDrone.Integration.Test/HttpLogFixture.cs

@@ -22,15 +22,15 @@ namespace NzbDrone.Integration.Test
             var logFile = "radarr.trace.txt";
             var logLines = Logs.GetLogFileLines(logFile);
 
-            var resultPost = Movies.InvalidPost(new Radarr.Api.V2.Movies.MovieResource());
+            var resultPost = Movies.InvalidPost(new Radarr.Api.V3.Movies.MovieResource());
 
             // Skip 2 and 1 to ignore the logs endpoint
             logLines = Logs.GetLogFileLines(logFile).Skip(logLines.Length + 2).ToArray();
             Array.Resize(ref logLines, logLines.Length - 1);
 
-            logLines.Should().Contain(v => v.Contains("|Trace|Http|Req") && v.Contains("/api/v2/movie/"));
-            logLines.Should().Contain(v => v.Contains("|Trace|Http|Res") && v.Contains("/api/v2/movie/: 400.BadRequest"));
-            logLines.Should().Contain(v => v.Contains("|Debug|Api|") && v.Contains("/api/v2/movie/: 400.BadRequest"));
+            logLines.Should().Contain(v => v.Contains("|Trace|Http|Req") && v.Contains("/api/v3/movie/"));
+            logLines.Should().Contain(v => v.Contains("|Trace|Http|Res") && v.Contains("/api/v3/movie/: 400.BadRequest"));
+            logLines.Should().Contain(v => v.Contains("|Debug|Api|") && v.Contains("/api/v3/movie/: 400.BadRequest"));
         }
     }
 }

src/NzbDrone.Integration.Test/IntegrationTest.cs

@@ -26,7 +26,7 @@ namespace NzbDrone.Integration.Test
 
         protected override void InitializeTestTarget()
         {
-            Indexers.Post(new Radarr.Api.V2.Indexers.IndexerResource
+            Indexers.Post(new Radarr.Api.V3.Indexers.IndexerResource
             {
                 EnableRss = false,
                 EnableInteractiveSearch = false,

src/NzbDrone.Integration.Test/IntegrationTestBase.cs

@@ -9,16 +9,16 @@ using NLog;
 using NLog.Config;
 using NLog.Targets;
 using NUnit.Framework;
-using Radarr.Api.V2.Blacklist;
-using Radarr.Api.V2.Commands;
-using Radarr.Api.V2.Config;
-using Radarr.Api.V2.DownloadClient;
-using Radarr.Api.V2.MovieFiles;
-using Radarr.Api.V2.History;
-using Radarr.Api.V2.Profiles.Quality;
-using Radarr.Api.V2.RootFolders;
-using Radarr.Api.V2.Movies;
-using Radarr.Api.V2.Tags;
+using Radarr.Api.V3.Blacklist;
+using Radarr.Api.V3.Commands;
+using Radarr.Api.V3.Config;
+using Radarr.Api.V3.DownloadClient;
+using Radarr.Api.V3.MovieFiles;
+using Radarr.Api.V3.History;
+using Radarr.Api.V3.Profiles.Quality;
+using Radarr.Api.V3.RootFolders;
+using Radarr.Api.V3.Movies;
+using Radarr.Api.V3.Tags;
 using NzbDrone.Common.EnvironmentInfo;
 using NzbDrone.Common.Serializer;
 using NzbDrone.Core.MediaFiles.Events;
@@ -97,7 +97,7 @@ namespace NzbDrone.Integration.Test
 
         protected virtual void InitRestClients()
         {
-            RestClient = new RestClient(RootUrl + "api/v2/");
+            RestClient = new RestClient(RootUrl + "api/v3/");
             RestClient.AddDefaultHeader("Authentication", ApiKey);
             RestClient.AddDefaultHeader("X-Api-Key", ApiKey);
 

src/NzbDrone.Integration.Test/Radarr.Integration.Test.csproj

@@ -17,6 +17,6 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\NzbDrone.Test.Common\Radarr.Test.Common.csproj" />
-    <ProjectReference Include="..\Radarr.Api.V2\Radarr.Api.V2.csproj" />
+    <ProjectReference Include="..\Radarr.Api.V3\Radarr.Api.V3.csproj" />
   </ItemGroup>
 </Project>

src/NzbDrone.Test.Common/NzbDroneRunner.cs

@@ -26,7 +26,7 @@ namespace NzbDrone.Test.Common
         public NzbDroneRunner(Logger logger, int port = 7878)
         {
             _processProvider = new ProcessProvider(logger);
-            _restClient = new RestClient("http://localhost:7878/api");
+            _restClient = new RestClient("http://localhost:7878/api/v3");
         }
 
         public void Start()

src/Radarr.Api.V2/RadarrV2FeedModule.cs

@@ -1,12 +0,0 @@
-using Radarr.Http;
-
-namespace Radarr.Api.V2
-{
-    public abstract class RadarrV2FeedModule : RadarrModule
-    {
-        protected RadarrV2FeedModule(string resource)
-            : base("/feed/v2/" + resource.Trim('/'))
-        {
-        }
-    }
-}

src/Radarr.Api.V2/RadarrV2Module.cs

@@ -1,12 +0,0 @@
-using Radarr.Http;
-
-namespace Radarr.Api.V2
-{
-    public abstract class RadarrV2Module : RadarrModule
-    {
-        protected RadarrV2Module(string resource)
-            : base("/api/v2/" + resource.Trim('/'))
-        {
-        }
-    }
-}

src/Radarr.Api.V3/Blacklist/BlacklistModule.cs

@@ -2,7 +2,7 @@ using NzbDrone.Core.Blacklisting;
 using NzbDrone.Core.Datastore;
 using Radarr.Http;
 
-namespace Radarr.Api.V2.Blacklist
+namespace Radarr.Api.V3.Blacklist
 {
     public class BlacklistModule : RadarrRestModule<BlacklistResource>
     {

src/Radarr.Api.V3/Blacklist/BlacklistResource.cs

@@ -3,10 +3,10 @@ using System.Collections.Generic;
 using NzbDrone.Core.Indexers;
 using NzbDrone.Core.Languages;
 using NzbDrone.Core.Qualities;
-using Radarr.Api.V2.Movies;
+using Radarr.Api.V3.Movies;
 using Radarr.Http.REST;
 
-namespace Radarr.Api.V2.Blacklist
+namespace Radarr.Api.V3.Blacklist
 {
     public class BlacklistResource : RestResource
     {

src/Radarr.Api.V3/Calendar/CalendarFeedModule.cs

@@ -11,9 +11,9 @@ using Nancy.Responses;
 using NzbDrone.Core.Tags;
 using NzbDrone.Common.Extensions;
 
-namespace Radarr.Api.V2.Calendar
+namespace Radarr.Api.V3.Calendar
 {
-    public class CalendarFeedModule : RadarrV2FeedModule
+    public class CalendarFeedModule : RadarrV3FeedModule
     {
         private readonly IMovieService _movieService;
         private readonly ITagService _tagService;

src/Radarr.Api.V3/Calendar/CalendarModule.cs

@@ -2,12 +2,12 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using Nancy;
-using Radarr.Api.V2.Movies;
+using Radarr.Api.V3.Movies;
 using NzbDrone.Core.Movies;
 using NzbDrone.SignalR;
 using Radarr.Http;
 
-namespace Radarr.Api.V2.Calendar
+namespace Radarr.Api.V3.Calendar
 {
     public class CalendarModule : RadarrRestModuleWithSignalR<MovieResource, Movie>
     {

src/Radarr.Api.V3/Commands/CommandModule.cs

@@ -12,7 +12,7 @@ using Radarr.Http;
 using Radarr.Http.Extensions;
 using Radarr.Http.Validation;
 
-namespace Radarr.Api.V2.Commands
+namespace Radarr.Api.V3.Commands
 {
     public class CommandModule : RadarrRestModuleWithSignalR<CommandResource, CommandModel>, IHandle<CommandUpdatedEvent>
     {

src/Radarr.Api.V3/Commands/CommandResource.cs

@@ -6,7 +6,7 @@ using NzbDrone.Common.Extensions;
 using NzbDrone.Core.Messaging.Commands;
 using Radarr.Http.REST;
 
-namespace Radarr.Api.V2.Commands
+namespace Radarr.Api.V3.Commands
 {
     public class CommandResource : RestResource
     {

src/Radarr.Api.V3/Config/DownloadClientConfigModule.cs

@@ -2,7 +2,7 @@ using FluentValidation;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Validation.Paths;
 
-namespace Radarr.Api.V2.Config
+namespace Radarr.Api.V3.Config
 {
     public class DownloadClientConfigModule : RadarrConfigModule<DownloadClientConfigResource>
     {

src/Radarr.Api.V3/Config/DownloadClientConfigResource.cs

@@ -1,7 +1,7 @@
 using Radarr.Http.REST;
 using NzbDrone.Core.Configuration;
 
-namespace Radarr.Api.V2.Config
+namespace Radarr.Api.V3.Config
 {
     public class DownloadClientConfigResource : RestResource
     {

src/Radarr.Api.V3/Config/HostConfigModule.cs

@@ -11,7 +11,7 @@ using NzbDrone.Core.Validation;
 using NzbDrone.Core.Validation.Paths;
 using Radarr.Http;
 
-namespace Radarr.Api.V2.Config
+namespace Radarr.Api.V3.Config
 {
     public class HostConfigModule : RadarrRestModule<HostConfigResource>
     {

src/Radarr.Api.V3/Config/HostConfigResource.cs

@@ -5,7 +5,7 @@ using NzbDrone.Core.Security;
 using NzbDrone.Core.Update;
 using NzbDrone.Common.Http.Proxy;
 
-namespace Radarr.Api.V2.Config
+namespace Radarr.Api.V3.Config
 {
     public class HostConfigResource : RestResource
     {

src/Radarr.Api.V3/Config/IndexerConfigModule.cs

@@ -2,7 +2,7 @@ using FluentValidation;
 using Radarr.Http.Validation;
 using NzbDrone.Core.Configuration;
 
-namespace Radarr.Api.V2.Config
+namespace Radarr.Api.V3.Config
 {
     public class IndexerConfigModule : RadarrConfigModule<IndexerConfigResource>
     {

src/Radarr.Api.V3/Config/IndexerConfigResource.cs

@@ -2,7 +2,7 @@ using Radarr.Http.REST;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Parser;
 
-namespace Radarr.Api.V2.Config
+namespace Radarr.Api.V3.Config
 {
     public class IndexerConfigResource : RestResource
     {

src/Radarr.Api.V3/Config/MediaManagementConfigModule.cs

@@ -2,7 +2,7 @@ using FluentValidation;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Validation.Paths;
 
-namespace Radarr.Api.V2.Config
+namespace Radarr.Api.V3.Config
 {
     public class MediaManagementConfigModule : RadarrConfigModule<MediaManagementConfigResource>
     {

src/Radarr.Api.V3/Config/MediaManagementConfigResource.cs

@@ -2,7 +2,7 @@ using Radarr.Http.REST;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.MediaFiles;
 
-namespace Radarr.Api.V2.Config
+namespace Radarr.Api.V3.Config
 {
     public class MediaManagementConfigResource : RestResource
     {

src/Radarr.Api.V3/Config/NamingConfigModule.cs

@@ -7,7 +7,7 @@ using NzbDrone.Core.Organizer;
 using Nancy.ModelBinding;
 using Radarr.Http;
 
-namespace Radarr.Api.V2.Config
+namespace Radarr.Api.V3.Config
 {
     public class NamingConfigModule : RadarrRestModule<NamingConfigResource>
     {

src/Radarr.Api.V3/Config/NamingConfigResource.cs

@@ -1,7 +1,7 @@
 using Radarr.Http.REST;
 using NzbDrone.Core.Organizer;
 
-namespace Radarr.Api.V2.Config
+namespace Radarr.Api.V3.Config
 {
     public class NamingConfigResource : RestResource
     {

src/Radarr.Api.V3/Config/NamingExampleResource.cs

@@ -1,6 +1,6 @@
 using NzbDrone.Core.Organizer;
 
-namespace Radarr.Api.V2.Config
+namespace Radarr.Api.V3.Config
 {
     public class NamingExampleResource
     {

src/Radarr.Api.V3/Config/NetImportConfigModule.cs

@@ -2,7 +2,7 @@ using FluentValidation;
 using Radarr.Http.Validation;
 using NzbDrone.Core.Configuration;
 
-namespace Radarr.Api.V2.Config
+namespace Radarr.Api.V3.Config
 {
     public class NetImportConfigModule : RadarrConfigModule<NetImportConfigResource>
     {

src/Radarr.Api.V3/Config/NetImportConfigResource.cs

@@ -1,7 +1,7 @@
 using Radarr.Http.REST;
 using NzbDrone.Core.Configuration;
 
-namespace Radarr.Api.V2.Config
+namespace Radarr.Api.V3.Config
 {
     public class NetImportConfigResource : RestResource
     {

src/Radarr.Api.V3/Config/RadarrConfigModule.cs

@@ -4,7 +4,7 @@ using Radarr.Http;
 using Radarr.Http.REST;
 using NzbDrone.Core.Configuration;
 
-namespace Radarr.Api.V2.Config
+namespace Radarr.Api.V3.Config
 {
     public abstract class RadarrConfigModule<TResource> : RadarrRestModule<TResource> where TResource : RestResource, new()
     {

src/Radarr.Api.V3/Config/UiConfigModule.cs

@@ -1,6 +1,6 @@
 using NzbDrone.Core.Configuration;
 
-namespace Radarr.Api.V2.Config
+namespace Radarr.Api.V3.Config
 {
     public class UiConfigModule : RadarrConfigModule<UiConfigResource>
     {

src/Radarr.Api.V3/Config/UiConfigResource.cs

@@ -1,7 +1,7 @@
 using Radarr.Http.REST;
 using NzbDrone.Core.Configuration;
 
-namespace Radarr.Api.V2.Config
+namespace Radarr.Api.V3.Config
 {
     public class UiConfigResource : RestResource
     {

src/Radarr.Api.V3/CustomFilters/CustomFilterModule.cs

@@ -2,7 +2,7 @@ using System.Collections.Generic;
 using NzbDrone.Core.CustomFilters;
 using Radarr.Http;
 
-namespace Radarr.Api.V2.CustomFilters
+namespace Radarr.Api.V3.CustomFilters
 {
     public class CustomFilterModule : RadarrRestModule<CustomFilterResource>
     {

src/Radarr.Api.V3/CustomFilters/CustomFilterResource.cs

@@ -4,7 +4,7 @@ using NzbDrone.Common.Serializer;
 using NzbDrone.Core.CustomFilters;
 using Radarr.Http.REST;
 
-namespace Radarr.Api.V2.CustomFilters
+namespace Radarr.Api.V3.CustomFilters
 {
     public class CustomFilterResource : RestResource
     {

src/Radarr.Api.V3/DiskSpace/DiskSpaceModule.cs

@@ -2,7 +2,7 @@ using System.Collections.Generic;
 using NzbDrone.Core.DiskSpace;
 using Radarr.Http;
 
-namespace Radarr.Api.V2.DiskSpace
+namespace Radarr.Api.V3.DiskSpace
 {
     public class DiskSpaceModule : RadarrRestModule<DiskSpaceResource>
     {

src/Radarr.Api.V3/DiskSpace/DiskSpaceResource.cs

@@ -1,6 +1,6 @@
 using Radarr.Http.REST;
 
-namespace Radarr.Api.V2.DiskSpace
+namespace Radarr.Api.V3.DiskSpace
 {
     public class DiskSpaceResource : RestResource
     {

src/Radarr.Api.V3/DownloadClient/DownloadClientModule.cs

@@ -1,6 +1,6 @@
 using NzbDrone.Core.Download;
 
-namespace Radarr.Api.V2.DownloadClient
+namespace Radarr.Api.V3.DownloadClient
 {
     public class DownloadClientModule : ProviderModuleBase<DownloadClientResource, IDownloadClient, DownloadClientDefinition>
     {

src/Radarr.Api.V3/DownloadClient/DownloadClientResource.cs

@@ -1,7 +1,7 @@
 using NzbDrone.Core.Download;
 using NzbDrone.Core.Indexers;
 
-namespace Radarr.Api.V2.DownloadClient
+namespace Radarr.Api.V3.DownloadClient
 {
     public class DownloadClientResource : ProviderResource
     {

src/Radarr.Api.V3/FileSystem/FileSystemModule.cs

@@ -7,9 +7,9 @@ using NzbDrone.Common.Extensions;
 using NzbDrone.Core.MediaFiles;
 using Radarr.Http.Extensions;
 
-namespace Radarr.Api.V2.FileSystem
+namespace Radarr.Api.V3.FileSystem
 {
-    public class FileSystemModule : RadarrV2Module
+    public class FileSystemModule : RadarrV3Module
     {
         private readonly IFileSystemLookupService _fileSystemLookupService;
         private readonly IDiskProvider _diskProvider;

src/Radarr.Api.V3/Health/HealthModule.cs

@@ -5,7 +5,7 @@ using NzbDrone.Core.Messaging.Events;
 using NzbDrone.SignalR;
 using Radarr.Http;
 
-namespace Radarr.Api.V2.Health
+namespace Radarr.Api.V3.Health
 {
     public class HealthModule : RadarrRestModuleWithSignalR<HealthResource, HealthCheck>,
                                 IHandle<HealthCheckCompleteEvent>

src/Radarr.Api.V3/Health/HealthResource.cs

@@ -4,7 +4,7 @@ using NzbDrone.Common.Http;
 using NzbDrone.Core.HealthCheck;
 using Radarr.Http.REST;
 
-namespace Radarr.Api.V2.Health
+namespace Radarr.Api.V3.Health
 {
     public class HealthResource : RestResource
     {

src/Radarr.Api.V3/History/HistoryModule.cs

@@ -6,12 +6,12 @@ using NzbDrone.Core.Datastore;
 using NzbDrone.Core.DecisionEngine.Specifications;
 using NzbDrone.Core.Download;
 using NzbDrone.Core.History;
-using Radarr.Api.V2.Movies;
+using Radarr.Api.V3.Movies;
 using Radarr.Http;
 using Radarr.Http.Extensions;
 using Radarr.Http.REST;
 
-namespace Radarr.Api.V2.History
+namespace Radarr.Api.V3.History
 {
     public class HistoryModule : RadarrRestModule<HistoryResource>
     {

src/Radarr.Api.V3/History/HistoryResource.cs

@@ -3,10 +3,10 @@ using System.Collections.Generic;
 using NzbDrone.Core.History;
 using NzbDrone.Core.Languages;
 using NzbDrone.Core.Qualities;
-using Radarr.Api.V2.Movies;
+using Radarr.Api.V3.Movies;
 using Radarr.Http.REST;
 
-namespace Radarr.Api.V2.History
+namespace Radarr.Api.V3.History
 {
     public class HistoryResource : RestResource
     {

src/Radarr.Api.V3/Indexers/IndexerModule.cs

@@ -1,6 +1,6 @@
 using NzbDrone.Core.Indexers;
 
-namespace Radarr.Api.V2.Indexers
+namespace Radarr.Api.V3.Indexers
 {
     public class IndexerModule : ProviderModuleBase<IndexerResource, IIndexer, IndexerDefinition>
     {

src/Radarr.Api.V3/Indexers/IndexerResource.cs

@@ -1,6 +1,6 @@
 using NzbDrone.Core.Indexers;
 
-namespace Radarr.Api.V2.Indexers
+namespace Radarr.Api.V3.Indexers
 {
     public class IndexerResource : ProviderResource
     {

src/Radarr.Api.V3/Indexers/ReleaseModule.cs

@@ -15,7 +15,7 @@ using NzbDrone.Core.Validation;
 using Radarr.Http.Extensions;
 using HttpStatusCode = System.Net.HttpStatusCode;
 
-namespace Radarr.Api.V2.Indexers
+namespace Radarr.Api.V3.Indexers
 {
     public class ReleaseModule : ReleaseModuleBase
     {

src/Radarr.Api.V3/Indexers/ReleaseModuleBase.cs

@@ -2,7 +2,7 @@ using System.Collections.Generic;
 using NzbDrone.Core.DecisionEngine;
 using Radarr.Http;
 
-namespace Radarr.Api.V2.Indexers
+namespace Radarr.Api.V3.Indexers
 {
     public abstract class ReleaseModuleBase : RadarrRestModule<ReleaseResource>
     {

src/Radarr.Api.V3/Indexers/ReleasePushModule.cs

@@ -12,7 +12,7 @@ using NzbDrone.Core.Indexers;
 using NzbDrone.Core.Parser.Model;
 using Radarr.Http.Extensions;
 
-namespace Radarr.Api.V2.Indexers
+namespace Radarr.Api.V3.Indexers
 {
     class ReleasePushModule : ReleaseModuleBase
     {

src/Radarr.Api.V3/Indexers/ReleaseResource.cs

@@ -9,7 +9,7 @@ using NzbDrone.Core.Parser.Model;
 using NzbDrone.Core.Qualities;
 using Radarr.Http.REST;
 
-namespace Radarr.Api.V2.Indexers
+namespace Radarr.Api.V3.Indexers
 {
     public class ReleaseResource : RestResource
     {

src/Radarr.Api.V3/Logs/LogFileModule.cs

@@ -1,11 +1,11 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.IO;
 using NzbDrone.Common.Disk;
 using NzbDrone.Common.EnvironmentInfo;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Core.Configuration;
 
-namespace Radarr.Api.V2.Logs
+namespace Radarr.Api.V3.Logs
 {
     public class LogFileModule : LogFileModuleBase
     {
@@ -40,4 +40,4 @@ namespace Radarr.Api.V2.Logs
         }
 
     }
-}
+}

src/Radarr.Api.V3/Logs/LogFileModuleBase.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using Nancy;
@@ -8,7 +8,7 @@ using NzbDrone.Common.Disk;
 using NzbDrone.Core.Configuration;
 using Radarr.Http;
 
-namespace Radarr.Api.V2.Logs
+namespace Radarr.Api.V3.Logs
 {
     public abstract class LogFileModuleBase : RadarrRestModule<LogFileResource>
     {
@@ -45,7 +45,7 @@ namespace Radarr.Api.V2.Logs
                     Id = i + 1,
                     Filename = filename,
                     LastWriteTime = _diskProvider.FileGetLastWrite(file),
-                    ContentsUrl = string.Format("{0}/api/v2/{1}/{2}", _configFileProvider.UrlBase, Resource, filename),
+                    ContentsUrl = string.Format("{0}/api/v3/{1}/{2}", _configFileProvider.UrlBase, Resource, filename),
                     DownloadUrl = string.Format("{0}/{1}/{2}", _configFileProvider.UrlBase, DownloadUrlRoot, filename)
                 });
             }
@@ -72,4 +72,4 @@ namespace Radarr.Api.V2.Logs
 
         protected abstract string DownloadUrlRoot { get; }
     }
-}
+}

src/Radarr.Api.V3/Logs/LogFileResource.cs

@@ -1,7 +1,7 @@
-using System;
+using System;
 using Radarr.Http.REST;
 
-namespace Radarr.Api.V2.Logs
+namespace Radarr.Api.V3.Logs
 {
     public class LogFileResource : RestResource
     {

src/Radarr.Api.V3/Logs/LogModule.cs

@@ -2,7 +2,7 @@ using System.Linq;
 using NzbDrone.Core.Instrumentation;
 using Radarr.Http;
 
-namespace Radarr.Api.V2.Logs
+namespace Radarr.Api.V3.Logs
 {
     public class LogModule : RadarrRestModule<LogResource>
     {

src/Radarr.Api.V3/Logs/LogResource.cs

@@ -2,7 +2,7 @@ using System;
 using NzbDrone.Core.Instrumentation;
 using Radarr.Http.REST;
 
-namespace Radarr.Api.V2.Logs
+namespace Radarr.Api.V3.Logs
 {
     public class LogResource : RestResource
     {

src/Radarr.Api.V3/Logs/UpdateLogFileModule.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
@@ -7,7 +7,7 @@ using NzbDrone.Common.EnvironmentInfo;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Core.Configuration;
 
-namespace Radarr.Api.V2.Logs
+namespace Radarr.Api.V3.Logs
 {
     public class UpdateLogFileModule : LogFileModuleBase
     {

src/Radarr.Api.V3/ManualImport/ManualImportModule.cs

@@ -5,7 +5,7 @@ using NzbDrone.Core.Qualities;
 using Radarr.Http;
 using Radarr.Http.Extensions;
 
-namespace Radarr.Api.V2.ManualImport
+namespace Radarr.Api.V3.ManualImport
 {
     public class ManualImportModule : RadarrRestModule<ManualImportResource>
     {

src/Radarr.Api.V3/ManualImport/ManualImportResource.cs

@@ -5,10 +5,10 @@ using NzbDrone.Core.DecisionEngine;
 using NzbDrone.Core.Languages;
 using NzbDrone.Core.MediaFiles.MovieImport.Manual;
 using NzbDrone.Core.Qualities;
-using Radarr.Api.V2.Movies;
+using Radarr.Api.V3.Movies;
 using Radarr.Http.REST;
 
-namespace Radarr.Api.V2.ManualImport
+namespace Radarr.Api.V3.ManualImport
 {
     public class ManualImportResource : RestResource
     {

src/Radarr.Api.V3/Metadata/MetadataModule.cs

@@ -1,6 +1,6 @@
 using NzbDrone.Core.Extras.Metadata;
 
-namespace Radarr.Api.V2.Metadata
+namespace Radarr.Api.V3.Metadata
 {
     public class MetadataModule : ProviderModuleBase<MetadataResource, IMetadata, MetadataDefinition>
     {

src/Radarr.Api.V3/Metadata/MetadataResource.cs

@@ -1,6 +1,6 @@
 using NzbDrone.Core.Extras.Metadata;
 
-namespace Radarr.Api.V2.Metadata
+namespace Radarr.Api.V3.Metadata
 {
     public class MetadataResource : ProviderResource
     {

src/Radarr.Api.V3/MovieFiles/MediaInfoResource.cs

@@ -3,7 +3,7 @@ using System.Text;
 using NzbDrone.Core.MediaFiles.MediaInfo;
 using Radarr.Http.REST;
 
-namespace Radarr.Api.V2.MovieFiles
+namespace Radarr.Api.V3.MovieFiles
 {
     public class MediaInfoResource : RestResource
     {

src/Radarr.Api.V3/MovieFiles/MovieFileListResource.cs

@@ -2,7 +2,7 @@ using System.Collections.Generic;
 using NzbDrone.Core.Languages;
 using NzbDrone.Core.Qualities;
 
-namespace Radarr.Api.V2.MovieFiles
+namespace Radarr.Api.V3.MovieFiles
 {
     public class MovieFileListResource
     {

src/Radarr.Api.V3/MovieFiles/MovieFileModule.cs

@@ -16,7 +16,7 @@ using Radarr.Http;
 using Radarr.Http.Extensions;
 using BadRequestException = Radarr.Http.REST.BadRequestException;
 
-namespace Radarr.Api.V2.MovieFiles
+namespace Radarr.Api.V3.MovieFiles
 {
     public class MovieFileModule : RadarrRestModuleWithSignalR<MovieFileResource, MovieFile>,
                                  IHandle<MovieFileAddedEvent>,

src/Radarr.Api.V3/MovieFiles/MovieFileResource.cs

@@ -7,7 +7,7 @@ using NzbDrone.Core.MediaFiles;
 using NzbDrone.Core.Qualities;
 using Radarr.Http.REST;
 
-namespace Radarr.Api.V2.MovieFiles
+namespace Radarr.Api.V3.MovieFiles
 {
     public class MovieFileResource : RestResource
     {

src/Radarr.Api.V3/Movies/AlternativeTitleModule.cs

@@ -7,7 +7,7 @@ using NzbDrone.Core.Movies;
 using NzbDrone.Core.Movies.Events;
 using Radarr.Http;
 
-namespace Radarr.Api.V2.Movies
+namespace Radarr.Api.V3.Movies
 {
     public class AlternativeTitleModule : RadarrRestModule<AlternativeTitleResource>
     {

src/Radarr.Api.V3/Movies/AlternativeTitleResource.cs

@@ -5,7 +5,7 @@ using Radarr.Http.REST;
 using NzbDrone.Core.Movies.AlternativeTitles;
 using NzbDrone.Core.Languages;
 
-namespace Radarr.Api.V2.Movies
+namespace Radarr.Api.V3.Movies
 {
     public class AlternativeTitleResource : RestResource
     {

src/Radarr.Api.V3/Movies/AlternativeYearModule.cs

@@ -6,7 +6,7 @@ using NzbDrone.Core.Movies;
 using NzbDrone.Core.Movies.Events;
 using Radarr.Http;
 
-namespace Radarr.Api.V2.Movies
+namespace Radarr.Api.V3.Movies
 {
     public class AlternativeYearModule : RadarrRestModule<AlternativeYearResource>
     {

src/Radarr.Api.V3/Movies/AlternativeYearResource.cs

@@ -9,7 +9,7 @@ using NzbDrone.Core.MediaFiles;
 using NzbDrone.Core.Movies.AlternativeTitles;
 using NzbDrone.Core.Parser;
 
-namespace Radarr.Api.V2.Movies
+namespace Radarr.Api.V3.Movies
 {
     public class AlternativeYearResource : RestResource
     {

src/Radarr.Api.V3/Movies/FetchMovieListModule.cs

@@ -8,7 +8,7 @@ using NzbDrone.Core.Movies;
 using Radarr.Http;
 using Radarr.Http.Extensions;
 
-namespace Radarr.Api.V2.Movies
+namespace Radarr.Api.V3.Movies
 {
     public class FetchMovieListModule : RadarrRestModule<MovieResource>
     {

src/Radarr.Api.V3/Movies/MovieDiscoverModule.cs

@@ -5,10 +5,10 @@ using NzbDrone.Core.MetadataSource;
 using System.Linq;
 using Radarr.Http;
 using NzbDrone.Core.NetImport;
-using Radarr.Api.V2.NetImport;
+using Radarr.Api.V3.NetImport;
 using NzbDrone.Core.Organizer;
 
-namespace Radarr.Api.V2.Movies
+namespace Radarr.Api.V3.Movies
 {
     public class MovieDiscoverModule : RadarrRestModule<MovieResource>
     {

src/Radarr.Api.V3/Movies/MovieEditorModule.cs

@@ -7,9 +7,9 @@ using NzbDrone.Common.Extensions;
 using NzbDrone.Core.Movies.Commands;
 using NzbDrone.Core.Messaging.Commands;
 
-namespace Radarr.Api.V2.Movies
+namespace Radarr.Api.V3.Movies
 {
-    public class MovieEditorModule : RadarrV2Module
+    public class MovieEditorModule : RadarrV3Module
     {
         private readonly IMovieService _movieService;
         private readonly IManageCommandQueue _commandQueueManager;

src/Radarr.Api.V3/Movies/MovieEditorResource.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using NzbDrone.Core.Movies;
 
-namespace Radarr.Api.V2.Movies
+namespace Radarr.Api.V3.Movies
 {
     public class MovieEditorResource
     {

src/Radarr.Api.V3/Movies/MovieFolderAsRootFolderValidator.cs

@@ -4,7 +4,7 @@ using FluentValidation.Validators;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Core.Organizer;
 
-namespace Radarr.Api.V2.Movies
+namespace Radarr.Api.V3.Movies
 {
     public class MovieFolderAsRootFolderValidator : PropertyValidator
     {

src/Radarr.Api.V3/Movies/MovieImportModule.cs

@@ -4,7 +4,7 @@ using NzbDrone.Core.Movies;
 using Radarr.Http;
 using Radarr.Http.Extensions;
 
-namespace Radarr.Api.V2.Movies
+namespace Radarr.Api.V3.Movies
 {
     public class MovieImportModule : RadarrRestModule<MovieResource>
     {

src/Radarr.Api.V3/Movies/MovieLookupModule.cs

@@ -10,7 +10,7 @@ using Radarr.Http;
 using Radarr.Http.REST;
 using NzbDrone.Core.Organizer;
 
-namespace Radarr.Api.V2.Movies
+namespace Radarr.Api.V3.Movies
 {
     public class MovieLookupModule : RadarrRestModule<MovieResource>
     {

src/Radarr.Api.V3/Movies/MovieModule.cs

@@ -16,7 +16,7 @@ using NzbDrone.SignalR;
 using Nancy;
 using Radarr.Http;
 
-namespace Radarr.Api.V2.Movies
+namespace Radarr.Api.V3.Movies
 {
     public class MovieModule : RadarrRestModuleWithSignalR<MovieResource, Movie>, 
                                 IHandle<MovieImportedEvent>,

src/Radarr.Api.V3/Movies/MovieResource.cs

@@ -4,9 +4,9 @@ using System.Linq;
 using Radarr.Http.REST;
 using NzbDrone.Core.MediaCover;
 using NzbDrone.Core.Movies;
-using Radarr.Api.V2.MovieFiles;
+using Radarr.Api.V3.MovieFiles;
 
-namespace Radarr.Api.V2.Movies
+namespace Radarr.Api.V3.Movies
 {
     public class MovieResource : RestResource
     {

src/Radarr.Api.V3/Movies/RenameMovieModule.cs

@@ -6,7 +6,7 @@ using System.Linq;
 using System.Text;
 using Radarr.Http;
 
-namespace Radarr.Api.V2.Movies
+namespace Radarr.Api.V3.Movies
 {
     public class RenameMovieModule : RadarrRestModule<RenameMovieResource>
     {

src/Radarr.Api.V3/Movies/RenameMovieResource.cs

@@ -3,7 +3,7 @@ using Radarr.Http.REST;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Radarr.Api.V2.Movies
+namespace Radarr.Api.V3.Movies
 {
     public class RenameMovieResource : RestResource
     {

src/Radarr.Api.V3/NetImport/ImportExclusionsModule.cs

@@ -4,7 +4,7 @@ using NzbDrone.Core.NetImport;
 using NzbDrone.Core.NetImport.ImportExclusions;
 using Radarr.Http;
 
-namespace Radarr.Api.V2.NetImport
+namespace Radarr.Api.V3.NetImport
 {
     public class ImportExclusionsModule : RadarrRestModule<ImportExclusionsResource>
     {

src/Radarr.Api.V3/NetImport/ImportExclusionsResource.cs

@@ -3,7 +3,7 @@ using System.Linq;
 using NzbDrone.Core.NetImport;
 using NzbDrone.Core.Movies;
 
-namespace Radarr.Api.V2.NetImport
+namespace Radarr.Api.V3.NetImport
 {
     public class ImportExclusionsResource : ProviderResource
     {

src/Radarr.Api.V3/NetImport/ListImportModule.cs

@@ -3,13 +3,13 @@ using System.Linq;
 using Nancy;
 using Nancy.Extensions;
 using Radarr.Http.Extensions;
-using Radarr.Api.V2.Movies;
+using Radarr.Api.V3.Movies;
 using NzbDrone.Core.MetadataSource;
 using NzbDrone.Core.Movies;
 
-namespace Radarr.Api.V2.NetImport
+namespace Radarr.Api.V3.NetImport
 {
-    public class ListImportModule : RadarrV2Module
+    public class ListImportModule : RadarrV3Module
     {
         private readonly IMovieService _movieService;
         private readonly ISearchForNewMovie _movieSearch;

src/Radarr.Api.V3/NetImport/NetImportModule.cs

@@ -3,7 +3,7 @@ using Radarr.Http.ClientSchema;
 using NzbDrone.Core.NetImport;
 using NzbDrone.Core.Validation.Paths;
 
-namespace Radarr.Api.V2.NetImport
+namespace Radarr.Api.V3.NetImport
 {
     public class NetImportModule : ProviderModuleBase<NetImportResource, INetImport, NetImportDefinition>
     {

src/Radarr.Api.V3/NetImport/NetImportResource.cs

@@ -1,7 +1,7 @@
 using NzbDrone.Core.Movies;
 using NzbDrone.Core.NetImport;
 
-namespace Radarr.Api.V2.NetImport
+namespace Radarr.Api.V3.NetImport
 {
     public class NetImportResource : ProviderResource
     {

src/Radarr.Api.V3/Notifications/NotificationModule.cs

@@ -1,6 +1,6 @@
 using NzbDrone.Core.Notifications;
 
-namespace Radarr.Api.V2.Notifications
+namespace Radarr.Api.V3.Notifications
 {
     public class NotificationModule : ProviderModuleBase<NotificationResource, INotification, NotificationDefinition>
     {

src/Radarr.Api.V3/Notifications/NotificationResource.cs

@@ -1,6 +1,6 @@
 using NzbDrone.Core.Notifications;
 
-namespace Radarr.Api.V2.Notifications
+namespace Radarr.Api.V3.Notifications
 {
     public class NotificationResource : ProviderResource
     {