diff --git a/src/Lidarr.Api.V3/AlbumStudio/AlbumStudioArtistResource.cs b/src/Lidarr.Api.V1/AlbumStudio/AlbumStudioArtistResource.cs similarity index 78% rename from src/Lidarr.Api.V3/AlbumStudio/AlbumStudioArtistResource.cs rename to src/Lidarr.Api.V1/AlbumStudio/AlbumStudioArtistResource.cs index e1c43ebc5..653ed1df0 100644 --- a/src/Lidarr.Api.V3/AlbumStudio/AlbumStudioArtistResource.cs +++ b/src/Lidarr.Api.V1/AlbumStudio/AlbumStudioArtistResource.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; -using Lidarr.Api.V3.Albums; +using Lidarr.Api.V1.Albums; -namespace Lidarr.Api.V3.AlbumStudio +namespace Lidarr.Api.V1.AlbumStudio { public class AlbumStudioArtistResource { diff --git a/src/Lidarr.Api.V3/AlbumStudio/AlbumStudioModule.cs b/src/Lidarr.Api.V1/AlbumStudio/AlbumStudioModule.cs similarity index 95% rename from src/Lidarr.Api.V3/AlbumStudio/AlbumStudioModule.cs rename to src/Lidarr.Api.V1/AlbumStudio/AlbumStudioModule.cs index 71dc76920..11715006c 100644 --- a/src/Lidarr.Api.V3/AlbumStudio/AlbumStudioModule.cs +++ b/src/Lidarr.Api.V1/AlbumStudio/AlbumStudioModule.cs @@ -3,9 +3,9 @@ using Nancy; using NzbDrone.Core.Music; using Lidarr.Http.Extensions; -namespace Lidarr.Api.V3.AlbumStudio +namespace Lidarr.Api.V1.AlbumStudio { - public class AlbumStudioModule : SonarrV3Module + public class AlbumStudioModule : LidarrV1Module { private readonly IArtistService _artistService; private readonly IAlbumMonitoredService _episodeMonitoredService; diff --git a/src/Lidarr.Api.V3/AlbumStudio/AlbumStudioResource.cs b/src/Lidarr.Api.V1/AlbumStudio/AlbumStudioResource.cs similarity index 87% rename from src/Lidarr.Api.V3/AlbumStudio/AlbumStudioResource.cs rename to src/Lidarr.Api.V1/AlbumStudio/AlbumStudioResource.cs index b03f0629e..f89b6c962 100644 --- a/src/Lidarr.Api.V3/AlbumStudio/AlbumStudioResource.cs +++ b/src/Lidarr.Api.V1/AlbumStudio/AlbumStudioResource.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using NzbDrone.Core.Music; -namespace Lidarr.Api.V3.AlbumStudio +namespace Lidarr.Api.V1.AlbumStudio { public class AlbumStudioResource { diff --git a/src/Lidarr.Api.V3/Albums/AlbumModule.cs b/src/Lidarr.Api.V1/Albums/AlbumModule.cs similarity index 98% rename from src/Lidarr.Api.V3/Albums/AlbumModule.cs rename to src/Lidarr.Api.V1/Albums/AlbumModule.cs index 6b5e47d31..c00c2ca41 100644 --- a/src/Lidarr.Api.V3/Albums/AlbumModule.cs +++ b/src/Lidarr.Api.V1/Albums/AlbumModule.cs @@ -9,7 +9,7 @@ using Lidarr.Http.Extensions; using Lidarr.Http.REST; using NzbDrone.Core.ArtistStats; -namespace Lidarr.Api.V3.Albums +namespace Lidarr.Api.V1.Albums { public class AlbumModule : AlbumModuleWithSignalR { diff --git a/src/Lidarr.Api.V3/Albums/AlbumModuleWithSignalR.cs b/src/Lidarr.Api.V1/Albums/AlbumModuleWithSignalR.cs similarity index 98% rename from src/Lidarr.Api.V3/Albums/AlbumModuleWithSignalR.cs rename to src/Lidarr.Api.V1/Albums/AlbumModuleWithSignalR.cs index 17c64b70c..830458024 100644 --- a/src/Lidarr.Api.V3/Albums/AlbumModuleWithSignalR.cs +++ b/src/Lidarr.Api.V1/Albums/AlbumModuleWithSignalR.cs @@ -3,14 +3,14 @@ using System.Collections.Generic; using System.Linq; using FluentValidation; using NzbDrone.Common.Extensions; -using Lidarr.Api.V3.Artist; +using Lidarr.Api.V1.Artist; using NzbDrone.Core.DecisionEngine; using NzbDrone.Core.Music; using NzbDrone.Core.ArtistStats; using NzbDrone.SignalR; using Lidarr.Http; -namespace Lidarr.Api.V3.Albums +namespace Lidarr.Api.V1.Albums { public abstract class AlbumModuleWithSignalR : LidarrRestModuleWithSignalR { diff --git a/src/Lidarr.Api.V3/Albums/AlbumResource.cs b/src/Lidarr.Api.V1/Albums/AlbumResource.cs similarity index 97% rename from src/Lidarr.Api.V3/Albums/AlbumResource.cs rename to src/Lidarr.Api.V1/Albums/AlbumResource.cs index ddfc8c5b1..b4df959d4 100644 --- a/src/Lidarr.Api.V3/Albums/AlbumResource.cs +++ b/src/Lidarr.Api.V1/Albums/AlbumResource.cs @@ -3,11 +3,11 @@ using System.Collections.Generic; using System.Linq; using Newtonsoft.Json; using NzbDrone.Core.Music; -using Lidarr.Api.V3.Artist; +using Lidarr.Api.V1.Artist; using Lidarr.Http.REST; using NzbDrone.Core.MediaCover; -namespace Lidarr.Api.V3.Albums +namespace Lidarr.Api.V1.Albums { public class AlbumResource : RestResource { diff --git a/src/Lidarr.Api.V3/Albums/AlbumStatisticsResource.cs b/src/Lidarr.Api.V1/Albums/AlbumStatisticsResource.cs similarity index 97% rename from src/Lidarr.Api.V3/Albums/AlbumStatisticsResource.cs rename to src/Lidarr.Api.V1/Albums/AlbumStatisticsResource.cs index e53450ed5..cb7e8c2ed 100644 --- a/src/Lidarr.Api.V3/Albums/AlbumStatisticsResource.cs +++ b/src/Lidarr.Api.V1/Albums/AlbumStatisticsResource.cs @@ -1,7 +1,7 @@ using System; using NzbDrone.Core.ArtistStats; -namespace Lidarr.Api.V3.Albums +namespace Lidarr.Api.V1.Albums { public class AlbumStatisticsResource { diff --git a/src/Lidarr.Api.V3/Albums/AlbumsMonitoredResource.cs b/src/Lidarr.Api.V1/Albums/AlbumsMonitoredResource.cs similarity index 86% rename from src/Lidarr.Api.V3/Albums/AlbumsMonitoredResource.cs rename to src/Lidarr.Api.V1/Albums/AlbumsMonitoredResource.cs index 9c0120eda..8ccd7efea 100644 --- a/src/Lidarr.Api.V3/Albums/AlbumsMonitoredResource.cs +++ b/src/Lidarr.Api.V1/Albums/AlbumsMonitoredResource.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace Lidarr.Api.V3.Albums +namespace Lidarr.Api.V1.Albums { public class AlbumsMonitoredResource { diff --git a/src/Lidarr.Api.V3/Artist/AlternateTitleResource.cs b/src/Lidarr.Api.V1/Artist/AlternateTitleResource.cs similarity index 85% rename from src/Lidarr.Api.V3/Artist/AlternateTitleResource.cs rename to src/Lidarr.Api.V1/Artist/AlternateTitleResource.cs index d3df621b9..6da1c997f 100644 --- a/src/Lidarr.Api.V3/Artist/AlternateTitleResource.cs +++ b/src/Lidarr.Api.V1/Artist/AlternateTitleResource.cs @@ -1,4 +1,4 @@ -namespace Lidarr.Api.V3.Series +namespace Lidarr.Api.V1.Series { public class AlternateTitleResource { diff --git a/src/Lidarr.Api.V3/Artist/ArtistEditorDeleteResource.cs b/src/Lidarr.Api.V1/Artist/ArtistEditorDeleteResource.cs similarity index 85% rename from src/Lidarr.Api.V3/Artist/ArtistEditorDeleteResource.cs rename to src/Lidarr.Api.V1/Artist/ArtistEditorDeleteResource.cs index 09c5b892c..cd719149e 100644 --- a/src/Lidarr.Api.V3/Artist/ArtistEditorDeleteResource.cs +++ b/src/Lidarr.Api.V1/Artist/ArtistEditorDeleteResource.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Lidarr.Api.V3.Artist +namespace Lidarr.Api.V1.Artist { public class ArtistEditorDeleteResource { diff --git a/src/Lidarr.Api.V3/Artist/ArtistEditorModule.cs b/src/Lidarr.Api.V1/Artist/ArtistEditorModule.cs similarity index 96% rename from src/Lidarr.Api.V3/Artist/ArtistEditorModule.cs rename to src/Lidarr.Api.V1/Artist/ArtistEditorModule.cs index 2cbdd8046..56c7a373b 100644 --- a/src/Lidarr.Api.V3/Artist/ArtistEditorModule.cs +++ b/src/Lidarr.Api.V1/Artist/ArtistEditorModule.cs @@ -4,9 +4,9 @@ using NzbDrone.Common.Extensions; using NzbDrone.Core.Music; using Lidarr.Http.Extensions; -namespace Lidarr.Api.V3.Artist +namespace Lidarr.Api.V1.Artist { - public class ArtistEditorModule : SonarrV3Module + public class ArtistEditorModule : LidarrV1Module { private readonly IArtistService _artistService; diff --git a/src/Lidarr.Api.V3/Artist/ArtistEditorResource.cs b/src/Lidarr.Api.V1/Artist/ArtistEditorResource.cs similarity index 95% rename from src/Lidarr.Api.V3/Artist/ArtistEditorResource.cs rename to src/Lidarr.Api.V1/Artist/ArtistEditorResource.cs index 649b9910a..b8724213d 100644 --- a/src/Lidarr.Api.V3/Artist/ArtistEditorResource.cs +++ b/src/Lidarr.Api.V1/Artist/ArtistEditorResource.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using NzbDrone.Core.Music; -namespace Lidarr.Api.V3.Artist +namespace Lidarr.Api.V1.Artist { public class ArtistEditorResource { diff --git a/src/Lidarr.Api.V3/Artist/ArtistImportModule.cs b/src/Lidarr.Api.V1/Artist/ArtistImportModule.cs similarity index 96% rename from src/Lidarr.Api.V3/Artist/ArtistImportModule.cs rename to src/Lidarr.Api.V1/Artist/ArtistImportModule.cs index 2a3e1519e..f24c04f86 100644 --- a/src/Lidarr.Api.V3/Artist/ArtistImportModule.cs +++ b/src/Lidarr.Api.V1/Artist/ArtistImportModule.cs @@ -4,7 +4,7 @@ using NzbDrone.Core.Music; using Lidarr.Http; using Lidarr.Http.Extensions; -namespace Lidarr.Api.V3.Artist +namespace Lidarr.Api.V1.Artist { public class ArtistImportModule : LidarrRestModule { diff --git a/src/Lidarr.Api.V3/Artist/ArtistLookupModule.cs b/src/Lidarr.Api.V1/Artist/ArtistLookupModule.cs similarity index 97% rename from src/Lidarr.Api.V3/Artist/ArtistLookupModule.cs rename to src/Lidarr.Api.V1/Artist/ArtistLookupModule.cs index d0cbc6349..636f979e6 100644 --- a/src/Lidarr.Api.V3/Artist/ArtistLookupModule.cs +++ b/src/Lidarr.Api.V1/Artist/ArtistLookupModule.cs @@ -6,7 +6,7 @@ using NzbDrone.Core.MetadataSource; using Lidarr.Http; using Lidarr.Http.Extensions; -namespace Lidarr.Api.V3.Artist +namespace Lidarr.Api.V1.Artist { public class ArtistLookupModule : LidarrRestModule { diff --git a/src/Lidarr.Api.V3/Artist/ArtistModule.cs b/src/Lidarr.Api.V1/Artist/ArtistModule.cs similarity index 99% rename from src/Lidarr.Api.V3/Artist/ArtistModule.cs rename to src/Lidarr.Api.V1/Artist/ArtistModule.cs index 0ead0137c..b19b7e527 100644 --- a/src/Lidarr.Api.V3/Artist/ArtistModule.cs +++ b/src/Lidarr.Api.V1/Artist/ArtistModule.cs @@ -13,13 +13,13 @@ using NzbDrone.Core.Music; using NzbDrone.Core.Music.Events; using NzbDrone.Core.Validation; using NzbDrone.Core.Validation.Paths; -using Lidarr.Api.V3.Albums; +using Lidarr.Api.V1.Albums; using NzbDrone.SignalR; using Lidarr.Http; using Lidarr.Http.Extensions; using Lidarr.Http.Mapping; -namespace Lidarr.Api.V3.Artist +namespace Lidarr.Api.V1.Artist { public class ArtistModule : LidarrRestModuleWithSignalR, IHandle, diff --git a/src/Lidarr.Api.V3/Artist/ArtistResource.cs b/src/Lidarr.Api.V1/Artist/ArtistResource.cs similarity index 99% rename from src/Lidarr.Api.V3/Artist/ArtistResource.cs rename to src/Lidarr.Api.V1/Artist/ArtistResource.cs index 2ac1f42c4..b4c4e69bc 100644 --- a/src/Lidarr.Api.V3/Artist/ArtistResource.cs +++ b/src/Lidarr.Api.V1/Artist/ArtistResource.cs @@ -3,10 +3,10 @@ using System.Collections.Generic; using System.Linq; using NzbDrone.Core.MediaCover; using NzbDrone.Core.Music; -using Lidarr.Api.V3.Albums; +using Lidarr.Api.V1.Albums; using Lidarr.Http.REST; -namespace Lidarr.Api.V3.Artist +namespace Lidarr.Api.V1.Artist { public class ArtistResource : RestResource { diff --git a/src/Lidarr.Api.V3/Blacklist/BlacklistModule.cs b/src/Lidarr.Api.V1/Blacklist/BlacklistModule.cs similarity index 94% rename from src/Lidarr.Api.V3/Blacklist/BlacklistModule.cs rename to src/Lidarr.Api.V1/Blacklist/BlacklistModule.cs index 7fecda1ca..2a93d68d9 100644 --- a/src/Lidarr.Api.V3/Blacklist/BlacklistModule.cs +++ b/src/Lidarr.Api.V1/Blacklist/BlacklistModule.cs @@ -1,8 +1,8 @@ -using NzbDrone.Core.Blacklisting; +using NzbDrone.Core.Blacklisting; using NzbDrone.Core.Datastore; using Lidarr.Http; -namespace Lidarr.Api.V3.Blacklist +namespace Lidarr.Api.V1.Blacklist { public class BlacklistModule : LidarrRestModule { @@ -33,4 +33,4 @@ namespace Lidarr.Api.V3.Blacklist _blacklistService.Delete(id); } } -} \ No newline at end of file +} diff --git a/src/Lidarr.Api.V3/Blacklist/BlacklistResource.cs b/src/Lidarr.Api.V1/Blacklist/BlacklistResource.cs similarity index 95% rename from src/Lidarr.Api.V3/Blacklist/BlacklistResource.cs rename to src/Lidarr.Api.V1/Blacklist/BlacklistResource.cs index d47926b97..61445bc94 100644 --- a/src/Lidarr.Api.V3/Blacklist/BlacklistResource.cs +++ b/src/Lidarr.Api.V1/Blacklist/BlacklistResource.cs @@ -3,10 +3,10 @@ using System.Collections.Generic; using NzbDrone.Core.Indexers; using NzbDrone.Core.Languages; using NzbDrone.Core.Qualities; -using Lidarr.Api.V3.Artist; +using Lidarr.Api.V1.Artist; using Lidarr.Http.REST; -namespace Lidarr.Api.V3.Blacklist +namespace Lidarr.Api.V1.Blacklist { public class BlacklistResource : RestResource { diff --git a/src/Lidarr.Api.V3/Calendar/CalendarFeedModule.cs b/src/Lidarr.Api.V1/Calendar/CalendarFeedModule.cs similarity index 97% rename from src/Lidarr.Api.V3/Calendar/CalendarFeedModule.cs rename to src/Lidarr.Api.V1/Calendar/CalendarFeedModule.cs index 86a467be7..b2493437c 100644 --- a/src/Lidarr.Api.V3/Calendar/CalendarFeedModule.cs +++ b/src/Lidarr.Api.V1/Calendar/CalendarFeedModule.cs @@ -14,9 +14,9 @@ using NzbDrone.Core.Tags; using NzbDrone.Core.Music; using Lidarr.Http.Extensions; -namespace Lidarr.Api.V3.Calendar +namespace Lidarr.Api.V1.Calendar { - public class CalendarFeedModule : SonarrV3FeedModule + public class CalendarFeedModule : LidarrV1FeedModule { private readonly IAlbumService _albumService; private readonly ITagService _tagService; diff --git a/src/Lidarr.Api.V3/Calendar/CalendarModule.cs b/src/Lidarr.Api.V1/Calendar/CalendarModule.cs similarity index 96% rename from src/Lidarr.Api.V3/Calendar/CalendarModule.cs rename to src/Lidarr.Api.V1/Calendar/CalendarModule.cs index db4e78722..8c9908a01 100644 --- a/src/Lidarr.Api.V3/Calendar/CalendarModule.cs +++ b/src/Lidarr.Api.V1/Calendar/CalendarModule.cs @@ -5,10 +5,10 @@ using NzbDrone.Core.DecisionEngine; using NzbDrone.Core.Music; using NzbDrone.Core.ArtistStats; using NzbDrone.SignalR; -using Lidarr.Api.V3.Albums; +using Lidarr.Api.V1.Albums; using Lidarr.Http.Extensions; -namespace Lidarr.Api.V3.Calendar +namespace Lidarr.Api.V1.Calendar { public class CalendarModule : AlbumModuleWithSignalR { diff --git a/src/Lidarr.Api.V3/Commands/CommandModule.cs b/src/Lidarr.Api.V1/Commands/CommandModule.cs similarity index 98% rename from src/Lidarr.Api.V3/Commands/CommandModule.cs rename to src/Lidarr.Api.V1/Commands/CommandModule.cs index c4ceba3ed..71100f31a 100644 --- a/src/Lidarr.Api.V3/Commands/CommandModule.cs +++ b/src/Lidarr.Api.V1/Commands/CommandModule.cs @@ -11,7 +11,7 @@ using Lidarr.Http; using Lidarr.Http.Extensions; using Lidarr.Http.Validation; -namespace Lidarr.Api.V3.Commands +namespace Lidarr.Api.V1.Commands { public class CommandModule : LidarrRestModuleWithSignalR, IHandle { diff --git a/src/Lidarr.Api.V3/Commands/CommandResource.cs b/src/Lidarr.Api.V1/Commands/CommandResource.cs similarity index 98% rename from src/Lidarr.Api.V3/Commands/CommandResource.cs rename to src/Lidarr.Api.V1/Commands/CommandResource.cs index 743db720c..6e0f8a907 100644 --- a/src/Lidarr.Api.V3/Commands/CommandResource.cs +++ b/src/Lidarr.Api.V1/Commands/CommandResource.cs @@ -5,7 +5,7 @@ using Newtonsoft.Json; using NzbDrone.Core.Messaging.Commands; using Lidarr.Http.REST; -namespace Lidarr.Api.V3.Commands +namespace Lidarr.Api.V1.Commands { public class CommandResource : RestResource { diff --git a/src/Lidarr.Api.V3/Config/DownloadClientConfigModule.cs b/src/Lidarr.Api.V1/Config/DownloadClientConfigModule.cs similarity index 93% rename from src/Lidarr.Api.V3/Config/DownloadClientConfigModule.cs rename to src/Lidarr.Api.V1/Config/DownloadClientConfigModule.cs index 262b378c7..39290ec79 100644 --- a/src/Lidarr.Api.V3/Config/DownloadClientConfigModule.cs +++ b/src/Lidarr.Api.V1/Config/DownloadClientConfigModule.cs @@ -1,6 +1,6 @@ using NzbDrone.Core.Configuration; -namespace Lidarr.Api.V3.Config +namespace Lidarr.Api.V1.Config { public class DownloadClientConfigModule : SonarrConfigModule { diff --git a/src/Lidarr.Api.V3/Config/DownloadClientConfigResource.cs b/src/Lidarr.Api.V1/Config/DownloadClientConfigResource.cs similarity index 97% rename from src/Lidarr.Api.V3/Config/DownloadClientConfigResource.cs rename to src/Lidarr.Api.V1/Config/DownloadClientConfigResource.cs index 49340c01b..50bdaefc9 100644 --- a/src/Lidarr.Api.V3/Config/DownloadClientConfigResource.cs +++ b/src/Lidarr.Api.V1/Config/DownloadClientConfigResource.cs @@ -1,7 +1,7 @@ using NzbDrone.Core.Configuration; using Lidarr.Http.REST; -namespace Lidarr.Api.V3.Config +namespace Lidarr.Api.V1.Config { public class DownloadClientConfigResource : RestResource { diff --git a/src/Lidarr.Api.V3/Config/HostConfigModule.cs b/src/Lidarr.Api.V1/Config/HostConfigModule.cs similarity index 99% rename from src/Lidarr.Api.V3/Config/HostConfigModule.cs rename to src/Lidarr.Api.V1/Config/HostConfigModule.cs index 081ef9f5c..624d21605 100644 --- a/src/Lidarr.Api.V3/Config/HostConfigModule.cs +++ b/src/Lidarr.Api.V1/Config/HostConfigModule.cs @@ -10,7 +10,7 @@ using NzbDrone.Core.Validation; using NzbDrone.Core.Validation.Paths; using Lidarr.Http; -namespace Lidarr.Api.V3.Config +namespace Lidarr.Api.V1.Config { public class HostConfigModule : LidarrRestModule { diff --git a/src/Lidarr.Api.V3/Config/HostConfigResource.cs b/src/Lidarr.Api.V1/Config/HostConfigResource.cs similarity index 99% rename from src/Lidarr.Api.V3/Config/HostConfigResource.cs rename to src/Lidarr.Api.V1/Config/HostConfigResource.cs index 8d45f2a23..71d01e10e 100644 --- a/src/Lidarr.Api.V3/Config/HostConfigResource.cs +++ b/src/Lidarr.Api.V1/Config/HostConfigResource.cs @@ -4,7 +4,7 @@ using NzbDrone.Core.Configuration; using NzbDrone.Core.Update; using Lidarr.Http.REST; -namespace Lidarr.Api.V3.Config +namespace Lidarr.Api.V1.Config { public class HostConfigResource : RestResource { diff --git a/src/Lidarr.Api.V3/Config/IndexerConfigModule.cs b/src/Lidarr.Api.V1/Config/IndexerConfigModule.cs similarity index 96% rename from src/Lidarr.Api.V3/Config/IndexerConfigModule.cs rename to src/Lidarr.Api.V1/Config/IndexerConfigModule.cs index b7a066539..6b10b46c9 100644 --- a/src/Lidarr.Api.V3/Config/IndexerConfigModule.cs +++ b/src/Lidarr.Api.V1/Config/IndexerConfigModule.cs @@ -2,7 +2,7 @@ using NzbDrone.Core.Configuration; using Lidarr.Http.Validation; -namespace Lidarr.Api.V3.Config +namespace Lidarr.Api.V1.Config { public class IndexerConfigModule : SonarrConfigModule { diff --git a/src/Lidarr.Api.V3/Config/IndexerConfigResource.cs b/src/Lidarr.Api.V1/Config/IndexerConfigResource.cs similarity index 95% rename from src/Lidarr.Api.V3/Config/IndexerConfigResource.cs rename to src/Lidarr.Api.V1/Config/IndexerConfigResource.cs index ffeb6d76d..a5f1f92fb 100644 --- a/src/Lidarr.Api.V3/Config/IndexerConfigResource.cs +++ b/src/Lidarr.Api.V1/Config/IndexerConfigResource.cs @@ -1,7 +1,7 @@ using NzbDrone.Core.Configuration; using Lidarr.Http.REST; -namespace Lidarr.Api.V3.Config +namespace Lidarr.Api.V1.Config { public class IndexerConfigResource : RestResource { diff --git a/src/Lidarr.Api.V3/Config/MediaManagementConfigModule.cs b/src/Lidarr.Api.V1/Config/MediaManagementConfigModule.cs similarity index 96% rename from src/Lidarr.Api.V3/Config/MediaManagementConfigModule.cs rename to src/Lidarr.Api.V1/Config/MediaManagementConfigModule.cs index dbf8ff9a4..d15e65ee8 100644 --- a/src/Lidarr.Api.V3/Config/MediaManagementConfigModule.cs +++ b/src/Lidarr.Api.V1/Config/MediaManagementConfigModule.cs @@ -2,7 +2,7 @@ using NzbDrone.Core.Configuration; using NzbDrone.Core.Validation.Paths; -namespace Lidarr.Api.V3.Config +namespace Lidarr.Api.V1.Config { public class MediaManagementConfigModule : SonarrConfigModule { diff --git a/src/Lidarr.Api.V3/Config/MediaManagementConfigResource.cs b/src/Lidarr.Api.V1/Config/MediaManagementConfigResource.cs similarity index 98% rename from src/Lidarr.Api.V3/Config/MediaManagementConfigResource.cs rename to src/Lidarr.Api.V1/Config/MediaManagementConfigResource.cs index 857e8baa0..95d413384 100644 --- a/src/Lidarr.Api.V3/Config/MediaManagementConfigResource.cs +++ b/src/Lidarr.Api.V1/Config/MediaManagementConfigResource.cs @@ -2,7 +2,7 @@ using NzbDrone.Core.Configuration; using NzbDrone.Core.MediaFiles; using Lidarr.Http.REST; -namespace Lidarr.Api.V3.Config +namespace Lidarr.Api.V1.Config { public class MediaManagementConfigResource : RestResource { diff --git a/src/Lidarr.Api.V3/Config/MetadataProviderConfigModule.cs b/src/Lidarr.Api.V1/Config/MetadataProviderConfigModule.cs similarity index 95% rename from src/Lidarr.Api.V3/Config/MetadataProviderConfigModule.cs rename to src/Lidarr.Api.V1/Config/MetadataProviderConfigModule.cs index 9292c4842..a494a70e5 100644 --- a/src/Lidarr.Api.V3/Config/MetadataProviderConfigModule.cs +++ b/src/Lidarr.Api.V1/Config/MetadataProviderConfigModule.cs @@ -4,7 +4,7 @@ using NzbDrone.Core.Configuration; using Lidarr.Http; using NzbDrone.Core.Validation; -namespace Lidarr.Api.V3.Config +namespace Lidarr.Api.V1.Config { public class MetadataProviderConfigModule : SonarrConfigModule { diff --git a/src/Lidarr.Api.V3/Config/MetadataProviderConfigResource.cs b/src/Lidarr.Api.V1/Config/MetadataProviderConfigResource.cs similarity index 94% rename from src/Lidarr.Api.V3/Config/MetadataProviderConfigResource.cs rename to src/Lidarr.Api.V1/Config/MetadataProviderConfigResource.cs index f14ff6ce8..827ab6905 100644 --- a/src/Lidarr.Api.V3/Config/MetadataProviderConfigResource.cs +++ b/src/Lidarr.Api.V1/Config/MetadataProviderConfigResource.cs @@ -1,7 +1,7 @@ using NzbDrone.Core.Configuration; using Lidarr.Http.REST; -namespace Lidarr.Api.V3.Config +namespace Lidarr.Api.V1.Config { public class MetadataProviderConfigResource : RestResource { diff --git a/src/Lidarr.Api.V3/Config/NamingConfigModule.cs b/src/Lidarr.Api.V1/Config/NamingConfigModule.cs similarity index 99% rename from src/Lidarr.Api.V3/Config/NamingConfigModule.cs rename to src/Lidarr.Api.V1/Config/NamingConfigModule.cs index 4484f0455..4af476d20 100644 --- a/src/Lidarr.Api.V3/Config/NamingConfigModule.cs +++ b/src/Lidarr.Api.V1/Config/NamingConfigModule.cs @@ -10,7 +10,7 @@ using Lidarr.Http; using Lidarr.Http.Extensions; using Lidarr.Http.Mapping; -namespace Lidarr.Api.V3.Config +namespace Lidarr.Api.V1.Config { public class NamingConfigModule : LidarrRestModule { diff --git a/src/Lidarr.Api.V3/Config/NamingConfigResource.cs b/src/Lidarr.Api.V1/Config/NamingConfigResource.cs similarity index 95% rename from src/Lidarr.Api.V3/Config/NamingConfigResource.cs rename to src/Lidarr.Api.V1/Config/NamingConfigResource.cs index f081d65a6..fce16aa99 100644 --- a/src/Lidarr.Api.V3/Config/NamingConfigResource.cs +++ b/src/Lidarr.Api.V1/Config/NamingConfigResource.cs @@ -1,6 +1,6 @@ using Lidarr.Http.REST; -namespace Lidarr.Api.V3.Config +namespace Lidarr.Api.V1.Config { public class NamingConfigResource : RestResource { diff --git a/src/Lidarr.Api.V3/Config/NamingExampleResource.cs b/src/Lidarr.Api.V1/Config/NamingExampleResource.cs similarity index 98% rename from src/Lidarr.Api.V3/Config/NamingExampleResource.cs rename to src/Lidarr.Api.V1/Config/NamingExampleResource.cs index d516dc8e1..27960f594 100644 --- a/src/Lidarr.Api.V3/Config/NamingExampleResource.cs +++ b/src/Lidarr.Api.V1/Config/NamingExampleResource.cs @@ -1,6 +1,6 @@ using NzbDrone.Core.Organizer; -namespace Lidarr.Api.V3.Config +namespace Lidarr.Api.V1.Config { public class NamingExampleResource { diff --git a/src/Lidarr.Api.V3/Config/SonarrConfigModule.cs b/src/Lidarr.Api.V1/Config/SonarrConfigModule.cs similarity index 98% rename from src/Lidarr.Api.V3/Config/SonarrConfigModule.cs rename to src/Lidarr.Api.V1/Config/SonarrConfigModule.cs index b294ef7bb..30e572482 100644 --- a/src/Lidarr.Api.V3/Config/SonarrConfigModule.cs +++ b/src/Lidarr.Api.V1/Config/SonarrConfigModule.cs @@ -4,7 +4,7 @@ using NzbDrone.Core.Configuration; using Lidarr.Http; using Lidarr.Http.REST; -namespace Lidarr.Api.V3.Config +namespace Lidarr.Api.V1.Config { public abstract class SonarrConfigModule : LidarrRestModule where TResource : RestResource, new() { diff --git a/src/Lidarr.Api.V3/Config/UiConfigModule.cs b/src/Lidarr.Api.V1/Config/UiConfigModule.cs similarity index 93% rename from src/Lidarr.Api.V3/Config/UiConfigModule.cs rename to src/Lidarr.Api.V1/Config/UiConfigModule.cs index 2bc1fd4f9..a34c6ab6b 100644 --- a/src/Lidarr.Api.V3/Config/UiConfigModule.cs +++ b/src/Lidarr.Api.V1/Config/UiConfigModule.cs @@ -3,7 +3,7 @@ using System.Reflection; using NzbDrone.Core.Configuration; using Lidarr.Http; -namespace Lidarr.Api.V3.Config +namespace Lidarr.Api.V1.Config { public class UiConfigModule : SonarrConfigModule { diff --git a/src/Lidarr.Api.V3/Config/UiConfigResource.cs b/src/Lidarr.Api.V1/Config/UiConfigResource.cs similarity index 97% rename from src/Lidarr.Api.V3/Config/UiConfigResource.cs rename to src/Lidarr.Api.V1/Config/UiConfigResource.cs index 28ed7ce28..6f66a1166 100644 --- a/src/Lidarr.Api.V3/Config/UiConfigResource.cs +++ b/src/Lidarr.Api.V1/Config/UiConfigResource.cs @@ -1,7 +1,7 @@ using NzbDrone.Core.Configuration; using Lidarr.Http.REST; -namespace Lidarr.Api.V3.Config +namespace Lidarr.Api.V1.Config { public class UiConfigResource : RestResource { diff --git a/src/Lidarr.Api.V3/DiskSpace/DiskSpaceModule.cs b/src/Lidarr.Api.V1/DiskSpace/DiskSpaceModule.cs similarity index 94% rename from src/Lidarr.Api.V3/DiskSpace/DiskSpaceModule.cs rename to src/Lidarr.Api.V1/DiskSpace/DiskSpaceModule.cs index 15806fb59..7d57cefd1 100644 --- a/src/Lidarr.Api.V3/DiskSpace/DiskSpaceModule.cs +++ b/src/Lidarr.Api.V1/DiskSpace/DiskSpaceModule.cs @@ -2,7 +2,7 @@ using NzbDrone.Core.DiskSpace; using Lidarr.Http; -namespace Lidarr.Api.V3.DiskSpace +namespace Lidarr.Api.V1.DiskSpace { public class DiskSpaceModule :LidarrRestModule { diff --git a/src/Lidarr.Api.V3/DiskSpace/DiskSpaceResource.cs b/src/Lidarr.Api.V1/DiskSpace/DiskSpaceResource.cs similarity index 95% rename from src/Lidarr.Api.V3/DiskSpace/DiskSpaceResource.cs rename to src/Lidarr.Api.V1/DiskSpace/DiskSpaceResource.cs index fc236f1c7..9adcfaf50 100644 --- a/src/Lidarr.Api.V3/DiskSpace/DiskSpaceResource.cs +++ b/src/Lidarr.Api.V1/DiskSpace/DiskSpaceResource.cs @@ -1,6 +1,6 @@ using Lidarr.Http.REST; -namespace Lidarr.Api.V3.DiskSpace +namespace Lidarr.Api.V1.DiskSpace { public class DiskSpaceResource : RestResource { diff --git a/src/Lidarr.Api.V3/DownloadClient/DownloadClientModule.cs b/src/Lidarr.Api.V1/DownloadClient/DownloadClientModule.cs similarity index 94% rename from src/Lidarr.Api.V3/DownloadClient/DownloadClientModule.cs rename to src/Lidarr.Api.V1/DownloadClient/DownloadClientModule.cs index af12eb21d..789932dfd 100644 --- a/src/Lidarr.Api.V3/DownloadClient/DownloadClientModule.cs +++ b/src/Lidarr.Api.V1/DownloadClient/DownloadClientModule.cs @@ -1,6 +1,6 @@ using NzbDrone.Core.Download; -namespace Lidarr.Api.V3.DownloadClient +namespace Lidarr.Api.V1.DownloadClient { public class DownloadClientModule : ProviderModuleBase { diff --git a/src/Lidarr.Api.V3/DownloadClient/DownloadClientResource.cs b/src/Lidarr.Api.V1/DownloadClient/DownloadClientResource.cs similarity index 96% rename from src/Lidarr.Api.V3/DownloadClient/DownloadClientResource.cs rename to src/Lidarr.Api.V1/DownloadClient/DownloadClientResource.cs index 6205f8813..bab6faa84 100644 --- a/src/Lidarr.Api.V3/DownloadClient/DownloadClientResource.cs +++ b/src/Lidarr.Api.V1/DownloadClient/DownloadClientResource.cs @@ -1,7 +1,7 @@ using NzbDrone.Core.Download; using NzbDrone.Core.Indexers; -namespace Lidarr.Api.V3.DownloadClient +namespace Lidarr.Api.V1.DownloadClient { public class DownloadClientResource : ProviderResource { diff --git a/src/Lidarr.Api.V3/FileSystem/FileSystemModule.cs b/src/Lidarr.Api.V1/FileSystem/FileSystemModule.cs similarity index 96% rename from src/Lidarr.Api.V3/FileSystem/FileSystemModule.cs rename to src/Lidarr.Api.V1/FileSystem/FileSystemModule.cs index f6a9bb24a..0ed90e37c 100644 --- a/src/Lidarr.Api.V3/FileSystem/FileSystemModule.cs +++ b/src/Lidarr.Api.V1/FileSystem/FileSystemModule.cs @@ -7,9 +7,9 @@ using NzbDrone.Common.Extensions; using NzbDrone.Core.MediaFiles; using Lidarr.Http.Extensions; -namespace Lidarr.Api.V3.FileSystem +namespace Lidarr.Api.V1.FileSystem { - public class FileSystemModule : SonarrV3Module + public class FileSystemModule : LidarrV1Module { private readonly IFileSystemLookupService _fileSystemLookupService; private readonly IDiskProvider _diskProvider; diff --git a/src/Lidarr.Api.V3/Health/HealthModule.cs b/src/Lidarr.Api.V1/Health/HealthModule.cs similarity index 96% rename from src/Lidarr.Api.V3/Health/HealthModule.cs rename to src/Lidarr.Api.V1/Health/HealthModule.cs index d299b40f7..6fa7f2efd 100644 --- a/src/Lidarr.Api.V3/Health/HealthModule.cs +++ b/src/Lidarr.Api.V1/Health/HealthModule.cs @@ -5,7 +5,7 @@ using NzbDrone.Core.Messaging.Events; using NzbDrone.SignalR; using Lidarr.Http; -namespace Lidarr.Api.V3.Health +namespace Lidarr.Api.V1.Health { public class HealthModule : LidarrRestModuleWithSignalR, IHandle diff --git a/src/Lidarr.Api.V3/Health/HealthResource.cs b/src/Lidarr.Api.V1/Health/HealthResource.cs similarity index 97% rename from src/Lidarr.Api.V3/Health/HealthResource.cs rename to src/Lidarr.Api.V1/Health/HealthResource.cs index feebcb230..b7f176630 100644 --- a/src/Lidarr.Api.V3/Health/HealthResource.cs +++ b/src/Lidarr.Api.V1/Health/HealthResource.cs @@ -4,7 +4,7 @@ using NzbDrone.Common.Http; using NzbDrone.Core.HealthCheck; using Lidarr.Http.REST; -namespace Lidarr.Api.V3.Health +namespace Lidarr.Api.V1.Health { public class HealthResource : RestResource { diff --git a/src/Lidarr.Api.V3/History/HistoryModule.cs b/src/Lidarr.Api.V1/History/HistoryModule.cs similarity index 96% rename from src/Lidarr.Api.V3/History/HistoryModule.cs rename to src/Lidarr.Api.V1/History/HistoryModule.cs index 9b1c73799..0f9eb48bd 100644 --- a/src/Lidarr.Api.V3/History/HistoryModule.cs +++ b/src/Lidarr.Api.V1/History/HistoryModule.cs @@ -4,13 +4,13 @@ using NzbDrone.Core.Datastore; using NzbDrone.Core.DecisionEngine; using NzbDrone.Core.Download; using NzbDrone.Core.History; -using Lidarr.Api.V3.Albums; -using Lidarr.Api.V3.Artist; -using Lidarr.Api.V3.Tracks; +using Lidarr.Api.V1.Albums; +using Lidarr.Api.V1.Artist; +using Lidarr.Api.V1.Tracks; using Lidarr.Http; using Lidarr.Http.Extensions; -namespace Lidarr.Api.V3.History +namespace Lidarr.Api.V1.History { public class HistoryModule : LidarrRestModule { diff --git a/src/Lidarr.Api.V3/History/HistoryResource.cs b/src/Lidarr.Api.V1/History/HistoryResource.cs similarity index 93% rename from src/Lidarr.Api.V3/History/HistoryResource.cs rename to src/Lidarr.Api.V1/History/HistoryResource.cs index 86d8a9964..a4a38ed6e 100644 --- a/src/Lidarr.Api.V3/History/HistoryResource.cs +++ b/src/Lidarr.Api.V1/History/HistoryResource.cs @@ -3,12 +3,12 @@ using System.Collections.Generic; using NzbDrone.Core.History; using NzbDrone.Core.Languages; using NzbDrone.Core.Qualities; -using Lidarr.Api.V3.Albums; -using Lidarr.Api.V3.Artist; -using Lidarr.Api.V3.Tracks; +using Lidarr.Api.V1.Albums; +using Lidarr.Api.V1.Artist; +using Lidarr.Api.V1.Tracks; using Lidarr.Http.REST; -namespace Lidarr.Api.V3.History +namespace Lidarr.Api.V1.History { public class HistoryResource : RestResource { diff --git a/src/Lidarr.Api.V3/Indexers/IndexerModule.cs b/src/Lidarr.Api.V1/Indexers/IndexerModule.cs similarity index 94% rename from src/Lidarr.Api.V3/Indexers/IndexerModule.cs rename to src/Lidarr.Api.V1/Indexers/IndexerModule.cs index c3451b61b..9156f03c0 100644 --- a/src/Lidarr.Api.V3/Indexers/IndexerModule.cs +++ b/src/Lidarr.Api.V1/Indexers/IndexerModule.cs @@ -1,6 +1,6 @@ using NzbDrone.Core.Indexers; -namespace Lidarr.Api.V3.Indexers +namespace Lidarr.Api.V1.Indexers { public class IndexerModule : ProviderModuleBase { diff --git a/src/Lidarr.Api.V3/Indexers/IndexerResource.cs b/src/Lidarr.Api.V1/Indexers/IndexerResource.cs similarity index 97% rename from src/Lidarr.Api.V3/Indexers/IndexerResource.cs rename to src/Lidarr.Api.V1/Indexers/IndexerResource.cs index cfe23ea61..85c1824c8 100644 --- a/src/Lidarr.Api.V3/Indexers/IndexerResource.cs +++ b/src/Lidarr.Api.V1/Indexers/IndexerResource.cs @@ -1,6 +1,6 @@ using NzbDrone.Core.Indexers; -namespace Lidarr.Api.V3.Indexers +namespace Lidarr.Api.V1.Indexers { public class IndexerResource : ProviderResource { diff --git a/src/Lidarr.Api.V3/Indexers/ReleaseModule.cs b/src/Lidarr.Api.V1/Indexers/ReleaseModule.cs similarity index 99% rename from src/Lidarr.Api.V3/Indexers/ReleaseModule.cs rename to src/Lidarr.Api.V1/Indexers/ReleaseModule.cs index 07d7a6de6..6a049212f 100644 --- a/src/Lidarr.Api.V3/Indexers/ReleaseModule.cs +++ b/src/Lidarr.Api.V1/Indexers/ReleaseModule.cs @@ -14,7 +14,7 @@ using NzbDrone.Core.Parser.Model; using Lidarr.Http.Extensions; using HttpStatusCode = System.Net.HttpStatusCode; -namespace Lidarr.Api.V3.Indexers +namespace Lidarr.Api.V1.Indexers { public class ReleaseModule : ReleaseModuleBase { diff --git a/src/Lidarr.Api.V3/Indexers/ReleaseModuleBase.cs b/src/Lidarr.Api.V1/Indexers/ReleaseModuleBase.cs similarity index 97% rename from src/Lidarr.Api.V3/Indexers/ReleaseModuleBase.cs rename to src/Lidarr.Api.V1/Indexers/ReleaseModuleBase.cs index 5d0e79ec5..761f05785 100644 --- a/src/Lidarr.Api.V3/Indexers/ReleaseModuleBase.cs +++ b/src/Lidarr.Api.V1/Indexers/ReleaseModuleBase.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using NzbDrone.Core.DecisionEngine; using Lidarr.Http; -namespace Lidarr.Api.V3.Indexers +namespace Lidarr.Api.V1.Indexers { public abstract class ReleaseModuleBase : LidarrRestModule { diff --git a/src/Lidarr.Api.V3/Indexers/ReleasePushModule.cs b/src/Lidarr.Api.V1/Indexers/ReleasePushModule.cs similarity index 98% rename from src/Lidarr.Api.V3/Indexers/ReleasePushModule.cs rename to src/Lidarr.Api.V1/Indexers/ReleasePushModule.cs index 817602f12..344ee777f 100644 --- a/src/Lidarr.Api.V3/Indexers/ReleasePushModule.cs +++ b/src/Lidarr.Api.V1/Indexers/ReleasePushModule.cs @@ -9,7 +9,7 @@ using NzbDrone.Core.Download; using NzbDrone.Core.Parser.Model; using Lidarr.Http.Extensions; -namespace Lidarr.Api.V3.Indexers +namespace Lidarr.Api.V1.Indexers { class ReleasePushModule : ReleaseModuleBase { diff --git a/src/Lidarr.Api.V3/Indexers/ReleaseResource.cs b/src/Lidarr.Api.V1/Indexers/ReleaseResource.cs similarity index 99% rename from src/Lidarr.Api.V3/Indexers/ReleaseResource.cs rename to src/Lidarr.Api.V1/Indexers/ReleaseResource.cs index eb44fdaf6..fc6ce77a2 100644 --- a/src/Lidarr.Api.V3/Indexers/ReleaseResource.cs +++ b/src/Lidarr.Api.V1/Indexers/ReleaseResource.cs @@ -8,7 +8,7 @@ using NzbDrone.Core.Parser.Model; using NzbDrone.Core.Qualities; using Lidarr.Http.REST; -namespace Lidarr.Api.V3.Indexers +namespace Lidarr.Api.V1.Indexers { public class ReleaseResource : RestResource { diff --git a/src/Lidarr.Api.V3/Lidarr.Api.V3.csproj b/src/Lidarr.Api.V1/Lidarr.Api.V1.csproj similarity index 98% rename from src/Lidarr.Api.V3/Lidarr.Api.V3.csproj rename to src/Lidarr.Api.V1/Lidarr.Api.V1.csproj index 6e3aed69d..5d823a543 100644 --- a/src/Lidarr.Api.V3/Lidarr.Api.V3.csproj +++ b/src/Lidarr.Api.V1/Lidarr.Api.V1.csproj @@ -7,8 +7,8 @@ {7140FF1F-79BE-492F-9188-B21A050BF708} Library Properties - Lidarr.Api.V3 - Lidarr.Api.V3 + Lidarr.Api.V1 + Lidarr.Api.V1 v4.6.1 512 ..\ @@ -167,8 +167,8 @@ - - + + diff --git a/src/Lidarr.Api.V1/LidarrV1FeedModule.cs b/src/Lidarr.Api.V1/LidarrV1FeedModule.cs new file mode 100644 index 000000000..5c457a7f1 --- /dev/null +++ b/src/Lidarr.Api.V1/LidarrV1FeedModule.cs @@ -0,0 +1,12 @@ +using Nancy; + +namespace Lidarr.Api.V1 +{ + public abstract class LidarrV1FeedModule : NancyModule + { + protected LidarrV1FeedModule(string resource) + : base("/feed/v1/" + resource.Trim('/')) + { + } + } +} diff --git a/src/Lidarr.Api.V1/LidarrV1Module.cs b/src/Lidarr.Api.V1/LidarrV1Module.cs new file mode 100644 index 000000000..314581787 --- /dev/null +++ b/src/Lidarr.Api.V1/LidarrV1Module.cs @@ -0,0 +1,12 @@ +using Nancy; + +namespace Lidarr.Api.V1 +{ + public abstract class LidarrV1Module : NancyModule + { + protected LidarrV1Module(string resource) + : base("/api/v1/" + resource.Trim('/')) + { + } + } +} diff --git a/src/Lidarr.Api.V3/Logs/LogFileModule.cs b/src/Lidarr.Api.V1/Logs/LogFileModule.cs similarity index 97% rename from src/Lidarr.Api.V3/Logs/LogFileModule.cs rename to src/Lidarr.Api.V1/Logs/LogFileModule.cs index 19676d523..fadd69ad1 100644 --- a/src/Lidarr.Api.V3/Logs/LogFileModule.cs +++ b/src/Lidarr.Api.V1/Logs/LogFileModule.cs @@ -5,7 +5,7 @@ using NzbDrone.Common.EnvironmentInfo; using NzbDrone.Common.Extensions; using NzbDrone.Core.Configuration; -namespace Lidarr.Api.V3.Logs +namespace Lidarr.Api.V1.Logs { public class LogFileModule : LogFileModuleBase { diff --git a/src/Lidarr.Api.V3/Logs/LogFileModuleBase.cs b/src/Lidarr.Api.V1/Logs/LogFileModuleBase.cs similarity index 94% rename from src/Lidarr.Api.V3/Logs/LogFileModuleBase.cs rename to src/Lidarr.Api.V1/Logs/LogFileModuleBase.cs index 47a8eab6d..36d11b6a3 100644 --- a/src/Lidarr.Api.V3/Logs/LogFileModuleBase.cs +++ b/src/Lidarr.Api.V1/Logs/LogFileModuleBase.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections.Generic; using System.IO; using System.Linq; using Nancy; @@ -7,7 +7,7 @@ using NzbDrone.Common.Disk; using NzbDrone.Core.Configuration; using Lidarr.Http; -namespace Lidarr.Api.V3.Logs +namespace Lidarr.Api.V1.Logs { public abstract class LogFileModuleBase : LidarrRestModule { @@ -44,7 +44,7 @@ namespace Lidarr.Api.V3.Logs Id = i + 1, Filename = filename, LastWriteTime = _diskProvider.FileGetLastWrite(file), - ContentsUrl = string.Format("{0}/api/v3/{1}/{2}", _configFileProvider.UrlBase, Resource, filename), + ContentsUrl = string.Format("{0}/api/v1/{1}/{2}", _configFileProvider.UrlBase, Resource, filename), DownloadUrl = string.Format("{0}/{1}/{2}", _configFileProvider.UrlBase, DownloadUrlRoot, filename) }); } @@ -69,4 +69,4 @@ namespace Lidarr.Api.V3.Logs protected abstract string DownloadUrlRoot { get; } } -} \ No newline at end of file +} diff --git a/src/Lidarr.Api.V3/Logs/LogFileResource.cs b/src/Lidarr.Api.V1/Logs/LogFileResource.cs similarity index 91% rename from src/Lidarr.Api.V3/Logs/LogFileResource.cs rename to src/Lidarr.Api.V1/Logs/LogFileResource.cs index 2bfb7da7c..f99e48445 100644 --- a/src/Lidarr.Api.V3/Logs/LogFileResource.cs +++ b/src/Lidarr.Api.V1/Logs/LogFileResource.cs @@ -1,7 +1,7 @@ using System; using Lidarr.Http.REST; -namespace Lidarr.Api.V3.Logs +namespace Lidarr.Api.V1.Logs { public class LogFileResource : RestResource { diff --git a/src/Lidarr.Api.V3/Logs/LogModule.cs b/src/Lidarr.Api.V1/Logs/LogModule.cs similarity index 98% rename from src/Lidarr.Api.V3/Logs/LogModule.cs rename to src/Lidarr.Api.V1/Logs/LogModule.cs index a1b9b79e3..aac359771 100644 --- a/src/Lidarr.Api.V3/Logs/LogModule.cs +++ b/src/Lidarr.Api.V1/Logs/LogModule.cs @@ -1,7 +1,7 @@ using NzbDrone.Core.Instrumentation; using Lidarr.Http; -namespace Lidarr.Api.V3.Logs +namespace Lidarr.Api.V1.Logs { public class LogModule : LidarrRestModule { diff --git a/src/Lidarr.Api.V3/Logs/LogResource.cs b/src/Lidarr.Api.V1/Logs/LogResource.cs similarity index 97% rename from src/Lidarr.Api.V3/Logs/LogResource.cs rename to src/Lidarr.Api.V1/Logs/LogResource.cs index e3eef3836..c95e42077 100644 --- a/src/Lidarr.Api.V3/Logs/LogResource.cs +++ b/src/Lidarr.Api.V1/Logs/LogResource.cs @@ -2,7 +2,7 @@ using NzbDrone.Core.Instrumentation; using Lidarr.Http.REST; -namespace Lidarr.Api.V3.Logs +namespace Lidarr.Api.V1.Logs { public class LogResource : RestResource { diff --git a/src/Lidarr.Api.V3/Logs/UpdateLogFileModule.cs b/src/Lidarr.Api.V1/Logs/UpdateLogFileModule.cs similarity index 98% rename from src/Lidarr.Api.V3/Logs/UpdateLogFileModule.cs rename to src/Lidarr.Api.V1/Logs/UpdateLogFileModule.cs index f9ac8311c..441ee9e36 100644 --- a/src/Lidarr.Api.V3/Logs/UpdateLogFileModule.cs +++ b/src/Lidarr.Api.V1/Logs/UpdateLogFileModule.cs @@ -7,7 +7,7 @@ using NzbDrone.Common.EnvironmentInfo; using NzbDrone.Common.Extensions; using NzbDrone.Core.Configuration; -namespace Lidarr.Api.V3.Logs +namespace Lidarr.Api.V1.Logs { public class UpdateLogFileModule : LogFileModuleBase { diff --git a/src/Lidarr.Api.V3/ManualImport/ManualImportModule.cs b/src/Lidarr.Api.V1/ManualImport/ManualImportModule.cs similarity index 97% rename from src/Lidarr.Api.V3/ManualImport/ManualImportModule.cs rename to src/Lidarr.Api.V1/ManualImport/ManualImportModule.cs index 11a3e4924..5d5f9f088 100644 --- a/src/Lidarr.Api.V3/ManualImport/ManualImportModule.cs +++ b/src/Lidarr.Api.V1/ManualImport/ManualImportModule.cs @@ -4,7 +4,7 @@ using NzbDrone.Core.MediaFiles.TrackImport.Manual; using NzbDrone.Core.Qualities; using Lidarr.Http; -namespace Lidarr.Api.V3.ManualImport +namespace Lidarr.Api.V1.ManualImport { public class ManualImportModule : LidarrRestModule { diff --git a/src/Lidarr.Api.V3/ManualImport/ManualImportResource.cs b/src/Lidarr.Api.V1/ManualImport/ManualImportResource.cs similarity index 94% rename from src/Lidarr.Api.V3/ManualImport/ManualImportResource.cs rename to src/Lidarr.Api.V1/ManualImport/ManualImportResource.cs index 40d77cadb..368737de5 100644 --- a/src/Lidarr.Api.V3/ManualImport/ManualImportResource.cs +++ b/src/Lidarr.Api.V1/ManualImport/ManualImportResource.cs @@ -3,14 +3,14 @@ using NzbDrone.Core.DecisionEngine; using NzbDrone.Core.MediaFiles.TrackImport.Manual; using NzbDrone.Core.Qualities; using NzbDrone.Core.Languages; -using Lidarr.Api.V3.Artist; -using Lidarr.Api.V3.Albums; -using Lidarr.Api.V3.Tracks; +using Lidarr.Api.V1.Artist; +using Lidarr.Api.V1.Albums; +using Lidarr.Api.V1.Tracks; using Lidarr.Http.REST; using System.Collections.Generic; using System.Linq; -namespace Lidarr.Api.V3.ManualImport +namespace Lidarr.Api.V1.ManualImport { public class ManualImportResource : RestResource { diff --git a/src/Lidarr.Api.V3/MediaCovers/MediaCoverModule.cs b/src/Lidarr.Api.V1/MediaCovers/MediaCoverModule.cs similarity index 95% rename from src/Lidarr.Api.V3/MediaCovers/MediaCoverModule.cs rename to src/Lidarr.Api.V1/MediaCovers/MediaCoverModule.cs index 922cf54a4..f964f51c3 100644 --- a/src/Lidarr.Api.V3/MediaCovers/MediaCoverModule.cs +++ b/src/Lidarr.Api.V1/MediaCovers/MediaCoverModule.cs @@ -6,9 +6,9 @@ using NzbDrone.Common.Disk; using NzbDrone.Common.EnvironmentInfo; using NzbDrone.Common.Extensions; -namespace Lidarr.Api.V3.MediaCovers +namespace Lidarr.Api.V1.MediaCovers { - public class MediaCoverModule : SonarrV3Module + public class MediaCoverModule : LidarrV1Module { private static readonly Regex RegexResizedImage = new Regex(@"-\d+\.jpg$", RegexOptions.Compiled | RegexOptions.IgnoreCase); diff --git a/src/Lidarr.Api.V3/Metadata/MetadataModule.cs b/src/Lidarr.Api.V1/Metadata/MetadataModule.cs similarity index 94% rename from src/Lidarr.Api.V3/Metadata/MetadataModule.cs rename to src/Lidarr.Api.V1/Metadata/MetadataModule.cs index c8de3fc02..1006c47b7 100644 --- a/src/Lidarr.Api.V3/Metadata/MetadataModule.cs +++ b/src/Lidarr.Api.V1/Metadata/MetadataModule.cs @@ -1,6 +1,6 @@ using NzbDrone.Core.Extras.Metadata; -namespace Lidarr.Api.V3.Metadata +namespace Lidarr.Api.V1.Metadata { public class MetadataModule : ProviderModuleBase { diff --git a/src/Lidarr.Api.V3/Metadata/MetadataResource.cs b/src/Lidarr.Api.V1/Metadata/MetadataResource.cs similarity index 96% rename from src/Lidarr.Api.V3/Metadata/MetadataResource.cs rename to src/Lidarr.Api.V1/Metadata/MetadataResource.cs index 3920b46f9..5921b7fcb 100644 --- a/src/Lidarr.Api.V3/Metadata/MetadataResource.cs +++ b/src/Lidarr.Api.V1/Metadata/MetadataResource.cs @@ -1,6 +1,6 @@ using NzbDrone.Core.Extras.Metadata; -namespace Lidarr.Api.V3.Metadata +namespace Lidarr.Api.V1.Metadata { public class MetadataResource : ProviderResource { diff --git a/src/Lidarr.Api.V3/Notifications/NotificationModule.cs b/src/Lidarr.Api.V1/Notifications/NotificationModule.cs similarity index 94% rename from src/Lidarr.Api.V3/Notifications/NotificationModule.cs rename to src/Lidarr.Api.V1/Notifications/NotificationModule.cs index edf57eaa8..ed1dd2ee6 100644 --- a/src/Lidarr.Api.V3/Notifications/NotificationModule.cs +++ b/src/Lidarr.Api.V1/Notifications/NotificationModule.cs @@ -1,6 +1,6 @@ using NzbDrone.Core.Notifications; -namespace Lidarr.Api.V3.Notifications +namespace Lidarr.Api.V1.Notifications { public class NotificationModule : ProviderModuleBase { diff --git a/src/Lidarr.Api.V3/Notifications/NotificationResource.cs b/src/Lidarr.Api.V1/Notifications/NotificationResource.cs similarity index 98% rename from src/Lidarr.Api.V3/Notifications/NotificationResource.cs rename to src/Lidarr.Api.V1/Notifications/NotificationResource.cs index 1cdb4e176..3d1c9ff2b 100644 --- a/src/Lidarr.Api.V3/Notifications/NotificationResource.cs +++ b/src/Lidarr.Api.V1/Notifications/NotificationResource.cs @@ -1,6 +1,6 @@ using NzbDrone.Core.Notifications; -namespace Lidarr.Api.V3.Notifications +namespace Lidarr.Api.V1.Notifications { public class NotificationResource : ProviderResource { diff --git a/src/Lidarr.Api.V3/Parse/ParseModule.cs b/src/Lidarr.Api.V1/Parse/ParseModule.cs similarity index 95% rename from src/Lidarr.Api.V3/Parse/ParseModule.cs rename to src/Lidarr.Api.V1/Parse/ParseModule.cs index e6f3b15b6..d8b1b1037 100644 --- a/src/Lidarr.Api.V3/Parse/ParseModule.cs +++ b/src/Lidarr.Api.V1/Parse/ParseModule.cs @@ -1,10 +1,10 @@ using NzbDrone.Common.Extensions; using NzbDrone.Core.Parser; -using Lidarr.Api.V3.Albums; -using Lidarr.Api.V3.Artist; +using Lidarr.Api.V1.Albums; +using Lidarr.Api.V1.Artist; using Lidarr.Http; -namespace Lidarr.Api.V3.Parse +namespace Lidarr.Api.V1.Parse { public class ParseModule : LidarrRestModule { diff --git a/src/Lidarr.Api.V3/Parse/ParseResource.cs b/src/Lidarr.Api.V1/Parse/ParseResource.cs similarity index 80% rename from src/Lidarr.Api.V3/Parse/ParseResource.cs rename to src/Lidarr.Api.V1/Parse/ParseResource.cs index 85a335186..38a1668e8 100644 --- a/src/Lidarr.Api.V3/Parse/ParseResource.cs +++ b/src/Lidarr.Api.V1/Parse/ParseResource.cs @@ -1,10 +1,10 @@ using System.Collections.Generic; using NzbDrone.Core.Parser.Model; -using Lidarr.Api.V3.Albums; -using Lidarr.Api.V3.Artist; +using Lidarr.Api.V1.Albums; +using Lidarr.Api.V1.Artist; using Lidarr.Http.REST; -namespace Lidarr.Api.V3.Parse +namespace Lidarr.Api.V1.Parse { public class ParseResource : RestResource { diff --git a/src/Lidarr.Api.V3/Profiles/Delay/DelayProfileModule.cs b/src/Lidarr.Api.V1/Profiles/Delay/DelayProfileModule.cs similarity index 98% rename from src/Lidarr.Api.V3/Profiles/Delay/DelayProfileModule.cs rename to src/Lidarr.Api.V1/Profiles/Delay/DelayProfileModule.cs index 217a50bc6..2ad0bf475 100644 --- a/src/Lidarr.Api.V3/Profiles/Delay/DelayProfileModule.cs +++ b/src/Lidarr.Api.V1/Profiles/Delay/DelayProfileModule.cs @@ -9,7 +9,7 @@ using Lidarr.Http.Extensions; using Lidarr.Http.REST; using Lidarr.Http.Validation; -namespace Lidarr.Api.V3.Profiles.Delay +namespace Lidarr.Api.V1.Profiles.Delay { public class DelayProfileModule : LidarrRestModule { diff --git a/src/Lidarr.Api.V3/Profiles/Delay/DelayProfileResource.cs b/src/Lidarr.Api.V1/Profiles/Delay/DelayProfileResource.cs similarity index 98% rename from src/Lidarr.Api.V3/Profiles/Delay/DelayProfileResource.cs rename to src/Lidarr.Api.V1/Profiles/Delay/DelayProfileResource.cs index 6ec92a6cd..bcdd83c65 100644 --- a/src/Lidarr.Api.V3/Profiles/Delay/DelayProfileResource.cs +++ b/src/Lidarr.Api.V1/Profiles/Delay/DelayProfileResource.cs @@ -4,7 +4,7 @@ using NzbDrone.Core.Indexers; using NzbDrone.Core.Profiles.Delay; using Lidarr.Http.REST; -namespace Lidarr.Api.V3.Profiles.Delay +namespace Lidarr.Api.V1.Profiles.Delay { public class DelayProfileResource : RestResource { diff --git a/src/Lidarr.Api.V3/Profiles/Language/LanguageProfileModule.cs b/src/Lidarr.Api.V1/Profiles/Language/LanguageProfileModule.cs similarity index 97% rename from src/Lidarr.Api.V3/Profiles/Language/LanguageProfileModule.cs rename to src/Lidarr.Api.V1/Profiles/Language/LanguageProfileModule.cs index 458eede53..9c33e12e5 100644 --- a/src/Lidarr.Api.V3/Profiles/Language/LanguageProfileModule.cs +++ b/src/Lidarr.Api.V1/Profiles/Language/LanguageProfileModule.cs @@ -3,7 +3,7 @@ using FluentValidation; using NzbDrone.Core.Profiles.Languages; using Lidarr.Http; -namespace Lidarr.Api.V3.Profiles.Language +namespace Lidarr.Api.V1.Profiles.Language { public class LanguageProfileModule : LidarrRestModule { diff --git a/src/Lidarr.Api.V3/Profiles/Language/LanguageProfileResource.cs b/src/Lidarr.Api.V1/Profiles/Language/LanguageProfileResource.cs similarity index 98% rename from src/Lidarr.Api.V3/Profiles/Language/LanguageProfileResource.cs rename to src/Lidarr.Api.V1/Profiles/Language/LanguageProfileResource.cs index fabfc40f7..c14b17460 100644 --- a/src/Lidarr.Api.V3/Profiles/Language/LanguageProfileResource.cs +++ b/src/Lidarr.Api.V1/Profiles/Language/LanguageProfileResource.cs @@ -3,7 +3,7 @@ using System.Linq; using NzbDrone.Core.Profiles.Languages; using Lidarr.Http.REST; -namespace Lidarr.Api.V3.Profiles.Language +namespace Lidarr.Api.V1.Profiles.Language { public class LanguageProfileResource : RestResource { diff --git a/src/Lidarr.Api.V3/Profiles/Language/LanguageProfileSchemaModule.cs b/src/Lidarr.Api.V1/Profiles/Language/LanguageProfileSchemaModule.cs similarity index 96% rename from src/Lidarr.Api.V3/Profiles/Language/LanguageProfileSchemaModule.cs rename to src/Lidarr.Api.V1/Profiles/Language/LanguageProfileSchemaModule.cs index 899658441..3b2345231 100644 --- a/src/Lidarr.Api.V3/Profiles/Language/LanguageProfileSchemaModule.cs +++ b/src/Lidarr.Api.V1/Profiles/Language/LanguageProfileSchemaModule.cs @@ -2,7 +2,7 @@ using NzbDrone.Core.Profiles.Languages; using Lidarr.Http; -namespace Lidarr.Api.V3.Profiles.Language +namespace Lidarr.Api.V1.Profiles.Language { public class LanguageProfileSchemaModule : LidarrRestModule { diff --git a/src/Lidarr.Api.V3/Profiles/Language/LanguageValidator.cs b/src/Lidarr.Api.V1/Profiles/Language/LanguageValidator.cs similarity index 96% rename from src/Lidarr.Api.V3/Profiles/Language/LanguageValidator.cs rename to src/Lidarr.Api.V1/Profiles/Language/LanguageValidator.cs index 6aa5de220..62ac82807 100644 --- a/src/Lidarr.Api.V3/Profiles/Language/LanguageValidator.cs +++ b/src/Lidarr.Api.V1/Profiles/Language/LanguageValidator.cs @@ -3,7 +3,7 @@ using System.Linq; using FluentValidation; using FluentValidation.Validators; -namespace Lidarr.Api.V3.Profiles.Language +namespace Lidarr.Api.V1.Profiles.Language { public static class LanguageValidation { diff --git a/src/Lidarr.Api.V3/Profiles/Quality/QualityProfileModule.cs b/src/Lidarr.Api.V1/Profiles/Quality/QualityProfileModule.cs similarity index 97% rename from src/Lidarr.Api.V3/Profiles/Quality/QualityProfileModule.cs rename to src/Lidarr.Api.V1/Profiles/Quality/QualityProfileModule.cs index dbc7d8a1d..58ac1192d 100644 --- a/src/Lidarr.Api.V3/Profiles/Quality/QualityProfileModule.cs +++ b/src/Lidarr.Api.V1/Profiles/Quality/QualityProfileModule.cs @@ -3,7 +3,7 @@ using FluentValidation; using NzbDrone.Core.Profiles.Qualities; using Lidarr.Http; -namespace Lidarr.Api.V3.Profiles.Quality +namespace Lidarr.Api.V1.Profiles.Quality { public class ProfileModule : LidarrRestModule { diff --git a/src/Lidarr.Api.V3/Profiles/Quality/QualityProfileResource.cs b/src/Lidarr.Api.V1/Profiles/Quality/QualityProfileResource.cs similarity index 98% rename from src/Lidarr.Api.V3/Profiles/Quality/QualityProfileResource.cs rename to src/Lidarr.Api.V1/Profiles/Quality/QualityProfileResource.cs index 111fbec79..8820339b6 100644 --- a/src/Lidarr.Api.V3/Profiles/Quality/QualityProfileResource.cs +++ b/src/Lidarr.Api.V1/Profiles/Quality/QualityProfileResource.cs @@ -3,7 +3,7 @@ using System.Linq; using NzbDrone.Core.Profiles.Qualities; using Lidarr.Http.REST; -namespace Lidarr.Api.V3.Profiles.Quality +namespace Lidarr.Api.V1.Profiles.Quality { public class QualityProfileResource : RestResource { diff --git a/src/Lidarr.Api.V3/Profiles/Quality/QualityProfileSchemaModule.cs b/src/Lidarr.Api.V1/Profiles/Quality/QualityProfileSchemaModule.cs similarity index 96% rename from src/Lidarr.Api.V3/Profiles/Quality/QualityProfileSchemaModule.cs rename to src/Lidarr.Api.V1/Profiles/Quality/QualityProfileSchemaModule.cs index 4aebb9fb2..b55020594 100644 --- a/src/Lidarr.Api.V3/Profiles/Quality/QualityProfileSchemaModule.cs +++ b/src/Lidarr.Api.V1/Profiles/Quality/QualityProfileSchemaModule.cs @@ -3,7 +3,7 @@ using NzbDrone.Core.Profiles.Qualities; using NzbDrone.Core.Qualities; using Lidarr.Http; -namespace Lidarr.Api.V3.Profiles.Quality +namespace Lidarr.Api.V1.Profiles.Quality { public class QualityProfileSchemaModule : LidarrRestModule { diff --git a/src/Lidarr.Api.V3/Profiles/Quality/QualityProfileValidation.cs b/src/Lidarr.Api.V1/Profiles/Quality/QualityProfileValidation.cs similarity index 96% rename from src/Lidarr.Api.V3/Profiles/Quality/QualityProfileValidation.cs rename to src/Lidarr.Api.V1/Profiles/Quality/QualityProfileValidation.cs index 7382dbefb..5481bd07a 100644 --- a/src/Lidarr.Api.V3/Profiles/Quality/QualityProfileValidation.cs +++ b/src/Lidarr.Api.V1/Profiles/Quality/QualityProfileValidation.cs @@ -3,7 +3,7 @@ using System.Linq; using FluentValidation; using FluentValidation.Validators; -namespace Lidarr.Api.V3.Profiles.Quality +namespace Lidarr.Api.V1.Profiles.Quality { public static class QualityProfileValidation { diff --git a/src/Lidarr.Api.V3/Properties/AssemblyInfo.cs b/src/Lidarr.Api.V1/Properties/AssemblyInfo.cs similarity index 100% rename from src/Lidarr.Api.V3/Properties/AssemblyInfo.cs rename to src/Lidarr.Api.V1/Properties/AssemblyInfo.cs diff --git a/src/Lidarr.Api.V3/ProviderModuleBase.cs b/src/Lidarr.Api.V1/ProviderModuleBase.cs similarity index 99% rename from src/Lidarr.Api.V3/ProviderModuleBase.cs rename to src/Lidarr.Api.V1/ProviderModuleBase.cs index 43d7228a0..24d965898 100644 --- a/src/Lidarr.Api.V3/ProviderModuleBase.cs +++ b/src/Lidarr.Api.V1/ProviderModuleBase.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; using FluentValidation; using FluentValidation.Results; @@ -9,7 +9,7 @@ using NzbDrone.Core.Validation; using Lidarr.Http; using Lidarr.Http.Extensions; -namespace Lidarr.Api.V3 +namespace Lidarr.Api.V1 { public abstract class ProviderModuleBase : LidarrRestModule where TProviderDefinition : ProviderDefinition, new() diff --git a/src/Lidarr.Api.V3/ProviderResource.cs b/src/Lidarr.Api.V1/ProviderResource.cs similarity index 99% rename from src/Lidarr.Api.V3/ProviderResource.cs rename to src/Lidarr.Api.V1/ProviderResource.cs index e9aa78c80..1c85260d4 100644 --- a/src/Lidarr.Api.V3/ProviderResource.cs +++ b/src/Lidarr.Api.V1/ProviderResource.cs @@ -4,7 +4,7 @@ using NzbDrone.Core.ThingiProvider; using Lidarr.Http.ClientSchema; using Lidarr.Http.REST; -namespace Lidarr.Api.V3 +namespace Lidarr.Api.V1 { public class ProviderResource : RestResource { diff --git a/src/Lidarr.Api.V3/Qualities/QualityDefinitionModule.cs b/src/Lidarr.Api.V1/Qualities/QualityDefinitionModule.cs similarity index 97% rename from src/Lidarr.Api.V3/Qualities/QualityDefinitionModule.cs rename to src/Lidarr.Api.V1/Qualities/QualityDefinitionModule.cs index 1da32a774..4e735371d 100644 --- a/src/Lidarr.Api.V3/Qualities/QualityDefinitionModule.cs +++ b/src/Lidarr.Api.V1/Qualities/QualityDefinitionModule.cs @@ -5,7 +5,7 @@ using NzbDrone.Core.Qualities; using Lidarr.Http; using Lidarr.Http.Extensions; -namespace Lidarr.Api.V3.Qualities +namespace Lidarr.Api.V1.Qualities { public class QualityDefinitionModule : LidarrRestModule { diff --git a/src/Lidarr.Api.V3/Qualities/QualityDefinitionResource.cs b/src/Lidarr.Api.V1/Qualities/QualityDefinitionResource.cs similarity index 98% rename from src/Lidarr.Api.V3/Qualities/QualityDefinitionResource.cs rename to src/Lidarr.Api.V1/Qualities/QualityDefinitionResource.cs index 7d2000c79..67c7b0822 100644 --- a/src/Lidarr.Api.V3/Qualities/QualityDefinitionResource.cs +++ b/src/Lidarr.Api.V1/Qualities/QualityDefinitionResource.cs @@ -3,7 +3,7 @@ using System.Linq; using NzbDrone.Core.Qualities; using Lidarr.Http.REST; -namespace Lidarr.Api.V3.Qualities +namespace Lidarr.Api.V1.Qualities { public class QualityDefinitionResource : RestResource { diff --git a/src/Lidarr.Api.V3/Queue/QueueActionModule.cs b/src/Lidarr.Api.V1/Queue/QueueActionModule.cs similarity index 99% rename from src/Lidarr.Api.V3/Queue/QueueActionModule.cs rename to src/Lidarr.Api.V1/Queue/QueueActionModule.cs index d0ff7e818..e82c50ff5 100644 --- a/src/Lidarr.Api.V3/Queue/QueueActionModule.cs +++ b/src/Lidarr.Api.V1/Queue/QueueActionModule.cs @@ -9,7 +9,7 @@ using Lidarr.Http; using Lidarr.Http.Extensions; using Lidarr.Http.REST; -namespace Lidarr.Api.V3.Queue +namespace Lidarr.Api.V1.Queue { public class QueueActionModule : LidarrRestModule { diff --git a/src/Lidarr.Api.V3/Queue/QueueBulkResource.cs b/src/Lidarr.Api.V1/Queue/QueueBulkResource.cs similarity index 81% rename from src/Lidarr.Api.V3/Queue/QueueBulkResource.cs rename to src/Lidarr.Api.V1/Queue/QueueBulkResource.cs index b1024846e..12c86b964 100644 --- a/src/Lidarr.Api.V3/Queue/QueueBulkResource.cs +++ b/src/Lidarr.Api.V1/Queue/QueueBulkResource.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Lidarr.Api.V3.Queue +namespace Lidarr.Api.V1.Queue { public class QueueBulkResource { diff --git a/src/Lidarr.Api.V3/Queue/QueueDetailsModule.cs b/src/Lidarr.Api.V1/Queue/QueueDetailsModule.cs similarity index 98% rename from src/Lidarr.Api.V3/Queue/QueueDetailsModule.cs rename to src/Lidarr.Api.V1/Queue/QueueDetailsModule.cs index 4adda5669..e677c65e6 100644 --- a/src/Lidarr.Api.V3/Queue/QueueDetailsModule.cs +++ b/src/Lidarr.Api.V1/Queue/QueueDetailsModule.cs @@ -9,7 +9,7 @@ using NzbDrone.SignalR; using Lidarr.Http; using Lidarr.Http.Extensions; -namespace Lidarr.Api.V3.Queue +namespace Lidarr.Api.V1.Queue { public class QueueDetailsModule : LidarrRestModuleWithSignalR, IHandle, IHandle diff --git a/src/Lidarr.Api.V3/Queue/QueueModule.cs b/src/Lidarr.Api.V1/Queue/QueueModule.cs similarity index 99% rename from src/Lidarr.Api.V3/Queue/QueueModule.cs rename to src/Lidarr.Api.V1/Queue/QueueModule.cs index 8ecfdccfc..10be1f90e 100644 --- a/src/Lidarr.Api.V3/Queue/QueueModule.cs +++ b/src/Lidarr.Api.V1/Queue/QueueModule.cs @@ -10,7 +10,7 @@ using NzbDrone.SignalR; using Lidarr.Http; using Lidarr.Http.Extensions; -namespace Lidarr.Api.V3.Queue +namespace Lidarr.Api.V1.Queue { public class QueueModule : LidarrRestModuleWithSignalR, IHandle, IHandle diff --git a/src/Lidarr.Api.V3/Queue/QueueResource.cs b/src/Lidarr.Api.V1/Queue/QueueResource.cs similarity index 96% rename from src/Lidarr.Api.V3/Queue/QueueResource.cs rename to src/Lidarr.Api.V1/Queue/QueueResource.cs index e37a0155b..2fd196d09 100644 --- a/src/Lidarr.Api.V3/Queue/QueueResource.cs +++ b/src/Lidarr.Api.V1/Queue/QueueResource.cs @@ -4,11 +4,11 @@ using System.Linq; using NzbDrone.Core.Download.TrackedDownloads; using NzbDrone.Core.Indexers; using NzbDrone.Core.Qualities; -using Lidarr.Api.V3.Albums; -using Lidarr.Api.V3.Artist; +using Lidarr.Api.V1.Albums; +using Lidarr.Api.V1.Artist; using Lidarr.Http.REST; -namespace Lidarr.Api.V3.Queue +namespace Lidarr.Api.V1.Queue { public class QueueResource : RestResource { diff --git a/src/Lidarr.Api.V3/Queue/QueueStatusModule.cs b/src/Lidarr.Api.V1/Queue/QueueStatusModule.cs similarity index 98% rename from src/Lidarr.Api.V3/Queue/QueueStatusModule.cs rename to src/Lidarr.Api.V1/Queue/QueueStatusModule.cs index 09b59fc33..ab76504e9 100644 --- a/src/Lidarr.Api.V3/Queue/QueueStatusModule.cs +++ b/src/Lidarr.Api.V1/Queue/QueueStatusModule.cs @@ -9,7 +9,7 @@ using NzbDrone.SignalR; using Lidarr.Http; using Lidarr.Http.Extensions; -namespace Lidarr.Api.V3.Queue +namespace Lidarr.Api.V1.Queue { public class QueueStatusModule : LidarrRestModuleWithSignalR, IHandle, IHandle diff --git a/src/Lidarr.Api.V3/Queue/QueueStatusResource.cs b/src/Lidarr.Api.V1/Queue/QueueStatusResource.cs similarity index 87% rename from src/Lidarr.Api.V3/Queue/QueueStatusResource.cs rename to src/Lidarr.Api.V1/Queue/QueueStatusResource.cs index 82261abc3..627f0da0d 100644 --- a/src/Lidarr.Api.V3/Queue/QueueStatusResource.cs +++ b/src/Lidarr.Api.V1/Queue/QueueStatusResource.cs @@ -1,6 +1,6 @@ using Lidarr.Http.REST; -namespace Lidarr.Api.V3.Queue +namespace Lidarr.Api.V1.Queue { public class QueueStatusResource : RestResource { diff --git a/src/Lidarr.Api.V3/RemotePathMappings/RemotePathMappingModule.cs b/src/Lidarr.Api.V1/RemotePathMappings/RemotePathMappingModule.cs similarity index 98% rename from src/Lidarr.Api.V3/RemotePathMappings/RemotePathMappingModule.cs rename to src/Lidarr.Api.V1/RemotePathMappings/RemotePathMappingModule.cs index cbdffa155..542e90d5b 100644 --- a/src/Lidarr.Api.V3/RemotePathMappings/RemotePathMappingModule.cs +++ b/src/Lidarr.Api.V1/RemotePathMappings/RemotePathMappingModule.cs @@ -4,7 +4,7 @@ using NzbDrone.Core.RemotePathMappings; using NzbDrone.Core.Validation.Paths; using Lidarr.Http; -namespace Lidarr.Api.V3.RemotePathMappings +namespace Lidarr.Api.V1.RemotePathMappings { public class RemotePathMappingModule : LidarrRestModule { diff --git a/src/Lidarr.Api.V3/RemotePathMappings/RemotePathMappingResource.cs b/src/Lidarr.Api.V1/RemotePathMappings/RemotePathMappingResource.cs similarity index 96% rename from src/Lidarr.Api.V3/RemotePathMappings/RemotePathMappingResource.cs rename to src/Lidarr.Api.V1/RemotePathMappings/RemotePathMappingResource.cs index e1b716ba6..1f4050274 100644 --- a/src/Lidarr.Api.V3/RemotePathMappings/RemotePathMappingResource.cs +++ b/src/Lidarr.Api.V1/RemotePathMappings/RemotePathMappingResource.cs @@ -3,7 +3,7 @@ using System.Linq; using NzbDrone.Core.RemotePathMappings; using Lidarr.Http.REST; -namespace Lidarr.Api.V3.RemotePathMappings +namespace Lidarr.Api.V1.RemotePathMappings { public class RemotePathMappingResource : RestResource { diff --git a/src/Lidarr.Api.V3/Restrictions/RestrictionModule.cs b/src/Lidarr.Api.V1/Restrictions/RestrictionModule.cs similarity index 97% rename from src/Lidarr.Api.V3/Restrictions/RestrictionModule.cs rename to src/Lidarr.Api.V1/Restrictions/RestrictionModule.cs index 810eb821a..5c21d13d8 100644 --- a/src/Lidarr.Api.V3/Restrictions/RestrictionModule.cs +++ b/src/Lidarr.Api.V1/Restrictions/RestrictionModule.cs @@ -4,7 +4,7 @@ using NzbDrone.Common.Extensions; using NzbDrone.Core.Restrictions; using Lidarr.Http; -namespace Lidarr.Api.V3.Restrictions +namespace Lidarr.Api.V1.Restrictions { public class RestrictionModule : LidarrRestModule { diff --git a/src/Lidarr.Api.V3/Restrictions/RestrictionResource.cs b/src/Lidarr.Api.V1/Restrictions/RestrictionResource.cs similarity index 97% rename from src/Lidarr.Api.V3/Restrictions/RestrictionResource.cs rename to src/Lidarr.Api.V1/Restrictions/RestrictionResource.cs index 8c8689cd6..aff26e209 100644 --- a/src/Lidarr.Api.V3/Restrictions/RestrictionResource.cs +++ b/src/Lidarr.Api.V1/Restrictions/RestrictionResource.cs @@ -3,7 +3,7 @@ using System.Linq; using NzbDrone.Core.Restrictions; using Lidarr.Http.REST; -namespace Lidarr.Api.V3.Restrictions +namespace Lidarr.Api.V1.Restrictions { public class RestrictionResource : RestResource { diff --git a/src/Lidarr.Api.V3/RootFolders/RootFolderModule.cs b/src/Lidarr.Api.V1/RootFolders/RootFolderModule.cs similarity index 98% rename from src/Lidarr.Api.V3/RootFolders/RootFolderModule.cs rename to src/Lidarr.Api.V1/RootFolders/RootFolderModule.cs index 9258db3f6..6ba44bc63 100644 --- a/src/Lidarr.Api.V3/RootFolders/RootFolderModule.cs +++ b/src/Lidarr.Api.V1/RootFolders/RootFolderModule.cs @@ -5,7 +5,7 @@ using NzbDrone.Core.Validation.Paths; using NzbDrone.SignalR; using Lidarr.Http; -namespace Lidarr.Api.V3.RootFolders +namespace Lidarr.Api.V1.RootFolders { public class RootFolderModule : LidarrRestModuleWithSignalR { diff --git a/src/Lidarr.Api.V3/RootFolders/RootFolderResource.cs b/src/Lidarr.Api.V1/RootFolders/RootFolderResource.cs similarity index 97% rename from src/Lidarr.Api.V3/RootFolders/RootFolderResource.cs rename to src/Lidarr.Api.V1/RootFolders/RootFolderResource.cs index 992f112be..27d5cb18d 100644 --- a/src/Lidarr.Api.V3/RootFolders/RootFolderResource.cs +++ b/src/Lidarr.Api.V1/RootFolders/RootFolderResource.cs @@ -3,7 +3,7 @@ using System.Linq; using NzbDrone.Core.RootFolders; using Lidarr.Http.REST; -namespace Lidarr.Api.V3.RootFolders +namespace Lidarr.Api.V1.RootFolders { public class RootFolderResource : RestResource { diff --git a/src/Lidarr.Api.V3/System/Backup/BackupModule.cs b/src/Lidarr.Api.V1/System/Backup/BackupModule.cs similarity index 96% rename from src/Lidarr.Api.V3/System/Backup/BackupModule.cs rename to src/Lidarr.Api.V1/System/Backup/BackupModule.cs index 9bf93146d..4279f2d73 100644 --- a/src/Lidarr.Api.V3/System/Backup/BackupModule.cs +++ b/src/Lidarr.Api.V1/System/Backup/BackupModule.cs @@ -4,7 +4,7 @@ using System.Linq; using NzbDrone.Core.Backup; using Lidarr.Http; -namespace Lidarr.Api.V3.System.Backup +namespace Lidarr.Api.V1.System.Backup { public class BackupModule : LidarrRestModule { diff --git a/src/Lidarr.Api.V3/System/Backup/BackupResource.cs b/src/Lidarr.Api.V1/System/Backup/BackupResource.cs similarity index 88% rename from src/Lidarr.Api.V3/System/Backup/BackupResource.cs rename to src/Lidarr.Api.V1/System/Backup/BackupResource.cs index 243ccd5bf..cf5d895b1 100644 --- a/src/Lidarr.Api.V3/System/Backup/BackupResource.cs +++ b/src/Lidarr.Api.V1/System/Backup/BackupResource.cs @@ -2,7 +2,7 @@ using NzbDrone.Core.Backup; using Lidarr.Http.REST; -namespace Lidarr.Api.V3.System.Backup +namespace Lidarr.Api.V1.System.Backup { public class BackupResource : RestResource { diff --git a/src/Lidarr.Api.V3/System/SystemModule.cs b/src/Lidarr.Api.V1/System/SystemModule.cs similarity index 97% rename from src/Lidarr.Api.V3/System/SystemModule.cs rename to src/Lidarr.Api.V1/System/SystemModule.cs index 5017c5ed4..4258bfe7e 100644 --- a/src/Lidarr.Api.V3/System/SystemModule.cs +++ b/src/Lidarr.Api.V1/System/SystemModule.cs @@ -7,9 +7,9 @@ using NzbDrone.Core.Datastore; using NzbDrone.Core.Lifecycle; using Lidarr.Http.Extensions; -namespace Lidarr.Api.V3.System +namespace Lidarr.Api.V1.System { - public class SystemModule : SonarrV3Module + public class SystemModule : LidarrV1Module { private readonly IAppFolderInfo _appFolderInfo; private readonly IRuntimeInfo _runtimeInfo; diff --git a/src/Lidarr.Api.V3/System/Tasks/TaskModule.cs b/src/Lidarr.Api.V1/System/Tasks/TaskModule.cs similarity index 98% rename from src/Lidarr.Api.V3/System/Tasks/TaskModule.cs rename to src/Lidarr.Api.V1/System/Tasks/TaskModule.cs index e23a8567e..cf1a38fb1 100644 --- a/src/Lidarr.Api.V3/System/Tasks/TaskModule.cs +++ b/src/Lidarr.Api.V1/System/Tasks/TaskModule.cs @@ -7,7 +7,7 @@ using NzbDrone.Core.Messaging.Events; using NzbDrone.SignalR; using Lidarr.Http; -namespace Lidarr.Api.V3.System.Tasks +namespace Lidarr.Api.V1.System.Tasks { public class TaskModule : LidarrRestModuleWithSignalR, IHandle { diff --git a/src/Lidarr.Api.V3/System/Tasks/TaskResource.cs b/src/Lidarr.Api.V1/System/Tasks/TaskResource.cs similarity index 90% rename from src/Lidarr.Api.V3/System/Tasks/TaskResource.cs rename to src/Lidarr.Api.V1/System/Tasks/TaskResource.cs index 9c6d6385b..e0454b664 100644 --- a/src/Lidarr.Api.V3/System/Tasks/TaskResource.cs +++ b/src/Lidarr.Api.V1/System/Tasks/TaskResource.cs @@ -1,7 +1,7 @@ using System; using Lidarr.Http.REST; -namespace Lidarr.Api.V3.System.Tasks +namespace Lidarr.Api.V1.System.Tasks { public class TaskResource : RestResource { diff --git a/src/Lidarr.Api.V3/Tags/TagDetailsModule.cs b/src/Lidarr.Api.V1/Tags/TagDetailsModule.cs similarity index 94% rename from src/Lidarr.Api.V3/Tags/TagDetailsModule.cs rename to src/Lidarr.Api.V1/Tags/TagDetailsModule.cs index a8a4f173c..f97bd0e1c 100644 --- a/src/Lidarr.Api.V3/Tags/TagDetailsModule.cs +++ b/src/Lidarr.Api.V1/Tags/TagDetailsModule.cs @@ -1,7 +1,7 @@ using NzbDrone.Core.Tags; using Lidarr.Http; -namespace Lidarr.Api.V3.Tags +namespace Lidarr.Api.V1.Tags { public class TagDetailsModule : LidarrRestModule { diff --git a/src/Lidarr.Api.V3/Tags/TagDetailsResource.cs b/src/Lidarr.Api.V1/Tags/TagDetailsResource.cs similarity index 91% rename from src/Lidarr.Api.V3/Tags/TagDetailsResource.cs rename to src/Lidarr.Api.V1/Tags/TagDetailsResource.cs index 10675b3c1..9f201fdf2 100644 --- a/src/Lidarr.Api.V3/Tags/TagDetailsResource.cs +++ b/src/Lidarr.Api.V1/Tags/TagDetailsResource.cs @@ -1,12 +1,12 @@ using System.Collections.Generic; using System.Linq; using NzbDrone.Core.Tags; -using Lidarr.Api.V3.Notifications; -using Lidarr.Api.V3.Profiles.Delay; -using Lidarr.Api.V3.Restrictions; +using Lidarr.Api.V1.Notifications; +using Lidarr.Api.V1.Profiles.Delay; +using Lidarr.Api.V1.Restrictions; using Lidarr.Http.REST; -namespace Lidarr.Api.V3.Tags +namespace Lidarr.Api.V1.Tags { public class TagDetailsResource : RestResource { diff --git a/src/Lidarr.Api.V3/Tags/TagModule.cs b/src/Lidarr.Api.V1/Tags/TagModule.cs similarity index 98% rename from src/Lidarr.Api.V3/Tags/TagModule.cs rename to src/Lidarr.Api.V1/Tags/TagModule.cs index 045fe723d..d188d9387 100644 --- a/src/Lidarr.Api.V3/Tags/TagModule.cs +++ b/src/Lidarr.Api.V1/Tags/TagModule.cs @@ -5,7 +5,7 @@ using NzbDrone.Core.Tags; using NzbDrone.SignalR; using Lidarr.Http; -namespace Lidarr.Api.V3.Tags +namespace Lidarr.Api.V1.Tags { public class TagModule : LidarrRestModuleWithSignalR, IHandle { diff --git a/src/Lidarr.Api.V3/Tags/TagResource.cs b/src/Lidarr.Api.V1/Tags/TagResource.cs similarity index 96% rename from src/Lidarr.Api.V3/Tags/TagResource.cs rename to src/Lidarr.Api.V1/Tags/TagResource.cs index 1c95024f2..681453622 100644 --- a/src/Lidarr.Api.V3/Tags/TagResource.cs +++ b/src/Lidarr.Api.V1/Tags/TagResource.cs @@ -3,7 +3,7 @@ using System.Linq; using NzbDrone.Core.Tags; using Lidarr.Http.REST; -namespace Lidarr.Api.V3.Tags +namespace Lidarr.Api.V1.Tags { public class TagResource : RestResource { diff --git a/src/Lidarr.Api.V3/TrackFiles/MediaInfoResource.cs b/src/Lidarr.Api.V1/TrackFiles/MediaInfoResource.cs similarity index 95% rename from src/Lidarr.Api.V3/TrackFiles/MediaInfoResource.cs rename to src/Lidarr.Api.V1/TrackFiles/MediaInfoResource.cs index 7ebdd974b..0e49860eb 100644 --- a/src/Lidarr.Api.V3/TrackFiles/MediaInfoResource.cs +++ b/src/Lidarr.Api.V1/TrackFiles/MediaInfoResource.cs @@ -1,7 +1,7 @@ using NzbDrone.Core.MediaFiles.MediaInfo; using Lidarr.Http.REST; -namespace Lidarr.Api.V3.TrackFiles +namespace Lidarr.Api.V1.TrackFiles { public class MediaInfoResource : RestResource { diff --git a/src/Lidarr.Api.V3/TrackFiles/TrackFileListResource.cs b/src/Lidarr.Api.V1/TrackFiles/TrackFileListResource.cs similarity index 89% rename from src/Lidarr.Api.V3/TrackFiles/TrackFileListResource.cs rename to src/Lidarr.Api.V1/TrackFiles/TrackFileListResource.cs index d8bf09018..e8e6b4a7c 100644 --- a/src/Lidarr.Api.V3/TrackFiles/TrackFileListResource.cs +++ b/src/Lidarr.Api.V1/TrackFiles/TrackFileListResource.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using NzbDrone.Core.Languages; using NzbDrone.Core.Qualities; -namespace Lidarr.Api.V3.TrackFiles +namespace Lidarr.Api.V1.TrackFiles { public class TrackFileListResource { diff --git a/src/Lidarr.Api.V3/TrackFiles/TrackFileModule.cs b/src/Lidarr.Api.V1/TrackFiles/TrackFileModule.cs similarity index 99% rename from src/Lidarr.Api.V3/TrackFiles/TrackFileModule.cs rename to src/Lidarr.Api.V1/TrackFiles/TrackFileModule.cs index 753820b29..bb0696843 100644 --- a/src/Lidarr.Api.V3/TrackFiles/TrackFileModule.cs +++ b/src/Lidarr.Api.V1/TrackFiles/TrackFileModule.cs @@ -15,7 +15,7 @@ using Lidarr.Http.Extensions; using NzbDrone.Core.Exceptions; using HttpStatusCode = System.Net.HttpStatusCode; -namespace Lidarr.Api.V3.TrackFiles +namespace Lidarr.Api.V1.TrackFiles { public class TrackModule : LidarrRestModuleWithSignalR, IHandle diff --git a/src/Lidarr.Api.V3/TrackFiles/TrackFileResource.cs b/src/Lidarr.Api.V1/TrackFiles/TrackFileResource.cs similarity index 98% rename from src/Lidarr.Api.V3/TrackFiles/TrackFileResource.cs rename to src/Lidarr.Api.V1/TrackFiles/TrackFileResource.cs index be6deaabe..eabb60f73 100644 --- a/src/Lidarr.Api.V3/TrackFiles/TrackFileResource.cs +++ b/src/Lidarr.Api.V1/TrackFiles/TrackFileResource.cs @@ -6,7 +6,7 @@ using NzbDrone.Core.MediaFiles; using NzbDrone.Core.Qualities; using Lidarr.Http.REST; -namespace Lidarr.Api.V3.TrackFiles +namespace Lidarr.Api.V1.TrackFiles { public class TrackFileResource : RestResource { diff --git a/src/Lidarr.Api.V3/Tracks/RenameTrackModule.cs b/src/Lidarr.Api.V1/Tracks/RenameTrackModule.cs similarity index 97% rename from src/Lidarr.Api.V3/Tracks/RenameTrackModule.cs rename to src/Lidarr.Api.V1/Tracks/RenameTrackModule.cs index 073acdff4..2bf4cc538 100644 --- a/src/Lidarr.Api.V3/Tracks/RenameTrackModule.cs +++ b/src/Lidarr.Api.V1/Tracks/RenameTrackModule.cs @@ -3,7 +3,7 @@ using NzbDrone.Core.MediaFiles; using Lidarr.Http; using Lidarr.Http.REST; -namespace Lidarr.Api.V3.Tracks +namespace Lidarr.Api.V1.Tracks { public class RenameTrackModule : LidarrRestModule { diff --git a/src/Lidarr.Api.V3/Tracks/RenameTrackResource.cs b/src/Lidarr.Api.V1/Tracks/RenameTrackResource.cs similarity index 97% rename from src/Lidarr.Api.V3/Tracks/RenameTrackResource.cs rename to src/Lidarr.Api.V1/Tracks/RenameTrackResource.cs index 9bfe676cb..9b76b8998 100644 --- a/src/Lidarr.Api.V3/Tracks/RenameTrackResource.cs +++ b/src/Lidarr.Api.V1/Tracks/RenameTrackResource.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; using Lidarr.Http.REST; -namespace Lidarr.Api.V3.Tracks +namespace Lidarr.Api.V1.Tracks { public class RenameTrackResource : RestResource { diff --git a/src/Lidarr.Api.V3/Tracks/TrackModule.cs b/src/Lidarr.Api.V1/Tracks/TrackModule.cs similarity index 98% rename from src/Lidarr.Api.V3/Tracks/TrackModule.cs rename to src/Lidarr.Api.V1/Tracks/TrackModule.cs index 32d761d9d..454ffefd1 100644 --- a/src/Lidarr.Api.V3/Tracks/TrackModule.cs +++ b/src/Lidarr.Api.V1/Tracks/TrackModule.cs @@ -8,7 +8,7 @@ using NzbDrone.SignalR; using Lidarr.Http.Extensions; using Lidarr.Http.REST; -namespace Lidarr.Api.V3.Tracks +namespace Lidarr.Api.V1.Tracks { public class TrackModule : TrackModuleWithSignalR { diff --git a/src/Lidarr.Api.V3/Tracks/TrackModuleWithSignalR.cs b/src/Lidarr.Api.V1/Tracks/TrackModuleWithSignalR.cs similarity index 98% rename from src/Lidarr.Api.V3/Tracks/TrackModuleWithSignalR.cs rename to src/Lidarr.Api.V1/Tracks/TrackModuleWithSignalR.cs index bd4f3f654..9d3795c99 100644 --- a/src/Lidarr.Api.V3/Tracks/TrackModuleWithSignalR.cs +++ b/src/Lidarr.Api.V1/Tracks/TrackModuleWithSignalR.cs @@ -7,11 +7,11 @@ using NzbDrone.Core.MediaFiles.Events; using NzbDrone.Core.Messaging.Events; using NzbDrone.Core.Music; using NzbDrone.SignalR; -using Lidarr.Api.V3.TrackFiles; -using Lidarr.Api.V3.Artist; +using Lidarr.Api.V1.TrackFiles; +using Lidarr.Api.V1.Artist; using Lidarr.Http; -namespace Lidarr.Api.V3.Tracks +namespace Lidarr.Api.V1.Tracks { public abstract class TrackModuleWithSignalR : LidarrRestModuleWithSignalR //IHandle, diff --git a/src/Lidarr.Api.V3/Tracks/TrackResource.cs b/src/Lidarr.Api.V1/Tracks/TrackResource.cs similarity index 95% rename from src/Lidarr.Api.V3/Tracks/TrackResource.cs rename to src/Lidarr.Api.V1/Tracks/TrackResource.cs index 222394c52..d3331a90d 100644 --- a/src/Lidarr.Api.V3/Tracks/TrackResource.cs +++ b/src/Lidarr.Api.V1/Tracks/TrackResource.cs @@ -3,11 +3,11 @@ using System.Collections.Generic; using System.Linq; using Newtonsoft.Json; using NzbDrone.Core.Music; -using Lidarr.Api.V3.TrackFiles; -using Lidarr.Api.V3.Artist; +using Lidarr.Api.V1.TrackFiles; +using Lidarr.Api.V1.Artist; using Lidarr.Http.REST; -namespace Lidarr.Api.V3.Tracks +namespace Lidarr.Api.V1.Tracks { public class TrackResource : RestResource { diff --git a/src/Lidarr.Api.V3/Update/UpdateModule.cs b/src/Lidarr.Api.V1/Update/UpdateModule.cs similarity index 97% rename from src/Lidarr.Api.V3/Update/UpdateModule.cs rename to src/Lidarr.Api.V1/Update/UpdateModule.cs index 9aa4c2c94..460559291 100644 --- a/src/Lidarr.Api.V3/Update/UpdateModule.cs +++ b/src/Lidarr.Api.V1/Update/UpdateModule.cs @@ -4,7 +4,7 @@ using NzbDrone.Common.EnvironmentInfo; using NzbDrone.Core.Update; using Lidarr.Http; -namespace Lidarr.Api.V3.Update +namespace Lidarr.Api.V1.Update { public class UpdateModule : LidarrRestModule { diff --git a/src/Lidarr.Api.V3/Update/UpdateResource.cs b/src/Lidarr.Api.V1/Update/UpdateResource.cs similarity index 98% rename from src/Lidarr.Api.V3/Update/UpdateResource.cs rename to src/Lidarr.Api.V1/Update/UpdateResource.cs index 2ed916cdc..e79a183f3 100644 --- a/src/Lidarr.Api.V3/Update/UpdateResource.cs +++ b/src/Lidarr.Api.V1/Update/UpdateResource.cs @@ -5,7 +5,7 @@ using Newtonsoft.Json; using NzbDrone.Core.Update; using Lidarr.Http.REST; -namespace Lidarr.Api.V3.Update +namespace Lidarr.Api.V1.Update { public class UpdateResource : RestResource { diff --git a/src/Lidarr.Api.V3/Wanted/CutoffModule.cs b/src/Lidarr.Api.V1/Wanted/CutoffModule.cs similarity index 97% rename from src/Lidarr.Api.V3/Wanted/CutoffModule.cs rename to src/Lidarr.Api.V1/Wanted/CutoffModule.cs index e104269fe..34b284b09 100644 --- a/src/Lidarr.Api.V3/Wanted/CutoffModule.cs +++ b/src/Lidarr.Api.V1/Wanted/CutoffModule.cs @@ -3,11 +3,11 @@ using NzbDrone.Core.DecisionEngine; using NzbDrone.Core.Music; using NzbDrone.Core.ArtistStats; using NzbDrone.SignalR; -using Lidarr.Api.V3.Albums; +using Lidarr.Api.V1.Albums; using Lidarr.Http; using Lidarr.Http.Extensions; -namespace Lidarr.Api.V3.Wanted +namespace Lidarr.Api.V1.Wanted { public class CutoffModule : AlbumModuleWithSignalR { diff --git a/src/Lidarr.Api.V3/Wanted/MissingModule.cs b/src/Lidarr.Api.V1/Wanted/MissingModule.cs similarity index 96% rename from src/Lidarr.Api.V3/Wanted/MissingModule.cs rename to src/Lidarr.Api.V1/Wanted/MissingModule.cs index 05eb9b8a5..0ecc5c1f9 100644 --- a/src/Lidarr.Api.V3/Wanted/MissingModule.cs +++ b/src/Lidarr.Api.V1/Wanted/MissingModule.cs @@ -3,11 +3,11 @@ using NzbDrone.Core.DecisionEngine; using NzbDrone.Core.Music; using NzbDrone.Core.ArtistStats; using NzbDrone.SignalR; -using Lidarr.Api.V3.Albums; +using Lidarr.Api.V1.Albums; using Lidarr.Http; using Lidarr.Http.Extensions; -namespace Lidarr.Api.V3.Wanted +namespace Lidarr.Api.V1.Wanted { public class MissingModule : AlbumModuleWithSignalR { diff --git a/src/Lidarr.Api.V3/app.config b/src/Lidarr.Api.V1/app.config similarity index 100% rename from src/Lidarr.Api.V3/app.config rename to src/Lidarr.Api.V1/app.config diff --git a/src/Lidarr.Api.V3/packages.config b/src/Lidarr.Api.V1/packages.config similarity index 100% rename from src/Lidarr.Api.V3/packages.config rename to src/Lidarr.Api.V1/packages.config diff --git a/src/Lidarr.Api.V3/SonarrV3FeedModule.cs b/src/Lidarr.Api.V3/SonarrV3FeedModule.cs deleted file mode 100644 index 0c6e838b2..000000000 --- a/src/Lidarr.Api.V3/SonarrV3FeedModule.cs +++ /dev/null @@ -1,12 +0,0 @@ -using Nancy; - -namespace Lidarr.Api.V3 -{ - public abstract class SonarrV3FeedModule : NancyModule - { - protected SonarrV3FeedModule(string resource) - : base("/feed/v3/" + resource.Trim('/')) - { - } - } -} \ No newline at end of file diff --git a/src/Lidarr.Api.V3/SonarrV3Module.cs b/src/Lidarr.Api.V3/SonarrV3Module.cs deleted file mode 100644 index 112368f9f..000000000 --- a/src/Lidarr.Api.V3/SonarrV3Module.cs +++ /dev/null @@ -1,12 +0,0 @@ -using Nancy; - -namespace Lidarr.Api.V3 -{ - public abstract class SonarrV3Module : NancyModule - { - protected SonarrV3Module(string resource) - : base("/api/v3/" + resource.Trim('/')) - { - } - } -} \ No newline at end of file diff --git a/src/Lidarr.Http/Frontend/Mappers/IndexHtmlMapper.cs b/src/Lidarr.Http/Frontend/Mappers/IndexHtmlMapper.cs index aefe17fb6..94e7121ad 100644 --- a/src/Lidarr.Http/Frontend/Mappers/IndexHtmlMapper.cs +++ b/src/Lidarr.Http/Frontend/Mappers/IndexHtmlMapper.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.IO; using System.Text.RegularExpressions; using Nancy; @@ -102,7 +102,7 @@ namespace Lidarr.Http.Frontend.Mappers return string.Format("{0}=\"{1}{2}\"", match.Groups["attribute"].Value, URL_BASE, url); }); - text = text.Replace("API_ROOT", URL_BASE + "/api/v3"); + text = text.Replace("API_ROOT", URL_BASE + "/api/v1"); text = text.Replace("API_KEY", API_KEY); text = text.Replace("RELEASE", BuildInfo.Release); text = text.Replace("APP_VERSION", BuildInfo.Version.ToString()); @@ -116,4 +116,4 @@ namespace Lidarr.Http.Frontend.Mappers return _generatedContent; } } -} \ No newline at end of file +} diff --git a/src/Lidarr.Http/LIdarrRestModuleWithSignalR.cs b/src/Lidarr.Http/LIdarrRestModuleWithSignalR.cs index dd5efe0ee..44fbb75ce 100644 --- a/src/Lidarr.Http/LIdarrRestModuleWithSignalR.cs +++ b/src/Lidarr.Http/LIdarrRestModuleWithSignalR.cs @@ -55,7 +55,7 @@ namespace Lidarr.Http protected void BroadcastResourceChange(ModelAction action) { - if (GetType().Namespace.Contains("V3")) + if (GetType().Namespace.Contains("V1")) { var signalRMessage = new SignalRMessage { diff --git a/src/Lidarr.Http/LidarrRestModule.cs b/src/Lidarr.Http/LidarrRestModule.cs index d5f148a06..9e88b0d92 100644 --- a/src/Lidarr.Http/LidarrRestModule.cs +++ b/src/Lidarr.Http/LidarrRestModule.cs @@ -12,10 +12,10 @@ namespace Lidarr.Http private static string BaseUrl() { - var isV3 = typeof(TResource).Namespace.Contains(".V3."); + var isV3 = typeof(TResource).Namespace.Contains(".V1."); if (isV3) { - return "/api/v3/"; + return "/api/v1/"; } return "/api/"; } diff --git a/src/Lidarr.sln b/src/Lidarr.sln index fc5dfaa83..ef60bc0ef 100644 --- a/src/Lidarr.sln +++ b/src/Lidarr.sln @@ -84,10 +84,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LogentriesNLog", "Logentrie EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CurlSharp", "ExternalModules\CurlSharp\CurlSharp\CurlSharp.csproj", "{74420A79-CC16-442C-8B1E-7C1B913844F0}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lidarr.Api.V3", "Lidarr.Api.V3\Lidarr.Api.V3.csproj", "{7140FF1F-79BE-492F-9188-B21A050BF708}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lidarr.Http", "Lidarr.Http\Lidarr.Http.csproj", "{5370BFF7-1BD7-46BC-AF06-7D9EA5CDA1D6}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lidarr.Api.V1", "Lidarr.Api.V1\Lidarr.Api.V1.csproj", "{7140FF1F-79BE-492F-9188-B21A050BF708}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x86 = Debug|x86 @@ -256,18 +256,18 @@ Global {74420A79-CC16-442C-8B1E-7C1B913844F0}.Mono|x86.Build.0 = Release|Any CPU {74420A79-CC16-442C-8B1E-7C1B913844F0}.Release|x86.ActiveCfg = Release|Any CPU {74420A79-CC16-442C-8B1E-7C1B913844F0}.Release|x86.Build.0 = Release|Any CPU - {7140FF1F-79BE-492F-9188-B21A050BF708}.Debug|x86.ActiveCfg = Debug|x86 - {7140FF1F-79BE-492F-9188-B21A050BF708}.Debug|x86.Build.0 = Debug|x86 - {7140FF1F-79BE-492F-9188-B21A050BF708}.Mono|x86.ActiveCfg = Release|x86 - {7140FF1F-79BE-492F-9188-B21A050BF708}.Mono|x86.Build.0 = Release|x86 - {7140FF1F-79BE-492F-9188-B21A050BF708}.Release|x86.ActiveCfg = Release|x86 - {7140FF1F-79BE-492F-9188-B21A050BF708}.Release|x86.Build.0 = Release|x86 {5370BFF7-1BD7-46BC-AF06-7D9EA5CDA1D6}.Debug|x86.ActiveCfg = Debug|x86 {5370BFF7-1BD7-46BC-AF06-7D9EA5CDA1D6}.Debug|x86.Build.0 = Debug|x86 {5370BFF7-1BD7-46BC-AF06-7D9EA5CDA1D6}.Mono|x86.ActiveCfg = Release|x86 {5370BFF7-1BD7-46BC-AF06-7D9EA5CDA1D6}.Mono|x86.Build.0 = Release|x86 {5370BFF7-1BD7-46BC-AF06-7D9EA5CDA1D6}.Release|x86.ActiveCfg = Release|x86 {5370BFF7-1BD7-46BC-AF06-7D9EA5CDA1D6}.Release|x86.Build.0 = Release|x86 + {7140FF1F-79BE-492F-9188-B21A050BF708}.Debug|x86.ActiveCfg = Debug|x86 + {7140FF1F-79BE-492F-9188-B21A050BF708}.Debug|x86.Build.0 = Debug|x86 + {7140FF1F-79BE-492F-9188-B21A050BF708}.Mono|x86.ActiveCfg = Release|x86 + {7140FF1F-79BE-492F-9188-B21A050BF708}.Mono|x86.Build.0 = Release|x86 + {7140FF1F-79BE-492F-9188-B21A050BF708}.Release|x86.ActiveCfg = Release|x86 + {7140FF1F-79BE-492F-9188-B21A050BF708}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -301,8 +301,8 @@ Global {74420A79-CC16-442C-8B1E-7C1B913844F0} = {F6E3A728-AE77-4D02-BAC8-82FBC1402DDA} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution - EnterpriseLibraryConfigurationToolBinariesPath = packages\Unity.2.1.505.0\lib\NET35;packages\Unity.2.1.505.2\lib\NET35 SolutionGuid = {2C047BC5-490F-4DCE-962F-141370D23765} + EnterpriseLibraryConfigurationToolBinariesPath = packages\Unity.2.1.505.0\lib\NET35;packages\Unity.2.1.505.2\lib\NET35 EndGlobalSection GlobalSection(MonoDevelopProperties) = preSolution StartupItem = NzbDrone.Console\NzbDrone.Console.csproj diff --git a/src/NzbDrone.Api.Test/NzbDrone.Api.Test.csproj b/src/NzbDrone.Api.Test/NzbDrone.Api.Test.csproj index ffc34d23a..f330fd6be 100644 --- a/src/NzbDrone.Api.Test/NzbDrone.Api.Test.csproj +++ b/src/NzbDrone.Api.Test/NzbDrone.Api.Test.csproj @@ -70,9 +70,9 @@ - + {7140ff1f-79be-492f-9188-b21a050bf708} - Lidarr.Api.V3 + Lidarr.Api.V1 {F6FC6BE7-0847-4817-A1ED-223DC647C3D7} diff --git a/src/NzbDrone.Host/MainAppContainerBuilder.cs b/src/NzbDrone.Host/MainAppContainerBuilder.cs index 86dfc9b93..c60ab2764 100644 --- a/src/NzbDrone.Host/MainAppContainerBuilder.cs +++ b/src/NzbDrone.Host/MainAppContainerBuilder.cs @@ -17,7 +17,7 @@ namespace NzbDrone.Host "Lidarr.Host", "Lidarr.Core", "Lidarr.SignalR", - "Lidarr.Api.V3", + "Lidarr.Api.V1", "Lidarr.Http" }; diff --git a/src/NzbDrone.Host/NzbDrone.Host.csproj b/src/NzbDrone.Host/NzbDrone.Host.csproj index 64b28955f..582329e4e 100644 --- a/src/NzbDrone.Host/NzbDrone.Host.csproj +++ b/src/NzbDrone.Host/NzbDrone.Host.csproj @@ -167,6 +167,10 @@ + + {7140ff1f-79be-492f-9188-b21a050bf708} + Lidarr.Api.V1 + {F2BE0FDF-6E47-4827-A420-DD4EF82407F8} NzbDrone.Common @@ -179,10 +183,6 @@ {7C2CC69F-5CA0-4E5C-85CB-983F9F6C3B36} NzbDrone.SignalR - - {7140ff1f-79be-492f-9188-b21a050bf708} - Lidarr.Api.V3 - {5370bff7-1bd7-46bc-af06-7d9ea5cda1d6} Lidarr.Http diff --git a/src/NzbDrone.Integration.Test/ApiTests/ArtistEditorFixture.cs b/src/NzbDrone.Integration.Test/ApiTests/ArtistEditorFixture.cs index e4363ad12..d44e150b6 100644 --- a/src/NzbDrone.Integration.Test/ApiTests/ArtistEditorFixture.cs +++ b/src/NzbDrone.Integration.Test/ApiTests/ArtistEditorFixture.cs @@ -1,6 +1,6 @@ using FluentAssertions; using NUnit.Framework; -using Lidarr.Api.V3.Artist; +using Lidarr.Api.V1.Artist; using System.Linq; using NzbDrone.Test.Common; diff --git a/src/NzbDrone.Integration.Test/ApiTests/BlacklistFixture.cs b/src/NzbDrone.Integration.Test/ApiTests/BlacklistFixture.cs index dfd4cc580..a67bb8e3c 100644 --- a/src/NzbDrone.Integration.Test/ApiTests/BlacklistFixture.cs +++ b/src/NzbDrone.Integration.Test/ApiTests/BlacklistFixture.cs @@ -1,7 +1,7 @@ using FluentAssertions; using NUnit.Framework; -using Lidarr.Api.V3.Artist; -using Lidarr.Api.V3.Blacklist; +using Lidarr.Api.V1.Artist; +using Lidarr.Api.V1.Blacklist; namespace NzbDrone.Integration.Test.ApiTests { diff --git a/src/NzbDrone.Integration.Test/ApiTests/CalendarFixture.cs b/src/NzbDrone.Integration.Test/ApiTests/CalendarFixture.cs index c38ed9f7f..4bacbcd85 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 Lidarr.Api.V3.Albums; +using Lidarr.Api.V1.Albums; using NzbDrone.Integration.Test.Client; using System; using System.Collections.Generic; diff --git a/src/NzbDrone.Integration.Test/ApiTests/CommandFixture.cs b/src/NzbDrone.Integration.Test/ApiTests/CommandFixture.cs index a1a0e597d..d70ed4cd4 100644 --- a/src/NzbDrone.Integration.Test/ApiTests/CommandFixture.cs +++ b/src/NzbDrone.Integration.Test/ApiTests/CommandFixture.cs @@ -1,6 +1,6 @@ using FluentAssertions; using NUnit.Framework; -using Lidarr.Api.V3.Commands; +using Lidarr.Api.V1.Commands; namespace NzbDrone.Integration.Test.ApiTests { diff --git a/src/NzbDrone.Integration.Test/ApiTests/DiskSpaceFixture.cs b/src/NzbDrone.Integration.Test/ApiTests/DiskSpaceFixture.cs index a64dba210..deb675433 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 Lidarr.Api.V3.DiskSpace; +using Lidarr.Api.V1.DiskSpace; using NzbDrone.Integration.Test.Client; namespace NzbDrone.Integration.Test.ApiTests diff --git a/src/NzbDrone.Integration.Test/ApiTests/ReleaseFixture.cs b/src/NzbDrone.Integration.Test/ApiTests/ReleaseFixture.cs index 64c7ea250..2101497f8 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 Lidarr.Api.V3.Indexers; +using Lidarr.Api.V1.Indexers; using System.Linq; using System.Net; diff --git a/src/NzbDrone.Integration.Test/ApiTests/ReleasePushFixture.cs b/src/NzbDrone.Integration.Test/ApiTests/ReleasePushFixture.cs index f43576ba7..3f497255f 100644 --- a/src/NzbDrone.Integration.Test/ApiTests/ReleasePushFixture.cs +++ b/src/NzbDrone.Integration.Test/ApiTests/ReleasePushFixture.cs @@ -1,6 +1,6 @@ using FluentAssertions; using NUnit.Framework; -using Lidarr.Api.V3.Indexers; +using Lidarr.Api.V1.Indexers; using System.Linq; using System.Net; using System.Collections.Generic; diff --git a/src/NzbDrone.Integration.Test/ApiTests/RootFolderFixture.cs b/src/NzbDrone.Integration.Test/ApiTests/RootFolderFixture.cs index e7f2527d6..5bae86b11 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 Lidarr.Api.V3.RootFolders; +using Lidarr.Api.V1.RootFolders; namespace NzbDrone.Integration.Test.ApiTests { diff --git a/src/NzbDrone.Integration.Test/ApiTests/TrackFixture.cs b/src/NzbDrone.Integration.Test/ApiTests/TrackFixture.cs index afe070bbf..3b3e094ab 100644 --- a/src/NzbDrone.Integration.Test/ApiTests/TrackFixture.cs +++ b/src/NzbDrone.Integration.Test/ApiTests/TrackFixture.cs @@ -1,8 +1,8 @@ using System.Threading; using FluentAssertions; using NUnit.Framework; -using Lidarr.Api.V3.Series; -using Lidarr.Api.V3.Artist; +using Lidarr.Api.V1.Series; +using Lidarr.Api.V1.Artist; using System.Linq; using NzbDrone.Test.Common; diff --git a/src/NzbDrone.Integration.Test/Client/AlbumClient.cs b/src/NzbDrone.Integration.Test/Client/AlbumClient.cs index e6d9975c1..535e42c07 100644 --- a/src/NzbDrone.Integration.Test/Client/AlbumClient.cs +++ b/src/NzbDrone.Integration.Test/Client/AlbumClient.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using Lidarr.Api.V3.Albums; +using Lidarr.Api.V1.Albums; using RestSharp; namespace NzbDrone.Integration.Test.Client diff --git a/src/NzbDrone.Integration.Test/Client/ArtistClient.cs b/src/NzbDrone.Integration.Test/Client/ArtistClient.cs index c06e96ab4..b8a454a0c 100644 --- a/src/NzbDrone.Integration.Test/Client/ArtistClient.cs +++ b/src/NzbDrone.Integration.Test/Client/ArtistClient.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using System.Net; -using Lidarr.Api.V3.Artist; +using Lidarr.Api.V1.Artist; using RestSharp; namespace NzbDrone.Integration.Test.Client diff --git a/src/NzbDrone.Integration.Test/Client/ClientBase.cs b/src/NzbDrone.Integration.Test/Client/ClientBase.cs index d2bdcc8f2..9fd52f0c3 100644 --- a/src/NzbDrone.Integration.Test/Client/ClientBase.cs +++ b/src/NzbDrone.Integration.Test/Client/ClientBase.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Net; using FluentAssertions; using NLog; -using Lidarr.Api.V3; +using Lidarr.Api.V1; using Lidarr.Http.REST; using NzbDrone.Common.Serializer; using RestSharp; diff --git a/src/NzbDrone.Integration.Test/Client/CommandClient.cs b/src/NzbDrone.Integration.Test/Client/CommandClient.cs index 67e409cc9..c4cc528ba 100644 --- a/src/NzbDrone.Integration.Test/Client/CommandClient.cs +++ b/src/NzbDrone.Integration.Test/Client/CommandClient.cs @@ -1,4 +1,4 @@ -using Lidarr.Api.V3.Commands; +using Lidarr.Api.V1.Commands; using RestSharp; using NzbDrone.Core.Messaging.Commands; using FluentAssertions; diff --git a/src/NzbDrone.Integration.Test/Client/DownloadClientClient.cs b/src/NzbDrone.Integration.Test/Client/DownloadClientClient.cs index 0a975af25..7b24bc01c 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 Lidarr.Api.V3.DownloadClient; +using Lidarr.Api.V1.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 b3cc265c2..9e56dd21a 100644 --- a/src/NzbDrone.Integration.Test/Client/IndexerClient.cs +++ b/src/NzbDrone.Integration.Test/Client/IndexerClient.cs @@ -1,4 +1,4 @@ -using Lidarr.Api.V3.Indexers; +using Lidarr.Api.V1.Indexers; 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 b056ce5f7..678b1c210 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 Lidarr.Api.V3.Notifications; +using Lidarr.Api.V1.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 bda2ccb03..1d7ad3548 100644 --- a/src/NzbDrone.Integration.Test/Client/ReleaseClient.cs +++ b/src/NzbDrone.Integration.Test/Client/ReleaseClient.cs @@ -1,4 +1,4 @@ -using Lidarr.Api.V3.Indexers; +using Lidarr.Api.V1.Indexers; using RestSharp; namespace NzbDrone.Integration.Test.Client diff --git a/src/NzbDrone.Integration.Test/Client/ReleasePushClient.cs b/src/NzbDrone.Integration.Test/Client/ReleasePushClient.cs index 5b660dfda..3a65d4676 100644 --- a/src/NzbDrone.Integration.Test/Client/ReleasePushClient.cs +++ b/src/NzbDrone.Integration.Test/Client/ReleasePushClient.cs @@ -1,4 +1,4 @@ -using Lidarr.Api.V3.Indexers; +using Lidarr.Api.V1.Indexers; using RestSharp; namespace NzbDrone.Integration.Test.Client diff --git a/src/NzbDrone.Integration.Test/Client/TrackClient.cs b/src/NzbDrone.Integration.Test/Client/TrackClient.cs index ab51399b7..ad3ec8436 100644 --- a/src/NzbDrone.Integration.Test/Client/TrackClient.cs +++ b/src/NzbDrone.Integration.Test/Client/TrackClient.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using Lidarr.Api.V3.Tracks; +using Lidarr.Api.V1.Tracks; using RestSharp; namespace NzbDrone.Integration.Test.Client diff --git a/src/NzbDrone.Integration.Test/HttpLogFixture.cs b/src/NzbDrone.Integration.Test/HttpLogFixture.cs index 52e28670e..29274c802 100644 --- a/src/NzbDrone.Integration.Test/HttpLogFixture.cs +++ b/src/NzbDrone.Integration.Test/HttpLogFixture.cs @@ -18,7 +18,7 @@ namespace NzbDrone.Integration.Test var logFile = Path.Combine(_runner.AppData, "logs", "Lidarr.trace.txt"); var logLines = File.ReadAllLines(logFile); - var result = Artist.InvalidPost(new Lidarr.Api.V3.Artist.ArtistResource()); + var result = Artist.InvalidPost(new Lidarr.Api.V1.Artist.ArtistResource()); logLines = File.ReadAllLines(logFile).Skip(logLines.Length).ToArray(); diff --git a/src/NzbDrone.Integration.Test/IntegrationTest.cs b/src/NzbDrone.Integration.Test/IntegrationTest.cs index 80d2612af..e886ae4d7 100644 --- a/src/NzbDrone.Integration.Test/IntegrationTest.cs +++ b/src/NzbDrone.Integration.Test/IntegrationTest.cs @@ -25,7 +25,7 @@ namespace NzbDrone.Integration.Test protected override void InitializeTestTarget() { - Indexers.Post(new Lidarr.Api.V3.Indexers.IndexerResource + Indexers.Post(new Lidarr.Api.V1.Indexers.IndexerResource { EnableRss = false, EnableSearch = false, diff --git a/src/NzbDrone.Integration.Test/IntegrationTestBase.cs b/src/NzbDrone.Integration.Test/IntegrationTestBase.cs index 964c5e4c8..c4ac3c900 100644 --- a/src/NzbDrone.Integration.Test/IntegrationTestBase.cs +++ b/src/NzbDrone.Integration.Test/IntegrationTestBase.cs @@ -10,18 +10,18 @@ using NLog; using NLog.Config; using NLog.Targets; using NUnit.Framework; -using Lidarr.Api.V3.Blacklist; -using Lidarr.Api.V3.Commands; -using Lidarr.Api.V3.Config; -using Lidarr.Api.V3.DownloadClient; -using Lidarr.Api.V3.TrackFiles; -using Lidarr.Api.V3.History; -using Lidarr.Api.V3.Profiles.Quality; -using Lidarr.Api.V3.RootFolders; -using Lidarr.Api.V3.Artist; -using Lidarr.Api.V3.Albums; -using Lidarr.Api.V3.Tracks; -using Lidarr.Api.V3.Tags; +using Lidarr.Api.V1.Blacklist; +using Lidarr.Api.V1.Commands; +using Lidarr.Api.V1.Config; +using Lidarr.Api.V1.DownloadClient; +using Lidarr.Api.V1.TrackFiles; +using Lidarr.Api.V1.History; +using Lidarr.Api.V1.Profiles.Quality; +using Lidarr.Api.V1.RootFolders; +using Lidarr.Api.V1.Artist; +using Lidarr.Api.V1.Albums; +using Lidarr.Api.V1.Tracks; +using Lidarr.Api.V1.Tags; using NzbDrone.Common.EnvironmentInfo; using NzbDrone.Common.Serializer; using NzbDrone.Core.Qualities; @@ -96,7 +96,7 @@ namespace NzbDrone.Integration.Test protected virtual void InitRestClients() { - RestClient = new RestClient(RootUrl + "api/v3/"); + RestClient = new RestClient(RootUrl + "api/v1/"); RestClient.AddDefaultHeader("Authentication", ApiKey); RestClient.AddDefaultHeader("X-Api-Key", ApiKey); diff --git a/src/NzbDrone.Integration.Test/NzbDrone.Integration.Test.csproj b/src/NzbDrone.Integration.Test/NzbDrone.Integration.Test.csproj index 509f762eb..a145ccd04 100644 --- a/src/NzbDrone.Integration.Test/NzbDrone.Integration.Test.csproj +++ b/src/NzbDrone.Integration.Test/NzbDrone.Integration.Test.csproj @@ -138,9 +138,9 @@ - + {7140ff1f-79be-492f-9188-b21a050bf708} - Lidarr.Api.V3 + Lidarr.Api.V1 {F2BE0FDF-6E47-4827-A420-DD4EF82407F8}