diff --git a/frontend/src/Settings/ImportLists/ImportLists/EditImportListModalContent.js b/frontend/src/Settings/ImportLists/ImportLists/EditImportListModalContent.js index a1c74884b..5365fdd65 100644 --- a/frontend/src/Settings/ImportLists/ImportLists/EditImportListModalContent.js +++ b/frontend/src/Settings/ImportLists/ImportLists/EditImportListModalContent.js @@ -49,6 +49,12 @@ function EditImportListModalContent(props) { fields } = item; + const importListTypeOptions = [ + { key: 'manual', value: 'Manual' }, + { key: 'automatic', value: 'Automatic Add' }, + { key: 'exclusion', value: 'Exclusion List' } + ]; + return ( @@ -100,8 +106,9 @@ function EditImportListModalContent(props) { {translate('EnableAutomaticAdd')} (); mockList.SetupGet(s => s.Definition).Returns(new ImportListDefinition { Id = id }); - mockList.SetupGet(s => s.EnableAuto).Returns(true); + mockList.SetupGet(s => s.EnableAuto).Returns(ImportListType.Automatic); _lists.Add(mockList.Object); diff --git a/src/NzbDrone.Core.Test/ImportListTests/FetchAndParseImportListServiceFixture.cs b/src/NzbDrone.Core.Test/ImportListTests/FetchAndParseImportListServiceFixture.cs index 0a5c67d3f..8130a3e0a 100644 --- a/src/NzbDrone.Core.Test/ImportListTests/FetchAndParseImportListServiceFixture.cs +++ b/src/NzbDrone.Core.Test/ImportListTests/FetchAndParseImportListServiceFixture.cs @@ -42,12 +42,12 @@ namespace NzbDrone.Core.Test.ImportListTests .Returns(m => new Movie { TmdbId = m.TmdbId }); } - private void GivenList(int id, bool enabled, bool enabledAuto, ImportListFetchResult fetchResult) + private void GivenList(int id, bool enabled, ImportListType enabledAuto, ImportListFetchResult fetchResult) { CreateListResult(id, enabled, enabledAuto, fetchResult); } - private Mock CreateListResult(int id, bool enabled, bool enabledAuto, ImportListFetchResult fetchResult) + private Mock CreateListResult(int id, bool enabled, ImportListType enabledAuto, ImportListFetchResult fetchResult) { var importListDefinition = new ImportListDefinition { Id = id, EnableAuto = enabledAuto }; @@ -71,7 +71,7 @@ namespace NzbDrone.Core.Test.ImportListTests public void should_return_failure_if_blocked_list() { var fetchResult = new ImportListFetchResult(); - GivenList(1, true, true, fetchResult); + GivenList(1, true, ImportListType.Automatic, fetchResult); GivenBlockedList(1); var listResult = Subject.Fetch(); @@ -82,11 +82,11 @@ namespace NzbDrone.Core.Test.ImportListTests public void should_return_failure_if_one_blocked_list_one_good_list() { var fetchResult1 = new ImportListFetchResult(); - GivenList(1, true, true, fetchResult1); + GivenList(1, true, ImportListType.Automatic, fetchResult1); GivenBlockedList(1); var fetchResult2 = new ImportListFetchResult { Movies = _listMovies, AnyFailure = true }; - GivenList(2, true, true, fetchResult2); + GivenList(2, true, ImportListType.Automatic, fetchResult2); var listResult = Subject.Fetch(); listResult.AnyFailure.Should().BeTrue(); @@ -96,7 +96,7 @@ namespace NzbDrone.Core.Test.ImportListTests public void should_return_failure_if_single_list_fails() { var fetchResult = new ImportListFetchResult { Movies = _listMovies, AnyFailure = true }; - GivenList(1, true, true, fetchResult); + GivenList(1, true, ImportListType.Automatic, fetchResult); var listResult = Subject.Fetch(); listResult.AnyFailure.Should().BeTrue(); @@ -106,9 +106,9 @@ namespace NzbDrone.Core.Test.ImportListTests public void should_return_failure_if_any_list_fails() { var fetchResult1 = new ImportListFetchResult { Movies = _listMovies, AnyFailure = true }; - GivenList(1, true, true, fetchResult1); + GivenList(1, true, ImportListType.Automatic, fetchResult1); var fetchResult2 = new ImportListFetchResult { Movies = _listMovies, AnyFailure = false }; - GivenList(2, true, true, fetchResult2); + GivenList(2, true, ImportListType.Automatic, fetchResult2); var listResult = Subject.Fetch(); listResult.AnyFailure.Should().BeTrue(); @@ -131,7 +131,7 @@ namespace NzbDrone.Core.Test.ImportListTests { var listId = 1; var fetchResult = new ImportListFetchResult { Movies = _listMovies, AnyFailure = false }; - GivenList(listId, true, true, fetchResult); + GivenList(listId, true, ImportListType.Automatic, fetchResult); var listResult = Subject.Fetch(); listResult.AnyFailure.Should().BeFalse(); @@ -145,7 +145,7 @@ namespace NzbDrone.Core.Test.ImportListTests { var listId = 1; var fetchResult = new ImportListFetchResult { Movies = _listMovies, AnyFailure = true }; - GivenList(listId, true, true, fetchResult); + GivenList(listId, true, ImportListType.Automatic, fetchResult); var listResult = Subject.Fetch(); listResult.AnyFailure.Should().BeTrue(); @@ -159,10 +159,10 @@ namespace NzbDrone.Core.Test.ImportListTests { var passedListId = 1; var fetchResult1 = new ImportListFetchResult { Movies = _listMovies, AnyFailure = false }; - GivenList(passedListId, true, true, fetchResult1); + GivenList(passedListId, true, ImportListType.Automatic, fetchResult1); var failedListId = 2; var fetchResult2 = new ImportListFetchResult { Movies = _listMovies, AnyFailure = true }; - GivenList(failedListId, true, true, fetchResult2); + GivenList(failedListId, true, ImportListType.Automatic, fetchResult2); var listResult = Subject.Fetch(); listResult.AnyFailure.Should().BeTrue(); @@ -176,10 +176,10 @@ namespace NzbDrone.Core.Test.ImportListTests { var passedListId = 1; var fetchResult1 = new ImportListFetchResult { Movies = _listMovies, AnyFailure = false }; - GivenList(passedListId, true, true, fetchResult1); + GivenList(passedListId, true, ImportListType.Automatic, fetchResult1); var failedListId = 2; var fetchResult2 = new ImportListFetchResult { Movies = _listMovies, AnyFailure = false }; - GivenList(failedListId, true, true, fetchResult2); + GivenList(failedListId, true, ImportListType.Automatic, fetchResult2); var listResult = Subject.Fetch(); listResult.AnyFailure.Should().BeFalse(); diff --git a/src/NzbDrone.Core.Test/ImportListTests/ImportListSyncServiceFixture.cs b/src/NzbDrone.Core.Test/ImportListTests/ImportListSyncServiceFixture.cs index 3e937b3c0..96969e030 100644 --- a/src/NzbDrone.Core.Test/ImportListTests/ImportListSyncServiceFixture.cs +++ b/src/NzbDrone.Core.Test/ImportListTests/ImportListSyncServiceFixture.cs @@ -104,7 +104,7 @@ namespace NzbDrone.Core.Test.ImportList .Returns(cleanLevel); } - private void GivenList(int id, bool enabledAuto) + private void GivenList(int id, ImportListType enabledAuto) { var importListDefinition = new ImportListDefinition { Id = id, EnableAuto = enabledAuto }; @@ -115,7 +115,7 @@ namespace NzbDrone.Core.Test.ImportList CreateListResult(id, enabledAuto); } - private Mock CreateListResult(int id, bool enabledAuto) + private Mock CreateListResult(int id, ImportListType enabledAuto) { var importListDefinition = new ImportListDefinition { Id = id, EnableAuto = enabledAuto }; @@ -133,7 +133,7 @@ namespace NzbDrone.Core.Test.ImportList public void should_not_clean_library_if_config_value_disable() { _importListFetch.Movies.ForEach(m => m.ListId = 1); - GivenList(1, true); + GivenList(1, ImportListType.Automatic); GivenCleanLevel("disabled"); Subject.Execute(_commandAll); @@ -149,7 +149,7 @@ namespace NzbDrone.Core.Test.ImportList public void should_log_only_on_clean_library_if_config_value_logonly() { _importListFetch.Movies.ForEach(m => m.ListId = 1); - GivenList(1, true); + GivenList(1, ImportListType.Automatic); GivenCleanLevel("logOnly"); Mocker.GetMock() @@ -172,7 +172,7 @@ namespace NzbDrone.Core.Test.ImportList public void should_unmonitor_on_clean_library_if_config_value_keepAndUnmonitor() { _importListFetch.Movies.ForEach(m => m.ListId = 1); - GivenList(1, true); + GivenList(1, ImportListType.Automatic); GivenCleanLevel("keepAndUnmonitor"); Mocker.GetMock() @@ -197,7 +197,7 @@ namespace NzbDrone.Core.Test.ImportList _importListFetch.Movies.ForEach(m => m.ListId = 1); _importListFetch.Movies[0].TmdbId = 6; - GivenList(1, true); + GivenList(1, ImportListType.Automatic); GivenCleanLevel("keepAndUnmonitor"); Mocker.GetMock() @@ -217,7 +217,7 @@ namespace NzbDrone.Core.Test.ImportList _importListFetch.Movies[0].TmdbId = 0; _importListFetch.Movies[0].ImdbId = "6"; - GivenList(1, true); + GivenList(1, ImportListType.Automatic); GivenCleanLevel("keepAndUnmonitor"); Mocker.GetMock() @@ -234,7 +234,7 @@ namespace NzbDrone.Core.Test.ImportList public void should_delete_movies_not_files_on_clean_library_if_config_value_logonly() { _importListFetch.Movies.ForEach(m => m.ListId = 1); - GivenList(1, true); + GivenList(1, ImportListType.Automatic); GivenCleanLevel("removeAndKeep"); Mocker.GetMock() @@ -260,7 +260,7 @@ namespace NzbDrone.Core.Test.ImportList public void should_delete_movies_and_files_on_clean_library_if_config_value_logonly() { _importListFetch.Movies.ForEach(m => m.ListId = 1); - GivenList(1, true); + GivenList(1, ImportListType.Automatic); GivenCleanLevel("removeAndDelete"); Mocker.GetMock() @@ -288,7 +288,7 @@ namespace NzbDrone.Core.Test.ImportList _importListFetch.Movies.ForEach(m => m.ListId = 1); GivenListFailure(); - GivenList(1, true); + GivenList(1, ImportListType.Automatic); GivenCleanLevel("disabled"); Subject.Execute(_commandAll); @@ -301,7 +301,7 @@ namespace NzbDrone.Core.Test.ImportList public void should_add_new_movies_from_single_list_to_library() { _importListFetch.Movies.ForEach(m => m.ListId = 1); - GivenList(1, true); + GivenList(1, ImportListType.Automatic); GivenCleanLevel("disabled"); Subject.Execute(_commandAll); @@ -317,8 +317,8 @@ namespace NzbDrone.Core.Test.ImportList _importListFetch.Movies.ForEach(m => m.ListId = 1); _importListFetch.Movies.AddRange(_list2Movies); - GivenList(1, true); - GivenList(2, true); + GivenList(1, ImportListType.Automatic); + GivenList(2, ImportListType.Automatic); GivenCleanLevel("disabled"); @@ -335,8 +335,8 @@ namespace NzbDrone.Core.Test.ImportList _importListFetch.Movies.ForEach(m => m.ListId = 1); _importListFetch.Movies.AddRange(_list2Movies); - GivenList(1, true); - GivenList(2, false); + GivenList(1, ImportListType.Automatic); + GivenList(2, ImportListType.Manual); GivenCleanLevel("disabled"); @@ -354,8 +354,8 @@ namespace NzbDrone.Core.Test.ImportList _importListFetch.Movies.AddRange(_list2Movies); _importListFetch.Movies[0].TmdbId = 4; - GivenList(1, true); - GivenList(2, true); + GivenList(1, ImportListType.Automatic); + GivenList(2, ImportListType.Automatic); GivenCleanLevel("disabled"); @@ -372,8 +372,8 @@ namespace NzbDrone.Core.Test.ImportList _importListFetch.Movies.ForEach(m => m.ListId = 1); _importListFetch.Movies.AddRange(_list2Movies); - GivenList(1, true); - GivenList(2, true); + GivenList(1, ImportListType.Automatic); + GivenList(2, ImportListType.Automatic); GivenCleanLevel("disabled"); @@ -394,8 +394,8 @@ namespace NzbDrone.Core.Test.ImportList _importListFetch.Movies.ForEach(m => m.ListId = 1); _importListFetch.Movies.AddRange(_list2Movies); - GivenList(1, true); - GivenList(2, true); + GivenList(1, ImportListType.Automatic); + GivenList(2, ImportListType.Automatic); GivenCleanLevel("disabled"); diff --git a/src/NzbDrone.Core/ImportLists/CouchPotato/CouchPotatoImport.cs b/src/NzbDrone.Core/ImportLists/CouchPotato/CouchPotatoImport.cs index 37f5d28b2..b41a2927b 100644 --- a/src/NzbDrone.Core/ImportLists/CouchPotato/CouchPotatoImport.cs +++ b/src/NzbDrone.Core/ImportLists/CouchPotato/CouchPotatoImport.cs @@ -9,9 +9,9 @@ namespace NzbDrone.Core.ImportLists.CouchPotato { public override string Name => "CouchPotato"; - public override ImportListType ListType => ImportListType.Program; + public override ImportListSource ListType => ImportListSource.Program; public override bool Enabled => true; - public override bool EnableAuto => false; + public override ImportListType EnableAuto => ImportListType.Manual; public CouchPotatoImport(IHttpClient httpClient, IImportListStatusService importListStatusService, IConfigService configService, IParsingService parsingService, Logger logger) : base(httpClient, importListStatusService, configService, parsingService, logger) diff --git a/src/NzbDrone.Core/ImportLists/IImportList.cs b/src/NzbDrone.Core/ImportLists/IImportList.cs index 52be21a56..c0d840dfc 100644 --- a/src/NzbDrone.Core/ImportLists/IImportList.cs +++ b/src/NzbDrone.Core/ImportLists/IImportList.cs @@ -5,9 +5,9 @@ namespace NzbDrone.Core.ImportLists public interface IImportList : IProvider { bool Enabled { get; } - bool EnableAuto { get; } + ImportListType EnableAuto { get; } - ImportListType ListType { get; } + ImportListSource ListType { get; } ImportListFetchResult Fetch(); } } diff --git a/src/NzbDrone.Core/ImportLists/ImportListBase.cs b/src/NzbDrone.Core/ImportLists/ImportListBase.cs index 2f989da93..564ddf1b5 100644 --- a/src/NzbDrone.Core/ImportLists/ImportListBase.cs +++ b/src/NzbDrone.Core/ImportLists/ImportListBase.cs @@ -31,9 +31,9 @@ namespace NzbDrone.Core.ImportLists public abstract string Name { get; } - public abstract ImportListType ListType { get; } + public abstract ImportListSource ListType { get; } public abstract bool Enabled { get; } - public abstract bool EnableAuto { get; } + public abstract ImportListType EnableAuto { get; } public abstract ImportListFetchResult Fetch(); @@ -59,7 +59,7 @@ namespace NzbDrone.Core.ImportLists { Name = GetType().Name, Enabled = config.Validate().IsValid && Enabled, - EnableAuto = true, + EnableAuto = ImportListType.Automatic, Implementation = GetType().Name, Settings = config }; diff --git a/src/NzbDrone.Core/ImportLists/ImportListDefinition.cs b/src/NzbDrone.Core/ImportLists/ImportListDefinition.cs index 97fadae36..8bf96963e 100644 --- a/src/NzbDrone.Core/ImportLists/ImportListDefinition.cs +++ b/src/NzbDrone.Core/ImportLists/ImportListDefinition.cs @@ -12,7 +12,7 @@ namespace NzbDrone.Core.ImportLists } public bool Enabled { get; set; } - public bool EnableAuto { get; set; } + public ImportListType EnableAuto { get; set; } public bool ShouldMonitor { get; set; } public MovieStatusType MinimumAvailability { get; set; } public int ProfileId { get; set; } @@ -20,6 +20,6 @@ namespace NzbDrone.Core.ImportLists public bool SearchOnAdd { get; set; } public override bool Enable => Enabled; - public ImportListType ListType { get; set; } + public ImportListSource ListType { get; set; } } } diff --git a/src/NzbDrone.Core/ImportLists/ImportListSource.cs b/src/NzbDrone.Core/ImportLists/ImportListSource.cs new file mode 100644 index 000000000..236a91998 --- /dev/null +++ b/src/NzbDrone.Core/ImportLists/ImportListSource.cs @@ -0,0 +1,11 @@ +namespace NzbDrone.Core.ImportLists +{ + public enum ImportListSource + { + Program, + TMDB, + Trakt, + Other, + Advanced + } +} diff --git a/src/NzbDrone.Core/ImportLists/ImportListSyncService.cs b/src/NzbDrone.Core/ImportLists/ImportListSyncService.cs index 7fb5a01ee..f665b89dd 100644 --- a/src/NzbDrone.Core/ImportLists/ImportListSyncService.cs +++ b/src/NzbDrone.Core/ImportLists/ImportListSyncService.cs @@ -51,7 +51,7 @@ namespace NzbDrone.Core.ImportLists { var result = _listFetcherAndParser.Fetch(); - if (_importListFactory.Enabled().Where(a => ((ImportListDefinition)a.Definition).EnableAuto).Empty()) + if (_importListFactory.Enabled().Where(a => ((ImportListDefinition)a.Definition).EnableAuto == ImportListType.Automatic).Empty()) { _logger.Info("No auto enabled lists, skipping sync and cleaning"); return; @@ -67,7 +67,7 @@ namespace NzbDrone.Core.ImportLists private void ProcessMovieReport(ImportListDefinition importList, ImportListMovie report, List listExclusions, List dbMovies, List moviesToAdd) { - if (report.TmdbId == 0 || !importList.EnableAuto) + if (report.TmdbId == 0 || importList.EnableAuto != ImportListType.Automatic) { return; } diff --git a/src/NzbDrone.Core/ImportLists/ImportListType.cs b/src/NzbDrone.Core/ImportLists/ImportListType.cs index f31d835c2..39aa04984 100644 --- a/src/NzbDrone.Core/ImportLists/ImportListType.cs +++ b/src/NzbDrone.Core/ImportLists/ImportListType.cs @@ -2,10 +2,8 @@ namespace NzbDrone.Core.ImportLists { public enum ImportListType { - Program, - TMDB, - Trakt, - Other, - Advanced + Manual, + Automatic, + Exclusion } } diff --git a/src/NzbDrone.Core/ImportLists/RSSImport/RSSImport.cs b/src/NzbDrone.Core/ImportLists/RSSImport/RSSImport.cs index 19f13cfee..3630eaf24 100644 --- a/src/NzbDrone.Core/ImportLists/RSSImport/RSSImport.cs +++ b/src/NzbDrone.Core/ImportLists/RSSImport/RSSImport.cs @@ -11,9 +11,9 @@ namespace NzbDrone.Core.ImportLists.RSSImport { public override string Name => "RSS List"; - public override ImportListType ListType => ImportListType.Advanced; + public override ImportListSource ListType => ImportListSource.Advanced; public override bool Enabled => true; - public override bool EnableAuto => false; + public override ImportListType EnableAuto => ImportListType.Manual; public RSSImport(IHttpClient httpClient, IImportListStatusService importListStatusService, IConfigService configService, IParsingService parsingService, Logger logger) : base(httpClient, importListStatusService, configService, parsingService, logger) @@ -33,7 +33,7 @@ namespace NzbDrone.Core.ImportLists.RSSImport { Name = "IMDb List", Enabled = Enabled, - EnableAuto = true, + EnableAuto = ImportListType.Automatic, ProfileId = 1, Implementation = GetType().Name, Settings = new RSSImportSettings { Link = "https://rss.imdb.com/list/YOURLISTID" }, @@ -42,7 +42,7 @@ namespace NzbDrone.Core.ImportLists.RSSImport { Name = "IMDb Watchlist", Enabled = Enabled, - EnableAuto = true, + EnableAuto = ImportListType.Automatic, ProfileId = 1, Implementation = GetType().Name, Settings = new RSSImportSettings { Link = "https://rss.imdb.com/user/IMDBUSERID/watchlist" }, diff --git a/src/NzbDrone.Core/ImportLists/Radarr/RadarrImport.cs b/src/NzbDrone.Core/ImportLists/Radarr/RadarrImport.cs index 3b6e6eff6..bbaae937a 100644 --- a/src/NzbDrone.Core/ImportLists/Radarr/RadarrImport.cs +++ b/src/NzbDrone.Core/ImportLists/Radarr/RadarrImport.cs @@ -16,9 +16,9 @@ namespace NzbDrone.Core.ImportLists.Radarr private readonly IRadarrV3Proxy _radarrV3Proxy; public override string Name => "Radarr"; public override bool Enabled => true; - public override bool EnableAuto => false; + public override ImportListType EnableAuto => ImportListType.Manual; - public override ImportListType ListType => ImportListType.Program; + public override ImportListSource ListType => ImportListSource.Program; public RadarrImport(IRadarrV3Proxy radarrV3Proxy, IImportListStatusService importListStatusService, diff --git a/src/NzbDrone.Core/ImportLists/RadarrList/RadarrListImport.cs b/src/NzbDrone.Core/ImportLists/RadarrList/RadarrListImport.cs index bb118158f..ac597b86b 100644 --- a/src/NzbDrone.Core/ImportLists/RadarrList/RadarrListImport.cs +++ b/src/NzbDrone.Core/ImportLists/RadarrList/RadarrListImport.cs @@ -11,9 +11,9 @@ namespace NzbDrone.Core.ImportLists.RadarrList { public override string Name => "Custom Lists"; - public override ImportListType ListType => ImportListType.Advanced; + public override ImportListSource ListType => ImportListSource.Advanced; public override bool Enabled => true; - public override bool EnableAuto => false; + public override ImportListType EnableAuto => ImportListType.Manual; public RadarrListImport(IHttpClient httpClient, IImportListStatusService importListStatusService, diff --git a/src/NzbDrone.Core/ImportLists/RadarrList2/IMDb/IMDbListImport.cs b/src/NzbDrone.Core/ImportLists/RadarrList2/IMDb/IMDbListImport.cs index 813e532d4..1808ea941 100644 --- a/src/NzbDrone.Core/ImportLists/RadarrList2/IMDb/IMDbListImport.cs +++ b/src/NzbDrone.Core/ImportLists/RadarrList2/IMDb/IMDbListImport.cs @@ -14,9 +14,9 @@ namespace NzbDrone.Core.ImportLists.RadarrList2.IMDbList public override string Name => "IMDb Lists"; - public override ImportListType ListType => ImportListType.Other; + public override ImportListSource ListType => ImportListSource.Other; public override bool Enabled => true; - public override bool EnableAuto => false; + public override ImportListType EnableAuto => ImportListType.Manual; public IMDbListImport(IRadarrCloudRequestBuilder requestBuilder, IHttpClient httpClient, @@ -42,7 +42,7 @@ namespace NzbDrone.Core.ImportLists.RadarrList2.IMDbList { Name = "IMDb Top 250", Enabled = Enabled, - EnableAuto = true, + EnableAuto = ImportListType.Automatic, ProfileId = 1, Implementation = GetType().Name, Settings = new IMDbListSettings { ListId = "top250" }, @@ -51,7 +51,7 @@ namespace NzbDrone.Core.ImportLists.RadarrList2.IMDbList { Name = "IMDb Popular Movies", Enabled = Enabled, - EnableAuto = true, + EnableAuto = ImportListType.Automatic, ProfileId = 1, Implementation = GetType().Name, Settings = new IMDbListSettings { ListId = "popular" }, diff --git a/src/NzbDrone.Core/ImportLists/RadarrList2/StevenLu/StevenLu2Import.cs b/src/NzbDrone.Core/ImportLists/RadarrList2/StevenLu/StevenLu2Import.cs index 1c0368b50..485f083d9 100644 --- a/src/NzbDrone.Core/ImportLists/RadarrList2/StevenLu/StevenLu2Import.cs +++ b/src/NzbDrone.Core/ImportLists/RadarrList2/StevenLu/StevenLu2Import.cs @@ -12,9 +12,9 @@ namespace NzbDrone.Core.ImportLists.RadarrList2.StevenLu public override string Name => "StevenLu List"; - public override ImportListType ListType => ImportListType.Other; + public override ImportListSource ListType => ImportListSource.Other; public override bool Enabled => true; - public override bool EnableAuto => false; + public override ImportListType EnableAuto => ImportListType.Manual; public StevenLu2Import(IRadarrCloudRequestBuilder requestBuilder, IHttpClient httpClient, diff --git a/src/NzbDrone.Core/ImportLists/StevenLu/StevenLuImport.cs b/src/NzbDrone.Core/ImportLists/StevenLu/StevenLuImport.cs index f04d94bf9..b04fac619 100644 --- a/src/NzbDrone.Core/ImportLists/StevenLu/StevenLuImport.cs +++ b/src/NzbDrone.Core/ImportLists/StevenLu/StevenLuImport.cs @@ -9,9 +9,9 @@ namespace NzbDrone.Core.ImportLists.StevenLu { public override string Name => "StevenLu Custom"; - public override ImportListType ListType => ImportListType.Advanced; + public override ImportListSource ListType => ImportListSource.Advanced; public override bool Enabled => true; - public override bool EnableAuto => false; + public override ImportListType EnableAuto => ImportListType.Manual; public StevenLuImport(IHttpClient httpClient, IImportListStatusService importListStatusService, diff --git a/src/NzbDrone.Core/ImportLists/TMDb/Collection/TMDbCollectionImport.cs b/src/NzbDrone.Core/ImportLists/TMDb/Collection/TMDbCollectionImport.cs index a7f691c13..0ac1f1db0 100644 --- a/src/NzbDrone.Core/ImportLists/TMDb/Collection/TMDbCollectionImport.cs +++ b/src/NzbDrone.Core/ImportLists/TMDb/Collection/TMDbCollectionImport.cs @@ -22,7 +22,7 @@ namespace NzbDrone.Core.ImportLists.TMDb.Collection public override string Name => "TMDb Collection"; public override bool Enabled => true; - public override bool EnableAuto => false; + public override ImportListType EnableAuto => ImportListType.Manual; public override IParseImportListResponse GetParser() { diff --git a/src/NzbDrone.Core/ImportLists/TMDb/List/TMDbListImport.cs b/src/NzbDrone.Core/ImportLists/TMDb/List/TMDbListImport.cs index c8a87a038..014c13f49 100644 --- a/src/NzbDrone.Core/ImportLists/TMDb/List/TMDbListImport.cs +++ b/src/NzbDrone.Core/ImportLists/TMDb/List/TMDbListImport.cs @@ -22,7 +22,7 @@ namespace NzbDrone.Core.ImportLists.TMDb.List public override string Name => "TMDb List"; public override bool Enabled => true; - public override bool EnableAuto => false; + public override ImportListType EnableAuto => ImportListType.Manual; public override IParseImportListResponse GetParser() { diff --git a/src/NzbDrone.Core/ImportLists/TMDb/Person/TMDbPersonImport.cs b/src/NzbDrone.Core/ImportLists/TMDb/Person/TMDbPersonImport.cs index aa09d299c..b1ed6bff9 100644 --- a/src/NzbDrone.Core/ImportLists/TMDb/Person/TMDbPersonImport.cs +++ b/src/NzbDrone.Core/ImportLists/TMDb/Person/TMDbPersonImport.cs @@ -22,7 +22,7 @@ namespace NzbDrone.Core.ImportLists.TMDb.Person public override string Name => "TMDb Person"; public override bool Enabled => true; - public override bool EnableAuto => false; + public override ImportListType EnableAuto => ImportListType.Manual; public override IParseImportListResponse GetParser() { diff --git a/src/NzbDrone.Core/ImportLists/TMDb/Popular/TMDbPopularImport.cs b/src/NzbDrone.Core/ImportLists/TMDb/Popular/TMDbPopularImport.cs index 4a064d4b7..69f2e00ab 100644 --- a/src/NzbDrone.Core/ImportLists/TMDb/Popular/TMDbPopularImport.cs +++ b/src/NzbDrone.Core/ImportLists/TMDb/Popular/TMDbPopularImport.cs @@ -22,7 +22,7 @@ namespace NzbDrone.Core.ImportLists.TMDb.Popular public override string Name => "TMDb Popular"; public override bool Enabled => true; - public override bool EnableAuto => false; + public override ImportListType EnableAuto => ImportListType.Manual; public override IParseImportListResponse GetParser() { diff --git a/src/NzbDrone.Core/ImportLists/TMDb/TMDbImportBase.cs b/src/NzbDrone.Core/ImportLists/TMDb/TMDbImportBase.cs index 3c4df1b7c..e942861b1 100644 --- a/src/NzbDrone.Core/ImportLists/TMDb/TMDbImportBase.cs +++ b/src/NzbDrone.Core/ImportLists/TMDb/TMDbImportBase.cs @@ -10,7 +10,7 @@ namespace NzbDrone.Core.ImportLists.TMDb public abstract class TMDbImportListBase : HttpImportListBase where TSettings : TMDbSettingsBase, new() { - public override ImportListType ListType => ImportListType.TMDB; + public override ImportListSource ListType => ImportListSource.TMDB; public readonly ISearchForNewMovie _skyhookProxy; public readonly IHttpRequestBuilderFactory _requestBuilder; diff --git a/src/NzbDrone.Core/ImportLists/TMDb/User/TMDbUserImport.cs b/src/NzbDrone.Core/ImportLists/TMDb/User/TMDbUserImport.cs index 33a8c10c6..96871760c 100644 --- a/src/NzbDrone.Core/ImportLists/TMDb/User/TMDbUserImport.cs +++ b/src/NzbDrone.Core/ImportLists/TMDb/User/TMDbUserImport.cs @@ -24,7 +24,7 @@ namespace NzbDrone.Core.ImportLists.TMDb.User public override string Name => "TMDb User"; public override bool Enabled => true; - public override bool EnableAuto => false; + public override ImportListType EnableAuto => ImportListType.Manual; public override IParseImportListResponse GetParser() { diff --git a/src/NzbDrone.Core/ImportLists/Trakt/List/TraktListImport.cs b/src/NzbDrone.Core/ImportLists/Trakt/List/TraktListImport.cs index 0691a35c6..548d51453 100644 --- a/src/NzbDrone.Core/ImportLists/Trakt/List/TraktListImport.cs +++ b/src/NzbDrone.Core/ImportLists/Trakt/List/TraktListImport.cs @@ -21,7 +21,7 @@ namespace NzbDrone.Core.ImportLists.Trakt.List public override string Name => "Trakt List"; public override bool Enabled => true; - public override bool EnableAuto => false; + public override ImportListType EnableAuto => ImportListType.Manual; public override IImportListRequestGenerator GetRequestGenerator() { diff --git a/src/NzbDrone.Core/ImportLists/Trakt/Popular/TraktPopularImport.cs b/src/NzbDrone.Core/ImportLists/Trakt/Popular/TraktPopularImport.cs index 1739d1853..07178f23c 100644 --- a/src/NzbDrone.Core/ImportLists/Trakt/Popular/TraktPopularImport.cs +++ b/src/NzbDrone.Core/ImportLists/Trakt/Popular/TraktPopularImport.cs @@ -21,7 +21,7 @@ namespace NzbDrone.Core.ImportLists.Trakt.Popular public override string Name => "Trakt Popular List"; public override bool Enabled => true; - public override bool EnableAuto => false; + public override ImportListType EnableAuto => ImportListType.Manual; public override IParseImportListResponse GetParser() { diff --git a/src/NzbDrone.Core/ImportLists/Trakt/TraktImportBase.cs b/src/NzbDrone.Core/ImportLists/Trakt/TraktImportBase.cs index 330aab737..eae26c411 100644 --- a/src/NzbDrone.Core/ImportLists/Trakt/TraktImportBase.cs +++ b/src/NzbDrone.Core/ImportLists/Trakt/TraktImportBase.cs @@ -14,7 +14,7 @@ namespace NzbDrone.Core.ImportLists.Trakt { public ITraktProxy _traktProxy; private readonly IImportListRepository _importListRepository; - public override ImportListType ListType => ImportListType.Trakt; + public override ImportListSource ListType => ImportListSource.Trakt; protected TraktImportBase(IImportListRepository importListRepository, ITraktProxy traktProxy, diff --git a/src/NzbDrone.Core/ImportLists/Trakt/User/TraktUserImport.cs b/src/NzbDrone.Core/ImportLists/Trakt/User/TraktUserImport.cs index 6f8198cd7..08758b1ef 100644 --- a/src/NzbDrone.Core/ImportLists/Trakt/User/TraktUserImport.cs +++ b/src/NzbDrone.Core/ImportLists/Trakt/User/TraktUserImport.cs @@ -21,7 +21,7 @@ namespace NzbDrone.Core.ImportLists.Trakt.User public override string Name => "Trakt User"; public override bool Enabled => true; - public override bool EnableAuto => false; + public override ImportListType EnableAuto => ImportListType.Manual; public override IImportListRequestGenerator GetRequestGenerator() { diff --git a/src/Radarr.Api.V3/ImportLists/ImportListResource.cs b/src/Radarr.Api.V3/ImportLists/ImportListResource.cs index 05e3c2aed..c3b765f76 100644 --- a/src/Radarr.Api.V3/ImportLists/ImportListResource.cs +++ b/src/Radarr.Api.V3/ImportLists/ImportListResource.cs @@ -6,13 +6,13 @@ namespace Radarr.Api.V3.ImportLists public class ImportListResource : ProviderResource { public bool Enabled { get; set; } - public bool EnableAuto { get; set; } + public ImportListType EnableAuto { get; set; } public bool ShouldMonitor { get; set; } public string RootFolderPath { get; set; } public int QualityProfileId { get; set; } public bool SearchOnAdd { get; set; } public MovieStatusType MinimumAvailability { get; set; } - public ImportListType ListType { get; set; } + public ImportListSource ListType { get; set; } public int ListOrder { get; set; } }