From 1c0c348dc46c21c6898a1546633753aa3df8d1eb Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Fri, 22 Feb 2013 18:19:53 -0800 Subject: [PATCH] Moved indexer providers out of subfolder --- NzbDrone.Core.Test/CentralDispatchFixture.cs | 1 - .../IndexerTests/IndexerFixture.cs | 1 - .../IndexerTests/NzbxFixture.cs | 2 +- .../Indexers/IndexerServiceTest.cs | 1 - .../SearchTests/PerformSearchTestBase.cs | 1 - NzbDrone.Core/ContainerExtentions.cs | 2 +- .../{Providers => }/FileSharingTalk.cs | 2 +- .../Indexers/{Providers => }/IndexerBase.cs | 2 +- NzbDrone.Core/Indexers/IndexerService.cs | 1 - .../Indexers/{Providers => }/Newznab.cs | 2 +- .../Indexers/{Providers => }/NzbClub.cs | 2 +- .../Indexers/{Providers => }/NzbIndex.cs | 2 +- .../Indexers/{Providers => }/NzbsRUs.cs | 2 +- .../Indexers/{Providers => }/Nzbx.cs | 2 +- .../Indexers/{Providers => }/Omgwtfnzbs.cs | 2 +- .../SyndicationFeedXmlReader.cs | 2 +- .../Indexers/{Providers => }/Wombles.cs | 2 +- NzbDrone.Core/NzbDrone.Core.csproj | 20 +++++++++---------- 18 files changed, 22 insertions(+), 27 deletions(-) rename NzbDrone.Core/Indexers/{Providers => }/FileSharingTalk.cs (98%) rename NzbDrone.Core/Indexers/{Providers => }/IndexerBase.cs (99%) rename NzbDrone.Core/Indexers/{Providers => }/Newznab.cs (99%) rename NzbDrone.Core/Indexers/{Providers => }/NzbClub.cs (98%) rename NzbDrone.Core/Indexers/{Providers => }/NzbIndex.cs (98%) rename NzbDrone.Core/Indexers/{Providers => }/NzbsRUs.cs (98%) rename NzbDrone.Core/Indexers/{Providers => }/Nzbx.cs (99%) rename NzbDrone.Core/Indexers/{Providers => }/Omgwtfnzbs.cs (98%) rename NzbDrone.Core/Indexers/{Providers => }/SyndicationFeedXmlReader.cs (98%) rename NzbDrone.Core/Indexers/{Providers => }/Wombles.cs (98%) diff --git a/NzbDrone.Core.Test/CentralDispatchFixture.cs b/NzbDrone.Core.Test/CentralDispatchFixture.cs index 10c016a3c..76546ff52 100644 --- a/NzbDrone.Core.Test/CentralDispatchFixture.cs +++ b/NzbDrone.Core.Test/CentralDispatchFixture.cs @@ -8,7 +8,6 @@ using NCrunch.Framework; using NUnit.Framework; using NzbDrone.Common; using NzbDrone.Core.Indexers; -using NzbDrone.Core.Indexers.Providers; using NzbDrone.Core.Jobs; using NzbDrone.Core.Providers; using NzbDrone.Core.Providers.ExternalNotification; diff --git a/NzbDrone.Core.Test/IndexerTests/IndexerFixture.cs b/NzbDrone.Core.Test/IndexerTests/IndexerFixture.cs index e4fb2ae3b..63fb529ed 100644 --- a/NzbDrone.Core.Test/IndexerTests/IndexerFixture.cs +++ b/NzbDrone.Core.Test/IndexerTests/IndexerFixture.cs @@ -11,7 +11,6 @@ using Moq; using NUnit.Framework; using NzbDrone.Common; using NzbDrone.Core.Indexers; -using NzbDrone.Core.Indexers.Providers; using NzbDrone.Core.Model; using NzbDrone.Core.Providers; using NzbDrone.Core.Providers.Core; diff --git a/NzbDrone.Core.Test/IndexerTests/NzbxFixture.cs b/NzbDrone.Core.Test/IndexerTests/NzbxFixture.cs index 77c734682..fc2c5d83c 100644 --- a/NzbDrone.Core.Test/IndexerTests/NzbxFixture.cs +++ b/NzbDrone.Core.Test/IndexerTests/NzbxFixture.cs @@ -10,7 +10,7 @@ using FluentAssertions; using Moq; using NUnit.Framework; using NzbDrone.Common; -using NzbDrone.Core.Indexers.Providers; +using NzbDrone.Core.Indexers; using NzbDrone.Core.Model; using NzbDrone.Core.Providers; using NzbDrone.Core.Providers.Core; diff --git a/NzbDrone.Core.Test/Indexers/IndexerServiceTest.cs b/NzbDrone.Core.Test/Indexers/IndexerServiceTest.cs index da2269dd6..1cb6fa3d6 100644 --- a/NzbDrone.Core.Test/Indexers/IndexerServiceTest.cs +++ b/NzbDrone.Core.Test/Indexers/IndexerServiceTest.cs @@ -9,7 +9,6 @@ using Moq; using NUnit.Framework; using NzbDrone.Common; using NzbDrone.Core.Indexers; -using NzbDrone.Core.Indexers.Providers; using NzbDrone.Core.Model; using NzbDrone.Core.Providers; using NzbDrone.Core.Providers.Core; diff --git a/NzbDrone.Core.Test/ProviderTests/SearchTests/PerformSearchTestBase.cs b/NzbDrone.Core.Test/ProviderTests/SearchTests/PerformSearchTestBase.cs index 4b96e196b..5446d56db 100644 --- a/NzbDrone.Core.Test/ProviderTests/SearchTests/PerformSearchTestBase.cs +++ b/NzbDrone.Core.Test/ProviderTests/SearchTests/PerformSearchTestBase.cs @@ -6,7 +6,6 @@ using FizzWare.NBuilder; using Moq; using NUnit.Framework; using NzbDrone.Core.Indexers; -using NzbDrone.Core.Indexers.Providers; using NzbDrone.Core.Tv; using NzbDrone.Core.Model; using NzbDrone.Core.Model.Notification; diff --git a/NzbDrone.Core/ContainerExtentions.cs b/NzbDrone.Core/ContainerExtentions.cs index 11faff3bb..90adcd1ef 100644 --- a/NzbDrone.Core/ContainerExtentions.cs +++ b/NzbDrone.Core/ContainerExtentions.cs @@ -6,7 +6,7 @@ using Autofac.Core; using NLog; using NzbDrone.Common; using NzbDrone.Core.Datastore; -using NzbDrone.Core.Indexers.Providers; +using NzbDrone.Core.Indexers; using NzbDrone.Core.Instrumentation; using NzbDrone.Core.Providers.ExternalNotification; using NzbDrone.Core.Providers.Metadata; diff --git a/NzbDrone.Core/Indexers/Providers/FileSharingTalk.cs b/NzbDrone.Core/Indexers/FileSharingTalk.cs similarity index 98% rename from NzbDrone.Core/Indexers/Providers/FileSharingTalk.cs rename to NzbDrone.Core/Indexers/FileSharingTalk.cs index ea39aa99a..1d70dd8da 100644 --- a/NzbDrone.Core/Indexers/Providers/FileSharingTalk.cs +++ b/NzbDrone.Core/Indexers/FileSharingTalk.cs @@ -6,7 +6,7 @@ using NzbDrone.Common; using NzbDrone.Core.Model; using NzbDrone.Core.Providers.Core; -namespace NzbDrone.Core.Indexers.Providers +namespace NzbDrone.Core.Indexers { public class FileSharingTalk : IndexerBase { diff --git a/NzbDrone.Core/Indexers/Providers/IndexerBase.cs b/NzbDrone.Core/Indexers/IndexerBase.cs similarity index 99% rename from NzbDrone.Core/Indexers/Providers/IndexerBase.cs rename to NzbDrone.Core/Indexers/IndexerBase.cs index 4051e1302..25cd7572f 100644 --- a/NzbDrone.Core/Indexers/Providers/IndexerBase.cs +++ b/NzbDrone.Core/Indexers/IndexerBase.cs @@ -9,7 +9,7 @@ using NzbDrone.Common; using NzbDrone.Core.Model; using NzbDrone.Core.Providers.Core; -namespace NzbDrone.Core.Indexers.Providers +namespace NzbDrone.Core.Indexers { public abstract class IndexerBase { diff --git a/NzbDrone.Core/Indexers/IndexerService.cs b/NzbDrone.Core/Indexers/IndexerService.cs index 3ad42643e..7200ce18d 100644 --- a/NzbDrone.Core/Indexers/IndexerService.cs +++ b/NzbDrone.Core/Indexers/IndexerService.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using System.Linq; using NLog; -using NzbDrone.Core.Indexers.Providers; using NzbDrone.Core.Lifecycle; using PetaPoco; diff --git a/NzbDrone.Core/Indexers/Providers/Newznab.cs b/NzbDrone.Core/Indexers/Newznab.cs similarity index 99% rename from NzbDrone.Core/Indexers/Providers/Newznab.cs rename to NzbDrone.Core/Indexers/Newznab.cs index ef464c3df..fd10dc2b4 100644 --- a/NzbDrone.Core/Indexers/Providers/Newznab.cs +++ b/NzbDrone.Core/Indexers/Newznab.cs @@ -8,7 +8,7 @@ using NzbDrone.Core.Model; using NzbDrone.Core.Providers; using NzbDrone.Core.Providers.Core; -namespace NzbDrone.Core.Indexers.Providers +namespace NzbDrone.Core.Indexers { public class Newznab : IndexerBase { diff --git a/NzbDrone.Core/Indexers/Providers/NzbClub.cs b/NzbDrone.Core/Indexers/NzbClub.cs similarity index 98% rename from NzbDrone.Core/Indexers/Providers/NzbClub.cs rename to NzbDrone.Core/Indexers/NzbClub.cs index 922903534..977b5898d 100644 --- a/NzbDrone.Core/Indexers/Providers/NzbClub.cs +++ b/NzbDrone.Core/Indexers/NzbClub.cs @@ -7,7 +7,7 @@ using NzbDrone.Common; using NzbDrone.Core.Model; using NzbDrone.Core.Providers.Core; -namespace NzbDrone.Core.Indexers.Providers +namespace NzbDrone.Core.Indexers { public class NzbClub : IndexerBase { diff --git a/NzbDrone.Core/Indexers/Providers/NzbIndex.cs b/NzbDrone.Core/Indexers/NzbIndex.cs similarity index 98% rename from NzbDrone.Core/Indexers/Providers/NzbIndex.cs rename to NzbDrone.Core/Indexers/NzbIndex.cs index 049b5ae3a..cd835ba4b 100644 --- a/NzbDrone.Core/Indexers/Providers/NzbIndex.cs +++ b/NzbDrone.Core/Indexers/NzbIndex.cs @@ -7,7 +7,7 @@ using NzbDrone.Common; using NzbDrone.Core.Model; using NzbDrone.Core.Providers.Core; -namespace NzbDrone.Core.Indexers.Providers +namespace NzbDrone.Core.Indexers { public class NzbIndex : IndexerBase { diff --git a/NzbDrone.Core/Indexers/Providers/NzbsRUs.cs b/NzbDrone.Core/Indexers/NzbsRUs.cs similarity index 98% rename from NzbDrone.Core/Indexers/Providers/NzbsRUs.cs rename to NzbDrone.Core/Indexers/NzbsRUs.cs index 565fdeb38..f0054af8f 100644 --- a/NzbDrone.Core/Indexers/Providers/NzbsRUs.cs +++ b/NzbDrone.Core/Indexers/NzbsRUs.cs @@ -7,7 +7,7 @@ using NzbDrone.Common; using NzbDrone.Core.Model; using NzbDrone.Core.Providers.Core; -namespace NzbDrone.Core.Indexers.Providers +namespace NzbDrone.Core.Indexers { public class NzbsRUs : IndexerBase { diff --git a/NzbDrone.Core/Indexers/Providers/Nzbx.cs b/NzbDrone.Core/Indexers/Nzbx.cs similarity index 99% rename from NzbDrone.Core/Indexers/Providers/Nzbx.cs rename to NzbDrone.Core/Indexers/Nzbx.cs index 1ffd9f2cd..eeb84fe17 100644 --- a/NzbDrone.Core/Indexers/Providers/Nzbx.cs +++ b/NzbDrone.Core/Indexers/Nzbx.cs @@ -9,7 +9,7 @@ using NzbDrone.Core.Model; using NzbDrone.Core.Model.Nzbx; using NzbDrone.Core.Providers.Core; -namespace NzbDrone.Core.Indexers.Providers +namespace NzbDrone.Core.Indexers { class Nzbx : IndexerBase { diff --git a/NzbDrone.Core/Indexers/Providers/Omgwtfnzbs.cs b/NzbDrone.Core/Indexers/Omgwtfnzbs.cs similarity index 98% rename from NzbDrone.Core/Indexers/Providers/Omgwtfnzbs.cs rename to NzbDrone.Core/Indexers/Omgwtfnzbs.cs index 73adaaf38..d78548c73 100644 --- a/NzbDrone.Core/Indexers/Providers/Omgwtfnzbs.cs +++ b/NzbDrone.Core/Indexers/Omgwtfnzbs.cs @@ -7,7 +7,7 @@ using NzbDrone.Common; using NzbDrone.Core.Model; using NzbDrone.Core.Providers.Core; -namespace NzbDrone.Core.Indexers.Providers +namespace NzbDrone.Core.Indexers { class Omgwtfnzbs : IndexerBase { diff --git a/NzbDrone.Core/Indexers/Providers/SyndicationFeedXmlReader.cs b/NzbDrone.Core/Indexers/SyndicationFeedXmlReader.cs similarity index 98% rename from NzbDrone.Core/Indexers/Providers/SyndicationFeedXmlReader.cs rename to NzbDrone.Core/Indexers/SyndicationFeedXmlReader.cs index 6f21848fc..addbe4959 100644 --- a/NzbDrone.Core/Indexers/Providers/SyndicationFeedXmlReader.cs +++ b/NzbDrone.Core/Indexers/SyndicationFeedXmlReader.cs @@ -11,7 +11,7 @@ using System.Threading; using System.Xml; using NLog; -namespace NzbDrone.Core.Indexers.Providers +namespace NzbDrone.Core.Indexers { public class SyndicationFeedXmlReader : XmlTextReader { diff --git a/NzbDrone.Core/Indexers/Providers/Wombles.cs b/NzbDrone.Core/Indexers/Wombles.cs similarity index 98% rename from NzbDrone.Core/Indexers/Providers/Wombles.cs rename to NzbDrone.Core/Indexers/Wombles.cs index 1a45df14c..3665c8461 100644 --- a/NzbDrone.Core/Indexers/Providers/Wombles.cs +++ b/NzbDrone.Core/Indexers/Wombles.cs @@ -6,7 +6,7 @@ using NzbDrone.Common; using NzbDrone.Core.Model; using NzbDrone.Core.Providers.Core; -namespace NzbDrone.Core.Indexers.Providers +namespace NzbDrone.Core.Indexers { public class Wombles : IndexerBase { diff --git a/NzbDrone.Core/NzbDrone.Core.csproj b/NzbDrone.Core/NzbDrone.Core.csproj index 5c7c02067..e79b4f77e 100644 --- a/NzbDrone.Core/NzbDrone.Core.csproj +++ b/NzbDrone.Core/NzbDrone.Core.csproj @@ -341,13 +341,13 @@ - + - - - - - + + + + + @@ -494,16 +494,16 @@ Code - + Code - + Code - + Code - + Code