From 499401fc701c7718513ccf4bc142fabbfa4ddd63 Mon Sep 17 00:00:00 2001 From: Keivan Beigi Date: Mon, 18 Feb 2013 18:19:38 -0800 Subject: [PATCH] Moved DecisionEngine to root of core. --- .../EnviromentProviderTest.cs | 6 ----- .../AcceptableSizeSpecificationFixture.cs | 4 +-- .../AllowedDownloadSpecificationFixture.cs | 4 +-- ...AllowedReleaseGroupSpecificationFixture.cs | 4 +-- .../CustomStartDateSpecificationFixture.cs | 4 +-- .../LanguageSpecificationFixture.cs | 4 +-- .../MonitoredEpisodeSpecificationFixture.cs | 4 +-- ...ityAllowedByProfileSpecificationFixture.cs | 4 +-- .../QualityUpgradeSpecificationFixture.cs | 4 +-- .../RetentionSpecificationFixture.cs | 4 +-- .../UpgradeDiskSpecificationFixture.cs | 4 +-- .../UpgradeHistorySpecificationFixture.cs | 4 +-- .../UpgradePossibleSpecificationFixture.cs | 4 +-- NzbDrone.Core.Test/NzbDrone.Core.Test.csproj | 24 ++++++++--------- .../SearchTests/ProcessResultsFixture.cs | 2 +- .../ProviderTests/SearchTests/TestSearch.cs | 2 +- .../AcceptableSizeSpecification.cs | 3 ++- .../AllowedDownloadSpecification.cs | 2 +- .../AllowedReleaseGroupSpecification.cs | 2 +- .../AlreadyInQueueSpecification.cs | 3 ++- .../CustomStartDateSpecification.cs | 2 +- .../DecisionEngine/LanguageSpecification.cs | 2 +- .../MonitoredEpisodeSpecification.cs | 3 ++- .../QualityAllowedByProfileSpecification.cs | 2 +- .../QualityUpgradeSpecification.cs | 2 +- .../DecisionEngine/RetentionSpecification.cs | 2 +- .../UpgradeDiskSpecification.cs | 2 +- .../UpgradeHistorySpecification.cs | 3 ++- .../UpgradePossibleSpecification.cs | 3 ++- NzbDrone.Core/Jobs/EpisodeSearchJob.cs | 2 +- NzbDrone.Core/Jobs/RssSyncJob.cs | 2 +- NzbDrone.Core/NzbDrone.Core.csproj | 26 +++++++++---------- .../DownloadClients/BlackholeProvider.cs | 2 +- .../DownloadClients/PneumaticProvider.cs | 2 +- .../Providers/Search/DailyEpisodeSearch.cs | 2 +- .../Providers/Search/EpisodeSearch.cs | 2 +- .../Providers/Search/PartialSeasonSearch.cs | 2 +- NzbDrone.Core/Providers/Search/SearchBase.cs | 2 +- NzbDrone.Core/Providers/SearchProvider.cs | 2 +- 39 files changed, 78 insertions(+), 79 deletions(-) rename NzbDrone.Core.Test/{ProviderTests => }/DecisionEngineTests/AcceptableSizeSpecificationFixture.cs (99%) rename NzbDrone.Core.Test/{ProviderTests => }/DecisionEngineTests/AllowedDownloadSpecificationFixture.cs (98%) rename NzbDrone.Core.Test/{ProviderTests => }/DecisionEngineTests/AllowedReleaseGroupSpecificationFixture.cs (95%) rename NzbDrone.Core.Test/{ProviderTests => }/DecisionEngineTests/CustomStartDateSpecificationFixture.cs (97%) rename NzbDrone.Core.Test/{ProviderTests => }/DecisionEngineTests/LanguageSpecificationFixture.cs (93%) rename NzbDrone.Core.Test/{ProviderTests => }/DecisionEngineTests/MonitoredEpisodeSpecificationFixture.cs (97%) rename NzbDrone.Core.Test/{ProviderTests => }/DecisionEngineTests/QualityAllowedByProfileSpecificationFixture.cs (95%) rename NzbDrone.Core.Test/{ProviderTests => }/DecisionEngineTests/QualityUpgradeSpecificationFixture.cs (94%) rename NzbDrone.Core.Test/{ProviderTests => }/DecisionEngineTests/RetentionSpecificationFixture.cs (95%) rename NzbDrone.Core.Test/{ProviderTests => }/DecisionEngineTests/UpgradeDiskSpecificationFixture.cs (97%) rename NzbDrone.Core.Test/{ProviderTests => }/DecisionEngineTests/UpgradeHistorySpecificationFixture.cs (97%) rename NzbDrone.Core.Test/{ProviderTests => }/DecisionEngineTests/UpgradePossibleSpecificationFixture.cs (96%) rename NzbDrone.Core/{Providers => }/DecisionEngine/AcceptableSizeSpecification.cs (97%) rename NzbDrone.Core/{Providers => }/DecisionEngine/AllowedDownloadSpecification.cs (98%) rename NzbDrone.Core/{Providers => }/DecisionEngine/AllowedReleaseGroupSpecification.cs (96%) rename NzbDrone.Core/{Providers => }/DecisionEngine/AlreadyInQueueSpecification.cs (90%) rename NzbDrone.Core/{Providers => }/DecisionEngine/CustomStartDateSpecification.cs (94%) rename NzbDrone.Core/{Providers => }/DecisionEngine/LanguageSpecification.cs (95%) rename NzbDrone.Core/{Providers => }/DecisionEngine/MonitoredEpisodeSpecification.cs (95%) rename NzbDrone.Core/{Providers => }/DecisionEngine/QualityAllowedByProfileSpecification.cs (93%) rename NzbDrone.Core/{Providers => }/DecisionEngine/QualityUpgradeSpecification.cs (95%) rename NzbDrone.Core/{Providers => }/DecisionEngine/RetentionSpecification.cs (95%) rename NzbDrone.Core/{Providers => }/DecisionEngine/UpgradeDiskSpecification.cs (96%) rename NzbDrone.Core/{Providers => }/DecisionEngine/UpgradeHistorySpecification.cs (95%) rename NzbDrone.Core/{Providers => }/DecisionEngine/UpgradePossibleSpecification.cs (93%) diff --git a/NzbDrone.Common.Test/EnviromentProviderTest.cs b/NzbDrone.Common.Test/EnviromentProviderTest.cs index 7b4eca09e..b02c88334 100644 --- a/NzbDrone.Common.Test/EnviromentProviderTest.cs +++ b/NzbDrone.Common.Test/EnviromentProviderTest.cs @@ -42,12 +42,6 @@ namespace NzbDrone.Common.Test environmentProvider.CrawlToRoot("C:\\").Should().BeNullOrEmpty(); } - [Test] - public void should_go_up_the_tree_to_find_iis() - { - environmentProvider.ApplicationPath.Should().NotBe(Environment.CurrentDirectory); - environmentProvider.ApplicationPath.Should().NotBe(environmentProvider.StartUpPath); - } [Test] public void IsProduction_should_return_false_when_run_within_nunit() { diff --git a/NzbDrone.Core.Test/ProviderTests/DecisionEngineTests/AcceptableSizeSpecificationFixture.cs b/NzbDrone.Core.Test/DecisionEngineTests/AcceptableSizeSpecificationFixture.cs similarity index 99% rename from NzbDrone.Core.Test/ProviderTests/DecisionEngineTests/AcceptableSizeSpecificationFixture.cs rename to NzbDrone.Core.Test/DecisionEngineTests/AcceptableSizeSpecificationFixture.cs index 2e1690a8c..e99f79e89 100644 --- a/NzbDrone.Core.Test/ProviderTests/DecisionEngineTests/AcceptableSizeSpecificationFixture.cs +++ b/NzbDrone.Core.Test/DecisionEngineTests/AcceptableSizeSpecificationFixture.cs @@ -9,12 +9,12 @@ using Moq; using NUnit.Framework; using NzbDrone.Core.Model; using NzbDrone.Core.Providers; -using NzbDrone.Core.Providers.DecisionEngine; +using NzbDrone.Core.DecisionEngine; using NzbDrone.Core.Repository; using NzbDrone.Core.Repository.Quality; using NzbDrone.Core.Test.Framework; -namespace NzbDrone.Core.Test.ProviderTests.DecisionEngineTests +namespace NzbDrone.Core.Test.DecisionEngineTests { [TestFixture] // ReSharper disable InconsistentNaming diff --git a/NzbDrone.Core.Test/ProviderTests/DecisionEngineTests/AllowedDownloadSpecificationFixture.cs b/NzbDrone.Core.Test/DecisionEngineTests/AllowedDownloadSpecificationFixture.cs similarity index 98% rename from NzbDrone.Core.Test/ProviderTests/DecisionEngineTests/AllowedDownloadSpecificationFixture.cs rename to NzbDrone.Core.Test/DecisionEngineTests/AllowedDownloadSpecificationFixture.cs index ff143f98a..0480370ee 100644 --- a/NzbDrone.Core.Test/ProviderTests/DecisionEngineTests/AllowedDownloadSpecificationFixture.cs +++ b/NzbDrone.Core.Test/DecisionEngineTests/AllowedDownloadSpecificationFixture.cs @@ -9,12 +9,12 @@ using Moq; using NUnit.Framework; using NzbDrone.Core.Model; using NzbDrone.Core.Providers; -using NzbDrone.Core.Providers.DecisionEngine; +using NzbDrone.Core.DecisionEngine; using NzbDrone.Core.Repository; using NzbDrone.Core.Repository.Quality; using NzbDrone.Core.Test.Framework; -namespace NzbDrone.Core.Test.ProviderTests.DecisionEngineTests +namespace NzbDrone.Core.Test.DecisionEngineTests { [TestFixture] // ReSharper disable InconsistentNaming diff --git a/NzbDrone.Core.Test/ProviderTests/DecisionEngineTests/AllowedReleaseGroupSpecificationFixture.cs b/NzbDrone.Core.Test/DecisionEngineTests/AllowedReleaseGroupSpecificationFixture.cs similarity index 95% rename from NzbDrone.Core.Test/ProviderTests/DecisionEngineTests/AllowedReleaseGroupSpecificationFixture.cs rename to NzbDrone.Core.Test/DecisionEngineTests/AllowedReleaseGroupSpecificationFixture.cs index 223c34201..d7707a0c6 100644 --- a/NzbDrone.Core.Test/ProviderTests/DecisionEngineTests/AllowedReleaseGroupSpecificationFixture.cs +++ b/NzbDrone.Core.Test/DecisionEngineTests/AllowedReleaseGroupSpecificationFixture.cs @@ -10,12 +10,12 @@ using NUnit.Framework; using NzbDrone.Core.Model; using NzbDrone.Core.Providers; using NzbDrone.Core.Providers.Core; -using NzbDrone.Core.Providers.DecisionEngine; +using NzbDrone.Core.DecisionEngine; using NzbDrone.Core.Repository; using NzbDrone.Core.Repository.Quality; using NzbDrone.Core.Test.Framework; -namespace NzbDrone.Core.Test.ProviderTests.DecisionEngineTests +namespace NzbDrone.Core.Test.DecisionEngineTests { [TestFixture] // ReSharper disable InconsistentNaming diff --git a/NzbDrone.Core.Test/ProviderTests/DecisionEngineTests/CustomStartDateSpecificationFixture.cs b/NzbDrone.Core.Test/DecisionEngineTests/CustomStartDateSpecificationFixture.cs similarity index 97% rename from NzbDrone.Core.Test/ProviderTests/DecisionEngineTests/CustomStartDateSpecificationFixture.cs rename to NzbDrone.Core.Test/DecisionEngineTests/CustomStartDateSpecificationFixture.cs index 95d3d3ada..3dee00de2 100644 --- a/NzbDrone.Core.Test/ProviderTests/DecisionEngineTests/CustomStartDateSpecificationFixture.cs +++ b/NzbDrone.Core.Test/DecisionEngineTests/CustomStartDateSpecificationFixture.cs @@ -9,11 +9,11 @@ using Moq; using NUnit.Framework; using NzbDrone.Core.Model; using NzbDrone.Core.Providers; -using NzbDrone.Core.Providers.DecisionEngine; +using NzbDrone.Core.DecisionEngine; using NzbDrone.Core.Repository; using NzbDrone.Core.Test.Framework; -namespace NzbDrone.Core.Test.ProviderTests.DecisionEngineTests +namespace NzbDrone.Core.Test.DecisionEngineTests { [TestFixture] // ReSharper disable InconsistentNaming diff --git a/NzbDrone.Core.Test/ProviderTests/DecisionEngineTests/LanguageSpecificationFixture.cs b/NzbDrone.Core.Test/DecisionEngineTests/LanguageSpecificationFixture.cs similarity index 93% rename from NzbDrone.Core.Test/ProviderTests/DecisionEngineTests/LanguageSpecificationFixture.cs rename to NzbDrone.Core.Test/DecisionEngineTests/LanguageSpecificationFixture.cs index 796160a7a..22d45779d 100644 --- a/NzbDrone.Core.Test/ProviderTests/DecisionEngineTests/LanguageSpecificationFixture.cs +++ b/NzbDrone.Core.Test/DecisionEngineTests/LanguageSpecificationFixture.cs @@ -10,11 +10,11 @@ using NUnit.Framework; using NzbDrone.Core.Model; using NzbDrone.Core.Providers; using NzbDrone.Core.Providers.Core; -using NzbDrone.Core.Providers.DecisionEngine; +using NzbDrone.Core.DecisionEngine; using NzbDrone.Core.Repository; using NzbDrone.Core.Test.Framework; -namespace NzbDrone.Core.Test.ProviderTests.DecisionEngineTests +namespace NzbDrone.Core.Test.DecisionEngineTests { [TestFixture] // ReSharper disable InconsistentNaming diff --git a/NzbDrone.Core.Test/ProviderTests/DecisionEngineTests/MonitoredEpisodeSpecificationFixture.cs b/NzbDrone.Core.Test/DecisionEngineTests/MonitoredEpisodeSpecificationFixture.cs similarity index 97% rename from NzbDrone.Core.Test/ProviderTests/DecisionEngineTests/MonitoredEpisodeSpecificationFixture.cs rename to NzbDrone.Core.Test/DecisionEngineTests/MonitoredEpisodeSpecificationFixture.cs index 7b6f624ab..d54c2856f 100644 --- a/NzbDrone.Core.Test/ProviderTests/DecisionEngineTests/MonitoredEpisodeSpecificationFixture.cs +++ b/NzbDrone.Core.Test/DecisionEngineTests/MonitoredEpisodeSpecificationFixture.cs @@ -9,11 +9,11 @@ using Moq; using NUnit.Framework; using NzbDrone.Core.Model; using NzbDrone.Core.Providers; -using NzbDrone.Core.Providers.DecisionEngine; +using NzbDrone.Core.DecisionEngine; using NzbDrone.Core.Repository; using NzbDrone.Core.Test.Framework; -namespace NzbDrone.Core.Test.ProviderTests.DecisionEngineTests +namespace NzbDrone.Core.Test.DecisionEngineTests { [TestFixture] // ReSharper disable InconsistentNaming diff --git a/NzbDrone.Core.Test/ProviderTests/DecisionEngineTests/QualityAllowedByProfileSpecificationFixture.cs b/NzbDrone.Core.Test/DecisionEngineTests/QualityAllowedByProfileSpecificationFixture.cs similarity index 95% rename from NzbDrone.Core.Test/ProviderTests/DecisionEngineTests/QualityAllowedByProfileSpecificationFixture.cs rename to NzbDrone.Core.Test/DecisionEngineTests/QualityAllowedByProfileSpecificationFixture.cs index e3c9b79a6..7959d43fb 100644 --- a/NzbDrone.Core.Test/ProviderTests/DecisionEngineTests/QualityAllowedByProfileSpecificationFixture.cs +++ b/NzbDrone.Core.Test/DecisionEngineTests/QualityAllowedByProfileSpecificationFixture.cs @@ -6,12 +6,12 @@ using FizzWare.NBuilder; using FluentAssertions; using NUnit.Framework; using NzbDrone.Core.Model; -using NzbDrone.Core.Providers.DecisionEngine; +using NzbDrone.Core.DecisionEngine; using NzbDrone.Core.Repository; using NzbDrone.Core.Repository.Quality; using NzbDrone.Core.Test.Framework; -namespace NzbDrone.Core.Test.ProviderTests.DecisionEngineTests +namespace NzbDrone.Core.Test.DecisionEngineTests { [TestFixture] // ReSharper disable InconsistentNaming diff --git a/NzbDrone.Core.Test/ProviderTests/DecisionEngineTests/QualityUpgradeSpecificationFixture.cs b/NzbDrone.Core.Test/DecisionEngineTests/QualityUpgradeSpecificationFixture.cs similarity index 94% rename from NzbDrone.Core.Test/ProviderTests/DecisionEngineTests/QualityUpgradeSpecificationFixture.cs rename to NzbDrone.Core.Test/DecisionEngineTests/QualityUpgradeSpecificationFixture.cs index a8ad64e89..fc86a99db 100644 --- a/NzbDrone.Core.Test/ProviderTests/DecisionEngineTests/QualityUpgradeSpecificationFixture.cs +++ b/NzbDrone.Core.Test/DecisionEngineTests/QualityUpgradeSpecificationFixture.cs @@ -4,11 +4,11 @@ using System.Linq; using FluentAssertions; using NUnit.Framework; using NzbDrone.Core.Model; -using NzbDrone.Core.Providers.DecisionEngine; +using NzbDrone.Core.DecisionEngine; using NzbDrone.Core.Repository.Quality; using NzbDrone.Core.Test.Framework; -namespace NzbDrone.Core.Test.ProviderTests.DecisionEngineTests +namespace NzbDrone.Core.Test.DecisionEngineTests { [TestFixture] // ReSharper disable InconsistentNaming diff --git a/NzbDrone.Core.Test/ProviderTests/DecisionEngineTests/RetentionSpecificationFixture.cs b/NzbDrone.Core.Test/DecisionEngineTests/RetentionSpecificationFixture.cs similarity index 95% rename from NzbDrone.Core.Test/ProviderTests/DecisionEngineTests/RetentionSpecificationFixture.cs rename to NzbDrone.Core.Test/DecisionEngineTests/RetentionSpecificationFixture.cs index 520f5a084..3d72fb4d5 100644 --- a/NzbDrone.Core.Test/ProviderTests/DecisionEngineTests/RetentionSpecificationFixture.cs +++ b/NzbDrone.Core.Test/DecisionEngineTests/RetentionSpecificationFixture.cs @@ -10,11 +10,11 @@ using NUnit.Framework; using NzbDrone.Core.Model; using NzbDrone.Core.Providers; using NzbDrone.Core.Providers.Core; -using NzbDrone.Core.Providers.DecisionEngine; +using NzbDrone.Core.DecisionEngine; using NzbDrone.Core.Repository; using NzbDrone.Core.Test.Framework; -namespace NzbDrone.Core.Test.ProviderTests.DecisionEngineTests +namespace NzbDrone.Core.Test.DecisionEngineTests { [TestFixture] // ReSharper disable InconsistentNaming diff --git a/NzbDrone.Core.Test/ProviderTests/DecisionEngineTests/UpgradeDiskSpecificationFixture.cs b/NzbDrone.Core.Test/DecisionEngineTests/UpgradeDiskSpecificationFixture.cs similarity index 97% rename from NzbDrone.Core.Test/ProviderTests/DecisionEngineTests/UpgradeDiskSpecificationFixture.cs rename to NzbDrone.Core.Test/DecisionEngineTests/UpgradeDiskSpecificationFixture.cs index 128bfe93a..55f431e45 100644 --- a/NzbDrone.Core.Test/ProviderTests/DecisionEngineTests/UpgradeDiskSpecificationFixture.cs +++ b/NzbDrone.Core.Test/DecisionEngineTests/UpgradeDiskSpecificationFixture.cs @@ -8,12 +8,12 @@ using FluentAssertions; using NUnit.Framework; using NzbDrone.Core.Model; using NzbDrone.Core.Providers; -using NzbDrone.Core.Providers.DecisionEngine; +using NzbDrone.Core.DecisionEngine; using NzbDrone.Core.Repository; using NzbDrone.Core.Repository.Quality; using NzbDrone.Core.Test.Framework; -namespace NzbDrone.Core.Test.ProviderTests.DecisionEngineTests +namespace NzbDrone.Core.Test.DecisionEngineTests { [TestFixture] // ReSharper disable InconsistentNaming diff --git a/NzbDrone.Core.Test/ProviderTests/DecisionEngineTests/UpgradeHistorySpecificationFixture.cs b/NzbDrone.Core.Test/DecisionEngineTests/UpgradeHistorySpecificationFixture.cs similarity index 97% rename from NzbDrone.Core.Test/ProviderTests/DecisionEngineTests/UpgradeHistorySpecificationFixture.cs rename to NzbDrone.Core.Test/DecisionEngineTests/UpgradeHistorySpecificationFixture.cs index 565ea6ed4..8f3dc70c8 100644 --- a/NzbDrone.Core.Test/ProviderTests/DecisionEngineTests/UpgradeHistorySpecificationFixture.cs +++ b/NzbDrone.Core.Test/DecisionEngineTests/UpgradeHistorySpecificationFixture.cs @@ -7,12 +7,12 @@ using FluentAssertions; using NUnit.Framework; using NzbDrone.Core.Model; using NzbDrone.Core.Providers; -using NzbDrone.Core.Providers.DecisionEngine; +using NzbDrone.Core.DecisionEngine; using NzbDrone.Core.Repository; using NzbDrone.Core.Repository.Quality; using NzbDrone.Core.Test.Framework; -namespace NzbDrone.Core.Test.ProviderTests.DecisionEngineTests +namespace NzbDrone.Core.Test.DecisionEngineTests { [TestFixture] // ReSharper disable InconsistentNaming diff --git a/NzbDrone.Core.Test/ProviderTests/DecisionEngineTests/UpgradePossibleSpecificationFixture.cs b/NzbDrone.Core.Test/DecisionEngineTests/UpgradePossibleSpecificationFixture.cs similarity index 96% rename from NzbDrone.Core.Test/ProviderTests/DecisionEngineTests/UpgradePossibleSpecificationFixture.cs rename to NzbDrone.Core.Test/DecisionEngineTests/UpgradePossibleSpecificationFixture.cs index f5cc36457..aa5533fe1 100644 --- a/NzbDrone.Core.Test/ProviderTests/DecisionEngineTests/UpgradePossibleSpecificationFixture.cs +++ b/NzbDrone.Core.Test/DecisionEngineTests/UpgradePossibleSpecificationFixture.cs @@ -6,12 +6,12 @@ using FluentAssertions; using Moq; using NUnit.Framework; using NzbDrone.Core.Providers; -using NzbDrone.Core.Providers.DecisionEngine; +using NzbDrone.Core.DecisionEngine; using NzbDrone.Core.Repository; using NzbDrone.Core.Repository.Quality; using NzbDrone.Core.Test.Framework; -namespace NzbDrone.Core.Test.ProviderTests.DecisionEngineTests +namespace NzbDrone.Core.Test.DecisionEngineTests { [TestFixture] // ReSharper disable InconsistentNaming diff --git a/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj b/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj index 31612613b..f22548de5 100644 --- a/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj +++ b/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj @@ -143,7 +143,7 @@ - + @@ -174,8 +174,8 @@ - - + + @@ -193,12 +193,12 @@ - - - - - - + + + + + + @@ -221,7 +221,7 @@ - + @@ -238,13 +238,13 @@ - + - + diff --git a/NzbDrone.Core.Test/ProviderTests/SearchTests/ProcessResultsFixture.cs b/NzbDrone.Core.Test/ProviderTests/SearchTests/ProcessResultsFixture.cs index 246a78c8e..40896c82d 100644 --- a/NzbDrone.Core.Test/ProviderTests/SearchTests/ProcessResultsFixture.cs +++ b/NzbDrone.Core.Test/ProviderTests/SearchTests/ProcessResultsFixture.cs @@ -9,7 +9,7 @@ using NUnit.Framework; using NzbDrone.Core.Model; using NzbDrone.Core.Model.Notification; using NzbDrone.Core.Providers; -using NzbDrone.Core.Providers.DecisionEngine; +using NzbDrone.Core.DecisionEngine; using NzbDrone.Core.Providers.Search; using NzbDrone.Core.Repository; using NzbDrone.Core.Repository.Quality; diff --git a/NzbDrone.Core.Test/ProviderTests/SearchTests/TestSearch.cs b/NzbDrone.Core.Test/ProviderTests/SearchTests/TestSearch.cs index e7aa7b19f..d9b95e936 100644 --- a/NzbDrone.Core.Test/ProviderTests/SearchTests/TestSearch.cs +++ b/NzbDrone.Core.Test/ProviderTests/SearchTests/TestSearch.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; using NLog; using NzbDrone.Core.Model; using NzbDrone.Core.Providers; -using NzbDrone.Core.Providers.DecisionEngine; +using NzbDrone.Core.DecisionEngine; using NzbDrone.Core.Providers.Search; using NzbDrone.Core.Repository.Search; diff --git a/NzbDrone.Core/Providers/DecisionEngine/AcceptableSizeSpecification.cs b/NzbDrone.Core/DecisionEngine/AcceptableSizeSpecification.cs similarity index 97% rename from NzbDrone.Core/Providers/DecisionEngine/AcceptableSizeSpecification.cs rename to NzbDrone.Core/DecisionEngine/AcceptableSizeSpecification.cs index 63a47cbb6..0ba115e96 100644 --- a/NzbDrone.Core/Providers/DecisionEngine/AcceptableSizeSpecification.cs +++ b/NzbDrone.Core/DecisionEngine/AcceptableSizeSpecification.cs @@ -1,9 +1,10 @@ using System.Linq; using NLog; using NzbDrone.Core.Model; +using NzbDrone.Core.Providers; using NzbDrone.Core.Repository.Quality; -namespace NzbDrone.Core.Providers.DecisionEngine +namespace NzbDrone.Core.DecisionEngine { public class AcceptableSizeSpecification { diff --git a/NzbDrone.Core/Providers/DecisionEngine/AllowedDownloadSpecification.cs b/NzbDrone.Core/DecisionEngine/AllowedDownloadSpecification.cs similarity index 98% rename from NzbDrone.Core/Providers/DecisionEngine/AllowedDownloadSpecification.cs rename to NzbDrone.Core/DecisionEngine/AllowedDownloadSpecification.cs index 2c107dfc7..363f3b612 100644 --- a/NzbDrone.Core/Providers/DecisionEngine/AllowedDownloadSpecification.cs +++ b/NzbDrone.Core/DecisionEngine/AllowedDownloadSpecification.cs @@ -3,7 +3,7 @@ using NLog; using NzbDrone.Core.Model; using NzbDrone.Core.Repository.Search; -namespace NzbDrone.Core.Providers.DecisionEngine +namespace NzbDrone.Core.DecisionEngine { public class AllowedDownloadSpecification { diff --git a/NzbDrone.Core/Providers/DecisionEngine/AllowedReleaseGroupSpecification.cs b/NzbDrone.Core/DecisionEngine/AllowedReleaseGroupSpecification.cs similarity index 96% rename from NzbDrone.Core/Providers/DecisionEngine/AllowedReleaseGroupSpecification.cs rename to NzbDrone.Core/DecisionEngine/AllowedReleaseGroupSpecification.cs index c8c86fb58..1060dcb0e 100644 --- a/NzbDrone.Core/Providers/DecisionEngine/AllowedReleaseGroupSpecification.cs +++ b/NzbDrone.Core/DecisionEngine/AllowedReleaseGroupSpecification.cs @@ -4,7 +4,7 @@ using NLog; using NzbDrone.Core.Model; using NzbDrone.Core.Providers.Core; -namespace NzbDrone.Core.Providers.DecisionEngine +namespace NzbDrone.Core.DecisionEngine { public class AllowedReleaseGroupSpecification { diff --git a/NzbDrone.Core/Providers/DecisionEngine/AlreadyInQueueSpecification.cs b/NzbDrone.Core/DecisionEngine/AlreadyInQueueSpecification.cs similarity index 90% rename from NzbDrone.Core/Providers/DecisionEngine/AlreadyInQueueSpecification.cs rename to NzbDrone.Core/DecisionEngine/AlreadyInQueueSpecification.cs index 8f4ecedcf..2541dde27 100644 --- a/NzbDrone.Core/Providers/DecisionEngine/AlreadyInQueueSpecification.cs +++ b/NzbDrone.Core/DecisionEngine/AlreadyInQueueSpecification.cs @@ -1,8 +1,9 @@ using System.Linq; using NLog; using NzbDrone.Core.Model; +using NzbDrone.Core.Providers; -namespace NzbDrone.Core.Providers.DecisionEngine +namespace NzbDrone.Core.DecisionEngine { public class AlreadyInQueueSpecification { diff --git a/NzbDrone.Core/Providers/DecisionEngine/CustomStartDateSpecification.cs b/NzbDrone.Core/DecisionEngine/CustomStartDateSpecification.cs similarity index 94% rename from NzbDrone.Core/Providers/DecisionEngine/CustomStartDateSpecification.cs rename to NzbDrone.Core/DecisionEngine/CustomStartDateSpecification.cs index 3c30ca362..8d987204d 100644 --- a/NzbDrone.Core/Providers/DecisionEngine/CustomStartDateSpecification.cs +++ b/NzbDrone.Core/DecisionEngine/CustomStartDateSpecification.cs @@ -2,7 +2,7 @@ using NLog; using NzbDrone.Core.Model; -namespace NzbDrone.Core.Providers.DecisionEngine +namespace NzbDrone.Core.DecisionEngine { public class CustomStartDateSpecification { diff --git a/NzbDrone.Core/Providers/DecisionEngine/LanguageSpecification.cs b/NzbDrone.Core/DecisionEngine/LanguageSpecification.cs similarity index 95% rename from NzbDrone.Core/Providers/DecisionEngine/LanguageSpecification.cs rename to NzbDrone.Core/DecisionEngine/LanguageSpecification.cs index 492098407..f20d8be81 100644 --- a/NzbDrone.Core/Providers/DecisionEngine/LanguageSpecification.cs +++ b/NzbDrone.Core/DecisionEngine/LanguageSpecification.cs @@ -3,7 +3,7 @@ using NLog; using NzbDrone.Core.Model; using NzbDrone.Core.Providers.Core; -namespace NzbDrone.Core.Providers.DecisionEngine +namespace NzbDrone.Core.DecisionEngine { public class LanguageSpecification { diff --git a/NzbDrone.Core/Providers/DecisionEngine/MonitoredEpisodeSpecification.cs b/NzbDrone.Core/DecisionEngine/MonitoredEpisodeSpecification.cs similarity index 95% rename from NzbDrone.Core/Providers/DecisionEngine/MonitoredEpisodeSpecification.cs rename to NzbDrone.Core/DecisionEngine/MonitoredEpisodeSpecification.cs index a719c0b94..99f0a78d7 100644 --- a/NzbDrone.Core/Providers/DecisionEngine/MonitoredEpisodeSpecification.cs +++ b/NzbDrone.Core/DecisionEngine/MonitoredEpisodeSpecification.cs @@ -1,8 +1,9 @@ using System.Linq; using NLog; using NzbDrone.Core.Model; +using NzbDrone.Core.Providers; -namespace NzbDrone.Core.Providers.DecisionEngine +namespace NzbDrone.Core.DecisionEngine { public class MonitoredEpisodeSpecification { diff --git a/NzbDrone.Core/Providers/DecisionEngine/QualityAllowedByProfileSpecification.cs b/NzbDrone.Core/DecisionEngine/QualityAllowedByProfileSpecification.cs similarity index 93% rename from NzbDrone.Core/Providers/DecisionEngine/QualityAllowedByProfileSpecification.cs rename to NzbDrone.Core/DecisionEngine/QualityAllowedByProfileSpecification.cs index a67ba9e00..5355abc51 100644 --- a/NzbDrone.Core/Providers/DecisionEngine/QualityAllowedByProfileSpecification.cs +++ b/NzbDrone.Core/DecisionEngine/QualityAllowedByProfileSpecification.cs @@ -2,7 +2,7 @@ using NLog; using NzbDrone.Core.Model; -namespace NzbDrone.Core.Providers.DecisionEngine +namespace NzbDrone.Core.DecisionEngine { public class QualityAllowedByProfileSpecification { diff --git a/NzbDrone.Core/Providers/DecisionEngine/QualityUpgradeSpecification.cs b/NzbDrone.Core/DecisionEngine/QualityUpgradeSpecification.cs similarity index 95% rename from NzbDrone.Core/Providers/DecisionEngine/QualityUpgradeSpecification.cs rename to NzbDrone.Core/DecisionEngine/QualityUpgradeSpecification.cs index b7e55fae0..b7e53cc24 100644 --- a/NzbDrone.Core/Providers/DecisionEngine/QualityUpgradeSpecification.cs +++ b/NzbDrone.Core/DecisionEngine/QualityUpgradeSpecification.cs @@ -3,7 +3,7 @@ using NLog; using NzbDrone.Core.Model; using NzbDrone.Core.Repository.Quality; -namespace NzbDrone.Core.Providers.DecisionEngine +namespace NzbDrone.Core.DecisionEngine { public class QualityUpgradeSpecification { diff --git a/NzbDrone.Core/Providers/DecisionEngine/RetentionSpecification.cs b/NzbDrone.Core/DecisionEngine/RetentionSpecification.cs similarity index 95% rename from NzbDrone.Core/Providers/DecisionEngine/RetentionSpecification.cs rename to NzbDrone.Core/DecisionEngine/RetentionSpecification.cs index 58a86651d..8f5d23517 100644 --- a/NzbDrone.Core/Providers/DecisionEngine/RetentionSpecification.cs +++ b/NzbDrone.Core/DecisionEngine/RetentionSpecification.cs @@ -3,7 +3,7 @@ using NLog; using NzbDrone.Core.Model; using NzbDrone.Core.Providers.Core; -namespace NzbDrone.Core.Providers.DecisionEngine +namespace NzbDrone.Core.DecisionEngine { public class RetentionSpecification { diff --git a/NzbDrone.Core/Providers/DecisionEngine/UpgradeDiskSpecification.cs b/NzbDrone.Core/DecisionEngine/UpgradeDiskSpecification.cs similarity index 96% rename from NzbDrone.Core/Providers/DecisionEngine/UpgradeDiskSpecification.cs rename to NzbDrone.Core/DecisionEngine/UpgradeDiskSpecification.cs index 317c13dc0..a532368dd 100644 --- a/NzbDrone.Core/Providers/DecisionEngine/UpgradeDiskSpecification.cs +++ b/NzbDrone.Core/DecisionEngine/UpgradeDiskSpecification.cs @@ -3,7 +3,7 @@ using System.Linq; using NLog; using NzbDrone.Core.Model; -namespace NzbDrone.Core.Providers.DecisionEngine +namespace NzbDrone.Core.DecisionEngine { public class UpgradeDiskSpecification { diff --git a/NzbDrone.Core/Providers/DecisionEngine/UpgradeHistorySpecification.cs b/NzbDrone.Core/DecisionEngine/UpgradeHistorySpecification.cs similarity index 95% rename from NzbDrone.Core/Providers/DecisionEngine/UpgradeHistorySpecification.cs rename to NzbDrone.Core/DecisionEngine/UpgradeHistorySpecification.cs index 768f81ddd..ef1163c84 100644 --- a/NzbDrone.Core/Providers/DecisionEngine/UpgradeHistorySpecification.cs +++ b/NzbDrone.Core/DecisionEngine/UpgradeHistorySpecification.cs @@ -1,8 +1,9 @@ using System.Linq; using NLog; using NzbDrone.Core.Model; +using NzbDrone.Core.Providers; -namespace NzbDrone.Core.Providers.DecisionEngine +namespace NzbDrone.Core.DecisionEngine { public class UpgradeHistorySpecification { diff --git a/NzbDrone.Core/Providers/DecisionEngine/UpgradePossibleSpecification.cs b/NzbDrone.Core/DecisionEngine/UpgradePossibleSpecification.cs similarity index 93% rename from NzbDrone.Core/Providers/DecisionEngine/UpgradePossibleSpecification.cs rename to NzbDrone.Core/DecisionEngine/UpgradePossibleSpecification.cs index 42ad0b496..a17e8d144 100644 --- a/NzbDrone.Core/Providers/DecisionEngine/UpgradePossibleSpecification.cs +++ b/NzbDrone.Core/DecisionEngine/UpgradePossibleSpecification.cs @@ -1,8 +1,9 @@ using System.Linq; using NLog; +using NzbDrone.Core.Providers; using NzbDrone.Core.Repository; -namespace NzbDrone.Core.Providers.DecisionEngine +namespace NzbDrone.Core.DecisionEngine { public class UpgradePossibleSpecification { diff --git a/NzbDrone.Core/Jobs/EpisodeSearchJob.cs b/NzbDrone.Core/Jobs/EpisodeSearchJob.cs index 53da54a0b..2f8c9c401 100644 --- a/NzbDrone.Core/Jobs/EpisodeSearchJob.cs +++ b/NzbDrone.Core/Jobs/EpisodeSearchJob.cs @@ -3,7 +3,7 @@ using System; using NLog; using NzbDrone.Core.Model.Notification; using NzbDrone.Core.Providers; -using NzbDrone.Core.Providers.DecisionEngine; +using NzbDrone.Core.DecisionEngine; using NzbDrone.Core.Providers.Search; using NzbDrone.Core.Repository; diff --git a/NzbDrone.Core/Jobs/RssSyncJob.cs b/NzbDrone.Core/Jobs/RssSyncJob.cs index e8ea32538..7557c30b8 100644 --- a/NzbDrone.Core/Jobs/RssSyncJob.cs +++ b/NzbDrone.Core/Jobs/RssSyncJob.cs @@ -7,7 +7,7 @@ using NzbDrone.Core.Model; using NzbDrone.Core.Model.Notification; using NzbDrone.Core.Providers; using NzbDrone.Core.Providers.Core; -using NzbDrone.Core.Providers.DecisionEngine; +using NzbDrone.Core.DecisionEngine; using NzbDrone.Core.Providers.Indexer; namespace NzbDrone.Core.Jobs diff --git a/NzbDrone.Core/NzbDrone.Core.csproj b/NzbDrone.Core/NzbDrone.Core.csproj index 1d2ff5385..d9452876b 100644 --- a/NzbDrone.Core/NzbDrone.Core.csproj +++ b/NzbDrone.Core/NzbDrone.Core.csproj @@ -331,11 +331,11 @@ - + - - + + @@ -409,34 +409,34 @@ Code - + Code - + Code - + Code - + Code - + Code - + Code - + Code - + Code - + Code - + Code diff --git a/NzbDrone.Core/Providers/DownloadClients/BlackholeProvider.cs b/NzbDrone.Core/Providers/DownloadClients/BlackholeProvider.cs index 02d288e3d..242593647 100644 --- a/NzbDrone.Core/Providers/DownloadClients/BlackholeProvider.cs +++ b/NzbDrone.Core/Providers/DownloadClients/BlackholeProvider.cs @@ -5,7 +5,7 @@ using NLog; using NzbDrone.Common; using NzbDrone.Core.Model; using NzbDrone.Core.Providers.Core; -using NzbDrone.Core.Providers.DecisionEngine; +using NzbDrone.Core.DecisionEngine; namespace NzbDrone.Core.Providers.DownloadClients { diff --git a/NzbDrone.Core/Providers/DownloadClients/PneumaticProvider.cs b/NzbDrone.Core/Providers/DownloadClients/PneumaticProvider.cs index 0845baf13..e62e11311 100644 --- a/NzbDrone.Core/Providers/DownloadClients/PneumaticProvider.cs +++ b/NzbDrone.Core/Providers/DownloadClients/PneumaticProvider.cs @@ -5,7 +5,7 @@ using NLog; using NzbDrone.Common; using NzbDrone.Core.Model; using NzbDrone.Core.Providers.Core; -using NzbDrone.Core.Providers.DecisionEngine; +using NzbDrone.Core.DecisionEngine; namespace NzbDrone.Core.Providers.DownloadClients { diff --git a/NzbDrone.Core/Providers/Search/DailyEpisodeSearch.cs b/NzbDrone.Core/Providers/Search/DailyEpisodeSearch.cs index f18df2e6a..89e3d4a28 100644 --- a/NzbDrone.Core/Providers/Search/DailyEpisodeSearch.cs +++ b/NzbDrone.Core/Providers/Search/DailyEpisodeSearch.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; using NLog; using NzbDrone.Core.Model; using NzbDrone.Core.Model.Notification; -using NzbDrone.Core.Providers.DecisionEngine; +using NzbDrone.Core.DecisionEngine; using NzbDrone.Core.Repository; using NzbDrone.Core.Repository.Search; diff --git a/NzbDrone.Core/Providers/Search/EpisodeSearch.cs b/NzbDrone.Core/Providers/Search/EpisodeSearch.cs index 87478fc59..29287a315 100644 --- a/NzbDrone.Core/Providers/Search/EpisodeSearch.cs +++ b/NzbDrone.Core/Providers/Search/EpisodeSearch.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; using NLog; using NzbDrone.Core.Model; using NzbDrone.Core.Model.Notification; -using NzbDrone.Core.Providers.DecisionEngine; +using NzbDrone.Core.DecisionEngine; using NzbDrone.Core.Repository; using NzbDrone.Core.Repository.Search; diff --git a/NzbDrone.Core/Providers/Search/PartialSeasonSearch.cs b/NzbDrone.Core/Providers/Search/PartialSeasonSearch.cs index 3dda70768..4e1912496 100644 --- a/NzbDrone.Core/Providers/Search/PartialSeasonSearch.cs +++ b/NzbDrone.Core/Providers/Search/PartialSeasonSearch.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; using NLog; using NzbDrone.Core.Model; using NzbDrone.Core.Model.Notification; -using NzbDrone.Core.Providers.DecisionEngine; +using NzbDrone.Core.DecisionEngine; using NzbDrone.Core.Repository; using NzbDrone.Core.Repository.Search; diff --git a/NzbDrone.Core/Providers/Search/SearchBase.cs b/NzbDrone.Core/Providers/Search/SearchBase.cs index 9c56116ed..97fee95a5 100644 --- a/NzbDrone.Core/Providers/Search/SearchBase.cs +++ b/NzbDrone.Core/Providers/Search/SearchBase.cs @@ -6,7 +6,7 @@ using System.Text.RegularExpressions; using NLog; using NzbDrone.Core.Model; using NzbDrone.Core.Model.Notification; -using NzbDrone.Core.Providers.DecisionEngine; +using NzbDrone.Core.DecisionEngine; using NzbDrone.Core.Repository; using NzbDrone.Core.Repository.Search; diff --git a/NzbDrone.Core/Providers/SearchProvider.cs b/NzbDrone.Core/Providers/SearchProvider.cs index ba3026cfa..3c56449db 100644 --- a/NzbDrone.Core/Providers/SearchProvider.cs +++ b/NzbDrone.Core/Providers/SearchProvider.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; using NLog; using NzbDrone.Core.Model; using NzbDrone.Core.Model.Notification; -using NzbDrone.Core.Providers.DecisionEngine; +using NzbDrone.Core.DecisionEngine; using NzbDrone.Core.Providers.Search; using NzbDrone.Core.Repository; using NzbDrone.Core.Repository.Search;