diff --git a/NzbDrone.Core.Test/ProviderTests/InventoryProvider_IsAcceptableSizeTest.cs b/NzbDrone.Core.Test/ProviderTests/InventoryProvider_IsAcceptableSizeTest.cs index 6bc339a75..1f2e2d6b0 100644 --- a/NzbDrone.Core.Test/ProviderTests/InventoryProvider_IsAcceptableSizeTest.cs +++ b/NzbDrone.Core.Test/ProviderTests/InventoryProvider_IsAcceptableSizeTest.cs @@ -116,7 +116,7 @@ namespace NzbDrone.Core.Test.ProviderTests var mocker = new AutoMoqer(MockBehavior.Strict); parseResultSingle.Series = series30minutes; - parseResultSingle.Size = 10000.Megabytes(); + parseResultSingle.Size = 1.Gigabytes(); mocker.GetMock().Setup(s => s.Get(1)).Returns(qualityType); @@ -137,7 +137,7 @@ namespace NzbDrone.Core.Test.ProviderTests var mocker = new AutoMoqer(MockBehavior.Strict); parseResultSingle.Series = series60minutes; - parseResultSingle.Size = 10000.Megabytes(); + parseResultSingle.Size = 1.Gigabytes(); mocker.GetMock().Setup(s => s.Get(1)).Returns(qualityType); @@ -200,7 +200,7 @@ namespace NzbDrone.Core.Test.ProviderTests var mocker = new AutoMoqer(MockBehavior.Strict); parseResultMulti.Series = series30minutes; - parseResultMulti.Size = 10000.Megabytes(); + parseResultMulti.Size = 1.Gigabytes(); mocker.GetMock().Setup(s => s.Get(1)).Returns(qualityType); @@ -221,7 +221,7 @@ namespace NzbDrone.Core.Test.ProviderTests var mocker = new AutoMoqer(MockBehavior.Strict); parseResultMulti.Series = series60minutes; - parseResultMulti.Size = 10000.Megabytes(); + parseResultMulti.Size = 10.Gigabytes(); mocker.GetMock().Setup(s => s.Get(1)).Returns(qualityType); @@ -284,7 +284,7 @@ namespace NzbDrone.Core.Test.ProviderTests var mocker = new AutoMoqer(MockBehavior.Strict); parseResultSingle.Series = series30minutes; - parseResultSingle.Size = 10000.Megabytes(); + parseResultSingle.Size = 1.Gigabytes(); mocker.GetMock().Setup(s => s.Get(1)).Returns(qualityType); @@ -305,7 +305,7 @@ namespace NzbDrone.Core.Test.ProviderTests var mocker = new AutoMoqer(MockBehavior.Strict); parseResultSingle.Series = series60minutes; - parseResultSingle.Size = 10000.Megabytes(); + parseResultSingle.Size = 10.Gigabytes(); mocker.GetMock().Setup(s => s.Get(1)).Returns(qualityType); diff --git a/NzbDrone.Core.Test/ProviderTests/PostDownloadProviderTests/ProcessDownloadFixture.cs b/NzbDrone.Core.Test/ProviderTests/PostDownloadProviderTests/ProcessDownloadFixture.cs index 4201ec0c2..8a8655838 100644 --- a/NzbDrone.Core.Test/ProviderTests/PostDownloadProviderTests/ProcessDownloadFixture.cs +++ b/NzbDrone.Core.Test/ProviderTests/PostDownloadProviderTests/ProcessDownloadFixture.cs @@ -104,7 +104,7 @@ namespace NzbDrone.Core.Test.ProviderTests.PostDownloadProviderTests mocker.GetMock().Setup(s => s.FindSeries("office")).Returns(fakeSeries); mocker.GetMock().Setup(s => s.Scan(fakeSeries, droppedFolder.FullName)).Returns(new List()); mocker.GetMock().Setup(s => s.MoveDirectory(droppedFolder.FullName, taggedFolder)); - mocker.GetMock().Setup(s => s.GetDirectorySize(droppedFolder.FullName)).Returns(100.Megabytes()); + mocker.GetMock().Setup(s => s.GetDirectorySize(droppedFolder.FullName)).Returns(Constants.IgnoreFileSize + 10.Megabytes()); mocker.Resolve().ProcessDownload(droppedFolder); @@ -136,7 +136,7 @@ namespace NzbDrone.Core.Test.ProviderTests.PostDownloadProviderTests //Act mocker.GetMock().Setup(s => s.FindSeries("office")).Returns(fakeSeries); mocker.GetMock().Setup(s => s.MoveDirectory(droppedFolder.FullName, taggedFolder)); - mocker.GetMock().Setup(s => s.GetDirectorySize(droppedFolder.FullName)).Returns(100.Megabytes()); + mocker.GetMock().Setup(s => s.GetDirectorySize(droppedFolder.FullName)).Returns(Constants.IgnoreFileSize + 10.Megabytes()); mocker.GetMock().Setup(s => s.Scan(fakeSeries, droppedFolder.FullName)).Returns(fakeEpisodeFiles); mocker.GetMock().Setup(s => s.MoveEpisodeFile(It.IsAny(), true)).Returns(true); @@ -210,7 +210,7 @@ namespace NzbDrone.Core.Test.ProviderTests.PostDownloadProviderTests mocker.GetMock().Setup(s => s.FindSeries("office")).Returns(fakeSeries); mocker.GetMock().Setup(s => s.Scan(fakeSeries, droppedFolder.FullName)).Returns(fakeEpisodeFiles); mocker.GetMock().Setup(s => s.MoveEpisodeFile(It.IsAny(), true)).Returns(true); - mocker.GetMock().Setup(s => s.GetDirectorySize(droppedFolder.FullName)).Returns(1.Megabytes()); + mocker.GetMock().Setup(s => s.GetDirectorySize(droppedFolder.FullName)).Returns(Constants.IgnoreFileSize - 1.Megabytes()); mocker.GetMock().Setup(s => s.DeleteFolder(droppedFolder.FullName, true)); //Act diff --git a/NzbDrone.Core/Constants.cs b/NzbDrone.Core/Constants.cs new file mode 100644 index 000000000..7839034ca --- /dev/null +++ b/NzbDrone.Core/Constants.cs @@ -0,0 +1,15 @@ +using System.Linq; + +namespace NzbDrone.Core +{ + public static class Constants + { + public static long IgnoreFileSize + { + get + { + return 40.Megabytes(); + } + } + } +} diff --git a/NzbDrone.Core/NzbDrone.Core.csproj b/NzbDrone.Core/NzbDrone.Core.csproj index 8ce4ad4e1..3018c61d8 100644 --- a/NzbDrone.Core/NzbDrone.Core.csproj +++ b/NzbDrone.Core/NzbDrone.Core.csproj @@ -174,6 +174,7 @@ + diff --git a/NzbDrone.Core/Providers/DiskScanProvider.cs b/NzbDrone.Core/Providers/DiskScanProvider.cs index e0988ce34..ddb848e4d 100644 --- a/NzbDrone.Core/Providers/DiskScanProvider.cs +++ b/NzbDrone.Core/Providers/DiskScanProvider.cs @@ -104,7 +104,7 @@ namespace NzbDrone.Core.Providers long size = _diskProvider.GetSize(filePath); //If Size is less than 40MB and contains sample. Check for Size to ensure its not an episode with sample in the title - if (size < 40.Megabytes() && filePath.ToLower().Contains("sample")) + if (size < Constants.IgnoreFileSize && filePath.ToLower().Contains("sample")) { Logger.Trace("[{0}] appears to be a sample. skipping.", filePath); return null; diff --git a/NzbDrone.Core/Providers/PostDownloadProvider.cs b/NzbDrone.Core/Providers/PostDownloadProvider.cs index b0080d2d0..439c87cf5 100644 --- a/NzbDrone.Core/Providers/PostDownloadProvider.cs +++ b/NzbDrone.Core/Providers/PostDownloadProvider.cs @@ -68,7 +68,7 @@ namespace NzbDrone.Core.Providers importedFiles.ForEach(file => _diskScanProvider.MoveEpisodeFile(file, true)); //Delete the folder only if folder is small enough - if (_diskProvider.GetDirectorySize(subfolderInfo.FullName) < 10.Megabytes()) + if (_diskProvider.GetDirectorySize(subfolderInfo.FullName) < Constants.IgnoreFileSize) { _diskProvider.DeleteFolder(subfolderInfo.FullName, true); }