Mark invalid series downloads with NzbDrone prefix.

Fixed broken tests.
This commit is contained in:
Mark McDowall 2011-09-18 13:53:05 -07:00
parent 951eb4523d
commit 4604bbd821
3 changed files with 5 additions and 2 deletions

View File

@ -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)

View File

@ -36,7 +36,7 @@ namespace NzbDrone.Core
RegexOptions.IgnoreCase | RegexOptions.Compiled),
//Episodes over 99 (3-digits or more)
new Regex(@"^(?<title>.*?)(?:\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

View File

@ -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;
}