Archive-Team
/
sonarr-repo-only
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed: Show more information in UI when testing SAB fails in some cases

This commit is contained in:
Mark McDowall 2020-07-26 10:49:15 -07:00
parent 8fe93eae38
commit 05735ad2c3
5 changed files with 33 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/src/Components/Form/FormInputGroup.js
View File

@ -210,7 +210,7 @@ function FormInputGroup(props) {
key={index}
text={error.message}
link={error.link}
linkTooltip={error.detailedMessage}
tooltip={error.detailedMessage}
isError={true}
isCheckInput={checkInput}
/>
@ -225,7 +225,7 @@ function FormInputGroup(props) {
key={index}
text={warning.message}
link={warning.link}
linkTooltip={warning.detailedMessage}
tooltip={warning.detailedMessage}
isWarning={true}
isCheckInput={checkInput}
/>

4
frontend/src/Components/Form/FormInputHelpText.css
View File

@ -37,3 +37,7 @@
margin-left: 5px;
}
.details {
margin-left: 5px;
}

21
frontend/src/Components/Form/FormInputHelpText.js
View File

@ -11,7 +11,7 @@ function FormInputHelpText(props) {
className,
text,
link,
linkTooltip,
tooltip,
isError,
isWarning,
isCheckInput
@ -28,16 +28,27 @@ function FormInputHelpText(props) {
{text}
{
!!link &&
link ?
<Link
className={styles.link}
to={link}
title={linkTooltip}
title={tooltip}
>
<Icon
name={icons.EXTERNAL_LINK}
/>
</Link>
</Link> :
null
}
{
!link && tooltip ?
<Icon
containerClassName={styles.details}
name={icons.INFO}
title={tooltip}
/> :
null
}
</div>
);
@ -47,7 +58,7 @@ FormInputHelpText.propTypes = {
className: PropTypes.string.isRequired,
text: PropTypes.string.isRequired,
link: PropTypes.string,
linkTooltip: PropTypes.string,
tooltip: PropTypes.string,
isError: PropTypes.bool,
isWarning: PropTypes.bool,
isCheckInput: PropTypes.bool

5
src/NzbDrone.Core/Download/Clients/Sabnzbd/Sabnzbd.cs
View File

@ -376,7 +376,10 @@ namespace NzbDrone.Core.Download.Clients.Sabnzbd
catch (Exception ex)
{
_logger.Error(ex, ex.Message);
return new ValidationFailure("Host", "Unable to connect to SABnzbd");
return new NzbDroneValidationFailure("Host", "Unable to connect to SABnzbd")
{
DetailedDescription = ex.Message
};
}
}

9
src/NzbDrone.Core/Download/Clients/Sabnzbd/SabnzbdProxy.cs
View File

@ -185,11 +185,16 @@ namespace NzbDrone.Core.Download.Clients.Sabnzbd
}
catch (HttpException ex)
{
throw new DownloadClientException("Unable to connect to SABnzbd, please check your settings", ex);
throw new DownloadClientException("Unable to connect to SABnzbd, {0}", ex, ex.Message);
}
catch (WebException ex)
{
throw new DownloadClientUnavailableException("Unable to connect to SABnzbd, please check your settings", ex);
if (ex.Status == WebExceptionStatus.TrustFailure)
{
throw new DownloadClientUnavailableException("Unable to connect to SABnzbd, certificate validation failed.", ex);
}
throw new DownloadClientUnavailableException("Unable to connect to SABnzbd, {0}", ex, ex.Message);
}
CheckForError(response);