From 4604bbd821a70d91fa92055b040f55e27061b8d8 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Sun, 18 Sep 2011 13:53:05 -0700 Subject: [PATCH] Mark invalid series downloads with NzbDrone prefix. Fixed broken tests. --- NzbDrone.Core.Test/IndexerTests.cs | 2 +- NzbDrone.Core/Parser.cs | 2 +- NzbDrone.Core/Providers/Jobs/PostDownloadScanJob.cs | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/NzbDrone.Core.Test/IndexerTests.cs b/NzbDrone.Core.Test/IndexerTests.cs index 8c077e1a4..6d85b1d28 100644 --- a/NzbDrone.Core.Test/IndexerTests.cs +++ b/NzbDrone.Core.Test/IndexerTests.cs @@ -24,7 +24,7 @@ namespace NzbDrone.Core.Test { [TestCase("nzbsorg.xml", 2)] - [TestCase("nzbsrus.xml", 9)] + [TestCase("nzbsrus.xml", 7)] [TestCase("newzbin.xml", 1)] [TestCase("nzbmatrix.xml", 2)] public void parse_feed_xml(string fileName, int warns) diff --git a/NzbDrone.Core/Parser.cs b/NzbDrone.Core/Parser.cs index 3e7445e56..f3e57d506 100644 --- a/NzbDrone.Core/Parser.cs +++ b/NzbDrone.Core/Parser.cs @@ -36,7 +36,7 @@ namespace NzbDrone.Core RegexOptions.IgnoreCase | RegexOptions.Compiled), //Episodes over 99 (3-digits or more) - new Regex(@"^(?.*?)(?:\W?S?(?<season>\d{1,2}(?!\d+))(?:(?:\-|\.|[ex]|\s)+(?<episode>\d+))+)+\W?(?!\\)", + new Regex(@"^(?<title>.*?)(?:\W?S?(?<season>\d{1,2}(?!\d+))(?:(?:\-|[ex]|\s)+(?<episode>\d+))+)+\W?(?!\\)", RegexOptions.IgnoreCase | RegexOptions.Compiled), //Supports 103/113 naming diff --git a/NzbDrone.Core/Providers/Jobs/PostDownloadScanJob.cs b/NzbDrone.Core/Providers/Jobs/PostDownloadScanJob.cs index 5f78d500e..97e5feb6d 100644 --- a/NzbDrone.Core/Providers/Jobs/PostDownloadScanJob.cs +++ b/NzbDrone.Core/Providers/Jobs/PostDownloadScanJob.cs @@ -86,6 +86,9 @@ namespace NzbDrone.Core.Providers.Jobs if (series == null) { Logger.Warn("Unable to Import new download [{0}], series doesn't exist in database.", subfolder); + + //Rename the Directory so it's not processed again. + _diskProvider.MoveDirectory(subfolderInfo.FullName, Path.Combine(subfolderInfo.Parent.FullName, "_NzbDrone_" + subfolderInfo.Name)); continue; }