From a3e5c9031998742b0dd8b8637ddb084ec3b8bafe Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Tue, 18 Oct 2011 16:49:43 -0700 Subject: [PATCH] Cleanup generating paths for error scenarios. --- NzbDrone.Core/Providers/PostDownloadProvider.cs | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/NzbDrone.Core/Providers/PostDownloadProvider.cs b/NzbDrone.Core/Providers/PostDownloadProvider.cs index e6050b7eb..b80771930 100644 --- a/NzbDrone.Core/Providers/PostDownloadProvider.cs +++ b/NzbDrone.Core/Providers/PostDownloadProvider.cs @@ -114,8 +114,7 @@ namespace NzbDrone.Core.Providers //Rename the Directory so it's not processed again. _diskProvider.MoveDirectory(subfolderInfo.FullName, - Path.Combine(subfolderInfo.Parent.FullName, - "_NzbDrone_InvalidSeries_" + subfolderInfo.Name)); + GetNewFolderNameWithPostDownloadStatus(subfolderInfo, PostDownloadStatusType.InvalidSeries)); return; } @@ -132,9 +131,8 @@ namespace NzbDrone.Core.Providers if (importedFiles.Count == 0) { Logger.Warn("Unable to Import new download [{0}], unable to parse episode file(s).", subfolderInfo.FullName); - _diskProvider.MoveDirectory(subfolderInfo.FullName, - Path.Combine(subfolderInfo.Parent.FullName, - "_NzbDrone_ParseError_" + subfolderInfo.Name)); + _diskProvider.MoveDirectory(subfolderInfo.FullName, + GetNewFolderNameWithPostDownloadStatus(subfolderInfo, PostDownloadStatusType.ParseError)); } //Unknown Error Importing (Possibly a lesser quality than episode currently on disk) @@ -142,9 +140,7 @@ namespace NzbDrone.Core.Providers { Logger.Warn("Unable to Import new download [{0}].", subfolderInfo.FullName); - _diskProvider.MoveDirectory(subfolderInfo.FullName, - Path.Combine(subfolderInfo.Parent.FullName, - "_NzbDrone_" + subfolderInfo.Name)); + _diskProvider.MoveDirectory(subfolderInfo.FullName, GetNewFolderNameWithPostDownloadStatus(subfolderInfo, PostDownloadStatusType.Unknown)); } } }