tedkulp/Readarr
1
0
Fork 0
mirror of https://github.com/Readarr/Readarr.git synced 2026-04-21 22:04:31 -04:00
Code Issues Projects Releases Wiki Activity

Updated test logic to report exceptions gracefully.

Browse Source
This commit is contained in:
Taloth Saldono
2014-07-10 00:11:57 +02:00
committed by Mark McDowall
parent 25abeb8c9c
commit f9586e6f77
8 changed files with 91 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/NzbDrone.Core/Download/DownloadClientBase.cs
+28 -3
View File
@@ -11,6 +11,7 @@ using NzbDrone.Core.ThingiProvider;
using NzbDrone.Core.Configuration;
using NLog;
using FluentValidation.Results;
using NzbDrone.Core.Validation;
namespace NzbDrone.Core.Download
{
@@ -39,7 +40,6 @@ namespace NzbDrone.Core.Download
}
public ProviderDefinition Definition { get; set; }
public abstract ValidationResult Test();
protected TSettings Settings
{
@@ -101,11 +101,33 @@ namespace NzbDrone.Core.Download
}
}
public ValidationResult Test()
{
var failures = new List<ValidationFailure>();
try
{
Test(failures);
}
catch (Exception ex)
{
_logger.ErrorException("Test aborted due to exception", ex);
failures.Add(new ValidationFailure(string.Empty, "Test was aborted due to an error: " + ex.Message));
}
return new ValidationResult(failures);
}
protected abstract void Test(List<ValidationFailure> failures);
protected ValidationFailure TestFolder(String folder, String propertyName, Boolean mustBeWritable = true)
{
if (!_diskProvider.FolderExists(folder))
{
return new ValidationFailure(propertyName, "Folder does not exist");
return new NzbDroneValidationFailure(propertyName, "Folder does not exist")
{
DetailedDescription = "The folder you specified does not exist or is inaccessible. Please verify the folder permissions for the user account that is used to execute NzbDrone."
};
}
if (mustBeWritable)
@@ -119,7 +141,10 @@ namespace NzbDrone.Core.Download
catch (Exception ex)
{
_logger.ErrorException(ex.Message, ex);
return new ValidationFailure(propertyName, "Unable to write to folder");
return new NzbDroneValidationFailure(propertyName, "Unable to write to folder")
{
DetailedDescription = "The folder you specified is not writable. Please verify the folder permissions for the user account that is used to execute NzbDrone."
};
}
}