From 8f4f8636314915285317cfb7884dfeae0454d872 Mon Sep 17 00:00:00 2001 From: "kay.one" Date: Sat, 14 Jan 2012 19:17:23 -0800 Subject: [PATCH] Turning off tagging folder for now, to stop messing people's series folders --- .../ProcessDownloadProviderFixture.cs | 13 ++++++++----- NzbDrone.Core/Providers/PostDownloadProvider.cs | 2 ++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/NzbDrone.Core.Test/ProviderTests/PostDownloadProviderTests/ProcessDownloadProviderFixture.cs b/NzbDrone.Core.Test/ProviderTests/PostDownloadProviderTests/ProcessDownloadProviderFixture.cs index f2aea1594..e7fbd45e7 100644 --- a/NzbDrone.Core.Test/ProviderTests/PostDownloadProviderTests/ProcessDownloadProviderFixture.cs +++ b/NzbDrone.Core.Test/ProviderTests/PostDownloadProviderTests/ProcessDownloadProviderFixture.cs @@ -45,7 +45,7 @@ namespace NzbDrone.Core.Test.ProviderTests.PostDownloadProviderTests //Assert Mocker.VerifyAllMocks(); - ExceptionVerification.ExpectedWarns(1); + ExceptionVerification.IgnoreWarns(); } @@ -61,10 +61,11 @@ namespace NzbDrone.Core.Test.ProviderTests.PostDownloadProviderTests //Assert Mocker.VerifyAllMocks(); - ExceptionVerification.ExpectedWarns(1); + ExceptionVerification.IgnoreWarns(); } [Test] + [Ignore("Disabled tagging")] public void when_series_isnt_found_folder_should_be_tagged_as_unknown_series() { //Setup @@ -85,6 +86,7 @@ namespace NzbDrone.Core.Test.ProviderTests.PostDownloadProviderTests } [Test] + [Ignore("Disabled tagging")] public void when_no_files_are_imported_folder_should_be_tagged_with_parse_error() { //Setup @@ -113,6 +115,7 @@ namespace NzbDrone.Core.Test.ProviderTests.PostDownloadProviderTests [Test] + [Ignore("Disabled tagging")] public void when_no_file_are_imported_and_folder_size_isnt_small_enought_folder_should_be_tagged_unknown() { //Setup @@ -166,7 +169,7 @@ namespace NzbDrone.Core.Test.ProviderTests.PostDownloadProviderTests } [Test] - public void folder_should_be_tagged_if_existing_tag_is_diffrent() + public void folder_should_not_be_tagged_if_existing_tag_is_diffrent() { //Setup @@ -183,8 +186,8 @@ namespace NzbDrone.Core.Test.ProviderTests.PostDownloadProviderTests //Assert Mocker.VerifyAllMocks(); - Mocker.GetMock().Verify(c => c.MoveDirectory(droppedFolder.FullName, taggedFolder), Times.Once()); - ExceptionVerification.ExpectedWarns(1); + Mocker.GetMock().Verify(c => c.MoveDirectory(droppedFolder.FullName, taggedFolder), Times.Never()); + ExceptionVerification.IgnoreWarns(); } [Test] diff --git a/NzbDrone.Core/Providers/PostDownloadProvider.cs b/NzbDrone.Core/Providers/PostDownloadProvider.cs index 444b4af11..7ee62f6a4 100644 --- a/NzbDrone.Core/Providers/PostDownloadProvider.cs +++ b/NzbDrone.Core/Providers/PostDownloadProvider.cs @@ -89,6 +89,8 @@ namespace NzbDrone.Core.Providers private void TagFolder(DirectoryInfo directory, PostDownloadStatusType status) { + //Turning off tagging folder for now, to stop messing people's series folders. + return; var target = GetTaggedFolderName(directory, status); if (!DiskProvider.PathEquals(target, directory.FullName))