diff --git a/.gitignore b/.gitignore index f21d5075f5..304f3c8e2a 100644 --- a/.gitignore +++ b/.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 diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 5c20c2aef8..5e36bba0dc 100644 --- a/azure-pipelines.yml +++ b/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)' diff --git a/macOS/Radarr.app/Contents/Info.plist b/macOS/Radarr.app/Contents/Info.plist index e124c9c4b7..d812a1fb97 100644 --- a/macOS/Radarr.app/Contents/Info.plist +++ b/macOS/Radarr.app/Contents/Info.plist @@ -23,11 +23,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 2.0 + 10.0.0.0 CFBundleSignature xmmd CFBundleVersion - 2.0 + 10.0.0.0 NSAppleScriptEnabled YES diff --git a/setup/radarr.iss b/setup/radarr.iss index 2095b19fa0..301c0290e9 100644 --- a/setup/radarr.iss +++ b/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') diff --git a/src/NzbDrone.Common.Test/EnvironmentInfo/BuildInfoFixture.cs b/src/NzbDrone.Common.Test/EnvironmentInfo/BuildInfoFixture.cs index 6e6f664fdc..40d2012a76 100644 --- a/src/NzbDrone.Common.Test/EnvironmentInfo/BuildInfoFixture.cs +++ b/src/NzbDrone.Common.Test/EnvironmentInfo/BuildInfoFixture.cs @@ -10,7 +10,7 @@ public class BuildInfoFixture [Test] public void should_return_version() { - BuildInfo.Version.Major.Should().BeOneOf(2, 10); + BuildInfo.Version.Major.Should().BeOneOf(3, 10); } [Test] diff --git a/src/NzbDrone.Host/MainAppContainerBuilder.cs b/src/NzbDrone.Host/MainAppContainerBuilder.cs index 6f859c398c..96307356f9 100644 --- a/src/NzbDrone.Host/MainAppContainerBuilder.cs +++ b/src/NzbDrone.Host/MainAppContainerBuilder.cs @@ -17,7 +17,7 @@ public static IContainer BuildContainer(StartupContext args) "Radarr.Core", "Radarr.Api", "Radarr.SignalR", - "Radarr.Api.V2", + "Radarr.Api.V3", "Radarr.Http" }; diff --git a/src/NzbDrone.Host/Radarr.Host.csproj b/src/NzbDrone.Host/Radarr.Host.csproj index 7544468275..267d0bc51b 100644 --- a/src/NzbDrone.Host/Radarr.Host.csproj +++ b/src/NzbDrone.Host/Radarr.Host.csproj @@ -21,7 +21,7 @@ - + diff --git a/src/NzbDrone.Integration.Test/ApiTests/BlacklistFixture.cs b/src/NzbDrone.Integration.Test/ApiTests/BlacklistFixture.cs index 7443b8cf10..34c84bd485 100644 --- a/src/NzbDrone.Integration.Test/ApiTests/BlacklistFixture.cs +++ b/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 @@ public void should_be_able_to_add_to_blacklist() { _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" diff --git a/src/NzbDrone.Integration.Test/ApiTests/CalendarFixture.cs b/src/NzbDrone.Integration.Test/ApiTests/CalendarFixture.cs index 2d66accf73..1a8815e0c7 100644 --- a/src/NzbDrone.Integration.Test/ApiTests/CalendarFixture.cs +++ b/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; diff --git a/src/NzbDrone.Integration.Test/ApiTests/DiskSpaceFixture.cs b/src/NzbDrone.Integration.Test/ApiTests/DiskSpaceFixture.cs index e43e0859e5..1fd49f6a65 100644 --- a/src/NzbDrone.Integration.Test/ApiTests/DiskSpaceFixture.cs +++ b/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 diff --git a/src/NzbDrone.Integration.Test/ApiTests/MovieEditorFixture.cs b/src/NzbDrone.Integration.Test/ApiTests/MovieEditorFixture.cs index a90932aaf7..35bb623978 100644 --- a/src/NzbDrone.Integration.Test/ApiTests/MovieEditorFixture.cs +++ b/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 diff --git a/src/NzbDrone.Integration.Test/ApiTests/ReleaseFixture.cs b/src/NzbDrone.Integration.Test/ApiTests/ReleaseFixture.cs index 151d7f3d18..d9d1f1f93e 100644 --- a/src/NzbDrone.Integration.Test/ApiTests/ReleaseFixture.cs +++ b/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; diff --git a/src/NzbDrone.Integration.Test/ApiTests/RootFolderFixture.cs b/src/NzbDrone.Integration.Test/ApiTests/RootFolderFixture.cs index 9dc73fbaea..7d0db2368b 100644 --- a/src/NzbDrone.Integration.Test/ApiTests/RootFolderFixture.cs +++ b/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 { diff --git a/src/NzbDrone.Integration.Test/Client/DownloadClientClient.cs b/src/NzbDrone.Integration.Test/Client/DownloadClientClient.cs index 74797e56d1..75236ef093 100644 --- a/src/NzbDrone.Integration.Test/Client/DownloadClientClient.cs +++ b/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 diff --git a/src/NzbDrone.Integration.Test/Client/IndexerClient.cs b/src/NzbDrone.Integration.Test/Client/IndexerClient.cs index cf231b1b9d..ce1e34eb92 100644 --- a/src/NzbDrone.Integration.Test/Client/IndexerClient.cs +++ b/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 diff --git a/src/NzbDrone.Integration.Test/Client/MovieClient.cs b/src/NzbDrone.Integration.Test/Client/MovieClient.cs index 1a57f045a0..52b508fca8 100644 --- a/src/NzbDrone.Integration.Test/Client/MovieClient.cs +++ b/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 diff --git a/src/NzbDrone.Integration.Test/Client/NotificationClient.cs b/src/NzbDrone.Integration.Test/Client/NotificationClient.cs index e3c0790eb0..9515e9d410 100644 --- a/src/NzbDrone.Integration.Test/Client/NotificationClient.cs +++ b/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 diff --git a/src/NzbDrone.Integration.Test/Client/ReleaseClient.cs b/src/NzbDrone.Integration.Test/Client/ReleaseClient.cs index 6b189961fe..f502717a3f 100644 --- a/src/NzbDrone.Integration.Test/Client/ReleaseClient.cs +++ b/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 diff --git a/src/NzbDrone.Integration.Test/HttpLogFixture.cs b/src/NzbDrone.Integration.Test/HttpLogFixture.cs index 26d0f2ea7a..d9a21da5ca 100644 --- a/src/NzbDrone.Integration.Test/HttpLogFixture.cs +++ b/src/NzbDrone.Integration.Test/HttpLogFixture.cs @@ -22,15 +22,15 @@ public void should_log_on_error() 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")); } } } \ No newline at end of file diff --git a/src/NzbDrone.Integration.Test/IntegrationTest.cs b/src/NzbDrone.Integration.Test/IntegrationTest.cs index a23b226769..843e339fae 100644 --- a/src/NzbDrone.Integration.Test/IntegrationTest.cs +++ b/src/NzbDrone.Integration.Test/IntegrationTest.cs @@ -26,7 +26,7 @@ protected override void StartTestTarget() protected override void InitializeTestTarget() { - Indexers.Post(new Radarr.Api.V2.Indexers.IndexerResource + Indexers.Post(new Radarr.Api.V3.Indexers.IndexerResource { EnableRss = false, EnableInteractiveSearch = false, diff --git a/src/NzbDrone.Integration.Test/IntegrationTestBase.cs b/src/NzbDrone.Integration.Test/IntegrationTestBase.cs index d981b0e253..30809f45f4 100644 --- a/src/NzbDrone.Integration.Test/IntegrationTestBase.cs +++ b/src/NzbDrone.Integration.Test/IntegrationTestBase.cs @@ -9,16 +9,16 @@ 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 @@ public void SmokeTestSetup() 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); diff --git a/src/NzbDrone.Integration.Test/Radarr.Integration.Test.csproj b/src/NzbDrone.Integration.Test/Radarr.Integration.Test.csproj index 914b2a59a8..68985f2f22 100644 --- a/src/NzbDrone.Integration.Test/Radarr.Integration.Test.csproj +++ b/src/NzbDrone.Integration.Test/Radarr.Integration.Test.csproj @@ -17,6 +17,6 @@ - + diff --git a/src/NzbDrone.Test.Common/NzbDroneRunner.cs b/src/NzbDrone.Test.Common/NzbDroneRunner.cs index 6336827930..b5fb409674 100644 --- a/src/NzbDrone.Test.Common/NzbDroneRunner.cs +++ b/src/NzbDrone.Test.Common/NzbDroneRunner.cs @@ -26,7 +26,7 @@ public class NzbDroneRunner 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() diff --git a/src/Radarr.Api.V2/RadarrV2FeedModule.cs b/src/Radarr.Api.V2/RadarrV2FeedModule.cs deleted file mode 100644 index 55a5374bf2..0000000000 --- a/src/Radarr.Api.V2/RadarrV2FeedModule.cs +++ /dev/null @@ -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('/')) - { - } - } -} diff --git a/src/Radarr.Api.V2/RadarrV2Module.cs b/src/Radarr.Api.V2/RadarrV2Module.cs deleted file mode 100644 index 97d522d4aa..0000000000 --- a/src/Radarr.Api.V2/RadarrV2Module.cs +++ /dev/null @@ -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('/')) - { - } - } -} diff --git a/src/Radarr.Api.V2/Blacklist/BlacklistModule.cs b/src/Radarr.Api.V3/Blacklist/BlacklistModule.cs similarity index 96% rename from src/Radarr.Api.V2/Blacklist/BlacklistModule.cs rename to src/Radarr.Api.V3/Blacklist/BlacklistModule.cs index 93dfcd4f8f..86137503d3 100644 --- a/src/Radarr.Api.V2/Blacklist/BlacklistModule.cs +++ b/src/Radarr.Api.V3/Blacklist/BlacklistModule.cs @@ -2,7 +2,7 @@ using NzbDrone.Core.Datastore; using Radarr.Http; -namespace Radarr.Api.V2.Blacklist +namespace Radarr.Api.V3.Blacklist { public class BlacklistModule : RadarrRestModule { diff --git a/src/Radarr.Api.V2/Blacklist/BlacklistResource.cs b/src/Radarr.Api.V3/Blacklist/BlacklistResource.cs similarity index 95% rename from src/Radarr.Api.V2/Blacklist/BlacklistResource.cs rename to src/Radarr.Api.V3/Blacklist/BlacklistResource.cs index 46da5032bd..eb95ccdc06 100644 --- a/src/Radarr.Api.V2/Blacklist/BlacklistResource.cs +++ b/src/Radarr.Api.V3/Blacklist/BlacklistResource.cs @@ -3,10 +3,10 @@ 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 { diff --git a/src/Radarr.Api.V2/Calendar/CalendarFeedModule.cs b/src/Radarr.Api.V3/Calendar/CalendarFeedModule.cs similarity index 98% rename from src/Radarr.Api.V2/Calendar/CalendarFeedModule.cs rename to src/Radarr.Api.V3/Calendar/CalendarFeedModule.cs index d3acabe31f..a645cc474e 100644 --- a/src/Radarr.Api.V2/Calendar/CalendarFeedModule.cs +++ b/src/Radarr.Api.V3/Calendar/CalendarFeedModule.cs @@ -11,9 +11,9 @@ 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; diff --git a/src/Radarr.Api.V2/Calendar/CalendarModule.cs b/src/Radarr.Api.V3/Calendar/CalendarModule.cs similarity index 96% rename from src/Radarr.Api.V2/Calendar/CalendarModule.cs rename to src/Radarr.Api.V3/Calendar/CalendarModule.cs index 1e98a751d6..72a06fdd0e 100644 --- a/src/Radarr.Api.V2/Calendar/CalendarModule.cs +++ b/src/Radarr.Api.V3/Calendar/CalendarModule.cs @@ -2,12 +2,12 @@ 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 { diff --git a/src/Radarr.Api.V2/Commands/CommandModule.cs b/src/Radarr.Api.V3/Commands/CommandModule.cs similarity index 99% rename from src/Radarr.Api.V2/Commands/CommandModule.cs rename to src/Radarr.Api.V3/Commands/CommandModule.cs index 53ec08d6c8..607f1b9adc 100644 --- a/src/Radarr.Api.V2/Commands/CommandModule.cs +++ b/src/Radarr.Api.V3/Commands/CommandModule.cs @@ -12,7 +12,7 @@ using Radarr.Http.Extensions; using Radarr.Http.Validation; -namespace Radarr.Api.V2.Commands +namespace Radarr.Api.V3.Commands { public class CommandModule : RadarrRestModuleWithSignalR, IHandle { diff --git a/src/Radarr.Api.V2/Commands/CommandResource.cs b/src/Radarr.Api.V3/Commands/CommandResource.cs similarity index 98% rename from src/Radarr.Api.V2/Commands/CommandResource.cs rename to src/Radarr.Api.V3/Commands/CommandResource.cs index 1df717870a..4474baa6f5 100644 --- a/src/Radarr.Api.V2/Commands/CommandResource.cs +++ b/src/Radarr.Api.V3/Commands/CommandResource.cs @@ -6,7 +6,7 @@ using NzbDrone.Core.Messaging.Commands; using Radarr.Http.REST; -namespace Radarr.Api.V2.Commands +namespace Radarr.Api.V3.Commands { public class CommandResource : RestResource { diff --git a/src/Radarr.Api.V2/Config/DownloadClientConfigModule.cs b/src/Radarr.Api.V3/Config/DownloadClientConfigModule.cs similarity index 94% rename from src/Radarr.Api.V2/Config/DownloadClientConfigModule.cs rename to src/Radarr.Api.V3/Config/DownloadClientConfigModule.cs index ca33d98f1f..87ead60fba 100644 --- a/src/Radarr.Api.V2/Config/DownloadClientConfigModule.cs +++ b/src/Radarr.Api.V3/Config/DownloadClientConfigModule.cs @@ -2,7 +2,7 @@ using NzbDrone.Core.Configuration; using NzbDrone.Core.Validation.Paths; -namespace Radarr.Api.V2.Config +namespace Radarr.Api.V3.Config { public class DownloadClientConfigModule : RadarrConfigModule { diff --git a/src/Radarr.Api.V2/Config/DownloadClientConfigResource.cs b/src/Radarr.Api.V3/Config/DownloadClientConfigResource.cs similarity index 97% rename from src/Radarr.Api.V2/Config/DownloadClientConfigResource.cs rename to src/Radarr.Api.V3/Config/DownloadClientConfigResource.cs index 70e017c140..58c7fd9052 100644 --- a/src/Radarr.Api.V2/Config/DownloadClientConfigResource.cs +++ b/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 { diff --git a/src/Radarr.Api.V2/Config/HostConfigModule.cs b/src/Radarr.Api.V3/Config/HostConfigModule.cs similarity index 99% rename from src/Radarr.Api.V2/Config/HostConfigModule.cs rename to src/Radarr.Api.V3/Config/HostConfigModule.cs index 85a81f6ae7..836be48da9 100644 --- a/src/Radarr.Api.V2/Config/HostConfigModule.cs +++ b/src/Radarr.Api.V3/Config/HostConfigModule.cs @@ -11,7 +11,7 @@ using NzbDrone.Core.Validation.Paths; using Radarr.Http; -namespace Radarr.Api.V2.Config +namespace Radarr.Api.V3.Config { public class HostConfigModule : RadarrRestModule { diff --git a/src/Radarr.Api.V2/Config/HostConfigResource.cs b/src/Radarr.Api.V3/Config/HostConfigResource.cs similarity index 99% rename from src/Radarr.Api.V2/Config/HostConfigResource.cs rename to src/Radarr.Api.V3/Config/HostConfigResource.cs index 3f8575bfae..a0b651e171 100644 --- a/src/Radarr.Api.V2/Config/HostConfigResource.cs +++ b/src/Radarr.Api.V3/Config/HostConfigResource.cs @@ -5,7 +5,7 @@ using NzbDrone.Core.Update; using NzbDrone.Common.Http.Proxy; -namespace Radarr.Api.V2.Config +namespace Radarr.Api.V3.Config { public class HostConfigResource : RestResource { diff --git a/src/Radarr.Api.V2/Config/IndexerConfigModule.cs b/src/Radarr.Api.V3/Config/IndexerConfigModule.cs similarity index 96% rename from src/Radarr.Api.V2/Config/IndexerConfigModule.cs rename to src/Radarr.Api.V3/Config/IndexerConfigModule.cs index 0e894453d1..93b8dcace1 100644 --- a/src/Radarr.Api.V2/Config/IndexerConfigModule.cs +++ b/src/Radarr.Api.V3/Config/IndexerConfigModule.cs @@ -2,7 +2,7 @@ using Radarr.Http.Validation; using NzbDrone.Core.Configuration; -namespace Radarr.Api.V2.Config +namespace Radarr.Api.V3.Config { public class IndexerConfigModule : RadarrConfigModule { diff --git a/src/Radarr.Api.V2/Config/IndexerConfigResource.cs b/src/Radarr.Api.V3/Config/IndexerConfigResource.cs similarity index 97% rename from src/Radarr.Api.V2/Config/IndexerConfigResource.cs rename to src/Radarr.Api.V3/Config/IndexerConfigResource.cs index 45949665f0..a20b2ede5e 100644 --- a/src/Radarr.Api.V2/Config/IndexerConfigResource.cs +++ b/src/Radarr.Api.V3/Config/IndexerConfigResource.cs @@ -2,7 +2,7 @@ using NzbDrone.Core.Configuration; using NzbDrone.Core.Parser; -namespace Radarr.Api.V2.Config +namespace Radarr.Api.V3.Config { public class IndexerConfigResource : RestResource { diff --git a/src/Radarr.Api.V2/Config/MediaManagementConfigModule.cs b/src/Radarr.Api.V3/Config/MediaManagementConfigModule.cs similarity index 97% rename from src/Radarr.Api.V2/Config/MediaManagementConfigModule.cs rename to src/Radarr.Api.V3/Config/MediaManagementConfigModule.cs index ce8d8f618d..70ded1d381 100644 --- a/src/Radarr.Api.V2/Config/MediaManagementConfigModule.cs +++ b/src/Radarr.Api.V3/Config/MediaManagementConfigModule.cs @@ -2,7 +2,7 @@ using NzbDrone.Core.Configuration; using NzbDrone.Core.Validation.Paths; -namespace Radarr.Api.V2.Config +namespace Radarr.Api.V3.Config { public class MediaManagementConfigModule : RadarrConfigModule { diff --git a/src/Radarr.Api.V2/Config/MediaManagementConfigResource.cs b/src/Radarr.Api.V3/Config/MediaManagementConfigResource.cs similarity index 98% rename from src/Radarr.Api.V2/Config/MediaManagementConfigResource.cs rename to src/Radarr.Api.V3/Config/MediaManagementConfigResource.cs index a6ba4433cb..ce5dcfd8f1 100644 --- a/src/Radarr.Api.V2/Config/MediaManagementConfigResource.cs +++ b/src/Radarr.Api.V3/Config/MediaManagementConfigResource.cs @@ -2,7 +2,7 @@ using NzbDrone.Core.Configuration; using NzbDrone.Core.MediaFiles; -namespace Radarr.Api.V2.Config +namespace Radarr.Api.V3.Config { public class MediaManagementConfigResource : RestResource { diff --git a/src/Radarr.Api.V2/Config/NamingConfigModule.cs b/src/Radarr.Api.V3/Config/NamingConfigModule.cs similarity index 99% rename from src/Radarr.Api.V2/Config/NamingConfigModule.cs rename to src/Radarr.Api.V3/Config/NamingConfigModule.cs index e500842b1d..306db70042 100644 --- a/src/Radarr.Api.V2/Config/NamingConfigModule.cs +++ b/src/Radarr.Api.V3/Config/NamingConfigModule.cs @@ -7,7 +7,7 @@ using Nancy.ModelBinding; using Radarr.Http; -namespace Radarr.Api.V2.Config +namespace Radarr.Api.V3.Config { public class NamingConfigModule : RadarrRestModule { diff --git a/src/Radarr.Api.V2/Config/NamingConfigResource.cs b/src/Radarr.Api.V3/Config/NamingConfigResource.cs similarity index 95% rename from src/Radarr.Api.V2/Config/NamingConfigResource.cs rename to src/Radarr.Api.V3/Config/NamingConfigResource.cs index 05e76cbfd2..477698b3a6 100644 --- a/src/Radarr.Api.V2/Config/NamingConfigResource.cs +++ b/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 { diff --git a/src/Radarr.Api.V2/Config/NamingExampleResource.cs b/src/Radarr.Api.V3/Config/NamingExampleResource.cs similarity index 98% rename from src/Radarr.Api.V2/Config/NamingExampleResource.cs rename to src/Radarr.Api.V3/Config/NamingExampleResource.cs index ee837fcce1..a871d015e6 100644 --- a/src/Radarr.Api.V2/Config/NamingExampleResource.cs +++ b/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 { diff --git a/src/Radarr.Api.V2/Config/NetImportConfigModule.cs b/src/Radarr.Api.V3/Config/NetImportConfigModule.cs similarity index 95% rename from src/Radarr.Api.V2/Config/NetImportConfigModule.cs rename to src/Radarr.Api.V3/Config/NetImportConfigModule.cs index ccf117989c..f5c3d1d8eb 100644 --- a/src/Radarr.Api.V2/Config/NetImportConfigModule.cs +++ b/src/Radarr.Api.V3/Config/NetImportConfigModule.cs @@ -2,7 +2,7 @@ using Radarr.Http.Validation; using NzbDrone.Core.Configuration; -namespace Radarr.Api.V2.Config +namespace Radarr.Api.V3.Config { public class NetImportConfigModule : RadarrConfigModule { diff --git a/src/Radarr.Api.V2/Config/NetImportConfigResource.cs b/src/Radarr.Api.V3/Config/NetImportConfigResource.cs similarity index 97% rename from src/Radarr.Api.V2/Config/NetImportConfigResource.cs rename to src/Radarr.Api.V3/Config/NetImportConfigResource.cs index 81c423996b..3b78755ab4 100644 --- a/src/Radarr.Api.V2/Config/NetImportConfigResource.cs +++ b/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 { diff --git a/src/Radarr.Api.V2/Config/RadarrConfigModule.cs b/src/Radarr.Api.V3/Config/RadarrConfigModule.cs similarity index 98% rename from src/Radarr.Api.V2/Config/RadarrConfigModule.cs rename to src/Radarr.Api.V3/Config/RadarrConfigModule.cs index 4523b0df0d..3f37ec9d09 100644 --- a/src/Radarr.Api.V2/Config/RadarrConfigModule.cs +++ b/src/Radarr.Api.V3/Config/RadarrConfigModule.cs @@ -4,7 +4,7 @@ using Radarr.Http.REST; using NzbDrone.Core.Configuration; -namespace Radarr.Api.V2.Config +namespace Radarr.Api.V3.Config { public abstract class RadarrConfigModule : RadarrRestModule where TResource : RestResource, new() { diff --git a/src/Radarr.Api.V2/Config/UiConfigModule.cs b/src/Radarr.Api.V3/Config/UiConfigModule.cs similarity index 92% rename from src/Radarr.Api.V2/Config/UiConfigModule.cs rename to src/Radarr.Api.V3/Config/UiConfigModule.cs index a38a04b0af..5c3953b76d 100644 --- a/src/Radarr.Api.V2/Config/UiConfigModule.cs +++ b/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 { diff --git a/src/Radarr.Api.V2/Config/UiConfigResource.cs b/src/Radarr.Api.V3/Config/UiConfigResource.cs similarity index 97% rename from src/Radarr.Api.V2/Config/UiConfigResource.cs rename to src/Radarr.Api.V3/Config/UiConfigResource.cs index d125a55567..f9bd8a51df 100644 --- a/src/Radarr.Api.V2/Config/UiConfigResource.cs +++ b/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 { diff --git a/src/Radarr.Api.V2/CustomFilters/CustomFilterModule.cs b/src/Radarr.Api.V3/CustomFilters/CustomFilterModule.cs similarity index 97% rename from src/Radarr.Api.V2/CustomFilters/CustomFilterModule.cs rename to src/Radarr.Api.V3/CustomFilters/CustomFilterModule.cs index abf78f24e5..679ec70615 100644 --- a/src/Radarr.Api.V2/CustomFilters/CustomFilterModule.cs +++ b/src/Radarr.Api.V3/CustomFilters/CustomFilterModule.cs @@ -2,7 +2,7 @@ using NzbDrone.Core.CustomFilters; using Radarr.Http; -namespace Radarr.Api.V2.CustomFilters +namespace Radarr.Api.V3.CustomFilters { public class CustomFilterModule : RadarrRestModule { diff --git a/src/Radarr.Api.V2/CustomFilters/CustomFilterResource.cs b/src/Radarr.Api.V3/CustomFilters/CustomFilterResource.cs similarity index 97% rename from src/Radarr.Api.V2/CustomFilters/CustomFilterResource.cs rename to src/Radarr.Api.V3/CustomFilters/CustomFilterResource.cs index 8b7c74d444..66e6e53b8a 100644 --- a/src/Radarr.Api.V2/CustomFilters/CustomFilterResource.cs +++ b/src/Radarr.Api.V3/CustomFilters/CustomFilterResource.cs @@ -4,7 +4,7 @@ using NzbDrone.Core.CustomFilters; using Radarr.Http.REST; -namespace Radarr.Api.V2.CustomFilters +namespace Radarr.Api.V3.CustomFilters { public class CustomFilterResource : RestResource { diff --git a/src/Radarr.Api.V2/DiskSpace/DiskSpaceModule.cs b/src/Radarr.Api.V3/DiskSpace/DiskSpaceModule.cs similarity index 94% rename from src/Radarr.Api.V2/DiskSpace/DiskSpaceModule.cs rename to src/Radarr.Api.V3/DiskSpace/DiskSpaceModule.cs index 212f7e6612..00be647ff5 100644 --- a/src/Radarr.Api.V2/DiskSpace/DiskSpaceModule.cs +++ b/src/Radarr.Api.V3/DiskSpace/DiskSpaceModule.cs @@ -2,7 +2,7 @@ using NzbDrone.Core.DiskSpace; using Radarr.Http; -namespace Radarr.Api.V2.DiskSpace +namespace Radarr.Api.V3.DiskSpace { public class DiskSpaceModule : RadarrRestModule { diff --git a/src/Radarr.Api.V2/DiskSpace/DiskSpaceResource.cs b/src/Radarr.Api.V3/DiskSpace/DiskSpaceResource.cs similarity index 95% rename from src/Radarr.Api.V2/DiskSpace/DiskSpaceResource.cs rename to src/Radarr.Api.V3/DiskSpace/DiskSpaceResource.cs index 8fd963a92e..e56e571a43 100644 --- a/src/Radarr.Api.V2/DiskSpace/DiskSpaceResource.cs +++ b/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 { diff --git a/src/Radarr.Api.V2/DownloadClient/DownloadClientModule.cs b/src/Radarr.Api.V3/DownloadClient/DownloadClientModule.cs similarity index 94% rename from src/Radarr.Api.V2/DownloadClient/DownloadClientModule.cs rename to src/Radarr.Api.V3/DownloadClient/DownloadClientModule.cs index a54bc622d5..d187e5f3ac 100644 --- a/src/Radarr.Api.V2/DownloadClient/DownloadClientModule.cs +++ b/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 { diff --git a/src/Radarr.Api.V2/DownloadClient/DownloadClientResource.cs b/src/Radarr.Api.V3/DownloadClient/DownloadClientResource.cs similarity index 96% rename from src/Radarr.Api.V2/DownloadClient/DownloadClientResource.cs rename to src/Radarr.Api.V3/DownloadClient/DownloadClientResource.cs index a78deea579..6282f8a3af 100644 --- a/src/Radarr.Api.V2/DownloadClient/DownloadClientResource.cs +++ b/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 { diff --git a/src/Radarr.Api.V2/FileSystem/FileSystemModule.cs b/src/Radarr.Api.V3/FileSystem/FileSystemModule.cs similarity index 96% rename from src/Radarr.Api.V2/FileSystem/FileSystemModule.cs rename to src/Radarr.Api.V3/FileSystem/FileSystemModule.cs index 6770d3b9a3..e04c9177d6 100644 --- a/src/Radarr.Api.V2/FileSystem/FileSystemModule.cs +++ b/src/Radarr.Api.V3/FileSystem/FileSystemModule.cs @@ -7,9 +7,9 @@ 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; diff --git a/src/Radarr.Api.V2/Health/HealthModule.cs b/src/Radarr.Api.V3/Health/HealthModule.cs similarity index 96% rename from src/Radarr.Api.V2/Health/HealthModule.cs rename to src/Radarr.Api.V3/Health/HealthModule.cs index 0b2f738756..4657d6dfde 100644 --- a/src/Radarr.Api.V2/Health/HealthModule.cs +++ b/src/Radarr.Api.V3/Health/HealthModule.cs @@ -5,7 +5,7 @@ using NzbDrone.SignalR; using Radarr.Http; -namespace Radarr.Api.V2.Health +namespace Radarr.Api.V3.Health { public class HealthModule : RadarrRestModuleWithSignalR, IHandle diff --git a/src/Radarr.Api.V2/Health/HealthResource.cs b/src/Radarr.Api.V3/Health/HealthResource.cs similarity index 97% rename from src/Radarr.Api.V2/Health/HealthResource.cs rename to src/Radarr.Api.V3/Health/HealthResource.cs index 70920a9565..090d30cf36 100644 --- a/src/Radarr.Api.V2/Health/HealthResource.cs +++ b/src/Radarr.Api.V3/Health/HealthResource.cs @@ -4,7 +4,7 @@ using NzbDrone.Core.HealthCheck; using Radarr.Http.REST; -namespace Radarr.Api.V2.Health +namespace Radarr.Api.V3.Health { public class HealthResource : RestResource { diff --git a/src/Radarr.Api.V2/History/HistoryModule.cs b/src/Radarr.Api.V3/History/HistoryModule.cs similarity index 98% rename from src/Radarr.Api.V2/History/HistoryModule.cs rename to src/Radarr.Api.V3/History/HistoryModule.cs index 8b188603ec..89d2c16f04 100644 --- a/src/Radarr.Api.V2/History/HistoryModule.cs +++ b/src/Radarr.Api.V3/History/HistoryModule.cs @@ -6,12 +6,12 @@ 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 { diff --git a/src/Radarr.Api.V2/History/HistoryResource.cs b/src/Radarr.Api.V3/History/HistoryResource.cs similarity index 96% rename from src/Radarr.Api.V2/History/HistoryResource.cs rename to src/Radarr.Api.V3/History/HistoryResource.cs index 4114c58267..7eaf65168f 100644 --- a/src/Radarr.Api.V2/History/HistoryResource.cs +++ b/src/Radarr.Api.V3/History/HistoryResource.cs @@ -3,10 +3,10 @@ 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 { diff --git a/src/Radarr.Api.V2/Indexers/IndexerModule.cs b/src/Radarr.Api.V3/Indexers/IndexerModule.cs similarity index 94% rename from src/Radarr.Api.V2/Indexers/IndexerModule.cs rename to src/Radarr.Api.V3/Indexers/IndexerModule.cs index 2af115a0e1..5252de7e35 100644 --- a/src/Radarr.Api.V2/Indexers/IndexerModule.cs +++ b/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 { diff --git a/src/Radarr.Api.V2/Indexers/IndexerResource.cs b/src/Radarr.Api.V3/Indexers/IndexerResource.cs similarity index 97% rename from src/Radarr.Api.V2/Indexers/IndexerResource.cs rename to src/Radarr.Api.V3/Indexers/IndexerResource.cs index 0dcb324386..f53dbcfdc7 100644 --- a/src/Radarr.Api.V2/Indexers/IndexerResource.cs +++ b/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 { diff --git a/src/Radarr.Api.V2/Indexers/ReleaseModule.cs b/src/Radarr.Api.V3/Indexers/ReleaseModule.cs similarity index 99% rename from src/Radarr.Api.V2/Indexers/ReleaseModule.cs rename to src/Radarr.Api.V3/Indexers/ReleaseModule.cs index 63c141f9eb..4ec69fb9ec 100644 --- a/src/Radarr.Api.V2/Indexers/ReleaseModule.cs +++ b/src/Radarr.Api.V3/Indexers/ReleaseModule.cs @@ -15,7 +15,7 @@ using Radarr.Http.Extensions; using HttpStatusCode = System.Net.HttpStatusCode; -namespace Radarr.Api.V2.Indexers +namespace Radarr.Api.V3.Indexers { public class ReleaseModule : ReleaseModuleBase { diff --git a/src/Radarr.Api.V2/Indexers/ReleaseModuleBase.cs b/src/Radarr.Api.V3/Indexers/ReleaseModuleBase.cs similarity index 97% rename from src/Radarr.Api.V2/Indexers/ReleaseModuleBase.cs rename to src/Radarr.Api.V3/Indexers/ReleaseModuleBase.cs index ba629f8f4c..e37307f144 100644 --- a/src/Radarr.Api.V2/Indexers/ReleaseModuleBase.cs +++ b/src/Radarr.Api.V3/Indexers/ReleaseModuleBase.cs @@ -2,7 +2,7 @@ using NzbDrone.Core.DecisionEngine; using Radarr.Http; -namespace Radarr.Api.V2.Indexers +namespace Radarr.Api.V3.Indexers { public abstract class ReleaseModuleBase : RadarrRestModule { diff --git a/src/Radarr.Api.V2/Indexers/ReleasePushModule.cs b/src/Radarr.Api.V3/Indexers/ReleasePushModule.cs similarity index 99% rename from src/Radarr.Api.V2/Indexers/ReleasePushModule.cs rename to src/Radarr.Api.V3/Indexers/ReleasePushModule.cs index 00ec73b38b..697f8c0b9c 100644 --- a/src/Radarr.Api.V2/Indexers/ReleasePushModule.cs +++ b/src/Radarr.Api.V3/Indexers/ReleasePushModule.cs @@ -12,7 +12,7 @@ using NzbDrone.Core.Parser.Model; using Radarr.Http.Extensions; -namespace Radarr.Api.V2.Indexers +namespace Radarr.Api.V3.Indexers { class ReleasePushModule : ReleaseModuleBase { diff --git a/src/Radarr.Api.V2/Indexers/ReleaseResource.cs b/src/Radarr.Api.V3/Indexers/ReleaseResource.cs similarity index 99% rename from src/Radarr.Api.V2/Indexers/ReleaseResource.cs rename to src/Radarr.Api.V3/Indexers/ReleaseResource.cs index 19700c768b..3f2afc65bd 100644 --- a/src/Radarr.Api.V2/Indexers/ReleaseResource.cs +++ b/src/Radarr.Api.V3/Indexers/ReleaseResource.cs @@ -9,7 +9,7 @@ using NzbDrone.Core.Qualities; using Radarr.Http.REST; -namespace Radarr.Api.V2.Indexers +namespace Radarr.Api.V3.Indexers { public class ReleaseResource : RestResource { diff --git a/src/Radarr.Api.V2/Logs/LogFileModule.cs b/src/Radarr.Api.V3/Logs/LogFileModule.cs similarity index 94% rename from src/Radarr.Api.V2/Logs/LogFileModule.cs rename to src/Radarr.Api.V3/Logs/LogFileModule.cs index 782e9cbeea..f902718ce0 100644 --- a/src/Radarr.Api.V2/Logs/LogFileModule.cs +++ b/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 @@ protected override string DownloadUrlRoot } } -} +} \ No newline at end of file diff --git a/src/Radarr.Api.V2/Logs/LogFileModuleBase.cs b/src/Radarr.Api.V3/Logs/LogFileModuleBase.cs similarity index 94% rename from src/Radarr.Api.V2/Logs/LogFileModuleBase.cs rename to src/Radarr.Api.V3/Logs/LogFileModuleBase.cs index d5ac05af0a..f4939e8751 100644 --- a/src/Radarr.Api.V2/Logs/LogFileModuleBase.cs +++ b/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.Core.Configuration; using Radarr.Http; -namespace Radarr.Api.V2.Logs +namespace Radarr.Api.V3.Logs { public abstract class LogFileModuleBase : RadarrRestModule { @@ -45,7 +45,7 @@ private List GetLogFilesResponse() 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 @@ private object GetLogFileResponse(string filename) protected abstract string DownloadUrlRoot { get; } } -} +} \ No newline at end of file diff --git a/src/Radarr.Api.V2/Logs/LogFileResource.cs b/src/Radarr.Api.V3/Logs/LogFileResource.cs similarity index 85% rename from src/Radarr.Api.V2/Logs/LogFileResource.cs rename to src/Radarr.Api.V3/Logs/LogFileResource.cs index 215b56f8c3..a5526b9793 100644 --- a/src/Radarr.Api.V2/Logs/LogFileResource.cs +++ b/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 { diff --git a/src/Radarr.Api.V2/Logs/LogModule.cs b/src/Radarr.Api.V3/Logs/LogModule.cs similarity index 98% rename from src/Radarr.Api.V2/Logs/LogModule.cs rename to src/Radarr.Api.V3/Logs/LogModule.cs index 64f77e4a76..6aa81383e1 100644 --- a/src/Radarr.Api.V2/Logs/LogModule.cs +++ b/src/Radarr.Api.V3/Logs/LogModule.cs @@ -2,7 +2,7 @@ using NzbDrone.Core.Instrumentation; using Radarr.Http; -namespace Radarr.Api.V2.Logs +namespace Radarr.Api.V3.Logs { public class LogModule : RadarrRestModule { diff --git a/src/Radarr.Api.V2/Logs/LogResource.cs b/src/Radarr.Api.V3/Logs/LogResource.cs similarity index 97% rename from src/Radarr.Api.V2/Logs/LogResource.cs rename to src/Radarr.Api.V3/Logs/LogResource.cs index 926d9ec5ef..42721c2e35 100644 --- a/src/Radarr.Api.V2/Logs/LogResource.cs +++ b/src/Radarr.Api.V3/Logs/LogResource.cs @@ -2,7 +2,7 @@ using NzbDrone.Core.Instrumentation; using Radarr.Http.REST; -namespace Radarr.Api.V2.Logs +namespace Radarr.Api.V3.Logs { public class LogResource : RestResource { diff --git a/src/Radarr.Api.V2/Logs/UpdateLogFileModule.cs b/src/Radarr.Api.V3/Logs/UpdateLogFileModule.cs similarity index 96% rename from src/Radarr.Api.V2/Logs/UpdateLogFileModule.cs rename to src/Radarr.Api.V3/Logs/UpdateLogFileModule.cs index 1d07de3f7b..5301f153df 100644 --- a/src/Radarr.Api.V2/Logs/UpdateLogFileModule.cs +++ b/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.Extensions; using NzbDrone.Core.Configuration; -namespace Radarr.Api.V2.Logs +namespace Radarr.Api.V3.Logs { public class UpdateLogFileModule : LogFileModuleBase { diff --git a/src/Radarr.Api.V2/ManualImport/ManualImportModule.cs b/src/Radarr.Api.V3/ManualImport/ManualImportModule.cs similarity index 97% rename from src/Radarr.Api.V2/ManualImport/ManualImportModule.cs rename to src/Radarr.Api.V3/ManualImport/ManualImportModule.cs index 1c66d3135c..ec0a6fb036 100644 --- a/src/Radarr.Api.V2/ManualImport/ManualImportModule.cs +++ b/src/Radarr.Api.V3/ManualImport/ManualImportModule.cs @@ -5,7 +5,7 @@ using Radarr.Http; using Radarr.Http.Extensions; -namespace Radarr.Api.V2.ManualImport +namespace Radarr.Api.V3.ManualImport { public class ManualImportModule : RadarrRestModule { diff --git a/src/Radarr.Api.V2/ManualImport/ManualImportResource.cs b/src/Radarr.Api.V3/ManualImport/ManualImportResource.cs similarity index 96% rename from src/Radarr.Api.V2/ManualImport/ManualImportResource.cs rename to src/Radarr.Api.V3/ManualImport/ManualImportResource.cs index 06b000734d..bed3c6fd63 100644 --- a/src/Radarr.Api.V2/ManualImport/ManualImportResource.cs +++ b/src/Radarr.Api.V3/ManualImport/ManualImportResource.cs @@ -5,10 +5,10 @@ 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 { diff --git a/src/Radarr.Api.V2/Metadata/MetadataModule.cs b/src/Radarr.Api.V3/Metadata/MetadataModule.cs similarity index 94% rename from src/Radarr.Api.V2/Metadata/MetadataModule.cs rename to src/Radarr.Api.V3/Metadata/MetadataModule.cs index c75db5c32c..252633309e 100644 --- a/src/Radarr.Api.V2/Metadata/MetadataModule.cs +++ b/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 { diff --git a/src/Radarr.Api.V2/Metadata/MetadataResource.cs b/src/Radarr.Api.V3/Metadata/MetadataResource.cs similarity index 96% rename from src/Radarr.Api.V2/Metadata/MetadataResource.cs rename to src/Radarr.Api.V3/Metadata/MetadataResource.cs index 77f138b3d5..3dcf83e600 100644 --- a/src/Radarr.Api.V2/Metadata/MetadataResource.cs +++ b/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 { diff --git a/src/Radarr.Api.V2/MovieFiles/MediaInfoResource.cs b/src/Radarr.Api.V3/MovieFiles/MediaInfoResource.cs similarity index 98% rename from src/Radarr.Api.V2/MovieFiles/MediaInfoResource.cs rename to src/Radarr.Api.V3/MovieFiles/MediaInfoResource.cs index e3a58227c5..dec201cb7f 100644 --- a/src/Radarr.Api.V2/MovieFiles/MediaInfoResource.cs +++ b/src/Radarr.Api.V3/MovieFiles/MediaInfoResource.cs @@ -3,7 +3,7 @@ using NzbDrone.Core.MediaFiles.MediaInfo; using Radarr.Http.REST; -namespace Radarr.Api.V2.MovieFiles +namespace Radarr.Api.V3.MovieFiles { public class MediaInfoResource : RestResource { diff --git a/src/Radarr.Api.V2/MovieFiles/MovieFileListResource.cs b/src/Radarr.Api.V3/MovieFiles/MovieFileListResource.cs similarity index 89% rename from src/Radarr.Api.V2/MovieFiles/MovieFileListResource.cs rename to src/Radarr.Api.V3/MovieFiles/MovieFileListResource.cs index 7ced9d024b..1016ed453d 100644 --- a/src/Radarr.Api.V2/MovieFiles/MovieFileListResource.cs +++ b/src/Radarr.Api.V3/MovieFiles/MovieFileListResource.cs @@ -2,7 +2,7 @@ using NzbDrone.Core.Languages; using NzbDrone.Core.Qualities; -namespace Radarr.Api.V2.MovieFiles +namespace Radarr.Api.V3.MovieFiles { public class MovieFileListResource { diff --git a/src/Radarr.Api.V2/MovieFiles/MovieFileModule.cs b/src/Radarr.Api.V3/MovieFiles/MovieFileModule.cs similarity index 99% rename from src/Radarr.Api.V2/MovieFiles/MovieFileModule.cs rename to src/Radarr.Api.V3/MovieFiles/MovieFileModule.cs index 4c505ecd25..7ecec61c6a 100644 --- a/src/Radarr.Api.V2/MovieFiles/MovieFileModule.cs +++ b/src/Radarr.Api.V3/MovieFiles/MovieFileModule.cs @@ -16,7 +16,7 @@ using Radarr.Http.Extensions; using BadRequestException = Radarr.Http.REST.BadRequestException; -namespace Radarr.Api.V2.MovieFiles +namespace Radarr.Api.V3.MovieFiles { public class MovieFileModule : RadarrRestModuleWithSignalR, IHandle, diff --git a/src/Radarr.Api.V2/MovieFiles/MovieFileResource.cs b/src/Radarr.Api.V3/MovieFiles/MovieFileResource.cs similarity index 98% rename from src/Radarr.Api.V2/MovieFiles/MovieFileResource.cs rename to src/Radarr.Api.V3/MovieFiles/MovieFileResource.cs index c939207b10..2f266671a0 100644 --- a/src/Radarr.Api.V2/MovieFiles/MovieFileResource.cs +++ b/src/Radarr.Api.V3/MovieFiles/MovieFileResource.cs @@ -7,7 +7,7 @@ using NzbDrone.Core.Qualities; using Radarr.Http.REST; -namespace Radarr.Api.V2.MovieFiles +namespace Radarr.Api.V3.MovieFiles { public class MovieFileResource : RestResource { diff --git a/src/Radarr.Api.V2/Movies/AlternativeTitleModule.cs b/src/Radarr.Api.V3/Movies/AlternativeTitleModule.cs similarity index 98% rename from src/Radarr.Api.V2/Movies/AlternativeTitleModule.cs rename to src/Radarr.Api.V3/Movies/AlternativeTitleModule.cs index 4a6fa60a69..ecd6049d09 100644 --- a/src/Radarr.Api.V2/Movies/AlternativeTitleModule.cs +++ b/src/Radarr.Api.V3/Movies/AlternativeTitleModule.cs @@ -7,7 +7,7 @@ using NzbDrone.Core.Movies.Events; using Radarr.Http; -namespace Radarr.Api.V2.Movies +namespace Radarr.Api.V3.Movies { public class AlternativeTitleModule : RadarrRestModule { diff --git a/src/Radarr.Api.V2/Movies/AlternativeTitleResource.cs b/src/Radarr.Api.V3/Movies/AlternativeTitleResource.cs similarity index 98% rename from src/Radarr.Api.V2/Movies/AlternativeTitleResource.cs rename to src/Radarr.Api.V3/Movies/AlternativeTitleResource.cs index 8493f5336f..d2b597c0cb 100644 --- a/src/Radarr.Api.V2/Movies/AlternativeTitleResource.cs +++ b/src/Radarr.Api.V3/Movies/AlternativeTitleResource.cs @@ -5,7 +5,7 @@ using NzbDrone.Core.Movies.AlternativeTitles; using NzbDrone.Core.Languages; -namespace Radarr.Api.V2.Movies +namespace Radarr.Api.V3.Movies { public class AlternativeTitleResource : RestResource { diff --git a/src/Radarr.Api.V2/Movies/AlternativeYearModule.cs b/src/Radarr.Api.V3/Movies/AlternativeYearModule.cs similarity index 98% rename from src/Radarr.Api.V2/Movies/AlternativeYearModule.cs rename to src/Radarr.Api.V3/Movies/AlternativeYearModule.cs index 0433d24e6e..df113f4a03 100644 --- a/src/Radarr.Api.V2/Movies/AlternativeYearModule.cs +++ b/src/Radarr.Api.V3/Movies/AlternativeYearModule.cs @@ -6,7 +6,7 @@ using NzbDrone.Core.Movies.Events; using Radarr.Http; -namespace Radarr.Api.V2.Movies +namespace Radarr.Api.V3.Movies { public class AlternativeYearModule : RadarrRestModule { diff --git a/src/Radarr.Api.V2/Movies/AlternativeYearResource.cs b/src/Radarr.Api.V3/Movies/AlternativeYearResource.cs similarity index 98% rename from src/Radarr.Api.V2/Movies/AlternativeYearResource.cs rename to src/Radarr.Api.V3/Movies/AlternativeYearResource.cs index 8bfd588822..8e80e78f8d 100644 --- a/src/Radarr.Api.V2/Movies/AlternativeYearResource.cs +++ b/src/Radarr.Api.V3/Movies/AlternativeYearResource.cs @@ -9,7 +9,7 @@ using NzbDrone.Core.Movies.AlternativeTitles; using NzbDrone.Core.Parser; -namespace Radarr.Api.V2.Movies +namespace Radarr.Api.V3.Movies { public class AlternativeYearResource : RestResource { diff --git a/src/Radarr.Api.V2/Movies/FetchMovieListModule.cs b/src/Radarr.Api.V3/Movies/FetchMovieListModule.cs similarity index 98% rename from src/Radarr.Api.V2/Movies/FetchMovieListModule.cs rename to src/Radarr.Api.V3/Movies/FetchMovieListModule.cs index f96de05ee1..01193dc95d 100644 --- a/src/Radarr.Api.V2/Movies/FetchMovieListModule.cs +++ b/src/Radarr.Api.V3/Movies/FetchMovieListModule.cs @@ -8,7 +8,7 @@ using Radarr.Http; using Radarr.Http.Extensions; -namespace Radarr.Api.V2.Movies +namespace Radarr.Api.V3.Movies { public class FetchMovieListModule : RadarrRestModule { diff --git a/src/Radarr.Api.V2/Movies/MovieDiscoverModule.cs b/src/Radarr.Api.V3/Movies/MovieDiscoverModule.cs similarity index 97% rename from src/Radarr.Api.V2/Movies/MovieDiscoverModule.cs rename to src/Radarr.Api.V3/Movies/MovieDiscoverModule.cs index a0b3effe9c..e3de85f9cb 100644 --- a/src/Radarr.Api.V2/Movies/MovieDiscoverModule.cs +++ b/src/Radarr.Api.V3/Movies/MovieDiscoverModule.cs @@ -5,10 +5,10 @@ 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 { diff --git a/src/Radarr.Api.V2/Movies/MovieEditorModule.cs b/src/Radarr.Api.V3/Movies/MovieEditorModule.cs similarity index 97% rename from src/Radarr.Api.V2/Movies/MovieEditorModule.cs rename to src/Radarr.Api.V3/Movies/MovieEditorModule.cs index 7bb86d81f0..d9c460deba 100644 --- a/src/Radarr.Api.V2/Movies/MovieEditorModule.cs +++ b/src/Radarr.Api.V3/Movies/MovieEditorModule.cs @@ -7,9 +7,9 @@ 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; diff --git a/src/Radarr.Api.V2/Movies/MovieEditorResource.cs b/src/Radarr.Api.V3/Movies/MovieEditorResource.cs similarity index 95% rename from src/Radarr.Api.V2/Movies/MovieEditorResource.cs rename to src/Radarr.Api.V3/Movies/MovieEditorResource.cs index 14d6684489..57c25f579d 100644 --- a/src/Radarr.Api.V2/Movies/MovieEditorResource.cs +++ b/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 { diff --git a/src/Radarr.Api.V2/Movies/MovieFolderAsRootFolderValidator.cs b/src/Radarr.Api.V3/Movies/MovieFolderAsRootFolderValidator.cs similarity index 97% rename from src/Radarr.Api.V2/Movies/MovieFolderAsRootFolderValidator.cs rename to src/Radarr.Api.V3/Movies/MovieFolderAsRootFolderValidator.cs index 6ce918f0bc..cf79e834c0 100644 --- a/src/Radarr.Api.V2/Movies/MovieFolderAsRootFolderValidator.cs +++ b/src/Radarr.Api.V3/Movies/MovieFolderAsRootFolderValidator.cs @@ -4,7 +4,7 @@ using NzbDrone.Common.Extensions; using NzbDrone.Core.Organizer; -namespace Radarr.Api.V2.Movies +namespace Radarr.Api.V3.Movies { public class MovieFolderAsRootFolderValidator : PropertyValidator { diff --git a/src/Radarr.Api.V2/Movies/MovieImportModule.cs b/src/Radarr.Api.V3/Movies/MovieImportModule.cs similarity index 95% rename from src/Radarr.Api.V2/Movies/MovieImportModule.cs rename to src/Radarr.Api.V3/Movies/MovieImportModule.cs index a003a3a73e..1886f5bc58 100644 --- a/src/Radarr.Api.V2/Movies/MovieImportModule.cs +++ b/src/Radarr.Api.V3/Movies/MovieImportModule.cs @@ -4,7 +4,7 @@ using Radarr.Http; using Radarr.Http.Extensions; -namespace Radarr.Api.V2.Movies +namespace Radarr.Api.V3.Movies { public class MovieImportModule : RadarrRestModule { diff --git a/src/Radarr.Api.V2/Movies/MovieLookupModule.cs b/src/Radarr.Api.V3/Movies/MovieLookupModule.cs similarity index 98% rename from src/Radarr.Api.V2/Movies/MovieLookupModule.cs rename to src/Radarr.Api.V3/Movies/MovieLookupModule.cs index 206cc8e517..7926070070 100644 --- a/src/Radarr.Api.V2/Movies/MovieLookupModule.cs +++ b/src/Radarr.Api.V3/Movies/MovieLookupModule.cs @@ -10,7 +10,7 @@ using Radarr.Http.REST; using NzbDrone.Core.Organizer; -namespace Radarr.Api.V2.Movies +namespace Radarr.Api.V3.Movies { public class MovieLookupModule : RadarrRestModule { diff --git a/src/Radarr.Api.V2/Movies/MovieModule.cs b/src/Radarr.Api.V3/Movies/MovieModule.cs similarity index 99% rename from src/Radarr.Api.V2/Movies/MovieModule.cs rename to src/Radarr.Api.V3/Movies/MovieModule.cs index 14a35caed0..4ce299f191 100644 --- a/src/Radarr.Api.V2/Movies/MovieModule.cs +++ b/src/Radarr.Api.V3/Movies/MovieModule.cs @@ -16,7 +16,7 @@ using Nancy; using Radarr.Http; -namespace Radarr.Api.V2.Movies +namespace Radarr.Api.V3.Movies { public class MovieModule : RadarrRestModuleWithSignalR, IHandle, diff --git a/src/Radarr.Api.V2/Movies/MovieResource.cs b/src/Radarr.Api.V3/Movies/MovieResource.cs similarity index 99% rename from src/Radarr.Api.V2/Movies/MovieResource.cs rename to src/Radarr.Api.V3/Movies/MovieResource.cs index 0149bab11f..7212d42f0d 100644 --- a/src/Radarr.Api.V2/Movies/MovieResource.cs +++ b/src/Radarr.Api.V3/Movies/MovieResource.cs @@ -4,9 +4,9 @@ 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 { diff --git a/src/Radarr.Api.V2/Movies/RenameMovieModule.cs b/src/Radarr.Api.V3/Movies/RenameMovieModule.cs similarity index 96% rename from src/Radarr.Api.V2/Movies/RenameMovieModule.cs rename to src/Radarr.Api.V3/Movies/RenameMovieModule.cs index bda58e322a..9cab45ec47 100644 --- a/src/Radarr.Api.V2/Movies/RenameMovieModule.cs +++ b/src/Radarr.Api.V3/Movies/RenameMovieModule.cs @@ -6,7 +6,7 @@ using System.Text; using Radarr.Http; -namespace Radarr.Api.V2.Movies +namespace Radarr.Api.V3.Movies { public class RenameMovieModule : RadarrRestModule { diff --git a/src/Radarr.Api.V2/Movies/RenameMovieResource.cs b/src/Radarr.Api.V3/Movies/RenameMovieResource.cs similarity index 97% rename from src/Radarr.Api.V2/Movies/RenameMovieResource.cs rename to src/Radarr.Api.V3/Movies/RenameMovieResource.cs index 70afd72483..c88fb701e5 100644 --- a/src/Radarr.Api.V2/Movies/RenameMovieResource.cs +++ b/src/Radarr.Api.V3/Movies/RenameMovieResource.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; -namespace Radarr.Api.V2.Movies +namespace Radarr.Api.V3.Movies { public class RenameMovieResource : RestResource { diff --git a/src/Radarr.Api.V2/NetImport/ImportExclusionsModule.cs b/src/Radarr.Api.V3/NetImport/ImportExclusionsModule.cs similarity index 97% rename from src/Radarr.Api.V2/NetImport/ImportExclusionsModule.cs rename to src/Radarr.Api.V3/NetImport/ImportExclusionsModule.cs index c3a42696d3..7353c51c3a 100644 --- a/src/Radarr.Api.V2/NetImport/ImportExclusionsModule.cs +++ b/src/Radarr.Api.V3/NetImport/ImportExclusionsModule.cs @@ -4,7 +4,7 @@ using NzbDrone.Core.NetImport.ImportExclusions; using Radarr.Http; -namespace Radarr.Api.V2.NetImport +namespace Radarr.Api.V3.NetImport { public class ImportExclusionsModule : RadarrRestModule { diff --git a/src/Radarr.Api.V2/NetImport/ImportExclusionsResource.cs b/src/Radarr.Api.V3/NetImport/ImportExclusionsResource.cs similarity index 97% rename from src/Radarr.Api.V2/NetImport/ImportExclusionsResource.cs rename to src/Radarr.Api.V3/NetImport/ImportExclusionsResource.cs index 0cb5581d59..88889adbb6 100644 --- a/src/Radarr.Api.V2/NetImport/ImportExclusionsResource.cs +++ b/src/Radarr.Api.V3/NetImport/ImportExclusionsResource.cs @@ -3,7 +3,7 @@ using NzbDrone.Core.NetImport; using NzbDrone.Core.Movies; -namespace Radarr.Api.V2.NetImport +namespace Radarr.Api.V3.NetImport { public class ImportExclusionsResource : ProviderResource { diff --git a/src/Radarr.Api.V2/NetImport/ListImportModule.cs b/src/Radarr.Api.V3/NetImport/ListImportModule.cs similarity index 89% rename from src/Radarr.Api.V2/NetImport/ListImportModule.cs rename to src/Radarr.Api.V3/NetImport/ListImportModule.cs index ebd5c17883..b28a4ca297 100644 --- a/src/Radarr.Api.V2/NetImport/ListImportModule.cs +++ b/src/Radarr.Api.V3/NetImport/ListImportModule.cs @@ -3,13 +3,13 @@ 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; diff --git a/src/Radarr.Api.V2/NetImport/NetImportModule.cs b/src/Radarr.Api.V3/NetImport/NetImportModule.cs similarity index 96% rename from src/Radarr.Api.V2/NetImport/NetImportModule.cs rename to src/Radarr.Api.V3/NetImport/NetImportModule.cs index 11d426dfc9..fa0cebf4cb 100644 --- a/src/Radarr.Api.V2/NetImport/NetImportModule.cs +++ b/src/Radarr.Api.V3/NetImport/NetImportModule.cs @@ -3,7 +3,7 @@ using NzbDrone.Core.NetImport; using NzbDrone.Core.Validation.Paths; -namespace Radarr.Api.V2.NetImport +namespace Radarr.Api.V3.NetImport { public class NetImportModule : ProviderModuleBase { diff --git a/src/Radarr.Api.V2/NetImport/NetImportResource.cs b/src/Radarr.Api.V3/NetImport/NetImportResource.cs similarity index 98% rename from src/Radarr.Api.V2/NetImport/NetImportResource.cs rename to src/Radarr.Api.V3/NetImport/NetImportResource.cs index 2ae868ba81..e7e4790dc8 100644 --- a/src/Radarr.Api.V2/NetImport/NetImportResource.cs +++ b/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 { diff --git a/src/Radarr.Api.V2/Notifications/NotificationModule.cs b/src/Radarr.Api.V3/Notifications/NotificationModule.cs similarity index 94% rename from src/Radarr.Api.V2/Notifications/NotificationModule.cs rename to src/Radarr.Api.V3/Notifications/NotificationModule.cs index 8a0b49c60c..25b43fbc4f 100644 --- a/src/Radarr.Api.V2/Notifications/NotificationModule.cs +++ b/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 { diff --git a/src/Radarr.Api.V2/Notifications/NotificationResource.cs b/src/Radarr.Api.V3/Notifications/NotificationResource.cs similarity index 98% rename from src/Radarr.Api.V2/Notifications/NotificationResource.cs rename to src/Radarr.Api.V3/Notifications/NotificationResource.cs index fc3f2d7488..258799ae7b 100644 --- a/src/Radarr.Api.V2/Notifications/NotificationResource.cs +++ b/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 { diff --git a/src/Radarr.Api.V2/Profiles/Delay/DelayProfileModule.cs b/src/Radarr.Api.V3/Profiles/Delay/DelayProfileModule.cs similarity index 98% rename from src/Radarr.Api.V2/Profiles/Delay/DelayProfileModule.cs rename to src/Radarr.Api.V3/Profiles/Delay/DelayProfileModule.cs index e05d4afe3b..5e94b82b90 100644 --- a/src/Radarr.Api.V2/Profiles/Delay/DelayProfileModule.cs +++ b/src/Radarr.Api.V3/Profiles/Delay/DelayProfileModule.cs @@ -6,7 +6,7 @@ using NzbDrone.Core.Profiles.Delay; using Radarr.Http; -namespace Radarr.Api.V2.Profiles.Delay +namespace Radarr.Api.V3.Profiles.Delay { public class DelayProfileModule : RadarrRestModule { diff --git a/src/Radarr.Api.V2/Profiles/Delay/DelayProfileResource.cs b/src/Radarr.Api.V3/Profiles/Delay/DelayProfileResource.cs similarity index 98% rename from src/Radarr.Api.V2/Profiles/Delay/DelayProfileResource.cs rename to src/Radarr.Api.V3/Profiles/Delay/DelayProfileResource.cs index 0460ce975c..9b1350ea4b 100644 --- a/src/Radarr.Api.V2/Profiles/Delay/DelayProfileResource.cs +++ b/src/Radarr.Api.V3/Profiles/Delay/DelayProfileResource.cs @@ -4,7 +4,7 @@ using NzbDrone.Core.Indexers; using NzbDrone.Core.Profiles.Delay; -namespace Radarr.Api.V2.Profiles.Delay +namespace Radarr.Api.V3.Profiles.Delay { public class DelayProfileResource : RestResource { diff --git a/src/Radarr.Api.V2/Profiles/Languages/LanguageModule.cs b/src/Radarr.Api.V3/Profiles/Languages/LanguageModule.cs similarity index 96% rename from src/Radarr.Api.V2/Profiles/Languages/LanguageModule.cs rename to src/Radarr.Api.V3/Profiles/Languages/LanguageModule.cs index fd8a293b98..2c49a1a70a 100644 --- a/src/Radarr.Api.V2/Profiles/Languages/LanguageModule.cs +++ b/src/Radarr.Api.V3/Profiles/Languages/LanguageModule.cs @@ -4,7 +4,7 @@ using NzbDrone.Core.Languages; using Radarr.Http; -namespace Radarr.Api.V2.Profiles.Languages +namespace Radarr.Api.V3.Profiles.Languages { public class LanguageModule : RadarrRestModule { diff --git a/src/Radarr.Api.V2/Profiles/Languages/LanguageResource.cs b/src/Radarr.Api.V3/Profiles/Languages/LanguageResource.cs similarity index 88% rename from src/Radarr.Api.V2/Profiles/Languages/LanguageResource.cs rename to src/Radarr.Api.V3/Profiles/Languages/LanguageResource.cs index b1c4e0babd..d0ce8da7c3 100644 --- a/src/Radarr.Api.V2/Profiles/Languages/LanguageResource.cs +++ b/src/Radarr.Api.V3/Profiles/Languages/LanguageResource.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; using Radarr.Http.REST; -namespace Radarr.Api.V2.Profiles.Languages +namespace Radarr.Api.V3.Profiles.Languages { public class LanguageResource : RestResource { diff --git a/src/Radarr.Api.V2/Profiles/Quality/QualityCutoffValidator.cs b/src/Radarr.Api.V3/Profiles/Quality/QualityCutoffValidator.cs similarity index 96% rename from src/Radarr.Api.V2/Profiles/Quality/QualityCutoffValidator.cs rename to src/Radarr.Api.V3/Profiles/Quality/QualityCutoffValidator.cs index 91773ed25d..0d1e5ff455 100644 --- a/src/Radarr.Api.V2/Profiles/Quality/QualityCutoffValidator.cs +++ b/src/Radarr.Api.V3/Profiles/Quality/QualityCutoffValidator.cs @@ -3,7 +3,7 @@ using FluentValidation; using FluentValidation.Validators; -namespace Radarr.Api.V2.Profiles.Quality +namespace Radarr.Api.V3.Profiles.Quality { public static class QualityCutoffValidator { diff --git a/src/Radarr.Api.V2/Profiles/Quality/QualityItemsValidator.cs b/src/Radarr.Api.V3/Profiles/Quality/QualityItemsValidator.cs similarity index 99% rename from src/Radarr.Api.V2/Profiles/Quality/QualityItemsValidator.cs rename to src/Radarr.Api.V3/Profiles/Quality/QualityItemsValidator.cs index 1927e34b99..025a71db34 100644 --- a/src/Radarr.Api.V2/Profiles/Quality/QualityItemsValidator.cs +++ b/src/Radarr.Api.V3/Profiles/Quality/QualityItemsValidator.cs @@ -4,7 +4,7 @@ using FluentValidation.Validators; using NzbDrone.Common.Extensions; -namespace Radarr.Api.V2.Profiles.Quality +namespace Radarr.Api.V3.Profiles.Quality { public static class QualityItemsValidator { diff --git a/src/Radarr.Api.V2/Profiles/Quality/QualityProfileModule.cs b/src/Radarr.Api.V3/Profiles/Quality/QualityProfileModule.cs similarity index 98% rename from src/Radarr.Api.V2/Profiles/Quality/QualityProfileModule.cs rename to src/Radarr.Api.V3/Profiles/Quality/QualityProfileModule.cs index f2698804d2..500649d5e4 100644 --- a/src/Radarr.Api.V2/Profiles/Quality/QualityProfileModule.cs +++ b/src/Radarr.Api.V3/Profiles/Quality/QualityProfileModule.cs @@ -8,7 +8,7 @@ using Radarr.Http; using Radarr.Http.Mapping; -namespace Radarr.Api.V2.Profiles.Quality +namespace Radarr.Api.V3.Profiles.Quality { public class QualityProfileModule : RadarrRestModule { diff --git a/src/Radarr.Api.V2/Profiles/Quality/QualityProfileResource.cs b/src/Radarr.Api.V3/Profiles/Quality/QualityProfileResource.cs similarity index 98% rename from src/Radarr.Api.V2/Profiles/Quality/QualityProfileResource.cs rename to src/Radarr.Api.V3/Profiles/Quality/QualityProfileResource.cs index eed5e44210..4de28a95ee 100644 --- a/src/Radarr.Api.V2/Profiles/Quality/QualityProfileResource.cs +++ b/src/Radarr.Api.V3/Profiles/Quality/QualityProfileResource.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using System.Linq; -using Radarr.Api.V2.Qualities; +using Radarr.Api.V3.Qualities; using Radarr.Http.REST; using NzbDrone.Core.Parser; using NzbDrone.Core.Profiles; @@ -8,7 +8,7 @@ using NzbDrone.Core.Languages; using NzbDrone.Core.CustomFormats; -namespace Radarr.Api.V2.Profiles.Quality +namespace Radarr.Api.V3.Profiles.Quality { public class QualityProfileResource : RestResource { diff --git a/src/Radarr.Api.V2/Profiles/Quality/QualityProfileSchemaModule.cs b/src/Radarr.Api.V3/Profiles/Quality/QualityProfileSchemaModule.cs similarity index 94% rename from src/Radarr.Api.V2/Profiles/Quality/QualityProfileSchemaModule.cs rename to src/Radarr.Api.V3/Profiles/Quality/QualityProfileSchemaModule.cs index 8ae6eab9d7..7bd028620e 100644 --- a/src/Radarr.Api.V2/Profiles/Quality/QualityProfileSchemaModule.cs +++ b/src/Radarr.Api.V3/Profiles/Quality/QualityProfileSchemaModule.cs @@ -1,7 +1,7 @@ using NzbDrone.Core.Profiles; using Radarr.Http; -namespace Radarr.Api.V2.Profiles.Quality +namespace Radarr.Api.V3.Profiles.Quality { public class QualityProfileSchemaModule : RadarrRestModule { diff --git a/src/Radarr.Api.V2/ProviderModuleBase.cs b/src/Radarr.Api.V3/ProviderModuleBase.cs similarity index 99% rename from src/Radarr.Api.V2/ProviderModuleBase.cs rename to src/Radarr.Api.V3/ProviderModuleBase.cs index 47254400e5..98a654d297 100644 --- a/src/Radarr.Api.V2/ProviderModuleBase.cs +++ b/src/Radarr.Api.V3/ProviderModuleBase.cs @@ -10,7 +10,7 @@ using Radarr.Http; using Radarr.Http.Extensions; -namespace Radarr.Api.V2 +namespace Radarr.Api.V3 { public abstract class ProviderModuleBase : RadarrRestModule where TProviderDefinition : ProviderDefinition, new() diff --git a/src/Radarr.Api.V2/ProviderResource.cs b/src/Radarr.Api.V3/ProviderResource.cs similarity index 99% rename from src/Radarr.Api.V2/ProviderResource.cs rename to src/Radarr.Api.V3/ProviderResource.cs index 84585a641d..858cb4c718 100644 --- a/src/Radarr.Api.V2/ProviderResource.cs +++ b/src/Radarr.Api.V3/ProviderResource.cs @@ -4,7 +4,7 @@ using Radarr.Http.ClientSchema; using Radarr.Http.REST; -namespace Radarr.Api.V2 +namespace Radarr.Api.V3 { public class ProviderResource : RestResource { diff --git a/src/Radarr.Api.V2/ProviderTestAllResult.cs b/src/Radarr.Api.V3/ProviderTestAllResult.cs similarity index 94% rename from src/Radarr.Api.V2/ProviderTestAllResult.cs rename to src/Radarr.Api.V3/ProviderTestAllResult.cs index 617d5413ef..175a3f443b 100644 --- a/src/Radarr.Api.V2/ProviderTestAllResult.cs +++ b/src/Radarr.Api.V3/ProviderTestAllResult.cs @@ -2,7 +2,7 @@ using FluentValidation.Results; using NzbDrone.Common.Extensions; -namespace Radarr.Api.V2 +namespace Radarr.Api.V3 { public class ProviderTestAllResult { diff --git a/src/Radarr.Api.V2/Qualities/CustomFormatModule.cs b/src/Radarr.Api.V3/Qualities/CustomFormatModule.cs similarity index 99% rename from src/Radarr.Api.V2/Qualities/CustomFormatModule.cs rename to src/Radarr.Api.V3/Qualities/CustomFormatModule.cs index cc8e575e8c..7c7735ab25 100644 --- a/src/Radarr.Api.V2/Qualities/CustomFormatModule.cs +++ b/src/Radarr.Api.V3/Qualities/CustomFormatModule.cs @@ -8,7 +8,7 @@ using NzbDrone.Core.Parser; using Radarr.Http; -namespace Radarr.Api.V2.Qualities +namespace Radarr.Api.V3.Qualities { public class CustomFormatModule : RadarrRestModule { diff --git a/src/Radarr.Api.V2/Qualities/CustomFormatResource.cs b/src/Radarr.Api.V3/Qualities/CustomFormatResource.cs similarity index 97% rename from src/Radarr.Api.V2/Qualities/CustomFormatResource.cs rename to src/Radarr.Api.V3/Qualities/CustomFormatResource.cs index ce225803f4..098de14fcc 100644 --- a/src/Radarr.Api.V2/Qualities/CustomFormatResource.cs +++ b/src/Radarr.Api.V3/Qualities/CustomFormatResource.cs @@ -3,7 +3,7 @@ using Radarr.Http.REST; using NzbDrone.Core.CustomFormats; -namespace Radarr.Api.V2.Qualities +namespace Radarr.Api.V3.Qualities { public class CustomFormatResource : RestResource { diff --git a/src/Radarr.Api.V2/Qualities/FormatTagMatchResultResource.cs b/src/Radarr.Api.V3/Qualities/FormatTagMatchResultResource.cs similarity index 98% rename from src/Radarr.Api.V2/Qualities/FormatTagMatchResultResource.cs rename to src/Radarr.Api.V3/Qualities/FormatTagMatchResultResource.cs index 27bfd63ed4..b60bbd5792 100644 --- a/src/Radarr.Api.V2/Qualities/FormatTagMatchResultResource.cs +++ b/src/Radarr.Api.V3/Qualities/FormatTagMatchResultResource.cs @@ -6,7 +6,7 @@ using NzbDrone.Core.Qualities; using System; -namespace Radarr.Api.V2.Qualities +namespace Radarr.Api.V3.Qualities { public class FormatTagMatchResultResource : RestResource { diff --git a/src/Radarr.Api.V2/Qualities/FormatTagValidator.cs b/src/Radarr.Api.V3/Qualities/FormatTagValidator.cs similarity index 97% rename from src/Radarr.Api.V2/Qualities/FormatTagValidator.cs rename to src/Radarr.Api.V3/Qualities/FormatTagValidator.cs index a726324b5c..0d77966749 100644 --- a/src/Radarr.Api.V2/Qualities/FormatTagValidator.cs +++ b/src/Radarr.Api.V3/Qualities/FormatTagValidator.cs @@ -3,7 +3,7 @@ using FluentValidation.Validators; using NzbDrone.Core.CustomFormats; -namespace Radarr.Api.V2.Qualities +namespace Radarr.Api.V3.Qualities { public class FormatTagValidator : PropertyValidator { diff --git a/src/Radarr.Api.V2/Qualities/QualityDefinitionModule.cs b/src/Radarr.Api.V3/Qualities/QualityDefinitionModule.cs similarity index 98% rename from src/Radarr.Api.V2/Qualities/QualityDefinitionModule.cs rename to src/Radarr.Api.V3/Qualities/QualityDefinitionModule.cs index c5329b9b73..a966ea9b9a 100644 --- a/src/Radarr.Api.V2/Qualities/QualityDefinitionModule.cs +++ b/src/Radarr.Api.V3/Qualities/QualityDefinitionModule.cs @@ -5,7 +5,7 @@ using Radarr.Http; using Radarr.Http.Extensions; -namespace Radarr.Api.V2.Qualities +namespace Radarr.Api.V3.Qualities { public class QualityDefinitionModule : RadarrRestModule { diff --git a/src/Radarr.Api.V2/Qualities/QualityDefinitionResource.cs b/src/Radarr.Api.V3/Qualities/QualityDefinitionResource.cs similarity index 98% rename from src/Radarr.Api.V2/Qualities/QualityDefinitionResource.cs rename to src/Radarr.Api.V3/Qualities/QualityDefinitionResource.cs index 565b95cd18..716cfddfc0 100644 --- a/src/Radarr.Api.V2/Qualities/QualityDefinitionResource.cs +++ b/src/Radarr.Api.V3/Qualities/QualityDefinitionResource.cs @@ -3,7 +3,7 @@ using Radarr.Http.REST; using NzbDrone.Core.Qualities; -namespace Radarr.Api.V2.Qualities +namespace Radarr.Api.V3.Qualities { public class QualityDefinitionResource : RestResource { diff --git a/src/Radarr.Api.V2/Queue/QueueActionModule.cs b/src/Radarr.Api.V3/Queue/QueueActionModule.cs similarity index 99% rename from src/Radarr.Api.V2/Queue/QueueActionModule.cs rename to src/Radarr.Api.V3/Queue/QueueActionModule.cs index 69a4be0162..98cb93265b 100644 --- a/src/Radarr.Api.V2/Queue/QueueActionModule.cs +++ b/src/Radarr.Api.V3/Queue/QueueActionModule.cs @@ -9,7 +9,7 @@ using Radarr.Http.Extensions; using Radarr.Http.REST; -namespace Radarr.Api.V2.Queue +namespace Radarr.Api.V3.Queue { public class QueueActionModule : RadarrRestModule { diff --git a/src/Radarr.Api.V2/Queue/QueueBulkResource.cs b/src/Radarr.Api.V3/Queue/QueueBulkResource.cs similarity index 81% rename from src/Radarr.Api.V2/Queue/QueueBulkResource.cs rename to src/Radarr.Api.V3/Queue/QueueBulkResource.cs index 35a451ce30..57652ec326 100644 --- a/src/Radarr.Api.V2/Queue/QueueBulkResource.cs +++ b/src/Radarr.Api.V3/Queue/QueueBulkResource.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Radarr.Api.V2.Queue +namespace Radarr.Api.V3.Queue { public class QueueBulkResource { diff --git a/src/Radarr.Api.V2/Queue/QueueDetailsModule.cs b/src/Radarr.Api.V3/Queue/QueueDetailsModule.cs similarity index 98% rename from src/Radarr.Api.V2/Queue/QueueDetailsModule.cs rename to src/Radarr.Api.V3/Queue/QueueDetailsModule.cs index 33eeb916ac..6ba51a2a33 100644 --- a/src/Radarr.Api.V2/Queue/QueueDetailsModule.cs +++ b/src/Radarr.Api.V3/Queue/QueueDetailsModule.cs @@ -9,7 +9,7 @@ using Radarr.Http; using Radarr.Http.Extensions; -namespace Radarr.Api.V2.Queue +namespace Radarr.Api.V3.Queue { public class QueueDetailsModule : RadarrRestModuleWithSignalR, IHandle, IHandle diff --git a/src/Radarr.Api.V2/Queue/QueueModule.cs b/src/Radarr.Api.V3/Queue/QueueModule.cs similarity index 99% rename from src/Radarr.Api.V2/Queue/QueueModule.cs rename to src/Radarr.Api.V3/Queue/QueueModule.cs index b4d56d04d4..1ec4c856c2 100644 --- a/src/Radarr.Api.V2/Queue/QueueModule.cs +++ b/src/Radarr.Api.V3/Queue/QueueModule.cs @@ -12,7 +12,7 @@ using Radarr.Http; using Radarr.Http.Extensions; -namespace Radarr.Api.V2.Queue +namespace Radarr.Api.V3.Queue { public class QueueModule : RadarrRestModuleWithSignalR, IHandle, IHandle diff --git a/src/Radarr.Api.V2/Queue/QueueResource.cs b/src/Radarr.Api.V3/Queue/QueueResource.cs similarity index 97% rename from src/Radarr.Api.V2/Queue/QueueResource.cs rename to src/Radarr.Api.V3/Queue/QueueResource.cs index 797a2e7be4..b64b354331 100644 --- a/src/Radarr.Api.V2/Queue/QueueResource.cs +++ b/src/Radarr.Api.V3/Queue/QueueResource.cs @@ -5,10 +5,10 @@ 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.Queue +namespace Radarr.Api.V3.Queue { public class QueueResource : RestResource { diff --git a/src/Radarr.Api.V2/Queue/QueueStatusModule.cs b/src/Radarr.Api.V3/Queue/QueueStatusModule.cs similarity index 98% rename from src/Radarr.Api.V2/Queue/QueueStatusModule.cs rename to src/Radarr.Api.V3/Queue/QueueStatusModule.cs index 0214acd97a..c01bf1d302 100644 --- a/src/Radarr.Api.V2/Queue/QueueStatusModule.cs +++ b/src/Radarr.Api.V3/Queue/QueueStatusModule.cs @@ -8,7 +8,7 @@ using NzbDrone.SignalR; using Radarr.Http; -namespace Radarr.Api.V2.Queue +namespace Radarr.Api.V3.Queue { public class QueueStatusModule : RadarrRestModuleWithSignalR, IHandle, IHandle diff --git a/src/Radarr.Api.V2/Queue/QueueStatusResource.cs b/src/Radarr.Api.V3/Queue/QueueStatusResource.cs similarity index 93% rename from src/Radarr.Api.V2/Queue/QueueStatusResource.cs rename to src/Radarr.Api.V3/Queue/QueueStatusResource.cs index 30d2476f70..81cd4399d8 100644 --- a/src/Radarr.Api.V2/Queue/QueueStatusResource.cs +++ b/src/Radarr.Api.V3/Queue/QueueStatusResource.cs @@ -1,6 +1,6 @@ using Radarr.Http.REST; -namespace Radarr.Api.V2.Queue +namespace Radarr.Api.V3.Queue { public class QueueStatusResource : RestResource { diff --git a/src/Radarr.Api.V2/Radarr.Api.V2.csproj b/src/Radarr.Api.V3/Radarr.Api.V3.csproj similarity index 100% rename from src/Radarr.Api.V2/Radarr.Api.V2.csproj rename to src/Radarr.Api.V3/Radarr.Api.V3.csproj diff --git a/src/Radarr.Api.V3/RadarrV3FeedModule.cs b/src/Radarr.Api.V3/RadarrV3FeedModule.cs new file mode 100644 index 0000000000..c6dce35469 --- /dev/null +++ b/src/Radarr.Api.V3/RadarrV3FeedModule.cs @@ -0,0 +1,12 @@ +using Radarr.Http; + +namespace Radarr.Api.V3 +{ + public abstract class RadarrV3FeedModule : RadarrModule + { + protected RadarrV3FeedModule(string resource) + : base("/feed/v3/" + resource.Trim('/')) + { + } + } +} diff --git a/src/Radarr.Api.V3/RadarrV3Module.cs b/src/Radarr.Api.V3/RadarrV3Module.cs new file mode 100644 index 0000000000..8d892e666f --- /dev/null +++ b/src/Radarr.Api.V3/RadarrV3Module.cs @@ -0,0 +1,12 @@ +using Radarr.Http; + +namespace Radarr.Api.V3 +{ + public abstract class RadarrV3Module : RadarrModule + { + protected RadarrV3Module(string resource) + : base("/api/v3/" + resource.Trim('/')) + { + } + } +} diff --git a/src/Radarr.Api.V2/RemotePathMappings/RemotePathMappingModule.cs b/src/Radarr.Api.V3/RemotePathMappings/RemotePathMappingModule.cs similarity index 98% rename from src/Radarr.Api.V2/RemotePathMappings/RemotePathMappingModule.cs rename to src/Radarr.Api.V3/RemotePathMappings/RemotePathMappingModule.cs index de7e61d9ca..7e1a0b5814 100644 --- a/src/Radarr.Api.V2/RemotePathMappings/RemotePathMappingModule.cs +++ b/src/Radarr.Api.V3/RemotePathMappings/RemotePathMappingModule.cs @@ -4,7 +4,7 @@ using NzbDrone.Core.Validation.Paths; using Radarr.Http; -namespace Radarr.Api.V2.RemotePathMappings +namespace Radarr.Api.V3.RemotePathMappings { public class RemotePathMappingModule : RadarrRestModule { diff --git a/src/Radarr.Api.V2/RemotePathMappings/RemotePathMappingResource.cs b/src/Radarr.Api.V3/RemotePathMappings/RemotePathMappingResource.cs similarity index 96% rename from src/Radarr.Api.V2/RemotePathMappings/RemotePathMappingResource.cs rename to src/Radarr.Api.V3/RemotePathMappings/RemotePathMappingResource.cs index ab449fc51b..87f4c24deb 100644 --- a/src/Radarr.Api.V2/RemotePathMappings/RemotePathMappingResource.cs +++ b/src/Radarr.Api.V3/RemotePathMappings/RemotePathMappingResource.cs @@ -3,7 +3,7 @@ using NzbDrone.Core.RemotePathMappings; using Radarr.Http.REST; -namespace Radarr.Api.V2.RemotePathMappings +namespace Radarr.Api.V3.RemotePathMappings { public class RemotePathMappingResource : RestResource { diff --git a/src/Radarr.Api.V2/Restrictions/RestrictionModule.cs b/src/Radarr.Api.V3/Restrictions/RestrictionModule.cs similarity index 97% rename from src/Radarr.Api.V2/Restrictions/RestrictionModule.cs rename to src/Radarr.Api.V3/Restrictions/RestrictionModule.cs index a234dc1cd6..43625deeb4 100644 --- a/src/Radarr.Api.V2/Restrictions/RestrictionModule.cs +++ b/src/Radarr.Api.V3/Restrictions/RestrictionModule.cs @@ -5,7 +5,7 @@ using NzbDrone.Core.Restrictions; using Radarr.Http; -namespace Radarr.Api.V2.Restrictions +namespace Radarr.Api.V3.Restrictions { public class RestrictionModule : RadarrRestModule { diff --git a/src/Radarr.Api.V2/Restrictions/RestrictionResource.cs b/src/Radarr.Api.V3/Restrictions/RestrictionResource.cs similarity index 97% rename from src/Radarr.Api.V2/Restrictions/RestrictionResource.cs rename to src/Radarr.Api.V3/Restrictions/RestrictionResource.cs index c73c569b5e..3ca323bd48 100644 --- a/src/Radarr.Api.V2/Restrictions/RestrictionResource.cs +++ b/src/Radarr.Api.V3/Restrictions/RestrictionResource.cs @@ -3,7 +3,7 @@ using NzbDrone.Core.Restrictions; using Radarr.Http.REST; -namespace Radarr.Api.V2.Restrictions +namespace Radarr.Api.V3.Restrictions { public class RestrictionResource : RestResource { diff --git a/src/Radarr.Api.V2/RootFolders/RootFolderModule.cs b/src/Radarr.Api.V3/RootFolders/RootFolderModule.cs similarity index 98% rename from src/Radarr.Api.V2/RootFolders/RootFolderModule.cs rename to src/Radarr.Api.V3/RootFolders/RootFolderModule.cs index cf79303c6f..d8ac2240aa 100644 --- a/src/Radarr.Api.V2/RootFolders/RootFolderModule.cs +++ b/src/Radarr.Api.V3/RootFolders/RootFolderModule.cs @@ -5,7 +5,7 @@ using NzbDrone.SignalR; using Radarr.Http; -namespace Radarr.Api.V2.RootFolders +namespace Radarr.Api.V3.RootFolders { public class RootFolderModule : RadarrRestModuleWithSignalR { diff --git a/src/Radarr.Api.V2/RootFolders/RootFolderResource.cs b/src/Radarr.Api.V3/RootFolders/RootFolderResource.cs similarity index 97% rename from src/Radarr.Api.V2/RootFolders/RootFolderResource.cs rename to src/Radarr.Api.V3/RootFolders/RootFolderResource.cs index 566c999d46..ed78d6f2b6 100644 --- a/src/Radarr.Api.V2/RootFolders/RootFolderResource.cs +++ b/src/Radarr.Api.V3/RootFolders/RootFolderResource.cs @@ -4,7 +4,7 @@ using NzbDrone.Core.RootFolders; using Radarr.Http.REST; -namespace Radarr.Api.V2.RootFolders +namespace Radarr.Api.V3.RootFolders { public class RootFolderResource : RestResource { diff --git a/src/Radarr.Api.V2/System/Backup/BackupModule.cs b/src/Radarr.Api.V3/System/Backup/BackupModule.cs similarity index 99% rename from src/Radarr.Api.V2/System/Backup/BackupModule.cs rename to src/Radarr.Api.V3/System/Backup/BackupModule.cs index 49cde0f367..d777869f93 100644 --- a/src/Radarr.Api.V2/System/Backup/BackupModule.cs +++ b/src/Radarr.Api.V3/System/Backup/BackupModule.cs @@ -11,7 +11,7 @@ using Radarr.Http.Extensions; using Radarr.Http.REST; -namespace Radarr.Api.V2.System.Backup +namespace Radarr.Api.V3.System.Backup { public class BackupModule : RadarrRestModule { diff --git a/src/Radarr.Api.V2/System/Backup/BackupResource.cs b/src/Radarr.Api.V3/System/Backup/BackupResource.cs similarity index 88% rename from src/Radarr.Api.V2/System/Backup/BackupResource.cs rename to src/Radarr.Api.V3/System/Backup/BackupResource.cs index b265f423eb..78d86f245a 100644 --- a/src/Radarr.Api.V2/System/Backup/BackupResource.cs +++ b/src/Radarr.Api.V3/System/Backup/BackupResource.cs @@ -2,7 +2,7 @@ using Radarr.Http.REST; using NzbDrone.Core.Backup; -namespace Radarr.Api.V2.System.Backup +namespace Radarr.Api.V3.System.Backup { public class BackupResource : RestResource { diff --git a/src/Radarr.Api.V2/System/SystemModule.cs b/src/Radarr.Api.V3/System/SystemModule.cs similarity index 98% rename from src/Radarr.Api.V2/System/SystemModule.cs rename to src/Radarr.Api.V3/System/SystemModule.cs index ae674cbed2..f48234eef4 100644 --- a/src/Radarr.Api.V2/System/SystemModule.cs +++ b/src/Radarr.Api.V3/System/SystemModule.cs @@ -8,9 +8,9 @@ using NzbDrone.Core.Datastore; using NzbDrone.Core.Lifecycle; -namespace Radarr.Api.V2.System +namespace Radarr.Api.V3.System { - public class SystemModule : RadarrV2Module + public class SystemModule : RadarrV3Module { private readonly IAppFolderInfo _appFolderInfo; private readonly IRuntimeInfo _runtimeInfo; diff --git a/src/Radarr.Api.V2/System/Tasks/TaskModule.cs b/src/Radarr.Api.V3/System/Tasks/TaskModule.cs similarity index 98% rename from src/Radarr.Api.V2/System/Tasks/TaskModule.cs rename to src/Radarr.Api.V3/System/Tasks/TaskModule.cs index 3ba31e72bf..50d97d0143 100644 --- a/src/Radarr.Api.V2/System/Tasks/TaskModule.cs +++ b/src/Radarr.Api.V3/System/Tasks/TaskModule.cs @@ -8,7 +8,7 @@ using NzbDrone.SignalR; using Radarr.Http; -namespace Radarr.Api.V2.System.Tasks +namespace Radarr.Api.V3.System.Tasks { public class TaskModule : RadarrRestModuleWithSignalR, IHandle { diff --git a/src/Radarr.Api.V2/System/Tasks/TaskResource.cs b/src/Radarr.Api.V3/System/Tasks/TaskResource.cs similarity index 89% rename from src/Radarr.Api.V2/System/Tasks/TaskResource.cs rename to src/Radarr.Api.V3/System/Tasks/TaskResource.cs index 40663dbec5..05c9acdefe 100644 --- a/src/Radarr.Api.V2/System/Tasks/TaskResource.cs +++ b/src/Radarr.Api.V3/System/Tasks/TaskResource.cs @@ -1,7 +1,7 @@ using System; using Radarr.Http.REST; -namespace Radarr.Api.V2.System.Tasks +namespace Radarr.Api.V3.System.Tasks { public class TaskResource : RestResource { diff --git a/src/Radarr.Api.V2/Tags/TagDetailsModule.cs b/src/Radarr.Api.V3/Tags/TagDetailsModule.cs similarity index 96% rename from src/Radarr.Api.V2/Tags/TagDetailsModule.cs rename to src/Radarr.Api.V3/Tags/TagDetailsModule.cs index de43481f7b..2699f320f6 100644 --- a/src/Radarr.Api.V2/Tags/TagDetailsModule.cs +++ b/src/Radarr.Api.V3/Tags/TagDetailsModule.cs @@ -2,7 +2,7 @@ using NzbDrone.Core.Tags; using Radarr.Http; -namespace Radarr.Api.V2.Tags +namespace Radarr.Api.V3.Tags { public class TagDetailsModule : RadarrRestModule { diff --git a/src/Radarr.Api.V2/Tags/TagDetailsResource.cs b/src/Radarr.Api.V3/Tags/TagDetailsResource.cs similarity index 97% rename from src/Radarr.Api.V2/Tags/TagDetailsResource.cs rename to src/Radarr.Api.V3/Tags/TagDetailsResource.cs index 74f27c2126..4ba530795d 100644 --- a/src/Radarr.Api.V2/Tags/TagDetailsResource.cs +++ b/src/Radarr.Api.V3/Tags/TagDetailsResource.cs @@ -3,7 +3,7 @@ using NzbDrone.Core.Tags; using Radarr.Http.REST; -namespace Radarr.Api.V2.Tags +namespace Radarr.Api.V3.Tags { public class TagDetailsResource : RestResource { diff --git a/src/Radarr.Api.V2/Tags/TagModule.cs b/src/Radarr.Api.V3/Tags/TagModule.cs similarity index 98% rename from src/Radarr.Api.V2/Tags/TagModule.cs rename to src/Radarr.Api.V3/Tags/TagModule.cs index 04ee083272..244acdb1a7 100644 --- a/src/Radarr.Api.V2/Tags/TagModule.cs +++ b/src/Radarr.Api.V3/Tags/TagModule.cs @@ -5,7 +5,7 @@ using NzbDrone.SignalR; using Radarr.Http; -namespace Radarr.Api.V2.Tags +namespace Radarr.Api.V3.Tags { public class TagModule : RadarrRestModuleWithSignalR, IHandle { diff --git a/src/Radarr.Api.V2/Tags/TagResource.cs b/src/Radarr.Api.V3/Tags/TagResource.cs similarity index 96% rename from src/Radarr.Api.V2/Tags/TagResource.cs rename to src/Radarr.Api.V3/Tags/TagResource.cs index 358b3705ea..b890c4f109 100644 --- a/src/Radarr.Api.V2/Tags/TagResource.cs +++ b/src/Radarr.Api.V3/Tags/TagResource.cs @@ -3,7 +3,7 @@ using Radarr.Http.REST; using NzbDrone.Core.Tags; -namespace Radarr.Api.V2.Tags +namespace Radarr.Api.V3.Tags { public class TagResource : RestResource { diff --git a/src/Radarr.Api.V2/Update/UpdateModule.cs b/src/Radarr.Api.V3/Update/UpdateModule.cs similarity index 97% rename from src/Radarr.Api.V2/Update/UpdateModule.cs rename to src/Radarr.Api.V3/Update/UpdateModule.cs index a4b718cbbf..bee86c83b9 100644 --- a/src/Radarr.Api.V2/Update/UpdateModule.cs +++ b/src/Radarr.Api.V3/Update/UpdateModule.cs @@ -4,7 +4,7 @@ using NzbDrone.Core.Update; using Radarr.Http; -namespace Radarr.Api.V2.Update +namespace Radarr.Api.V3.Update { public class UpdateModule : RadarrRestModule { diff --git a/src/Radarr.Api.V2/Update/UpdateResource.cs b/src/Radarr.Api.V3/Update/UpdateResource.cs similarity index 98% rename from src/Radarr.Api.V2/Update/UpdateResource.cs rename to src/Radarr.Api.V3/Update/UpdateResource.cs index 7019ff3aec..d887371e93 100644 --- a/src/Radarr.Api.V2/Update/UpdateResource.cs +++ b/src/Radarr.Api.V3/Update/UpdateResource.cs @@ -5,7 +5,7 @@ using NzbDrone.Core.Update; using Radarr.Http.REST; -namespace Radarr.Api.V2.Update +namespace Radarr.Api.V3.Update { public class UpdateResource : RestResource { diff --git a/src/Radarr.Http/Frontend/InitializeJsModule.cs b/src/Radarr.Http/Frontend/InitializeJsModule.cs index 21455f7876..ae1fb6001c 100644 --- a/src/Radarr.Http/Frontend/InitializeJsModule.cs +++ b/src/Radarr.Http/Frontend/InitializeJsModule.cs @@ -58,7 +58,7 @@ private string GetContent() var builder = new StringBuilder(); builder.AppendLine("window.Radarr = {"); - builder.AppendLine($" apiRoot: '{_urlBase}/api/v2',"); + builder.AppendLine($" apiRoot: '{_urlBase}/api/v3',"); builder.AppendLine($" apiKey: '{_apiKey}',"); builder.AppendLine($" release: '{BuildInfo.Release}',"); builder.AppendLine($" version: '{BuildInfo.Version.ToString()}',"); diff --git a/src/Radarr.Http/RadarrRestModule.cs b/src/Radarr.Http/RadarrRestModule.cs index 2a73f834db..f1f36c6cb0 100644 --- a/src/Radarr.Http/RadarrRestModule.cs +++ b/src/Radarr.Http/RadarrRestModule.cs @@ -12,10 +12,10 @@ namespace Radarr.Http private static string BaseUrl() { - var isV3 = typeof(TResource).Namespace.Contains(".V2."); + var isV3 = typeof(TResource).Namespace.Contains(".V3."); if (isV3) { - return "/api/v2/"; + return "/api/v3/"; } return "/api/"; } diff --git a/src/Radarr.Http/RadarrRestModuleWithSignalR.cs b/src/Radarr.Http/RadarrRestModuleWithSignalR.cs index a50955d5ab..587fd08607 100644 --- a/src/Radarr.Http/RadarrRestModuleWithSignalR.cs +++ b/src/Radarr.Http/RadarrRestModuleWithSignalR.cs @@ -54,7 +54,7 @@ protected void BroadcastResourceChange(ModelAction action, TResource resource) { if (!_signalRBroadcaster.IsConnected) return; - if (GetType().Namespace.Contains("V2")) + if (GetType().Namespace.Contains("V3")) { var signalRMessage = new SignalRMessage { @@ -71,7 +71,7 @@ protected void BroadcastResourceChange(ModelAction action) { if (!_signalRBroadcaster.IsConnected) return; - if (GetType().Namespace.Contains("V2")) + if (GetType().Namespace.Contains("V3")) { var signalRMessage = new SignalRMessage { diff --git a/src/Radarr.sln b/src/Radarr.sln index 79c2231a96..ee2f13e325 100644 --- a/src/Radarr.sln +++ b/src/Radarr.sln @@ -21,7 +21,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Platform", "Platform", "{4E EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Radarr.Api", "NzbDrone.Api\Radarr.Api.csproj", "{59D9DA5C-FD93-4599-BE2F-AFC540B180C8}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Radarr.Api.V2", "Radarr.Api.V2\Radarr.Api.V2.csproj", "{D1D48E1D-9EEB-470B-992C-3954F90FB014}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Radarr.Api.V3", "Radarr.Api.V3\Radarr.Api.V3.csproj", "{D1D48E1D-9EEB-470B-992C-3954F90FB014}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Radarr.Http", "Radarr.Http\Radarr.Http.csproj", "{F8A02FD4-A7A4-40D0-BB81-6319105A3302}" EndProject